Add fixes for gentoo-freebsd prefix and freemint prefix.

Should fix 464784 and 507182

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA832680F

4 files changed, 91 insertions, 13 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index ce318d462b73..38ab9000a623 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/perl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.418 2014/03/11 17:01:15 civil Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.419 2014/04/30 14:47:53 civil Exp $
+
+  30 Apr 2014; Vladimir Smirnov +files/eblits/src_prepare-v50180002.eblit,
+  perl-5.18.2.ebuild:
+  Add fixes for gentoo-freebsd prefix and freemint prefix. Should fix 464784 and
+  507182
 
   11 Mar 2014; Vladimir Smirnov <civil@gentoo.org>
   +files/eblits/src_configure-v50180002.eblit,
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index ca8654eefcae..f9dfaa156458 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -9,6 +9,7 @@ AUX eblits/src_configure-v50160001.eblit 4718 SHA256 d98d70055a3a46384b5e1c30d78
 AUX eblits/src_configure-v50180002.eblit 4355 SHA256 675a0ee854c418f4b89a4aa3bf4f2c134ebc2db7d6c3b9b5af6cda351ed1690e SHA512 b40715ffe98e20b9a26f6118b01a37ffd1e7f77d54793bff6e1d234c751af799e3d5f5963892d8f05d016591bf8b7028b73871110dbc0997055d8e42c7c9feec WHIRLPOOL 5b87ffa64d1e87951144182e3347e499e6ea3953ac8a19fca4ceeedbae39c10778c47ed9110866cb2990e35b05bf9494da77deab3d459c20eb59eb563aec1f43
 AUX eblits/src_install-v50160001.eblit 2122 SHA256 64a8d7bcfd7757e8f15c28f4457240390f5f0ffff3c8c72c3e01a2612b668cec SHA512 ecea3ae0006fa2b009c15cf7ceca989058738e2e893b053dc0bf904ce17443b7d21ed033f09997535fd86da608d1c95d1b93a55268c06cf164d7894a71616e2c WHIRLPOOL a9c5531a799a3054ff3fd9add4e81e818f6f4d01d4826728274a15d98cee2a20188dee906f565ce4b413813068db4ac347ef7b717cd4b9526f54ba208c309491
 AUX eblits/src_prepare-v50160001.eblit 2114 SHA256 dc803c75ffa7194149d7891c90cbdcd56e634afa6d0988db52242c27a6e1df3e SHA512 e6a32a3fd4b1b35ea146aefb67df74517304237d3fede12feaf52a1eed5880c2c15ad3b6bf2eb5bd153c60df5d6e9da583408d469d9014299dd4704e9a65d3db WHIRLPOOL b93e03c60c76a34da9d783bd88b2e0ec6c34c9a3a291973ad856180f4ed7b88ccbdd57fb95227c809c27a8a7537c67bf5ed573f5d7eba35b147ba26242438313
+AUX eblits/src_prepare-v50180002.eblit 2123 SHA256 c59aad808aebdf00e2a7579ba707b77143de0f5d967ce4e565669951c067b9a0 SHA512 1a3d0111b6b04afebbb752d5dabffd44f4d7f563b10b458cc6480d083237f636c2902927de82115172860c644abf22eccbb7fe48aa475d9295770bc36e5a5cbc WHIRLPOOL bef5d1dd0a822b2b012272054543d00d9357a9074ddfb9e1fac8f0bcb23ecc792fd9f812b7ae6f7c9b54e9f582f4952ff1d9d5a1c344aad398561240a44cc592
 AUX eblits/src_test-v50160001.eblit 503 SHA256 35a8a1a6f89e351e4587c82ef3c30699f8a37d78570e28510c5e02bc9e352198 SHA512 09c6f1b253119d0ad7f7d698c37d9d1979a67a2866c72677177c47d9e7c413a7588e2e531bb1e9790ce49add618b768a7fa271e05171a3ce73fa4433034f91f7 WHIRLPOOL 9aae83a23fc6246d26729ad940a7a13bb89e3b2223581e34000f8a93470455bc8ca5b71ae47bf5e6809544793fe21f7207beca3681990c849838497f32f08b51
 AUX perl-5.10.1-cleanup-paths.patch 2368 SHA256 90738b47513eed34789ab506a023ca88be841a9a64127d201c4eebe85b63f443 SHA512 47246aa49f8baeab315bf06e64bddce98778fc9fcceddc0dd974604e1d6cb00a3a48bc08243a3edd2ccedf452bafd522e31e4469e672470c996da16efea85c4a WHIRLPOOL 9abc97d16322927f2e8b71d13f78edaca9e0b3838e2cd695fa2773ce6f7c3d6ce0d30bb81e34824294545df8a444772339f279ae2a556db2add9547b9cd7d065
 AUX perl-5.10.1-hpux.patch 1042 SHA256 3288b1b8a3d09d078c6c8453ebde7fdea15b0c39be016141c7278502a91dc26f SHA512 dbb3fadf45463c4aa2fc7333167369f8dd6506e4d45a39f7fa0c651ded185b866b289abaf38555ca559ab93b80ec4d666959cdfb76380a965a6b65bea5cb3df5 WHIRLPOOL c128d8baa440b0fc4ed0454b3b54f02a2525ae383b12daa6f5794d051a17637827219429650cdb2cb62f5972cc27818bae301b3d5f6aa5f11de90a5e77ca635d
