[patch] Patch to add USERLAND="Darwin"

portage-2.0.51.16-darwin.patch (text/plain), 4.13 KB, created by Kito (RETIRED) on 2005-02-16 22:52:00 UTC

diff -uNr portage-2.0.51.16/bin/ebuild.sh portage-2.0.51.16-new/bin/ebuild.sh
--- portage-2.0.51.16/bin/ebuild.sh	Sun Feb  6 05:43:34 2005
+++ portage-2.0.51.16-new/bin/ebuild.sh	Wed Feb 16 23:30:59 2005
@@ -690,6 +690,10 @@
 		chflags -R noschg,nouchg,nosappnd,nouappnd,nosunlnk,nouunlnk \
 			"${BUILDDIR}"
 	fi
+	
+	if [ "$USERLAND" == "Darwin" ] && type -p chflags &>/dev/null; then
+		chflags -R noschg,nouchg,nosappnd,nouappnd "${BUILDDIR}"
+	fi
 
 	rm -rf "${BUILDDIR}/image"
 
@@ -1063,7 +1067,7 @@
 				python -c "import os,stat; print '%o' % os.stat('$1')[stat.ST_MODE]"
 			}
 		else
-			if [ "${USERLAND}" == "BSD" ]; then
+			if [ "${USERLAND}" == "BSD" ] || [ "${USERLAND}" == "Darwin" ]; then
 				do_stat() {
 					# BSD version -- Octal result
 					$(type -p stat) -f '%p' "$1"
@@ -1091,12 +1095,15 @@
 	done
 
 	find "${D}/" -group portage | while read file; do
-		ewarn "file $file was installed with group portage!"
 		s=$(stat_perms "$file")
-		[ "$USERLAND" == "BSD" ] && chgrp wheel "$file"
-		[ "$USERLAND" != "BSD" ] && chgrp root "$file"
+		if [ "$USERLAND" == "BSD" ] || [ "$USERLAND" == "Darwin" ];then
+			chgrp wheel "$file"
+		else
+			chgrp root "$file"
+		fi
 		chmod "$s" "$file"
 	done
+	ewarn "files were installed with group portage!"
 
 	unset -f stat_perms
 
diff -uNr portage-2.0.51.16/bin/emerge-webrsync portage-2.0.51.16-new/bin/emerge-webrsync
--- portage-2.0.51.16/bin/emerge-webrsync	Mon Jan 17 14:13:21 2005
+++ portage-2.0.51.16-new/bin/emerge-webrsync	Wed Feb 16 23:50:04 2005
@@ -68,7 +68,7 @@
 	attempts=$(( attempts + 1 ))
 
 	#this too, sucks.  it works in the interim though.
-	if [ "$USERLAND" == "BSD" ] ; then
+	if [ "$USERLAND" == "BSD" ] || [ "$USERLAND" == "Darwin" ] ; then
 		daysbefore=$(expr $(date +"%s") - 86400 \* $attempts)
 		day=$(date -r $daysbefore +"%d")
 		month=$(date -r $daysbefore +"%m")
diff -uNr portage-2.0.51.16/bin/etc-update portage-2.0.51.16-new/bin/etc-update
--- portage-2.0.51.16/bin/etc-update	Sun Jan 30 17:44:55 2005
+++ portage-2.0.51.16-new/bin/etc-update	Wed Feb 16 23:38:57 2005
@@ -14,6 +14,8 @@
 
 if [ $(/usr/lib/portage/bin/portageq envvar USERLAND) = BSD ] ; then
 	function sed() { gsed "$@"; }
+elif [ $(/usr/lib/portage/bin/portageq envvar USERLAND) = Darwin -a -x /bin/gsed ]; then
+	function sed() { gsed "$@"; }
 fi
 
 function get_config() {
diff -uNr portage-2.0.51.16/bin/repoman portage-2.0.51.16-new/bin/repoman
--- portage-2.0.51.16/bin/repoman	Sun Feb  6 05:43:35 2005
+++ portage-2.0.51.16-new/bin/repoman	Wed Feb 16 21:17:49 2005
@@ -347,7 +347,7 @@
 		print "rm -Rf [a-z]*"
 		print "cvs up"
 		print
-		if portage.userland=="BSD":
+		if portage.userland=="BSD" or portage.userland=="Darwin":
 			print "find ./ -type f -regex '.*/CVS/Root$' -print0 | xargs -0 sed \\"
 		else:
 			print "find ./ -type f -regex '.*/CVS/Root$' -print0 | xargs -0r sed \\"
diff -uNr portage-2.0.51.16/pym/portage.py portage-2.0.51.16-new/pym/portage.py
--- portage-2.0.51.16/pym/portage.py	Sun Feb  6 07:06:13 2005
+++ portage-2.0.51.16-new/pym/portage.py	Wed Feb 16 22:34:30 2005
@@ -6767,7 +6767,7 @@
 					# old package won't yank the file with it. (non-cfgprot related)
 					os.utime(myrealdest,(thismtime,thismtime))
 					zing="---"
-				if self.settings["ARCH"] == "ppc-macos" and myrealdest[-2:] == ".a":
+				if self.settings["USERLAND"] == "Darwin" and myrealdest[-2:] == ".a":
 
 					# XXX kludge, bug #58848; can be killed when portage stops relying on 
 					# md5+mtime, and uses refcounts
diff -uNr portage-2.0.51.16/pym/portage_data.py portage-2.0.51.16-new/pym/portage_data.py
--- portage-2.0.51.16/pym/portage_data.py	Sat Jan 15 20:35:33 2005
+++ portage-2.0.51.16-new/pym/portage_data.py	Wed Feb 16 22:36:33 2005
@@ -14,11 +14,13 @@
 if ostype=="Linux":
 	userland="GNU"
 	os.environ["XARGS"]="xargs -r"
-elif ostype in ["Darwin","FreeBSD","OpenBSD"]:
-	if ostype == "Darwin":
-		lchown=os.chown
-	userland="BSD"
+elif ostype == "Darwin":
+	userland="Darwin"
 	os.environ["XARGS"]="xargs"	
+	lchown=os.chown
+elif ostype in ["FreeBSD","OpenBSD"]:
+	userland="BSD"
+	os.environ["XARGS"]="xargs"
 else:
 	writemsg(red("Operating system")+" \""+ostype+"\" "+red("currently unsupported. Exiting.")+"\n")
 	sys.exit(1)