Block separate perl-core/ExtUtils-Manifest package here since there is a file collision, bug 541544

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

3 files changed, 24 insertions, 18 deletions

diff --git a/perl-core/ExtUtils-MakeMaker/ChangeLog b/perl-core/ExtUtils-MakeMaker/ChangeLog
index fcf3962f89de..f2f79b3a5f21 100644
--- a/perl-core/ExtUtils-MakeMaker/ChangeLog
+++ b/perl-core/ExtUtils-MakeMaker/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for perl-core/ExtUtils-MakeMaker
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ChangeLog,v 1.66 2015/02/27 23:45:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ChangeLog,v 1.67 2015/02/28 18:44:38 dilfridge Exp $
+
+  28 Feb 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  ExtUtils-MakeMaker-7.40.0.ebuild:
+  Block separate perl-core/ExtUtils-Manifest package here since there is a file
+  collision, bug 541544
 
 *ExtUtils-MakeMaker-7.40.0-r1 (27 Feb 2015)
 
diff --git a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-7.40.0.ebuild b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-7.40.0.ebuild
index 252bac59dfea..2b5f612add13 100644
--- a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-7.40.0.ebuild
+++ b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-7.40.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-7.40.0.ebuild,v 1.1 2015/02/25 23:08:03 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-7.40.0.ebuild,v 1.2 2015/02/28 18:44:38 dilfridge Exp $
 
 EAPI=5
 MODULE_AUTHOR=BINGOS
@@ -18,6 +18,7 @@ DEPEND="
 	>=virtual/perl-ExtUtils-Install-1.540.0
 	>=virtual/perl-ExtUtils-Manifest-1.600.0
 	>=virtual/perl-File-Spec-0.800.0
+	!perl-core/ExtUtils-Manifest
 "
 RDEPEND="${DEPEND}"
 PDEPEND="
diff --git a/perl-core/ExtUtils-MakeMaker/Manifest b/perl-core/ExtUtils-MakeMaker/Manifest
index 18dfbcc737e6..c9f927e25d91 100644
--- a/perl-core/ExtUtils-MakeMaker/Manifest
+++ b/perl-core/ExtUtils-MakeMaker/Manifest
@@ -12,25 +12,25 @@ DIST ExtUtils-MakeMaker-6.82.tar.gz 433809 SHA256 eb2b31b6764e2b81437d4f38a29135
 DIST ExtUtils-MakeMaker-7.04.tar.gz 439960 SHA256 98126b012d70c2af0f8e33a07ebe0d6f2340281b2460981b959a9fb31d5ad97f SHA512 10b905dfdda2c6b4d59e6dac5a5da64db4674df51fc4d87af36fa8735fac93baa43fc9e083a37b09a3b66fe546d053224b2f1bfb5981ad1fa0f4fa6e61f2563c WHIRLPOOL ff6078394c488633adf3d1214c9379921a0c015215bab2ba2fb9305eb203f9fef95ce0aa95a5f9d274b348d74e7ea26a02ff5101a931e26df7700ce98133c2e9
 EBUILD ExtUtils-MakeMaker-6.820.0-r1.ebuild 1474 SHA256 b0b35f9ca93435b3aa9fbd17d72b1006a3a3c717d8fda93cfc2169c8aa92f5b9 SHA512 2d3c7f2cee5d7626edbaf76363946bf59f1c2f5e9b01eb3f13937b0fbd1da521a673a65884321efe1a3f5afc603a7b261046b6ce8b69abb91db4b60aa2a925db WHIRLPOOL 3576df7ab9bd163a272065c46ff0e82addb1fb3b5062f6ece74b15f9d5e0a6c4597e92b61524b801220ed042c6445897306da180e12ed11baf56ad7053a8c50a
 EBUILD ExtUtils-MakeMaker-7.40.0-r1.ebuild 1288 SHA256 0154a015eb9382c821b9b23a1659f06cfc9dd16234704c14c1de6a0fac7623a4 SHA512 f3bd200346bac751d8581256d5882f27a24e7ce4ebb66751271c6146133f15bcbe01eddc057c38fb85dd435ccf290b4951302c70666d6ecae5df2ce21cbfe065 WHIRLPOOL ad1c4a9c31fd69c929a3c8221139276b9be734405427079a4281ac156c7edcfc38538c2200a8c6412c73eac32ad874434ed21740ed431f5a1d8e2b9396150e8c
