Stable on amd64 and remove old

(Portage version: 2.1.4)

6 files changed, 7 insertions, 143 deletions

diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index c2b52b5a1e86..647735297201 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/slim
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.11 2008/01/27 16:39:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.12 2008/01/27 16:44:32 angelos Exp $
+
+  27 Jan 2008; Christoph Mende <angelos@gentoo.org> -slim-1.2.6.ebuild,
+  -slim-1.3.0.ebuild, slim-1.3.0-r1.ebuild:
+  Stable on amd64 and remove old
 
   27 Jan 2008; Raúl Porcel <armin76@gentoo.org> slim-1.3.0-r1.ebuild:
   sparc/x86 stable
diff --git a/x11-misc/slim/files/digest-slim-1.2.6 b/x11-misc/slim/files/digest-slim-1.2.6
deleted file mode 100644
index cc557ad76ceb..000000000000
--- a/x11-misc/slim/files/digest-slim-1.2.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1bf891f046014a03236c21ce6cbe455b slim-1.2.6.tar.gz 219003
-RMD160 81b2d230857dd1b3b2fb6e41b2a81a3ed7207bfd slim-1.2.6.tar.gz 219003
-SHA256 4f0a51c88d0d4f942d3552efcfbfcb245bc558336a1ed3f531dbe65252ad8c5e slim-1.2.6.tar.gz 219003
diff --git a/x11-misc/slim/files/digest-slim-1.3.0 b/x11-misc/slim/files/digest-slim-1.3.0
deleted file mode 100644
index 90302a8017c0..000000000000
--- a/x11-misc/slim/files/digest-slim-1.3.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1c1a87f3cbd3c334c874585e42701961 slim-1.3.0.tar.gz 218646
-RMD160 80205d8e757c76f9c0e21263ec38624f605d9586 slim-1.3.0.tar.gz 218646
-SHA256 b3cb736ce567146e9bdb5e081fce95d4ec69d64ccc30d004e921823b54c44e9b slim-1.3.0.tar.gz 218646
diff --git a/x11-misc/slim/slim-1.2.6.ebuild b/x11-misc/slim/slim-1.2.6.ebuild
deleted file mode 100644
index f9e0e5d4d2ec..000000000000
--- a/x11-misc/slim/slim-1.2.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.2.6.ebuild,v 1.5 2007/08/13 02:44:48 angelos Exp $
-
-inherit toolchain-funcs
-
-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=""
-
-DEPEND="x11-proto/xproto
-	x11-libs/libXmu
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXft
-	media-libs/libpng
-	media-libs/jpeg"
-RDEPEND="${DEPEND}
-	media-fonts/corefonts"
-
-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:/usr/X11R6:/usr:" \
-		-e "s:^\t\(.*\)\ \$(LDFLAGS)\ \(.*\):\t\1\ \2\ \$(LDFLAGS):g" \
-		Makefile || die 'sed failed in Makefile'
-
-	# Remove all X11R6 references from slim.conf
-	# 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
-	sed -i -e 's#X11R6/##g' -e 's#/usr/bin:##' \
-		-e 's/# daemon/daemon/' \
-		-e 's#/var/log/slim.log#/dev/null#g' \
-		slim.conf || die "sed failed in slim.conf"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc xinitrc.sample README TODO THEMES
-}
-
-pkg_postinst() {
-	elog
-	elog "The configuration file is located at /etc/slim.conf."
-	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 "${PN} uses .xinitrc in the user's home directory and /etc/slim.conf"
-	elog "for session management. For further information, see README and"
-	elog "xinitrc.sample in /usr/share/doc/${PF}."
-	elog
-}
diff --git a/x11-misc/slim/slim-1.3.0-r1.ebuild b/x11-misc/slim/slim-1.3.0-r1.ebuild
index f6b59fd2e7ed..c89fea62775e 100644
--- a/x11-misc/slim/slim-1.3.0-r1.ebuild
+++ b/x11-misc/slim/slim-1.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.0-r1.ebuild,v 1.3 2008/01/27 16:39:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.0-r1.ebuild,v 1.4 2008/01/27 16:44:32 angelos Exp $
 
 inherit toolchain-funcs pam
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 IUSE="pam"
 
 DEPEND="x11-proto/xproto
diff --git a/x11-misc/slim/slim-1.3.0.ebuild b/x11-misc/slim/slim-1.3.0.ebuild
deleted file mode 100644
index ef442b955f4d..000000000000
--- a/x11-misc/slim/slim-1.3.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.0.ebuild,v 1.3 2007/09/08 12:08:46 nixnut Exp $
-
-inherit toolchain-funcs
-
-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 ~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"
-
-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:/usr/X11R6:/usr:" \
-		-e "s:^\t\(.*\)\ \$(LDFLAGS)\ \(.*\):\t\1\ \2\ \$(LDFLAGS):g" \
-		Makefile || die 'sed failed in Makefile'
-
-	# Remove all X11R6 references from slim.conf
-	# 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
-	sed -i -e 's#X11R6/##g' -e 's#/usr/bin:##' \
-		-e 's/# daemon/daemon/' \
-		-e 's#/var/log/slim.log#/dev/null#g' \
-		slim.conf || die "sed failed in slim.conf"
-}
-
-src_install() {
-	if use pam ; then
-		emake USE_PAM=1 DESTDIR="${D}" install || die "emake install failed."
-	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 "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 "${PN} uses .xinitrc in the user's home directory and /etc/slim.conf"
-	elog "for session management. For further information, see README and"
-	elog "xinitrc.sample in /usr/share/doc/${PF}."
-	elog
-}