Add support for USE=vanilla.

Package-Manager: portage-2.2_pre5

4 files changed, 29 insertions, 21 deletions

diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog
index cb467042e347..e6f4ca224aa3 100644
--- a/sys-apps/coreutils/ChangeLog
+++ b/sys-apps/coreutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/coreutils
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.224 2008/04/13 22:12:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.225 2008/04/13 22:14:59 vapier Exp $
+
+  13 Apr 2008; Mike Frysinger <vapier@gentoo.org> coreutils-6.10-r1.ebuild,
+  coreutils-6.10-r2.ebuild:
+  Add support for USE=vanilla.
 
   13 Apr 2008; Mike Frysinger <vapier@gentoo.org> coreutils-6.10-r1.ebuild,
   coreutils-6.10-r2.ebuild:
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 6341db55d3ef..557c73349c98 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -7,15 +7,15 @@ DIST coreutils-6.10-patches-1.2.tar.lzma 33307 RMD160 bd7f95f69a315d4fa477d37ca8
 DIST coreutils-6.10.tar.lzma 3746908 RMD160 7b3f7ae0f92fa3f04ab0b7fc0bbc22430a392a0b SHA1 783d425aeeb087f46a4d7d24f5a890299a09a487 SHA256 8b05bba1b2726a164e444c314e3f359604b58216be704bed8f2e028449cc6204
 DIST coreutils-6.9-patches-1.3.tar.bz2 49170 RMD160 a9ef9fb1850f343ede8c6ca81da9d55ebf719756 SHA1 6d88f3ac1da66c99622f09aec9c264efbec1f099 SHA256 e25a74602d0107747d61d3dda9d05673b307fe761f81776cdd5f7ab0262bcae7
 DIST coreutils-6.9.tar.bz2 5384378 RMD160 c6ae65204b2e9c234a1140f39a8be1ee5cdcaab7 SHA1 10310a78c4e1d9f742f3815ac28e9bf1086a5885 SHA256 89c2895ad157de50e53298b22d91db116ee4e1dd3fdf4019260254e2e31497b0
-EBUILD coreutils-6.10-r1.ebuild 4644 RMD160 93b607cea9a4badae3f636503f2757bf31869340 SHA1 0d5fbb6336e437fa5a9deb8678570597703bdb7b SHA256 94513bbfb23c41cd44d7e43e2c7639397917c1c6e6ff0fb3ea67eefa2b423f04
-EBUILD coreutils-6.10-r2.ebuild 4648 RMD160 ae1c14d785d41dc86b81ccdf2ae0a4e5cd632e0c SHA1 265e2e0f0c967317f03ec0114f0cbc5f94b341b7 SHA256 628e4d9db366eb872b597ad2d6d66738c03232ed0526d85cb6ee984f0b83a7b8
+EBUILD coreutils-6.10-r1.ebuild 4700 RMD160 784449c345093d8ee6d7a5be88541abb6e76f5f2 SHA1 ebeffdb6c7e924b028549fdeb616fccb45882dd0 SHA256 cf919100dca51f873cd7b74e52029bc3915e2a8103c8672360e9dde487956aee
+EBUILD coreutils-6.10-r2.ebuild 4704 RMD160 1b60e6ce0e21e8e6d1563a4a20af6d2b0dd4fb3f SHA1 7c60857d88aaefda2218f9d55f3d6e887101017c SHA256 f458605fe76d926e303f18eb7ff9c244f309271ec5b5e194857356f3cfcc492f
 EBUILD coreutils-6.9-r1.ebuild 4903 RMD160 084abf9060b3d24c8ff93ce6b6f06003e9fe7c80 SHA1 ec66d32b4e58e24f2fc7fcdc6f39953ef32f5376 SHA256 963b2ca3044382e97f68f1f1c5c0dea875c7c68a0fcafef6aceae6e4e26cbf75
