Cleanup relating to choice of dev-lib/libffi or gcc with gcj or obcj use flag turned on; very information dense error messages now given when objc or libffi is not available; old ebuilds pruned out (one "stable" release, one "cvs fetching" release); "stable" release base libs marked stable on ppc

author: Armando Di Cianno <fafhrd@gentoo.org> 2004-12-13 23:09:06 +0000
committer: Armando Di Cianno <fafhrd@gentoo.org> 2004-12-13 23:09:06 +0000
commit: 54605564181d09b2a8e6b092693b9aa840cd96ef (patch)
tree: b4d974e063ccad409b603c65a45078f6c9616b02
parent: Cleanup relating to choice of dev-lib/libffi or gcc with gcj or obcj use flag... (diff)
download: historical-54605564181d09b2a8e6b092693b9aa840cd96ef.tar.gz
historical-54605564181d09b2a8e6b092693b9aa840cd96ef.tar.bz2
historical-54605564181d09b2a8e6b092693b9aa840cd96ef.zip
55 files changed, 124 insertions, 1381 deletions
diff --git a/gnustep-base/gnustep-back-art/ChangeLog b/gnustep-base/gnustep-back-art/ChangeLog
index 8d67cf4f1edc..40e65351c66c 100644
--- a/gnustep-base/gnustep-back-art/ChangeLog
+++ b/gnustep-base/gnustep-back-art/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnustep-base/gnustep-back-art
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-art/ChangeLog,v 1.14 2004/12/04 20:19:25 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-art/ChangeLog,v 1.15 2004/12/13 23:07:58 fafhrd Exp $
+
+  13 Dec 2004; Armando Di Cianno <fafhrd@gentoo.org>
+  gnustep-back-art-0.9.4.ebuild, -gnustep-back-art-0.9.5_pre20041030.ebuild,
+  -gnustep-back-art-0.9.5_pre20041116.ebuild:
+  Cleaned up detection of objc and libff; general cleanups
 
 *gnustep-back-art-0.9.5_pre20041203 (03 Dec 2004)
 
diff --git a/gnustep-base/gnustep-back-art/Manifest b/gnustep-base/gnustep-back-art/Manifest
index 1f7543495ff9..13f6a29f7c33 100644
--- a/gnustep-base/gnustep-back-art/Manifest
+++ b/gnustep-base/gnustep-back-art/Manifest
@@ -1,11 +1,7 @@
 MD5 1d9e1d24e5342cdfb3cb21f93a3d2ee6 gnustep-back-art-0.9.5_pre20041203.ebuild 1346
-MD5 44ab058ea99528120fe8b3fc8d683981 gnustep-back-art-0.9.5_pre20041116.ebuild 1346
-MD5 3d51c23e4dc847da5ed499bb8e92e13d gnustep-back-art-0.9.4.ebuild 1110
-MD5 03f2c31d2f0e582bb64b74053dbbc6fe gnustep-back-art-0.9.5_pre20041030.ebuild 1346
-MD5 484de151b1bd0e6a78f2723a4102c012 ChangeLog 2764
+MD5 45d60b3b0ed014c4201e374c0e466969 gnustep-back-art-0.9.4.ebuild 1142
+MD5 a80a1e5fe42e2ce7c596b03505bfc477 ChangeLog 3000
 MD5 e2bc2a5b2bdec3808102e5a2caf41f7f metadata.xml 1030
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-back-art-0.9.5_pre20041030 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-back-art-0.9.5_pre20041116 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-back-art-0.9.5_pre20041203 0
 MD5 9c943c0c0837bfe718a98769bc25d366 files/digest-gnustep-back-art-0.9.4 70
 MD5 7421c230db078e850be063b28fdf18cf files/config-gnustep-back-art.sh 415
diff --git a/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.5_pre20041030 b/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.5_pre20041030
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.5_pre20041030
+++ /dev/null
diff --git a/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.5_pre20041116 b/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.5_pre20041116
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-base/gnustep-back-art/files/digest-gnustep-back-art-0.9.5_pre20041116
+++ /dev/null
diff --git a/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.4.ebuild b/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.4.ebuild
index 321316f91a32..433e0b89e7d5 100644
--- a/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.4.ebuild
+++ b/gnustep-base/gnustep-back-art/gnustep-back-art-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-back-art/gnustep-back-art-0.9.4.ebuild,v 1.5 2004/11/23 20:37:57 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.4.ebuild,v 1.6 2004/12/13 23:07:58 fafhrd Exp $
 
 inherit gnustep
 
@@ -10,7 +10,7 @@ DESCRIPTION="libart_lgpl back-end component for the GNUstep GUI Library."
 
 HOMEPAGE="http://www.gnustep.org"
 SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
-KEYWORDS="~ppc ~x86 amd64 ~sparc ~alpha"
+KEYWORDS="ppc ~x86 amd64 ~sparc ~alpha"
 SLOT="0"
 LICENSE="LGPL-2.1"
 
@@ -18,6 +18,7 @@ PROVIDE="virtual/gnustep-back"
 
 IUSE="${IUSE} opengl xim doc"
 DEPEND="${GNUSTEP_GUI_DEPEND}
+	~gnustep-base/gnustep-gui-0.9.4
 	virtual/xft
 	opengl? ( virtual/opengl virtual/glu )
 	gnustep-libs/artresources
diff --git a/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.5_pre20041030.ebuild b/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.5_pre20041030.ebuild
deleted file mode 100644
index 40deeec18695..000000000000
--- a/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.5_pre20041030.ebuild
+++ /dev/null
@@ -1,50 +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-back-art/gnustep-back-art-0.9.5_pre20041030.ebuild,v 1.2 2004/11/12 03:48:04 fafhrd Exp $
-
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
-ECVS_USER="anoncvs"
-ECVS_AUTH="ext"
-ECVS_MODULE="gnustep/core/back"
-ECVS_CO_OPTS="-P -D ${PV/*_pre}"
-ECVS_UP_OPTS="-dP -D ${PV/*_pre}"
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/savannah.gnu.org-gnustep"
-inherit gnustep cvs
-
-S=${WORKDIR}/${ECVS_MODULE}
-
-DESCRIPTION="libart_lgpl back-end component for the GNUstep GUI Library."
-HOMEPAGE="http://www.gnustep.org"
-
-KEYWORDS="~ppc ~x86 ~amd64 ~sparc ~alpha"
-SLOT="0"
-LICENSE="LGPL-2.1"
-
-PROVIDE="virtual/gnustep-back"
-
-IUSE="${IUSE} opengl xim doc"
-DEPEND="${GNUSTEP_GUI_DEPEND}
-	virtual/xft
-	=gnustep-base/gnustep-gui-${PV}*
-	opengl? ( virtual/opengl virtual/glu )
-	gnustep-libs/artresources
-	>=gnustep-base/mknfonts-0.5
-	>=media-libs/libart_lgpl-2.3*"
-RDEPEND="${DEPEND}
-${DOC_RDEPEND}"
-
-egnustep_install_domain "System"
-
-src_compile() {
-	egnustep_env
-
-	use opengl && myconf="--enable-glx"
-	myconf="$myconf `use_enable xim`"
-	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=art --with-name=art"
-	econf $myconf || die "configure failed"
-
-	egnustep_make
-}
-
diff --git a/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.5_pre20041116.ebuild b/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.5_pre20041116.ebuild
deleted file mode 100644
index 0251fe1ac2d3..000000000000
--- a/gnustep-base/gnustep-back-art/gnustep-back-art-0.9.5_pre20041116.ebuild
+++ /dev/null
@@ -1,50 +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-back-art/gnustep-back-art-0.9.5_pre20041116.ebuild,v 1.1 2004/11/16 23:15:11 fafhrd Exp $
-
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
-ECVS_USER="anoncvs"
-ECVS_AUTH="ext"
-ECVS_MODULE="gnustep/core/back"
-ECVS_CO_OPTS="-P -D ${PV/*_pre}"
-ECVS_UP_OPTS="-dP -D ${PV/*_pre}"
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/savannah.gnu.org-gnustep"
-inherit gnustep cvs
-
-S=${WORKDIR}/${ECVS_MODULE}
-
-DESCRIPTION="libart_lgpl back-end component for the GNUstep GUI Library."
-HOMEPAGE="http://www.gnustep.org"
-
-KEYWORDS="~ppc ~x86 ~amd64 ~sparc ~alpha"
-SLOT="0"
-LICENSE="LGPL-2.1"
-
-PROVIDE="virtual/gnustep-back"
-
-IUSE="${IUSE} opengl xim doc"
-DEPEND="${GNUSTEP_GUI_DEPEND}
-	virtual/xft
-	=gnustep-base/gnustep-gui-${PV}*
-	opengl? ( virtual/opengl virtual/glu )
-	gnustep-libs/artresources
-	>=gnustep-base/mknfonts-0.5
-	>=media-libs/libart_lgpl-2.3*"
-RDEPEND="${DEPEND}
-${DOC_RDEPEND}"
-
-egnustep_install_domain "System"
-
-src_compile() {
-	egnustep_env
-
-	use opengl && myconf="--enable-glx"
-	myconf="$myconf `use_enable xim`"
-	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=art --with-name=art"
-	econf $myconf || die "configure failed"
-
-	egnustep_make
-}
-
diff --git a/gnustep-base/gnustep-back-xlib/ChangeLog b/gnustep-base/gnustep-back-xlib/ChangeLog
index 79a3e97cd0bd..7f09d45db943 100644
--- a/gnustep-base/gnustep-back-xlib/ChangeLog
+++ b/gnustep-base/gnustep-back-xlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnustep-base/gnustep-back-xlib
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/ChangeLog,v 1.10 2004/12/04 20:19:03 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/ChangeLog,v 1.11 2004/12/13 23:08:15 fafhrd Exp $
+
+  13 Dec 2004; Armando Di Cianno <fafhrd@gentoo.org>
+  gnustep-back-xlib-0.9.4.ebuild, -gnustep-back-xlib-0.9.5_pre20041030.ebuild,
+  -gnustep-back-xlib-0.9.5_pre20041116.ebuild:
+  Cleaned up detection of objc and libff; general cleanups
 
 *gnustep-back-xlib-0.9.5_pre20041203 (03 Dec 2004)
 
diff --git a/gnustep-base/gnustep-back-xlib/Manifest b/gnustep-base/gnustep-back-xlib/Manifest
index bf0060742142..c5ae50cf5a80 100644
--- a/gnustep-base/gnustep-back-xlib/Manifest
+++ b/gnustep-base/gnustep-back-xlib/Manifest
@@ -1,11 +1,7 @@
 MD5 b433fe246bc03e9deb2de3480d65f222 gnustep-back-xlib-0.9.5_pre20041203.ebuild 1250
