See bug #42029. No major ebuild changes. Also fixed copyright year.

8 files changed, 145 insertions, 7 deletions

diff --git a/x11-wm/afterstep/ChangeLog b/x11-wm/afterstep/ChangeLog
index ef277611c0c3..0c3ed853d0f6 100644
--- a/x11-wm/afterstep/ChangeLog
+++ b/x11-wm/afterstep/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/afterstep
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.14 2003/10/21 09:59:04 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.15 2004/02/25 06:56:16 raker Exp $
+
+*afterstep-2.0_beta3 (25 Feb 2004)
+
+  25 Feb 2004; Nick Hadaway <raker@gentoo.org> afterstep-2.00_beta3.ebuild:
+  Version bump.  Stability changes.  No significant ebuild changes.
+  See bug #42029.
 
   21 Oct 2003; Nick Hadaway <raker@gentoo.org> afterstep-2.00_beta2.ebuild:
   See bug #31541.  Thanks to Doug Weimer and Mike Gardiner for providing
diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
index 7d58a342d508..21fcc9ab7ff2 100644
--- a/x11-wm/afterstep/Manifest
+++ b/x11-wm/afterstep/Manifest
@@ -1,10 +1,12 @@
 MD5 9de9a95844ac45af0aae3f26169d7111 afterstep-2.0_beta2.ebuild 3492
 MD5 a32908f7e2101611a17ddb1aad85cf11 afterstep-1.8.11-r2.ebuild 1569
 MD5 98d3f2ff8a9e176c8a6e12867bd25e36 afterstep-1.8.11-r1.ebuild 1437
+MD5 ad0441a235f4997ae1f199c075820bdc afterstep-2.0_beta3.ebuild 3492
 MD5 03e738266245843d6a304425d87ab568 ChangeLog 2564
 MD5 9735d9a9bce29bcbd35792c0c4064ea0 files/digest-afterstep-1.8.11-r1 70
 MD5 9735d9a9bce29bcbd35792c0c4064ea0 files/digest-afterstep-1.8.11-r2 70
 MD5 f91d4b766b1c70d8c899ab9ffa55f7c2 files/digest-afterstep-2.0_beta2 74
+MD5 2ea2a7ef9b473b186f54c6d399c05910 files/digest-afterstep-2.0_beta3 74
 MD5 7d3868b85f7325c35e5165a8c10ce77d files/afterstep-1.8.10-gentoo.diff 1321
 MD5 720723e9a9846b9d6a7e64a25b1adbbc files/afterstep 29
 MD5 7d3868b85f7325c35e5165a8c10ce77d files/afterstep-1.8.11-gentoo.diff 1321
diff --git a/x11-wm/afterstep/afterstep-1.8.11-r1.ebuild b/x11-wm/afterstep/afterstep-1.8.11-r1.ebuild
index 21f811f805b8..45848cafc747 100644
--- a/x11-wm/afterstep/afterstep-1.8.11-r1.ebuild
+++ b/x11-wm/afterstep/afterstep-1.8.11-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-1.8.11-r1.ebuild,v 1.15 2003/09/06 04:16:43 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-1.8.11-r1.ebuild,v 1.16 2004/02/25 06:56:16 raker Exp $
 
 S=${WORKDIR}/AfterStep-${PV}
 DESCRIPTION="A window manager based on the NeXTStep interface."
diff --git a/x11-wm/afterstep/afterstep-1.8.11-r2.ebuild b/x11-wm/afterstep/afterstep-1.8.11-r2.ebuild
index 954f44a11c4a..115e95ec402f 100644
--- a/x11-wm/afterstep/afterstep-1.8.11-r2.ebuild
+++ b/x11-wm/afterstep/afterstep-1.8.11-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-1.8.11-r2.ebuild,v 1.14 2003/09/06 04:16:43 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-1.8.11-r2.ebuild,v 1.15 2004/02/25 06:56:16 raker Exp $
 
 S=${WORKDIR}/AfterStep-${PV}
 DESCRIPTION="A window manager based on the NeXTStep interface."
diff --git a/x11-wm/afterstep/afterstep-2.0_beta2.ebuild b/x11-wm/afterstep/afterstep-2.0_beta2.ebuild
index dc206c47093a..c273366a021c 100644
--- a/x11-wm/afterstep/afterstep-2.0_beta2.ebuild
+++ b/x11-wm/afterstep/afterstep-2.0_beta2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.0_beta2.ebuild,v 1.2 2003/10/21 09:59:04 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.0_beta2.ebuild,v 1.3 2004/02/25 06:56:16 raker Exp $
 
 IUSE="png jpeg gif tiff truetype xinerama debug mmx"
 
diff --git a/x11-wm/afterstep/afterstep-2.0_beta3.ebuild b/x11-wm/afterstep/afterstep-2.0_beta3.ebuild
new file mode 100644
index 000000000000..c1c7390d8c18
--- /dev/null
+++ b/x11-wm/afterstep/afterstep-2.0_beta3.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.0_beta3.ebuild,v 1.1 2004/02/25 06:56:16 raker Exp $
+
+IUSE="png jpeg gif tiff truetype xinerama debug mmx"
+
+DESCRIPTION="Window manager based on the look and feel of the NeXTStep"
+HOMEPAGE="http://www.afterstep.org"
+SRC_URI="ftp://ftp.afterstep.org/devel/AfterStep-2.00.beta3.tar.bz2"
+
+LICENSE="AFTERSTEP"
+SLOT="0"
+KEYWORDS="~x86"
+
+DEPEND="virtual/glibc
+	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 )
+	debug? ( >=dev-util/efence-2.2.2 )"
+RDEPEND="${DEPEND}
+	>=media-sound/sox-12.17.3"
+
+S="${WORKDIR}/AfterStep-2.00.beta3"
+
+src_unpack () {
+	unpack ${A}
+	cd ${S}
+	# see bug #31541
+	epatch ${FILESDIR}/as2-gnome.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} --with-libefence --enable-gdb --enable-warn --enable-gprof --enable-audit --enable-trace --enable-trace-x"
+
+	# 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
+
+	# 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}
+
+	# 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.0_beta3 b/x11-wm/afterstep/files/digest-afterstep-2.0_beta3
new file mode 100644
index 000000000000..6b9179cc966c
--- /dev/null
+++ b/x11-wm/afterstep/files/digest-afterstep-2.0_beta3
@@ -0,0 +1 @@
+MD5 57d350faab8f2513417212736465b546 AfterStep-2.00.beta3.tar.bz2 4258336
diff --git a/x11-wm/afterstep/metadata.xml b/x11-wm/afterstep/metadata.xml
new file mode 100644
index 000000000000..194b369637e4
--- /dev/null
+++ b/x11-wm/afterstep/metadata.xml
@@ -0,0 +1,8 @@
+<?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>
+</pkgmetadata>