-MISC ChangeLog 34146 RMD160 1c8979cc038878cc5cdc2dbbb97bb42fb6ff2fec SHA1 65dbab6d61c94429fb75b71444cc514814005e36 SHA256 c94e37fefd04efe81ef57267fe399897b3c788319d73e96fb6ebdbce04d95119
+MISC ChangeLog 34282 RMD160 c45aba3d3afc4c8d2522807a292406ef1bfe56d1 SHA1 3bfb0c6e475fe626ace9c88c7c3a34036f735c16 SHA256 a4a53d0658ed12e68197f7b84b78e29b63f1e8b7f232533bc047f6f070737da7
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFIAoVEj9hvisErhMIRAjUbAJ9GDDtfwg9uJtGeRj7CY6RGHgQzYACgjzMI
-AreiylQ9X3K0Ui35sLAgw7w=
-=KF76
+iD8DBQFIAoXqj9hvisErhMIRAosGAKDMy7x+rkrG5NDcSfRSbKgOOBF/DQCg4mgA
+ra3eUANHGkycYev5Rac2bgM=
+=CHJi
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/coreutils/coreutils-6.10-r1.ebuild b/sys-apps/coreutils/coreutils-6.10-r1.ebuild
index ae4f0bce0ceb..44c8274f07ae 100644
--- a/sys-apps/coreutils/coreutils-6.10-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-6.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-6.10-r1.ebuild,v 1.6 2008/04/13 22:12:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-6.10-r1.ebuild,v 1.7 2008/04/13 22:14:59 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs autotools
 
@@ -16,7 +16,7 @@ SRC_URI="ftp://alpha.gnu.org/gnu/coreutils/${P}.tar.lzma
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
-IUSE="acl nls selinux static xattr"
+IUSE="acl nls selinux static xattr vanilla"
 
 RDEPEND="selinux? ( sys-libs/libselinux )
 	acl? ( sys-apps/acl )
@@ -49,10 +49,12 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	EPATCH_SUFFIX="patch" \
-	PATCHDIR="${WORKDIR}/patch" \
-	EPATCH_EXCLUDE="001_all_coreutils-gen-progress-bar.patch" \
-	epatch
+	if ! use vanilla ; then
+		EPATCH_SUFFIX="patch" \
+		PATCHDIR="${WORKDIR}/patch" \
+		EPATCH_EXCLUDE="001_all_coreutils-gen-progress-bar.patch" \
+		epatch
+	fi
 
 	# Since we've patched many .c files, the make process will try to
 	# re-build the manpages by running `./bin --help`.  When doing a
@@ -63,7 +65,7 @@ src_unpack() {
 	# There's no reason for this crap to use the private version
 	sed -i 's:__mempcpy:mempcpy:g' lib/*.c
 
-	AT_M4DIR="m4" eautoreconf
+	use vanilla || AT_M4DIR="m4" eautoreconf
 }
 
 src_compile() {
diff --git a/sys-apps/coreutils/coreutils-6.10-r2.ebuild b/sys-apps/coreutils/coreutils-6.10-r2.ebuild
index e5f20ffc2604..23323e0d024f 100644
--- a/sys-apps/coreutils/coreutils-6.10-r2.ebuild
+++ b/sys-apps/coreutils/coreutils-6.10-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-6.10-r2.ebuild,v 1.3 2008/04/13 22:12:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-6.10-r2.ebuild,v 1.4 2008/04/13 22:14:59 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs autotools
 
@@ -16,7 +16,7 @@ SRC_URI="ftp://alpha.gnu.org/gnu/coreutils/${P}.tar.lzma
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="acl nls selinux static xattr"
+IUSE="acl nls selinux static xattr vanilla"
 
 RDEPEND="selinux? ( sys-libs/libselinux )
 	acl? ( sys-apps/acl )
@@ -49,10 +49,12 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	EPATCH_SUFFIX="patch" \
-	PATCHDIR="${WORKDIR}/patch" \
-	EPATCH_EXCLUDE="001_all_coreutils-gen-progress-bar.patch" \
-	epatch
+	if ! use vanilla ; then
+		EPATCH_SUFFIX="patch" \
+		PATCHDIR="${WORKDIR}/patch" \
+		EPATCH_EXCLUDE="001_all_coreutils-gen-progress-bar.patch" \
+		epatch
+	fi
 
 	# Since we've patched many .c files, the make process will try to
 	# re-build the manpages by running `./bin --help`.  When doing a
@@ -63,7 +65,7 @@ src_unpack() {
 	# There's no reason for this crap to use the private version
 	sed -i 's:__mempcpy:mempcpy:g' lib/*.c
 
-	AT_M4DIR="m4" eautoreconf
+	use vanilla || AT_M4DIR="m4" eautoreconf
 }
 
 src_compile() {