Add EAPI check to silence repoman warnings

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 1d1494af25715e8c530098e9c8d099610cc23a7e..9f5f7c434944b83e690e3edce7cd2d7e1613ce7d 100644 (file)
--- 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 e25cdd5426d21890a0c422e8eb65b50a45d45bc2..6c4caf4b25b2e99928c808a882b5db8fa08f3165 100644 (file)
--- 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 c78d8aaed2aa526870cd197cc4803174c00467ac..dd3ffc3e7c23737b65a6f26a9123fa37b73ed629 100644 (file)
--- 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}"