Extend man page hack to missing perl #387091 by nzqr.

Package-Manager: portage-2.2.0_alpha65/cvs/Linux x86_64

diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog
index f9cc238f7946a6e6963e9583e6899d30c215335d..d5383e77068f38a19c2a304784817d3981060828 100644 (file)
--- a/sys-apps/coreutils/ChangeLog
+++ b/sys-apps/coreutils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/coreutils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.325 2011/10/13 16:12:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.326 2011/10/18 22:47:25 vapier Exp $
+
+  18 Oct 2011; Mike Frysinger <vapier@gentoo.org> coreutils-8.14.ebuild:
+  Extend man page hack to missing perl #387091 by nzqr.
 
 *coreutils-8.14 (13 Oct 2011)
 

diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 8613a30a2a4f0d4f5531f2dc2604c04e083a06ef..ad4bfd99d4ebd9874e28d2dcd960d1c7cab1874a 100644 (file)
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -24,18 +24,18 @@ EBUILD coreutils-8.10.ebuild 5472 RMD160 5adde475a12ca22de6ad590b78887007fbfef46
 EBUILD coreutils-8.11.ebuild 5472 RMD160 7c04758691871a3deb82755378d1d1504ffa77cd SHA1 112566bf3c00f773a1c7a5b0a2afc8f5b8d11b9a SHA256 9b0de23c04b1dcda80bdcec3b5533668fd6d8b401b8997ed181b13bff23ee15f
 EBUILD coreutils-8.12.ebuild 5472 RMD160 767dae36d2968c1c142d8efaa78ca74d8cb19ea8 SHA1 85e1481835fe9a2d7ad423e010007976301adb80 SHA256 e04c1143146043af29e54b9367191e8a11c9a3bf741763a5fb13aec471fdffe9
 EBUILD coreutils-8.13.ebuild 5472 RMD160 1092b8938dee2ef3b0d2b850e3ef6003ccce466e SHA1 d1107fb7aa15b53ec67a2c852c263812de13334d SHA256 8c2fe5fc85031756e8a874805c94892176a9a0618b8532ce644b87b660112a57
-EBUILD coreutils-8.14.ebuild 5472 RMD160 e106c1a55ffe9e23dfe8c533eef417fdd701cf2d SHA1 0a18b8209949b61851702b88ae134ff9b81962cb SHA256 8b0abb8de28191727d8b2d150cdd0b38767c3d501c6f1015fde6faa6cf5f055d
+EBUILD coreutils-8.14.ebuild 5505 RMD160 9f8bc60c550728ea2a276348da022439f0c8612c SHA1 9be87f89bb1305980c0c740dd9ae46710a0cf5d6 SHA256 67d0202103ea1e18cbd098c82053ce45e04976a89bca7b2a703114f33fb0c922
 EBUILD coreutils-8.5-r1.ebuild 5092 RMD160 581fd98b19c19507fc4362e1b315b3f81c6ffba4 SHA1 2f5c99678a8653939e6b91a9d2d0ed42783916a7 SHA256 2c537534ff389f926635dcd39cb4d7a48eff5e5d3825aa7af02a8a03a4ce5cc1
 EBUILD coreutils-8.5.ebuild 5078 RMD160 a500ac6b5d8a93dcb8f5863104a8a8e31b1d84ee SHA1 8300896fb3be6280b882bcb9ca62ffc768ec5c97 SHA256 a22d449686212e48dc39bd7b0b1de22bd0ce73d78c758229b3fcc8cb025eb932
 EBUILD coreutils-8.7.ebuild 5104 RMD160 53fe85675d68535ae53f276c5268b65177a5d0e8 SHA1 cc383887e6927281bd67317c23296159bff61cec SHA256 e5b6d11ad984e0d8c93328a2a2a0d2e5f0bace971aabf22d535793fee02cb750
 EBUILD coreutils-8.8.ebuild 5118 RMD160 ab648eef66d5a4a60435d16089bfadf65b830302 SHA1 820383ee5be1902ee43d0b0f1d7eb08e99b584a6 SHA256 de92ab9516bc39f976c3ed0959412d003ff8a83d0b76293657f6524efbe7903b
 EBUILD coreutils-8.9.ebuild 5118 RMD160 3a093bac74854ca289376a678056b104b1ac6960 SHA1 75b03d8636b14b730331f0d5003d373e62aea659 SHA256 ba38db2a7a071493aaa638c55c07515953d2a84540df9b5a405324e22b582741
-MISC ChangeLog 46750 RMD160 5d569a93d2941063c053d774a98090a597441511 SHA1 fdcd8e29d7cf1c5ade2584fe3c7d9bfde219d4b8 SHA256 060aa0904230ac1ef9d5f26f361889505d55317a90a6e36008fbf5441f829ab1
+MISC ChangeLog 46880 RMD160 7754caf51f339ac69bf6c0d946def543ef17a287 SHA1 25acebcd4253db31c37b03057ffd128dec3e5cda SHA256 0914168db7d236eb7a4ef8ba2212f9d49215ea2d670e140a1d5738d6c4ffd578
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6XDfAACgkQaC/OocHi7JYeAAD/alTbU/dez5EL9CKDmOi3dytl
-IThMjmevjdOALO/4rmcA/Ri71VWEIGwrYtg2ShUAckEoJ66Hx/LQBO6nuJlo7Wf9
-=zYSC
+iF4EAREIAAYFAk6eAgQACgkQaC/OocHi7JYZwQEAlnxu8E0ZMvjzU88wBGiDV7p+
+d+wrCWY1D/TYlPX1eYQA+wRsFRwXJMQxA/ZNfyprOpDxhqBzwetOqo4dQOi8CyaM
+=7w48
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/coreutils/coreutils-8.14.ebuild b/sys-apps/coreutils/coreutils-8.14.ebuild
index d7d758e2d86178a7447c7ae73359b38e8dacd8d9..59f3a1db644aa62117b48679d91678f762c3125d 100644 (file)
--- a/sys-apps/coreutils/coreutils-8.14.ebuild
+++ b/sys-apps/coreutils/coreutils-8.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-8.14.ebuild,v 1.1 2011/10/13 16:12:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-8.14.ebuild,v 1.2 2011/10/18 22:47:25 vapier Exp $
 
 EAPI="3"
 
@@ -45,9 +45,6 @@ src_prepare() {
                epatch
        fi
 
-       # Avoid perl dep for compiled in dircolors default #348642
-       has_version dev-lang/perl || touch src/dircolors.h
-
        # 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.
@@ -55,6 +52,12 @@ src_prepare() {
        # so let's just update the timestamps and skip the help2man step.
        set -- man/*.x
        tc-is-cross-compiler && touch ${@/%x/1}
+
+       # Avoid perl dep for compiled in dircolors default #348642
+       if ! has_version dev-lang/perl ; then
+               touch src/dircolors.h
+               touch ${@/%x/1}
+       fi
 }
 
 src_configure() {