10 files changed, 13 insertions, 933 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/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; \