From: Michael Orlitzky <mjo@gentoo.org>
Date: Tue, 3 Jan 2017 04:57:50 +0000 (-0500)
Subject: dev-php/pecl-stomp: new revisions fixing the no-ssl build.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c9face083ba534f37d02a1c4d76c6337fef4c911;p=gentoo.git

dev-php/pecl-stomp: new revisions fixing the no-ssl build.

The main reason for these two new revisions are to fix what happens
when USE="-ssl" is set. The build system expects --with-openssl-dir=no
in that case, so the existing --without-openssl-dir was causing it to
crash. That should now be fixed; I've used "usex" instead of "use_with".

Some other minor fixes were made:

  * The LICENSE for this package is PHP-3.01, not PHP-3.
  * The "ssl" flag was also defaulted to being on, which -- unless
    critical -- kind of defeats the purpose of USE flags. It now
    defaults to being off.
  * Two eclass variables that were set to their default values have
    been removed.
  * The test suite is now enabled, but only for v2.0.0 where it actually
    passes (even though failure doesn't kill the build?).

Gentoo-Bug: 603560

Package-Manager: portage-2.3.0
---

diff --git a/dev-php/pecl-stomp/pecl-stomp-1.0.9.ebuild b/dev-php/pecl-stomp/pecl-stomp-1.0.9-r1.ebuild
similarity index 69%
rename from dev-php/pecl-stomp/pecl-stomp-1.0.9.ebuild
rename to dev-php/pecl-stomp/pecl-stomp-1.0.9-r1.ebuild
index 2ac7efc2c9db..ca443b95e65c 100644
--- a/dev-php/pecl-stomp/pecl-stomp-1.0.9.ebuild
+++ b/dev-php/pecl-stomp/pecl-stomp-1.0.9-r1.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="6"
+EAPI=6
 
 USE_PHP="php5-6 php7-0"
 PHP_EXT_NAME="stomp"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
 DOCS=( CREDITS doc/classes.php doc/functions.php )
 
 inherit php-ext-pecl-r3
@@ -16,10 +14,10 @@ USE_PHP="php5-6"
 
 KEYWORDS="~amd64 ~x86"
 
-DESCRIPTION="PHP extension to communicate with Stomp compliant Message Brokers"
-LICENSE="PHP-3"
+DESCRIPTION="PHP extension to communicate with Stomp message brokers"
+LICENSE="PHP-3.01"
 SLOT="0"
-IUSE="examples +ssl"
+IUSE="examples ssl"
 
 DEPEND="${DEPEND}
 	php_targets_php5-6? ( dev-lang/php:5.6[ssl?] )
@@ -37,8 +35,10 @@ src_prepare() {
 }
 
 src_configure() {
-	local PHP_EXT_ECONF_ARGS=( --enable-stomp
-		$(use_with ssl openssl-dir=/usr) )
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-stomp
+		--with-openssl-dir=$(usex ssl "${EPREFIX}/usr")
+	)
 	php-ext-source-r3_src_configure
 }
 
diff --git a/dev-php/pecl-stomp/pecl-stomp-2.0.0.ebuild b/dev-php/pecl-stomp/pecl-stomp-2.0.0-r1.ebuild
similarity index 69%
rename from dev-php/pecl-stomp/pecl-stomp-2.0.0.ebuild
rename to dev-php/pecl-stomp/pecl-stomp-2.0.0-r1.ebuild
index 08bd34979fb2..a64f473dceb7 100644
--- a/dev-php/pecl-stomp/pecl-stomp-2.0.0.ebuild
+++ b/dev-php/pecl-stomp/pecl-stomp-2.0.0-r1.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="6"
+EAPI=6
 
 USE_PHP="php5-6 php7-0"
 PHP_EXT_NAME="stomp"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
 DOCS=( CREDITS doc/classes.php doc/functions.php )
 
 inherit php-ext-pecl-r3
@@ -16,10 +14,10 @@ USE_PHP="php7-0"
 
 KEYWORDS="~amd64 ~x86"
 
-DESCRIPTION="PHP extension to communicate with Stomp compliant Message Brokers"
-LICENSE="PHP-3"
+DESCRIPTION="PHP extension to communicate with Stomp message brokers"
+LICENSE="PHP-3.01"
 SLOT="7"
-IUSE="examples +ssl"
+IUSE="examples ssl test"
 
 DEPEND="${DEPEND}
 	php_targets_php7-0? ( dev-lang/php:7.0[ssl?] )
@@ -37,8 +35,10 @@ src_prepare() {
 }
 
 src_configure() {
-	local PHP_EXT_ECONF_ARGS=( --enable-stomp
-		$(use_with ssl openssl-dir=/usr) )
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-stomp
+		--with-openssl-dir=$(usex ssl "${EPREFIX}/usr")
+	)
 	php-ext-source-r3_src_configure
 }