commit:     7045d31acbfb4ed785fc3061313f7f3fcae75dba
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 23:29:26 2016 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 23:42:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7045d31a

dev-lang/php: new 5.6 and 7.0 revisions with additional LICENSE entries.

The main license under which PHP is distributed is the "PHP license."
But, a lot of files, functions, and libraries have been inlined and
bring with them the associated license from the upstream project. This
commit adds the following unconditionally:

  * BSD (thread-safe resource manager, probably other places)
  * Zend-2.0 (used by the Zend engine, everything under ${S}/Zend/)

and the following USE-conditionally:

  * LGPL-2.1+, used by the bcmath extension.
  * BSD-2, used by the fpm SAPI and mbstring extension.
  * gd, used by gd.
  * LGPL-2.1, used by the mbstring extension.

The main license was also updated from "PHP-3" to "PHP-3.01", because
that's what it is.

Package-Manager: portage-2.3.0

 dev-lang/php/{php-5.6.26-r1.ebuild => php-5.6.26-r2.ebuild} | 10 +++++++++-
 dev-lang/php/{php-7.0.11-r1.ebuild => php-7.0.11-r2.ebuild} | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/dev-lang/php/php-5.6.26-r1.ebuild 
b/dev-lang/php/php-5.6.26-r2.ebuild
similarity index 99%
rename from dev-lang/php/php-5.6.26-r1.ebuild
rename to dev-lang/php/php-5.6.26-r2.ebuild
index 420cbd7..90bc6e2 100644
--- a/dev-lang/php/php-5.6.26-r1.ebuild
+++ b/dev-lang/php/php-5.6.26-r2.ebuild
@@ -9,7 +9,15 @@ inherit autotools flag-o-matic versionator libtool systemd
 DESCRIPTION="The PHP language runtime engine"
 HOMEPAGE="http://php.net/";
 SRC_URI="http://php.net/distributions/${P}.tar.xz";
-LICENSE="PHP-3"
+
+LICENSE="PHP-3.01
+       BSD
+       Zend-2.0
+       bcmath? ( LGPL-2.1+ )
+       fpm? ( BSD-2 )
+       gd? ( gd )
+       unicode? ( BSD-2 LGPL-2.1 )"
+
 SLOT="$(get_version_component_range 1-2)"
 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"
 

diff --git a/dev-lang/php/php-7.0.11-r1.ebuild 
b/dev-lang/php/php-7.0.11-r2.ebuild
similarity index 99%
rename from dev-lang/php/php-7.0.11-r1.ebuild
rename to dev-lang/php/php-7.0.11-r2.ebuild
index 7464406..0729ac3 100644
--- a/dev-lang/php/php-7.0.11-r1.ebuild
+++ b/dev-lang/php/php-7.0.11-r2.ebuild
@@ -9,7 +9,15 @@ inherit autotools flag-o-matic versionator libtool systemd
 DESCRIPTION="The PHP language runtime engine"
 HOMEPAGE="http://php.net/";
 SRC_URI="http://php.net/distributions/${P}.tar.xz";
-LICENSE="PHP-3"
+
+LICENSE="PHP-3.01
+       BSD
+       Zend-2.0
+       bcmath? ( LGPL-2.1+ )
+       fpm? ( BSD-2 )
+       gd? ( gd )
+       unicode? ( BSD-2 LGPL-2.1 )"
+
 SLOT="$(get_version_component_range 1-2)"
 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"
 

Reply via email to