Version bump; marked 2.00.02 stable on x86.

(Portage version: 2.0.51.19)

5 files changed, 146 insertions, 19 deletions

diff --git a/x11-wm/afterstep/ChangeLog b/x11-wm/afterstep/ChangeLog
index d137a6264e2b..f7a94b7b4e3c 100644
--- a/x11-wm/afterstep/ChangeLog
+++ b/x11-wm/afterstep/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/afterstep
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.29 2005/02/15 12:52:15 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.30 2005/03/30 17:06:16 ka0ttic Exp $
+
+*afterstep-2.00.04 (30 Mar 2005)
+
+  30 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> afterstep-2.00.02.ebuild,
+  +afterstep-2.00.04.ebuild:
+  Version bump; marked 2.00.02 stable on x86.
 
   15 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   afterstep-2.00.01.ebuild:
diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
index 2eb09b820dbb..b9e7fb18de41 100644
--- a/x11-wm/afterstep/Manifest
+++ b/x11-wm/afterstep/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 605d38475ce8bfd4f17c9b91345aabb1 ChangeLog 4532
 MD5 61ac082c6563be2e5790a287988a4674 afterstep-1.8.11-r2.ebuild 1543
-MD5 fca9d0ef8f9ab0142654d2cf85544310 afterstep-2.00.01.ebuild 3673
+MD5 8a775d81172ac4dc1c90f5ec55eeecca afterstep-2.00.02.ebuild 3685
+MD5 03afe91d1c9dbcdc5732de526776d0d3 afterstep-2.00.04.ebuild 3686
+MD5 66b0c59052b6b74d80850dce6b0902e8 ChangeLog 4717
 MD5 5fcb6c5011c265ab4d4268662ee0dac9 metadata.xml 353
-MD5 41c106073cf5c6195702e63927ce11bc afterstep-2.00.02.ebuild 3574
+MD5 fca9d0ef8f9ab0142654d2cf85544310 afterstep-2.00.01.ebuild 3673
+MD5 9735d9a9bce29bcbd35792c0c4064ea0 files/digest-afterstep-1.8.11-r2 70
+MD5 776a43b6b57674eb3b1ec1f026707be5 files/as2-gnome-r1.diff 1802
 MD5 720723e9a9846b9d6a7e64a25b1adbbc files/afterstep 29
 MD5 7d3868b85f7325c35e5165a8c10ce77d files/afterstep-1.8.11-gentoo.diff 1321
-MD5 776a43b6b57674eb3b1ec1f026707be5 files/as2-gnome-r1.diff 1802
-MD5 9dfd9962d8a60e264920c6d4e742d74c files/as2-gnome.diff 1524
-MD5 9735d9a9bce29bcbd35792c0c4064ea0 files/digest-afterstep-1.8.11-r2 70
 MD5 1e30a65a7a4daf379a4159eb28ac2d0f files/afterstep-2.00.01-fix-makefile.diff 656
 MD5 68d5b5bcaa6c2e3102dbde6b1314326e files/digest-afterstep-2.00.01 71
 MD5 ddd133fa16578493d349b8cdaa531986 files/digest-afterstep-2.00.02 71
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCEfCJKRy60XGEcJIRAhZiAJ4mZYBSuu0FPvvj81t2XRn8EpFjQgCfVuGp
-H5VyBT4h4Hjw4DHwqg9dKr4=
-=VB6w
------END PGP SIGNATURE-----
+MD5 3b881a3589ee178d1ae956067a4ff6d0 files/digest-afterstep-2.00.04 71
+MD5 9dfd9962d8a60e264920c6d4e742d74c files/as2-gnome.diff 1524
diff --git a/x11-wm/afterstep/afterstep-2.00.02.ebuild b/x11-wm/afterstep/afterstep-2.00.02.ebuild
index d85d06a73458..06a6980e9ee9 100644
--- a/x11-wm/afterstep/afterstep-2.00.02.ebuild
+++ b/x11-wm/afterstep/afterstep-2.00.02.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.00.02.ebuild,v 1.1 2005/01/21 00:54:14 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.00.02.ebuild,v 1.2 2005/03/30 17:06:16 ka0ttic Exp $
 
 DESCRIPTION="AfterStep is a feature rich NeXTish window manager"
 HOMEPAGE="http://www.afterstep.org"
