| 1 |
commit: 7045d31acbfb4ed785fc3061313f7f3fcae75dba |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 30 23:29:26 2016 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 30 23:42:39 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7045d31a |
| 7 |
|
| 8 |
dev-lang/php: new 5.6 and 7.0 revisions with additional LICENSE entries. |
| 9 |
|
| 10 |
The main license under which PHP is distributed is the "PHP license." |
| 11 |
But, a lot of files, functions, and libraries have been inlined and |
| 12 |
bring with them the associated license from the upstream project. This |
| 13 |
commit adds the following unconditionally: |
| 14 |
|
| 15 |
* BSD (thread-safe resource manager, probably other places) |
| 16 |
* Zend-2.0 (used by the Zend engine, everything under ${S}/Zend/) |
| 17 |
|
| 18 |
and the following USE-conditionally: |
| 19 |
|
| 20 |
* LGPL-2.1+, used by the bcmath extension. |
| 21 |
* BSD-2, used by the fpm SAPI and mbstring extension. |
| 22 |
* gd, used by gd. |
| 23 |
* LGPL-2.1, used by the mbstring extension. |
| 24 |
|
| 25 |
The main license was also updated from "PHP-3" to "PHP-3.01", because |
| 26 |
that's what it is. |
| 27 |
|
| 28 |
Package-Manager: portage-2.3.0 |
| 29 |
|
| 30 |
dev-lang/php/{php-5.6.26-r1.ebuild => php-5.6.26-r2.ebuild} | 10 +++++++++- |
| 31 |
dev-lang/php/{php-7.0.11-r1.ebuild => php-7.0.11-r2.ebuild} | 10 +++++++++- |
| 32 |
2 files changed, 18 insertions(+), 2 deletions(-) |
| 33 |
|
| 34 |
diff --git a/dev-lang/php/php-5.6.26-r1.ebuild b/dev-lang/php/php-5.6.26-r2.ebuild |
| 35 |
similarity index 99% |
| 36 |
rename from dev-lang/php/php-5.6.26-r1.ebuild |
| 37 |
rename to dev-lang/php/php-5.6.26-r2.ebuild |
| 38 |
index 420cbd7..90bc6e2 100644 |
| 39 |
--- a/dev-lang/php/php-5.6.26-r1.ebuild |
| 40 |
+++ b/dev-lang/php/php-5.6.26-r2.ebuild |
| 41 |
@@ -9,7 +9,15 @@ inherit autotools flag-o-matic versionator libtool systemd |
| 42 |
DESCRIPTION="The PHP language runtime engine" |
| 43 |
HOMEPAGE="http://php.net/" |
| 44 |
SRC_URI="http://php.net/distributions/${P}.tar.xz" |
| 45 |
-LICENSE="PHP-3" |
| 46 |
+ |
| 47 |
+LICENSE="PHP-3.01 |
| 48 |
+ BSD |
| 49 |
+ Zend-2.0 |
| 50 |
+ bcmath? ( LGPL-2.1+ ) |
| 51 |
+ fpm? ( BSD-2 ) |
| 52 |
+ gd? ( gd ) |
| 53 |
+ unicode? ( BSD-2 LGPL-2.1 )" |
| 54 |
+ |
| 55 |
SLOT="$(get_version_component_range 1-2)" |
| 56 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
| 57 |
|
| 58 |
|
| 59 |
diff --git a/dev-lang/php/php-7.0.11-r1.ebuild b/dev-lang/php/php-7.0.11-r2.ebuild |
| 60 |
similarity index 99% |
| 61 |
rename from dev-lang/php/php-7.0.11-r1.ebuild |
| 62 |
rename to dev-lang/php/php-7.0.11-r2.ebuild |
| 63 |
index 7464406..0729ac3 100644 |
| 64 |
--- a/dev-lang/php/php-7.0.11-r1.ebuild |
| 65 |
+++ b/dev-lang/php/php-7.0.11-r2.ebuild |
| 66 |
@@ -9,7 +9,15 @@ inherit autotools flag-o-matic versionator libtool systemd |
| 67 |
DESCRIPTION="The PHP language runtime engine" |
| 68 |
HOMEPAGE="http://php.net/" |
| 69 |
SRC_URI="http://php.net/distributions/${P}.tar.xz" |
| 70 |
-LICENSE="PHP-3" |
| 71 |
+ |
| 72 |
+LICENSE="PHP-3.01 |
| 73 |
+ BSD |
| 74 |
+ Zend-2.0 |
| 75 |
+ bcmath? ( LGPL-2.1+ ) |
| 76 |
+ fpm? ( BSD-2 ) |
| 77 |
+ gd? ( gd ) |
| 78 |
+ unicode? ( BSD-2 LGPL-2.1 )" |
| 79 |
+ |
| 80 |
SLOT="$(get_version_component_range 1-2)" |
| 81 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
Archives