move xpatch from kde-funcitons to eutils, since it's not kde-specific in any way

1 files changed, 131 insertions, 18 deletions

diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 56655aac439d..f2586ad7a8d6 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.31 2003/06/05 06:42:32 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.32 2003/06/10 17:30:21 danarmak Exp $
 #
 # Author: Martin Schlemmer <azarah@gentoo.org>
 #
@@ -38,7 +38,7 @@ gen_usr_ldscript() {
 
 	# Just make sure it exists
 	dodir /usr/lib
-	
+
 	cat > ${D}/usr/lib/$1 <<"END_LDSCRIPT"
 /* GNU ld script
    Because Gentoo have critical dynamic libraries
@@ -72,11 +72,11 @@ draw_line() {
 
 	# Get the length of $*
 	str_length="$(echo -n "$*" | wc -m)"
-	
+
 	while [ "$i" -lt "${str_length}" ]
 	do
 		echo -n "="
-		
+
 		i=$((i + 1))
 	done
 
@@ -152,10 +152,10 @@ epatch() {
 	if [ -n "$1" -a -f "$1" ]
 	then
 		SINGLE_PATCH="yes"
-		
+
 		local EPATCH_SOURCE="$1"
 		local EPATCH_SUFFIX="${1##*\.}"
-		
+
 	elif [ -n "$1" -a -d "$1" ]
 	then
 		# Allow no extension if EPATCH_FORCE=yes ... used by vim for example ...
@@ -180,7 +180,7 @@ epatch() {
 			echo
 			die "Cannot find \$EPATCH_SOURCE!"
 		fi
-		
+
 		local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
 	fi
 
@@ -227,7 +227,7 @@ epatch() {
 					continue
 				fi
 			fi
-			
+
 			if [ "${SINGLE_PATCH}" = "yes" ]
 			then
 				if [ -n "${EPATCH_SINGLE_MSG}" ]
@@ -257,10 +257,10 @@ epatch() {
 				else
 					PATCH_TARGET="${x}"
 				fi
-				
+
 				echo -n "PATCH COMMAND:  " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
 				echo "patch ${popts} -p${count} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
-				
+
 				echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
 				draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
 
@@ -275,7 +275,7 @@ epatch() {
 						break
 					fi
 				fi
-				
+
 				if (cat ${PATCH_TARGET} | patch ${popts} --dry-run -f -p${count}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1
 				then
 					draw_line "***** ${x##*/} *****" >	${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