@@ -8,7 +8,7 @@ SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2"
 
 LICENSE="AFTERSTEP"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc"
 IUSE="debug gif jpeg mmx nls png tiff truetype xinerama"
 
 DEPEND="virtual/libc
@@ -51,6 +51,11 @@ src_compile() {
 
 	use !ppc && use debug && myconf="${myconf} --with-libefence"
 
+
+	#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
diff --git a/x11-wm/afterstep/afterstep-2.00.04.ebuild b/x11-wm/afterstep/afterstep-2.00.04.ebuild
new file mode 100644
index 000000000000..e23582ee3aa9
--- /dev/null
+++ b/x11-wm/afterstep/afterstep-2.00.04.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.00.04.ebuild,v 1.1 2005/03/30 17:06:16 ka0ttic Exp $
+
+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="~x86 ~ppc ~sparc"
+IUSE="debug gif jpeg mmx nls png tiff truetype xinerama"
+
+DEPEND="virtual/libc
+	virtual/x11
+	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 )"
+
+S="${WORKDIR}/AfterStep-${PV}"
+
+src_compile() {
+	local myconf
+
+	use nls && myconf="--enable-i18n" \
+		|| myconf="--enable-i18n=no"
+
+	use png && myconf="${myconf} --with-png" \
+		|| myconf="${myconf} --with-png=no"
+
+	use jpeg && myconf="${myconf} --with-jpeg" \
+		|| myconf="${myconf} --with-jpeg=no"
+
+	use gif && myconf="${myconf} --with-gif" \
+		|| myconf="${myconf} --with-gif=no"
+
+	use tiff && myconf="${myconf} --with-tiff" \
+		|| myconf="${myconf} --with-tiff=no"
+
+	use truetype && myconf="${myconf} --with-ttf --enable-reuse-font=no" \
+		|| myconf="${myconf} --with-ttf=no"
+
+	use xinerama && myconf="${myconf} --enable-xinerama" \
+		|| myconf="${myconf} --enable-xinerama=no"
+
+	use mmx && myconf="${myconf} --enable-mmx-optimization" \
+		|| myconf="${myconf} --enable-mmx-optimization=no"
+
+	use debug && myconf="${myconf} --enable-gdb --enable-warn --enable-gprof --enable-audit --enable-trace --enable-trace-x"
+
+	use !ppc && use debug && myconf="${myconf} --with-libefence"
+
+
+	#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 \
+		--with-helpcommand="xterm -e man" \
+		--with-xpm \
+		--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
+
+	make DESTDIR=${D} install || die "make install failed"
+
+	# This fixes a bug with shared libraries
+	rm ${D}/usr/lib/{libAfterImage.a,libAfterBase.a}
+	cp -a ${S}/libAfterImage/libAfterImage.so* ${D}/usr/lib
+	cp -a ${S}/libAfterBase/libAfterBase.so* ${D}/usr/lib
+	cp -a ${S}/libAfterConf/libAfterConf.so* ${D}/usr/lib
+	cp -a ${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 -a ${S}/TODO ${D}/usr/share/doc/${PF}/
+	dodir /usr/share/doc/${PF}/html
+	cp -a ${S}/doc/* ${D}/usr/share/doc/${PF}/html
+	rm ${D}/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in}
+
+	dodir /usr/share/xsessions
+	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/files/digest-afterstep-2.00.04 b/x11-wm/afterstep/files/digest-afterstep-2.00.04
new file mode 100644
index 000000000000..a69e39b644c8
--- /dev/null
+++ b/x11-wm/afterstep/files/digest-afterstep-2.00.04
@@ -0,0 +1 @@
+MD5 5b1459a9c8f06100d0c1c0002aa3399c AfterStep-2.00.04.tar.bz2 4710344