ebuild updates for GNUstep base, libs, and apps across the board; proper versions (to be stabilized, in due time) added where apropos, cvs-pull versions updated where needed

(Portage version: 2.0.51.19)

13 files changed, 155 insertions, 69 deletions

diff --git a/gnustep-base/gnustep-back-xlib/ChangeLog b/gnustep-base/gnustep-back-xlib/ChangeLog
index 849afabb69c5..f6d064942f08 100644
--- a/gnustep-base/gnustep-back-xlib/ChangeLog
+++ b/gnustep-base/gnustep-back-xlib/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnustep-base/gnustep-back-xlib
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/ChangeLog,v 1.12 2005/01/10 16:23:15 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/ChangeLog,v 1.13 2005/03/17 20:55:08 fafhrd Exp $
+
+*gnustep-back-xlib-0.9.5_pre20050312 (17 Mar 2005)
+
+  17 Mar 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  +files/font-make-fix.patch-0.9.5_pre20050312,
+  -gnustep-back-xlib-0.9.5_pre20041203.ebuild,
+  -gnustep-back-xlib-0.9.5_pre20050106.ebuild,
+  +gnustep-back-xlib-0.9.5_pre20050312.ebuild:
+  ebuild updates for GNUstep base, libs, and apps across the board; proper
+  versions (to be stabilized, in due time) added where apropos, cvs-pull
+  versions updated where needed
 
 *gnustep-back-xlib-0.9.5_pre20050106 (10 Jan 2005)
 
diff --git a/gnustep-base/gnustep-back-xlib/Manifest b/gnustep-base/gnustep-back-xlib/Manifest
index b09d13724f60..8fc098ebe06c 100644
--- a/gnustep-base/gnustep-back-xlib/Manifest
+++ b/gnustep-base/gnustep-back-xlib/Manifest
@@ -1,9 +1,8 @@
-MD5 9fd8da560009a11bd153f8a87bfe8219 gnustep-back-xlib-0.9.5_pre20050106.ebuild 1250
-MD5 c6ec14987937ebe2b39bde8fd7dd3508 gnustep-back-xlib-0.9.5_pre20041203.ebuild 1250
-MD5 da93923431441b659098180464e6f996 gnustep-back-xlib-0.9.4.ebuild 1044
 MD5 fab2165da115acddd806d207e07f95d0 ChangeLog 2977
 MD5 ef356714ab02a84c6e88fe3720749aea metadata.xml 1022
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-back-xlib-0.9.5_pre20041203 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-back-xlib-0.9.5_pre20050106 0
-MD5 9c943c0c0837bfe718a98769bc25d366 files/digest-gnustep-back-xlib-0.9.4 70
+MD5 5f2833c7c77395d7700d355e79a0973d gnustep-back-xlib-0.9.5_pre20050312.ebuild 1231
+MD5 da93923431441b659098180464e6f996 gnustep-back-xlib-0.9.4.ebuild 1044
 MD5 14c86d6ff5e83af36ad3d54266af5c99 files/config-gnustep-back-xlib.sh 181
