version bump, thanks to Daniel Pielmeier in bug #238801

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64

2 files changed, 96 insertions, 10 deletions

diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index b33ba0003077..62a6f926b0a4 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX slim-1.3.0-gcc43.patch 255 RMD160 dafb1ce951a97220916f14a418a9f4814b8c5f98 SHA1 46bcb9952bb3f9f8fefc53083cb475e073de4b46 SHA256 0cf636a722e048bcf6ca68c1419a87cacd65b87e92cda2ad88d1043b353621c4
 DIST slim-1.3.0.tar.gz 218646 RMD160 80205d8e757c76f9c0e21263ec38624f605d9586 SHA1 f27f40c73a2f757f1ae32155bf0438c97be2c019 SHA256 b3cb736ce567146e9bdb5e081fce95d4ec69d64ccc30d004e921823b54c44e9b
+DIST slim-1.3.1.tar.gz 219446 RMD160 dc0c7c7257dfa8c2bee47ffa5ec8ddf17fd38f70 SHA1 30152b280724daf75299a8ee16585041f253ed4f SHA256 acd7a4024bfd7c2a4f3cd5d77ffed4956d13727a8f554042126d0568defe0f77
 EBUILD slim-1.3.0-r1.ebuild 2901 RMD160 a8aa2ce96b0d4c802527c54c3d6602059a413c68 SHA1 7ac674b6fdc09d46e64c40ac52971396020a2d67 SHA256 d254f24ec386681493aba0c489bd7c880199950f4041ac2a3f00ae74c7ee37ce
 EBUILD slim-1.3.0-r2.ebuild 3284 RMD160 1bc4b4f1eea1dcc2f64418e14d1437c4a0e78ebb SHA1 6982b023c8117fbf0751d85b4d7e02567ecf2b59 SHA256 4f0bb9372f0294e27991dc946d76ba9b57b74a5b76627c7d0a80632f41ffa2c0
+EBUILD slim-1.3.1.ebuild 3114 RMD160 3a85f3607093dd2835a77e32a2aa3364bc211a67 SHA1 9a2c53ce03b2396b731ec0552940af15fa23e6f3 SHA256 ea338385d1f068841001464c80beb380fd2de80d165995382f177cc9e034f444
 MISC ChangeLog 2738 RMD160 35a50d9a72edc61a053583af07dfb51e9447b9ed SHA1 c2fda078b43a45c9179a16e4cd4c8ec86d22b397 SHA256 a521197aee93b0ac28e6feeff5dd0fe4be26458967b3a041d4e45d2f7800bfdf
 MISC metadata.xml 233 RMD160 cdc8b3d6e2c4eaff8f37088ee4e9c68c6eca7cd2 SHA1 5c3eaf0604c2e1273d7892ce1317a2525ce7d1c4 SHA256 46d923a7ef5b27ee3a8a182c96567dfe7013b0f2eb59930f332d8ade5b09f610
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjcvKcACgkQvFcC4BYPU0qRgACeLvs5HpoXIxqlFd8EqyFiD2t3
-5RUAoLm2g/EauYM8l9WedA6jWMr0Kasy
-=rzhf
------END PGP SIGNATURE-----
diff --git a/x11-misc/slim/slim-1.3.1.ebuild b/x11-misc/slim/slim-1.3.1.ebuild
new file mode 100644
index 000000000000..26fb69c5fd7d
--- /dev/null
+++ b/x11-misc/slim/slim-1.3.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2008 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.ebuild,v 1.1 2008/09/26 18:44:52 darkside Exp $
+
+inherit toolchain-funcs pam
+
+DESCRIPTION="Simple Login Manager"
+HOMEPAGE="http://slim.berlios.de"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="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}
+	media-fonts/corefonts
+	x11-apps/sessreg"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# 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'
+
+	# Set slim to daemon mode as default to stop xdm runscript from throwing errors on stop
+	# Set the default logfile to /dev/null to avoid cluttering up the harddisk
+	# as slim puts a lot of garbage in its logfile
+	# Make slim honor XSESSION in /etc/rc.conf by default.
+	sed -i -e 's/# daemon/daemon/' \
+		-e 's#/var/log/slim.log#/dev/null#g' \
+		-e '/^login_cmd.*/s#exec /bin/bash.*#exec /bin/bash -login /etc/X11/xinit/xinitrc#' \
+		slim.conf || die "sed failed in slim.conf"
+
+		# This method of appending to the slim.conf file may change, but it
+		# works for now.
+		echo "# Needed so your login will show up in wtmp and utmp, etc" >> slim.conf || die
+		echo "sessionstart_cmd        /usr/bin/sessreg -a -l $DISPLAY %user" >> slim.conf || die
+		echo "sessionstop_cmd         /usr/bin/sessreg -d -l $DISPLAY %user" >> slim.conf || die
+}
+
+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
+
+	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
+}