@@ -67,7 +68,7 @@ DIST perl-5.16.2-3.tar.bz2 18740 SHA256 830a6f444c2977c9dd8a0a4baa5be470b0019158
 DIST perl-5.16.2.tar.bz2 13725101 SHA256 5ba91d9aa40220c615b644bb48fa5df7fbca4afb1c9e911bdc0ce2a93f072d7d SHA512 b2a0eac73ce57ca9b83622eaee64cdbfc69011ff4dc54d5e6193e9a218117f33963ac56a30fc2baa7a76504868bfa5f00dd5ba25ece1ac70fe3a7a454898764b WHIRLPOOL e634c29edb00676023e906d65a9ace8cbee6aed43c6551d119a0b59f4f1be15f2f9d8b1417cc22b3bae5a0f3706d1aecccd2815edc7f341a4301be969e024203
 DIST perl-5.16.3-1.tar.bz2 16842 SHA256 e88c413f6491aaa76cfb730af5873d710906df84d486019ad34b8c976ed9279e SHA512 337fbe5b3f447d2bb7f1edb18df973efbf99582448bcc6d3099ec6a91a43071cbbde3419a642e69602d6526f0d2c83d1ce8c7315e51362937c76bf3dc93f3f84 WHIRLPOOL c5be2872341e2bffe4f83b3f77314ed60b078f0977b11aa89d24a25fffa5ad9a761945d6518872c92a156065b58a3c456b71f98a8939a9cfd748e3a2d98a2264
 DIST perl-5.16.3.tar.bz2 13724906 SHA256 bb7bc735e6813b177dcfccd480defcde7eddefa173b5967eac11babd1bfa98e8 SHA512 c30cda0af9463942e40b5d70a95e69b0640bf0b79d9d9dfa1a61d9d8b9ee05f553fd240be4c8b3c60a1def66c80453e49e865c27d3dd0b686f5c004e1ff58d92 WHIRLPOOL 241141d9a04095abbc08f29853cc2a348b04550c7e9330c65a1aa111620b61166d2516a619a3afbf8b7bae4208bae7114bfff153c9303c00158a0153c3388526