-MD5 b841fc146693588b26e8249c6f56f596 gnustep-back-xlib-0.9.4.ebuild 1011
-MD5 72c0c80f35125e4a348237843a4a37e3 gnustep-back-xlib-0.9.5_pre20041116.ebuild 1250
-MD5 0dcb2e8f4eedab02789731b913b5ee8e gnustep-back-xlib-0.9.5_pre20041030.ebuild 1250
-MD5 dd32e415496cde33b7427870334d9c27 ChangeLog 2453
+MD5 2d5d4e7380e657a19d3d19cf3fc8a6ea gnustep-back-xlib-0.9.4.ebuild 1044
+MD5 13e067681c83fa17b2a8f43fb75ff06a ChangeLog 2692
 MD5 ef356714ab02a84c6e88fe3720749aea metadata.xml 1022
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-back-xlib-0.9.5_pre20041030 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-back-xlib-0.9.5_pre20041116 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-back-xlib-0.9.5_pre20041203 0
 MD5 9c943c0c0837bfe718a98769bc25d366 files/digest-gnustep-back-xlib-0.9.4 70
 MD5 14c86d6ff5e83af36ad3d54266af5c99 files/config-gnustep-back-xlib.sh 181
diff --git a/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20041030 b/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20041030
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20041030
+++ /dev/null
diff --git a/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20041116 b/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20041116
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20041116
+++ /dev/null
diff --git a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.4.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.4.ebuild
index 84c84e098066..28073534587b 100644
--- a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.4.ebuild
+++ b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-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-back-xlib/gnustep-back-xlib-0.9.4.ebuild,v 1.3 2004/11/12 03:48:23 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.4.ebuild,v 1.4 2004/12/13 23:08:15 fafhrd Exp $
 
 inherit gnustep
 
@@ -18,6 +18,7 @@ PROVIDE="virtual/gnustep-back"
 
 IUSE="${IUSE} opengl xim doc"
 DEPEND="${GNUSTEP_GUI_DEPEND}
+	~gnustep-base/gnustep-gui-0.9.4
 	virtual/xft
 	opengl? ( virtual/opengl virtual/glu )"
 RDEPEND="${DEPEND}
diff --git a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20041030.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20041030.ebuild
deleted file mode 100644
index 824dfaa81904..000000000000
--- a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20041030.ebuild
+++ /dev/null
@@ -1,47 +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-back-xlib/gnustep-back-xlib-0.9.5_pre20041030.ebuild,v 1.2 2004/11/12 03:48:23 fafhrd Exp $
-
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
-ECVS_USER="anoncvs"
-ECVS_AUTH="ext"
-ECVS_MODULE="gnustep/core/back"
-ECVS_CO_OPTS="-P -D ${PV/*_pre}"
-ECVS_UP_OPTS="-dP -D ${PV/*_pre}"
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/savannah.gnu.org-gnustep"
-inherit gnustep cvs
-
-S=${WORKDIR}/${ECVS_MODULE}
-
-DESCRIPTION="Default X11 back-end component for the GNUstep GUI Library."
-HOMEPAGE="http://www.gnustep.org"
-
-KEYWORDS="~x86 ~ppc ~sparc"
-SLOT="0"
-LICENSE="LGPL-2.1"
-
-PROVIDE="virtual/gnustep-back"
-
-IUSE="${IUSE} opengl xim doc"
-DEPEND="${GNUSTEP_GUI_DEPEND}
-	=gnustep-base/gnustep-gui-${PV}*
-	virtual/xft
-	opengl? ( virtual/opengl virtual/glu )"
-RDEPEND="${DEPEND}
-	${DOC_RDEPEND}"
-
-egnustep_install_domain "System"
-
-src_compile() {
-	egnustep_env
-
-	use opengl && myconf="--enable-glx"
-	myconf="$myconf `use_enable xim`"
-	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=xlib --with-name=xlib"
-	econf $myconf || die "configure failed"
-
-	egnustep_make
-}
-
diff --git a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20041116.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20041116.ebuild
deleted file mode 100644
index 8dfc2d9386df..000000000000
--- a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20041116.ebuild
+++ /dev/null
@@ -1,47 +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-back-xlib/gnustep-back-xlib-0.9.5_pre20041116.ebuild,v 1.1 2004/11/16 23:14:50 fafhrd Exp $
-
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
-ECVS_USER="anoncvs"
-ECVS_AUTH="ext"
-ECVS_MODULE="gnustep/core/back"
-ECVS_CO_OPTS="-P -D ${PV/*_pre}"
-ECVS_UP_OPTS="-dP -D ${PV/*_pre}"
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/savannah.gnu.org-gnustep"
-inherit gnustep cvs
-
-S=${WORKDIR}/${ECVS_MODULE}
-
-DESCRIPTION="Default X11 back-end component for the GNUstep GUI Library."
-HOMEPAGE="http://www.gnustep.org"
-
-KEYWORDS="~x86 ~ppc ~sparc"
-SLOT="0"
-LICENSE="LGPL-2.1"
-
-PROVIDE="virtual/gnustep-back"
-
-IUSE="${IUSE} opengl xim doc"
-DEPEND="${GNUSTEP_GUI_DEPEND}
-	=gnustep-base/gnustep-gui-${PV}*
-	virtual/xft
-	opengl? ( virtual/opengl virtual/glu )"
-RDEPEND="${DEPEND}
-	${DOC_RDEPEND}"
-
-egnustep_install_domain "System"
-
-src_compile() {
-	egnustep_env
-
-	use opengl && myconf="--enable-glx"
-	myconf="$myconf `use_enable xim`"
-	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=xlib --with-name=xlib"
-	econf $myconf || die "configure failed"
-
-	egnustep_make
-}
-
diff --git a/gnustep-base/gnustep-base/ChangeLog b/gnustep-base/gnustep-base/ChangeLog
index afe9451b0638..745304c08c23 100644
--- a/gnustep-base/gnustep-base/ChangeLog
+++ b/gnustep-base/gnustep-base/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnustep-base/gnustep-base
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.16 2004/12/05 21:52:07 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.17 2004/12/13 23:07:20 fafhrd Exp $
+
+  13 Dec 2004; Armando Di Cianno <fafhrd@gentoo.org> -files/tryffi.c,
+  -gnustep-base-1.10.0.ebuild, gnustep-base-1.10.1-r1.ebuild,
+  -gnustep-base-1.10.1.ebuild, -gnustep-base-1.10.1_pre20040928.ebuild,
+  -gnustep-base-1.10.2_pre20041116.ebuild,
+  gnustep-base-1.10.2_pre20041203.ebuild:
+  Cleaned up detection of objc and libff; general cleanups
 
   05 Dec 2004; Armando Di Cianno <fafhrd@gentoo.org> +files/tryffi.c,
   gnustep-base-1.10.2_pre20041203.ebuild:
diff --git a/gnustep-base/gnustep-base/Manifest b/gnustep-base/gnustep-base/Manifest
index d5b274262f2e..e9094eed1f53 100644
--- a/gnustep-base/gnustep-base/Manifest
+++ b/gnustep-base/gnustep-base/Manifest
@@ -1,17 +1,8 @@
-MD5 0ed4adc84367642a60e7813301bf3cd9 gnustep-base-1.10.0.ebuild 2182
-MD5 7da856ebeafe13f9ad2ee0d06e5a9c08 gnustep-base-1.10.1-r1.ebuild 2646
-MD5 38f82f2b0548aee169bd441883e12cb6 gnustep-base-1.10.1_pre20040928.ebuild 2452
-MD5 98e377542e7bd7dc34c636edf0014939 gnustep-base-1.10.2_pre20041203.ebuild 4139
-MD5 0ba89760f3342015b2b6bb4b71c17816 gnustep-base-1.10.2_pre20041116.ebuild 2913
-MD5 1ce84a41b6dd184226328e37935d2d74 gnustep-base-1.10.1.ebuild 2212
-MD5 3a3b37f7211f1378828ba134f12a5eb2 ChangeLog 6425
+MD5 186b1b5af3c365e4926e229392ca529d gnustep-base-1.10.1-r1.ebuild 2984
+MD5 8d62529d60540db3a4b5fdb45e8577d9 gnustep-base-1.10.2_pre20041203.ebuild 3364
+MD5 b789b507aaea73af1365554f75352bb4 ChangeLog 6774
 MD5 6054f8e4a94313852ff8e1294c8abd88 metadata.xml 670
 MD5 deded00aa5a335854582a82255ddc2f3 files/digest-gnustep-base-1.10.1-r1 72
 MD5 efda24cf74398ac3ddce6cba6071561a files/config-gnustep-base.sh 559
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-base-1.10.1_pre20040928 0
-MD5 da38d67a86d0553b73378aea856093f5 files/digest-gnustep-base-1.10.0 72
-MD5 deded00aa5a335854582a82255ddc2f3 files/digest-gnustep-base-1.10.1 72
-MD5 e293bf6e39517a94d1c5221fd9bfb147 files/tryffi.c 96
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-base-1.10.2_pre20041116 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-base-1.10.2_pre20041203 0
 MD5 1e1e21f737b0d25c8faabb89bd286988 files/base-user-defaults.patch-1.10.0 1069
diff --git a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.0 b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.0
deleted file mode 100644
index bbb7e59b96fd..000000000000
--- a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a948608044062a8ce6fae230144f5519 gnustep-base-1.10.0.tar.gz 1879307
diff --git a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.1 b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.1
deleted file mode 100644
index 9982eb38cdb0..000000000000
--- a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 94eaac8feb8d5ae95194a37cedc27544 gnustep-base-1.10.1.tar.gz 1909988
diff --git a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.1_pre20040928 b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.1_pre20040928
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.1_pre20040928
+++ /dev/null
diff --git a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2_pre20041116 b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2_pre20041116
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2_pre20041116
+++ /dev/null
diff --git a/gnustep-base/gnustep-base/files/tryffi.c b/gnustep-base/gnustep-base/files/tryffi.c
deleted file mode 100644
index 5f84c87b07b8..000000000000
--- a/gnustep-base/gnustep-base/files/tryffi.c
+++ /dev/null
@@ -1,11 +0,0 @@
-//////
-// gcc -o tryffi tryffi.c -lffi
-//////
-
-#include <ffi.h>
-
-int main(void)
-{
-	return 0;
-}
-
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.10.0.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.10.0.ebuild
deleted file mode 100644
index 500d317da091..000000000000
--- a/gnustep-base/gnustep-base/gnustep-base-1.10.0.ebuild
+++ /dev/null
@@ -1,72 +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-base/gnustep-base-1.10.0.ebuild,v 1.4 2004/10/21 19:09:11 fafhrd Exp $
-
-inherit gnustep
-
-DESCRIPTION="The GNUstep Base Library is a library of general-purpose, non-graphical Objective C objects."
-
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-KEYWORDS="~x86 ~ppc"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-
-IUSE="${IUSE} doc"
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	=gnustep-base/gnustep-make-${PV}
-	=dev-libs/libxml2-2.6*
-	=dev-libs/libxslt-1.1*
-	=dev-libs/gmp-4.1*
-	=dev-libs/openssl-0.9.7*
-	=dev-libs/libffi-3*
-	=sys-libs/zlib-1.2*
-	${DOC_DEPEND}"
-RDEPEND="${DEPEND}
-	${DOC_RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/base-user-defaults.patch-${PV}
-}
-
-src_compile() {
-	egnustep_env
-	# why libffi over ffcall?
-	# - libffi is known to work with 32 and 64 bit platforms
-	# - libffi does not use trampolines
-	myconf="--enable-libffi --with-ffi-library=/usr/lib/libffi --with-ffi-include=/usr/include/libffi --disable-ffcall"
-	myconf="$myconf --with-xml-prefix=/usr"
-	myconf="$myconf --with-gmp-include=/usr/include --with-gmp-library=/usr/lib"
-	econf $myconf || die "configure failed"
-
-	egnustep_make || die
-}
-
-src_install() {
-	egnustep_env
-	egnustep_install || die
-	if use doc ; then
-		cd ${S}/Documentation
-		make HOME=${TMP} \
-			GNUSTEP_USER_ROOT=${TMP}/GNUstep \
-			INSTALL_ROOT_DIR=${D} \
-			LD_LIBRARY_PATH="${D}${GNUSTEP_SYSTEM_ROOT}/Library/Libraries:${LD_LIBRARY_PATH}" \
-			GNUSTEP_INSTALLATION_DIR=${D}${GNUSTEP_SYSTEM_ROOT} \
-			GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
-			all || die "doc make failed"
-
-		make HOME=${TMP} \
-			GNUSTEP_USER_ROOT=${TMP}/GNUstep \
-			GNUSTEP_DEFAULTS_ROOT=${TMP}/GNUstep \
-			INSTALL_ROOT_DIR=${D} \
-			GNUSTEP_INSTALLATION_DIR=${D}${GNUSTEP_SYSTEM_ROOT} \
-			GNUSTEP_MAKEFILES=${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles \
-			GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT} \
-			TAR_OPTIONS="${TAR_OPTIONS} --no-same-owner" \
-			install || die "doc install failed"
-		cd ..
-	fi
-	egnustep_package_config
-}
-
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.10.1-r1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.10.1-r1.ebuild
index 6b3c61689562..51c6a3243784 100644
--- a/gnustep-base/gnustep-base/gnustep-base-1.10.1-r1.ebuild
+++ b/gnustep-base/gnustep-base/gnustep-base-1.10.1-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-base/gnustep-base-1.10.1-r1.ebuild,v 1.2 2004/11/23 20:33:57 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.10.1-r1.ebuild,v 1.3 2004/12/13 23:07:20 fafhrd Exp $
 
 inherit gnustep
 
