diff options
| author |   Brian Evans <grknight@gentoo.org> | 2015-02-11 02:53:18 +0000 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2015-02-11 02:53:18 +0000 |
| commit | 2afce407c9a794cde65ff554cd5e478c2d4fc0f1 (patch) | |
| tree | ab640994d2e22c57fdfd5cf7d93730c4c86505a4 | |
| parent | Version bump (bug #536596). (diff) | |
| download | gentoo-2-2afce407c9a794cde65ff554cd5e478c2d4fc0f1.tar.gz gentoo-2-2afce407c9a794cde65ff554cd5e478c2d4fc0f1.tar.bz2 gentoo-2-2afce407c9a794cde65ff554cd5e478c2d4fc0f1.zip | |
Add EAPI check to silence repoman warnings
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/php-pear-lib-r1.eclass | 16 | ||||
| -rw-r--r-- | eclass/php-pear-r1.eclass | 16 |
3 files changed, 31 insertions, 7 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 1d1494af2571..9f5f7c434944 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1530 2015/02/10 22:21:26 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1531 2015/02/11 02:53:18 grknight Exp $ + + 10 Feb 2015; Johannes Huber <johu@gentoo.org> php-pear-r1.eclass, + php-pear-lib-r1.eclass: + Add EAPI check to silence repoman warnings 10 Feb 2015; Johannes Huber <johu@gentoo.org> kde5.eclass: Sync SRC_URI calculation with kde overlay, fixes bug #539668. diff --git a/eclass/php-pear-lib-r1.eclass b/eclass/php-pear-lib-r1.eclass index e25cdd5426d2..6c4caf4b25b2 100644 --- a/eclass/php-pear-lib-r1.eclass +++ b/eclass/php-pear-lib-r1.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.27 2012/08/22 15:06:20 olemarkus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.28 2015/02/11 02:53:18 grknight Exp $ # @ECLASS: php-pear-lib-r1.eclass # @MAINTAINER: @@ -17,7 +17,17 @@ inherit multilib EXPORT_FUNCTIONS pkg_setup src_install -DEPEND="dev-lang/php +# Silence repoman warnings +case "${EAPI:-0}" in + 5) + PHP_DEPEND="dev-lang/php:*" + ;; + *) + PHP_DEPEND="dev-lang/php" + ;; +esac + +DEPEND="${PHP_DEPEND} >=dev-php/pear-1.9.0" RDEPEND="${DEPEND}" diff --git a/eclass/php-pear-r1.eclass b/eclass/php-pear-r1.eclass index c78d8aaed2aa..dd3ffc3e7c23 100644 --- a/eclass/php-pear-r1.eclass +++ b/eclass/php-pear-r1.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.32 2013/11/25 23:22:57 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.33 2015/02/11 02:53:18 grknight Exp $ # @ECLASS: php-pear-r1.eclass # @MAINTAINER: @@ -19,7 +19,17 @@ inherit multilib EXPORT_FUNCTIONS pkg_setup src_install -DEPEND="dev-lang/php +# Silence repoman warnings +case "${EAPI:-0}" in + 5) + PHP_DEPEND="dev-lang/php:*" + ;; + *) + PHP_DEPEND="dev-lang/php" + ;; +esac + +DEPEND="${PHP_DEPEND} >=dev-php/pear-1.8.1" RDEPEND="${DEPEND}" |