Mass Update: gnustep.eclass revamped to allow configurable root install; gnustep-base/libs/apps updated to utilize new gnustep.eclass (only versions bumped where files would change); some KEYWORDS were accidentally dropped between version bumps of packages -- this has been resolved; windowmaker correctly supports gnustep now; gnustep-funcs.eclass added -- used where info on an installed gnustep-env is needed rather than making a full GNUstep application

21 files changed, 45 insertions, 360 deletions

diff --git a/gnustep-base/gnustep-gui/ChangeLog b/gnustep-base/gnustep-gui/ChangeLog
index 0c3b774a0112..426cd074446f 100644
--- a/gnustep-base/gnustep-gui/ChangeLog
+++ b/gnustep-base/gnustep-gui/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for gnustep-base/gnustep-gui
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/ChangeLog,v 1.15 2004/11/02 17:31:00 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/ChangeLog,v 1.16 2004/11/12 03:47:43 fafhrd Exp $
+
+*gnustep-gui-0.9.5_pre20041030-r1 (11 Nov 2004)
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org>
+  -gnustep-gui-0.7.9.ebuild, -gnustep-gui-0.8.0.ebuild,
+  -gnustep-gui-0.8.3.ebuild, -gnustep-gui-0.8.5-r1.ebuild,
+  -gnustep-gui-0.8.5.ebuild, -gnustep-gui-0.8.7.ebuild,
+  -gnustep-gui-0.8.8.ebuild, gnustep-gui-0.9.4.ebuild,
+  -gnustep-gui-0.9.5_pre20040928.ebuild,
+  +gnustep-gui-0.9.5_pre20041030-r1.ebuild,
+  -gnustep-gui-0.9.5_pre20041030.ebuild:
+  Mass Update: gnustep.eclass revamped to allow configurable root install;
+  gnustep-base/libs/apps updated to utilize new gnustep.eclass (only versions
+  bumped where files would change); some KEYWORDS were accidentally dropped
+  between version bumps of packages -- this has been resolved; windowmaker
+  correctly supports gnustep now
 
   02 Nov 2004; Simon Stelling <blubb@gentoo.org> gnustep-gui-0.9.4.ebuild:
   added ~amd64
diff --git a/gnustep-base/gnustep-gui/Manifest b/gnustep-base/gnustep-gui/Manifest
index 3a319a1e0725..ef2c9433c363 100644
--- a/gnustep-base/gnustep-gui/Manifest
+++ b/gnustep-base/gnustep-gui/Manifest
@@ -1,23 +1,7 @@
-MD5 19bd40822e382e7850b16c54932902ec ChangeLog 4705
-MD5 ec2a075a4a96dd9d782e868467c96986 gnustep-gui-0.7.9.ebuild 1033
-MD5 6116d8408ca55f6d4a520b0e5a83619d gnustep-gui-0.8.0.ebuild 1033
-MD5 e14e1639b26da4acf77a9eab4ad5e320 gnustep-gui-0.8.3.ebuild 1070
-MD5 be917ba7298ba3bd936d874774de0a7d gnustep-gui-0.8.5-r1.ebuild 798
-MD5 ec1df9161d8f1382a12157b4670a1981 gnustep-gui-0.8.5.ebuild 1070
-MD5 a99822a371283fd3dd2abd1563b08c76 gnustep-gui-0.8.7.ebuild 799
-MD5 09a9062f1abe9c3eaf5154f262af8bef gnustep-gui-0.8.8.ebuild 805
-MD5 22eca2682c530406e7ef3db5c4b9a377 gnustep-gui-0.9.4.ebuild 1450
-MD5 b4fa3c584cd67bf3a0fee04a962701a0 gnustep-gui-0.9.5_pre20040928.ebuild 1757
-MD5 1f56d7ed70faa44496c3907530b0eee3 gnustep-gui-0.9.5_pre20041030.ebuild 1734
+MD5 f9ef752c788f79af90ede7c1870321ce gnustep-gui-0.9.5_pre20041030-r1.ebuild 1503
+MD5 392022073a363b6bee518357a8829d7a ChangeLog 5497
 MD5 649db105cbe2e9ffcca068143f88926f metadata.xml 1355