+MD5 f9dd4c1b68af4bef2e272d82202323ea files/font-make-fix.patch-0.9.5_pre20050312 501
+MD5 9c943c0c0837bfe718a98769bc25d366 files/digest-gnustep-back-xlib-0.9.4 70
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-back-xlib-0.9.5_pre20050312 0
diff --git a/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20041203 b/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20050312
index e69de29bb2d1..e69de29bb2d1 100644
--- a/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20041203
+++ b/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20050312
diff --git a/gnustep-base/gnustep-back-xlib/files/font-make-fix.patch-0.9.5_pre20050312 b/gnustep-base/gnustep-back-xlib/files/font-make-fix.patch-0.9.5_pre20050312
new file mode 100644
index 000000000000..5554a8b712a7
--- /dev/null
+++ b/gnustep-base/gnustep-back-xlib/files/font-make-fix.patch-0.9.5_pre20050312
@@ -0,0 +1,12 @@
+diff -ur Fonts/GNUmakefile Fonts/GNUmakefile
+--- Fonts/GNUmakefile	2005-03-12 23:06:51.808553304 -0500
++++ Fonts/GNUmakefile	2005-02-22 22:47:34.000000000 -0500
+@@ -27,7 +27,7 @@
+ include $(GNUSTEP_MAKEFILES)/common.make
+ 
+ #RESOURCE_SET_NAME = back-resources
+-back-resources_RESOURCE_FILES_INSTALL_DIR = Library/Fonts
++back-resources_RESOURCE_FILES_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Fonts
+ back-resources_RESOURCE_FILES = $(FONT_INSTALL_FILES)
+ 
+ FONT_INSTALL_FILES = Helvetica.nfont
diff --git a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20050106.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20050106.ebuild
deleted file mode 100644
index 100fbf863f0b..000000000000
--- a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20050106.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 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_pre20050106.ebuild,v 1.1 2005/01/10 16:23:15 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_pre20041203.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20050312.ebuild
index 3ad0784f3dd7..0200d6557935 100644
--- a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20041203.ebuild
+++ b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20050312.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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_pre20041203.ebuild,v 1.2 2005/01/10 16:23:15 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20050312.ebuild,v 1.1 2005/03/17 20:55:08 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
@@ -33,6 +33,12 @@ RDEPEND="${DEPEND}
 
 egnustep_install_domain "System"
 
+src_unpack() {
+	cvs_src_unpack ${A}
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/font-make-fix.patch-${PV}
+	cd ${S}
+}
+
 src_compile() {
 	egnustep_env
 
diff --git a/gnustep-base/gnustep-env/ChangeLog b/gnustep-base/gnustep-env/ChangeLog
index 9ef2a8a4f4fb..078dadb94582 100644
--- a/gnustep-base/gnustep-env/ChangeLog
+++ b/gnustep-base/gnustep-env/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnustep-base/gnustep-env
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-env/ChangeLog,v 1.13 2005/03/12 11:43:26 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-env/ChangeLog,v 1.14 2005/03/17 20:55:59 fafhrd Exp $
+
+*gnustep-env-0.1.6 (17 Mar 2005)
+
+  17 Mar 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  +files/gnustep.env-0.1.6, +files/gnustep.runscript-0.1.6,
+  gnustep-env-0.1.5.ebuild, +gnustep-env-0.1.6.ebuild:
+  ebuild updates for GNUstep base, libs, and apps across the board; proper
+  versions (to be stabilized, in due time) added where apropos, cvs-pull
+  versions updated where needed
 
   12 Mar 2005; Eric Shattow <jnc@gentoo.org> gnustep-env-0.1.4.ebuild:
   quasi-stable on x86 (fixes broken dependency tracking in stable arch)
diff --git a/gnustep-base/gnustep-env/Manifest b/gnustep-base/gnustep-env/Manifest
index dfaff8a85c9a..85c3f1cc797c 100644
--- a/gnustep-base/gnustep-env/Manifest
+++ b/gnustep-base/gnustep-env/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 7163891cbbaf64de56ee85b45970507e ChangeLog 2845
 MD5 f61990fa6c6fb4772239840f832cac4b gnustep-env-0.1.4.ebuild 1198
-MD5 683ed938f678c1dad3737b6c3db75570 gnustep-env-0.1.5.ebuild 1514
 MD5 c603ed4d589dc2091e618436e4de9c78 metadata.xml 371
+MD5 955db58bb8f28c7074ac5d1c8ce1a20a gnustep-env-0.1.6.ebuild 1408
+MD5 15e40e50c9f63742032688d1e6166299 gnustep-env-0.1.5.ebuild 1565
 MD5 766b0cb8343bea6f212694c1fd261335 files/10gnustep 36
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-env-0.1.4 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-env-0.1.5 0
@@ -12,10 +10,6 @@ MD5 1588a64b28bc5eb05d1c93571ad340b1 files/gnustep.env-0.1.4 586
 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)
