dev-util/efence is no more

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

11 files changed, 15 insertions, 949 deletions

diff --git a/x11-wm/afterstep/ChangeLog b/x11-wm/afterstep/ChangeLog
index 728501b332b2..3f1aa88ab604 100644
--- a/x11-wm/afterstep/ChangeLog
+++ b/x11-wm/afterstep/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/afterstep
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.81 2007/07/22 06:02:57 dberkholz Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.82 2009/07/10 13:58:19 ssuominen Exp $
+
+  10 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  -files/afterstep-1.8.11-gentoo.diff, -afterstep-2.00.05.ebuild,
+  -afterstep-2.1.2.ebuild, -afterstep-2.2.0.ebuild, -afterstep-2.2.1.ebuild,
+  -afterstep-2.2.2.ebuild, -afterstep-2.2.2-r1.ebuild,
+  -afterstep-2.2.3.ebuild, afterstep-2.2.4.ebuild:
+  dev-util/efence is no more
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   afterstep-2.00.05.ebuild, afterstep-2.1.2.ebuild, afterstep-2.2.0.ebuild,
diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
index 28badbec456d..04aa9ca5639a 100644
--- a/x11-wm/afterstep/Manifest
+++ b/x11-wm/afterstep/Manifest
@@ -1,20 +1,6 @@
 AUX afterstep 29 RMD160 a1fafb8971d47c7cebfe972bb74bbef19de4ac52 SHA1 7ce7a198aef7adb7484981fed4b84798311f5409 SHA256 c6e31f7e4912188f1ce7c41298cb66178944960628e1451efd42331236cbc3c5
-AUX afterstep-1.8.11-gentoo.diff 1321 RMD160 26d04b31388a2713c3b7764b3d1301a0b77bce3c SHA1 e38452e28b2b8222ab7d85b1190922d2fca5e72e SHA256 880ffbda3e4a9e3d6898dc780696ff71769d0fdbb180b65eed28f24700f0c670
 AUX no-alternatives.patch 1178 RMD160 de3efea2502d9f8f8dbe403a4cc5c2e796017afd SHA1 11e79670530f8c9846adbe2a4fbe2cfc53a9688e SHA256 c3849ba4cd53fa1de52ab3b743b194b005754577dbe661ad7ee23a4b3eef36fc
-DIST AfterStep-2.00.05.tar.bz2 4997596 RMD160 856eea2793c79e42d4b8bb32ae8260bcd5f7144a SHA1 8ef24b0f7ad2fc8ddad0ef35c205814860fbeaf9 SHA256 09edf8d311084235ea972f090ea81bbf79031517b560a92edff551222bfe1b97
-DIST AfterStep-2.1.2.tar.bz2 5079333 RMD160 f891ded642b9190bd261f3e3f92cb595da2d785b SHA1 c367e7c73561ddf03b3725f80d2f39f50d2b45bd SHA256 76708224628d86823c04753606712415245518b36671fd0c4abc9df9c8dd35b4
-DIST AfterStep-2.2.0.tar.bz2 5398517 RMD160 564e6120a3698baebacd6882a5283c520b76afa2 SHA1 30042b2e1674b75eb51b494d454b158b7fa4b429 SHA256 e2113670b170901010429e90549a7570d66f676c2d726bf7435d67f9940c295f
-DIST AfterStep-2.2.1.tar.bz2 5405913 RMD160 c838b9b19c5d5a4a5ad5d22f1e2f1b412d91e487 SHA1 b715a86d93fd27ad511741240d265c7270fd5fdf SHA256 f4b59eefe315636bcf13505ddbcf36440f7f94e711716b5952c48b4db7a70f50
-DIST AfterStep-2.2.2.tar.bz2 5458624 RMD160 0a314423218f138e6041bcae0cfa18b565231a61 SHA1 4a2d39f3b990313b0a5a213bcc58dc7c99125907 SHA256 57657c8374c96aef8a9eeb0aa717aae3a38862bce9c9d389f69378bc8cc9fd65
-DIST AfterStep-2.2.3.tar.bz2 5611790 RMD160 dc347d03070588c860b229dcb7eb30440c00aae5 SHA1 207fc2597584369daa8cd5487fb7a66b21d0e4a6 SHA256 6aa1dedb8760abc66ade5a8b29eba03d40d06e0c0c4ec8c2b98f7e986388d8c5
 DIST AfterStep-2.2.4.tar.bz2 5707951 RMD160 74ab7c74afce8d5d669a1520a3c02f04882e05b9 SHA1 592da988696a0745c4bef240e49274b3915ee277 SHA256 e1787184faaee583435730666ef3dd1c221ced493ccd9ba0a06f94ac5e5b05ec
