Add fixes for gentoo-freebsd prefix and freemint prefix.

Should fix 464784 and 507182

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xA832680F)

3 files changed, 80 insertions, 5 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/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/"