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

7 files changed, 124 insertions, 10 deletions

diff --git a/gnustep-base/gnustep-env/ChangeLog b/gnustep-base/gnustep-env/ChangeLog
index b5e0425babb0..88076ab3c117 100644
--- a/gnustep-base/gnustep-env/ChangeLog
+++ b/gnustep-base/gnustep-env/ChangeLog
@@ -1,6 +1,17 @@
 # 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.8 2004/10/31 16:01:30 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-env/ChangeLog,v 1.9 2004/11/12 03:48:44 fafhrd Exp $
+
+*gnustep-env-0.1.5 (11 Nov 2004)
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org> +files/gnustep.env-0.1.5,
+  +files/gnustep.runscript-0.1.5, gnustep-env-0.1.4.ebuild,
+  +gnustep-env-0.1.5.ebuild:
+  Mass Update: gnustep.eclass revamped to allow configurable root install;
+  gnustep-base/libs/apps updated to utilize new gnustep.eclass (only versions
+  bumped where files would change); some KEYWORDS were accidentally dropped
+  between version bumps of packages -- this has been resolved; windowmaker
+  correctly supports gnustep now
 
   31 Oct 2004; Jason Wever <weeve@gentoo.org> gnustep-env-0.1.4.ebuild:
   Added ~sparc keyword.
diff --git a/gnustep-base/gnustep-env/Manifest b/gnustep-base/gnustep-env/Manifest
index 463eba7f95e6..00b147df0613 100644
--- a/gnustep-base/gnustep-env/Manifest
+++ b/gnustep-base/gnustep-env/Manifest
@@ -1,9 +1,13 @@
-MD5 7cb3a579d289139dc36aaeebf7a86772 gnustep-env-0.1.4.ebuild 1175
-MD5 c603ed4d589dc2091e618436e4de9c78 metadata.xml 371
+MD5 4983d9a117db4db81834ad317244bbdf gnustep-env-0.1.4.ebuild 1201
+MD5 27a1021fcc0ac5de4813e3dbe673edec gnustep-env-0.1.5.ebuild 1408
 MD5 1e82c3c29105707ada1b6bce01e6cb0f gnustep-env-0.1.ebuild 563
-MD5 1ccad74b33dd4851a113f792a42077a1 ChangeLog 1880
-MD5 766b0cb8343bea6f212694c1fd261335 files/10gnustep 36
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-env-0.1 0
+MD5 f1c64c589577b13f8e40a14514bd90c8 ChangeLog 2420
+MD5 c603ed4d589dc2091e618436e4de9c78 metadata.xml 371
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-env-0.1.4 0
-MD5 1588a64b28bc5eb05d1c93571ad340b1 files/gnustep.env-0.1.4 586
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-env-0.1.5 0
 MD5 f814aedb43348b181f1ee9c044efa12c files/gnustep.runscript-0.1.4 1052
+MD5 8a7d7c75991671d8b36f9f229404edf7 files/gnustep.runscript-0.1.5 944
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-env-0.1 0
+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.5 b/gnustep-base/gnustep-env/files/digest-gnustep-env-0.1.5
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/gnustep-base/gnustep-env/files/digest-gnustep-env-0.1.5
diff --git a/gnustep-base/gnustep-env/files/gnustep.env-0.1.5 b/gnustep-base/gnustep-env/files/gnustep.env-0.1.5
new file mode 100644
index 000000000000..364c5fece416
--- /dev/null
+++ b/gnustep-base/gnustep-env/files/gnustep.env-0.1.5
@@ -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.5 b/gnustep-base/gnustep-env/files/gnustep.runscript-0.1.5
new file mode 100644
index 000000000000..ffe2a0eea676
--- /dev/null
+++ b/gnustep-base/gnustep-env/files/gnustep.runscript-0.1.5
@@ -0,0 +1,49 @@
+#!/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 "\tgdomap "
+	GNUSTEP_USER_ROOT=/var/run/GNUstep \
+		GNUSTEP_DEFAULTS_ROOT=/var/run/GNUstep \
+		gdomap
+	ebegin "\tgdnc "
+	GNUSTEP_USER_ROOT=/var/run/GNUstep \
+		GNUSTEP_DEFAULTS_ROOT=/var/run/GNUstep \
+		gdnc
+#	ebegin "\tgnustep_sndd"
+#	GNUSTEP_USER_ROOT=/var/run/GNUstep \
+#	GNUSTEP_DEFAULTS_ROOT=/var/run/GNUstep \
+#		/gnustep_sndd
+
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping gnustep daemons..."
+
+	ebegin "\tgdomap "
+	killall gdomap
+	
+	ebegin "\tgdnc "
+	killall gdnc
+
+#	ebegin "\tgnustep_sndd"
+#	killall gnustep_sndd
+
+	eend $?
+}
+
diff --git a/gnustep-base/gnustep-env/gnustep-env-0.1.4.ebuild b/gnustep-base/gnustep-env/gnustep-env-0.1.4.ebuild
index 0b9910cde61c..37280a698b0f 100644
--- a/gnustep-base/gnustep-env/gnustep-env-0.1.4.ebuild
+++ b/gnustep-base/gnustep-env/gnustep-env-0.1.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-env/gnustep-env-0.1.4.ebuild,v 1.6 2004/11/09 19:17:51 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-env/gnustep-env-0.1.4.ebuild,v 1.7 2004/11/12 03:48:44 fafhrd Exp $
 
 inherit gnustep
 
@@ -16,6 +16,8 @@ IUSE=""
 DEPEND="${GS_DEPEND}"
 RDEPEND="${GS_RDEPEND}"
 
+egnustep_install_domain "System"
+
 src_unpack() {
 	echo "nothing to unpack"
 }
@@ -27,10 +29,10 @@ src_compile() {
 src_install() {
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/gnustep.runscript-${PV} gnustep
-	dosed "s:XXX_GENTOO_GNUSTEP_ROOT_XXX:${GENTOO_GNUSTEP_ROOT}:g" /etc/init.d/gnustep
+	dosed "s:XXX_GENTOO_GNUSTEP_ROOT_XXX:$(egnustep_prefix):g" /etc/init.d/gnustep
 	insinto /etc/env.d
 	newins ${FILESDIR}/gnustep.env-${PV} 99gnustep
-	dosed "s:XXX_GENTOO_GNUSTEP_ROOT_XXX:${GENTOO_GNUSTEP_ROOT}:g" /etc/env.d/99gnustep
+	dosed "s:XXX_GENTOO_GNUSTEP_ROOT_XXX:$(egnustep_prefix):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."
 }
diff --git a/gnustep-base/gnustep-env/gnustep-env-0.1.5.ebuild b/gnustep-base/gnustep-env/gnustep-env-0.1.5.ebuild
new file mode 100644
index 000000000000..e114507b2d1f
--- /dev/null
+++ b/gnustep-base/gnustep-env/gnustep-env-0.1.5.ebuild
@@ -0,0 +1,44 @@
+# 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.1 2004/11/12 03:48:44 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."
+}
+