diff options
Diffstat (limited to 'dev-lang/php')
-rw-r--r-- | dev-lang/php/Manifest | 24 | ||||
-rw-r--r-- | dev-lang/php/php-5.6.35-r1.ebuild | 10 | ||||
-rw-r--r-- | dev-lang/php/php-5.6.36.ebuild | 12 | ||||
-rw-r--r-- | dev-lang/php/php-7.0.29.ebuild | 10 | ||||
-rw-r--r-- | dev-lang/php/php-7.0.30.ebuild | 12 | ||||
-rw-r--r-- | dev-lang/php/php-7.1.16.ebuild | 10 | ||||
-rw-r--r-- | dev-lang/php/php-7.1.18.ebuild | 12 | ||||
-rw-r--r-- | dev-lang/php/php-7.1.19.ebuild (renamed from dev-lang/php/php-7.1.17.ebuild) | 13 | ||||
-rw-r--r-- | dev-lang/php/php-7.2.6.ebuild | 743 | ||||
-rw-r--r-- | dev-lang/php/php-7.2.7.ebuild (renamed from dev-lang/php/php-7.2.5.ebuild) | 13 | ||||
-rw-r--r-- | dev-lang/php/php-7.3.0_alpha1.ebuild | 10 |
11 files changed, 59 insertions, 810 deletions
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index 6e92b6216a58..2606d2517b2f 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -11,19 +11,17 @@ DIST php-5.6.36.tar.xz 12467560 BLAKE2B 8badaabc668ff3a4b1129f03605a1570729f8196 DIST php-7.0.29.tar.xz 12400192 BLAKE2B 0bd1bd9450b87437e539ec5131cb4f7e4dbf76d5fd5212bdf34c4f022dd8f2d357e9a845d83b485d89469e20675c031bcf382a8ca348161dfd082d7a389ffcb2 SHA512 ea5a2fbcfc875dd2621e3f67038c1e00f43b53bc7079ae2127fcefbf116db0f32e34d4435f8211305402a4eccdaa5dfd6b96cf9416e68700f2c1f438d74a0af8 DIST php-7.0.30.tar.xz 12030228 BLAKE2B cc4c50d108fca68ee98b70a3007893d912d2343dd255faf52e41c1de04f590f427d9edad7b637177ccf1d9c62212ee6060baca13931c0aa14532df548ef159aa SHA512 1f0914ebda79247aa65ace63f6c8c4fcd850b21a82704f7b6482760259239cc5fee4cfd5aa2ed590b56822b4d69330ac472f46537e7f25d59e73ba63a48827c5 DIST php-7.1.16.tar.xz 12211512 BLAKE2B bf242e2438b2dc363368a9ef4478349a291f483477ccedf988abd0fbb78a6f1b31e3b86dcb39ed9a9a8151674a8373ae77d8420e77efd6a2e05d5cfc778ed40f SHA512 98e96f06a4912cfa6926be2f292ce7120ca893c9b779b2efef4120c1df3580fa427cd58f5e4977edb01a0ae3b85660d6ca79b2bd79b6cd830cd77f6c6588b5ea -DIST php-7.1.17.tar.xz 12213536 BLAKE2B bf358bc4920d38f74e4bdbc53f4744274071b4cea057452bfafbbc5760eb1ae0878f8cc92cf5337b883e17769cc6a490d0e64d3969aa1769cec92bf14f9101ea SHA512 2ac81b5ec898d366dc60f2dae4b07094457c6b8b110615e0fcc3af1e680708ed0e9c89728b95e453110eec41198cb8a0416b4aeadc017d4a2b6bf25ce624cac1 DIST php-7.1.18.tar.xz 12213396 BLAKE2B f851c6eb261b8b532e84e73e6f173deb6ac00cd5168a02db9811843540aeadc390a4c5416eb17749cc950bbb1eda1045f538e2b80e4734ea2c0c4e264776bffb SHA512 7eacbc3b98d8b668c90d5c93030263f47ba2e0d4d7820594662590b8b68670f734a2274ae476e3aeac7e030c4ef10411a80da3523383e87a6757e87597caee90 -DIST php-7.2.5.tar.xz 12034928 BLAKE2B 36c9ec413b5332a1ef138a5724fd1718f5a8ffa8873dbe27ae7b6ca9a55ecfa0de7f7504a20581edb48605c2afcc799784eb3d94e08236222f6de2094d1921d0 SHA512 1d49fc6e47d2e86d4fd62396e558965502f44cc8f72459bb0d406e157298cac67703b219837952da11122722d9fa8cb4cda8ef66ddf063cb063859db34110f58 -DIST php-7.2.6.tar.xz 12113028 BLAKE2B 8b46ea6153cd12e7aa977978892c0842e5fa096bdead9ad6c6358d37d446e2f61fe09213a4de6864707ce0935823eb8b514be9e79f2095dda44fa22a51cb0c45 SHA512 da86b1ff2df3b9e2d46e59a80296b940d81132975b621bdec9602f8b4c8d91a3fdcd4ffd7cb982d63d3ec974b3a12a7854e42a73b7f2cc8eefade14335aa7c71 +DIST php-7.1.19.tar.xz 12215112 BLAKE2B 13f39fa258b5257e00b300d9488dc53caac8b005a01c4db98a05681334ab0dfade713116581da3f150dc20f4428fb249e00d705696d12b1daa13fc16fdaeedb9 SHA512 af966ef8d4172bbdac84bebbf6bf5cfd04376564307e925d3eecd1ba8f23b84dbb55f653d21adad120605d015ea4d15898e0a9154c85f4fc974b6ef695f6c566 +DIST php-7.2.7.tar.xz 12115168 BLAKE2B 787621d6bfcfa2f8f7176e3fab5b1f521f82169d5d8367664404eda4503e477a16233c6b155170e8a0c76c1d67674bc9bb0922ea65c3694977df0c6c2aba6a04 SHA512 fe9d632f190e62d97848035584f387987856348c6ca288a8bdf85bc2c48de73c20e774776a1a8928a470a6108121c993c032529836a8ffe6bcfe45724d432829 DIST php-7.3.0alpha1.tar.xz 11746836 BLAKE2B 14feb7a31652d2f4cf3d34f0f0450fbcc597d026177b60455887657213acd6d5a8a11f96df30e9d18f51a95409bb944ba287aaee0b84ef1b66ffd61aeb8821d5 SHA512 5fedb7716bd194bd9692de9d2ac88b4bac876b74e463a43ae5bc5fd4f63bbf85d02c9d2f1f1e952c45b7867ccb2bd80b99dc77c9f2051967b9efe9fdcc5862ae -EBUILD php-5.6.35-r1.ebuild 22709 BLAKE2B a8c2c5fe84d4849f2ad5cf96ae1896185e905f93c6c5fa1ae75c169d8ec3c267741931f59eef2fc6add4562a4a6bceed33181a315d949181c0e0df26c7635642 SHA512 f5b2a64129a4a8bab850ab0278bbf45829cf5fca35ad989715c5aceefac2bb27d69bf4de10498a1e04eb46273628e1830b689a06fac67e97a81fb40923c33e5a -EBUILD php-5.6.36.ebuild 22761 BLAKE2B f2cdb63d4eaecd8e332e78c86e8dd757cf27f6547dc24c9abc144531ba09b46fbb63261cd13615115bae555a3f55cb67f84e4967ae00cae53c8cca765e08d501 SHA512 30a2fd376f0b601f40a63027b474459cb16e813c629dd2069b4aae342d1845a57a9edf82a752a930b087027a9407c78edbb239698fd5568f40a9edb09c8ec974 -EBUILD php-7.0.29.ebuild 21967 BLAKE2B e0339d5bba0ff95a5d9222fb09cd06876a3f646e221f1447f28ad822c8e2e101e18b2af1da2164459988fc980a8e8aa1da8ac77220512cfb512c4ed6243213d6 SHA512 a03cdfcd12f54d87ac75d9a2b103c0ce875389854bde66a709852ef5f43c0bd6a04096e7d779e721abb8d1209b3394c7c0a016433a2519d53132cd89200ba9b9 -EBUILD php-7.0.30.ebuild 21971 BLAKE2B edcbcf4e3f1250428028c19ed21510e33e16486887dc98d47d16015533ed418786479f862fdbf8760ad9709b4c791d960153c423348849c39dd8f7bb8f5f4363 SHA512 c9049a128fc81d1592fc603039bfa77e22331dcb01262a50f358a3cc0aacff1530f969bedd7a9e84910092d7f0e3383ac1ab420aa15c7565de24b46d58064762 -EBUILD php-7.1.16.ebuild 21855 BLAKE2B a5ea02c60695ae4085da75888102418f511922d2a9360bd466ce31248d30f1131fdd1eb5e30229ab1566a7fde2c659b434639181c03764cc57c290391971fc31 SHA512 b147467417ef28bc7a4845897c1aa891e13dfa69d1fdc0cbebccc9206e86b1fe2e57ee4af18bc5c3ed744c5579137fae4a6a6323209e58eb25ce15f93069bcc5 -EBUILD php-7.1.17.ebuild 21818 BLAKE2B ce339e941dadb1672c866a94e611fa8c329c95c7fafbbd4f135e4ea734f77120c6b06e6b204b59b46c930e440aac1308d209749576024265b04ced1fac7ad451 SHA512 0dbb7ddac39a1d02532edda4fd5caccc42cf9a25c1bf7b33e795f86b7bd8a2020a4c8f911d6881989b7aa11eba2c0d638be2aa94c519405e54decdf30abd41fa -EBUILD php-7.1.18.ebuild 21814 BLAKE2B d5836fb2bd58b1de7fc61f0123c6c966dfb176c558639ee5abc2b292293b36e09c1a670ad01a7d40ecbba3c3f7fce321ddebccc8767417943c6163749d0e3042 SHA512 302c977ae6ee07bcf8cb1c03d9436435eb67ff2390650ab98b324f970b3e51e0d79dc57ff147a65af1c36ed8f95d8c0daebbc92ec99baa28f6ebc951f8afcdc5 -EBUILD php-7.2.5.ebuild 22349 BLAKE2B ade2a77aa0ebdb57085266b89f2b1e3f893acaf8f738944e5b1cc55512e6d27eb517ec7d01da359a1f84848ec6d014e14d8155861ea71b0d0397374e946ad63c SHA512 e3c62327d81ce1e40c7a790243b7549cf0d3881fa8b25e2fa1af8d21bc1912553adffa7b5f35e0ab84b77e531bd0879fff4fb14f931fc695d21cc014ad672c7a -EBUILD php-7.2.6.ebuild 22349 BLAKE2B ade2a77aa0ebdb57085266b89f2b1e3f893acaf8f738944e5b1cc55512e6d27eb517ec7d01da359a1f84848ec6d014e14d8155861ea71b0d0397374e946ad63c SHA512 e3c62327d81ce1e40c7a790243b7549cf0d3881fa8b25e2fa1af8d21bc1912553adffa7b5f35e0ab84b77e531bd0879fff4fb14f931fc695d21cc014ad672c7a -EBUILD php-7.3.0_alpha1.ebuild 22287 BLAKE2B cdb6302942261264007d7d8662f6255b81be903136eb6ad3977f3d9b879a326514585bae162772e0fb404bbda98619a2bdbfac3a19c99ed8481d824b2f7cc86a SHA512 cbff95a78e50e3550cb64fd081d4e92492dd6bbd9d4937dae4a5a8b5634721d718149319985485452944d4b4e31a1796b7d981dbf02ef1b7139b8451ebbf902e +EBUILD php-5.6.35-r1.ebuild 22749 BLAKE2B 5f7c9b7f459781568948a34f73e9153e252bb42c37a3ab028a7f8cfdcfc430c28cbb615d4a193330bdbb373385002b453437754e18be2c9042bafe6bed141a22 SHA512 45538caa8ac17ec46110f55c4a22f3e23e2277da49a48f9bef1b6f44a99bc3db57ae148562dcbe0f689b088e3fef22c01a6462eac27661f104876e853ef6bced +EBUILD php-5.6.36.ebuild 22797 BLAKE2B ed16c850486f309c4ebc83fa1345f787452cbb2aee4716db5af6fc484c396f379cb475afab8e53279e522ec83a3edaa703549cb9054cd10d46373bf5c1956d48 SHA512 86ddca5f0a4806e5e1635eb1825c946d43426e1465a8902c9bd6c25c156abc856bb617e6232264cbacc16eac67a581229c1c82c329d645379e6115155aa2e559 +EBUILD php-7.0.29.ebuild 22007 BLAKE2B 402536b872143cbe5157ef0cd5afd93ae18d98bd6c097a6f0c55795fa6c039a77fd183186e85e502f6ee7b51f3dfdf42d66418bceb8e981e1025379533f1505a SHA512 94398ad107dfbfd5daad2cc1afd43d4f5225431e7c8c772dcf9c91477da21394a528fcf2c4919a1e684628826f7a08987c1ad7806d3f5aa90d1193fbff7ee8bb +EBUILD php-7.0.30.ebuild 22008 BLAKE2B c6c9459d316e0a002de1eab337ecb010a543eb1a9dbeaf30bcbaa57368cf4197792243e1939e357a80b01f21fc3b81331ba11203305559d4a88dc71e9473c339 SHA512 ce14aae5dbe741df62d593bcc0f562d77bdfcf01058328d50985dd107201f5f812229722978b44bc912a35251b7991e8ac9e46383a2e33bf1b98bf4229e1a511 +EBUILD php-7.1.16.ebuild 21895 BLAKE2B 63ee40d49bad190791b2c07fcf3e4a08fd3aa5b53a02120e1e4b998614ca867f80c4418f5ef23fc318c8b598fcd91e09d4bf0b9c3536209aca53df42ea895ada SHA512 0c32c7570e67dbdf397da50940f34d94788843a9ea82e1bef265e3ed6a60a366f9f1a45f2b2f842dc9382977a0d301a52c0d136873b56c8e60649221cd338df2 +EBUILD php-7.1.18.ebuild 21851 BLAKE2B 6cbdae0dc872c9613249343aab00ce0dca50ca433091dd16479a06ca7a935adfaa9cc590fab3e1175a80679c4a165f73c454720bdd129d25db3d5e0e5a9a099a SHA512 67231960f12f75c2711d47b35b89d91275edfba7f443e4b94491c2a54c82c4a525ed45cdde10ed45bae9be26640a1e8117634598ffe2d6c2a5c50c43adb7583d +EBUILD php-7.1.19.ebuild 21705 BLAKE2B 030c85144ac9f22ff31cdad2b30946b7b05dae10908ceda32f6a9eccc9cb3ead02f830571d05f819dbdaabf09c8f22b659f19180859ab5b893af1d12585161ee SHA512 6154f220def10f403293025448d2703cdd3b4d9fcb7f4ddad94a91ec0844746221da01f44acf26da7f60ef4aa06c3bb5517a957be440c6c60e0c278707e06306 +EBUILD php-7.2.7.ebuild 22236 BLAKE2B a211a96418b58a56d2eac6b586b681b28da34877a0c8011cbdd70caa82bf7c0b73d9dc5942ee1e7504e4271495e86cb8f72fef8a1238078c54f690b30d16b1d1 SHA512 73d1e7e7459cbea57dc45f5101f49756c9165dd5af809099314a876afec25b6d48d98e4b8186cdf48b67526a920f84172a4fbb8e9a479fc6c99fcb551a836d2a +EBUILD php-7.3.0_alpha1.ebuild 22327 BLAKE2B 4b6c25fdf510e9cae4bedba67e1af0ab47215ac632184a5738536dda58951e41c250182cf6f1a915765ce7489af9a75ebd70b141e76fdda0791efb191a5bb4a4 SHA512 b73c9c88dd0fe430da6be45c51c61334fe470b5846fc85f27e04c606f3c4d7bde9038b7ff7b4872c3842d848fc1ed1cf0b794e72a6c2f14515559f00b2e9fdef MISC metadata.xml 2577 BLAKE2B 9b15d6073181a5f5ff7b00ef8b68d24c7ea8763171ae84895ebc4a6925f589d2a02e4e29116c2741b3502b35d32aa58e7ed909e144c0e694f8cce5b4d26ecd3b SHA512 14e6daa693325b8a27157cff22d0b0cae9d89e4dada775f39188f7f36546b78a8b19efedb2f7b6f64ee1375bf29d3af32a8f7d6e7bf0d04cf2a7241abd154afa diff --git a/dev-lang/php/php-5.6.35-r1.ebuild b/dev-lang/php/php-5.6.35-r1.ebuild index bb5bbdaecb06..56d281890cd8 100644 --- a/dev-lang/php/php-5.6.35-r1.ebuild +++ b/dev-lang/php/php-5.6.35-r1.ebuild @@ -272,8 +272,8 @@ src_prepare() { } src_configure() { - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" @@ -530,8 +530,8 @@ src_configure() { src_compile() { # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn for sapi in ${SAPIS} ; do if use "${sapi}"; then @@ -544,7 +544,7 @@ src_compile() { src_install() { # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index + addpredict /usr/share/snmp/mibs/.index #nowarn # grab the first SAPI that got built and install common files from there local first_sapi="" diff --git a/dev-lang/php/php-5.6.36.ebuild b/dev-lang/php/php-5.6.36.ebuild index f38ce11cfa9c..5b743906a993 100644 --- a/dev-lang/php/php-5.6.36.ebuild +++ b/dev-lang/php/php-5.6.36.ebuild @@ -18,7 +18,7 @@ LICENSE="PHP-3.01 unicode? ( BSD-2 LGPL-2.1 )" SLOT="$(get_version_component_range 1-2)" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" # We can build the following SAPIs in the given order SAPIS="embed cli cgi fpm apache2" @@ -273,8 +273,8 @@ src_prepare() { } src_configure() { - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" @@ -531,8 +531,8 @@ src_configure() { src_compile() { # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn for sapi in ${SAPIS} ; do if use "${sapi}"; then @@ -545,7 +545,7 @@ src_compile() { src_install() { # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index + addpredict /usr/share/snmp/mibs/.index #nowarn # grab the first SAPI that got built and install common files from there local first_sapi="" diff --git a/dev-lang/php/php-7.0.29.ebuild b/dev-lang/php/php-7.0.29.ebuild index 0c32a2cff737..a57432146374 100644 --- a/dev-lang/php/php-7.0.29.ebuild +++ b/dev-lang/php/php-7.0.29.ebuild @@ -244,8 +244,8 @@ src_prepare() { } src_configure() { - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" @@ -498,8 +498,8 @@ src_configure() { src_compile() { # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn for sapi in ${SAPIS} ; do if use "${sapi}"; then @@ -512,7 +512,7 @@ src_compile() { src_install() { # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index + addpredict /usr/share/snmp/mibs/.index #nowarn # grab the first SAPI that got built and install common files from there local first_sapi="" diff --git a/dev-lang/php/php-7.0.30.ebuild b/dev-lang/php/php-7.0.30.ebuild index 90a7930b7ac0..cfcbd02ee740 100644 --- a/dev-lang/php/php-7.0.30.ebuild +++ b/dev-lang/php/php-7.0.30.ebuild @@ -18,7 +18,7 @@ LICENSE="PHP-3.01 unicode? ( BSD-2 LGPL-2.1 )" SLOT="$(get_version_component_range 1-2)" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" # We can build the following SAPIs in the given order SAPIS="embed cli cgi fpm apache2 phpdbg" @@ -244,8 +244,8 @@ src_prepare() { } src_configure() { - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" @@ -498,8 +498,8 @@ src_configure() { src_compile() { # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn for sapi in ${SAPIS} ; do if use "${sapi}"; then @@ -512,7 +512,7 @@ src_compile() { src_install() { # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index + addpredict /usr/share/snmp/mibs/.index #nowarn # grab the first SAPI that got built and install common files from there local first_sapi="" diff --git a/dev-lang/php/php-7.1.16.ebuild b/dev-lang/php/php-7.1.16.ebuild index ca595ad6fcaf..0adf8fe59a01 100644 --- a/dev-lang/php/php-7.1.16.ebuild +++ b/dev-lang/php/php-7.1.16.ebuild @@ -226,8 +226,8 @@ src_prepare() { } src_configure() { - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" @@ -480,8 +480,8 @@ src_configure() { src_compile() { # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn for sapi in ${SAPIS} ; do if use "${sapi}"; then @@ -494,7 +494,7 @@ src_compile() { src_install() { # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index + addpredict /usr/share/snmp/mibs/.index #nowarn # grab the first SAPI that got built and install common files from there local first_sapi="" diff --git a/dev-lang/php/php-7.1.18.ebuild b/dev-lang/php/php-7.1.18.ebuild index b2aacdbf7c7d..f53642ef9653 100644 --- a/dev-lang/php/php-7.1.18.ebuild +++ b/dev-lang/php/php-7.1.18.ebuild @@ -18,7 +18,7 @@ LICENSE="PHP-3.01 unicode? ( BSD-2 LGPL-2.1 )" SLOT="$(get_version_component_range 1-2)" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" # We can build the following SAPIs in the given order SAPIS="embed cli cgi fpm apache2 phpdbg" @@ -224,8 +224,8 @@ src_prepare() { } src_configure() { - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" @@ -478,8 +478,8 @@ src_configure() { src_compile() { # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn for sapi in ${SAPIS} ; do if use "${sapi}"; then @@ -492,7 +492,7 @@ src_compile() { src_install() { # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index + addpredict /usr/share/snmp/mibs/.index #nowarn # grab the first SAPI that got built and install common files from there local first_sapi="" diff --git a/dev-lang/php/php-7.1.17.ebuild b/dev-lang/php/php-7.1.19.ebuild index 39336570acbd..1432a2ae457c 100644 --- a/dev-lang/php/php-7.1.17.ebuild +++ b/dev-lang/php/php-7.1.19.ebuild @@ -145,9 +145,6 @@ REQUIRED_USE=" mysql? ( || ( mysqli pdo ) ) " PATCHES=( - # hopefully upstream will include the same version check fixes in upcoming releases - # patch added 20180429 - "${FILESDIR}/libressl-compatibility.patch" "${FILESDIR}/php-freetype-2.9.1.patch" ) @@ -224,8 +221,8 @@ src_prepare() { } src_configure() { - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" @@ -478,8 +475,8 @@ src_configure() { src_compile() { # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn for sapi in ${SAPIS} ; do if use "${sapi}"; then @@ -492,7 +489,7 @@ src_compile() { src_install() { # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index + addpredict /usr/share/snmp/mibs/.index #nowarn # grab the first SAPI that got built and install common files from there local first_sapi="" diff --git a/dev-lang/php/php-7.2.6.ebuild b/dev-lang/php/php-7.2.6.ebuild deleted file mode 100644 index f781eb4d8033..000000000000 --- a/dev-lang/php/php-7.2.6.ebuild +++ /dev/null @@ -1,743 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic versionator systemd - -DESCRIPTION="The PHP language runtime engine" -HOMEPAGE="https://secure.php.net/" -SRC_URI="https://secure.php.net/distributions/${P}.tar.xz" - -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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2 phpdbg" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk - coverage +ctype curl debug - enchant exif +fileinfo +filter firebird - flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb - mhash mssql mysql mysqli nls - oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm - readline recode selinux +session session-mm sharedmem - +simplexml snmp soap sockets sodium spell sqlite ssl - sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp - +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib" - -# The supported (that is, autodetected) versions of BDB are listed in -# the ./configure script. Other versions *work*, but we need to stick to -# the ones that can be detected to avoid a repeat of bug #564824. -COMMON_DEPEND=" - >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] - >=dev-libs/libpcre-8.32[unicode] - fpm? ( acl? ( sys-apps/acl ) ) - apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] - <www-servers/apache-2.4[threads=] ) ) - argon2? ( app-crypt/argon2:= ) - berkdb? ( || ( sys-libs/db:5.3 - sys-libs/db:5.1 - sys-libs/db:4.8 - sys-libs/db:4.7 - sys-libs/db:4.6 - sys-libs/db:4.5 ) ) - bzip2? ( app-arch/bzip2:0= ) - cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - coverage? ( dev-util/lcov ) - curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) - gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) - gmp? ( dev-libs/gmp:0= ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[kerberos=,ssl=] ) - intl? ( dev-libs/icu:= ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - lmdb? ( dev-db/lmdb:= ) - mssql? ( dev-db/freetds[mssql] ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql:* ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline:0= ) - recode? ( app-text/recode ) - session-mm? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - sodium? ( dev-libs/libsodium:= ) - spell? ( >=app-text/aspell-0.50 ) - sqlite? ( >=dev-db/sqlite-3.7.6.3 ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) - tokyocabinet? ( dev-db/tokyocabinet ) - truetype? ( =media-libs/freetype-2* ) - unicode? ( dev-libs/oniguruma:= ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - webp? ( media-libs/libwebp:0= ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( x11-libs/libXpm ) - xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib:0= ) - zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) - zlib? ( sys-libs/zlib:0= ) -" - -RDEPEND="${COMMON_DEPEND} - virtual/mta - fpm? ( - selinux? ( sec-policy/selinux-phpfpm ) - systemd? ( sys-apps/systemd ) )" - -# Bison isn't actually needed when building from a release tarball -# However, the configure script will warn if it's absent or if you -# have an incompatible version installed. See bug 593278. -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils - >=sys-devel/bison-3.0.1" - -# Without USE=readline or libedit, the interactive "php -a" CLI will hang. -REQUIRED_USE=" - || ( cli cgi fpm apache2 embed phpdbg ) - cli? ( ^^ ( readline libedit ) ) - truetype? ( gd ) - webp? ( gd ) - cjk? ( gd ) - exif? ( gd ) - xpm? ( gd ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xslt? ( xml ) - ldap-sasl? ( ldap ) - mhash? ( hash ) - phar? ( hash ) - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysqli !mysql ) - session-mm? ( session !threads ) - mysql? ( || ( mysqli pdo ) ) - zip-encryption? ( zip ) -" -PATCHES=( - # hopefully upstream will include the same version check fixes in upcoming releases - # patch added 20180429 - "${FILESDIR}/libressl-compatibility.patch" - "${FILESDIR}/php-freetype-2.9.1.patch" -) - -PHP_MV="$(get_major_version)" - -php_install_ini() { - local phpsapi="${1}" - - # work out where we are installing the ini file - php_set_ini_dir "${phpsapi}" - - # Always install the production INI file, bug 611214. - local phpinisrc="php.ini-production-${phpsapi}" - cp php.ini-production "${phpinisrc}" || die - - # default to /tmp for save_path, bug #282768 - sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die - - # Set the extension dir - sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \ - -i "${phpinisrc}" || die - - # Set the include path to point to where we want to find PEAR packages - sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die - - dodir "${PHP_INI_DIR#${EPREFIX}}" - insinto "${PHP_INI_DIR#${EPREFIX}}" - newins "${phpinisrc}" php.ini - - elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" - elog - - dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" - dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" - - if use opcache; then - elog "Adding opcache to $PHP_EXT_INI_DIR" - echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \ - "${D}/${PHP_EXT_INI_DIR}"/opcache.ini - dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \ - "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" - fi - - # SAPI-specific handling - if [[ "${sapi}" == "fpm" ]] ; then - einfo "Installing FPM config files php-fpm.conf and www.conf" - insinto "${PHP_INI_DIR#${EPREFIX}}" - doins sapi/fpm/php-fpm.conf - insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d" - doins sapi/fpm/www.conf - fi - - dodoc php.ini-{development,production} -} - -php_set_ini_dir() { - PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" - PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" - PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" -} - -src_prepare() { - default - - # In php-7.x, the FPM pool configuration files have been split off - # of the main config. By default the pool config files go in - # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the - # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later - # we'll install the pool configuration file "www.conf" there. - php_set_ini_dir fpm - sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \ - sapi/fpm/php-fpm.conf.in \ - || die 'failed to move the include directory in php-fpm.conf' -} - -src_configure() { - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes - - PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" - - # The php-fpm config file wants localstatedir to be ${EPREFIX}/var - # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002. - local our_conf=( - --prefix="${PHP_DESTDIR}" - --mandir="${PHP_DESTDIR}/man" - --infodir="${PHP_DESTDIR}/info" - --libdir="${PHP_DESTDIR}/lib" - --with-libdir="$(get_libdir)" - --localstatedir="${EPREFIX}/var" - --without-pear - $(use_enable threads maintainer-zts) - ) - - our_conf+=( - $(use_with argon2 password-argon2 "${EPREFIX}/usr") - $(use_enable bcmath bcmath) - $(use_with bzip2 bz2 "${EPREFIX}/usr") - $(use_enable calendar calendar) - $(use_enable coverage gcov) - $(use_enable ctype ctype) - $(use_with curl curl "${EPREFIX}/usr") - $(use_enable xml dom) - $(use_with enchant enchant "${EPREFIX}/usr") - $(use_enable exif exif) - $(use_enable fileinfo fileinfo) - $(use_enable filter filter) - $(use_enable ftp ftp) - $(use_with nls gettext "${EPREFIX}/usr") - $(use_with gmp gmp "${EPREFIX}/usr") - $(use_enable hash hash) - $(use_with mhash mhash "${EPREFIX}/usr") - $(use_with iconv iconv \ - $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr")) - $(use_enable intl intl) - $(use_enable ipv6 ipv6) - $(use_enable json json) - $(use_with kerberos kerberos "${EPREFIX}/usr") - $(use_enable xml libxml) - $(use_with xml libxml-dir "${EPREFIX}/usr") - $(use_enable unicode mbstring) - $(use_with unicode onig "${EPREFIX}/usr") - $(use_with ssl openssl "${EPREFIX}/usr") - $(use_with ssl openssl-dir "${EPREFIX}/usr") - $(use_enable pcntl pcntl) - $(use_enable phar phar) - $(use_enable pdo pdo) - $(use_enable opcache opcache) - $(use_with postgres pgsql "${EPREFIX}/usr") - $(use_enable posix posix) - $(use_with spell pspell "${EPREFIX}/usr") - $(use_with recode recode "${EPREFIX}/usr") - $(use_enable simplexml simplexml) - $(use_enable sharedmem shmop) - $(use_with snmp snmp "${EPREFIX}/usr") - $(use_enable soap soap) - $(use_enable sockets sockets) - $(use_with sodium sodium "${EPREFIX}/usr") - $(use_with sqlite sqlite3 "${EPREFIX}/usr") - $(use_enable sysvipc sysvmsg) - $(use_enable sysvipc sysvsem) - $(use_enable sysvipc sysvshm) - $(use_with tidy tidy "${EPREFIX}/usr") - $(use_enable tokenizer tokenizer) - $(use_enable wddx wddx) - $(use_enable xml xml) - $(use_enable xmlreader xmlreader) - $(use_enable xmlwriter xmlwriter) - $(use_with xmlrpc xmlrpc) - $(use_with xslt xsl "${EPREFIX}/usr") - $(use_enable zip zip) - $(use_with zip-encryption libzip "${EPREFIX}/usr") - $(use_with zlib zlib "${EPREFIX}/usr") - $(use_enable debug debug) - ) - - # DBA support - if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ - || use qdbm || use lmdb || use tokyocabinet ; then - our_conf+=( "--enable-dba${shared}" ) - fi - - # DBA drivers support - our_conf+=( - $(use_with cdb cdb) - $(use_with berkdb db4 "${EPREFIX}/usr") - $(use_enable flatfile flatfile) - $(use_with gdbm gdbm "${EPREFIX}/usr") - $(use_enable inifile inifile) - $(use_with qdbm qdbm "${EPREFIX}/usr") - $(use_with lmdb lmdb "${EPREFIX}/usr") - ) - - # Support for the GD graphics library - our_conf+=( - $(use_with truetype freetype-dir "${EPREFIX}/usr") - $(use_enable cjk gd-jis-conv) - $(use_with gd jpeg-dir "${EPREFIX}/usr") - $(use_with gd png-dir "${EPREFIX}/usr") - $(use_with xpm xpm-dir "${EPREFIX}/usr") - ) - if use webp; then - our_conf+=( --with-webp-dir="${EPREFIX}/usr" ) - fi - # enable gd last, so configure can pick up the previous settings - our_conf+=( $(use_with gd gd) ) - - # IMAP support - if use imap ; then - our_conf+=( - $(use_with imap imap "${EPREFIX}/usr") - $(use_with ssl imap-ssl "${EPREFIX}/usr") - ) - fi - - # Interbase/firebird support - our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") ) - - # LDAP support - if use ldap ; then - our_conf+=( - $(use_with ldap ldap "${EPREFIX}/usr") - $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr") - ) - fi - - # MySQL support - local mysqllib="mysqlnd" - local mysqlilib="mysqlnd" - - our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") ) - - local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock" - if use mysql || use mysqli ; then - our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") ) - fi - - # ODBC support - our_conf+=( - $(use_with odbc unixODBC "${EPREFIX}/usr") - $(use_with iodbc iodbc "${EPREFIX}/usr") - ) - - # Oracle support - our_conf+=( $(use_with oci8-instant-client oci8) ) - - # PDO support - if use pdo ; then - our_conf+=( - $(use_with mssql pdo-dblib "${EPREFIX}/usr") - $(use_with mysql pdo-mysql "${mysqllib}") - $(use_with postgres pdo-pgsql) - $(use_with sqlite pdo-sqlite "${EPREFIX}/usr") - $(use_with firebird pdo-firebird "${EPREFIX}/usr") - $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr") - $(use_with oci8-instant-client pdo-oci) - ) - fi - - # readline/libedit support - our_conf+=( - $(use_with readline readline "${EPREFIX}/usr") - $(use_with libedit libedit "${EPREFIX}/usr") - ) - - # Session support - if use session ; then - our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") ) - else - our_conf+=( $(use_enable session session) ) - fi - - # Use pic for shared modules such as apache2's mod_php - our_conf+=( --with-pic ) - - # we use the system copy of pcre - # --with-pcre-regex affects ext/pcre - # --with-pcre-dir affects ext/filter and ext/zip - # --with-pcre-valgrind cannot be enabled with system pcre - # Many arches don't support pcre-jit - our_conf+=( - --with-pcre-regex="${EPREFIX}/usr" - --with-pcre-dir="${EPREFIX}/usr" - --without-pcre-valgrind - --without-pcre-jit - ) - - # Catch CFLAGS problems - # Fixes bug #14067. - # Changed order to run it in reverse for bug #32022 and #12021. - replace-cpu-flags "k6*" "i586" - - # Cache the ./configure test results between SAPIs. - our_conf+=( --cache-file="${T}/config.cache" ) - - # Support user-passed configuration parameters - our_conf+=( ${EXTRA_ECONF:-} ) - - # Support the Apache2 extras, they must be set globally for all - # SAPIs to work correctly, especially for external PHP extensions - - mkdir -p "${WORKDIR}/sapis-build" || die - for one_sapi in $SAPIS ; do - use "${one_sapi}" || continue - php_set_ini_dir "${one_sapi}" - - # The BUILD_DIR variable is used to determine where to output - # the files that autotools creates. This was all originally - # based on the autotools-utils eclass. - BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}" - cp -a "${S}" "${BUILD_DIR}" || die - cd "${BUILD_DIR}" || die - - local sapi_conf=( - --with-config-file-path="${PHP_INI_DIR}" - --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}" - ) - - for sapi in $SAPIS ; do - case "$sapi" in - cli|cgi|embed|fpm|phpdbg) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf+=( "--enable-${sapi}" ) - if [[ "fpm" == "${sapi}" ]] ; then - sapi_conf+=( - $(use_with acl fpm-acl) - $(use_with systemd fpm-systemd) - ) - fi - else - sapi_conf+=( "--disable-${sapi}" ) - fi - ;; - - apache2) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" ) - else - sapi_conf+=( --without-apxs2 ) - fi - ;; - esac - done - - # Construct the $myeconfargs array by concatenating $our_conf - # (the common args) and $sapi_conf (the SAPI-specific args). - local myeconfargs=( "${our_conf[@]}" ) - myeconfargs+=( "${sapi_conf[@]}" ) - - pushd "${BUILD_DIR}" > /dev/null || die - econf "${myeconfargs[@]}" - popd > /dev/null || die - done -} - -src_compile() { - # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes - - for sapi in ${SAPIS} ; do - if use "${sapi}"; then - cd "${WORKDIR}/sapis-build/$sapi" || \ - die "Failed to change dir to ${WORKDIR}/sapis-build/$1" - emake - fi - done -} - -src_install() { - # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index - - # grab the first SAPI that got built and install common files from there - local first_sapi="" - for sapi in $SAPIS ; do - if use $sapi ; then - first_sapi=$sapi - break - fi - done - - # Makefile forgets to create this before trying to write to it... - dodir "${PHP_DESTDIR#${EPREFIX}}/bin" - - # Install php environment (without any sapis) - cd "${WORKDIR}/sapis-build/$first_sapi" || die - emake INSTALL_ROOT="${D}" \ - install-build install-headers install-programs - - local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" - - # Create the directory where we'll put version-specific php scripts - keepdir "/usr/share/php${PHP_MV}" - - local sapi="", file="" - local sapi_list="" - - for sapi in ${SAPIS}; do - if use "${sapi}" ; then - einfo "Installing SAPI: ${sapi}" - cd "${WORKDIR}/sapis-build/${sapi}" || die - - if [[ "${sapi}" == "apache2" ]] ; then - # We're specifically not using emake install-sapi as libtool - # may cause unnecessary relink failures (see bug #351266) - insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" - newins ".libs/libphp${PHP_MV}$(get_libname)" \ - "libphp${PHP_MV}$(get_libname)" - keepdir "/usr/$(get_libdir)/apache2/modules" - else - # needed each time, php_install_ini would reset it - local dest="${PHP_DESTDIR#${EPREFIX}}" - into "${dest}" - case "$sapi" in - cli) - source="sapi/cli/php" - ;; - cgi) - source="sapi/cgi/php-cgi" - ;; - fpm) - source="sapi/fpm/php-fpm" - ;; - embed) - source="libs/libphp${PHP_MV}$(get_libname)" - ;; - phpdbg) - source="sapi/phpdbg/phpdbg" - ;; - *) - die "unhandled sapi in src_install" - ;; - esac - - if [[ "${source}" == *"$(get_libname)" ]]; then - dolib.so "${source}" - else - dobin "${source}" - local name="$(basename ${source})" - dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" - fi - fi - - php_install_ini "${sapi}" - - # construct correct SAPI string for php-config - # thanks to ferringb for the bash voodoo - if [[ "${sapi}" == "apache2" ]]; then - sapi_list="${sapi_list:+${sapi_list} }apache2handler" - else - sapi_list="${sapi_list:+${sapi_list} }${sapi}" - fi - fi - done - - # Installing opcache module - if use opcache ; then - into "${PHP_DESTDIR#${EPREFIX}}" - dolib.so "modules/opcache$(get_libname)" - fi - - # Install env.d files - newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}" - sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die - sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die - - # set php-config variable correctly (bug #278439) - sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ - "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die - - if use fpm ; then - if use systemd; then - systemd_newunit "${FILESDIR}/php-fpm_at.service" \ - "php-fpm@${SLOT}.service" - else - systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \ - "php-fpm@${SLOT}.service" - fi - fi -} - -src_test() { - echo ">>> Test phase [test]: ${CATEGORY}/${PF}" - PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" - if [[ ! -x "${PHP_BIN}" ]] ; then - ewarn "Test phase requires USE=cli, skipping" - return - else - export TEST_PHP_EXECUTABLE="${PHP_BIN}" - fi - - if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then - export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" - fi - - if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then - export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" - fi - - REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \ - "session.save_path=${T}" \ - "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \ - "session.save_path=${T}" - - for name in ${EXPECTED_TEST_FAILURES}; do - mv "${name}.out" "${name}.out.orig" 2>/dev/null || die - done - - local failed="$(find -name '*.out')" - if [[ ${failed} != "" ]] ; then - ewarn "The following test cases failed unexpectedly:" - for name in ${failed}; do - ewarn " ${name/.out/}" - done - else - einfo "No unexpected test failures, all fine" - fi - - if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then - local passed="" - for name in ${EXPECTED_TEST_FAILURES}; do - [[ -f "${name}.diff" ]] && continue - passed="${passed} ${name}" - done - if [[ ${passed} != "" ]] ; then - einfo "The following test cases passed unexpectedly:" - for name in ${passed}; do - ewarn " ${passed}" - done - else - einfo "None of the known-to-fail tests passed, all fine" - fi - fi -} - -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - elog - elog "To enable PHP in apache, you will need to add \"-D PHP\" to" - elog "your apache2 command. OpenRC users can append that string to" - elog "APACHE2_OPTS in /etc/conf.d/apache2." - elog - elog "The apache module configuration file 70_mod_php.conf is" - elog "provided (and maintained) by eselect-php." - elog - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} || die - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - # Remove dead symlinks for SAPIs that were just disabled. For - # example, if the user has the cgi SAPI enabled, then he has an - # eselect-php symlink for it. If he later reinstalls PHP with - # USE="-cgi", that symlink will break. This call to eselect is - # supposed to remove that dead link per bug 572436. - eselect php cleanup || die - - if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then - elog "To build extensions for this version of PHP, you will need to" - elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable." - elog - fi - - # Warn about the removal of PHP_INI_VERSION if the user has it set. - if [[ -n "${PHP_INI_VERSION}" ]]; then - ewarn 'The PHP_INI_VERSION variable has been phased out. You may' - ewarn 'remove it from your configuration at your convenience. See' - ewarn - ewarn ' https://bugs.gentoo.org/611214' - ewarn - ewarn 'for more information.' - fi - - elog "For details on how version slotting works, please see" - elog "the wiki:" - elog - elog " https://wiki.gentoo.org/wiki/PHP" - elog -} - -pkg_postrm() { - # This serves two purposes. First, if we have just removed the last - # installed version of PHP, then this will remove any dead symlinks - # belonging to eselect-php. Second, if a user upgrades slots from - # (say) 5.6 to 7.0 and depcleans the old slot, then this will update - # his existing symlinks to point to the new 7.0 installation. The - # latter is bug 432962. - # - # Note: the eselect-php package may not be installed at this point, - # so we can't die() if this command fails. - eselect php cleanup -} diff --git a/dev-lang/php/php-7.2.5.ebuild b/dev-lang/php/php-7.2.7.ebuild index f781eb4d8033..ecf193ae0d19 100644 --- a/dev-lang/php/php-7.2.5.ebuild +++ b/dev-lang/php/php-7.2.7.ebuild @@ -150,9 +150,6 @@ REQUIRED_USE=" zip-encryption? ( zip ) " PATCHES=( - # hopefully upstream will include the same version check fixes in upcoming releases - # patch added 20180429 - "${FILESDIR}/libressl-compatibility.patch" "${FILESDIR}/php-freetype-2.9.1.patch" ) @@ -229,8 +226,8 @@ src_prepare() { } src_configure() { - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" @@ -490,8 +487,8 @@ src_configure() { src_compile() { # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn for sapi in ${SAPIS} ; do if use "${sapi}"; then @@ -504,7 +501,7 @@ src_compile() { src_install() { # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index + addpredict /usr/share/snmp/mibs/.index #nowarn # grab the first SAPI that got built and install common files from there local first_sapi="" diff --git a/dev-lang/php/php-7.3.0_alpha1.ebuild b/dev-lang/php/php-7.3.0_alpha1.ebuild index 2fcf528ff923..27d2d493ca14 100644 --- a/dev-lang/php/php-7.3.0_alpha1.ebuild +++ b/dev-lang/php/php-7.3.0_alpha1.ebuild @@ -229,8 +229,8 @@ src_prepare() { } src_configure() { - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" @@ -490,8 +490,8 @@ src_configure() { src_compile() { # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn for sapi in ${SAPIS} ; do if use "${sapi}"; then @@ -504,7 +504,7 @@ src_compile() { src_install() { # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index + addpredict /usr/share/snmp/mibs/.index #nowarn # grab the first SAPI that got built and install common files from there local first_sapi="" |