Broke apart some optional components from gworkspace; added gnustep-apps/desktop gnustep-apps/recycler; gnustep-apps/gwnet

6 files changed, 37 insertions, 6 deletions

diff --git a/gnustep-apps/gworkspace/ChangeLog b/gnustep-apps/gworkspace/ChangeLog
index ad6d71799526..2715ccfa7b88 100644
--- a/gnustep-apps/gworkspace/ChangeLog
+++ b/gnustep-apps/gworkspace/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnustep-apps/gworkspace
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gworkspace/ChangeLog,v 1.6 2004/10/04 23:56:22 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gworkspace/ChangeLog,v 1.7 2004/10/05 16:26:19 fafhrd Exp $
+
+*gworkspace-0.6.6_pre20040928-r2 (05 Oct 2004)
+
+  05 Oct 2004; Armando Di Cianno <fafhrd@gentoo.org>
+  +files/seperate-desktop-recycler.patch,
+  -gworkspace-0.6.6_pre20040908.ebuild,
+  +gworkspace-0.6.6_pre20040928-r2.ebuild:
+  Removed old package revision; removed desktop and recycler support (moved to
+  seperate packages)
 
 *gworkspace-0.6.6_pre20040928-r1 (04 Oct 2004)
 
diff --git a/gnustep-apps/gworkspace/Manifest b/gnustep-apps/gworkspace/Manifest
index 636c7316ba0a..06e197a4f89e 100644
--- a/gnustep-apps/gworkspace/Manifest
+++ b/gnustep-apps/gworkspace/Manifest
@@ -1,3 +1,4 @@
+MD5 97975e78a20e45d62cb176c1153313d7 gworkspace-0.6.6_pre20040928-r2.ebuild 773
 MD5 fc35533cd18704845b8a9528844d0cf4 gworkspace-0.5.3.ebuild 619
 MD5 17550668a1428fcc2a0e7bc989ac3931 gworkspace-0.6.6_pre20040928-r1.ebuild 931
 MD5 399f71cc47ffd1480fb919ba5f4aecf4 gworkspace-0.6.6_pre20040908.ebuild 652
@@ -8,3 +9,4 @@ MD5 61b8e5ab2a32b906a1376c1425c8471a files/digest-gworkspace-0.6.6_pre20040908 8
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gworkspace-0.6.6_pre20040928 0
 MD5 48cb1091fdd1df58f0a32711945b64fb files/digest-gworkspace-0.5.3 69
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gworkspace-0.6.6_pre20040928-r1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gworkspace-0.6.6_pre20040928-r2 0
diff --git a/gnustep-apps/gworkspace/files/digest-gworkspace-0.6.6_pre20040908 b/gnustep-apps/gworkspace/files/digest-gworkspace-0.6.6_pre20040908
deleted file mode 100644
index 80139d67b71a..000000000000
--- a/gnustep-apps/gworkspace/files/digest-gworkspace-0.6.6_pre20040908
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1f1f1b06b4c7b9ecafd294809b5e7e0d gworkspace-0.6.6_pre20040908.tar.gz 1537328
diff --git a/gnustep-apps/gworkspace/files/digest-gworkspace-0.6.6_pre20040928-r2 b/gnustep-apps/gworkspace/files/digest-gworkspace-0.6.6_pre20040928-r2
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/gnustep-apps/gworkspace/files/digest-gworkspace-0.6.6_pre20040928-r2
diff --git a/gnustep-apps/gworkspace/files/seperate-desktop-recycler.patch b/gnustep-apps/gworkspace/files/seperate-desktop-recycler.patch
new file mode 100644
index 000000000000..8ade945cf39c
--- /dev/null
+++ b/gnustep-apps/gworkspace/files/seperate-desktop-recycler.patch
@@ -0,0 +1,11 @@
+--- GNUmakefile.in	2004-10-05 11:21:56.029398848 -0400
++++ GNUmakefile.in	2004-10-05 11:22:16.076351248 -0400
+@@ -17,8 +17,6 @@
+ 	      			  Inspector \
+ 	      			  Operation \
+                 Finder \
+-	      			  Desktop \
+-	      			  Recycler \
+ 	      			  GWorkspace 
+ 						 
+ -include GNUmakefile.preamble
diff --git a/gnustep-apps/gworkspace/gworkspace-0.6.6_pre20040908.ebuild b/gnustep-apps/gworkspace/gworkspace-0.6.6_pre20040928-r2.ebuild
index c69795b1f5c7..f6d3b4551d6e 100644
--- a/gnustep-apps/gworkspace/gworkspace-0.6.6_pre20040908.ebuild
+++ b/gnustep-apps/gworkspace/gworkspace-0.6.6_pre20040928-r2.ebuild
@@ -1,14 +1,22 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gworkspace/gworkspace-0.6.6_pre20040908.ebuild,v 1.1 2004/09/24 01:06:48 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gworkspace/gworkspace-0.6.6_pre20040928-r2.ebuild,v 1.1 2004/10/05 16:26:19 fafhrd Exp $
 
-inherit gnustep
+ECVS_CVS_COMMAND="cvs -q"
+ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
+ECVS_USER="anoncvs"
+ECVS_AUTH="ext"
+ECVS_MODULE="gnustep/usr-apps/${PN}"
+ECVS_CO_OPTS="-D ${PV/*_pre}"
+ECVS_UP_OPTS="-D ${PV/*_pre}"
+ECVS_TOP_DIR="${DISTDIR}/cvs-src/savannah.gnu.org-gnustep"
+inherit gnustep cvs
 
-S=${WORKDIR}/${PN}
+S=${WORKDIR}/${ECVS_MODULE}
 
 DESCRIPTION="A workspace manager for GNUstep."
 HOMEPAGE="http://www.gnustep.it/enrico/gworkspace/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+
 KEYWORDS="~x86"
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,6 +29,8 @@ RDEPEND="${GS_RDEPEND}"
 src_compile() {
 	egnustep_env
 
+	EPATCH_OPTIONS="-d ${S}" epatch ${FILESDIR}/seperate-desktop-recycler.patch
+	
 	econf || die "configure failed"
 
 	egnustep_make