[patch] Darkside's patch

coreutils-prefix.diff (text/plain), 4.26 KB, created by Richard Yao (RETIRED) on 2012-07-12 14:22:05 UTC

? files
Index: coreutils-8.17.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-8.17.ebuild,v
retrieving revision 1.3
diff -u -r1.3 coreutils-8.17.ebuild
--- coreutils-8.17.ebuild	11 Jul 2012 14:33:02 -0000	1.3
+++ coreutils-8.17.ebuild	12 Jul 2012 13:59:30 -0000
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-8.17.ebuild,v 1.3 2012/07/11 14:33:02 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-8.17.ebuild,v 1.2 2012/05/24 02:33:02 vapier Exp $
 
 EAPI="3"
 
@@ -17,8 +17,8 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
-IUSE="acl caps gmp nls selinux static unicode userland_BSD vanilla xattr"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="acl caps gmp nls selinux static unicode vanilla xattr"
 
 RDEPEND="caps? ( sys-libs/libcap )
 	gmp? ( dev-libs/gmp )
@@ -46,6 +46,8 @@
 		epatch
 	fi
 
+	epatch "${FILESDIR}"/${PN}-7.2-mint.patch
+
 	# Since we've patched many .c files, the make process will try to
 	# re-build the manpages by running `./bin --help`.  When doing a
 	# cross-compile, we can't do that since 'bin' isn't a native bin.
@@ -75,12 +77,18 @@
 	# kill/uptime - procps
 	# groups/su   - shadow
 	# hostname    - net-tools
+	if [[ ${CHOST} == *-mint* ]]; then
+		myconf="${myconf} --enable-install-program=arch,hostname,kill,uptime"
+		myconf="${myconf} --enable-no-install-program=groups,su"
+	else
+		myconf="${myconf} --enable-install-program=arch"
+		myconf="${myconf} --enable-no-install-program=groups,hostname,kill,su,uptime"
+	fi
+
 	econf \
 		--with-packager="Gentoo" \
 		--with-packager-version="${PVR} (p${PATCH_VER:-0})" \
 		--with-packager-bug-reports="http://bugs.gentoo.org/" \
-		--enable-install-program="arch" \
-		--enable-no-install-program="groups,hostname,kill,su,uptime" \
 		--enable-largefile \
 		$(use caps || echo --disable-libcap) \
 		$(use_enable nls) \
@@ -105,7 +113,7 @@
 		for w in "$@" ; do
 			ww="${T}/mount-wrappers/${w}"
 			cat <<-EOF > "${ww}"
-				#!/bin/sh
+				#!${EPREFIX}/bin/sh
 				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P $w) "\$@"
 			EOF
 			chmod a+rx "${ww}"
@@ -127,12 +135,15 @@
 	insinto /etc
 	newins src/dircolors.hin DIR_COLORS || die
 
-	if [[ ${USERLAND} == "GNU" ]] ; then
-		cd "${D}"/usr/bin
+	if [[ ${USERLAND} == "GNU" || ${EPREFIX%/} != "" ]] ; then
+		cd "${ED}"/usr/bin
 		dodir /bin
 		# move critical binaries into /bin (required by FHS)
 		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
 		           mkdir mknod mv pwd rm rmdir stty sync true uname"
+
+		[[ ${CHOST} == *-mint* ]] && fhs="${fhs} hostname"
+
 		mv ${fhs} ../../bin/ || die "could not move fhs bins"
 		# move critical binaries into /bin (common scripts)
 		local com="basename chroot cut dir dirname du env expr head mkfifo
@@ -145,7 +156,7 @@
 		done
 	else
 		# For now, drop the man pages, collides with the ones of the system.
-		rm -rf "${D}"/usr/share/man
+		rm -rf "${ED}"/usr/share/man
 	fi
 }
 
@@ -155,15 +166,15 @@
 	ewarn "  changes, such as: source /etc/profile"
 
 	# /bin/dircolors sometimes sticks around #224823
-	if [ -e "${ROOT}/usr/bin/dircolors" ] && [ -e "${ROOT}/bin/dircolors" ] ; then
-		if strings "${ROOT}/bin/dircolors" | grep -qs "GNU coreutils" ; then
+	if [ -e "${EROOT}/usr/bin/dircolors" ] && [ -e "${EROOT}/bin/dircolors" ] ; then
+		if strings "${EROOT}/bin/dircolors" | grep -qs "GNU coreutils" ; then
 			einfo "Deleting orphaned GNU /bin/dircolors for you"
-			rm -f "${ROOT}/bin/dircolors"
+			rm -f "${EROOT}/bin/dircolors"
 		fi
 	fi
 
 	# Help out users using experimental filesystems
-	if grep -qs btrfs "${ROOT}"/etc/fstab /proc/mounts ; then
+	if grep -qs btrfs "${EROOT}"/etc/fstab /proc/mounts ; then
 		case $(uname -r) in
 		2.6.[12][0-9]|2.6.3[0-7]*)
 			ewarn "You are running a system with a buggy btrfs driver."