[patch] Update gnustep-make ebuild to support more variables

gnustep-make-user_dir.patch (text/plain), 3.60 KB, created by Christophe Osuna on 2007-03-03 22:30:11 UTC

diff -urN gnustep-make-old/gnustep-make-1.13.0.ebuild gnustep-make-new/gnustep-make-1.13.0.ebuild
--- gnustep-make-old/gnustep-make-1.13.0.ebuild	2007-02-18 22:36:02.000000000 +0100
+++ gnustep-make-new/gnustep-make-1.13.0.ebuild	2007-03-03 22:01:39.000000000 +0100
@@ -50,6 +50,8 @@
 			unset GNUSTEP_LOCAL_ROOT
 			unset GNUSTEP_NETWORK_ROOT
 			unset GNUSTEP_USER_ROOT
+			unset GNUSTEP_USER_DIR
+			unset GNUSTEP_USER_DEFAULTS_DIR
 			. /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"
@@ -81,12 +83,28 @@
 			elif [ -z "${GNUSTEP_USER_ROOT}" ]; then
 				GNUSTEP_USER_ROOT='~/GNUstep'
 			fi
+			if [ "${GNUSTEP_USER_DIR}" ] && [ '~' != "${GNUSTEP_USER_DIR:0:1}" ]; then
+				eerror "GNUSTEP_USER_DIR is misconfigured in /etc/conf.d/gnustep.env"
+				eerror "GNUSTEP_USER_DIR=${GNUSTEP_USER_DIR}"
+				die "USE flag misconfiguration -- please correct"
+			elif [ -z "${GNUSTEP_USER_DIR}" ]; then
+				GNUSTEP_USER_DIR='~/GNUstep'
+			fi
+			if [ "${GNUSTEP_USER_DEFAULTS_DIR}" ] && [ '~' != "${GNUSTEP_USER_DEFAULTS_DIR:0:1}" ]; then
+				eerror "GNUSTEP_USER_DEFAULTS_DIR is misconfigured in /etc/conf.d/gnustep.env"
+				eerror "GNUSTEP_USER_DEFAULTS_DIR=${GNUSTEP_USER_DEFAULTS_DIR}"
+				die "USE flag misconfiguration -- please correct"
+			elif [ -z "${GNUSTEP_USER_DEFAULTS_DIR}" ]; then
+				GNUSTEP_USER_DEFAULTS_DIR='~/GNUstep/Defaults'
+			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}"
+			egnustep_user_dir "${GNUSTEP_USER_DIR}"
+			egnustep_user_defaults_dir "${GNUSTEP_USER_DEFAULTS_DIR}"
 		fi
 	elif use layout-osx-like; then
 		egnustep_prefix "/"
@@ -94,6 +112,8 @@
 		egnustep_local_root "/"
 		egnustep_network_root "/Network"
 		egnustep_user_root '~'
+		egnustep_user_dir '~'
+		egnustep_user_defaults_dir '~/Library/Preferences'
 	else
 		# setup defaults here
 		egnustep_prefix "/usr/GNUstep"
@@ -101,6 +121,8 @@
 		egnustep_local_root "/usr/GNUstep/Local"
 		egnustep_network_root "/usr/GNUstep/Network"
 		egnustep_user_root '~/GNUstep'
+		egnustep_user_dir '~/GNUstep'
+		egnustep_user_defaults_dir '~/GNUstep/Defaults'
 	fi
 
 	einfo "GNUstep installation will be laid out as follows:"
@@ -108,6 +130,8 @@
 	einfo "\tGNUSTEP_LOCAL_ROOT=`egnustep_local_root`"
 	einfo "\tGNUSTEP_NETWORK_ROOT=`egnustep_network_root`"
 	einfo "\tGNUSTEP_USER_ROOT=`egnustep_user_root`"
+	einfo "\tGNUSTEP_USER_DIR=`egnustep_user_dir`"
+	einfo "\tGNUSTEP_USER_DEFAULTS_DIR=`egnustep_user_defaults_dir`"
 }
 
 src_compile() {
@@ -123,6 +147,8 @@
 	myconf="$myconf --with-local-root=`egnustep_local_root`"
 	myconf="$myconf --with-network-root=`egnustep_network_root`"
 	myconf="$myconf --with-user-root=`egnustep_user_root`"
+	myconf="$myconf --with-user-dir=`egnustep_user_dir`"
+	myconf="$myconf --with-user-defaults-dir=`egnustep_user_defaults_dir`"
 	econf $myconf || die "configure failed"
 
 	egnustep_make
@@ -164,6 +190,8 @@
 	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
+	echo "GNUSTEP_USER_DIR='$(egnustep_user_dir)'" >> ${D}/etc/conf.d/gnustep.env
+	echo "GNUSTEP_USER_DEFAULTS_DIR='$(egnustep_user_defaults_dir)'" >> ${D}/etc/conf.d/gnustep.env
 
 	insinto /etc/GNUstep
 	doins ${S}/GNUstep.conf