-DIST perl-5.18.2-1.tar.bz2 16256 SHA256 e797502e384969839fb8e918dc6cf3c497206d332cb25a0cc503aeef4c574b75 SHA512 d5cdb2db530bbc53448045161a6ca2ef8a73539b6611737282d5c6f8ac623e9c481a8be22da8eabefb2f8f2a934cf254b50468651c76a0a1196e69773271d48a WHIRLPOOL 9cce4dd310e041c41e91e9f2ea94a2275168edfb1752da5f929a07333107451fb87d3901012e4af863e839bf8bd170571ae2a60309f4210d87b463615db9febe
+DIST perl-5.18.2-patches-2.tar.bz2 17153 SHA256 2d203611d9df9d63ed972a37db4927e5d04e80f1abd9724519ac9fc6600d7dbb SHA512 9efacaa44447dc605e69dd68886b41a263726158e98cdb9293678a77311eb197fbc86591db6209ad4614e8a8491758fa24f10c189e5a75dc8ec8c9a1335cafbc WHIRLPOOL 4d69c24e773b51a62e4a223a6846698b207a4ee71f16e58692634a750f25372e602c6902d3ec9859ec21fbf32acdef12817eb1ff285cdba37c404636ced16332
 DIST perl-5.18.2.tar.bz2 14058513 SHA256 06a0cd490be36d829606aa41d8c9c4c72ae70542f8d4f23ec554335b3d9e2746 SHA512 7129f56b33724a49498af22977e9e995791c8de736b204124e21d170f1a7419e7b8c6dbc57d76216e4aebcb4b42e61c4075f96ebf06a13523287966222527535 WHIRLPOOL 2acee8f9d7ee5b9f265c6cee625d67efb9ddad7164787faa8cb50707cc53914fb78420e1450e85180fb093804ae84cb301dd274aa4412f4b899aacf1f15bd0cb
 EBUILD perl-5.12.3-r1.ebuild 19453 SHA256 d675c932b718a36b59d666fec13d0a5a77b02b8450a961a7e1a833dcaf560de4 SHA512 9dbfc08a5ec1185f352caf0529ae0fa5d8df8b980aaa4682f18b2186244452247ea2bb4132a7464c27f12015522862a89091448ddcef6684c037f9c6eae5dd72 WHIRLPOOL d03b934499856b26454a8f7c99fed0044dce612928321483d61048fefb0200e922047154bc6d8375fdaa0c1c6c0c03ec1698343b0c4155f0b52d708fd794c504
 EBUILD perl-5.12.4-r1.ebuild 19372 SHA256 5daba3ba20c18960efdcc372ad697231ecb8f36515b8bdb2a386444992c431bd SHA512 fd1ab8eab7f11568578fc485c38ad4c261401c2235bb86314a9db2d4922866b51ed2037c80afe650c8488b77f6fe8ca13c788efe0bd10f0eed1460f16eda37bb WHIRLPOOL 80eca255b42b520d1dd08ed9b75e76b64c117e5d3906ea989297dc21dbed546b83eb023c4bc841bef8ccd536e8f9f0f4639d092f8327a7ded2a04c797174ffef
@@ -82,15 +83,17 @@ EBUILD perl-5.16.1.ebuild 4236 SHA256 29c5cb646290e5004262274b170ab8191ce03f40b4
 EBUILD perl-5.16.2-r1.ebuild 4323 SHA256 4d52bbc5bdd1dc013cc52ff21d91df98046d1b12e0709c3d322ce152b3fdb698 SHA512 0e0f7776803dc94248bba0403e3d3ebb8323dc6be5305a04cba1f2fabd820039a81ec2ac6b0d3105574e613b3c50f65fefe5b6f499acdb1d5b796d894ed4c50f WHIRLPOOL 690782c898a86551c0aeb02ec7e887bcdc8c6502e03282aaf5e2fe8c2febc715880ea5f380c16711dce6e67d9392f7a67de6868f43dcaeaf0c9fa983bb284f2d
 EBUILD perl-5.16.2.ebuild 4258 SHA256 9ce10c889603fe6c47ff5a35f6d6d912b34f5a8eca8d43db6d5f750eb536e770 SHA512 1fb31398edc025fb97ce5b74d44b86d10a6dc3405694e31e6744e6b83fb7069a59cf62d43b112faba80d804e12046e7c8ce7282b851d35fbd1faeab5acb18606 WHIRLPOOL b48f187a9f69d36849b946850dbed5a1969bb8ca5d49c71c203d93c45f94dea55f4d9b9136acf3d3b7a8b806a880d6c8c9ca9f1becc5ca6f3b201c91fd2cb01c
 EBUILD perl-5.16.3.ebuild 4320 SHA256 48fe6c0980d866928449355bd38b7818d8821af26fda72d9ae206e00835875ae SHA512 72b3986cd3a246484754a763d07e6b903295861b9de6227ab0acd6bc9fa80a21680192c289ebeed811e489a1ad817d53a9b5ce6688d19c6203daf6ce58c3d282 WHIRLPOOL e4758d3bb21b6a2c565bf456e8d64eecdb457929af21e9305b956c8507947b2e772151f0bee7b1444dd94b4c530fd011ecee02ff986d875312583e11dafd78c9
