From cd5db516f5e2cd632b4562b29c9a0f99ac6ca1c0 Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Mon, 4 May 2015 18:59:30 +0000 Subject: [PATCH] Make USE_PHP a REQUIRED variable for the php-ext-source-r2 eclass --- eclass/ChangeLog | 5 ++++- eclass/php-ext-source-r2.eclass | 11 ++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 1d2da3e3ae6e..23be1832bc3b 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1600 2015/05/02 20:23:56 chewi Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1601 2015/05/04 18:59:30 grknight Exp $ + + 04 May 2015; php-ext-source-r2.eclass: + Make USE_PHP a REQUIRED variable for the php-ext-source-r2 eclass 02 May 2015; James Le Cuirot java-utils-2.eclass: Make java-pkg_doso always install with mode 0755, which is more like diff --git a/eclass/php-ext-source-r2.eclass b/eclass/php-ext-source-r2.eclass index 6d8445fd865f..0b7d61030b36 100644 --- a/eclass/php-ext-source-r2.eclass +++ b/eclass/php-ext-source-r2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.34 2015/03/26 16:15:33 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.35 2015/05/04 18:59:30 grknight Exp $ # @ECLASS: php-ext-source-r2.eclass # @MAINTAINER: @@ -32,6 +32,7 @@ case ${EAPI} in esac # @ECLASS-VARIABLE: PHP_EXT_NAME +# @REQUIRED # @DESCRIPTION: # The extension name. This must be set, otherwise the eclass dies. # Only automagically set by php-ext-pecl-r2.eclass, so unless your ebuild @@ -51,10 +52,14 @@ esac [[ -z "${PHP_EXT_ZENDEXT}" ]] && PHP_EXT_ZENDEXT="no" # @ECLASS-VARIABLE: USE_PHP +# @REQUIRED # @DESCRIPTION: # Lists the PHP slots compatibile the extension is compatibile with -[[ -z "${USE_PHP}" ]] && USE_PHP="php5-3" \ - && eqawarn "An empty USE_PHP is deprecated and support will be removed on 2015-05-01" +# Example: +# @CODE +# USE_PHP="php5-5 php5-6" +# @CODE +[[ -z "${USE_PHP}" ]] && die "USE_PHP is not set for the php-ext-source-r2 eclass" # @ECLASS-VARIABLE: PHP_EXT_OPTIONAL_USE # @DESCRIPTION: -- 2.26.2