Lots of general version bumps all related to GNUstep

4 files changed, 204 insertions, 17 deletions

diff --git a/gnustep-base/gnustep-make/ChangeLog b/gnustep-base/gnustep-make/ChangeLog
index 9527fb056e98..e9d34c1d95a9 100644
--- a/gnustep-base/gnustep-make/ChangeLog
+++ b/gnustep-base/gnustep-make/ChangeLog
@@ -1,6 +1,12 @@
 # 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.16 2004/11/23 20:40:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.17 2004/12/04 20:17:58 fafhrd Exp $
+
+*gnustep-make-1.10.1_pre20041203 (03 Dec 2004)
+
+  03 Dec 2004; Armando Di Cianno <fafhrd@gentoo.org>
+  +gnustep-make-1.10.1_pre20041203.ebuild:
+  General version bump
 
   23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
   gnustep-make-1.10.1_pre20041030-r1.ebuild:
diff --git a/gnustep-base/gnustep-make/Manifest b/gnustep-base/gnustep-make/Manifest
index 47d7f65d0e84..ab659d931585 100644
--- a/gnustep-base/gnustep-make/Manifest
+++ b/gnustep-base/gnustep-make/Manifest
@@ -1,25 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f14e7317634cf0dc157a125052256ca1 ChangeLog 6052
 MD5 1dd1a6eda21348216981bfe902aac512 gnustep-make-1.10.1_pre20041116.ebuild 6804
-MD5 ca04d409726e17e7151b832de9989a48 metadata.xml 530
 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 f01c4f0197c120d97c99216d06fadcb0 gnustep-make-1.10.1_pre20041126.ebuild 6678
 MD5 d08de5046cf82d5acb49ccaf3ab515d8 gnustep-make-1.10.1_pre20041030-r1.ebuild 6810
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-make-1.10.1_pre20041116 0
-MD5 020f6b825d80a9769c36a39877f13f44 files/digest-gnustep-make-1.10.0 71
+MD5 f14e7317634cf0dc157a125052256ca1 ChangeLog 6052
+MD5 ca04d409726e17e7151b832de9989a48 metadata.xml 530
+MD5 f01c4f0197c120d97c99216d06fadcb0 gnustep-make-1.10.1_pre20041203.ebuild 6678
 MD5 4ba1b8533c9b3b56077617796abc9ab6 files/helloworld.m 1004
 MD5 fdb13360dfc78ccdc3c75a5da84b46ab files/make-user-defaults.patch-1.10.0 1282
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-make-1.10.1_pre20041030 0
 MD5 ff55be8ebf757b97d823bb3cf08b8bc4 files/GNUstep-reset.sh.patch 2121
-MD5 020f6b825d80a9769c36a39877f13f44 files/digest-gnustep-make-1.10.0-r1 71
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-make-1.10.1_pre20041030-r1 0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBo6BbArHZZzCEUG0RAsHZAJ9qA1GnFBlCXtBc796WHodD1YjgQACfTVw7
-M9pPUwkmuqarBPhgrQMCpus=
-=hr9M
------END PGP SIGNATURE-----
+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_pre20041126 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.1_pre20041203 b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20041203
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20041203
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
new file mode 100644
index 000000000000..4b7742c4b170
--- /dev/null
+++ b/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041203.ebuild
@@ -0,0 +1,187 @@
+# 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.1 2004/12/04 20:17:58 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
+}
+