Cleaned out old crusty files. Version bump in the 2.0 series. UPdated the gnome diff.

9 files changed, 52 insertions, 101 deletions

diff --git a/x11-wm/afterstep/ChangeLog b/x11-wm/afterstep/ChangeLog
index 0c3ed853d0f6..8c0f0c4e1e43 100644
--- a/x11-wm/afterstep/ChangeLog
+++ b/x11-wm/afterstep/ChangeLog
@@ -1,20 +1,26 @@
 # 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.15 2004/02/25 06:56:16 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.16 2004/03/19 01:07:58 raker Exp $
+
+*afterstep-2.0_beta4 (18 Mar 2004)
+
+  18 Mar 2004; Nick Hadaway <raker@gentoo.org> afterstep-2.0_beta4.ebuild,
+  files/as2-gnome-r1.diff:
+  Another version bump.  Updated the gnome patch.
 
 *afterstep-2.0_beta3 (25 Feb 2004)
 
-  25 Feb 2004; Nick Hadaway <raker@gentoo.org> afterstep-2.00_beta3.ebuild:
+  25 Feb 2004; Nick Hadaway <raker@gentoo.org> afterstep-2.0_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:
+  21 Oct 2003; Nick Hadaway <raker@gentoo.org> afterstep-2.0_beta2.ebuild:
   See bug #31541.  Thanks to Doug Weimer and Mike Gardiner for providing
   quick answers to a pesky little problem.
 
 *afterstep-2.0_beta2 (18 Oct 2003)
 
-  18 Oct 2003; Nick Hadaway <raker@gentoo.org> afterstep-2.00_beta2.ebuild:
+  18 Oct 2003; Nick Hadaway <raker@gentoo.org> afterstep-2.0_beta2.ebuild:
   Afterstep is almost 2.00 revisions old! :)
 
   12 Jun 2003; <msterret@gentoo.org> afterstep-1.8.11-r1.ebuild,
diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
index 58f7c37675eb..312f49ef644e 100644
--- a/x11-wm/afterstep/Manifest
+++ b/x11-wm/afterstep/Manifest
@@ -1,5 +1,6 @@
 MD5 0abdb2fbbb46308cdb8aa274214c80e2 afterstep-2.0_beta2.ebuild 3492
 MD5 683928bb2dabe34efe215c99b24e4123 afterstep-1.8.11-r2.ebuild 1566
+MD5 9219c376a5e2594a41639c2297e0eb22 afterstep-2.0_beta4.ebuild 3494
 MD5 c53873bb4da6d6bc275b66968162c15d afterstep-1.8.11-r1.ebuild 1434
 MD5 b298afabcc6701a7d8e6bf8301df7504 afterstep-2.0_beta3.ebuild 3492
 MD5 dab619c30e0ae4c12e6f3be958d99e37 ChangeLog 2763
@@ -8,6 +9,7 @@ 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 82c3b0c4d9c7c8cf1460dbe184f344cd files/digest-afterstep-2.0_beta4 75
 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
deleted file mode 100644
index 45848cafc747..000000000000
--- a/x11-wm/afterstep/afterstep-1.8.11-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.16 2004/02/25 06:56:16 raker Exp $
-
-S=${WORKDIR}/AfterStep-${PV}
-DESCRIPTION="A window manager based on the NeXTStep interface."
-SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2"
-HOMEPAGE="http://www.afterstep.org/"
-LICENSE="AFTERSTEP"
-SLOT="0"
-KEYWORDS="x86 sparc "
-IUSE="nls"
-
-DEPEND="virtual/glibc virtual/x11
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.2.1
-	x11-wm/gnustep-env"
-
-RDEPEND="${DEPEND}
-	 >=media-sound/sox-12.17.1"
-
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p0 < ${FILESDIR}/${P}-gentoo.diff
-}
-
-src_compile() {
-	local myconf
-	use nls && myconf="${myconf} --enable-i18n"
-
-	econf \
-		--libdir=/usr/lib \
-		--sysconfdir=/etc/X11 \
-		--with-helpcommand="xterm -e man" \
-		--disable-availability \
-		--disable-staticlibs \
-		--with-xpm \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} \
-	     GNUSTEP_LOCAL_ROOT=${D}${GNUSTEP_LOCAL_ROOT} \
-	     install || die
-
-	rm -f ${D}/usr/bin/sessreg
-
-	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*
-
-	exeinto /etc/X11/Sessions
-	doexe ${FILESDIR}/afterstep
-}
diff --git a/x11-wm/afterstep/afterstep-2.0_beta2.ebuild b/x11-wm/afterstep/afterstep-2.0_beta4.ebuild
index c273366a021c..a774c447e179 100644
--- a/x11-wm/afterstep/afterstep-2.0_beta2.ebuild
+++ b/x11-wm/afterstep/afterstep-2.0_beta4.ebuild
@@ -1,12 +1,12 @@
 # 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.3 2004/02/25 06:56:16 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.0_beta4.ebuild,v 1.1 2004/03/19 01:07:58 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.beta2.tar.bz2"