-MD5 6511d4ca362a94c774358fa192e6db0b files/digest-gnustep-gui-0.7.9 70
-MD5 5baad5af49b8264c69ed660df9f0c066 files/digest-gnustep-gui-0.8.0 70
-MD5 1f422b6764274b25f0b97d452edf5855 files/digest-gnustep-gui-0.8.3 70
-MD5 82f2e76d38bbd5e31455ac00bd902b50 files/digest-gnustep-gui-0.8.5 70
-MD5 82f2e76d38bbd5e31455ac00bd902b50 files/digest-gnustep-gui-0.8.5-r1 70
-MD5 a93088148fffb768eca1d4861ee881e8 files/digest-gnustep-gui-0.8.7 70
-MD5 5271d70faa156ae988c1bbb1146348fd files/digest-gnustep-gui-0.8.8 70
-MD5 c6c9275a80b7fc7af0686d0875489069 files/digest-gnustep-gui-0.9.4 70
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-gui-0.9.5_pre20040928 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-gui-0.9.5_pre20041030 0
+MD5 169b853edc8b696f8663bed970f1ad01 gnustep-gui-0.9.4.ebuild 1338
 MD5 6f66904f0ad8d980c653d5c0fdf7d81b files/gnustep-gui-0.9.4-camaelon.patch 4029
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-gui-0.9.5_pre20041030-r1 0
+MD5 c6c9275a80b7fc7af0686d0875489069 files/digest-gnustep-gui-0.9.4 70
diff --git a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.7.9 b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.7.9
deleted file mode 100644
index 9dffdd380284..000000000000
--- a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.7.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fd9da66b9323227a04c8097d0346b985 gnustep-gui-0.7.9.tar.gz 1890883
diff --git a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.8.0 b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.8.0
deleted file mode 100644
index ca94121f6515..000000000000
--- a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b031634efa8c75a38e45eff7056f3b2a gnustep-gui-0.8.0.tar.gz 1892916
diff --git a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.8.3 b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.8.3
deleted file mode 100644
index 4c8a673e3247..000000000000
--- a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.8.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4d84f35eaee651e1a8edc883cd098ba2 gnustep-gui-0.8.3.tar.gz 2070740
diff --git a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.8.5 b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.8.5
deleted file mode 100644
index 44be7233fa76..000000000000
--- a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.8.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ddaf662db31a4e6b382499548e9efcf4 gnustep-gui-0.8.5.tar.gz 2113216
diff --git a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.8.5-r1 b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.8.5-r1
deleted file mode 100644
index 44be7233fa76..000000000000
--- a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.8.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ddaf662db31a4e6b382499548e9efcf4 gnustep-gui-0.8.5.tar.gz 2113216
diff --git a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.8.7 b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.8.7
deleted file mode 100644
index 58a6b3d06e95..000000000000
--- a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.8.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a3da917a6ac77917ddfaddf356a8a469 gnustep-gui-0.8.7.tar.gz 2164898
diff --git a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.8.8 b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.8.8
deleted file mode 100644
index 1946a644e363..000000000000
--- a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.8.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cf555e09fb1074a74e850ccfc5c6652b gnustep-gui-0.8.8.tar.gz 2187548
diff --git a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20041030 b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20041030
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20041030
+++ /dev/null
diff --git a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20040928 b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20041030-r1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20040928
+++ b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20041030-r1
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.7.9.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.7.9.ebuild
deleted file mode 100644
index 58b69183c1c6..000000000000
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.7.9.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.7.9.ebuild,v 1.2 2004/07/23 15:00:58 fafhrd Exp $
-
-DESCRIPTION="GNUstep AppKit implementation"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 -ppc -sparc "
-IUSE=""
-DEPEND=">=gnustep-base/gnustep-base-1.3.4
-	>=media-libs/tiff-3.5.7
-	>=media-libs/jpeg-6b-r2"
-
-src_compile() {
-
-	. /usr/GNUstep/System/Makefiles/GNUstep.sh
-
-	./configure --prefix=/usr/GNUstep \
-		--with-jpeg-library=/usr/lib \
-		--with-jpeg-include=/usr/include \
-		--with-tiff-library=/usr/lib \
-		--with-tiff-include=/usr/include \
-		|| die "configure failed"
-
-	make LD_LIBRARY_PATH=$LD_LIBRARY_PATH || die
-}
-
-src_install () {
-
-	. /usr/GNUstep/System/Makefiles/GNUstep.sh
-
-	make \
-		GNUSTEP_INSTALLATION_DIR=${D}/usr/GNUstep/System \
-		INSTALL_ROOT_DIR=${D} \
-		install || die "install failed"
-
-}
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.8.0.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.8.0.ebuild
deleted file mode 100644
index c77fc7893ddd..000000000000
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.8.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.8.0.ebuild,v 1.2 2004/07/23 15:00:58 fafhrd Exp $
-
-DESCRIPTION="GNUstep AppKit implementation"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 -ppc -sparc "
-IUSE=""
-DEPEND=">=gnustep-base/gnustep-base-1.4.0
-	>=media-libs/tiff-3.5.7
-	>=media-libs/jpeg-6b-r2"
-
-src_compile() {
-
-	. /usr/GNUstep/System/Makefiles/GNUstep.sh
-
-	./configure --prefix=/usr/GNUstep \
-		--with-jpeg-library=/usr/lib \
-		--with-jpeg-include=/usr/include \
-		--with-tiff-library=/usr/lib \
-		--with-tiff-include=/usr/include \
-		|| die "configure failed"
-
-	make LD_LIBRARY_PATH=$LD_LIBRARY_PATH || die
-}
-
-src_install () {
-
-	. /usr/GNUstep/System/Makefiles/GNUstep.sh
-
-	make \
-		GNUSTEP_INSTALLATION_DIR=${D}/usr/GNUstep/System \
-		INSTALL_ROOT_DIR=${D} \
-		install || die "install failed"
-
-}
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.8.3.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.8.3.ebuild
deleted file mode 100644
index c19ff3c75c6f..000000000000
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.8.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.8.3.ebuild,v 1.2 2004/07/23 15:00:58 fafhrd Exp $
-
-DESCRIPTION="GNUstep AppKit implementation"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 -ppc -sparc"
-IUSE=""
-DEPEND=">=gnustep-base/gnustep-base-1.5.1
-	>=media-libs/tiff-3.5.7
-	>=media-libs/jpeg-6b-r2"
-PDEPEND=">=gnustep-base/gnustep-back-${PV}"
-
-src_compile() {
-	. /usr/GNUstep/System/Makefiles/GNUstep.sh
-	./configure --prefix=/usr/GNUstep \
-		--with-jpeg-library=/usr/lib \
-		--with-jpeg-include=/usr/include \
-		--with-tiff-library=/usr/lib \
-		--with-tiff-include=/usr/include \
-		|| die "configure failed"
-	make LD_LIBRARY_PATH=$LD_LIBRARY_PATH || die
-}
-
-src_install () {
-	. /usr/GNUstep/System/Makefiles/GNUstep.sh
-	make \
-		GNUSTEP_INSTALLATION_DIR=${D}/usr/GNUstep/System \
-		INSTALL_ROOT_DIR=${D} \
-		install || die "install failed"
-}
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.8.5-r1.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.8.5-r1.ebuild
deleted file mode 100644
index 42109e3bc97e..000000000000
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.8.5-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.8.5-r1.ebuild,v 1.2 2004/07/23 15:00:58 fafhrd Exp $
-
-inherit gnustep-old
-
-DESCRIPTION="GNUstep AppKit implementation"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 -ppc -sparc"
-IUSE=""
-DEPEND=">=gnustep-base/gnustep-base-1.6.0
-	>=media-libs/tiff-3.5.7
-	>=media-libs/jpeg-6b-r2"
-PDEPEND="=gnustep-base/gnustep-back-${PV}*"
-
-src_compile() {
-	egnustepmake \
-		--with-jpeg-library=/usr/lib \
-		--with-jpeg-include=/usr/include \
-		--with-tiff-library=/usr/lib \
-		--with-tiff-include=/usr/include \
-		|| die "configure failed"
-}
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.8.5.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.8.5.ebuild
deleted file mode 100644
index c7c56a17fa4f..000000000000
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.8.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.8.5.ebuild,v 1.2 2004/07/23 15:00:58 fafhrd Exp $
-
-DESCRIPTION="GNUstep AppKit implementation"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 -ppc -sparc"
-IUSE=""
-DEPEND=">=gnustep-base/gnustep-base-1.5.1
-	>=media-libs/tiff-3.5.7
-	>=media-libs/jpeg-6b-r2"
-PDEPEND=">=gnustep-base/gnustep-back-${PV}"
-
-src_compile() {
-	. /usr/GNUstep/System/Makefiles/GNUstep.sh
-	./configure --prefix=/usr/GNUstep \
-		--with-jpeg-library=/usr/lib \
-		--with-jpeg-include=/usr/include \
-		--with-tiff-library=/usr/lib \
-		--with-tiff-include=/usr/include \
-		|| die "configure failed"
-	make LD_LIBRARY_PATH=$LD_LIBRARY_PATH || die
-}
-
-src_install () {
-	. /usr/GNUstep/System/Makefiles/GNUstep.sh
-	make \
-		GNUSTEP_INSTALLATION_DIR=${D}/usr/GNUstep/System \
-		INSTALL_ROOT_DIR=${D} \
-		install || die "install failed"
-}
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.8.7.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.8.7.ebuild
deleted file mode 100644
index bde24526df1a..000000000000
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.8.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.8.7.ebuild,v 1.2 2004/07/23 15:00:58 fafhrd Exp $
-
-IUSE=""
-
-inherit gnustep-old
-
-DESCRIPTION="GNUstep AppKit implementation"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="-x86 -ppc -sparc"
-
-DEPEND=">=gnustep-base/gnustep-base-1.7.1
-	>=media-libs/tiff-3.5.7
-	>=media-libs/jpeg-6b-r2"
-PDEPEND="=gnustep-base/gnustep-back-${PV}*"
-
-src_compile() {
-	egnustepmake \
-		--with-jpeg-library=/usr/lib \
-		--with-jpeg-include=/usr/include \
-		--with-tiff-library=/usr/lib \
-		--with-tiff-include=/usr/include \
-		|| die "configure failed"
-}
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.8.8.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.8.8.ebuild
deleted file mode 100644
index 165603e7daa5..000000000000
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.8.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.8.8.ebuild,v 1.2 2004/07/23 15:00:58 fafhrd Exp $
-
-IUSE=""
-
-inherit gnustep-old
-
-DESCRIPTION="GNUstep AppKit implementation"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc alpha"
-
-DEPEND=">=gnustep-base/gnustep-base-1.7.2
-	>=media-libs/tiff-3.5.7
-	>=media-libs/jpeg-6b-r2"
-PDEPEND="=gnustep-base/gnustep-back-${PV}*"
-
-src_compile() {
-	egnustepmake \
-		--with-jpeg-library=/usr/lib \
-		--with-jpeg-include=/usr/include \
-		--with-tiff-library=/usr/lib \
-		--with-tiff-include=/usr/include \
-		|| die "configure failed"
-}
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.9.4.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.9.4.ebuild
index 4f5cffa85bff..0f23b35b0829 100644
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.9.4.ebuild
+++ b/gnustep-base/gnustep-gui/gnustep-gui-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.9.4.ebuild,v 1.5 2004/11/02 17:31:00 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.9.4.ebuild,v 1.6 2004/11/12 03:47:43 fafhrd Exp $
 
 inherit gnustep
 
