From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RPmkq-0003y6-QM for garchives@archives.gentoo.org; Mon, 14 Nov 2011 02:58:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05A2A21C0B5; Mon, 14 Nov 2011 02:57:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B585E21C0B5 for ; Mon, 14 Nov 2011 02:57:33 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 41A961B402D for ; Mon, 14 Nov 2011 02:57:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id ADBDD80042 for ; Mon, 14 Nov 2011 02:57:32 +0000 (UTC) From: "Kent Fredric" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kent Fredric" Message-ID: Subject: [gentoo-commits] proj/perl-overlay:master commit in: scripts/lib/ X-VCS-Repository: proj/perl-overlay X-VCS-Files: scripts/lib/deptools.pm X-VCS-Directories: scripts/lib/ X-VCS-Committer: kent X-VCS-Committer-Name: Kent Fredric X-VCS-Revision: e01ba77c86e09acec1efa29e06456bfce89e4c69 Date: Mon, 14 Nov 2011 02:57:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: c2151416-45d9-4454-93fb-c2f5cb78dcfe X-Archives-Hash: 3bd525d3994e310acda2c31a5c619fae commit: e01ba77c86e09acec1efa29e06456bfce89e4c69 Author: Kent Fredric gmail com> AuthorDate: Mon Nov 14 02:51:16 2011 +0000 Commit: Kent Fredric gmail com> CommitDate: Mon Nov 14 02:51:16 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/perl-overlay.= git;a=3Dcommit;h=3De01ba77c [scripts/lib] add a few other exception rules to deptools --- scripts/lib/deptools.pm | 51 ++++++++++++++++++++++++-----------------= ------ 1 files changed, 26 insertions(+), 25 deletions(-) diff --git a/scripts/lib/deptools.pm b/scripts/lib/deptools.pm index b85c518..947d5b0 100644 --- a/scripts/lib/deptools.pm +++ b/scripts/lib/deptools.pm @@ -47,19 +47,24 @@ sub _vmap_perl_strange { 'Net-Ping' =3D> virtual 'net-ping', 'Pod-Parser' =3D> virtual 'PodParser', 'Config-General' =3D> perl 'config-general', - 'CGI-Simple' =3D> perl 'Cgi-Simple', + 'CGI-Simple' =3D> perl 'Cgi-Simple', + 'Text-Template' =3D> perl 'text-template', ); } =20 sub _vmap_overlay_native { return ( - 'Archive-Extract', 'B-Debug', 'B-Lint', '= constant', 'CPAN', - 'CPANPLUS', 'CPANPLUS-Dist-Build', 'Devel-DProf', '= Devel-PPPort', 'Devel-SelfStubber', - 'Dumpvalue', 'ExtUtils-Constant', 'ExtUtils-MakeMaker', '= File-Fetch', 'Filter-Simple', - 'HTTP-Tiny', 'i18n-langtags', 'if', '= IPC-SysV', 'Log-Message', - 'Log-Message-Simple', 'Math-Complex', 'Module-CoreList', '= NEXT', 'Object-Accessor', - 'Pod-LaTeX', 'Pod-Perldoc', 'Pod-Plainer', '= SelfLoader', 'Term-UI', - 'Unicode-Collate', 'Unicode-Normalize', + ( + 'Archive-Extract', 'B-Debug', 'B-Lint', = 'constant', + 'CPAN', 'CPANPLUS', 'CPANPLUS-Dist-Build', = 'Devel-DProf', + 'Devel-PPPort', 'Devel-SelfStubber', 'Dumpvalue', = 'ExtUtils-Constant', + 'ExtUtils-MakeMaker', 'File-Fetch', 'Filter-Simple', = 'HTTP-Tiny', + 'i18n-langtags', 'if', 'IPC-SysV', = 'Log-Message', + 'Log-Message-Simple', 'Math-Complex', 'Module-CoreList', = 'NEXT', + 'Object-Accessor', 'Pod-LaTeX', 'Pod-Perldoc', = 'Pod-Plainer', + 'SelfLoader', 'Term-UI', 'Unicode-Collate', = 'Unicode-Normalize', + ), + ( 'Exporter', 'base', ) ); } =20 @@ -98,9 +103,8 @@ sub provider_map { require dep::specialvs; my $specialvs =3D dep::specialvs->new(); =20 - for my $provider (@providers) { - =20 + next if $provider->is_backpan; next if $provider->is_dev; =20 @@ -112,8 +116,8 @@ sub provider_map { next unless $mod->name eq $wanted->module; =20 # specials - $specialvs->set_latest_mod( $provider->distribution , $mod ); - $specialvs->set_newest_mod( $provider->distribution, $mod ); + $specialvs->set_latest_mod( $provider->distribution, $mod ); + $specialvs->set_newest_mod( $provider->distribution, $mod ); $specialvs->set_oldest_mod( $provider->distribution, $mod ); =20 if ( $wanted->no_version_dep or $mod->version >=3D $wanted->versio= n ) { @@ -128,6 +132,7 @@ sub provider_map { } return \%moduleprov, $specialvs; } + sub get_deps { my ($release) =3D shift; =20 @@ -154,7 +159,7 @@ sub get_dep_phases { =20 $phases{$phase} //=3D []; $modules{$module} //=3D []; - =20 + require Gentoo::PerlMod::Version; my $v =3D Gentoo::PerlMod::Version::gentooize_version( $dep->{versio= n}, { lax =3D> 1 } ); =20 @@ -165,7 +170,7 @@ sub get_dep_phases { } =20 sub dispatch_dependency_handler { - =20 + my ( $release, $module, $declaration, $feeder ) =3D @_; =20 my ( $moduleprov, $specialvs ) =3D provider_map( $module, $declaration= ->[0] ); @@ -177,9 +182,8 @@ sub dispatch_dependency_handler { =20 $feeder->begin_dep( $release, $module, $declaration ); =20 - - if( $module eq 'perl' ){=20 - $feeder->perl_dep( $module, $declaration , gentooize_pkg( 'perl', $d= eclaration->[1] )); + if ( $module eq 'perl' ) { + $feeder->perl_dep( $module, $declaration, gentooize_pkg( 'perl', $de= claration->[1] ) ); return $feeder->done; } =20 @@ -187,19 +191,16 @@ sub dispatch_dependency_handler { =20 if ($multi) { $feeder->evt_multi( $module, $declaration ); } =20 - #pp {=20 - # moduleprov =3D> $moduleprov,=20 + #pp { + # moduleprov =3D> $moduleprov, # specialvs =3D> $specialvs, # release =3D> $release, - # module =3D> $module,=20 + # module =3D> $module, # declaration =3D> $declaration, # latest =3D> $specialvs->latest, #}; - if( $specialvs->has_latest ) { - $feeder->set_latest( $specialvs->latest,=20 - gentooize_pkg( $specialvs->latest->[0], - $declaration->[1] )=20 - ); + if ( $specialvs->has_latest ) { + $feeder->set_latest( $specialvs->latest, gentooize_pkg( $specialvs->= latest->[0], $declaration->[1] ) ); } =20 for my $prov ( keys %{$moduleprov} ) {