+SRC_URI="ftp://ftp.afterstep.org/devel/AfterStep-2.00.beta4b.tar.bz2"
 
 LICENSE="AFTERSTEP"
 SLOT="0"
@@ -22,13 +22,14 @@ DEPEND="virtual/glibc
 RDEPEND="${DEPEND}
 	>=media-sound/sox-12.17.3"
 
-S="${WORKDIR}/AfterStep-2.00.beta2"
+S="${WORKDIR}/AfterStep-2.00.beta4b"
 
 src_unpack () {
 	unpack ${A}
 	cd ${S}
 	# see bug #31541
-	epatch ${FILESDIR}/as2-gnome.diff
+	# updated to -r1 for beta4 - raker@gentoo.org
+	epatch ${FILESDIR}/as2-gnome-r1.diff
 }
 
 src_compile() {
diff --git a/x11-wm/afterstep/files/afterstep-1.8.10-gentoo.diff b/x11-wm/afterstep/files/afterstep-1.8.10-gentoo.diff
deleted file mode 100644
index e39690ece655..000000000000
--- a/x11-wm/afterstep/files/afterstep-1.8.10-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; \
diff --git a/x11-wm/afterstep/files/as2-gnome-r1.diff b/x11-wm/afterstep/files/as2-gnome-r1.diff
new file mode 100644
index 000000000000..57dc09d18e50
--- /dev/null
+++ b/x11-wm/afterstep/files/as2-gnome-r1.diff
@@ -0,0 +1,34 @@
+diff -urN AfterStep-2.00.beta4b/Makefile.in AfterStep-2.00.beta4b-modified/Makefile.in
+--- AfterStep-2.00.beta4b/Makefile.in	2004-03-05 14:19:54.000000000 -0600
++++ AfterStep-2.00.beta4b-modified/Makefile.in	2004-03-18 19:01:20.807818448 -0600
+@@ -66,12 +66,13 @@
+ 	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/; \
++	@if [ -d $(GNOME_SHAREDIR)/wm-properties ] ; then \
++	if [ -w $(GNOME_SHAREDIR)/wm-properties ] ; then \
++	 echo $(CP) AfterStep.desktop $(GNOME_SHAREDESTDIR)/wm-properties/; \
++	$(MKDIR) -p $(GNOME_SHAREDESTDIR)/wm-properties; \
++	$(CP) AfterStep.desktop $(GNOME_SHAREDESTDIR)/wm-properties/; \
+ 	else \
+-	echo "/usr/share/gnome/wm-properties exists but is not writable."; \
++	echo "$(GNOME_SHAREDIR)/wm-properties exists but is not writable."; \
+ 	echo "If you want AfterStep to appear in your Gnome menu, please install as root."; \
+ 	fi \
+ 	fi
+diff -urN AfterStep-2.00.beta4b/autoconf/Makefile.defines.in AfterStep-2.00.beta4b-modified/autoconf/Makefile.defines.in
+--- AfterStep-2.00.beta4b/autoconf/Makefile.defines.in	2004-03-05 14:19:52.000000000 -0600
++++ AfterStep-2.00.beta4b-modified/autoconf/Makefile.defines.in	2004-03-18 18:59:38.244410456 -0600
+@@ -54,6 +54,8 @@
+ AFTER_BIN_DIR	= $(DESTDIR)@bindir@
+ AFTER_MAN_DIR	= $(DESTDIR)@mandir@/man1
+ AFTER_SHAREDIR	= $(DESTDIR)@datadir@/afterstep
++GNOME_SHAREDIR	= @datadir@/gnome
++GNOME_SHAREDESTDIR = $(DESTDIR)$(GNOME_SHAREDIR)
+ AFTER_DOC_DIR	= $(AFTER_SHAREDIR)/doc
+ AFTER_DIR	= @with_afterdir@
+ AFTER_SAVE	= @with_afterdir@/.workspace_state
diff --git a/x11-wm/afterstep/files/digest-afterstep-1.8.11-r1 b/x11-wm/afterstep/files/digest-afterstep-1.8.11-r1
deleted file mode 100644
index 4bbf31502daa..000000000000
--- a/x11-wm/afterstep/files/digest-afterstep-1.8.11-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d8b41b7a642105b4cafc4d3d5f12a46 AfterStep-1.8.11.tar.bz2 1162212
diff --git a/x11-wm/afterstep/files/digest-afterstep-2.0_beta2 b/x11-wm/afterstep/files/digest-afterstep-2.0_beta2
deleted file mode 100644
index 59cab41cee6b..000000000000
--- a/x11-wm/afterstep/files/digest-afterstep-2.0_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9ce007eb2281840b5473e1155d531fcd AfterStep-2.00.beta2.tar.bz2 4166714
diff --git a/x11-wm/afterstep/files/digest-afterstep-2.0_beta4 b/x11-wm/afterstep/files/digest-afterstep-2.0_beta4
new file mode 100644
index 000000000000..08763aa38d61
--- /dev/null
+++ b/x11-wm/afterstep/files/digest-afterstep-2.0_beta4
@@ -0,0 +1 @@
+MD5 3a83d7630dbdde085799bf98e2fa0530 AfterStep-2.00.beta4b.tar.bz2 4384504