diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2013-12-29 21:37:09 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2013-12-29 21:37:09 +0000 |
| commit | 4d4bdec6fe009fd841646c95ec27a2883f8be45d (patch) | |
| tree | 5364c11d4181daf2b08a0996444bbb01601d73ab /eclass | |
| parent | old (diff) | |
| download | gentoo-2-4d4bdec6fe009fd841646c95ec27a2883f8be45d.tar.gz gentoo-2-4d4bdec6fe009fd841646c95ec27a2883f8be45d.tar.bz2 gentoo-2-4d4bdec6fe009fd841646c95ec27a2883f8be45d.zip | |
Use subslot dependencies on dev-lang/perl if possible, bug 479298
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/perl-module.eclass | 20 |
2 files changed, 21 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index cfdafbe129cb..65733d1d59b8 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1100 2013/12/29 18:19:48 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1101 2013/12/29 21:37:09 dilfridge Exp $ + + 29 Dec 2013; Andreas K. Huettel <dilfridge@gentoo.org> perl-module.eclass: + Use subslot dependencies on dev-lang/perl if possible, bug 479298 29 Dec 2013; Michał Górny <mgorny@gentoo.org> python-r1.eclass: Update doc link to point to the docs on Wiki. diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass index d750bf72b37d..4192c7a370a5 100644 --- a/eclass/perl-module.eclass +++ b/eclass/perl-module.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.137 2013/07/31 05:15:43 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.138 2013/12/29 21:37:09 dilfridge Exp $ # @ECLASS: perl-module.eclass # @MAINTAINER: @@ -27,10 +27,24 @@ case "${EAPI:-0}" in PERL_EXPF+=" pkg_postinst pkg_postrm" case "${GENTOO_DEPEND_ON_PERL:-yes}" in - yes) + yes) + case "${EAPI:-0}" in + 5) + case "${GENTOO_DEPEND_ON_PERL_SUBSLOT:-yes}" in + yes) + DEPEND="dev-lang/perl:=[-build(-)]" + ;; + *) + DEPEND="dev-lang/perl[-build(-)]" + ;; + esac + ;; + *) DEPEND="|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )" - RDEPEND="${DEPEND}" ;; + esac + RDEPEND="${DEPEND}" + ;; esac ;; *) |