-EBUILD afterstep-2.00.05.ebuild 3595 RMD160 efd54dd8214db3d54264504978d0ed89b16aa80b SHA1 8756f854853f1e5155b58461499e535f9cb18aba SHA256 310c0a254051ef39f063b8031dac6500f11653e1bf3a358d470a5bb575da2391
-EBUILD afterstep-2.1.2.ebuild 3613 RMD160 ffa1d55b5678e7ee7bdf4643a6fdae459d0529ee SHA1 9fc795ea3c1a792e009109927a61e752bd4f6369 SHA256 a420e8d5401890d832892a4fdb9e0f8109e83f70dd940bf024aec53f8fea6b39
-EBUILD afterstep-2.2.0.ebuild 3628 RMD160 6c7fb7f920a7e913cc12ab16a69603aacaa77264 SHA1 52bec7c28204a14af66971c9293d6b03f4186257 SHA256 db04d46db18910eacb7f939731e7802683bb91a8d12caa5273307f199b7ab756
-EBUILD afterstep-2.2.1.ebuild 3632 RMD160 4652505585c4301c52d3a21f076b1ae59ca1aec1 SHA1 728fa6711253824b4063fb6d9e480fe036e5bb07 SHA256 1d407b68f48cecccb3a360f7c96057a60adc2ffeb3d02922202712d8697ced71
-EBUILD afterstep-2.2.2-r1.ebuild 3724 RMD160 56d7b0dc62b33d0853cb3aa87f95f31a66a4664e SHA1 8672ee1461d13b33f01663b57357fe2e299f82eb SHA256 730cb2dd5f7a82b07e625fac0a0d155eee3fc8e37a1efd36fecbc8aeff4b1ffc
-EBUILD afterstep-2.2.2.ebuild 3632 RMD160 eef812797325cbb85ede203fd1c5411a6e82f4b2 SHA1 70896dafed18573c51ff19e5c9584c5d0e949959 SHA256 d87b3ba458fc7889e640681ce82b1b75a2ed6190b0c6eee90e81542954c5c2ba
-EBUILD afterstep-2.2.3.ebuild 3720 RMD160 6adba127da64df5cd289462af0e6cc9c3b376d40 SHA1 f671c73ef4af53c34bab7e44d53af0f003effd98 SHA256 5e18d3af2bade12c45c6273e5afe286834d66a2043d96fdfe374279a70eee33d
-EBUILD afterstep-2.2.4.ebuild 3732 RMD160 6af10407d31d32d5007d4c16d7bc8d146c6d79d1 SHA1 43cbacbf485b1d6bf1c3f446725be6dc013382dd SHA256 2f0c2b4e9b5a74a62779ffbfcde036647f555c3d80f297029a18302cc39c2a88
-MISC ChangeLog 11436 RMD160 40e8a8dd9b04dc60abe19ca2b16473ee1be996af SHA1 2aa83b3292df635f94a386c7c54aade880e66f3c SHA256 bf8489dcbaef9681b06938d268cfaa6c1f7637f5fb8df986e071aac04ad4f6f2
+EBUILD afterstep-2.2.4.ebuild 3588 RMD160 f4167298e1a6c0142af4ba132445b2763e1bfcfc SHA1 57cf58e986a56d5493494ba8958881f568e371ce SHA256 0fb5403784576896fec409a56bda63c3932cd2ce711856108f5cf7fe59f282ba
+MISC ChangeLog 11769 RMD160 d5395b20a3d5320ce3e69a089c4033f269905d60 SHA1 87842e0ca325086db6d30fda6e8dad5547b8e802 SHA256 11046f1a5834cf385633562627132135cdfe65fc383d3f5294d3cf0d09f1c0e3
 MISC metadata.xml 350 RMD160 8a78f43601183735a3e88e99953e83fa319a2c9c SHA1 a0887e36150abf9d32d108bd1339880ca2a21449 SHA256 ffc449f67b60b79df064e7843b19ce9c16ab0ccc495de3b9cd9b1a38bf6b0c26