-EBUILD perl-5.18.2.ebuild 4329 SHA256 674f711e4a1b82a3b86647d0a89c494f8bef45383f45ee49f3a750752bacb54a SHA512 5ed12fa51fe31a537eb4b61337d4cdf5f182ece89a35778cdae506104dc943c014df64c0254ffcf56b71b0d77f3f95b476091aae42f81c8b2cf2f071dd34e197 WHIRLPOOL 7423064a7f9d4d4436e00e975e3fdcecbe8dc6219b8122e84e0b43f0d20795af17c941020fbdb2ba6be77784927be079f9a44e585ff04247936e1ccb0b27fcd2
-MISC ChangeLog 79699 SHA256 093033cc07aad948a7970d79ed2443ef7aaed54dc5b41bb1b391248ec27da657 SHA512 425bee166df8497e958f4e63a2c81426eab0bc81488b1710b9e369e50a67f194e9561b221137ea7ff887c79d3325809ee17c12f5302430e5e52e98e25eff6545 WHIRLPOOL 7ca5149364cf0b1e90014a9aefad58fe8ba2c36b26f0fe139799b1471b5a970181102e605c125ebdcc78b6f17a190817641149c6c80919ae13ce1cb14206d551
+EBUILD perl-5.18.2.ebuild 4345 SHA256 a212eb731e065ea0af933e80067c4c4f8320c0a24c0f9d38a6b80a97d5109230 SHA512 71ba3c91d0ea90f360bf73575ce89c12688fc0e5a3935281c8ff18dcb68f4816c20e605df21f5ffd4ad734561bc05ef1f5cceb0c8fbd484aba9f2617a3905f7f WHIRLPOOL 357e06e8ab4144c0b8ef691f0167e55c452e94a37e211ff97c3dbe08912e2fd0b9c01b0489ddd2f926190f7c9d2bf353b445a71e0674dd7d65ccd53b5a1eb165
+MISC ChangeLog 79887 SHA256 d391993d73ca4ab91c10d8880687857dec3cdc4c47acdda8bde5a03c01f476dc SHA512 c0b6a08e2c64533ecfb7ea36d043df8e210338f9e9128d1806ba66d390d93b1331a0927dbdb947f285bd892facf84428efdc53add5c123044662570887dfb677 WHIRLPOOL de698565f82e0213460bfc77a7cd1b07f039f249b763b7a4f0110bdc783ae742b4372e7753f6a55d0ffa9d6e074e77691a533593aafc4a8a2012cbbbe06bf249
 MISC metadata.xml 257 SHA256 94d99e58fcedfe7951797e5cbd70790c21b87c1e07a7003f650632bb0a4f2300 SHA512 caf80fd9d8931ab6d476afc21fcc840894cdb4cf548d196958321a0ba09ab83ff98de3f8b5f01701f8101fd0ec0fcfc35ae6e572aa8ef499b106c3ac8cabb769 WHIRLPOOL 7793b51d68b2c56ff1d6029be61fc41007af60c7143e8d82d87891e2863c1978c92d2bc13a0266e4506b69c0012a8555d27ce05061e4ce8c656b32e937badeae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iJwEAQEIAAYFAlM3798ACgkQG9wOWsQutdYPcgP/UCw59ykpeaOdSt5BmahzGUFv