@@ -8,32 +8,24 @@ DESCRIPTION="It is a library of graphical user interface classes written complet
 HOMEPAGE="http://www.gnustep.org"
 SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
 
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~ppc ~x86 ~amd64 ~sparc ~alpha"
 SLOT="0"
 LICENSE="LGPL-2.1"
 
-IUSE="${IUSE} jpeg gif png gsnd doc cups camaelon"
+IUSE="${IUSE} jpeg gif png gsnd doc cups"
 DEPEND="${GNUSTEP_BASE_DEPEND}
 	virtual/x11
-	=media-libs/tiff-3*
-	jpeg? =media-libs/jpeg-6b*
-	gif? =media-libs/libungif-4.1*
-	png? =media-libs/libpng-1.2*
-	gsnd? =media-libs/audiofile-0.2*
-	cups? =net-print/cups-1.1*
-	=app-text/aspell-0.50*"
+	>=media-libs/tiff-3*
+	jpeg? >=media-libs/jpeg-6b*
+	gif? >=media-libs/libungif-4.1*
+	png? >=media-libs/libpng-1.2*
+	gsnd? >=media-libs/audiofile-0.2*
+	cups? >=net-print/cups-1.1*
+	app-text/aspell"
 RDEPEND="${DEPEND}
 	${DOC_RDEPEND}"
