version bump and clean out

10 files changed, 104 insertions, 214 deletions

diff --git a/dev-util/gnustep-base/ChangeLog b/dev-util/gnustep-base/ChangeLog
index a421c39a4978..e809c107ef27 100644
--- a/dev-util/gnustep-base/ChangeLog
+++ b/dev-util/gnustep-base/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/gnustep-base
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-base/ChangeLog,v 1.10 2003/02/12 06:42:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-base/ChangeLog,v 1.11 2003/03/31 01:38:59 liquidx Exp $
+
+*gnustep-base-1.6.0 (31 Mar 2003)
+
+  31 Mar 2003; Alastair Tse <liquidx@gentoo.org> gnustep-base-1.6.0.ebuild,
+  files/gnustep:
+  version bump. thanks to Michael R. Taylor <mtaylor@member.fsf.org>. Bug #18280.
 
 *gnustep-base-1.5.1 (19 Jan 2003)
 
diff --git a/dev-util/gnustep-base/files/digest-gnustep-base-1.3.4 b/dev-util/gnustep-base/files/digest-gnustep-base-1.3.4
deleted file mode 100644
index 2cb75a1c1c28..000000000000
--- a/dev-util/gnustep-base/files/digest-gnustep-base-1.3.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 940ea5fce82eddf398606dafe35a3bf5 gnustep-base-1.3.4.tar.gz 1571681
diff --git a/dev-util/gnustep-base/files/digest-gnustep-base-1.3.4-r1 b/dev-util/gnustep-base/files/digest-gnustep-base-1.3.4-r1
deleted file mode 100644
index 2cb75a1c1c28..000000000000
--- a/dev-util/gnustep-base/files/digest-gnustep-base-1.3.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 940ea5fce82eddf398606dafe35a3bf5 gnustep-base-1.3.4.tar.gz 1571681
diff --git a/dev-util/gnustep-base/files/digest-gnustep-base-1.4.0 b/dev-util/gnustep-base/files/digest-gnustep-base-1.4.0
deleted file mode 100644
index 07781b850415..000000000000
--- a/dev-util/gnustep-base/files/digest-gnustep-base-1.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2eff09a24fe02e36dc7cdf8e4f60823e gnustep-base-1.4.0.tar.gz 1572242
diff --git a/dev-util/gnustep-base/files/digest-gnustep-base-1.6.0 b/dev-util/gnustep-base/files/digest-gnustep-base-1.6.0
new file mode 100644
index 000000000000..63b60db629dc
--- /dev/null
+++ b/dev-util/gnustep-base/files/digest-gnustep-base-1.6.0
@@ -0,0 +1 @@
+MD5 41d2b9d9ef7c86dfe5f4dba8fa501278 gnustep-base-1.6.0.tar.gz 1564369
diff --git a/dev-util/gnustep-base/files/gnustep b/dev-util/gnustep-base/files/gnustep
new file mode 100644
index 000000000000..68c82f22ab95
--- /dev/null
+++ b/dev-util/gnustep-base/files/gnustep
@@ -0,0 +1,38 @@
+#!/sbin/runscript
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: 
+
+start() {
+	ebegin "Starting GNUstep services"
+	
+	# Check for necessary files
+	if [ -d /usr/GNUstep/System/Makefiles ]; then
+		GNUSTEP_MAKEFILES="/usr/GNUstep/System/Makefiles"
+        else
+		exit 1
+        fi
+
+	# Source GNUstep makefile
+	if [ -x $GNUSTEP_MAKEFILES/GNUstep.sh ]; then
+		. $GNUSTEP_MAKEFILES/GNUstep.sh
+	else
+		exit 1
+	fi
+
+	# Start services
+	if [ -x $GNUSTEP_SYSTEM_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/gdomap ]; then
+		$GNUSTEP_SYSTEM_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/gdomap
+	fi
+	if [ -x $GNUSTEP_SYSTEM_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/gdnc ]; then
+		$GNUSTEP_SYSTEM_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/gdnc
+	fi
+}
+
+stop() {
+	ebegin "Stopping GNUstep services"
+
+	# Kill processes
+	killall gdomap
+	killall gdnc
+}
diff --git a/dev-util/gnustep-base/gnustep-base-1.3.4-r1.ebuild b/dev-util/gnustep-base/gnustep-base-1.3.4-r1.ebuild
deleted file mode 100644
index 0b070f62f724..000000000000
--- a/dev-util/gnustep-base/gnustep-base-1.3.4-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-base/gnustep-base-1.3.4-r1.ebuild,v 1.5 2003/02/28 16:54:59 liquidx Exp $
-
-DESCRIPTION="GNUstep base package"
-HOMEPAGE="http://www.gnustep.org"
-LICENSE="LGPL-2.1"
-DEPEND=">=dev-util/gnustep-make-1.3.4"
-RDEPEND="virtual/glibc"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-KEYWORDS="x86 -ppc -sparc "
-SLOT="0"
-
-src_compile() {
-	. /usr/GNUstep/System/Makefiles/GNUstep.sh
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc \
-		--with-xml-prefix=/usr \
-		--with-gmp-include=/usr/include \
-		--with-gmp-library=/usr/lib || die "./configure failed"
-	make || die
-}
-
-src_install () {
-
-	. /usr/GNUstep/System/Makefiles/GNUstep.sh
-	
-	make install \
-		GNUSTEP_INSTALLATION_DIR=${D}/usr/GNUstep/System \
-		INSTALL_ROOT_DIR=${D} \
-		|| die "install failed"
-
-}
diff --git a/dev-util/gnustep-base/gnustep-base-1.3.4.ebuild b/dev-util/gnustep-base/gnustep-base-1.3.4.ebuild
deleted file mode 100644
index ff20bc1eb037..000000000000
--- a/dev-util/gnustep-base/gnustep-base-1.3.4.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-base/gnustep-base-1.3.4.ebuild,v 1.7 2003/02/28 16:54:59 liquidx Exp $
-
-DESCRIPTION="GNUstep base package"
-HOMEPAGE="http://www.gnustep.org"
-LICENSE="LGPL-2.1"
-DEPEND=">=dev-util/gnustep-make-1.3.4"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-KEYWORDS="x86 -ppc -sparc "
-SLOT="0"
-
-src_compile() {
-	. /usr/GNUstep/System/Makefiles/GNUstep.sh
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc \
-		--with-xml-prefix=/usr \
-		--with-gmp-include=/usr/include \
-		--with-gmp-library=/usr/lib || die "./configure failed"
-	make || die
-}
-
-src_install () {
-	dodir	/usr/GNUstep/System/Makefiles/Additional
-	insinto /usr/GNUstep/System/Makefiles/Additional
-	doins base.make
-
-	dodir	/usr/GNUstep/System/Libraries/ix86/linux-gnu/gnu-gnu-gnu
-	cd ${WORKDIR}/${P}/Source/shared_obj/ix86/linux-gnu/gnu-gnu-gnu
-	insinto /usr/GNUstep/System/Libraries/ix86/linux-gnu/gnu-gnu-gnu
-	doins libgnustep-base.so.1.3.4	
-	dosym /usr/GNUstep/System/Libraries/ix86/linux-gnu/gnu-gnu-gnu/libgnustep-base.so.1.3.4 \
-		/usr/GNUstep/System/Libraries/ix86/linux-gnu/gnu-gnu-gnu/libgnustep-base.so.1
-	dosym /usr/GNUstep/System/Libraries/ix86/linux-gnu/gnu-gnu-gnu/libgnustep-base.so.1 \
-		/usr/GNUstep/System/Libraries/ix86/linux-gnu/gnu-gnu-gnu/libgnustep-base.so
-
-	dodir	/usr/GNUstep/System/Headers/Foundation
-	cd ${WORKDIR}/${P}/Headers/gnustep/base
-	insinto /usr/GNUstep/System/Headers/Foundation
-	doins Foundation.h NSByteOrder.h NSConcreteNumber.h \
-		NSPathUtilities.h NSSerialization.h NSUtilities.h GSMime.h \
-		GSXML.h NSArchiver.h NSArray.h NSAttributedString.h \
-		NSAutoreleasePool.h NSBitmapCharSet.h NSBundle.h \
-		NSCalendarDate.h NSCharacterSet.h NSClassDescription.h \
-		NSCoder.h NSConnection.h NSData.h NSDate.h NSDateFormatter.h \
-		NSDebug.h NSDecimal.h NSDecimalNumber.h NSDictionary.h \
-		NSDistantObject.h NSDistributedLock.h \
-		NSDistributedNotificationCenter.h NSEnumerator.h \
-		NSException.h NSFileHandle.h NSFileManager.h NSFormatter.h \
-		NSGeometry.h NSHashTable.h NSHost.h NSInvocation.h \
-		NSKeyValueCoding.h NSLock.h NSMapTable.h NSMethodSignature.h \
-		NSNotification.h NSNotificationQueue.h NSNull.h \
-		NSNumberFormatter.h NSObjCRuntime.h NSObject.h NSPort.h \
-		NSPortCoder.h NSPortMessage.h NSPortNameServer.h \
-		NSProcessInfo.h NSProtocolChecker.h NSProxy.h NSRange.h \
-		NSRunLoop.h NSScanner.h NSSet.h NSString.h NSTask.h \
-		NSThread.h NSTimeZone.h NSTimer.h NSURL.h NSURLHandle.h \
-		NSUndoManager.h NSUserDefaults.h NSValue.h NSZone.h \
-		objc-load.h
-
-	dodir	/usr/GNUstep/System/Headers/gnustep/base
-	cd ${WORKDIR}/${P}/Headers/gnustep/base
-	insinto /usr/GNUstep/System/Headers/gnustep/base
-	doins DistributedObjects.h GSLocale.h GSUnion.h GSIArray.h \
-		GSIMap.h Unicode.h UnixFileHandle.h behavior.h numbers.h \
-		objc-gnu2next.h preface.h
-
-	dodir	/usr/GNUstep/System/Headers/gnustep/unicode
-	cd ${WORKDIR}/${P}/Headers/gnustep/unicode
-	insinto /usr/GNUstep/System/Headers/gnustep/unicode
-	doins caseconv.h cop.h cyrillic.h latin2.h decomp.h nextstep.h
-
-	dodir	/usr/GNUstep/System/Headers/ix86/linux-gnu
-	cd ${WORKDIR}/${P}/Source/ix86/linux-gnu
-	insinto /usr/GNUstep/System/Headers/ix86/linux-gnu
-	doins GSConfig.h mframe.h
-
-	#These lines are already in /etc/services
-	#gdomap 538/tcp # GNUstep distrib objects
-	#gdomap 538/udp # GNUstep distrib objects
-
-	cd ${WORKDIR}/${P}/SSL
-	dodir	/usr/GNUstep/System/Library/Bundles
-	rm -f .tmp.gnustep.exclude
-	echo "SSL.bundle/Contents/Resources" > .tmp.gnustep.exclude
-	tar chfX - .tmp.gnustep.exclude SSL.bundle \
-	| (cd ${D}/usr/GNUstep/System/Library/Bundles; tar xf -)
-	rm -f .tmp.gnustep.exclude
-	dodir	/usr/GNUstep/System/Library/Bundles/SSL.bundle/Contents
-	rm -rf Resources
-	ln -s ../Resources .
-
-	cd ${WORKDIR}/${P}/Tools/shared_obj/ix86/linux-gnu/gnu-gnu-gnu
-	insinto /usr/GNUstep/System/Tools/ix86/linux-gnu/gnu-gnu-gnu
-	insopts -m 0755
-	doins autogsdoc cvtenc gdnc gsdoc defaults plmerge plparse \
-		sfparse pldes plser pl2link HTMLLinker
-
-	insinto /usr/GNUstep/System/Tools/ix86/linux-gnu
-	insopts -m 04755
-	doins gdomap
-
-	cd ${WORKDIR}/${P}/Tools/make_strings/shared_obj/ix86/linux-gnu/gnu-gnu-gnu
-	insinto /usr/GNUstep/System/Tools/ix86/linux-gnu/gnu-gnu-gnu
-	insopts -m 0755
-	doins make_strings
-
-	dodir	/usr/GNUstep/System/Libraries/Resources/NSCharacterServer
-	cd ${WORKDIR}/${P}/NSCharacterSets
-	insinto /usr/GNUstep/System/Libraries/Resources/NSCharacterSets
-	insopts -m 0644
-	doins alphanumericCharSet.dat controlCharSet.dat \
-		decimalDigitCharSet.dat decomposableCharSet.dat \
-		illegalCharSet.dat letterCharSet.dat \
-		lowercaseLetterCharSet.dat nonBaseCharSet.dat \
-		punctuationCharSet.dat symbolAndOperatorCharSet.dat \
-		uppercaseLetterCharSet.dat whitespaceAndNlCharSet.dat \
-		whitespaceCharSet.dat README.CharSet
-
-	dodir	/usr/GNUstep/System/Libraries/Resources
-	cd ${WORKDIR}/${P}/NSTimeZones
-	insinto /usr/GNUstep/System/Libraries/Resources
-	doins NSTimeZones.tar
-	cd ${D}/usr/GNUstep/System/Libraries/Resources
-	tar -xf NSTimeZones.tar
-	rm -f NSTimeZones.tar
-
-	cd ${WORKDIR}/${P}/Resources/Languages
-	dodir	/usr/GNUstep/System/Libraries/Resources/Languages
-	insinto /usr/GNUstep/System/Libraries/Resources/Languages
-	doins Dutch English French German Italian Russian Slovak \
-		UkraineRussian Locale.aliases
-}
diff --git a/dev-util/gnustep-base/gnustep-base-1.4.0.ebuild b/dev-util/gnustep-base/gnustep-base-1.4.0.ebuild
deleted file mode 100644
index 5e9b9a51ae88..000000000000
--- a/dev-util/gnustep-base/gnustep-base-1.4.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-base/gnustep-base-1.4.0.ebuild,v 1.4 2003/02/28 16:54:59 liquidx Exp $
-
-DESCRIPTION="GNUstep base package"
-HOMEPAGE="http://www.gnustep.org"
-LICENSE="LGPL-2.1"
-DEPEND=">=dev-util/gnustep-make-1.4.0
-	>=dev-libs/libxml2-2.4.23"
-RDEPEND="virtual/glibc"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-KEYWORDS="x86 -ppc sparc "
-SLOT="0"
-
-src_compile() {
-
-	. /usr/GNUstep/System/Makefiles/GNUstep.sh
-	econf \
-		--with-xml-prefix=/usr \
-		--with-gmp-include=/usr/include \
-		--with-gmp-library=/usr/lib || die "./configure failed"
-
-	make || die
-
-}
-
-src_install () {
-
-	. /usr/GNUstep/System/Makefiles/GNUstep.sh
-	
-	make install \
-		GNUSTEP_INSTALLATION_DIR=${D}/usr/GNUstep/System \
-		INSTALL_ROOT_DIR=${D} \
-		|| die "install failed"
-
-}
diff --git a/dev-util/gnustep-base/gnustep-base-1.6.0.ebuild b/dev-util/gnustep-base/gnustep-base-1.6.0.ebuild
new file mode 100644
index 000000000000..3bbeff90f5e5
--- /dev/null
+++ b/dev-util/gnustep-base/gnustep-base-1.6.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-base/gnustep-base-1.6.0.ebuild,v 1.1 2003/03/31 01:38:59 liquidx Exp $
+
+DESCRIPTION="GNUstep base package"
+HOMEPAGE="http://www.gnustep.org"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 -ppc ~sparc"
+IUSE=""
+DEPEND=">=dev-util/gnustep-make-1.6.0*
+	>=dev-libs/libxml2-2.4.23"
+
+src_compile() {
+
+	. /usr/GNUstep/System/Makefiles/GNUstep.sh
+	# This is a workaround for a hardcoded GNUSTEP_USER_ROOT
+	GNUSTEP_USER_ROOT=~/.GNUstep
+
+	econf \
+		--with-xml-prefix=/usr \
+		--with-gmp-include=/usr/include \
+		--with-gmp-library=/usr/lib || die "./configure failed"
+
+	make || die
+}
+
+src_install() {
+
+	. /usr/GNUstep/System/Makefiles/GNUstep.sh
+	# This is a workaround for a hardcoded GNUSTEP_USER_ROOT
+	GNUSTEP_USER_ROOT=~/.GNUstep
+
+	make install \
+		GNUSTEP_INSTALLATION_DIR=${D}/usr/GNUstep/System \
+		INSTALL_ROOT_DIR=${D} \
+		|| die "install failed"
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/gnustep gnustep
+	
+}
+
+pkg_postinst() {
+	einfo "You should set the local timezone and language with the defaults command now."
+	einfo
+	einfo "i.e. \"defaults write NSGlobalDomain \"Local Time Zone\" America/Chicago\""
+	einfo "     \"defaults write NSGlobalDomain NSLanguages \"English\"\""
+	einfo
+	einfo "Time zones can be found in"
+	einfo "  /usr/GNUstep/System/Libraries/Resources/NSTimeZones/zones/"
+	einfo
+	einfo "Make sure that you type"
+	einfo "  \". /usr/GNUstep/System/Makefiles/GNUstep.sh\" first to set the right PATH"
+	einfo
+	einfo "For GNUstep to work properly \"gnustep\" should be added to your default"
+	einfo "  runlevel.  This can be done by typing \"rc-update add gnustep default\"."
+}