@@ -8,28 +8,38 @@ DESCRIPTION="The GNUstep Base Library is a library of general-purpose, non-graph
 
 HOMEPAGE="http://www.gnustep.org"
 SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-KEYWORDS="~ppc ~x86 amd64 ~sparc ~alpha"
+KEYWORDS="ppc ~x86 amd64 ~sparc ~alpha"
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1"
 
-IUSE="${IUSE} doc"
+IUSE="${IUSE} doc gcc-libffi"
 DEPEND="${GNUSTEP_CORE_DEPEND}
+	~gnustep-base/gnustep-make-1.10.0
 	|| (
-		>=gnustep-base/gnustep-make-1.10.1_pre20041030-r1
-		~gnustep-base/gnustep-make-1.10.0
+		gcc-libffi? ( >=sys-devel/gcc-3.3.2 )
+		>=dev-libs/libffi-3*
 	)
 	>=dev-libs/libxml2-2.6*
 	>=dev-libs/libxslt-1.1*
 	>=dev-libs/gmp-4.1*
 	>=dev-libs/openssl-0.9.7*
-	>=dev-libs/libffi-3*
 	>=sys-libs/zlib-1.2*
+	sys-apps/sed
 	${DOC_DEPEND}"
 RDEPEND="${DEPEND}
 	${DOC_RDEPEND}"
 
 egnustep_install_domain "System"
 
