merged from overlay 106:159

svn path=/prefix-overlay/; revision=160

2 files changed, 24 insertions, 15 deletions

diff --git a/eclass/gnustep-2.eclass b/eclass/gnustep-2.eclass
index cb3de16..8d9562b 100644
--- a/eclass/gnustep-2.eclass
+++ b/eclass/gnustep-2.eclass
@@ -8,8 +8,11 @@ inherit gnustep-base
 
 DEPEND=">=gnustep-base/gnustep-make-2.0
 	virtual/gnustep-back"
-RDEPEND="$DEPEND
+RDEPEND="${DEPEND}
 	debug? ( >=sys-devel/gdb-6.0 )"
 
-# If you need to explicitly call some EXPORT_FUNCTIONS,
-# use the gnustep-base_* prefixed ones
+# The following gnustep-based EXPORT_FUNCTIONS are available:
+# * gnustep-base_pkg_setup
+# * gnustep-base_src_compile 
+# * gnustep-base_src_install 
+# * gnustep-base_pkg_postinst
diff --git a/eclass/gnustep-base.eclass b/eclass/gnustep-base.eclass
index 4173fbc..ba3e241 100644
--- a/eclass/gnustep-base.eclass
+++ b/eclass/gnustep-base.eclass
@@ -7,8 +7,8 @@ inherit eutils flag-o-matic
 # Inner gnustep eclass, should only be inherited directly by gnustep-base packages
 
 # IUSE variables across all GNUstep packages
-# "debug"	- enable code for debugging;
-# "doc" - build and install documentation, if available
+# "debug": enable code for debugging
+# "doc": build and install documentation, if available
 IUSE="debug doc"
 
 # packages needed to build any base gnustep package
@@ -48,10 +48,10 @@ gnustep-base_src_install() {
 	egnustep_install || die
 	if use doc ; then
 		egnustep_env
-		egnustep_doc || die
+		egnustep_doc
 	fi
 	# Copies "convenience scripts"
-	if [ -f ${FILESDIR}/config-${PN}.sh ]; then
+	if [ -f "${FILESDIR}/config-${PN}.sh" ]; then
 		dodir ${GNUSTEP_SYSTEM_TOOLS}/Gentoo
 		exeinto ${GNUSTEP_SYSTEM_TOOLS}/Gentoo
 		doexe ${FILESDIR}/config-${PN}.sh
@@ -60,7 +60,7 @@ gnustep-base_src_install() {
 
 gnustep-base_pkg_postinst() {
 	# Informs user about existence of "convenience script"	
-	if [ -f ${FILESDIR}/config-${PN}.sh ]; then
+	if [ -f "${FILESDIR}/config-${PN}.sh" ]; then
 		elog "Make sure to set happy defaults for this package by executing:"
 		elog "  ${GNUSTEP_SYSTEM_TOOLS}/Gentoo/config-${PN}.sh"
 		elog "as the user you will run the package as."
@@ -72,7 +72,8 @@ egnustep_env() {
 	# Get additional variables
 	GNUSTEP_SH_EXPORT_ALL_VARIABLES="true"
 
-	if [ -f ${GNUSTEP_PREFIX}/System/Library/Makefiles/GNUstep.sh ] ; then
+	if [ -f "${GNUSTEP_PREFIX}/System/Library/Makefiles/GNUstep.sh" ] ; then
+		# Reset GNUstep variables
 		. ${GNUSTEP_PREFIX}/System/Library/Makefiles/GNUstep-reset.sh
 		. ${GNUSTEP_PREFIX}/System/Library/Makefiles/GNUstep.sh
 
@@ -87,7 +88,9 @@ egnustep_env() {
 			DESTDIR=\"\${D}\" \
 			GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \
 			TAR_OPTIONS=\"\${TAR_OPTIONS} --no-same-owner\" \
-			messages=yes -j1"
+			messages=yes \
+			-j1"
+			# -j1 is needed as gnustep-make is not parallel-safe
 
 		if ! use debug ; then
 			__GS_MAKE_EVAL="${__GS_MAKE_EVAL} debug=no"
@@ -129,12 +132,15 @@ egnustep_install() {
 
 # Make and install docs using GNUstep Makefiles
 egnustep_doc() {
-	cd ${S}/Documentation || return
-	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
-		eval emake ${__GS_MAKE_EVAL} all || die "doc make failed"
-		eval emake ${__GS_MAKE_EVAL} install || die "doc install failed"
+	if [ -d ./Documentation ]; then
+		# Check documentation presence
+		cd ${S}/Documentation
+		if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
+			eval emake ${__GS_MAKE_EVAL} all || die "doc make failed"
+			eval emake ${__GS_MAKE_EVAL} install || die "doc install failed"
+		fi
+		cd ..
 	fi
-	cd ..
 }
 
 EXPORT_FUNCTIONS pkg_setup src_compile src_install pkg_postinst