Version bump, thanks to Nathan Mahon.

(Portage version: 2.0.51-r12)

6 files changed, 164 insertions, 8 deletions

diff --git a/x11-wm/afterstep/ChangeLog b/x11-wm/afterstep/ChangeLog
index 78236f325fb5..aed8b51f0584 100644
--- a/x11-wm/afterstep/ChangeLog
+++ b/x11-wm/afterstep/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/afterstep
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.24 2004/09/24 23:40:20 fafhrd Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.25 2005/01/17 17:40:55 ka0ttic Exp $
+
+*afterstep-2.00.01 (17 Jan 2005)
+
+  17 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> metadata.xml,
+  +files/afterstep-2.00.01-fix-makefile.diff, +afterstep-2.00.01.ebuild:
+  Version bump, thanks to Nathan Mahon.
 
   24 Sep 2004; Armando Di Cianno <fafhrd@gentoo.org>
   afterstep-1.8.11-r2.ebuild:
diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
index 8b9d9c2a9598..fc41f94b4991 100644
--- a/x11-wm/afterstep/Manifest
+++ b/x11-wm/afterstep/Manifest
@@ -1,12 +1,15 @@
 MD5 31f39ddd5c436eb2a77f4db4897fe2c3 afterstep-1.8.11-r2.ebuild 1542
 MD5 0494dc2dbd95a056487d7b2335c17c71 afterstep-2.0_beta4.ebuild 3576
 MD5 1774476c1aee0200109539a94010f2a4 afterstep-2.0_beta3.ebuild 3521
-MD5 7c43100b550418ab08833f9aa9cbe449 ChangeLog 3858
-MD5 0616eb9e1cca0ddd3b72f221b6b1aa52 metadata.xml 221
+MD5 dfb026c37dd9d7fc2ed5d87daeb8e940 ChangeLog 4069
+MD5 5fcb6c5011c265ab4d4268662ee0dac9 metadata.xml 353
+MD5 56bdb29bcd3ca79b4d3a72ba44c6d894 afterstep-2.00.01.ebuild 3672
 MD5 9735d9a9bce29bcbd35792c0c4064ea0 files/digest-afterstep-1.8.11-r2 70
 MD5 2ea2a7ef9b473b186f54c6d399c05910 files/digest-afterstep-2.0_beta3 74
 MD5 82c3b0c4d9c7c8cf1460dbe184f344cd files/digest-afterstep-2.0_beta4 75
 MD5 776a43b6b57674eb3b1ec1f026707be5 files/as2-gnome-r1.diff 1802
 MD5 720723e9a9846b9d6a7e64a25b1adbbc files/afterstep 29
 MD5 7d3868b85f7325c35e5165a8c10ce77d files/afterstep-1.8.11-gentoo.diff 1321
+MD5 1e30a65a7a4daf379a4159eb28ac2d0f files/afterstep-2.00.01-fix-makefile.diff 656
+MD5 68d5b5bcaa6c2e3102dbde6b1314326e files/digest-afterstep-2.00.01 71
 MD5 9dfd9962d8a60e264920c6d4e742d74c files/as2-gnome.diff 1524
diff --git a/x11-wm/afterstep/afterstep-2.00.01.ebuild b/x11-wm/afterstep/afterstep-2.00.01.ebuild
new file mode 100644
index 000000000000..85b3cfa2a15c
--- /dev/null
+++ b/x11-wm/afterstep/afterstep-2.00.01.ebuild
@@ -0,0 +1,126 @@
+# 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.01.ebuild,v 1.1 2005/01/17 17:40:55 ka0ttic Exp $
+
+inherit 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="~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_unpack () {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-fix-makefile.diff
+}
+
+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"
+
+	# 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/afterstep-2.00.01-fix-makefile.diff b/x11-wm/afterstep/files/afterstep-2.00.01-fix-makefile.diff
new file mode 100644
index 000000000000..70c207264727
--- /dev/null
+++ b/x11-wm/afterstep/files/afterstep-2.00.01-fix-makefile.diff
@@ -0,0 +1,15 @@
+--- Makefile.in.old      2004-11-30 17:57:13.000000000 -0500
++++ Makefile.in       2004-12-04 18:48:23.260595280 -0500
+@@ -72,10 +72,8 @@
+ install.desktop: AfterStep.desktop.final
+ 	@if [ -d /usr/share/xsessions ] && [ -w /usr/share/xsessions ] ; then \
+		echo "installing AfterStep.desktop into /usr/share/xsessions/" ; \
+-		$(INSTALL_DATA)  AfterStep.desktop.final /usr/share/xsessions/AfterStep.desktop ; \
+ 	else if [ -d /etc/X11/sessions ] && [ -w /etc/X11/sessions ] ; then \
+ 		echo "installing AfterStep.desktop /etc/X11/xsessions/" ; \
+-		$(INSTALL_DATA)  AfterStep.desktop.final /etc/X11/xsessions/AfterStep.desktop ; \
+	fi; fi
+
+ install.data:
+
+
diff --git a/x11-wm/afterstep/files/digest-afterstep-2.00.01 b/x11-wm/afterstep/files/digest-afterstep-2.00.01
new file mode 100644
index 000000000000..28fa6971827e
--- /dev/null
+++ b/x11-wm/afterstep/files/digest-afterstep-2.00.01
@@ -0,0 +1 @@
+MD5 5111d0ea47f60b70ce5cba907479ea22 AfterStep-2.00.01.tar.bz2 4508159
diff --git a/x11-wm/afterstep/metadata.xml b/x11-wm/afterstep/metadata.xml
index 194b369637e4..299eaeb73cdb 100644
--- a/x11-wm/afterstep/metadata.xml
+++ b/x11-wm/afterstep/metadata.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>raker@gentoo.org</email>
-</maintainer>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>ka0ttic@gentoo.org</email>
+		<name>Aaron Walker</name>
+	</maintainer>
+	<maintainer>
+		<email>gentoo.org@vaevictus.net</email>
+		<name>Nathan Mahon</name>
+	</maintainer>
 </pkgmetadata>