-
-iD8DBQFCMtbY+uC/ViVka/0RAoMhAKCFqF9LwyX2abFWdgIbgdf2dACRYACgiTfI
-4MceodqaeHRcVRDgFv3N2LQ=
-=nFof
------END PGP SIGNATURE-----
+MD5 9b9d12281e414534a0e1fbd04cb3e2d1 files/gnustep.env-0.1.6 682
+MD5 fc067eeb87dd2dbfc9cf4f2c4e1df860 files/gnustep.runscript-0.1.6 1006
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-env-0.1.6 0
diff --git a/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20050106 b/gnustep-base/gnustep-env/files/digest-gnustep-env-0.1.6
index e69de29bb2d1..e69de29bb2d1 100644
--- a/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20050106
+++ b/gnustep-base/gnustep-env/files/digest-gnustep-env-0.1.6
diff --git a/gnustep-base/gnustep-env/files/gnustep.env-0.1.6 b/gnustep-base/gnustep-env/files/gnustep.env-0.1.6
new file mode 100644
index 000000000000..364c5fece416
--- /dev/null
+++ b/gnustep-base/gnustep-env/files/gnustep.env-0.1.6
@@ -0,0 +1,4 @@
+MANPATH="XXX_GNUSTEP_USER_ROOT_XXX/Library/Documentation/man:XXX_GNUSTEP_LOCAL_ROOT_XXX/Library/Documentation/man:XXX_GNUSTEP_NETWORK_ROOT_XXX/Library/Documentation/man:XXX_GNUSTEP_SYSTEM_ROOT_XXX/Library/Documentation/man"
+INFOPATH="XXX_GNUSTEP_USER_ROOT_XXX/Library/Documentation/info:XXX_GNUSTEP_LOCAL_ROOT_XXX/Library/Documentation/info:XXX_GNUSTEP_NETWORK_ROOT_XXX/Library/Documentation/info:XXX_GNUSTEP_SYSTEM_ROOT_XXX/Library/Documentation/info"
+INFODIR="XXX_GNUSTEP_USER_ROOT_XXX/Library/Documentation/info:XXX_GNUSTEP_LOCAL_ROOT_XXX/Library/Documentation/info:XXX_GNUSTEP_NETWORK_ROOT_XXX/Library/Documentation/info:XXX_GNUSTEP_SYSTEM_ROOT_XXX/Library/Documentation/info"
+
diff --git a/gnustep-base/gnustep-env/files/gnustep.runscript-0.1.6 b/gnustep-base/gnustep-env/files/gnustep.runscript-0.1.6
new file mode 100755
index 000000000000..4383517c9d04
--- /dev/null
+++ b/gnustep-base/gnustep-env/files/gnustep.runscript-0.1.6
@@ -0,0 +1,51 @@
+#!/sbin/runscript
+#
+# (c) 2003 Dennis Leeuw
+# License: GPL version 2 or any newer version
+#
+# Modifications, truncation, and gentoo-ification:
+# Copyright 2004 Gentoo Technologies, Inc.
+
+if [ -f /etc/conf.d/gnustep.env ]; then
+	. /etc/conf.d/gnustep.env
+else
+	GNUSTEP_SYSTEM_ROOT="/usr/GNUstep/System"
+fi
+. ${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles/GNUstep.sh
+
+start() {
+#	ebegin "Starting gnustep daemons"
+
+	ebegin "Starting gdomap "
+	GNUSTEP_USER_ROOT=/var/run/GNUstep \
+		GNUSTEP_DEFAULTS_ROOT=/var/run/GNUstep \
+		gdomap
+	eend $?
+	ebegin "Starting gdnc "
+	GNUSTEP_USER_ROOT=/var/run/GNUstep \
+		GNUSTEP_DEFAULTS_ROOT=/var/run/GNUstep \
+		gdnc &
+	eend $?
+#	ebegin "\tgnustep_sndd"
+#	GNUSTEP_USER_ROOT=/var/run/GNUstep \
+#	GNUSTEP_DEFAULTS_ROOT=/var/run/GNUstep \
+#		/gnustep_sndd
+#	eend $?
+}
+
+stop() {
+#	ebegin "Stopping gnustep daemons"
+
+	ebegin "Stopping gdomap "
+	killall gdomap
+	eend $?
+	
+	ebegin "Stopping gdnc "
+	killall gdnc
+	eend $?
+
+#	ebegin "\tgnustep_sndd"
+#	killall gnustep_sndd
+#	eend $?
+}
+
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 b8b9067ad21d..1c455a89e967 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-2005 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.4 2005/03/12 11:43:26 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-env/gnustep-env-0.1.5.ebuild,v 1.5 2005/03/17 20:55:59 fafhrd Exp $
 
 inherit gnustep
 
@@ -15,7 +15,10 @@ KEYWORDS="~x86 ppc ~alpha ~sparc amd64"
 IUSE=""
 DEPEND="${GS_DEPEND}
 	>=gnustep-base/gnustep-base-1.10.1"
-RDEPEND="${GS_RDEPEND}"
+RDEPEND="${DEPEND}
+	${DEBUG_DEPEND}
+	${DOC_RDEPEND}
+	virtual/gnustep-back"
 
 egnustep_install_domain="System"
 
diff --git a/gnustep-base/gnustep-env/gnustep-env-0.1.6.ebuild b/gnustep-base/gnustep-env/gnustep-env-0.1.6.ebuild
new file mode 100644
index 000000000000..7a36409edbfc
--- /dev/null
+++ b/gnustep-base/gnustep-env/gnustep-env-0.1.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2005 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.6.ebuild,v 1.1 2005/03/17 20:55:59 fafhrd Exp $
+
+inherit gnustep
+
+DESCRIPTION="This is a convience package that installs all base GNUstep libraries, convenience scripts, and environment settings for use on Gentoo."
+# These are support files for GNUstep on Gentoo, so setting
+#   homepage thusly
+HOMEPAGE="http://www.gnustep.org"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
+
+IUSE=""
+DEPEND="${GS_DEPEND}
+	>=gnustep-base/gnustep-base-1.10.1"
+RDEPEND="${GS_RDEPEND}"
+
+egnustep_install_domain="System"
+
+src_unpack() {
+	echo "nothing to unpack"
+}
+
+src_compile() {
+	echo "nothing to compile"
+}
+
+src_install() {
+	egnustep_env
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/gnustep.runscript-${PV} gnustep
+	#dosed "s:XXX_GENTOO_GNUSTEP_ROOT_XXX:$(egnstep_prefix):g" /etc/init.d/gnustep
+	insinto /etc/env.d
+	newins ${FILESDIR}/gnustep.env-${PV} 99gnustep
+	dosed "s:XXX_GNUSTEP_USER_ROOT_XXX:~$(egnustep_user_root_suffix):g" /etc/env.d/99gnustep
+	dosed "s:XXX_GNUSTEP_LOCAL_ROOT_XXX:$(egnustep_local_root):g" /etc/env.d/99gnustep
+	dosed "s:XXX_GNUSTEP_NETWORK_ROOT_XXX:$(egnustep_network_root):g" /etc/env.d/99gnustep
+	dosed "s:XXX_GNUSTEP_SYSTEM_ROOT_XXX:$(egnustep_system_root):g" /etc/env.d/99gnustep
+	dodir /var/run/GNUstep
+	einfo "Check http://dev.gentoo.org/~fafhrd/ for very handy info in setting up your GNUstep env."
+}
+