punt old, broken versions with PAM and ConsoleKit. leave only latest, and the only working one in tree.

(Portage version: 2.2.0_alpha14/cvs/Linux x86_64)

4 files changed, 0 insertions, 278 deletions

diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index 33c390935694..ba996d5d91b9 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -4,12 +4,9 @@ AUX 261359-fix-SIGTERM-freeze.patch 1284 RMD160 ba75eda8cc539138f68f26de18c76a5e
 AUX 261713-restart-xserver-if-killed.patch 3198 RMD160 97b6627b17f74a6fb88a967fee7364bdb3280710 SHA1 15d7bffb0588ac33ece488aa209c2418023d4739 SHA256 c4ff22a4930d6ef12ee6ff30f4782b64785c00d54f687ac620e5cbd5eee283f9
 AUX 346037-stop_setting_host_for_pam_ck_connector_so.patch 328 RMD160 62012df3cccf607d8cba139b0754a7238bfb1dd3 SHA1 04f26bc3ad82dab47c8911f3ac069b756fe5a1a8 SHA256 51bee429be20f2538b19b84c311b136761acdf2b857661af11749e45cc73ad44
 AUX Xsession 4215 RMD160 86ab057ea3f78a9604811a1bff7e5aad88c2f717 SHA1 46dc684b873b190b74df199eae39b38e0f5ffccc SHA256 55671397563aa32d89e66658e6594f17d4ddcddd1ad6aa2d7582ba56ceec7628
-AUX slim-1.3.2-r1-config.diff 2367 RMD160 ac53bf33f1e369a2e545e38b6029b8daaf5aba15 SHA1 f3731b6f4dcd9bf125b3f76057901eca1cc8c0e8 SHA256 e5bd697a68c08b70e02c2bc8fd3be85828a7a3f1019dfcb4f4609ed60039d53c
 AUX slim-1.3.2-r2-config.diff 2572 RMD160 217c3d64b77e0af496670cee82849a0500516d0d SHA1 7dbc1b0df45a49688b52bfc701acc3dc15019394 SHA256 7ea06809e15f40c5113d8c05df2b6ca4eb4ba9ebc1e9fc1747b080337997384d
 AUX slim.logrotate 102 RMD160 ccf614eca8c0b8fc1fbc2dfb8bf71b02485a743b SHA1 d2bc9202862f0d33bb902eba3aa8fefe0797d7a3 SHA256 d0559cf7764147f601f2bab8077fd956b1171adad4872c0d324279f6a978264a
 DIST slim-1.3.2.tar.gz 220592 RMD160 1ca6504c07ea2d420fde86b6db0f4cfbbd6680fc SHA1 e421d5487732c8317f8f591906661e014b036358 SHA256 f1560125005f253b9b88220598fed7a9575ef405716862c6ca3fcc72dbd482b8
-EBUILD slim-1.3.2-r1.ebuild 3120 RMD160 2bc4013cb1bec42e7ad215f1ff42c9ce5ac81f18 SHA1 f4bc720a41bb7b98a0ff39a828ff5df11d34ad27 SHA256 b5b2a236f9fab5fa9dd775bc8ca7ed50b802910643c6754c758dc4edbab3ad36
-EBUILD slim-1.3.2-r2.ebuild 3482 RMD160 d4de8a124ecc94c893767ffeac46388d5c3b8623 SHA1 055462ecbd4c8647a76c8eab86d762351ea0c645 SHA256 0a042ba8f581d3365448943bec78602a1ae114759ff0be5679462df231b5bcbd
 EBUILD slim-1.3.2-r3.ebuild 3575 RMD160 8f53f06d4f1a2f36b41ac282ff182b5ecac0fd3f SHA1 20f30fddd4fc6a2eb4dd411e1a22a5b08c32ee79 SHA256 c5bd1f91f09609cf423ebaa893ab6cb623e1a1acb06b529981fab8a5e7c497e2
 MISC ChangeLog 10489 RMD160 9c77ad5534a8b81625e1abfc3fa1f46babbced8d SHA1 89982e37e0ad8d29d269fc2fb1b87f64c8dc4bda SHA256 7bda0ec3320378116e52e94f9d31ce808157938c973316cb31edd53181ab9b7e
 MISC metadata.xml 377 RMD160 6320bad8fc67d0814f8d74a83480ba2fb4ed5d2f SHA1 0e938430a8782f832c96a778c2a287f1787cce06 SHA256 4c607a49c6e35158356c67f5b1111626d66b7d72f4fc85f2303eb9b0e7600a8f
