Bump revision to include new init.d script to fix issues reported in bug #154162

Package-Manager: portage-2.1.1-r2

5 files changed, 211 insertions, 4 deletions

diff --git a/gnustep-base/gnustep-base/ChangeLog b/gnustep-base/gnustep-base/ChangeLog
index 5e002147b3ba..459a0df2a059 100644
--- a/gnustep-base/gnustep-base/ChangeLog
+++ b/gnustep-base/gnustep-base/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnustep-base/gnustep-base
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.40 2006/12/05 18:32:38 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.41 2006/12/05 19:51:34 grobian Exp $
+
+*gnustep-base-1.13.0-r1 (05 Dec 2006)
+
+  05 Dec 2006; Fabian Groffen <grobian@gentoo.org>
+  +files/gnustep.initd-1.13.0, files/gnustep.initd,
+  -gnustep-base-1.13.0.ebuild, +gnustep-base-1.13.0-r1.ebuild:
+  Bump revision to include new init.d script to fix issues reported in bug
+  #154162
 
   05 Dec 2006; Fabian Groffen <grobian@gentoo.org>
   gnustep-base-1.13.0.ebuild:
diff --git a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.13.0-r1 b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.13.0-r1
new file mode 100644
index 000000000000..cbf466834908
--- /dev/null
+++ b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.13.0-r1
@@ -0,0 +1,3 @@
+MD5 edd01516ba49915150f030848efc0baf gnustep-base-1.13.0.tar.gz 2282713
+RMD160 57a4dd3c9759e296d0a95304cd8b0624f1374bbf gnustep-base-1.13.0.tar.gz 2282713
+SHA256 6ed544682bb4512ca71230b76092fad90fd1c4e1cfee81f8a7871fd7fbba950b gnustep-base-1.13.0.tar.gz 2282713
diff --git a/gnustep-base/gnustep-base/files/gnustep.initd b/gnustep-base/gnustep-base/files/gnustep.initd
index 1bf24d43ddb8..b640a3023150 100644
--- a/gnustep-base/gnustep-base/files/gnustep.initd
+++ b/gnustep-base/gnustep-base/files/gnustep.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/files/gnustep.initd,v 1.1 2006/09/03 21:10:34 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/files/gnustep.initd,v 1.2 2006/12/05 19:51:34 grobian Exp $
 
 if [ -e /etc/GNUstep/GNUstep.conf ];
 then
