summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Olexa <darkside@gentoo.org>2009-03-25 23:54:18 +0000
committerJeremy Olexa <darkside@gentoo.org>2009-03-25 23:54:18 +0000
commite172cec642f2fb57b901714f86bf8c5b17df6fa2 (patch)
tree05cf6a4f5f7e688b70ccacb53419fe4e8a901473 /x11-misc/slim
parentamd64 stable, bug 262195 (diff)
downloadgentoo-2-e172cec642f2fb57b901714f86bf8c5b17df6fa2.tar.gz
gentoo-2-e172cec642f2fb57b901714f86bf8c5b17df6fa2.tar.bz2
gentoo-2-e172cec642f2fb57b901714f86bf8c5b17df6fa2.zip
Add logrotate support by Daniel Pielmeier (billie) bug 262034 & gcc-4.4 patch reported in bug 252745
(Portage version: 2.1.6.9/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/slim')
-rw-r--r--x11-misc/slim/ChangeLog10
-rw-r--r--x11-misc/slim/files/slim-1.3.1-gcc4.4.patch17
-rw-r--r--x11-misc/slim/files/slim.logrotate9
-rw-r--r--x11-misc/slim/slim-1.3.1-r5.ebuild90
4 files changed, 125 insertions, 1 deletions
diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index ec4cc08d5dbc..97f9974d6347 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for x11-misc/slim
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.35 2009/03/21 21:57:11 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.36 2009/03/25 23:54:18 darkside Exp $
+
+*slim-1.3.1-r5 (25 Mar 2009)
+
+ 25 Mar 2009; Jeremy Olexa <darkside@gentoo.org>
+ +files/slim-1.3.1-gcc4.4.patch, +files/slim.logrotate,
+ +slim-1.3.1-r5.ebuild:
+ Add logrotate support by Daniel Pielmeier (billie) bug 262034 & gcc-4.4
+ patch reported in bug 252745
21 Mar 2009; Krzysiek Pawlik <nelchael@gentoo.org>
-files/slim-1.3.0-gcc43.patch, -slim-1.3.0-r1.ebuild,
diff --git a/x11-misc/slim/files/slim-1.3.1-gcc4.4.patch b/x11-misc/slim/files/slim-1.3.1-gcc4.4.patch
new file mode 100644
index 000000000000..5c51d1f79662
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.1-gcc4.4.patch
@@ -0,0 +1,17 @@
+Patch to allow compilation with gcc-4.4
+
+Notified by Daniel J. - from Debian bug tracker
+
+http://bugs.gentoo.org/252745
+
+--- switchuser.h 2008-11-11 19:40:18.000000000 +0000
++++ switchuser.h 2008-11-11 19:40:28.000000000 +0000
+@@ -18,6 +18,7 @@
+ #include <pwd.h>
+ #include <grp.h>
+ #include <paths.h>
++#include <cstdio>
+ #include <iostream>
+ #include "const.h"
+ #include "cfg.h"
+
diff --git a/x11-misc/slim/files/slim.logrotate b/x11-misc/slim/files/slim.logrotate
new file mode 100644
index 000000000000..89015306ff50
--- /dev/null
+++ b/x11-misc/slim/files/slim.logrotate
@@ -0,0 +1,9 @@
+/var/log/slim.log {
+ compress
+ rotate 4
+ weekly
+ delaycompress
+ copytruncate
+ missingok
+ notifempty
+}
diff --git a/x11-misc/slim/slim-1.3.1-r5.ebuild b/x11-misc/slim/slim-1.3.1-r5.ebuild
new file mode 100644
index 000000000000..d530cce0cb69
--- /dev/null
+++ b/x11-misc/slim/slim-1.3.1-r5.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.1-r5.ebuild,v 1.1 2009/03/25 23:54:18 darkside Exp $
+
+EAPI="2"
+
+inherit toolchain-funcs pam eutils
+
+DESCRIPTION="Simple Login Manager"
+HOMEPAGE="http://slim.berlios.de"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="branding screenshot pam"
+
+DEPEND="x11-proto/xproto
+ x11-libs/libXmu
+ x11-libs/libX11
+ x11-libs/libXpm
+ x11-libs/libXft
+ media-libs/libpng
+ media-libs/jpeg
+ pam? ( virtual/pam )"
+RDEPEND="${DEPEND}
+ x11-apps/sessreg
+ screenshot? ( media-gfx/imagemagick )
+ branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
+
+src_prepare() {
+ # respect C[XX]FLAGS, fix crosscompile,
+ # fix linking order for --as-needed"
+ sed -i -e "s:^CXX=.*:CXX=$(tc-getCXX) ${CXXFLAGS}:" \
+ -e "s:^CC=.*:CC=$(tc-getCC) ${CFLAGS}:" \
+ -e "s:^MANDIR=.*:MANDIR=/usr/share/man:" \
+ -e "s:^\t\(.*\)\ \$(LDFLAGS)\ \(.*\):\t\1\ \2\ \$(LDFLAGS):g" \
+ -r -e "s:^LDFLAGS=(.*):LDFLAGS=\1 ${LDFLAGS}:" \
+ Makefile || die "sed failed in Makefile"
+ epatch "${FILESDIR}/${P}-config.diff"
+
+ if use branding; then
+ sed -i -e 's/ default/ slim-gentoo-simple/' slim.conf || die
+ fi
+
+ epatch "${FILESDIR}/${P}-gcc4.4.patch"
+
+}
+
+src_compile() {
+ if use pam ; then
+ emake USE_PAM=1 || die "emake failed."
+ else
+ emake || die "emake failed."
+ fi
+}
+
+src_install() {
+ if use pam ; then
+ emake USE_PAM=1 DESTDIR="${D}" install || die "emake install failed."
+ pamd_mimic_system slim auth account password session
+ else
+ emake DESTDIR="${D}" install || die "emake install failed."
+ fi
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/slim.logrotate" slim || die "newins failed"
+
+ dodoc xinitrc.sample ChangeLog README TODO THEMES
+}
+
+pkg_postinst() {
+ elog
+ elog "The configuration file is located at /etc/slim.conf."
+ elog
+ elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" "
+ elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"."
+ elog "By default, ${PN} will use default XSESSION value set in /etc/rc.conf."
+ elog
+ elog "If you want to use .xinitrc in the user's home directory for session"
+ elog "management instead, see README and xinitrc.sample in"
+ elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf"
+ elog "accordingly."
+ elog
+ if ! use pam; then
+ elog "You have merged ${PN} without USE=pam, this will cause ${PN} to fall back to"
+ elog "the console when restarting your window manager. If this is not"
+ elog "desired, then please remerge ${PN} with USE=pam"
+ fi
+}