diff --git a/x11-misc/slim/files/slim-1.3.2-r1-config.diff b/x11-misc/slim/files/slim-1.3.2-r1-config.diff
deleted file mode 100644
index dd5a21cbc2a3..000000000000
--- a/x11-misc/slim/files/slim-1.3.2-r1-config.diff
+++ /dev/null
@@ -1,68 +0,0 @@
---- slim.conf.orig	2010-08-24 10:18:52.344180981 -0500
-+++ slim.conf	2010-08-24 10:22:20.311234197 -0500
-@@ -2,7 +2,7 @@
- # Note: -xauth $authfile is automatically appended
- default_path        /bin:/usr/bin:/usr/local/bin
- default_xserver     /usr/bin/X
--#xserver_arguments   -dpi 75
-+xserver_arguments   -nolisten tcp -br -deferglyphs 16
- 
- # Commands for halt, login, etc.
- halt_cmd            /sbin/shutdown -h now
-@@ -18,7 +18,7 @@
- 
- 
- # Activate numlock when slim starts. Valid values: on|off
--# numlock             on
-+numlock             on
- 
- # Hide the mouse cursor (note: does not work with some WMs).
- # Valid values: true|false
-@@ -33,7 +33,8 @@
- # to adjust the command according to your preferred shell,
- # i.e. for freebsd use:
- # login_cmd           exec /bin/sh - ~/.xinitrc %session
--login_cmd           exec /bin/bash -login ~/.xinitrc %session
-+# login_cmd           exec /bin/bash -login ~/.xinitrc %session
-+login_cmd           exec /bin/bash -login /etc/X11/xinit/xinitrc
- 
- # Commands executed when starting and exiting a session.
- # They can be used for registering a X11 session with
-@@ -41,11 +42,13 @@
- #
- # sessionstart_cmd	some command
- # sessionstop_cmd	some command
-+sessionstart_cmd	/usr/bin/sessreg -a -l :0.0 %user
-+sessionstop_cmd     /usr/bin/sessreg -d -l :0.0 %user
- 
- # Start in daemon mode. Valid values: yes | no
- # Note that this can be overriden by the command line
- # options "-d" and "-nodaemon"
--# daemon	yes
-+daemon	yes
- 
- # Available sessions (first one is the default).
- # The current chosen session name is replaced in the login_cmd
-@@ -53,8 +56,10 @@
- # see the xinitrc.sample file shipped with slim sources
- sessions            xfce4,icewm,wmaker,blackbox
- 
--# Executed when pressing F11 (requires imagemagick)
-+# Executed when pressing F11 (requires media-gfx/imagemagick for import)
-+# Alternative is media-gfx/scrot. See Gentoo bug 252241 for more info.
- screenshot_cmd      import -window root /slim.png
-+#screenshot_cmd      scrot /root/slim.png
- 
- # welcome message. Available variables: %host, %domain
- welcome_msg         Welcome to %host
-@@ -83,8 +88,8 @@
- # randomly choose from
- current_theme       default
- 
--# Lock file
--lockfile            /var/run/slim.lock
-+# Lock file, /etc/init.d/xdm expects slim.pid
-+lockfile            /var/run/slim.pid
- 
- # Log file
- logfile             /var/log/slim.log
diff --git a/x11-misc/slim/slim-1.3.2-r1.ebuild b/x11-misc/slim/slim-1.3.2-r1.ebuild
deleted file mode 100644
index af274c5ae3ca..000000000000
--- a/x11-misc/slim/slim-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.2-r1.ebuild,v 1.8 2010/11/07 21:20:27 ssuominen 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 pam"
-
-RDEPEND="x11-libs/libXmu
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXft
-	>=media-libs/libpng-1.4
-	virtual/jpeg
-	x11-apps/sessreg
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-proto/xproto"
-PDEPEND="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" \
-		-e "s:-I/usr/include/libpng12:$(pkg-config --cflags-only-I libpng):" \
-		-e "s:-lpng12:$(pkg-config --libs-only-l libpng):" \
-		-r -e "s:^LDFLAGS=(.*):LDFLAGS=\1 ${LDFLAGS}:" \
-		Makefile || die "sed failed in Makefile"
-	# Our Gentoo-specific config changes
-	epatch "${FILESDIR}/${PN}-1.3.2-r1-config.diff"
-
-	if use branding; then
-		sed -i -e 's/  default/  slim-gentoo-simple/' slim.conf || die
-	fi
-
-	# Gentoo bug 297655
-	epatch "${FILESDIR}/14509-fix-keyboard-in-tty-from-which-${PN}-is-lauched.patch"
-	# Upstream bug #15287
-	epatch "${FILESDIR}/15287-fix-pam-authentication-with-pam_unix2.patch"
-	# Gentoo Bug 261713
-	epatch "${FILESDIR}/261713-restart-xserver-if-killed.patch"
-	# Gentoo bug 261359, upstream 15326
-	epatch "${FILESDIR}/261359-fix-SIGTERM-freeze.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
-}
diff --git a/x11-misc/slim/slim-1.3.2-r2.ebuild b/x11-misc/slim/slim-1.3.2-r2.ebuild
deleted file mode 100644
index 15eb5efe5bf1..000000000000
--- a/x11-misc/slim/slim-1.3.2-r2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.2-r2.ebuild,v 1.3 2010/11/07 21:20:27 ssuominen 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 pam"
-
-RDEPEND="x11-libs/libXmu
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXft
-	>=media-libs/libpng-1.4
-	virtual/jpeg
-	x11-apps/sessreg
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-proto/xproto"
-PDEPEND="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" \
-		-e "s:-I/usr/include/libpng12:$(pkg-config --cflags-only-I libpng):" \
-		-e "s:-lpng12:$(pkg-config --libs-only-l libpng):" \
-		-r -e "s:^LDFLAGS=(.*):LDFLAGS=\1 ${LDFLAGS}:" \
-		Makefile || die "sed failed in Makefile"
-	# Our Gentoo-specific config changes
-	epatch "${FILESDIR}/${PN}-1.3.2-r2-config.diff"
-
-	if use branding; then
-		sed -i -e 's/  default/  slim-gentoo-simple/' slim.conf || die
-	fi
-
-	# Gentoo bug 297655
-	epatch "${FILESDIR}/14509-fix-keyboard-in-tty-from-which-${PN}-is-lauched.patch"
-	# Upstream bug #15287
-	epatch "${FILESDIR}/15287-fix-pam-authentication-with-pam_unix2.patch"
-	# Gentoo Bug 261713
-	epatch "${FILESDIR}/261713-restart-xserver-if-killed.patch"
-	# Gentoo bug 261359, upstream 15326
-	epatch "${FILESDIR}/261359-fix-SIGTERM-freeze.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 /usr/share/slim
-	newins "${FILESDIR}/Xsession" Xsession || die "newins failed"
-
-	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
-	elog "By default, ${PN} now does proper X session selection, including ~/.xsession"
-	elog "support, as well as selection between sessions available in"
-	elog "/etc/X11/Sessions/ at login by pressing [F1]."
-	elog
-	elog "The XSESSION environment variable is still supported as a default"
-	elog "if no session has been specified by the user."
-	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
-}