diff --git a/x11-wm/afterstep/afterstep-2.00.05.ebuild b/x11-wm/afterstep/afterstep-2.00.05.ebuild
deleted file mode 100644
index 657772705717..000000000000
--- a/x11-wm/afterstep/afterstep-2.00.05.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.00.05.ebuild,v 1.10 2007/07/22 06:02:57 dberkholz Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="AfterStep is a feature rich NeXTish window manager"
-HOMEPAGE="http://www.afterstep.org"
-SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2"
-
-LICENSE="AFTERSTEP"
-SLOT="0"
-KEYWORDS="ppc sparc x86"
-IUSE="debug gif jpeg mmx nls png tiff xinerama"
-
-RDEPEND="virtual/libc
-	media-libs/freetype
-	debug? ( !ppc? ( dev-util/efence ) )
-	png? ( >=media-libs/libpng-1.2.5 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	gif?  ( >=media-libs/giflib-4.1.0 )
-	tiff? ( >=media-libs/tiff-3.5.7 )
-	x11-libs/libICE
-	x11-libs/libXext
-	x11-libs/libSM
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXrender
-	xinerama? ( x11-libs/libXinerama )"
-
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto
-	xinerama? ( x11-proto/xineramaproto )"
-
-S="${WORKDIR}/AfterStep-${PV}"
-
-src_compile() {
-	local myconf
-
-	use debug && myconf="--enable-gdb --enable-warn --enable-gprof
-		--enable-audit --enable-trace --enable-trace-x"
-
-	if ! use ppc && use debug ; then
-		myconf="${myconf} --with-libefence"
-	fi
-
-	#implied intent of debug means you need the frame pointers.
-	use debug && filter-flags -fomit-frame-pointer
-
-	# Explanation of configure options
-	# ================================
-	# --with-helpcommand="xterm -e man" -  Avoid installing xiterm
-	# --with-xpm - Contained in xfree
-	# --with-ungif=no - Use giflib instead of libungif
-	# --disable-availability - So we can use complete paths for menuitems
-	# --enable-ascp - The AfterStep ControlPanel is abandoned
-
-	econf \
-		$(use_enable nls i18n) \
-		$(use_enable mmx mmx-optimization) \
-		$(use_enable xinerama) \
-		$(use_with png) \
-		$(use_with jpeg) \
-		$(use_with gif) \
-		$(use_with tiff) \
-		--with-helpcommand="xterm -e man" \
-		--with-ungif=no \
-		--disable-availability \
-		--disable-staticlibs \
-		--enable-ascp=no \
-		${myconf} || die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	# see bug #31541
-	dodir /usr/share/gnome/wm-properties
-
-	# afterstep tries to detect the current resolution
-	# for documentation generation, causing access violations
-	# for the video device.  bug #87356
-	unset DISPLAY
-
-	make DESTDIR=${D} install || die "make install failed"
-
-	# This fixes a bug with shared libraries
-	rm ${D}/usr/lib/{libAfterImage.a,libAfterBase.a}
-	cp -pPR ${S}/libAfterImage/libAfterImage.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterBase/libAfterBase.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterConf/libAfterConf.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterStep/libAfterStep.so* ${D}/usr/lib
-
-	# Create a symlink from MonitorWharf to Wharf
-	rm ${D}/usr/bin/MonitorWharf
-	dosym /usr/bin/Wharf /usr/bin/MonitorWharf
-
-	# Handle the documentation
-	dodoc COPYRIGHT ChangeLog INSTALL NEW* README* TEAM UPGRADE
-	cp -pPR ${S}/TODO ${D}/usr/share/doc/${PF}/
-	dodir /usr/share/doc/${PF}/html
-	cp -pPR ${S}/doc/* ${D}/usr/share/doc/${PF}/html
-	rm ${D}/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in}
-
-	insinto /usr/share/xsessions
-	newins ${S}/AfterStep.desktop.final AfterStep.desktop
-
-	# For desktop managers like GDM or KDE
-	exeinto /etc/X11/Sessions
-	doexe ${FILESDIR}/afterstep
-}
-
-pkg_postinst() {
-	echo
-	einfo "To use AfterStep issue the following commands:"
-	einfo "mv ~/.xinitrc ~/xinitrc.old"
-	einfo "echo afterstep > ~/.xinitrc"
-	echo
-	einfo "If you like AfterStep please vote for it at"
-	einfo "http://www.PLiG.org/xwinman/vote.html !"
-	echo
-}
diff --git a/x11-wm/afterstep/afterstep-2.1.2.ebuild b/x11-wm/afterstep/afterstep-2.1.2.ebuild
deleted file mode 100644
index 610cb0992db5..000000000000
--- a/x11-wm/afterstep/afterstep-2.1.2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.1.2.ebuild,v 1.10 2007/07/22 06:02:57 dberkholz Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="AfterStep is a feature rich NeXTish window manager"
-HOMEPAGE="http://www.afterstep.org"
-SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2"
-
-LICENSE="AFTERSTEP"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ppc ~ppc64 sparc x86"
-IUSE="debug gif jpeg mmx nls png tiff xinerama"
-
-RDEPEND="virtual/libc
-	media-libs/freetype
-	debug? ( !ppc? ( dev-util/efence ) )
-	png? ( >=media-libs/libpng-1.2.5 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	gif?  ( >=media-libs/giflib-4.1.0 )
-	tiff? ( >=media-libs/tiff-3.5.7 )
-	x11-libs/libICE
-	x11-libs/libXext
-	x11-libs/libSM
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXrender
-	xinerama? ( x11-libs/libXinerama )"
-
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto
-	xinerama? ( x11-proto/xineramaproto )"
-
-S="${WORKDIR}/AfterStep-${PV}"
-
-src_compile() {
-	local myconf
-
-	use debug && myconf="--enable-gdb --enable-warn --enable-gprof
-		--enable-audit --enable-trace --enable-trace-x"
-
-	if ! use ppc && use debug ; then
-		myconf="${myconf} --with-libefence"
-	fi
-
-	#implied intent of debug means you need the frame pointers.
-	use debug && filter-flags -fomit-frame-pointer
-
-	# Explanation of configure options
-	# ================================
-	# --with-helpcommand="xterm -e man" -  Avoid installing xiterm
-	# --with-xpm - Contained in xfree
-	# --with-ungif=no - Use giflib instead of libungif
-	# --disable-availability - So we can use complete paths for menuitems
-	# --enable-ascp - The AfterStep ControlPanel is abandoned
-
-	econf \
-		$(use_enable nls i18n) \
-		$(use_enable mmx mmx-optimization) \
-		$(use_enable xinerama) \
-		$(use_with png) \
-		$(use_with jpeg) \
-		$(use_with gif) \
-		$(use_with tiff) \
-		--with-helpcommand="xterm -e man" \
-		--with-ungif=no \
-		--disable-availability \
-		--disable-staticlibs \
-		--enable-ascp=no \
-		${myconf} || die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	# see bug #31541
-	dodir /usr/share/gnome/wm-properties
-
-	# afterstep tries to detect the current resolution
-	# for documentation generation, causing access violations
-	# for the video device.  bug #87356
-	unset DISPLAY
-
-	make DESTDIR=${D} install || die "make install failed"
-
-	# This fixes a bug with shared libraries
-	rm ${D}/usr/lib/{libAfterImage.a,libAfterBase.a}
-	cp -pPR ${S}/libAfterImage/libAfterImage.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterBase/libAfterBase.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterConf/libAfterConf.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterStep/libAfterStep.so* ${D}/usr/lib
-
-	# Create a symlink from MonitorWharf to Wharf
-	rm ${D}/usr/bin/MonitorWharf
-	dosym /usr/bin/Wharf /usr/bin/MonitorWharf
-
-	# Handle the documentation
-	dodoc COPYRIGHT ChangeLog INSTALL NEW* README* TEAM UPGRADE
-	cp -pPR ${S}/TODO ${D}/usr/share/doc/${PF}/
-	dodir /usr/share/doc/${PF}/html
-	cp -pPR ${S}/doc/* ${D}/usr/share/doc/${PF}/html
-	rm ${D}/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in}
-
-	insinto /usr/share/xsessions
-	newins ${S}/AfterStep.desktop.final AfterStep.desktop
-
-	# For desktop managers like GDM or KDE
-	exeinto /etc/X11/Sessions
-	doexe ${FILESDIR}/afterstep
-}
-
-pkg_postinst() {
-	echo
-	einfo "To use AfterStep issue the following commands:"
-	einfo "mv ~/.xinitrc ~/xinitrc.old"
-	einfo "echo afterstep > ~/.xinitrc"
-	echo
-	einfo "If you like AfterStep please vote for it at"
-	einfo "http://www.PLiG.org/xwinman/vote.html !"
-	echo
-}
diff --git a/x11-wm/afterstep/afterstep-2.2.0.ebuild b/x11-wm/afterstep/afterstep-2.2.0.ebuild
deleted file mode 100644
index d9c95f63a4eb..000000000000
--- a/x11-wm/afterstep/afterstep-2.2.0.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.0.ebuild,v 1.10 2007/07/22 06:02:57 dberkholz Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="AfterStep is a feature rich NeXTish window manager"
-HOMEPAGE="http://www.afterstep.org"
-SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2"
-
-LICENSE="AFTERSTEP"
-SLOT="0"
-KEYWORDS="~amd64 hppa ~mips ppc ppc64 sparc x86"
-IUSE="debug gif jpeg mmx nls png tiff xinerama"
-
-RDEPEND="virtual/libc
-	media-libs/freetype
-	debug? ( !hppa? ( !ppc? ( dev-util/efence ) ) )
-	png? ( >=media-libs/libpng-1.2.5 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	gif?  ( >=media-libs/giflib-4.1.0 )
-	tiff? ( >=media-libs/tiff-3.5.7 )
-	x11-libs/libICE
-	x11-libs/libXext
-	x11-libs/libSM
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXrender
-	xinerama? ( x11-libs/libXinerama )"
-
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto
-	xinerama? ( x11-proto/xineramaproto )"
-
-S="${WORKDIR}/AfterStep-${PV}"
-
-src_compile() {
-	local myconf
-
-	use debug && myconf="--enable-gdb --enable-warn --enable-gprof
-		--enable-audit --enable-trace --enable-trace-x"
-
-	if ! use ppc && use debug ; then
-		myconf="${myconf} --with-libefence"
-	fi
-
-	#implied intent of debug means you need the frame pointers.
-	use debug && filter-flags -fomit-frame-pointer
-
-	# Explanation of configure options
-	# ================================
-	# --with-helpcommand="xterm -e man" -  Avoid installing xiterm
-	# --with-xpm - Contained in xfree
-	# --with-ungif=no - Use giflib instead of libungif
-	# --disable-availability - So we can use complete paths for menuitems
-	# --enable-ascp - The AfterStep ControlPanel is abandoned
-
-	econf \
-		$(use_enable nls i18n) \
-		$(use_enable mmx mmx-optimization) \
-		$(use_enable xinerama) \
-		$(use_with png) \
-		$(use_with jpeg) \
-		$(use_with gif) \
-		$(use_with tiff) \
-		--with-helpcommand="xterm -e man" \
-		--with-ungif=no \
-		--disable-availability \
-		--disable-staticlibs \
-		--enable-ascp=no \
-		${myconf} || die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	# see bug #31541
-	dodir /usr/share/gnome/wm-properties
-
-	# afterstep tries to detect the current resolution
-	# for documentation generation, causing access violations
-	# for the video device.  bug #87356
-	unset DISPLAY
-
-	make DESTDIR=${D} install || die "make install failed"
-
-	# This fixes a bug with shared libraries
-	rm ${D}/usr/lib/{libAfterImage.a,libAfterBase.a}
-	cp -pPR ${S}/libAfterImage/libAfterImage.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterBase/libAfterBase.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterConf/libAfterConf.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterStep/libAfterStep.so* ${D}/usr/lib
-
-	# Create a symlink from MonitorWharf to Wharf
-	rm ${D}/usr/bin/MonitorWharf
-	dosym /usr/bin/Wharf /usr/bin/MonitorWharf
-
-	# Handle the documentation
-	dodoc COPYRIGHT ChangeLog INSTALL NEW* README* TEAM UPGRADE
-	cp -pPR ${S}/TODO ${D}/usr/share/doc/${PF}/
-	dodir /usr/share/doc/${PF}/html
-	cp -pPR ${S}/doc/* ${D}/usr/share/doc/${PF}/html
-	rm ${D}/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in}
-
-	insinto /usr/share/xsessions
-	newins ${S}/AfterStep.desktop.final AfterStep.desktop
-
-	# For desktop managers like GDM or KDE
-	exeinto /etc/X11/Sessions
-	doexe ${FILESDIR}/afterstep
-}
-
-pkg_postinst() {
-	echo
-	einfo "To use AfterStep issue the following commands:"
-	einfo "mv ~/.xinitrc ~/xinitrc.old"
-	einfo "echo afterstep > ~/.xinitrc"
-	echo
-	einfo "If you like AfterStep please vote for it at"
-	einfo "http://www.PLiG.org/xwinman/vote.html !"
-	echo
-}
diff --git a/x11-wm/afterstep/afterstep-2.2.1.ebuild b/x11-wm/afterstep/afterstep-2.2.1.ebuild
deleted file mode 100644
index fc7afed8fa44..000000000000
--- a/x11-wm/afterstep/afterstep-2.2.1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.1.ebuild,v 1.4 2007/07/22 06:02:57 dberkholz Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="AfterStep is a feature rich NeXTish window manager"
-HOMEPAGE="http://www.afterstep.org"
-SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2"
-
-LICENSE="AFTERSTEP"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug gif jpeg mmx nls png tiff xinerama"
-
-RDEPEND="virtual/libc
-	media-libs/freetype
-	debug? ( !hppa? ( !ppc? ( dev-util/efence ) ) )
-	png? ( >=media-libs/libpng-1.2.5 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	gif?  ( >=media-libs/giflib-4.1.0 )
-	tiff? ( >=media-libs/tiff-3.5.7 )
-	x11-libs/libICE
-	x11-libs/libXext
-	x11-libs/libSM
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXrender
-	xinerama? ( x11-libs/libXinerama )"
-
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto
-	xinerama? ( x11-proto/xineramaproto )"
-
-S="${WORKDIR}/AfterStep-${PV}"
-
-src_compile() {
-	local myconf
-
-	use debug && myconf="--enable-gdb --enable-warn --enable-gprof
-		--enable-audit --enable-trace --enable-trace-x"
-
-	if ! use ppc && use debug ; then
-		myconf="${myconf} --with-libefence"
-	fi
-
-	#implied intent of debug means you need the frame pointers.
-	use debug && filter-flags -fomit-frame-pointer
-
-	# Explanation of configure options
-	# ================================
-	# --with-helpcommand="xterm -e man" -  Avoid installing xiterm
-	# --with-xpm - Contained in xfree
-	# --with-ungif=no - Use giflib instead of libungif
-	# --disable-availability - So we can use complete paths for menuitems
-	# --enable-ascp - The AfterStep ControlPanel is abandoned
-
-	econf \
-		$(use_enable nls i18n) \
-		$(use_enable mmx mmx-optimization) \
-		$(use_enable xinerama) \
-		$(use_with png) \
-		$(use_with jpeg) \
-		$(use_with gif) \
-		$(use_with tiff) \
-		--with-helpcommand="xterm -e man" \
-		--with-ungif=no \
-		--disable-availability \
-		--disable-staticlibs \
-		--enable-ascp=no \
-		${myconf} || die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	# see bug #31541
-	dodir /usr/share/gnome/wm-properties
-
-	# afterstep tries to detect the current resolution
-	# for documentation generation, causing access violations
-	# for the video device.  bug #87356
-	unset DISPLAY
-
-	make DESTDIR=${D} install || die "make install failed"
-
-	# This fixes a bug with shared libraries
-	rm ${D}/usr/lib/{libAfterImage.a,libAfterBase.a}
-	cp -pPR ${S}/libAfterImage/libAfterImage.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterBase/libAfterBase.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterConf/libAfterConf.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterStep/libAfterStep.so* ${D}/usr/lib
-
-	# Create a symlink from MonitorWharf to Wharf
-	rm ${D}/usr/bin/MonitorWharf
-	dosym /usr/bin/Wharf /usr/bin/MonitorWharf
-
-	# Handle the documentation
-	dodoc COPYRIGHT ChangeLog INSTALL NEW* README* TEAM UPGRADE
-	cp -pPR ${S}/TODO ${D}/usr/share/doc/${PF}/
-	dodir /usr/share/doc/${PF}/html
-	cp -pPR ${S}/doc/* ${D}/usr/share/doc/${PF}/html
-	rm ${D}/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in}
-
-	insinto /usr/share/xsessions
-	newins ${S}/AfterStep.desktop.final AfterStep.desktop
-
-	# For desktop managers like GDM or KDE
-	exeinto /etc/X11/Sessions
-	doexe ${FILESDIR}/afterstep
-}
-
-pkg_postinst() {
-	echo
-	einfo "To use AfterStep issue the following commands:"
-	einfo "mv ~/.xinitrc ~/xinitrc.old"
-	einfo "echo afterstep > ~/.xinitrc"
-	echo
-	einfo "If you like AfterStep please vote for it at"
-	einfo "http://www.PLiG.org/xwinman/vote.html !"
-	echo
-}
diff --git a/x11-wm/afterstep/afterstep-2.2.2-r1.ebuild b/x11-wm/afterstep/afterstep-2.2.2-r1.ebuild
deleted file mode 100644
index 32de3db0205b..000000000000
--- a/x11-wm/afterstep/afterstep-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.2-r1.ebuild,v 1.9 2007/07/22 06:02:57 dberkholz Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="AfterStep is a feature rich NeXTish window manager"
-HOMEPAGE="http://www.afterstep.org"
-SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2"
-
-LICENSE="AFTERSTEP"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc ppc64 sparc x86"
-IUSE="debug gif jpeg mmx nls png tiff xinerama"
-
-RDEPEND="virtual/libc
-	media-libs/freetype
-	debug? ( !hppa? ( !ppc? ( dev-util/efence ) ) )
-	png? ( >=media-libs/libpng-1.2.5 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	gif?  ( >=media-libs/giflib-4.1.0 )
-	tiff? ( >=media-libs/tiff-3.5.7 )
-	x11-libs/libICE
-	x11-libs/libXext
-	x11-libs/libSM
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXrender
-	xinerama? ( x11-libs/libXinerama )"
-
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto
-	xinerama? ( x11-proto/xineramaproto )"
-
-S="${WORKDIR}/AfterStep-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/no-alternatives.patch"
-}
-
-src_compile() {
-	local myconf
-
-	use debug && myconf="--enable-gdb --enable-warn --enable-gprof
-		--enable-audit --enable-trace --enable-trace-x"
-
-	if ! use ppc && use debug ; then
-		myconf="${myconf} --with-libefence"
-	fi
-
-	#implied intent of debug means you need the frame pointers.
-	use debug && filter-flags -fomit-frame-pointer
-
-	# Explanation of configure options
-	# ================================
-	# --with-helpcommand="xterm -e man" -  Avoid installing xiterm
-	# --with-xpm - Contained in xfree
-	# --with-ungif=no - Use giflib instead of libungif
-	# --disable-availability - So we can use complete paths for menuitems
-	# --enable-ascp - The AfterStep ControlPanel is abandoned
-
-	econf \
-		$(use_enable nls i18n) \
-		$(use_enable mmx mmx-optimization) \
-		$(use_enable xinerama) \
-		$(use_with png) \
-		$(use_with jpeg) \
-		$(use_with gif) \
-		$(use_with tiff) \
-		--with-helpcommand="xterm -e man" \
-		--with-ungif=no \
-		--disable-availability \
-		--disable-staticlibs \
-		--enable-ascp=no \
-		${myconf} || die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	# see bug #31541
-	dodir /usr/share/gnome/wm-properties
-
-	# afterstep tries to detect the current resolution
-	# for documentation generation, causing access violations
-	# for the video device.  bug #87356
-	unset DISPLAY
-
-	make DESTDIR=${D} install || die "make install failed"
-
-	# This fixes a bug with shared libraries
-	rm ${D}/usr/lib/{libAfterImage.a,libAfterBase.a}
-	cp -pPR ${S}/libAfterImage/libAfterImage.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterBase/libAfterBase.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterConf/libAfterConf.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterStep/libAfterStep.so* ${D}/usr/lib
-
-	# Create a symlink from MonitorWharf to Wharf
-	rm ${D}/usr/bin/MonitorWharf
-	dosym /usr/bin/Wharf /usr/bin/MonitorWharf
-
-	# Handle the documentation
-	dodoc COPYRIGHT ChangeLog INSTALL NEW* README* TEAM UPGRADE
-	cp -pPR ${S}/TODO ${D}/usr/share/doc/${PF}/
-	dodir /usr/share/doc/${PF}/html
-	cp -pPR ${S}/doc/* ${D}/usr/share/doc/${PF}/html
-	rm ${D}/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in}
-
-	insinto /usr/share/xsessions
-	newins ${S}/AfterStep.desktop.final AfterStep.desktop
-
-	# For desktop managers like GDM or KDE
-	exeinto /etc/X11/Sessions
-	doexe ${FILESDIR}/afterstep
-}
-
-pkg_postinst() {
-	echo
-	einfo "To use AfterStep issue the following commands:"
-	einfo "mv ~/.xinitrc ~/xinitrc.old"
-	einfo "echo afterstep > ~/.xinitrc"
-	echo
-	einfo "If you like AfterStep please vote for it at"
-	einfo "http://www.PLiG.org/xwinman/vote.html !"
-	echo
-}
diff --git a/x11-wm/afterstep/afterstep-2.2.2.ebuild b/x11-wm/afterstep/afterstep-2.2.2.ebuild
deleted file mode 100644
index 9ef6f8ee899a..000000000000
--- a/x11-wm/afterstep/afterstep-2.2.2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.2.ebuild,v 1.4 2007/07/22 06:02:57 dberkholz Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="AfterStep is a feature rich NeXTish window manager"
-HOMEPAGE="http://www.afterstep.org"
-SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2"
-
-LICENSE="AFTERSTEP"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug gif jpeg mmx nls png tiff xinerama"
-
-RDEPEND="virtual/libc
-	media-libs/freetype
-	debug? ( !hppa? ( !ppc? ( dev-util/efence ) ) )
-	png? ( >=media-libs/libpng-1.2.5 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	gif?  ( >=media-libs/giflib-4.1.0 )
-	tiff? ( >=media-libs/tiff-3.5.7 )
-	x11-libs/libICE
-	x11-libs/libXext
-	x11-libs/libSM
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXrender
-	xinerama? ( x11-libs/libXinerama )"
-
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto
-	xinerama? ( x11-proto/xineramaproto )"
-
-S="${WORKDIR}/AfterStep-${PV}"
-
-src_compile() {
-	local myconf
-
-	use debug && myconf="--enable-gdb --enable-warn --enable-gprof
-		--enable-audit --enable-trace --enable-trace-x"
-
-	if ! use ppc && use debug ; then
-		myconf="${myconf} --with-libefence"
-	fi
-
-	#implied intent of debug means you need the frame pointers.
-	use debug && filter-flags -fomit-frame-pointer
-
-	# Explanation of configure options
-	# ================================
-	# --with-helpcommand="xterm -e man" -  Avoid installing xiterm
-	# --with-xpm - Contained in xfree
-	# --with-ungif=no - Use giflib instead of libungif
-	# --disable-availability - So we can use complete paths for menuitems
-	# --enable-ascp - The AfterStep ControlPanel is abandoned
-
-	econf \
-		$(use_enable nls i18n) \
-		$(use_enable mmx mmx-optimization) \
-		$(use_enable xinerama) \
-		$(use_with png) \
-		$(use_with jpeg) \
-		$(use_with gif) \
-		$(use_with tiff) \
-		--with-helpcommand="xterm -e man" \
-		--with-ungif=no \
-		--disable-availability \
-		--disable-staticlibs \
-		--enable-ascp=no \
-		${myconf} || die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	# see bug #31541
-	dodir /usr/share/gnome/wm-properties
-
-	# afterstep tries to detect the current resolution
-	# for documentation generation, causing access violations
-	# for the video device.  bug #87356
-	unset DISPLAY
-
-	make DESTDIR=${D} install || die "make install failed"
-
-	# This fixes a bug with shared libraries
-	rm ${D}/usr/lib/{libAfterImage.a,libAfterBase.a}
-	cp -pPR ${S}/libAfterImage/libAfterImage.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterBase/libAfterBase.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterConf/libAfterConf.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterStep/libAfterStep.so* ${D}/usr/lib
-
-	# Create a symlink from MonitorWharf to Wharf
-	rm ${D}/usr/bin/MonitorWharf
-	dosym /usr/bin/Wharf /usr/bin/MonitorWharf
-
-	# Handle the documentation
-	dodoc COPYRIGHT ChangeLog INSTALL NEW* README* TEAM UPGRADE
-	cp -pPR ${S}/TODO ${D}/usr/share/doc/${PF}/
-	dodir /usr/share/doc/${PF}/html
-	cp -pPR ${S}/doc/* ${D}/usr/share/doc/${PF}/html
-	rm ${D}/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in}
-
-	insinto /usr/share/xsessions
-	newins ${S}/AfterStep.desktop.final AfterStep.desktop
-
-	# For desktop managers like GDM or KDE
-	exeinto /etc/X11/Sessions
-	doexe ${FILESDIR}/afterstep
-}
-
-pkg_postinst() {
-	echo
-	einfo "To use AfterStep issue the following commands:"
-	einfo "mv ~/.xinitrc ~/xinitrc.old"
-	einfo "echo afterstep > ~/.xinitrc"
-	echo
-	einfo "If you like AfterStep please vote for it at"
-	einfo "http://www.PLiG.org/xwinman/vote.html !"
-	echo
-}
diff --git a/x11-wm/afterstep/afterstep-2.2.3.ebuild b/x11-wm/afterstep/afterstep-2.2.3.ebuild
deleted file mode 100644
index 36643fc6bcaa..000000000000
--- a/x11-wm/afterstep/afterstep-2.2.3.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.3.ebuild,v 1.9 2007/07/22 06:02:57 dberkholz Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="AfterStep is a feature rich NeXTish window manager"
-HOMEPAGE="http://www.afterstep.org"
-SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2"
-
-LICENSE="AFTERSTEP"
-SLOT="0"
-KEYWORDS="amd64 hppa ~mips ppc ppc64 sparc x86"
-IUSE="debug gif jpeg mmx nls png tiff xinerama"
-
-RDEPEND="virtual/libc
-	media-libs/freetype
-	debug? ( !hppa? ( !ppc? ( dev-util/efence ) ) )
-	png? ( >=media-libs/libpng-1.2.5 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	gif?  ( >=media-libs/giflib-4.1.0 )
-	tiff? ( >=media-libs/tiff-3.5.7 )
-	x11-libs/libICE
-	x11-libs/libXext
-	x11-libs/libSM
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXrender
-	xinerama? ( x11-libs/libXinerama )"
-
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto
-	xinerama? ( x11-proto/xineramaproto )"
-
-S="${WORKDIR}/AfterStep-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/no-alternatives.patch"
-}
-
-src_compile() {
-	local myconf
-
-	use debug && myconf="--enable-gdb --enable-warn --enable-gprof
-		--enable-audit --enable-trace --enable-trace-x"
-
-	if ! use ppc && use debug ; then
-		myconf="${myconf} --with-libefence"
-	fi
-
-	#implied intent of debug means you need the frame pointers.
-	use debug && filter-flags -fomit-frame-pointer
-
-	# Explanation of configure options
-	# ================================
-	# --with-helpcommand="xterm -e man" -  Avoid installing xiterm
-	# --with-xpm - Contained in xfree
-	# --with-ungif=no - Use giflib instead of libungif
-	# --disable-availability - So we can use complete paths for menuitems
-	# --enable-ascp - The AfterStep ControlPanel is abandoned
-
-	econf \
-		$(use_enable nls i18n) \
-		$(use_enable mmx mmx-optimization) \
-		$(use_enable xinerama) \
-		$(use_with png) \
-		$(use_with jpeg) \
-		$(use_with gif) \
-		$(use_with tiff) \
-		--with-helpcommand="xterm -e man" \
-		--with-ungif=no \
-		--disable-availability \
-		--disable-staticlibs \
-		--enable-ascp=no \
-		${myconf} || die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	# see bug #31541
-	dodir /usr/share/gnome/wm-properties
-
-	# afterstep tries to detect the current resolution
-	# for documentation generation, causing access violations
-	# for the video device.  bug #87356
-	unset DISPLAY
-
-	make DESTDIR=${D} install || die "make install failed"
-
-	# This fixes a bug with shared libraries
-	rm ${D}/usr/lib/{libAfterImage.a,libAfterBase.a}
-	cp -pPR ${S}/libAfterImage/libAfterImage.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterBase/libAfterBase.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterConf/libAfterConf.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterStep/libAfterStep.so* ${D}/usr/lib
-
-	# Create a symlink from MonitorWharf to Wharf
-	rm ${D}/usr/bin/MonitorWharf
-	dosym /usr/bin/Wharf /usr/bin/MonitorWharf
-
-	# Handle the documentation
-	dodoc COPYRIGHT ChangeLog INSTALL NEW* README* TEAM UPGRADE
-	cp -pPR ${S}/TODO ${D}/usr/share/doc/${PF}/
-	dodir /usr/share/doc/${PF}/html
-	cp -pPR ${S}/doc/* ${D}/usr/share/doc/${PF}/html
-	rm ${D}/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in}
-
-	insinto /usr/share/xsessions
-	newins ${S}/AfterStep.desktop.final AfterStep.desktop
-
-	# For desktop managers like GDM or KDE
-	exeinto /etc/X11/Sessions
-	doexe ${FILESDIR}/afterstep
-}
-
-pkg_postinst() {
-	echo
-	einfo "To use AfterStep issue the following commands:"
-	einfo "mv ~/.xinitrc ~/xinitrc.old"
-	einfo "echo afterstep > ~/.xinitrc"
-	echo
-	einfo "If you like AfterStep please vote for it at"
-	einfo "http://www.PLiG.org/xwinman/vote.html !"
-	echo
-}
diff --git a/x11-wm/afterstep/afterstep-2.2.4.ebuild b/x11-wm/afterstep/afterstep-2.2.4.ebuild
index 978c12056a38..07341265903b 100644
--- a/x11-wm/afterstep/afterstep-2.2.4.ebuild
+++ b/x11-wm/afterstep/afterstep-2.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.4.ebuild,v 1.13 2007/07/22 06:02:57 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.4.ebuild,v 1.14 2009/07/10 13:58:19 ssuominen Exp $
 
 inherit flag-o-matic eutils
 
@@ -13,9 +13,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="debug gif jpeg mmx nls png tiff xinerama"
 
-RDEPEND="virtual/libc
-	media-libs/freetype
-	debug? ( !hppa? ( !ppc? ( dev-util/efence ) ) )
+RDEPEND="media-libs/freetype
 	png? ( >=media-libs/libpng-1.2.5 )
 	jpeg? ( >=media-libs/jpeg-6b )
 	gif?  ( >=media-libs/giflib-4.1.0 )
@@ -29,18 +27,16 @@ RDEPEND="virtual/libc
 	x11-libs/libXpm
 	x11-libs/libXrender
 	xinerama? ( x11-libs/libXinerama )"
-
 DEPEND="${RDEPEND}
 	x11-proto/xextproto
 	x11-proto/xproto
 	xinerama? ( x11-proto/xineramaproto )"
 
-S="${WORKDIR}/AfterStep-${PV}"
+S=${WORKDIR}/AfterStep-${PV}
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
 	epatch "${FILESDIR}/no-alternatives.patch"
 }
 
@@ -50,10 +46,6 @@ src_compile() {
 	use debug && myconf="--enable-gdb --enable-warn --enable-gprof
 		--enable-audit --enable-trace --enable-trace-x"
 
-	if ! use ppc && use debug ; then
-		myconf="${myconf} --with-libefence"
-	fi
-
 	#implied intent of debug means you need the frame pointers.
 	use debug && filter-flags -fomit-frame-pointer
 
diff --git a/x11-wm/afterstep/files/afterstep-1.8.11-gentoo.diff b/x11-wm/afterstep/files/afterstep-1.8.11-gentoo.diff
deleted file mode 100644
index e39690ece655..000000000000
--- a/x11-wm/afterstep/files/afterstep-1.8.11-gentoo.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile.in.orig	Fri Oct 20 05:27:54 2000
-+++ Makefile.in	Thu Feb 14 14:34:03 2002
-@@ -35,24 +35,9 @@
- 	for I in ${subdirs}; do (cd $$I; ${MAKE} install.script || exit 1); done
- 
- install.data:
--	@if [ -d /usr/local/share/gnome/wm-properties ] ; then \
--	if [ -w /usr/local/share/gnome/wm-properties ] ; then \
--	echo $(CP) AfterStep.desktop /usr/local/share/gnome/wm-properties/; \
--	$(CP) AfterStep.desktop /usr/local/share/gnome/wm-properties/; \
--	else \
--	echo "/usr/local/share/gnome/wm-properties exists but is not writable."; \
--	echo "If you want AfterStep to appear in your Gnome menu, please install as root."; \
--	fi \
--	fi
--	@if [ -d /usr/share/gnome/wm-properties ] ; then \
--	if [ -w /usr/share/gnome/wm-properties ] ; then \
--	 echo $(CP) AfterStep.desktop /usr/share/gnome/wm-properties/; \
--	 $(CP) AfterStep.desktop /usr/share/gnome/wm-properties/; \
--	else \
--	echo "/usr/share/gnome/wm-properties exists but is not writable."; \
--	echo "If you want AfterStep to appear in your Gnome menu, please install as root."; \
--	fi \
--	fi
-+	mkdir -p ${DESTDIR}/usr/share/gnome/wm-properties
-+	$(CP) AfterStep.desktop ${DESTDIR}/usr/share/gnome/wm-properties/; 
-+	
- 	@if [ -d $(AFTER_SHAREDIR) ] ; then \
- 	  echo $(RMF) -r $(AFTER_SHAREDIR)_old; \
- 	  echo $(MV) $(AFTER_SHAREDIR) $(AFTER_SHAREDIR)_old; \