Patch g-cpan to work with Perl 5.16 (bug #421247), also support /etc/portage/make.conf (bug #420617).

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

3 files changed, 92 insertions, 2 deletions

diff --git a/app-portage/g-cpan/ChangeLog b/app-portage/g-cpan/ChangeLog
index 02a3953353d7..5211f2cf5827 100644
--- a/app-portage/g-cpan/ChangeLog
+++ b/app-portage/g-cpan/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/g-cpan
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/g-cpan/ChangeLog,v 1.64 2011/01/24 23:36:12 robbat2 Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/g-cpan/ChangeLog,v 1.65 2012/06/17 12:49:58 flameeyes Exp $
+
+*g-cpan-0.16.4-r1 (17 Jun 2012)
+
+  17 Jun 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/g-cpan-0.16.4-misc.patch, +g-cpan-0.16.4-r1.ebuild:
+  Patch g-cpan to work with Perl 5.16 (bug #421247), also support
+  /etc/portage/make.conf (bug #420617).
 
 *g-cpan-0.16.4 (24 Jan 2011)
 
diff --git a/app-portage/g-cpan/files/g-cpan-0.16.4-misc.patch b/app-portage/g-cpan/files/g-cpan-0.16.4-misc.patch
new file mode 100644
index 000000000000..edbedd239df7
--- /dev/null
+++ b/app-portage/g-cpan/files/g-cpan-0.16.4-misc.patch
@@ -0,0 +1,40 @@
+Index: g-cpan-0.16.4/lib/Gentoo/CPAN.pm
+===================================================================
+--- g-cpan-0.16.4.orig/lib/Gentoo/CPAN.pm
++++ g-cpan-0.16.4/lib/Gentoo/CPAN.pm
+@@ -11,7 +11,6 @@ use YAML::Node;
+ use Memoize;
+ use Cwd qw(getcwd abs_path cwd);
+ use File::Basename;
+-use Shell qw(perl);
+ 
+ memoize('transformCPAN');
+ memoize('FindDeps');
+@@ -197,12 +196,12 @@ sub unpackModule {
+ 
+     # If we have a Makefile.PL, run it to generate Makefile
+     if ( -f "Makefile.PL" ) {
+-        perl("Makefile.PL",'</dev/null');
++        system("perl Makefile.PL </dev/null");
+     }
+ 
+     # If we have a Build.PL, run it to generate the Build script
+     if ( -f "Build.PL" ) {
+-        perl("Build.PL",'</dev/null');
++        system("perl Build.PL </dev/null");
+     }
+ 
+     # Return whence we came
+Index: g-cpan-0.16.4/lib/Gentoo/Portage.pm
+===================================================================
+--- g-cpan-0.16.4.orig/lib/Gentoo/Portage.pm
++++ g-cpan-0.16.4/lib/Gentoo/Portage.pm
+@@ -47,7 +47,7 @@ sub getEnv {
+         return($var =~ /^$envvar$/ );
+     };
+ 
+-foreach my $file ( "$ENV{HOME}/.gcpanrc", "/etc/make.conf", "/etc/make.globals" ) {
++foreach my $file ( "$ENV{HOME}/.gcpanrc", "/etc/make.conf", "/etc/portage/make.conf", "/etc/make.globals" ) {
+     if ( -f $file) {
+     	my $importer = Shell::EnvImporter->new(
+     		file => $file,
diff --git a/app-portage/g-cpan/g-cpan-0.16.4-r1.ebuild b/app-portage/g-cpan/g-cpan-0.16.4-r1.ebuild
new file mode 100644
index 000000000000..869dcb3de84d
--- /dev/null
+++ b/app-portage/g-cpan/g-cpan-0.16.4-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/g-cpan/g-cpan-0.16.4-r1.ebuild,v 1.1 2012/06/17 12:49:58 flameeyes Exp $
+
+EAPI=4
+
+inherit perl-module
+
+DESCRIPTION="g-cpan: generate and install CPAN modules using portage"
+HOMEPAGE="http://www.gentoo.org/proj/en/perl/g-cpan.xml"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+		 http://dev.gentoo.org/~robbat2/distfiles/${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+		>=dev-perl/yaml-0.60
+		dev-perl/Shell-EnvImporter
+		dev-perl/Log-Agent"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-misc.patch
+}
+
+src_install() {
+		perl-module_src_install
+		diropts "-m0755"
+		dodir "/var/tmp/g-cpan"
+		keepdir "/var/tmp/g-cpan"
+		dodir "/var/log/g-cpan"
+		keepdir "/var/log/g-cpan"
+}
+
+pkg_postinst() {
+	elog "You may wish to adjust the permissions on /var/tmp/g-cpan"
+	elog "if you have users besides root expecting to use g-cpan."
+	elog "Please note that some CPAN packages need additional manual"
+	elog "parameters or tweaking, due to bugs in their build systems."
+}