@@ -297,7 +297,7 @@ epatch() {
 					fi
 
 					rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
-					
+
 					break
 				fi
 
@@ -401,18 +401,18 @@ get_number_of_jobs() {
 	fi
 
 	export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
-	
+
 	if [ "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
 		"${ARCH}" = "arm" -o "${ARCH}" = "mips" ]
 	then
 		# these archs will always have "[Pp]rocessor"
 		jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
-	
+
 	elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
 	then
 		# sparc always has "ncpus active"
 		jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
-	
+
 	elif [ "${ARCH}" = "alpha" ]
 	then
 		# alpha has "cpus active", but only when compiled with SMP
@@ -422,7 +422,7 @@ get_number_of_jobs() {
 		else
 			jobs=2
 		fi
-		
+
 	elif [ "${ARCH}" = "ppc" ]
 	then
 		# ppc has "processor", but only when compiled with SMP
@@ -442,7 +442,7 @@ get_number_of_jobs() {
 	then
 		jobs=1
 	fi
-	
+
 	if [ -n "${ADMINPARAM}" ]
 	then
 		if [ "${jobs}" -gt "${ADMINPARAM}" ]
@@ -560,7 +560,7 @@ enewuser() {
 	else
 		einfo " - Extra: ${eextra}"
 		useradd ${opts} ${euser} ${eextra} \
-			|| die "enewuser failed" 
+			|| die "enewuser failed"
 	fi
 	export SANDBOX_ON="${oldsandbox}"
 
@@ -641,3 +641,116 @@ edos2unix() {
 		rm -f ${T}/edos2unix
 	done
 }
+
+# new convinience patch wapper function to eventually replace epatch(), $PATCHES, $PATCHES1, src_unpack:patch, src_unpack:autopatch and /usr/bin/patch
+# Features:
+# - bulk patch handling similar to epatch()'s
+# - automatic patch level detection like epatch()'s
+# - semiautomatic patch uncompression like epatch()'s (may switch to using /usr/bin/file for extra power, instead of just looking at the filename)
+# - doesn't have the --dry-run overhead of epatch() - inspects patchfiles manually instead
+# - is called from base_src_unpack to handle $PATCHES to avoid defining src_unpack(-) just to use xpatch
+
+# accepts zero or more parameters specifying patchfiles and/or patchdirs
+
+# known issues:
+# - only supports unified style patches (does anyone _really_ use anything else?)
+# - first file addressed in a patch can't have spaces in its name or in the path mentioned in the patchfile
+# (can be easily fixed to be: at least one file addressed in the patch must have no spaces...)
+xpatch() {
+
+	debug-print-function $FUNCNAME $*
+
+	local list=""
+	local list2=""
+	declare -i plevel
+
+	# parse patch sources
+	for x in $*; do
+		debug-print "$FUNCNAME: parsing parameter $x"
+		if [ -f "$x" ]; then
+			list="$list $x"
+		elif [ -d "$x" ]; then
+			# handles patchdirs like epatch() for now: no recursion.
+			# patches are sorted by filename, so with an xy_foo naming scheme you'll get the right order.
+			# only patches with _$ARCH_ or _all_ in their filenames are applied.
+			for file in `ls -A $x`; do
+				debug-print "$FUNCNAME:  parsing in subdir: file $file"
+				if [ -f "$x/$file" ] && [ "${file}" != "${file/_all_}" -o "${file}" != "${file/_$ARCH_}" ]; then
+					list2="$list2 $x/$file"
+				fi
+			done
+			list="`echo $list2 | sort` $list"
+		else
+			die "Couldn't find $x"
+		fi
+	done
+
+	debug-print "$FUNCNAME: final list of patches: $list"
+
+	for x in $list; do
+		debug-print "$FUNCNAME: processing $x"
+		# deal with compressed files. /usr/bin/file is in the system profile, or should be.
+		case "`/usr/bin/file -b $x`" in
+			*gzip*) patchfile="${T}/current.patch"; ungzip -c "$x" > "${patchfile}";;
+			*bzip2*) patchfile="${T}/current.patch"; bunzip2 -c "$x" > "${patchfile}";;
+			*text*) patchfile="$x";;
+			*) die "Could not determine filetype of patch $x";;
+		esac
+		debug-print "$FUNCNAME: patchfile=$patchfile"
+
+		# determine patchlevel. supports p0 and higher with either $S or $WORKDIR as base.
+		target="`/bin/grep '+++' $patchfile | /usr/bin/tail -1`"
+		debug-print "$FUNCNAME: raw target=$target"
+		# strip target down to the path/filename. NOTE doesn't support filenames/paths with spaces in them :-(
+		# remove leading +++
+		target="${target/+++ }"
+		# ugly, yes. i dunno why doesn't this work instead: target=${target%% *}
+		for foo in $target; do target="$foo"; break; done
+		# duplicate slashes are discarded by patch wrt the patchlevel. therefore we need to discard them as well
+		# to calculate the correct patchlevel.
+		while [ "$target" != "${target/\/\/}" ]; do
+			target="${target/\/\//\/}"
+		done
+		debug-print "$FUNCNAME: stripped target=$target"
+
+		# look for target
+		for basedir in "$S" "$WORKDIR" "`pwd`"; do
+			debug-print "$FUNCNAME: looking in basedir=$basedir"
+			cd "$basedir"
+
+			# try stripping leading directories
+			target2="$target"
+			plevel=0
+			debug-print "$FUNCNAME: trying target2=$target2, plevel=$plevel"
+			while [ ! -f "$target2" ]; do
+				target2="${target2#*/}" # removes piece of target2 upto the first occurence of /
+				plevel=plevel+1
+				debug-print "$FUNCNAME: trying target2=$target2, plevel=$plevel"
+				[ "$target2" == "${target2/\/}" ] && break
+			done
+			test -f "$target2" && break
+
+			# try stripping filename - needed to support patches creating new files
+			target2="${target%/*}"
+			plevel=0
+			debug-print "$FUNCNAME: trying target2=$target2, plevel=$plevel"
+			while [ ! -d "$target2" ]; do
+				target2="${target2#*/}" # removes piece of target2 upto the first occurence of /
+				plevel=plevel+1
+				debug-print "$FUNCNAME: trying target2=$target2, plevel=$plevel"
+				[ "$target2" == "${target2/\/}" ] && break
+			done
+			test -d "$target2" && break
+
+		done
+
+		test -f "${basedir}/${target2}" || test -d "${basedir}/${target2}" || die "Could not determine patchlevel for $x"
+		debug-print "$FUNCNAME: determined plevel=$plevel"
+		# do the patching
+		ebegin "Applying patch ${x##*/}..."
+		/usr/bin/patch -p$plevel < "$patchfile" > /dev/null || die "Failed to apply patch $x"
+		eend $?
+
+	done
+
+}