-EBUILD ExtUtils-MakeMaker-7.40.0.ebuild 1471 SHA256 c0f234a09e82943b088b424764f1066757f832189ffb5a0f8b64ed56ead65e66 SHA512 4a1dc98058a3f5091d2ce6eb061ddb966ba00bc59af66f59736e618aa06c41b714b17bfb16716615db20d3cd44a22241229be25a50289aa826757e01b379f7a6 WHIRLPOOL b7a7f5c244de96bc441fcbaa3c056976988838439a86bb0b7f68ad3c7405e9ef51cf8919d836254d19ce3890ab6f1b76d793441ba30d0f8633ecaa73c478eb9a
-MISC ChangeLog 9509 SHA256 c09136f18a9486865ace8d77ed14868a4d2d0c24f2432b89b563fe1c3081b5fc SHA512 9825c9e9ace3968faeffc0b1712165308d2fc95349c3b44a3bf6010bf3e41dc105e037538c178226265e499eac64c1b094a4a5a9b3394e386c83b3087dedca3a WHIRLPOOL e8debf3301734a6517319a2ec59e05de0de2356b04e5edb347c10da0030b8107babc8df839e1ac8b0386b963fcc86cb19a5e009781bc129e67791ac15aa82321
+EBUILD ExtUtils-MakeMaker-7.40.0.ebuild 1501 SHA256 d3de43682a093501fa314992cd604be0d93a7ecfffb12b8eb4b24b88e6dc189d SHA512 0872fafcdf0cc1bcba6703f7a84940fb51d109ec7738d732af2dbb7b243dbf0b30fa00336cba052397e9dcc7766cc2ac6463c90b74d439d1fcae7936d11d5de5 WHIRLPOOL 1e4135d645175924b70b035009b78e18b6e1af945dca63eb90bca248e7cab1fd4fa71d3aaa288ed0b73d7e3522942c191e59e167a4dc147c8f0923770cbd9b04
+MISC ChangeLog 9707 SHA256 823af007761eb1ca7001e9acfb4e60afbcca1ce55de75975fa9ecd0eab913396 SHA512 edf4169990b14d3f41cc8c058866b30414b7158b3203410a674aaa48d0575e85ce5b271a9209fb539cd960ac31355372c0d2799f44fd3028281a6eba8bdcdc84 WHIRLPOOL 804516d55c66c52fb2872cb413d2f220dd1e2569e8add5b497c090c33bf51a63c9e4d9fc2e3c248e17c315030fac6ba4f00f7db44e7aaef6b831341528136800
 MISC metadata.xml 2156 SHA256 45d2f290ee77aaa9af5e2feeb96e8b0803bdaf35c869c0d73b5a05ff599cd9e2 SHA512 2829f12b70a79e51b5659bd7b83dc951a3782fe5f5e19d04aede63cc536419a2ea27e7f8fc0eade299dc2183c5ac813dece6f5628145f4429af2ba59ac6acb85 WHIRLPOOL 6323979890593aebac8ba59f9544d43830a8f1f2fc212200f49e664aa071ba68b6db2f94374174613b11d6898df9f4f0cab9fa3d522481266a78a1da3314d0af
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU8QGtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJU8gycXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcT5UQAMFytLA3/vLYcssPQfw0baq8
-ASG1rAtGF6WsVODI8jP5lhlUgUuc8G3jzgb9IkGKw/yi6/XMWk8fUtfivov0StEi
-v+qK2RIB/a6X4JsKZ69dgnmRRCL7yifitXyz357SMo4z+KIyBWV1xMnq4hbDj6tH
-2jxm/PDUVuaBwAQHJqT/0oOlhjU9lQlehyMAlSNihbREbHHJeIfhP/Vta0ZuweYe
-wHtgHN7S4YdvGuxeIt7OqbAizYytNPeKrmjF7CNsKtyAGmYE9vIOQAK+Mh8IcoVx
-mYm8/xCu0zkB/mtA8uald0qwhqZS1pH5rutMyu9S/uBhQ2WbJaCBAy+VDg//jhPO
-kLRztiqnutnotIGLJkX0Gv6lfSReeKFiWK2fWWEb7pFSbFG4LspxB6klxNI7rvOw
-N1fzrWsjLNCfTOwUWSs+P25vf7bXSN8ycbCY5decXA6IPOpTiYL5UUudUyy/bfrf
-201wO29wdhDRiA9puQkvzuNrnIu8KxVh7CGW7vHARnjsPTO00RakaMEK1ylUCi1c
-5bTjqHDyxpZHMNfwoRzQU3ocA+R03xFekFpwqohUQVy+CVkeTkaXI7gwI5FAnIkI
-jl9i1rSLama0oxHkqI1GlWDWOXArgAs7yTi8G4FmrFhff36JPktIIpWtiRxw1l5j
-mZUiZN5N1PfR+dJJAmYm
-=bG2/
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcZVoP+wQg4ZblV6U/YQ44qPX2Tejo
+nUnsu2lXB2JQaqeRoub6f5RxnQpb9HDtL1gWzoqSiLbyZ0i+neqzt/NyTpe13Q1r
+EtPpkVsmoUSbsx6rjI4ppzc9iPQXPEF6AeLsZMqiJptvjsnW/B+UxTv9xRnt4Ygh
+Sad4aL9lya4htV2REahXBh92IF+8j8aXtH+kCViZ6pmNDLiLA56XoqNg8Vyf1OK4
+kmieUvcMJg5j4pY3g3fNMhAEnIKuuXq7ZNvY8uG4k0a7J/GvQJ/t9h3EA3DCDJP2
+L0tY5bgCTnRsF5tt3dp7aheffHSVh0r31VXsS9KLxr9d2yUTejtUCyWQ45oypbXq
+obdv+vQXDoVJOsnqOM3b5Io0tPE4De3+tlK/5OviwKVpRWaQls2e1gaWXTluUoTl
+MsbuzR6ymh1WrBSgjcvfmfucoqevXyPBRPV3zewZ9ZO2T/IYo6dOP1q3TOMkeyqX
+m/HzljTnS8alpN2K1StR+d1gIeyUckSlPBtN85Z/zRUpyvvcjXjQ1S1O13TPYwXv
+5IVpEJOb9NnTcPlaFG6v8TAbK3unKomRNhpLcdp/qng3pxAbmlqrC/qxsaGwv2sz
+ou+pO+N9PehmKKSBUsKyRryNnP+UP2qIPvwjQmmeLVMkqyrDuAFxxh7VVF4ffncZ
+v3NghaDAO+SQRR2XO/aX
+=Xi8Q
 -----END PGP SIGNATURE-----