-swbKsjHLHHEwXuuntCfxi5sdHJHhW/90JTjJN7G8QW7mJYh/1a2YwfwuUghdfAf6
-5IaSKmIy2aOYjAuKnablsdxkf/1PtWbw5Mt9n5bvh0XQoldwAmqv1QNgaGp6jylI
-OcXyxfQ+Inym2QlsknQ=
-=X9cy
+iQEcBAEBCAAGBQJTYQzTAAoJEIMvOqnEeZDCY3sIAIxN4zRkyzTTz6SAaBccvDb1
+eGgKAba7K3BuEfOEmg/bhfCsML/qiRRI3hBXoQEcRXY1dRc4m5TuCmErvgnjAUeW
+BAELYfrBDL3DUgUa578DQiYFKeY0EW4rvIIv2SS7CVgdc59Aajg6s4I+VUr0kB65
+kczGcpGTlNEeKQz3+5c9IilGwjsg7kwQ6ffeAPr8XNXjGJmlKSIRVXAD30ocXy0q
+Ds5BqYp+/TVlzPzJsZPPGC/77nCNVk/3jI/VDzglBeEQEfIo/tCtabhX1xzHNDUW
+gKVmwwBnaCNBivDPizxBABwAQjvbwGBTEjPIzuIUj8SyaMSuP/+jri4DAiMjOms=
+=z1QA
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/perl/files/eblits/src_prepare-v50180002.eblit b/dev-lang/perl/files/eblits/src_prepare-v50180002.eblit
new file mode 100644
index 000000000000..9f83cc563b2f
--- /dev/null
+++ b/dev-lang/perl/files/eblits/src_prepare-v50180002.eblit
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/src_prepare-v50180002.eblit,v 1.1 2014/04/30 14:47:53 civil Exp $
+
+src_prepare_update_patchlevel_h() {
+	# Copied and modified from debian:
+	# Copyright 2011 Niko Tyni
+	# This program is free software; you can redistribute it and/or modify
+	# it under the same terms as Perl itself.
+	local patchdir="${WORKDIR}/patches"
+	local prefix
+
+	[[ -f ${patchdir}/series ]] || return 0
+
+while read patch
+do
+	patchname=$(echo $patch | sed 's/\.diff$//')
+	< $patchdir/$patch sed -e '/^Subject:/ { N; s/\n / / }' | sed -n -e '
+
+	# massage the patch headers
+	s|^Bug: .*https\?://rt\.perl\.org/.*id=\(.*\).*|[perl #\1]|; tprepend;
+	s|^Bug: .*https\?://rt\.cpan\.org/.*id=\(.*\).*|[rt.cpan.org #\1]|; tprepend;
+	s|^Bug-Gentoo: ||; tprepend;
+	s/^\(Subject\|Description\): //; tappend;
+	s|^Origin: .*http://perl5\.git\.perl\.org/perl\.git/commit\(diff\)\?/\(.......\).*|[\2]|; tprepend;
+
+	# post-process at the end of input
+	$ { x;
+		# include the version number in the patchlevel.h description (if available)
+		s/List packaged patches/&'" for ${PF}(#${PATCH_VER})"'/;
+
+		# escape any backslashes and double quotes
+		s|\\|\\\\|g; s|"|\\"|g;
+
+		# add a prefix
+		s|^|\t,"'"$prefix$patchname"' - |;
+		# newlines away
+		s/\n/ /g; s/  */ /g;
+		# add a suffix
+		s/ *$/"/; p
+	};
+	# stop all processing
+	d;
+	# label: append to the hold space
+	:append H; d;
+	# label: prepend to the hold space
+	:prepend x; H; d;
+	'
+done < "${WORKDIR}"/patches/series > "${S}"/patchlevel-gentoo.h
+}
+
+eblit-perl-src_prepare() {
+	local patch
+	EPATCH_OPTS+=" -p1"
+	einfo "Applying patches from ${MY_P}-patches-${PATCH_VER} ..."
+	while read patch ; do
+		EPATCH_SINGLE_MSG="  ${patch} ..."
+		epatch "${WORKDIR}"/patches/${patch}
+	done < "${WORKDIR}"/patches/series
+
+	src_prepare_update_patchlevel_h
+
+	# pod/perltoc.pod fails
+	# lib/ExtUtils/t/Embed.t fails
+	if ! tc-is-static-only ; then
+		ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
+		ln -s ${LIBPERL} libperl$(get_libname ) || die
+	fi
+}
+
diff --git a/dev-lang/perl/perl-5.18.2.ebuild b/dev-lang/perl/perl-5.18.2.ebuild
index 668ffcc4e3bc..c3cc0fe8114e 100644
--- a/dev-lang/perl/perl-5.18.2.ebuild
+++ b/dev-lang/perl/perl-5.18.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.18.2.ebuild,v 1.3 2014/03/11 17:01:15 civil Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.18.2.ebuild,v 1.4 2014/04/30 14:47:53 civil Exp $
 
 EAPI=5
 
 inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessing
 
-PATCH_VER=1
+PATCH_VER=2
 
 PERL_OLDVERSEN="5.18.0 5.18.1"
 MODULE_AUTHOR=RJBS
@@ -20,8 +20,8 @@ DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
 SRC_URI="
 	mirror://cpan/src/5.0/${MY_P}.tar.bz2
 	mirror://cpan/authors/id/${MODULE_AUTHOR:0:1}/${MODULE_AUTHOR:0:2}/${MODULE_AUTHOR}/${MY_P}.tar.bz2
-	mirror://gentoo/${MY_P}-${PATCH_VER}.tar.bz2
-	http://dev.gentoo.org/~civil/distfiles/${CATEGORY}/${PN}/${MY_P}-${PATCH_VER}.tar.bz2
+	mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2
+	http://dev.gentoo.org/~civil/distfiles/${CATEGORY}/${PN}/${MY_P}-patches-${PATCH_VER}.tar.bz2
 "
 HOMEPAGE="http://www.perl.org/"