+pkg_setup() {
+	if use gcc-libffi; then
+		if [ "$(ffi_available)" == "no" ]; then
+			ffi_not_available_info
+			die "libffi is not available"
+		fi
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/base-user-defaults.patch-1.10.0
@@ -41,7 +51,13 @@ src_compile() {
 	# - libffi is known to work with 32 and 64 bit platforms
 	# - libffi does not use trampolines
 	local myconf
-	myconf="--enable-libffi --with-ffi-library=/usr/lib/libffi --with-ffi-include=/usr/include/libffi --disable-ffcall"
+	myconf="--enable-libffi --disable-ffcall"
+	if use gcc-libffi; then
+		myconf="${myconf} --with-ffi-library=$(gcc-config -L) --with-ffi-include=$(gcc-config -L | sed 's/:.*//')/include"
+	else
+		myconf="${myconf} --with-ffi-library=/usr/lib/libffi --with-ffi-include=/usr/include/libffi"
+	fi
+
 	myconf="$myconf --with-xml-prefix=/usr"
 	myconf="$myconf --with-gmp-include=/usr/include --with-gmp-library=/usr/lib"
 	econf $myconf || die "configure failed"
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.10.1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.10.1.ebuild
deleted file mode 100644
index 47b8b264b1f0..000000000000
--- a/gnustep-base/gnustep-base/gnustep-base-1.10.1.ebuild
+++ /dev/null
@@ -1,72 +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-base/gnustep-base-1.10.1.ebuild,v 1.3 2004/11/12 03:47:20 fafhrd Exp $
-
-inherit gnustep
-
-DESCRIPTION="The GNUstep Base Library is a library of general-purpose, non-graphical Objective C objects."
-
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-KEYWORDS="~ppc ~x86 ~amd64 ~sparc ~alpha"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-
-IUSE="${IUSE} doc"
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	=gnustep-base/gnustep-make-1.10.1*
-	>=dev-libs/libxml2-2.6*
-	>=dev-libs/libxslt-1.1*
-	>=dev-libs/gmp-4.1*
-	>=dev-libs/openssl-0.9.7*
-	>=dev-libs/libffi-3*
-	>=sys-libs/zlib-1.2*
-	${DOC_DEPEND}"
-RDEPEND="${DEPEND}
-	${DOC_RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/base-user-defaults.patch-1.10.0
-}
-
-src_compile() {
-	egnustep_env
-	# why libffi over ffcall?
-	# - libffi is known to work with 32 and 64 bit platforms
-	# - libffi does not use trampolines
-	myconf="--enable-libffi --with-ffi-library=/usr/lib/libffi --with-ffi-include=/usr/include/libffi --disable-ffcall"
-	myconf="$myconf --with-xml-prefix=/usr"
-	myconf="$myconf --with-gmp-include=/usr/include --with-gmp-library=/usr/lib"
-	econf $myconf || die "configure failed"
-
-	egnustep_make || die
-}
-
-src_install() {
-	egnustep_env
-	egnustep_install || die
-	if use doc ; then
-		cd ${S}/Documentation
-		make HOME=${TMP} \
-			GNUSTEP_USER_ROOT=${TMP}/GNUstep \
-			INSTALL_ROOT_DIR=${D} \
-			LD_LIBRARY_PATH="${D}${GNUSTEP_SYSTEM_ROOT}/Library/Libraries:${LD_LIBRARY_PATH}" \
-			GNUSTEP_INSTALLATION_DIR=${D}${GNUSTEP_SYSTEM_ROOT} \
-			GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
-			all || die "doc make failed"
-
-		make HOME=${TMP} \
-			GNUSTEP_USER_ROOT=${TMP}/GNUstep \
-			GNUSTEP_DEFAULTS_ROOT=${TMP}/GNUstep \
-			INSTALL_ROOT_DIR=${D} \
-			GNUSTEP_INSTALLATION_DIR=${D}${GNUSTEP_SYSTEM_ROOT} \
-			GNUSTEP_MAKEFILES=${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles \
-			GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT} \
-			TAR_OPTIONS="${TAR_OPTIONS} --no-same-owner" \
-			install || die "doc install failed"
-		cd ..
-	fi
-	egnustep_package_config
-}
-
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.10.1_pre20040928.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.10.1_pre20040928.ebuild
deleted file mode 100644
index 6e3780823066..000000000000
--- a/gnustep-base/gnustep-base/gnustep-base-1.10.1_pre20040928.ebuild
+++ /dev/null
@@ -1,81 +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-base/gnustep-base-1.10.1_pre20040928.ebuild,v 1.6 2004/11/12 03:47:20 fafhrd Exp $
-
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
-ECVS_USER="anoncvs"
-ECVS_AUTH="ext"
-ECVS_MODULE="gnustep/core/base"
-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="The GNUstep Base Library is a library of general-purpose, non-graphical Objective C objects."
-HOMEPAGE="http://www.gnustep.org"
-
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-
-IUSE="${IUSE} doc"
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	=gnustep-base/gnustep-make-${PV/_pre*}*
-	=dev-libs/libxml2-2.6*
-	=dev-libs/libxslt-1.1*
-	=dev-libs/gmp-4.1*
-	=dev-libs/openssl-0.9.7*
-	=dev-libs/libffi-3*
-	=sys-libs/zlib-1.2*
-	${DOC_DEPEND}"
-RDEPEND="${DEPEND}
-	${DOC_RDEPEND}"
-
-src_unpack() {
-	cvs_src_unpack
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/base-user-defaults.patch-1.10.0
-}
-
-src_compile() {
-	egnustep_env
-	# why libffi over ffcall?
-	# - libffi is known to work with 32 and 64 bit platforms
-	# - libffi does not use trampolines
-	myconf="--enable-libffi --with-ffi-library=/usr/lib/libffi --with-ffi-include=/usr/include/libffi --disable-ffcall"
-	myconf="$myconf --with-xml-prefix=/usr"
-	myconf="$myconf --with-gmp-include=/usr/include --with-gmp-library=/usr/lib"
-	econf $myconf || die "configure failed"
-
-	egnustep_make || die
-}
-
-src_install() {
-	egnustep_env
-	egnustep_install || die
-	if use doc ; then
-		cd ${S}/Documentation
-		make HOME=${TMP} \
-			GNUSTEP_USER_ROOT=${TMP}/GNUstep \
-			INSTALL_ROOT_DIR=${D} \
-			LD_LIBRARY_PATH="${D}${GNUSTEP_SYSTEM_ROOT}/Library/Libraries:${LD_LIBRARY_PATH}" \
-			GNUSTEP_INSTALLATION_DIR=${D}${GNUSTEP_SYSTEM_ROOT} \
-			GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
-			all || die "doc make failed"
-
-		make HOME=${TMP} \
-			GNUSTEP_USER_ROOT=${TMP}/GNUstep \
-			GNUSTEP_DEFAULTS_ROOT=${TMP}/GNUstep \
-			INSTALL_ROOT_DIR=${D} \
-			GNUSTEP_INSTALLATION_DIR=${D}${GNUSTEP_SYSTEM_ROOT} \
-			GNUSTEP_MAKEFILES=${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles \
-			GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT} \
-			TAR_OPTIONS="${TAR_OPTIONS} --no-same-owner" \
-			install || die "doc install failed"
-		cd ..
-	fi
-	egnustep_package_config
-}
-
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20041116.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20041116.ebuild
deleted file mode 100644
index 48f90b152298..000000000000
--- a/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20041116.ebuild
+++ /dev/null
@@ -1,95 +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-base/gnustep-base-1.10.2_pre20041116.ebuild,v 1.1 2004/11/16 23:14:09 fafhrd Exp $
-
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
-ECVS_USER="anoncvs"
-ECVS_AUTH="ext"
-ECVS_MODULE="gnustep/core/base"
-ECVS_CO_OPTS="-P -D ${PV/*_pre}"
-ECVS_UP_OPTS="-dP -D ${PV/*_pre}"
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/savannah.gnu.org-gnustep"
-inherit gnustep cvs
-
-S=${WORKDIR}/${ECVS_MODULE}
-
-DESCRIPTION="The GNUstep Base Library is a library of general-purpose, non-graphical Objective C objects."
-
-HOMEPAGE="http://www.gnustep.org"
-#SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-KEYWORDS="~ppc ~x86 ~amd64 ~sparc ~alpha"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-
-IUSE="${IUSE} doc"
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	>=gnustep-base/gnustep-make-1.10.1_pre20041116
-	>=dev-libs/libxml2-2.6*
-	>=dev-libs/libxslt-1.1*
-	>=dev-libs/gmp-4.1*
-	>=dev-libs/openssl-0.9.7*
-	>=dev-libs/libffi-3*
-	>=sys-libs/zlib-1.2*
-	${DOC_DEPEND}"
-RDEPEND="${DEPEND}
-	${DOC_RDEPEND}"
-
-egnustep_install_domain "System"
-
-src_unpack() {
-	cvs_src_unpack ${A}
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/base-user-defaults.patch-1.10.0
-}
-
-src_compile() {
-	egnustep_env
-	# why libffi over ffcall?
-	# - libffi is known to work with 32 and 64 bit platforms
-	# - libffi does not use trampolines
-	local myconf
-	myconf="--enable-libffi --with-ffi-library=/usr/lib/libffi --with-ffi-include=/usr/include/libffi --disable-ffcall"
-	myconf="$myconf --with-xml-prefix=/usr"
-	myconf="$myconf --with-gmp-include=/usr/include --with-gmp-library=/usr/lib"
-	econf $myconf || die "configure failed"
-
-	egnustep_make || die
-}
-
-src_install() {
-	egnustep_env
-	egnustep_install || die
-
-	local base_temp_lib_path
-	if [ ! -z $GNUSTEP_FLATTENED ]; then
-		base_temp_lib_path="$(egnustep_install_domain)/Library/Libraries"
-	else
-		base_temp_lib_path="$(egnustep_install_domain)/Library/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO"
-	fi
-
-	if use doc ; then
-		local make_eval="INSTALL_ROOT=\${D} \
-			GNUSTEP_SYSTEM_ROOT=\${D}\$(egnustep_system_root) \
-			GNUSTEP_NETWORK_ROOT=\$(egnustep_network_root) \
-			GNUSTEP_LOCAL_ROOT=\$(egnustep_local_root) \
-			GNUSTEP_MAKEFILES=\$(egnustep_system_root)/Library/Makefiles \
-			GNUSTEP_USER_ROOT=\${TMP} \
-			GNUSTEP_DEFAULTS_ROOT=\${TMP}/\${__GS_USER_ROOT_POSTFIX} \
-			LD_LIBRARY_PATH=\"\${D}\${base_temp_lib_path}:\${LD_LIBRARY_PATH}\" \
-			GNUSTEP_INSTALLATION_DIR=\${D}\$(egnustep_install_domain) \
-			-j1"
-		if use debug ; then
-			make_eval="${make_eval} debug=yes"
-		fi
-		if use verbose ; then
-			make_eval="${make_eval} verbose=yes"
-		fi
-
-		cd ${S}/Documentation
-		eval emake ${make_eval} all || die "doc make has failed"
-		eval emake ${make_eval} install || die "doc install has failed"
-		cd ..
-	fi
-	egnustep_package_config
-}
-
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20041203.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20041203.ebuild
index 5630ca581acf..f561ce65226e 100644
--- a/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20041203.ebuild
+++ b/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20041203.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-base/gnustep-base-1.10.2_pre20041203.ebuild,v 1.2 2004/12/05 21:52:07 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20041203.ebuild,v 1.3 2004/12/13 23:07:20 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
@@ -25,13 +25,15 @@ LICENSE="GPL-2 LGPL-2.1"
 IUSE="${IUSE} doc gcc-libffi"
 DEPEND="${GNUSTEP_CORE_DEPEND}
 	>=gnustep-base/gnustep-make-1.10.1_pre20041203
+	|| (
+		gcc-libffi? ( >=sys-devel/gcc-3.3.2 )
+		>=dev-libs/libffi-3* )
 	>=dev-libs/libxml2-2.6*
 	>=dev-libs/libxslt-1.1*
 	>=dev-libs/gmp-4.1*
 	>=dev-libs/openssl-0.9.7*
-	|| ( gcc-libffi? >=sys-devel/gcc-3.3*
-		>=dev-libs/libffi-3* )
 	>=sys-libs/zlib-1.2*
+	sys-apps/sed
 	${DOC_DEPEND}"
 RDEPEND="${DEPEND}
 	${DOC_RDEPEND}"
@@ -42,14 +44,17 @@ pkg_setup() {
 	gnustep_pkg_setup
 
 	if use gcc-libffi; then
-			eval $(tc-getCC) -lffi ${FILESDIR}/tryffi.c -o ${TMP}/tryffi \
-				|| die "Your FFI libraries and headers seem to be installed incorrectly -- this is not as bad as it sounds -- not many projects use libffi at the moment, and gcc may have installed the headers in an inavailable place.  Especially check for 'ffi.h' in your /usr/lib/gcc/\$CHOST/'gcc-version'/include directory, and that any other ffi related files it #include's (e.g. 'ffitarget.h') are in that directory as well; this can be solved by moving the files, or with a symlink.  This is a quick fix, and newer ebuilds of gcc should install the files in the correct places, but for now, it could save you a recompilation of gcc.  If this still fails for you, consider not using the 'gcc-libffi' USE flag and letting dev-libs/libffi build as a dependency.  It is important that either 'gcj' is a USE flag for gcc, or 'gcj' or 'objc' for >=gcc-3.4.3-r1."
+		if [ "$(ffi_available)" == "no" ]; then
+			ffi_not_available_info
+			die "libffi is not available"
+		fi
 	fi
 }
 
 src_unpack() {
 	cvs_src_unpack ${A}
 	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/base-user-defaults.patch-1.10.0
+	cd ${S}/Source
 }
 
 src_compile() {
@@ -60,9 +65,9 @@ src_compile() {
 	local myconf
 	myconf="--disable-ffcall --enable-libffi"
 	if use gcc-libffi; then
-		myconfi="${myconf} --with-ffi-library=$(gcc-config -L) --with-ffi-include=$(gcc-config -L | sed 's/:.*//')/include"
+		myconf="${myconf} --with-ffi-library=$(gcc-config -L) --with-ffi-include=$(gcc-config -L | sed 's/:.*//')/include"
 	else
-		myconfi="${myconf} --with-ffi-library=/usr/lib/libffi --with-ffi-include=/usr/include/libffi"
+		myconf="${myconf} --with-ffi-library=/usr/lib/libffi --with-ffi-include=/usr/include/libffi"
 	fi
 	myconf="$myconf --with-xml-prefix=/usr"
 	myconf="$myconf --with-gmp-include=/usr/include --with-gmp-library=/usr/lib"
diff --git a/gnustep-base/gnustep-env/ChangeLog b/gnustep-base/gnustep-env/ChangeLog
index 3bf8f790ee3a..613e786884c5 100644
--- a/gnustep-base/gnustep-env/ChangeLog
+++ b/gnustep-base/gnustep-env/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnustep-base/gnustep-env
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-env/ChangeLog,v 1.11 2004/11/23 20:40:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-env/ChangeLog,v 1.12 2004/12/13 23:08:33 fafhrd Exp $
+
+  13 Dec 2004; Armando Di Cianno <fafhrd@gentoo.org> gnustep-env-0.1.5.ebuild,
+  -gnustep-env-0.1.ebuild:
+  Cleaned up detection of objc and libff; general cleanups
 
   23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
   gnustep-env-0.1.5.ebuild:
diff --git a/gnustep-base/gnustep-env/Manifest b/gnustep-base/gnustep-env/Manifest
index f912ccd97281..b770824bd995 100644
--- a/gnustep-base/gnustep-env/Manifest
+++ b/gnustep-base/gnustep-env/Manifest
@@ -1,23 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7c8e2bdbb2c42f94c70b00ac9a51a56c ChangeLog 2542
-MD5 1e82c3c29105707ada1b6bce01e6cb0f gnustep-env-0.1.ebuild 563
 MD5 58e3cd99fc17de77785c9c81a83b1192 gnustep-env-0.1.4.ebuild 1202
+MD5 9847755d3ceb65f779854a1fe3d57fa5 gnustep-env-0.1.5.ebuild 1521
+MD5 7df32e4bc4e2734e3f89ad63a6b79f5c ChangeLog 2708
 MD5 c603ed4d589dc2091e618436e4de9c78 metadata.xml 371
-MD5 b1abe759591c82ceaadc25435783d07b gnustep-env-0.1.5.ebuild 1522
-MD5 766b0cb8343bea6f212694c1fd261335 files/10gnustep 36
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-env-0.1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-env-0.1.4 0
-MD5 1588a64b28bc5eb05d1c93571ad340b1 files/gnustep.env-0.1.4 586
-MD5 f814aedb43348b181f1ee9c044efa12c files/gnustep.runscript-0.1.4 1052
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-env-0.1.5 0
-MD5 9b9d12281e414534a0e1fbd04cb3e2d1 files/gnustep.env-0.1.5 682
+MD5 f814aedb43348b181f1ee9c044efa12c files/gnustep.runscript-0.1.4 1052
 MD5 8a7d7c75991671d8b36f9f229404edf7 files/gnustep.runscript-0.1.5 944
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBo6BSArHZZzCEUG0RAlYZAJ47VPTlzniK0yV0PmSErEiP5fL+SgCfUwaF
-yhgBQnyeMgZbQ+zi9pfIyFw=
-=FlE3
------END PGP SIGNATURE-----
+MD5 1588a64b28bc5eb05d1c93571ad340b1 files/gnustep.env-0.1.4 586
+MD5 9b9d12281e414534a0e1fbd04cb3e2d1 files/gnustep.env-0.1.5 682
+MD5 766b0cb8343bea6f212694c1fd261335 files/10gnustep 36
diff --git a/gnustep-base/gnustep-env/files/digest-gnustep-env-0.1 b/gnustep-base/gnustep-env/files/digest-gnustep-env-0.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-base/gnustep-env/files/digest-gnustep-env-0.1
+++ /dev/null
diff --git a/gnustep-base/gnustep-env/gnustep-env-0.1.5.ebuild b/gnustep-base/gnustep-env/gnustep-env-0.1.5.ebuild
index 8f31844de3cb..830354f59a96 100644
--- a/gnustep-base/gnustep-env/gnustep-env-0.1.5.ebuild
+++ b/gnustep-base/gnustep-env/gnustep-env-0.1.5.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-env/gnustep-env-0.1.5.ebuild,v 1.2 2004/11/23 20:36:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-env/gnustep-env-0.1.5.ebuild,v 1.3 2004/12/13 23:08:33 fafhrd Exp $
 
 inherit gnustep
 
@@ -10,7 +10,7 @@ DESCRIPTION="This is a convience package that installs all base GNUstep librarie
 HOMEPAGE="http://www.gnustep.org"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc amd64"
+KEYWORDS="~x86 ppc ~alpha ~sparc amd64"
 
 IUSE=""
 DEPEND="${GS_DEPEND}
diff --git a/gnustep-base/gnustep-env/gnustep-env-0.1.ebuild b/gnustep-base/gnustep-env/gnustep-env-0.1.ebuild
deleted file mode 100644
index 0811f25ddc2d..000000000000
--- a/gnustep-base/gnustep-env/gnustep-env-0.1.ebuild
+++ /dev/null
@@ -1,17 +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-env/gnustep-env-0.1.ebuild,v 1.1 2004/07/23 14:06:25 fafhrd Exp $
-
-DESCRIPTION="Exports GNUSTEP_LOCAL_ROOT"
-HOMEPAGE="http://www.gentoo.org"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 sparc ppc mips"
-SLOT="0"
-IUSE=""
-
-src_install() {
-	# Does anyone use GNUstep ?  Hopefully this will be fixed when
-	# someone package GNUstep, otherwise should work just fine.
-	insinto /etc/env.d
-	doins ${FILESDIR}/10gnustep
-}
diff --git a/gnustep-base/gnustep-gui/ChangeLog b/gnustep-base/gnustep-gui/ChangeLog
index f8365b8f5af7..352109e07be2 100644
--- a/gnustep-base/gnustep-gui/ChangeLog
+++ b/gnustep-base/gnustep-gui/ChangeLog
@@ -1,6 +1,13 @@
 # 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.19 2004/12/04 20:18:44 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/ChangeLog,v 1.20 2004/12/13 23:07:39 fafhrd Exp $
+
+*gnustep-gui-0.9.5_pre20041116 (13 Dec 2004)
+
+  13 Dec 2004; Armando Di Cianno <fafhrd@gentoo.org> gnustep-gui-0.9.4.ebuild,
+  -gnustep-gui-0.9.5_pre20041030-r1.ebuild,
+  -gnustep-gui-0.9.5_pre20041116.ebuild:
+  Cleaned up detection of objc and libff; general cleanups
 
 *gnustep-gui-0.9.5_pre20041203 (03 Dec 2004)
 
diff --git a/gnustep-base/gnustep-gui/Manifest b/gnustep-base/gnustep-gui/Manifest
index dd88ef2d4c30..7002969ffdcb 100644
--- a/gnustep-base/gnustep-gui/Manifest
+++ b/gnustep-base/gnustep-gui/Manifest
@@ -1,11 +1,7 @@
 MD5 a74baf5c3ea6c19e21df7f40969bbd7b gnustep-gui-0.9.5_pre20041203.ebuild 1639
-MD5 607268c9f22de0b8e93c9e4937b9b84b gnustep-gui-0.9.5_pre20041116.ebuild 1631
-MD5 08b57ab90ee62e3af9d126a19b080daa gnustep-gui-0.9.5_pre20041030-r1.ebuild 1629
-MD5 28a0beab53c38d4754042e85b933077c ChangeLog 5778
+MD5 0f74842b8a18325a903f019fba20e3f6 ChangeLog 6048
 MD5 649db105cbe2e9ffcca068143f88926f metadata.xml 1355
-MD5 08d349df6711334260b64ba8fd892215 gnustep-gui-0.9.4.ebuild 1342
+MD5 d899503bcd680c85e029a054095ca8c0 gnustep-gui-0.9.4.ebuild 1376
 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
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-gui-0.9.5_pre20041116 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-gui-0.9.5_pre20041203 0
diff --git a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20041030-r1 b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20041030-r1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20041030-r1
+++ /dev/null
diff --git a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20041116 b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20041116
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20041116
+++ /dev/null
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 90a8d1c13c60..81fd80bc00c9 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.7 2004/11/23 20:35:49 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.9.4.ebuild,v 1.8 2004/12/13 23:07:39 fafhrd Exp $
 
 inherit gnustep
 
@@ -8,12 +8,13 @@ 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="~ppc ~x86 amd64 ~sparc ~alpha"
+KEYWORDS="ppc ~x86 amd64 ~sparc ~alpha"
 SLOT="0"
 LICENSE="LGPL-2.1"
 
 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*
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20041030-r1.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20041030-r1.ebuild
deleted file mode 100644
index 5ace15d10beb..000000000000
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20041030-r1.ebuild
+++ /dev/null
@@ -1,54 +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_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"
-ECVS_USER="anoncvs"
-ECVS_AUTH="ext"
-ECVS_MODULE="gnustep/core/gui"
-ECVS_CO_OPTS="-P -D ${PV/*_pre}"
-ECVS_UP_OPTS="-dP -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="~ppc ~x86 ~amd64 ~sparc ~alpha"
-SLOT="0"
-LICENSE="LGPL-2.1"
-
-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*
-	app-text/aspell"
-RDEPEND="${DEPEND}
-	${DOC_RDEPEND}"
-
-egnustep_install_domain "System"
-
-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_pre20041116.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20041116.ebuild
deleted file mode 100644
index d978a848747c..000000000000
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20041116.ebuild
+++ /dev/null
@@ -1,54 +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_pre20041116.ebuild,v 1.1 2004/11/16 23:14:30 fafhrd 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="-P -D ${PV/*_pre}"
-ECVS_UP_OPTS="-dP -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="~ppc ~x86 ~amd64 ~sparc ~alpha"
-SLOT="0"
-LICENSE="LGPL-2.1"
-
-IUSE="${IUSE} jpeg gif png gsnd doc cups"
-DEPEND="${GNUSTEP_BASE_DEPEND}
-	>=gnustep-base/gnustep-base-1.10.2_pre*
-	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}"
-
-egnustep_install_domain "System"
-
-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-make/ChangeLog b/gnustep-base/gnustep-make/ChangeLog
index dff050c68420..2f53fa4772ba 100644
--- a/gnustep-base/gnustep-make/ChangeLog
+++ b/gnustep-base/gnustep-make/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnustep-base/gnustep-make
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.18 2004/12/05 21:36:57 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.19 2004/12/13 23:06:59 fafhrd Exp $
+
+  13 Dec 2004; Armando Di Cianno <fafhrd@gentoo.org> -files/helloworld.m,
+  gnustep-make-1.10.0-r1.ebuild, -gnustep-make-1.10.0.ebuild,
+  -gnustep-make-1.10.1_pre20041030-r1.ebuild,
+  -gnustep-make-1.10.1_pre20041030.ebuild,
+  -gnustep-make-1.10.1_pre20041116.ebuild,
+  gnustep-make-1.10.1_pre20041203.ebuild:
+  Cleaned up detection of objc and libff; general cleanups
 
   05 Dec 2004; Armando Di Cianno <fafhrd@gentoo.org>
   gnustep-make-1.10.1_pre20041203.ebuild:
diff --git a/gnustep-base/gnustep-make/Manifest b/gnustep-base/gnustep-make/Manifest
index bf9522b732d5..2a4d2c21a363 100644
--- a/gnustep-base/gnustep-make/Manifest
+++ b/gnustep-base/gnustep-make/Manifest
@@ -1,17 +1,8 @@
-MD5 1dd1a6eda21348216981bfe902aac512 gnustep-make-1.10.1_pre20041116.ebuild 6804
-MD5 ae1aaa05a220a14b3ecc49095a45deb0 gnustep-make-1.10.0.ebuild 2629
-MD5 438fde2802a4fab9ded98e13fdccc287 gnustep-make-1.10.1_pre20041030.ebuild 2885
-MD5 a5e0f21454d9d7bcd9580992eadf66eb gnustep-make-1.10.0-r1.ebuild 6623
-MD5 d08de5046cf82d5acb49ccaf3ab515d8 gnustep-make-1.10.1_pre20041030-r1.ebuild 6810
-MD5 2e4442f91e1b70c77b8b564f303f64cb ChangeLog 6489
+MD5 0024521e5465f07bdd4e79e0b13a259d gnustep-make-1.10.0-r1.ebuild 6434
+MD5 8e643e2ced7140675ba34585f0d209f9 ChangeLog 6859
 MD5 ca04d409726e17e7151b832de9989a48 metadata.xml 530
-MD5 4cdd0e0167d23956cd034f9634dd997d gnustep-make-1.10.1_pre20041203.ebuild 7071
-MD5 4ba1b8533c9b3b56077617796abc9ab6 files/helloworld.m 1004
+MD5 e06e1e19d307e0fee039a5e94c273cdc gnustep-make-1.10.1_pre20041203.ebuild 6617
 MD5 fdb13360dfc78ccdc3c75a5da84b46ab files/make-user-defaults.patch-1.10.0 1282
 MD5 ff55be8ebf757b97d823bb3cf08b8bc4 files/GNUstep-reset.sh.patch 2121
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-make-1.10.1_pre20041030-r1 0
-MD5 020f6b825d80a9769c36a39877f13f44 files/digest-gnustep-make-1.10.0 71
 MD5 020f6b825d80a9769c36a39877f13f44 files/digest-gnustep-make-1.10.0-r1 71
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-make-1.10.1_pre20041030 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-make-1.10.1_pre20041116 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-make-1.10.1_pre20041203 0
diff --git a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.0 b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.0
deleted file mode 100644
index a6f51a10dfba..000000000000
--- a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bfd0f6530b938e7ee1d5a300219a0ab3 gnustep-make-1.10.0.tar.gz 372852
diff --git a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20041030 b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20041030
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20041030
+++ /dev/null
diff --git a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20041030-r1 b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20041030-r1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20041030-r1
+++ /dev/null
diff --git a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20041116 b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20041116
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20041116
+++ /dev/null
diff --git a/gnustep-base/gnustep-make/files/helloworld.m b/gnustep-base/gnustep-make/files/helloworld.m
deleted file mode 100644
index af2414df1c03..000000000000
--- a/gnustep-base/gnustep-make/files/helloworld.m
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * This example taken from the tutorial at:
- * http://gnustep.made-it.com/GSPT/xml/Tutorial_en.html
- *
- <quote>
- A GNUstep Programming Tutorial
- Time is on our side...
- Yen-Ju Chen
- Dennis Leeuw
-
- Copyright � 2003 Yen-Ju Chen, Dennis Leeuw
-
- Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
- </quote>
- */
-
-#include <objc/Object.h>
-
-@interface Greeter:Object
-{
-  /* This is left empty on purpose:
-   ** Normally instance variables would be declared here,
-   ** but these are not used in our example.
-   */
-}
-
-- (void)greet;
-
-@end
-
-#include <stdio.h>
-
-@implementation Greeter
-
-- (void)greet
-{
-	printf("Hello, World!\n");
-}
-
-@end
-
-#include <stdlib.h>
-
-int main(void)
-{
-	id myGreeter;
-	myGreeter=[Greeter new];
-
-	[myGreeter greet];
-
-	[myGreeter free];
-	return EXIT_SUCCESS;
-}
-
diff --git a/gnustep-base/gnustep-make/gnustep-make-1.10.0-r1.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.10.0-r1.ebuild
index 6525868368b3..67f22307c61d 100644
--- a/gnustep-base/gnustep-make/gnustep-make-1.10.0-r1.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-1.10.0-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-make/gnustep-make-1.10.0-r1.ebuild,v 1.1 2004/11/12 03:46:56 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.0-r1.ebuild,v 1.2 2004/12/13 23:06:59 fafhrd Exp $
 
 inherit gnustep
 
@@ -8,7 +8,7 @@ DESCRIPTION="The makefile package is a simple, powerful and extensible way to wr
 
 HOMEPAGE="http://www.gnustep.org"
 SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-KEYWORDS="~ppc ~x86 ~amd64 ~sparc ~alpha"
+KEYWORDS="ppc ~x86 amd64 ~sparc ~alpha"
 SLOT="0"
 LICENSE="GPL-2"
 
@@ -24,11 +24,10 @@ egnustep_install_domain "System"
 pkg_setup() {
 	gnustep_pkg_setup
 
-	# okay, I couldn't figure out how to check if a dependency was
-	#  compiled with a specific use flag, so we do it ./configure
-	#  check-for-lib style ...
-	gcc ${FILESDIR}/helloworld.m -o $TMP/helloworld -lobjc || die \
-		"gcc must be compiled with Objective-C support! See the objc USE flag."
+	if [ "$(objc_available)" == "no" ]; then
+		objc_not_available_info
+		die "ObjC support not available"
+	fi
 
 	if use layout-from-conf-file && use layout-osx-like ; then
 		eerror "layout-from-conf-file and layout-osx-like are mutually exclusive use flags."
diff --git a/gnustep-base/gnustep-make/gnustep-make-1.10.0.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.10.0.ebuild
deleted file mode 100644
index 45351c5eb0e0..000000000000
--- a/gnustep-base/gnustep-make/gnustep-make-1.10.0.ebuild
+++ /dev/null
@@ -1,88 +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-make/gnustep-make-1.10.0.ebuild,v 1.5 2004/11/12 03:46:56 fafhrd Exp $
-
-inherit gnustep
-
-DESCRIPTION="The makefile package is a simple, powerful and extensible way to write makefiles for a GNUstep-based project."
-
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~alpha"
-SLOT="0"
-LICENSE="GPL-2"
-
-IUSE="${IUSE} doc"
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	>=sys-devel/make-3.75
-	${DOC_DEPEND}"
-RDEPEND="${DEPEND}
-	${DOC_RDEPEND}"
-
-pkg_setup() {
-	gnustep_pkg_setup
-
-	# okay, I couldn't figure out how to check if a dependency was
-	#  compiled with a specific use flag, so we do it ./configure
-	#  check-for-lib style ...
-	gcc ${FILESDIR}/helloworld.m -o $TMP/helloworld -lobjc || die \
-		"gcc must be compiled with Objective-C support! See the objc USE flag."
-}
-
-src_unpack() {
-	unpack ${A}
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/make-user-defaults.patch-${PV}
-}
-
-src_compile() {
-	cd ${S}
-
-	myconf="--prefix=${GENTOO_GNUSTEP_ROOT}"
-	myconf="$myconf --with-network-root=${GENTOO_GNUSTEP_ROOT}/Network"
-	myconf="$myconf --with-tar=/bin/tar"
-	econf $myconf || die "configure failed"
-
-	egnustep_make
-}
-
-src_install() {
-	. ${S}/GNUstep.sh
-
-	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
-		if use debug ; then
-			emake -j1 INSTALL_ROOT=${D} \
-				GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
-				GNUSTEP_NETWORK_ROOT=${D}${GNUSTEP_NETWORK_ROOT} \
-				GNUSTEP_LOCAL_ROOT=${D}${GNUSTEP_LOCAL_ROOT} \
-				debug=yes install || die "install has failed"
-		else
-			emake -j1 INSTALL_ROOT=${D} \
-				GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
-				GNUSTEP_NETWORK_ROOT=${D}${GNUSTEP_NETWORK_ROOT} \
-				GNUSTEP_LOCAL_ROOT=${D}${GNUSTEP_LOCAL_ROOT} \
-				install || die "install has failed"
-		fi
-	else
-		die "no Makefile found"
-	fi
-
-	. ${D}${GENTOO_GNUSTEP_ROOT}/System/Library/Makefiles/GNUstep.sh
-
-	if use doc ; then
-		cd Documentation
-		make INSTALL_ROOT=${D} \
-			GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
-			GNUSTEP_MAKEFILES=${D}${GENTOO_GNUSTEP_ROOT}/System/Library/Makefiles \
-			GNUSTEP_USER_ROOT=${TMP}/GNUstep \
-			GNUSTEP_DEFAULTS_ROOT=${TMP}/GNUstep \
-			all || die "doc build failed"
-		make INSTALL_ROOT=${D} \
-			GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
-			GNUSTEP_MAKEFILES=${D}${GENTOO_GNUSTEP_ROOT}/System/Library/Makefiles \
-			GNUSTEP_USER_ROOT=${TMP}/GNUstep \
-			GNUSTEP_DEFAULTS_ROOT=${TMP}/GNUstep \
-			install || die "doc install failed"
-		cd ..
-	fi
-}
-
diff --git a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041030-r1.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041030-r1.ebuild
deleted file mode 100644
index c36617c56480..000000000000
--- a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041030-r1.ebuild
+++ /dev/null
@@ -1,187 +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-make/gnustep-make-1.10.1_pre20041030-r1.ebuild,v 1.2 2004/11/23 20:33:32 eradicator Exp $
-
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
-ECVS_USER="anoncvs"
-ECVS_AUTH="ext"
-ECVS_MODULE="gnustep/core/make"
-ECVS_CO_OPTS="-P -D ${PV/*_pre}"
-ECVS_UP_OPTS="-dP -D ${PV/*_pre}"
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/savannah.gnu.org-gnustep"
-inherit gnustep cvs
-
-S=${WORKDIR}/${ECVS_MODULE}
-
-DESCRIPTION="The makefile package is a simple, powerful and extensible way to write makefiles for a GNUstep-based project."
-HOMEPAGE="http://www.gnustep.org"
-
-KEYWORDS="~x86 ~ppc amd64 ~sparc ~alpha"
-SLOT="0"
-LICENSE="GPL-2"
-
-IUSE="${IUSE} doc layout-from-conf-file layout-osx-like non-flattened"
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	>=sys-devel/make-3.75
-	${DOC_DEPEND}"
-RDEPEND="${DEPEND}
-	${DOC_RDEPEND}"
-
-egnustep_install_domain "System"
-
-pkg_setup() {
-	gnustep_pkg_setup
-
-	# okay, I couldn't figure out how to check if a dependency was
-	#  compiled with a specific use flag, so we do it ./configure
-	#  check-for-lib style ...
-	gcc ${FILESDIR}/helloworld.m -o $TMP/helloworld -lobjc || die \
-		"gcc must be compiled with Objective-C support! See the objc USE flag."
-
-	if use layout-from-conf-file && use layout-osx-like ; then
-		eerror "layout-from-conf-file and layout-osx-like are mutually exclusive use flags."
-		die "USE flag misconfiguration -- please correct"
-	fi
-
-	if use layout-from-conf-file || use layout-osx-like ; then
-		ewarn "USE layout-from-conf-file || layout-osx-like"
-		ewarn "Utilizing these USE flags allows one to install files in non standard"
-		ewarn "  locations vis a vis the Linux FHS -- please fully comprehend what you"
-		ewarn "  are doing when setting this USE flag."
-	fi
-
-	if use layout-from-conf-file; then
-		if [ ! -f /etc/conf.d/gnustep.env ]; then
-			eerror "There is no /etc/conf.d/gnustep.env file!"
-			eerror "Did you read the USE flag description?"
-			die "USE flag misconfiguration -- please correct"
-		else
-			unset GNUSTEP_SYSTEM_ROOT
-			unset GNUSTEP_LOCAL_ROOT
-			unset GNUSTEP_NETWORK_ROOT
-			unset GNUSTEP_USER_ROOT
-			. /etc/conf.d/gnustep.env
-			if [ -z "${GNUSTEP_SYSTEM_ROOT}" ] || [ "/" != "${GNUSTEP_SYSTEM_ROOT:0:1}" ]; then
-				eerror "GNUSTEP_SYSTEM_ROOT is missing or misconfigured in /etc/conf.d/gnustep.env"
-				eerror "GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT}"
-				die "USE flag misconfiguration -- please correct"
-			fi
-			if [ "/System" != ${GNUSTEP_SYSTEM_ROOT:$((${#GNUSTEP_SYSTEM_ROOT}-7)):7} ]; then
-				eerror "GNUSTEP_SYSTEM_ROOT must end with \"System\" -- read the USE flag directions!!!"
-				die "USE flag misconfiguration -- please correct"
-			fi
-			if [ "${GNUSTEP_LOCAL_ROOT}" ] && [ "/" != "${GNUSTEP_LOCAL_ROOT:0:1}" ]; then
-				eerror "GNUSTEP_LOCAL_ROOT is misconfigured in /etc/conf.d/gnustep.env"
-				eerror "GNUSTEP_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT}"
-				die "USE flag misconfiguration -- please correct"
-			elif [ -z "${GNUSTEP_LOCAL_ROOT}" ]; then
-				GNUSTEP_LOCAL_ROOT="$(dirname ${GNUSTEP_SYSTEM_ROOT})/Local"
-			fi
-			if [ "${GNUSTEP_NETWORK_ROOT}" ] && [ "/" != "${GNUSTEP_NETWORK_ROOT:0:1}" ]; then
-				eerror "GNUSTEP_NETWORK_ROOT is misconfigured in /etc/conf.d/gnustep.env"
-				eerror "GNUSTEP_NETWORK_ROOT=${GNUSTEP_NETWORK_ROOT}"
-				die "USE flag misconfiguration -- please correct"
-			elif [ -z "${GNUSTEP_NETWORK_ROOT}" ]; then
-				GNUSTEP_NETWORK_ROOT="$(dirname ${GNUSTEP_SYSTEM_ROOT})/Network"
-			fi
-			if [ "${GNUSTEP_USER_ROOT}" ] && [ '~' != "${GNUSTEP_USER_ROOT:0:1}" ]; then
-				eerror "GNUSTEP_USER_ROOT is misconfigured in /etc/conf.d/gnustep.env"
-				eerror "GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT}"
-				die "USE flag misconfiguration -- please correct"
-			elif [ -z "${GNUSTEP_USER_ROOT}" ]; then
-				GNUSTEP_USER_ROOT='~/GNUstep'
-			fi
-
-			egnustep_prefix "$(dirname ${GNUSTEP_SYSTEM_ROOT})"
-			egnustep_system_root "${GNUSTEP_SYSTEM_ROOT}"
-			egnustep_local_root "${GNUSTEP_LOCAL_ROOT}"
-			egnustep_network_root "${GNUSTEP_NETWORK_ROOT}"
-			egnustep_user_root "${GNUSTEP_USER_ROOT}"
-		fi
-	elif use layout-osx-like; then
-		egnustep_prefix "/"
-		egnustep_system_root "/System"
-		egnustep_local_root "/"
-		egnustep_network_root "/Network"
-		egnustep_user_root '~'
-	else
-		# setup defaults here
-		egnustep_prefix "/usr/GNUstep"
-		egnustep_system_root "/usr/GNUstep/System"
-		egnustep_local_root "/usr/GNUstep/Local"
-		egnustep_network_root "/usr/GNUstep/Network"
-		egnustep_user_root '~/GNUstep'
-	fi
-
-	einfo "GNUstep installation will be laid out thusly:"
-	einfo "\tGNUSTEP_SYSTEM_ROOT=`egnustep_system_root`"
-	einfo "\tGNUSTEP_LOCAL_ROOT=`egnustep_local_root`"
-	einfo "\tGNUSTEP_NETWORK_ROOT=`egnustep_network_root`"
-	einfo "\tGNUSTEP_USER_ROOT=`egnustep_user_root`"
-	ebeep
-	epause 10
-}
-
-src_unpack() {
-	cvs_src_unpack
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/make-user-defaults.patch-1.10.0
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/GNUstep-reset.sh.patch
-}
-
-src_compile() {
-	cd ${S}
-
-	# gnustep-make ./configure : "prefix" here is going to be where
-	#  "System" is installed -- other correct paths should be set
-	#  by econf
-	local myconf
-	myconf="--prefix=`egnustep_prefix`"
-	use non-flattened && myconf="$myconf --disable-flattened"
-	myconf="$myconf --with-tar=/bin/tar"
-	myconf="$myconf --with-local-root=`egnustep_local_root`"
-	myconf="$myconf --with-network-root=`egnustep_network_root`"
-	myconf="$myconf --with-user-root=`egnustep_user_root`"
-	econf $myconf || die "configure failed"
-
-	egnustep_make
-}
-
-src_install() {
-	. ${S}/GNUstep.sh
-
-	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
-		local make_eval="INSTALL_ROOT=\${D} \
-		GNUSTEP_SYSTEM_ROOT=\${D}\$(egnustep_system_root) \
-		GNUSTEP_NETWORK_ROOT=\${D}\$(egnustep_network_root) \
-		GNUSTEP_LOCAL_ROOT=\${D}\$(egnustep_local_root) \
-		GNUSTEP_MAKEFILES=\${D}\$(egnustep_system_root)/Library/Makefiles \
-		GNUSTEP_USER_ROOT=\${TMP} \
-		GNUSTEP_DEFAULTS_ROOT=\${TMP}/\${__GS_USER_ROOT_POSTFIX} \
-		-j1"
-
-		if use debug ; then
-			make_eval="${make_eval} debug=yes"
-		fi
-		if use verbose ; then
-			make_eval="${make_eval} verbose=yes"
-		fi
-		eval emake ${make_eval} install || die "install has failed"
-	else
-		die "no Makefile found"
-	fi
-
-	if use doc ; then
-		cd Documentation
-		eval emake ${make_eval} all || die "doc make has failed"
-		eval emake ${make_eval} install || die "doc install has failed"
-		cd ..
-	fi
-
-	dodir /etc/conf.d
-	echo "GNUSTEP_SYSTEM_ROOT=$(egnustep_system_root)" > ${D}/etc/conf.d/gnustep.env
-	echo "GNUSTEP_LOCAL_ROOT=$(egnustep_local_root)" >> ${D}/etc/conf.d/gnustep.env
-	echo "GNUSTEP_NETWORK_ROOT=$(egnustep_network_root)" >> ${D}/etc/conf.d/gnustep.env
-	echo "GNUSTEP_USER_ROOT='$(egnustep_user_root)'" >> ${D}/etc/conf.d/gnustep.env
-}
-
diff --git a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041030.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041030.ebuild
deleted file mode 100644
index 99f53028413b..000000000000
--- a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041030.ebuild
+++ /dev/null
@@ -1,97 +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-make/gnustep-make-1.10.1_pre20041030.ebuild,v 1.3 2004/11/12 03:46:56 fafhrd Exp $
-
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
-ECVS_USER="anoncvs"
-ECVS_AUTH="ext"
-ECVS_MODULE="gnustep/core/make"
-ECVS_CO_OPTS="-P -D ${PV/*_pre}"
-ECVS_UP_OPTS="-dP -D ${PV/*_pre}"
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/savannah.gnu.org-gnustep"
-inherit gnustep cvs
-
-S=${WORKDIR}/${ECVS_MODULE}
-
-DESCRIPTION="The makefile package is a simple, powerful and extensible way to write makefiles for a GNUstep-based project."
-HOMEPAGE="http://www.gnustep.org"
-
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~alpha"
-SLOT="0"
-LICENSE="GPL-2"
-
-IUSE="${IUSE} doc"
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	>=sys-devel/make-3.75
-	${DOC_DEPEND}"
-RDEPEND="${DEPEND}
-	${DOC_RDEPEND}"
-
-pkg_setup() {
-	gnustep_pkg_setup
-
-	# okay, I couldn't figure out how to check if a dependency was
-	#  compiled with a specific use flag, so we do it ./configure
-	#  check-for-lib style ...
-	gcc ${FILESDIR}/helloworld.m -o $TMP/helloworld -lobjc || die \
-		"gcc must be compiled with Objective-C support! See the objc USE flag."
-}
-
-src_unpack() {
-	cvs_src_unpack
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/make-user-defaults.patch-1.10.0
-}
-
-src_compile() {
-	cd ${S}
-
-	myconf="--prefix=${GENTOO_GNUSTEP_ROOT}"
-	myconf="$myconf --with-network-root=${GENTOO_GNUSTEP_ROOT}/Network"
-	myconf="$myconf --with-tar=/bin/tar"
-	econf $myconf || die "configure failed"
-
-	egnustep_make
-}
-
-src_install() {
-	. ${S}/GNUstep.sh
-
-	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
-		if use debug ; then
-			emake -j1 INSTALL_ROOT=${D} \
-				GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
-				GNUSTEP_NETWORK_ROOT=${D}${GNUSTEP_NETWORK_ROOT} \
-				GNUSTEP_LOCAL_ROOT=${D}${GNUSTEP_LOCAL_ROOT} \
-				debug=yes install || die "install has failed"
-		else
-			emake -j1 INSTALL_ROOT=${D} \
-				GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
-				GNUSTEP_NETWORK_ROOT=${D}${GNUSTEP_NETWORK_ROOT} \
-				GNUSTEP_LOCAL_ROOT=${D}${GNUSTEP_LOCAL_ROOT} \
-				install || die "install has failed"
-		fi
-	else
-		die "no Makefile found"
-	fi
-
-	. ${D}${GENTOO_GNUSTEP_ROOT}/System/Library/Makefiles/GNUstep.sh
-
-	if use doc ; then
-		cd Documentation
-		make INSTALL_ROOT=${D} \
-			GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
-			GNUSTEP_MAKEFILES=${D}${GENTOO_GNUSTEP_ROOT}/System/Library/Makefiles \
-			GNUSTEP_USER_ROOT=${TMP}/GNUstep \
-			GNUSTEP_DEFAULTS_ROOT=${TMP}/GNUstep \
-			all || die "doc build failed"
-		make INSTALL_ROOT=${D} \
-			GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
-			GNUSTEP_MAKEFILES=${D}${GENTOO_GNUSTEP_ROOT}/System/Library/Makefiles \
-			GNUSTEP_USER_ROOT=${TMP}/GNUstep \
-			GNUSTEP_DEFAULTS_ROOT=${TMP}/GNUstep \
-			install || die "doc install failed"
-		cd ..
-	fi
-}
-
diff --git a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041116.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041116.ebuild
deleted file mode 100644
index 5132ba0bdfd4..000000000000
--- a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041116.ebuild
+++ /dev/null
@@ -1,187 +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-make/gnustep-make-1.10.1_pre20041116.ebuild,v 1.1 2004/11/16 23:13:42 fafhrd Exp $
-
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
-ECVS_USER="anoncvs"
-ECVS_AUTH="ext"
-ECVS_MODULE="gnustep/core/make"
-ECVS_CO_OPTS="-P -D ${PV/*_pre}"
-ECVS_UP_OPTS="-dP -D ${PV/*_pre}"
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/savannah.gnu.org-gnustep"
-inherit gnustep cvs
-
-S=${WORKDIR}/${ECVS_MODULE}
-
-DESCRIPTION="The makefile package is a simple, powerful and extensible way to write makefiles for a GNUstep-based project."
-HOMEPAGE="http://www.gnustep.org"
-
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~alpha"
-SLOT="0"
-LICENSE="GPL-2"
-
-IUSE="${IUSE} doc layout-from-conf-file layout-osx-like non-flattened"
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	>=sys-devel/make-3.75
-	${DOC_DEPEND}"
-RDEPEND="${DEPEND}
-	${DOC_RDEPEND}"
-
-egnustep_install_domain "System"
-
-pkg_setup() {
-	gnustep_pkg_setup
-
-	# okay, I couldn't figure out how to check if a dependency was
-	#  compiled with a specific use flag, so we do it ./configure
-	#  check-for-lib style ...
-	gcc ${FILESDIR}/helloworld.m -o $TMP/helloworld -lobjc || die \
-		"gcc must be compiled with Objective-C support! See the objc USE flag."
-
-	if use layout-from-conf-file && use layout-osx-like ; then
-		eerror "layout-from-conf-file and layout-osx-like are mutually exclusive use flags."
-		die "USE flag misconfiguration -- please correct"
-	fi
-
-	if use layout-from-conf-file || use layout-osx-like ; then
-		ewarn "USE layout-from-conf-file || layout-osx-like"
-		ewarn "Utilizing these USE flags allows one to install files in non standard"
-		ewarn "  locations vis a vis the Linux FHS -- please fully comprehend what you"
-		ewarn "  are doing when setting this USE flag."
-	fi
-
-	if use layout-from-conf-file; then
-		if [ ! -f /etc/conf.d/gnustep.env ]; then
-			eerror "There is no /etc/conf.d/gnustep.env file!"
-			eerror "Did you read the USE flag description?"
-			die "USE flag misconfiguration -- please correct"
-		else
-			unset GNUSTEP_SYSTEM_ROOT
-			unset GNUSTEP_LOCAL_ROOT
-			unset GNUSTEP_NETWORK_ROOT
-			unset GNUSTEP_USER_ROOT
-			. /etc/conf.d/gnustep.env
-			if [ -z "${GNUSTEP_SYSTEM_ROOT}" ] || [ "/" != "${GNUSTEP_SYSTEM_ROOT:0:1}" ]; then
-				eerror "GNUSTEP_SYSTEM_ROOT is missing or misconfigured in /etc/conf.d/gnustep.env"
-				eerror "GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT}"
-				die "USE flag misconfiguration -- please correct"
-			fi
-			if [ "/System" != ${GNUSTEP_SYSTEM_ROOT:$((${#GNUSTEP_SYSTEM_ROOT}-7)):7} ]; then
-				eerror "GNUSTEP_SYSTEM_ROOT must end with \"System\" -- read the USE flag directions!!!"
-				die "USE flag misconfiguration -- please correct"
-			fi
-			if [ "${GNUSTEP_LOCAL_ROOT}" ] && [ "/" != "${GNUSTEP_LOCAL_ROOT:0:1}" ]; then
-				eerror "GNUSTEP_LOCAL_ROOT is misconfigured in /etc/conf.d/gnustep.env"
-				eerror "GNUSTEP_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT}"
-				die "USE flag misconfiguration -- please correct"
-			elif [ -z "${GNUSTEP_LOCAL_ROOT}" ]; then
-				GNUSTEP_LOCAL_ROOT="$(dirname ${GNUSTEP_SYSTEM_ROOT})/Local"
-			fi
-			if [ "${GNUSTEP_NETWORK_ROOT}" ] && [ "/" != "${GNUSTEP_NETWORK_ROOT:0:1}" ]; then
-				eerror "GNUSTEP_NETWORK_ROOT is misconfigured in /etc/conf.d/gnustep.env"
-				eerror "GNUSTEP_NETWORK_ROOT=${GNUSTEP_NETWORK_ROOT}"
-				die "USE flag misconfiguration -- please correct"
-			elif [ -z "${GNUSTEP_NETWORK_ROOT}" ]; then
-				GNUSTEP_NETWORK_ROOT="$(dirname ${GNUSTEP_SYSTEM_ROOT})/Network"
-			fi
-			if [ "${GNUSTEP_USER_ROOT}" ] && [ '~' != "${GNUSTEP_USER_ROOT:0:1}" ]; then
-				eerror "GNUSTEP_USER_ROOT is misconfigured in /etc/conf.d/gnustep.env"
-				eerror "GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT}"
-				die "USE flag misconfiguration -- please correct"
-			elif [ -z "${GNUSTEP_USER_ROOT}" ]; then
-				GNUSTEP_USER_ROOT='~/GNUstep'
-			fi
-
-			egnustep_prefix "$(dirname ${GNUSTEP_SYSTEM_ROOT})"
-			egnustep_system_root "${GNUSTEP_SYSTEM_ROOT}"
-			egnustep_local_root "${GNUSTEP_LOCAL_ROOT}"
-			egnustep_network_root "${GNUSTEP_NETWORK_ROOT}"
-			egnustep_user_root "${GNUSTEP_USER_ROOT}"
-		fi
-	elif use layout-osx-like; then
-		egnustep_prefix "/"
-		egnustep_system_root "/System"
-		egnustep_local_root "/"
-		egnustep_network_root "/Network"
-		egnustep_user_root '~'
-	else
-		# setup defaults here
-		egnustep_prefix "/usr/GNUstep"
-		egnustep_system_root "/usr/GNUstep/System"
-		egnustep_local_root "/usr/GNUstep/Local"
-		egnustep_network_root "/usr/GNUstep/Network"
-		egnustep_user_root '~/GNUstep'
-	fi
-
-	einfo "GNUstep installation will be laid out thusly:"
-	einfo "\tGNUSTEP_SYSTEM_ROOT=`egnustep_system_root`"
-	einfo "\tGNUSTEP_LOCAL_ROOT=`egnustep_local_root`"
-	einfo "\tGNUSTEP_NETWORK_ROOT=`egnustep_network_root`"
-	einfo "\tGNUSTEP_USER_ROOT=`egnustep_user_root`"
-	ebeep
-	epause 10
-}
-
-src_unpack() {
-	cvs_src_unpack
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/make-user-defaults.patch-1.10.0
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/GNUstep-reset.sh.patch
-}
-
-src_compile() {
-	cd ${S}
-
-	# gnustep-make ./configure : "prefix" here is going to be where
-	#  "System" is installed -- other correct paths should be set
-	#  by econf
-	local myconf
-	myconf="--prefix=`egnustep_prefix`"
-	use non-flattened && myconf="$myconf --disable-flattened"
-	myconf="$myconf --with-tar=/bin/tar"
-	myconf="$myconf --with-local-root=`egnustep_local_root`"
-	myconf="$myconf --with-network-root=`egnustep_network_root`"
-	myconf="$myconf --with-user-root=`egnustep_user_root`"
-	econf $myconf || die "configure failed"
-
-	egnustep_make
-}
-
-src_install() {
-	. ${S}/GNUstep.sh
-
-	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
-		local make_eval="INSTALL_ROOT=\${D} \
-		GNUSTEP_SYSTEM_ROOT=\${D}\$(egnustep_system_root) \
-		GNUSTEP_NETWORK_ROOT=\${D}\$(egnustep_network_root) \
-		GNUSTEP_LOCAL_ROOT=\${D}\$(egnustep_local_root) \
-		GNUSTEP_MAKEFILES=\${D}\$(egnustep_system_root)/Library/Makefiles \
-		GNUSTEP_USER_ROOT=\${TMP} \
-		GNUSTEP_DEFAULTS_ROOT=\${TMP}/\${__GS_USER_ROOT_POSTFIX} \
-		-j1"
-
-		if use debug ; then
-			make_eval="${make_eval} debug=yes"
-		fi
-		if use verbose ; then
-			make_eval="${make_eval} verbose=yes"
-		fi
-		eval emake ${make_eval} install || die "install has failed"
-	else
-		die "no Makefile found"
-	fi
-
-	if use doc ; then
-		cd Documentation
-		eval emake ${make_eval} all || die "doc make has failed"
-		eval emake ${make_eval} install || die "doc install has failed"
-		cd ..
-	fi
-
-	dodir /etc/conf.d
-	echo "GNUSTEP_SYSTEM_ROOT=$(egnustep_system_root)" > ${D}/etc/conf.d/gnustep.env
-	echo "GNUSTEP_LOCAL_ROOT=$(egnustep_local_root)" >> ${D}/etc/conf.d/gnustep.env
-	echo "GNUSTEP_NETWORK_ROOT=$(egnustep_network_root)" >> ${D}/etc/conf.d/gnustep.env
-	echo "GNUSTEP_USER_ROOT='$(egnustep_user_root)'" >> ${D}/etc/conf.d/gnustep.env
-}
-
diff --git a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041203.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041203.ebuild
index 870af8aa6695..e4f3b8b1b9b1 100644
--- a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041203.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041203.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-make/gnustep-make-1.10.1_pre20041203.ebuild,v 1.2 2004/12/05 21:36:57 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041203.ebuild,v 1.3 2004/12/13 23:06:59 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
@@ -33,11 +33,10 @@ egnustep_install_domain "System"
 pkg_setup() {
 	gnustep_pkg_setup
 
-	# okay, I couldn't figure out how to check if a dependency was
-	#  compiled with a specific use flag, so we do it ./configure
-	#  check-for-lib style ...
-	gcc ${FILESDIR}/helloworld.m -o $TMP/helloworld -lobjc || die \
-		"gcc must be compiled with Objective-C support! See the objc USE flag.  NOTE: if you have to recompile gcc anyway, now may be the time to also add the 'gcj' use flag, so that libffi will also be compiled.  Any gcc-3 version with 'gcj' should work, however, if you are testing >=gcc-3.4.3-r1 'objc' USE flag on should also install libffi."
+	if [ "$(objc_available)" == "no" ]; then
+		objc_not_available_info
+		die "ObjC support not available"
+	fi
 
 	if use layout-from-conf-file && use layout-osx-like ; then
 		eerror "layout-from-conf-file and layout-osx-like are mutually exclusive use flags."
diff --git a/gnustep-base/mknfonts/ChangeLog b/gnustep-base/mknfonts/ChangeLog
index ce5a558781e9..5ba03ede3547 100644
--- a/gnustep-base/mknfonts/ChangeLog
+++ b/gnustep-base/mknfonts/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnustep-base/mknfonts
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/mknfonts/ChangeLog,v 1.8 2004/11/23 20:40:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/mknfonts/ChangeLog,v 1.9 2004/12/13 23:09:06 fafhrd Exp $
+
+  13 Dec 2004; Armando Di Cianno <fafhrd@gentoo.org> mknfonts-0.5.ebuild:
+  Cleaned up detection of objc and libff; general cleanups
 
   23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
   mknfonts-0.5.ebuild:
diff --git a/gnustep-base/mknfonts/Manifest b/gnustep-base/mknfonts/Manifest
index 15ebc7fbe7a1..c49e576a3377 100644
--- a/gnustep-base/mknfonts/Manifest
+++ b/gnustep-base/mknfonts/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d338e94d3cb152e65102e955f7821630 ChangeLog 1220
+MD5 4a11f11e3b2a3b644c454de1adb5f3e9 mknfonts-0.5.ebuild 685
+MD5 030a6973677858008ede95f289257122 ChangeLog 1354
 MD5 459d449951c0cddb6f8c892a247ef78f metadata.xml 293
-MD5 e6d46273fd4a85e61b998811bfb0d57d mknfonts-0.5.ebuild 686
 MD5 0d9da4daa8baa4f7d051077a6da4f2c3 files/digest-mknfonts-0.5 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBo6BVArHZZzCEUG0RAgwaAJ98BMRo8vSdQQWaMgm7ZkubNBKzZgCdEZuQ
-52mf88WPT8rU/X3KALLLz2w=
-=066H
------END PGP SIGNATURE-----
diff --git a/gnustep-base/mknfonts/mknfonts-0.5.ebuild b/gnustep-base/mknfonts/mknfonts-0.5.ebuild
index 052e9cad7e69..03348e9cdd9e 100644
--- a/gnustep-base/mknfonts/mknfonts-0.5.ebuild
+++ b/gnustep-base/mknfonts/mknfonts-0.5.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/mknfonts/mknfonts-0.5.ebuild,v 1.7 2004/11/23 20:36:54 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/mknfonts/mknfonts-0.5.ebuild,v 1.8 2004/12/13 23:09:06 fafhrd Exp $
 
 inherit eutils gnustep
 
@@ -8,7 +8,7 @@ DESCRIPTION="Provides the tool to create .nfont packages suitable for use with g
 
 HOMEPAGE="http://w1.423.telia.com/~u42308495/alex/backart/"
 SRC_URI="http://w1.423.telia.com/~u42308495/alex/backart/mknfonts-0.5.tar.gz"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha amd64"
+KEYWORDS="~x86 ppc ~sparc ~alpha amd64"
 SLOT="0"
 LICENSE="GPL-2"
author	Armando Di Cianno <fafhrd@gentoo.org>	2004-12-13 23:09:06 +0000
committer	Armando Di Cianno <fafhrd@gentoo.org>	2004-12-13 23:09:06 +0000
commit	54605564181d09b2a8e6b092693b9aa840cd96ef (patch)
tree	b4d974e063ccad409b603c65a45078f6c9616b02
parent	Cleanup relating to choice of dev-lib/libffi or gcc with gcj or obcj use flag... (diff)
download	historical-54605564181d09b2a8e6b092693b9aa840cd96ef.tar.gz historical-54605564181d09b2a8e6b092693b9aa840cd96ef.tar.bz2 historical-54605564181d09b2a8e6b092693b9aa840cd96ef.zip