-PDEPEND="camaelon? =gnustep-libs/camaelon-0.1"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	if use camaelon
-	then
-		epatch ${FILESDIR}/${P}-camaelon.patch
-	fi
-}
+
+egnustep_install_domain "System"
 
 src_compile() {
 	egnustep_env
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20040928.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20040928.ebuild
deleted file mode 100644
index 5b52c971e352..000000000000
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20040928.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20040928.ebuild,v 1.5 2004/10/31 12:02:35 kloeri Exp $
-
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
-ECVS_USER="anoncvs"
-ECVS_AUTH="ext"
-ECVS_MODULE="gnustep/core/gui"
-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}/${ECVS_MODULE}
-
-DESCRIPTION="It is a library of graphical user interface classes written completely in the Objective-C language."
-HOMEPAGE="http://www.gnustep.org"
-
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-SLOT="0"
-LICENSE="LGPL-2.1"
-
-IUSE="${IUSE} jpeg gif png gsnd doc cups camaelon"
-DEPEND="${GNUSTEP_BASE_DEPEND}
-	=gnustep-base/gnustep-base-${PV/0.9.5/1.10.1}
-	virtual/x11
-	=media-libs/tiff-3*
-	jpeg? =media-libs/jpeg-6b*
-	gif? =media-libs/libungif-4.1*
-	png? =media-libs/libpng-1.2*
-	gsnd? =media-libs/audiofile-0.2*
-	cups? =net-print/cups-1.1*
-	app-text/aspell"
-RDEPEND="${DEPEND}
-	${DOC_RDEPEND}"
-PDEPEND="camaelon? =gnustep-libs/camaelon-0.1"
-
-src_unpack() {
-	cvs_src_unpack
-	cd ${S}
-	if use camaelon
-	then
-		epatch ${FILESDIR}/${PN}-0.9.4-camaelon.patch
-	fi
-}
-
-src_compile() {
-	egnustep_env
-
-	myconf="--with-tiff-include=/usr/include --with-tiff-library=/usr/lib"
-	myconf="$myconf `use_enable gsnd`"
-	use gsnd && myconf="$myconf --with-audiofile-include=/usr/include --with-audiofile-lib=/usr/lib"
-	use gif && myconf="$myconf --enable-ungif"
-	myconf="$myconf `use_enable jpeg`"
-	myconf="$myconf `use_enable png`"
-	myconf="$myconf `use_enable cups`"
-	econf $myconf || die "configure failed"
-
-	egnustep_make || die
-}
-
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20041030.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20041030-r1.ebuild
index 5f6902dcf538..5ace15d10beb 100644
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20041030.ebuild
+++ b/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20041030-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20041030.ebuild,v 1.1 2004/10/31 05:40:13 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20041030-r1.ebuild,v 1.1 2004/11/12 03:47:43 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
@@ -17,33 +17,25 @@ S=${WORKDIR}/${ECVS_MODULE}
 DESCRIPTION="It is a library of graphical user interface classes written completely in the Objective-C language."
 HOMEPAGE="http://www.gnustep.org"
 