@@ -20,7 +20,7 @@ start() {
 		. ${GNUSTEP_SYSTEM_ROOT}/Makefiles/GNUstep.sh
 	else
 		eend 0
-		exit 1
+		return 1
 	fi
 
 	if [ -z "$GNUSTEP_FLATTENED" ];
@@ -52,5 +52,6 @@ stop() {
 	killall gdomap
 	killall gdnc
 
-	eend 1
+	# always succeeds
+	eend 0
 }
diff --git a/gnustep-base/gnustep-base/files/gnustep.initd-1.13.0 b/gnustep-base/gnustep-base/files/gnustep.initd-1.13.0
new file mode 100644
index 000000000000..6c4eecea3300
--- /dev/null
+++ b/gnustep-base/gnustep-base/files/gnustep.initd-1.13.0
@@ -0,0 +1,56 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/files/gnustep.initd-1.13.0,v 1.1 2006/12/05 19:51:34 grobian Exp $
+
+if [ -e /etc/GNUstep/GNUstep.conf ] ; then
+	. /etc/GNUstep/GNUstep.conf
+else
+	GNUSTEP_SYSTEM_ROOT="/usr/GNUstep/System"
+fi
+
+start() {
+	ebegin "Starting GNUstep services"
+
+	# Check for necessary files
+	if [ -d ${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles ] ; then
+		# Source GNUstep makefile
+		. ${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles/GNUstep.sh
+	else
+		eend 1
+		return 1
+	fi
+
+	if [ -z "$GNUSTEP_FLATTENED" ] ; then
+		TDIR=${GNUSTEP_SYSTEM_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
+	else
+		TDIR=${GNUSTEP_SYSTEM_ROOT}/Tools
+	fi
+
+	# Start services
+	eindent
+
+	if [ -x ${TDIR}/gdomap ] ; then
+		ebegin "starting gdomap"
+		${TDIR}/gdomap
+		eend $?
+	fi
+	if [ -x ${TDIR}/$LIBRARY_COMBO/gdnc ] ; then
+		ebegin "starting gdnc"
+		${TDIR}/$LIBRARY_COMBO/gdnc
+		eend $?
+	fi
+
+	eoutdent
+}
+
+stop() {
+	ebegin "Killing GNUstep services"
+
+	# Kill processes
+	killall gdomap >& /dev/null
+	killall gdnc >& /dev/null
+
+	# always succeeds
+	eend 0
+}
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.13.0-r1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.13.0-r1.ebuild
new file mode 100644
index 000000000000..50bbcdc51352
--- /dev/null
+++ b/gnustep-base/gnustep-base/gnustep-base-1.13.0-r1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2006 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.13.0-r1.ebuild,v 1.1 2006/12/05 19:51:34 grobian Exp $
+
+inherit gnustep autotools
+
+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="~alpha ~amd64 ~ppc ~sparc ~x86"
+SLOT="0"
+LICENSE="GPL-2 LGPL-2.1"
+
+IUSE="${IUSE} doc gcc-libffi"
+
+DEPEND="${GNUSTEP_CORE_DEPEND}
+	~gnustep-base/gnustep-make-1.13.0
+	|| (
+		dev-libs/ffcall
+		gcc-libffi? ( >=sys-devel/gcc-3.3.5 )
+	)
+	>=dev-libs/libxml2-2.6
+	>=dev-libs/libxslt-1.1
+	>=dev-libs/gmp-4.1
+	>=dev-libs/openssl-0.9.7
+	>=sys-libs/zlib-1.2
+	sys-apps/sed
+	${DOC_DEPEND}"
+RDEPEND="${DEPEND}
+	${DEBUG_DEPEND}
+	${DOC_RDEPEND}"
+
+egnustep_install_domain "System"
+
+pkg_setup() {
+	if use gcc-libffi; then
+		export OBJC_INCLUDE_PATH="OBJC_INCLUDE_PATH:$(gcc-config -L | sed 's/:.*//')/include/libffi"
+		if [ "$(ffi_available)" == "no" ]; then
+			ffi_not_available_info
+			die "libffi is not available"
+		fi
+	fi
+}
+
+src_unpack() {
+	egnustep_env
+	unpack ${A}
+	# TODO: need for obey-homedir patch?
+
+	cd ${S}
+
+	# FIX non-flattened
+	if [ -z $GNUSTEP_FLATTENED ];
+	then
+		sed -i -e 's:$GNUSTEP_MAKEFILES/config.make:$GNUSTEP_MAKEFILES/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/config.make:' \
+			-e 's:$GNUSTEP_MAKEFILES/$obj_dir/config.make:$GNUSTEP_MAKEFILES/$obj_dir/$LIBRARY_COMBO/config.make:' \
+			configure.ac
+		eautoreconf
+	fi
+}
+
+src_compile() {
+	egnustep_env
+	# why libffi over ffcall?
+	# - libffi is known to work with 32 and 64 bit platforms
+	# - libffi does not use trampolines
+	# but upstream seems to prefer ffcall
+	local myconf
+	if use gcc-libffi;
+	then
+		myconf="--enable-libffi --disable-ffcall"
+		myconf="${myconf} --with-ffi-library=$(gcc-config -L) --with-ffi-include=$(gcc-config -L | sed 's/:.*//')/include/libffi"
+	else
+		myconf="--disable-libffi --enable-ffcall"
+	fi
+
+	myconf="$myconf --with-xml-prefix=/usr"
+	myconf="$myconf --with-gmp-include=/usr/include --with-gmp-library=/usr/lib"
+	myconf="$myconf --with-default-config=/etc/GNUstep/GNUstep.conf"
+
+	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"
+		use debug && make_eval="${make_eval} debug=yes"
+		use verbose && make_eval="${make_eval} verbose=yes"
+
+		cd ${S}/Documentation
+		eval emake ${make_eval} AUTOGSDOC="${S}/Tools/obj/autogsdoc" all \
+			|| die "doc make has failed"
+		eval emake ${make_eval} install \
+			|| die "doc install has failed"
+		cd ..
+	fi
+
+	newinitd "${FILESDIR}"/gnustep.initd-${PV} gnustep
+
+	dodir /etc/revdep-rebuild
+	sed -e 's|$GNUSTEP_SEARCH_DIRS|'"$GNUSTEP_PATHLIST"'|' \
+		"${FILESDIR}"/50-gnustep-revdep \
+		> "${D}/etc/revdep-rebuild/50-gnustep-revdep"
+
+	egnustep_package_config
+}
+
+pkg_postinst() {
+	egnustep_env
+
+	ewarn "The shared library version has changed in this release."
+	ewarn "You will need to recompile all Applications/Tools/etc in order"
+	ewarn "to use this library."
+	ewarn "Run:"
+	ewarn "revdep-rebuild --library \"libgnustep-base.so.1.1[012]\""
+}