| 1 |
commit: c9face083ba534f37d02a1c4d76c6337fef4c911 |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 3 04:57:50 2017 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 3 05:03:40 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9face08 |
| 7 |
|
| 8 |
dev-php/pecl-stomp: new revisions fixing the no-ssl build. |
| 9 |
|
| 10 |
The main reason for these two new revisions are to fix what happens |
| 11 |
when USE="-ssl" is set. The build system expects --with-openssl-dir=no |
| 12 |
in that case, so the existing --without-openssl-dir was causing it to |
| 13 |
crash. That should now be fixed; I've used "usex" instead of "use_with". |
| 14 |
|
| 15 |
Some other minor fixes were made: |
| 16 |
|
| 17 |
* The LICENSE for this package is PHP-3.01, not PHP-3. |
| 18 |
* The "ssl" flag was also defaulted to being on, which -- unless |
| 19 |
critical -- kind of defeats the purpose of USE flags. It now |
| 20 |
defaults to being off. |
| 21 |
* Two eclass variables that were set to their default values have |
| 22 |
been removed. |
| 23 |
* The test suite is now enabled, but only for v2.0.0 where it actually |
| 24 |
passes (even though failure doesn't kill the build?). |
| 25 |
|
| 26 |
Gentoo-Bug: 603560 |
| 27 |
|
| 28 |
Package-Manager: portage-2.3.0 |
| 29 |
|
| 30 |
...l-stomp-1.0.9.ebuild => pecl-stomp-1.0.9-r1.ebuild} | 18 +++++++++--------- |
| 31 |
...l-stomp-2.0.0.ebuild => pecl-stomp-2.0.0-r1.ebuild} | 18 +++++++++--------- |
| 32 |
2 files changed, 18 insertions(+), 18 deletions(-) |
| 33 |
|
| 34 |
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 |
| 35 |
similarity index 69% |
| 36 |
rename from dev-php/pecl-stomp/pecl-stomp-1.0.9.ebuild |
| 37 |
rename to dev-php/pecl-stomp/pecl-stomp-1.0.9-r1.ebuild |
| 38 |
index 2ac7efc..ca443b9 100644 |
| 39 |
--- a/dev-php/pecl-stomp/pecl-stomp-1.0.9.ebuild |
| 40 |
+++ b/dev-php/pecl-stomp/pecl-stomp-1.0.9-r1.ebuild |
| 41 |
@@ -1,13 +1,11 @@ |
| 42 |
-# Copyright 1999-2016 Gentoo Foundation |
| 43 |
+# Copyright 1999-2017 Gentoo Foundation |
| 44 |
# Distributed under the terms of the GNU General Public License v2 |
| 45 |
# $Id$ |
| 46 |
|
| 47 |
-EAPI="6" |
| 48 |
+EAPI=6 |
| 49 |
|
| 50 |
USE_PHP="php5-6 php7-0" |
| 51 |
PHP_EXT_NAME="stomp" |
| 52 |
-PHP_EXT_INI="yes" |
| 53 |
-PHP_EXT_ZENDEXT="no" |
| 54 |
DOCS=( CREDITS doc/classes.php doc/functions.php ) |
| 55 |
|
| 56 |
inherit php-ext-pecl-r3 |
| 57 |
@@ -16,10 +14,10 @@ USE_PHP="php5-6" |
| 58 |
|
| 59 |
KEYWORDS="~amd64 ~x86" |
| 60 |
|
| 61 |
-DESCRIPTION="PHP extension to communicate with Stomp compliant Message Brokers" |
| 62 |
-LICENSE="PHP-3" |
| 63 |
+DESCRIPTION="PHP extension to communicate with Stomp message brokers" |
| 64 |
+LICENSE="PHP-3.01" |
| 65 |
SLOT="0" |
| 66 |
-IUSE="examples +ssl" |
| 67 |
+IUSE="examples ssl" |
| 68 |
|
| 69 |
DEPEND="${DEPEND} |
| 70 |
php_targets_php5-6? ( dev-lang/php:5.6[ssl?] ) |
| 71 |
@@ -37,8 +35,10 @@ src_prepare() { |
| 72 |
} |
| 73 |
|
| 74 |
src_configure() { |
| 75 |
- local PHP_EXT_ECONF_ARGS=( --enable-stomp |
| 76 |
- $(use_with ssl openssl-dir=/usr) ) |
| 77 |
+ local PHP_EXT_ECONF_ARGS=( |
| 78 |
+ --enable-stomp |
| 79 |
+ --with-openssl-dir=$(usex ssl "${EPREFIX}/usr") |
| 80 |
+ ) |
| 81 |
php-ext-source-r3_src_configure |
| 82 |
} |
| 83 |
|
| 84 |
|
| 85 |
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 |
| 86 |
similarity index 69% |
| 87 |
rename from dev-php/pecl-stomp/pecl-stomp-2.0.0.ebuild |
| 88 |
rename to dev-php/pecl-stomp/pecl-stomp-2.0.0-r1.ebuild |
| 89 |
index 08bd349..a64f473 100644 |
| 90 |
--- a/dev-php/pecl-stomp/pecl-stomp-2.0.0.ebuild |
| 91 |
+++ b/dev-php/pecl-stomp/pecl-stomp-2.0.0-r1.ebuild |
| 92 |
@@ -1,13 +1,11 @@ |
| 93 |
-# Copyright 1999-2016 Gentoo Foundation |
| 94 |
+# Copyright 1999-2017 Gentoo Foundation |
| 95 |
# Distributed under the terms of the GNU General Public License v2 |
| 96 |
# $Id$ |
| 97 |
|
| 98 |
-EAPI="6" |
| 99 |
+EAPI=6 |
| 100 |
|
| 101 |
USE_PHP="php5-6 php7-0" |
| 102 |
PHP_EXT_NAME="stomp" |
| 103 |
-PHP_EXT_INI="yes" |
| 104 |
-PHP_EXT_ZENDEXT="no" |
| 105 |
DOCS=( CREDITS doc/classes.php doc/functions.php ) |
| 106 |
|
| 107 |
inherit php-ext-pecl-r3 |
| 108 |
@@ -16,10 +14,10 @@ USE_PHP="php7-0" |
| 109 |
|
| 110 |
KEYWORDS="~amd64 ~x86" |
| 111 |
|
| 112 |
-DESCRIPTION="PHP extension to communicate with Stomp compliant Message Brokers" |
| 113 |
-LICENSE="PHP-3" |
| 114 |
+DESCRIPTION="PHP extension to communicate with Stomp message brokers" |
| 115 |
+LICENSE="PHP-3.01" |
| 116 |
SLOT="7" |
| 117 |
-IUSE="examples +ssl" |
| 118 |
+IUSE="examples ssl test" |
| 119 |
|
| 120 |
DEPEND="${DEPEND} |
| 121 |
php_targets_php7-0? ( dev-lang/php:7.0[ssl?] ) |
| 122 |
@@ -37,8 +35,10 @@ src_prepare() { |
| 123 |
} |
| 124 |
|
| 125 |
src_configure() { |
| 126 |
- local PHP_EXT_ECONF_ARGS=( --enable-stomp |
| 127 |
- $(use_with ssl openssl-dir=/usr) ) |
| 128 |
+ local PHP_EXT_ECONF_ARGS=( |
| 129 |
+ --enable-stomp |
| 130 |
+ --with-openssl-dir=$(usex ssl "${EPREFIX}/usr") |
| 131 |
+ ) |
| 132 |
php-ext-source-r3_src_configure |
| 133 |
} |
Archives