-KEYWORDS="~ppc"
+KEYWORDS="~ppc ~x86 ~amd64 ~sparc ~alpha"
 SLOT="0"
 LICENSE="LGPL-2.1"
 
-IUSE="${IUSE} jpeg gif png gsnd doc cups camaelon"
+IUSE="${IUSE} jpeg gif png gsnd doc cups"
 DEPEND="${GNUSTEP_BASE_DEPEND}
 	=gnustep-base/gnustep-base-1.10.1*
 	virtual/x11
-	=media-libs/tiff-3*
-	jpeg? =media-libs/jpeg-6b*
-	gif? =media-libs/libungif-4.1*
-	png? =media-libs/libpng-1.2*
-	gsnd? =media-libs/audiofile-0.2*
-	cups? =net-print/cups-1.1*
+	>=media-libs/tiff-3*
+	jpeg? >=media-libs/jpeg-6b*
+	gif? >=media-libs/libungif-4.1*
+	png? >=media-libs/libpng-1.2*
+	gsnd? >=media-libs/audiofile-0.2*
+	cups? >=net-print/cups-1.1*
 	app-text/aspell"
 RDEPEND="${DEPEND}
 	${DOC_RDEPEND}"
-PDEPEND="camaelon? =gnustep-libs/camaelon-0.1"
-
-src_unpack() {
-	cvs_src_unpack
-	cd ${S}
-	if use camaelon
-	then
-		epatch ${FILESDIR}/${PN}-0.9.4-camaelon.patch
-	fi
-}
+
+egnustep_install_domain "System"
 
 src_compile() {
 	egnustep_env