commit: c99d1b1bbc03a6520bc954e3ba263d510ce81c94 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Mon Jun 27 15:53:58 2016 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Mon Jun 27 15:53:58 2016 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c99d1b1b
app-portage/g-cpan: sync, bug #585758 Package-Manager: portage-2.2.28-prefix app-portage/g-cpan/Manifest | 2 +- ...6.5-prefix.patch => g-cpan-0.16.7-prefix.patch} | 45 ++++++++-------- app-portage/g-cpan/g-cpan-0.16.5.ebuild | 44 --------------- app-portage/g-cpan/g-cpan-0.16.7.ebuild | 63 ++++++++++++++++++++++ app-portage/g-cpan/metadata.xml | 11 +++- 5 files changed, 96 insertions(+), 69 deletions(-) diff --git a/app-portage/g-cpan/Manifest b/app-portage/g-cpan/Manifest index 6cdf69b..1facc3b 100644 --- a/app-portage/g-cpan/Manifest +++ b/app-portage/g-cpan/Manifest @@ -1 +1 @@ -DIST g-cpan-0.16.5.tar.gz 33894 SHA256 929c06ee2cdd3361121b6f359ea7fc9201bc42caff96ef1df45b4cb93ccfd988 SHA512 f2eab23281abe567ee2df42895e3f0783228c6ab5e3a8230089e900fd2700367d736299da20fb228f2d4542491a24da05fd035a81aff7d79ce5132e35c48ad0b WHIRLPOOL 01e0b9fc59264455d57fc64c432e683ae941c74d6efa6e2b3430dea6caac019cfad3e893a4b39de4386a3dadadecf95d828a9fbaa8e8b1260303081e2cc6ce65 +DIST g-cpan-0.16.7.tar.gz 33621 SHA256 35ead4120bee1b4158413eb1f5933baf1ce75500495d590163fbfef95c9c171f SHA512 2412b30fa4c3432882db0f31da6ace841e353a363e15a3b536ea1febcf601a7f9c4e14968e3abcf848e3557098088012472179688caf36cd97ae9b528a3db7fb WHIRLPOOL 646f76745023ae815ebecf57856b50dcd568657df68aee89099dd64904a4d43e9cef82f4f16518bd0b8db50e3ddd57aa200bf8fcffbd6539305f59be798bece1 diff --git a/app-portage/g-cpan/files/g-cpan-0.16.5-prefix.patch b/app-portage/g-cpan/files/g-cpan-0.16.7-prefix.patch similarity index 84% rename from app-portage/g-cpan/files/g-cpan-0.16.5-prefix.patch rename to app-portage/g-cpan/files/g-cpan-0.16.7-prefix.patch index 7887972..04f9d6d 100644 --- a/app-portage/g-cpan/files/g-cpan-0.16.5-prefix.patch +++ b/app-portage/g-cpan/files/g-cpan-0.16.7-prefix.patch @@ -1,12 +1,12 @@ -diff -ur g-cpan-0.16.4.orig/bin/g-cpan g-cpan-0.16.4/bin/g-cpan ---- g-cpan-0.16.4.orig/bin/g-cpan 2011-01-25 00:10:13.000000000 +0100 -+++ g-cpan-0.16.4/bin/g-cpan 2012-09-29 16:59:48.000000000 +0200 +diff -ur g-cpan-0.16.7.orig/bin/g-cpan g-cpan-0.16.7/bin/g-cpan +--- g-cpan-0.16.7.orig/bin/g-cpan 2016-05-06 16:09:41.000000000 +0200 ++++ g-cpan-0.16.7/bin/g-cpan 2016-06-27 17:48:29.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -w package main; - # Copyright 1999-2011 Gentoo Foundation + # Copyright 1999-2016 Gentoo Foundation @@ -32,7 +32,7 @@ my $prog = basename($0); @@ -15,7 +15,7 @@ diff -ur g-cpan-0.16.4.orig/bin/g-cpan g-cpan-0.16.4/bin/g-cpan +unless ($ENV{TMPDIR}) { $ENV{TMPDIR} = '@GENTOO_PORTAGE_EPREFIX@/var/tmp/g-cpan' } my %dep_list = (); - my @perl_dirs = ("perl-gcpan", "dev-perl", "perl-core", "perl-text", "perl-tools", "perl-xml", "perl-dev", "dev-lang",); + my @perl_dirs = (qw( dev-perl perl-core perl-gcpan dev-lang )); @@ -80,8 +80,8 @@ if ($log) @@ -75,7 +75,7 @@ diff -ur g-cpan-0.16.4.orig/bin/g-cpan g-cpan-0.16.4/bin/g-cpan print_err("Please run $prog as a user with sufficient permissions"); exit; } -@@ -268,7 +268,7 @@ +@@ -269,7 +269,7 @@ } else { @@ -84,7 +84,7 @@ diff -ur g-cpan-0.16.4.orig/bin/g-cpan g-cpan-0.16.4/bin/g-cpan print_err("Please run $prog as a user with sufficient permissions"); exit; } -@@ -518,7 +518,7 @@ +@@ -519,7 +519,7 @@ { # First, check to see if this came with the core perl install @@ -93,7 +93,7 @@ diff -ur g-cpan-0.16.4.orig/bin/g-cpan g-cpan-0.16.4/bin/g-cpan my $s_perl = new DirHandle($pkgdbdir); my $eb = $ebuild_wanted; $eb =~ s{::}{/}gxs; -@@ -660,8 +660,8 @@ +@@ -666,8 +666,8 @@ } else { @@ -104,7 +104,7 @@ diff -ur g-cpan-0.16.4.orig/bin/g-cpan g-cpan-0.16.4/bin/g-cpan } foreach my $target_dir (@overlays) { -@@ -802,7 +802,7 @@ +@@ -810,7 +810,7 @@ if (defined($buildpkg) or defined($buildpkgonly)) { print $EBUILD "\npkg_postinst() {\n"; print $EBUILD "elog \"If you redistribute this package, please remember to\"\n"; @@ -113,7 +113,7 @@ diff -ur g-cpan-0.16.4.orig/bin/g-cpan g-cpan-0.16.4/bin/g-cpan print $EBUILD "}\n"; } -@@ -1131,7 +1131,7 @@ +@@ -1139,7 +1139,7 @@ =item B<-L,--log> @@ -122,11 +122,11 @@ diff -ur g-cpan-0.16.4.orig/bin/g-cpan g-cpan-0.16.4/bin/g-cpan =item B<-s,--search> -Only in g-cpan-0.16.4/bin: g-cpan.orig -diff -ur g-cpan-0.16.4.orig/lib/Gentoo/CPAN.pm g-cpan-0.16.4/lib/Gentoo/CPAN.pm ---- g-cpan-0.16.4.orig/lib/Gentoo/CPAN.pm 2012-09-29 16:30:49.000000000 +0200 -+++ g-cpan-0.16.4/lib/Gentoo/CPAN.pm 2012-09-29 16:59:48.000000000 +0200 -@@ -33,19 +33,19 @@ +Only in g-cpan-0.16.7/bin: g-cpan.orig +diff -ur g-cpan-0.16.7.orig/lib/Gentoo/CPAN.pm g-cpan-0.16.7/lib/Gentoo/CPAN.pm +--- g-cpan-0.16.7.orig/lib/Gentoo/CPAN.pm 2016-05-06 12:11:50.000000000 +0200 ++++ g-cpan-0.16.7/lib/Gentoo/CPAN.pm 2016-06-27 17:48:29.000000000 +0200 +@@ -32,19 +32,19 @@ use constant CPAN_CFG_NAME => 'MyConfig.pm'; # defaults tools for CPAN Config @@ -158,7 +158,7 @@ diff -ur g-cpan-0.16.4.orig/lib/Gentoo/CPAN.pm g-cpan-0.16.4/lib/Gentoo/CPAN.pm sub new { my $proto = shift; -@@ -553,7 +553,7 @@ +@@ -546,7 +546,7 @@ 'make' => q[$make_prog], 'make_arg' => q[], 'make_install_arg' => q[], @@ -167,16 +167,17 @@ diff -ur g-cpan-0.16.4.orig/lib/Gentoo/CPAN.pm g-cpan-0.16.4/lib/Gentoo/CPAN.pm 'makepl_arg' => q[], 'mbuild_arg' => q[], 'mbuild_install_arg' => q[], -diff -ur g-cpan-0.16.4.orig/lib/Gentoo/Portage.pm g-cpan-0.16.4/lib/Gentoo/Portage.pm ---- g-cpan-0.16.4.orig/lib/Gentoo/Portage.pm 2012-09-29 16:30:49.000000000 +0200 -+++ g-cpan-0.16.4/lib/Gentoo/Portage.pm 2012-09-29 17:01:00.000000000 +0200 +Only in g-cpan-0.16.7/lib/Gentoo: CPAN.pm.orig +diff -ur g-cpan-0.16.7.orig/lib/Gentoo/Portage.pm g-cpan-0.16.7/lib/Gentoo/Portage.pm +--- g-cpan-0.16.7.orig/lib/Gentoo/Portage.pm 2016-05-06 12:11:50.000000000 +0200 ++++ g-cpan-0.16.7/lib/Gentoo/Portage.pm 2016-06-27 17:49:44.000000000 +0200 @@ -47,7 +47,7 @@ return($var =~ /^$envvar$/ ); }; --foreach my $file ( "$ENV{HOME}/.gcpanrc", '/etc/portage/make.conf', '/etc/make.conf', '/etc/make.globals' ) { -+foreach my $file ( "$ENV{HOME}/.gcpanrc", "@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf", "@GENTOO_PORTAGE_EPREFIX@/etc/make.conf", "@GENTOO_PORTAGE_EPREFIX@/etc/make.globals" ) { +-foreach my $file ( "$ENV{HOME}/.gcpanrc", '/etc/portage/make.conf', '/etc/make.conf', '/usr/share/portage/config/make.globals' ) { ++foreach my $file ( "$ENV{HOME}/.gcpanrc", '@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf', '@GENTOO_PORTAGE_EPREFIX@/etc/make.conf', '@GENTOO_PORTAGE_EPREFIX@/usr/share/portage/config/make.globals' ) { if ( -f $file) { my $importer = Shell::EnvImporter->new( file => $file, -Only in g-cpan-0.16.4: prefix.patch +Only in g-cpan-0.16.7: prefix.patch diff --git a/app-portage/g-cpan/g-cpan-0.16.5.ebuild b/app-portage/g-cpan/g-cpan-0.16.5.ebuild deleted file mode 100644 index 355da6f..0000000 --- a/app-portage/g-cpan/g-cpan-0.16.5.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2014 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.5.ebuild,v 1.9 2014/09/11 12:17:27 zlogene Exp $ - -EAPI=5 - -inherit perl-module prefix - -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/~chainsaw/distfiles/${P}.tar.gz" - -LICENSE="|| ( Artistic GPL-2 )" -SLOT="0" -KEYWORDS="~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -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}-prefix.patch - eprefixify bin/g-cpan lib/Gentoo/Portage.pm lib/Gentoo/CPAN.pm -} - -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." -} diff --git a/app-portage/g-cpan/g-cpan-0.16.7.ebuild b/app-portage/g-cpan/g-cpan-0.16.7.ebuild new file mode 100644 index 0000000..0b9cb2d --- /dev/null +++ b/app-portage/g-cpan/g-cpan-0.16.7.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit perl-module prefix eutils +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://github.com/gentoo-perl/g-cpan.git" + inherit git-r3 + SRC_URI="" +else + SRC_URI="https://github.com/gentoo-perl/g-cpan/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +fi + +DESCRIPTION="Autogenerate and install ebuilds for CPAN modules" +HOMEPAGE="http://www.gentoo.org/proj/en/perl/g-cpan.xml" + +LICENSE="|| ( Artistic GPL-2 )" +SLOT="0" +IUSE="test" + +COMMONDEPEND=" + virtual/perl-File-Path + virtual/perl-File-Spec + dev-perl/Log-Agent + virtual/perl-Memoize + virtual/perl-IO + dev-perl/Shell-EnvImporter + virtual/perl-Term-ANSIColor + >=dev-perl/YAML-0.60 +" +RDEPEND="${COMMONDEPEND} + >=sys-apps/portage-2.0.0 +" +DEPEND="${COMMONDEPEND} + virtual/perl-ExtUtils-MakeMaker + test? ( >=virtual/perl-Test-Simple-0.940.0 ) +" + +src_prepare() { + epatch "${FILESDIR}"/${P}-prefix.patch + eprefixify bin/g-cpan lib/Gentoo/Portage.pm lib/Gentoo/CPAN.pm + eapply_user +} + +src_install() { + perl-module_src_install + use prefix \ + && diropts "-m0755" \ + || diropts -m0775 -o portage -g portage + dodir "/var/tmp/g-cpan" + dodir "/var/log/g-cpan" + keepdir "/var/log/g-cpan" +} + +pkg_postinst() { + elog "If you want to use g-cpan as non root user you may wish to adjust" + elog "the permissions on /var/tmp/g-cpan or add users to the portage group." + elog "Please note that some CPAN packages need additional manual" + elog "parameters or tweaking, due to bugs in their build systems." +} diff --git a/app-portage/g-cpan/metadata.xml b/app-portage/g-cpan/metadata.xml index 056ad38..fa5a8f4 100644 --- a/app-portage/g-cpan/metadata.xml +++ b/app-portage/g-cpan/metadata.xml @@ -1,8 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>perl</herd> - <maintainer> + <maintainer type="person"> <email>robb...@gentoo.org</email> </maintainer> + <maintainer type="project"> + <email>p...@gentoo.org</email> + <name>Gentoo Perl Project</name> + </maintainer> + <upstream> + <remote-id type="github">gentoo-perl/g-cpan</remote-id> + <bugs-to>https://github.com/gentoo-perl/g-cpan/issues</bugs-to> + </upstream> </pkgmetadata>