diff options
Diffstat (limited to 'dev-lang')
93 files changed, 4193 insertions, 207 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz Binary files differindex be69e3536571..af7b783de022 100644 --- a/dev-lang/Manifest.gz +++ b/dev-lang/Manifest.gz diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest index a67f2c4b8389..d062d3aa95a1 100644 --- a/dev-lang/R/Manifest +++ b/dev-lang/R/Manifest @@ -7,8 +7,8 @@ DIST R-3.5.3.tar.gz 30205979 BLAKE2B 60dde4c1a7874df0b113630577d943d581d9e084438 DIST R-3.6.0.tar.gz 30449618 BLAKE2B 2fb2f1252f5ead97ab42eb1f71fa0be1e8aec2f6cce182956ec1c35b43b70b58f579faf5f3ca11efb8e9c24a9ed836b5b690cb23858249bc7f575aca4709bc3b SHA512 b2e17b909b6387abb964492e2e9370f913295ca7ac99bab0e965c43ed3c4635e27468c326fb2bca3c529b03c731b0170d9e777a194ad4d6c5a983c050223d8c8 DIST R-3.6.2.tar.gz 33311930 BLAKE2B 53f344e80e017064a275c271d98be714e210193931a120e7ebc79ee6cf0ebc0c24c090acc25560998f26600c05305147816ab782632d99beaea83b3a9b5e2a21 SHA512 17513e9f4dd27c61c11f7aa45227aeeeefb375bf5d4e193b471724f379a1b2da33e127cbe91aa175cbbbb048b892047e2f610280585c8159242a6c94790b07f9 DIST R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion 13596 BLAKE2B 53338e4a1c4f68beb69247216e553dbcac47f660fbf032bfebf7a660e32d2cff5b11ed35411c52de7e1fd6e00bbf5b5ea19369a325fa0a38bd93d63dc3288cbd SHA512 9ccd19bb1b0c18a2f13035ccd6809447429e197e298fb4d1df808ef345d723b42f75a1b91c349f6dbb46e4a82e59ef33e11300c495d79b63d670d0c0f2b16a06 -EBUILD R-3.4.1.ebuild 6283 BLAKE2B 87469504881749122a9db87b227ec4be47439fef0080d872ce9c395e4168e06bbf92725f79c4cc36c81c0a0ae9dc7a99eeab2e92eb779575f394924bcc94cffc SHA512 dc3833f5e0312728c7b9c55e07c83533da0f97d76a0769d78d1146b9576b92b1a130571f6b2b02f841474e1110d1624458855e354e6e1b14688cebc458ee9f7a -EBUILD R-3.5.3.ebuild 6279 BLAKE2B 4674b9336e123bc78652603d203dee6a9a09c2a59648216874c8c0a7e214a85709900eacb92e28bece20ea8c9d890e6126150b458b697495c54ab321b714272f SHA512 c9ab6e44de46d6fd9f4b5f043b2a38ca4aeda997eb56715c14159c3d58c3d579755689ce102025a300389db46ac95f74f5ead9b50156085d16ff1ed9547a2b6c -EBUILD R-3.6.0.ebuild 6279 BLAKE2B 4674b9336e123bc78652603d203dee6a9a09c2a59648216874c8c0a7e214a85709900eacb92e28bece20ea8c9d890e6126150b458b697495c54ab321b714272f SHA512 c9ab6e44de46d6fd9f4b5f043b2a38ca4aeda997eb56715c14159c3d58c3d579755689ce102025a300389db46ac95f74f5ead9b50156085d16ff1ed9547a2b6c -EBUILD R-3.6.2.ebuild 6360 BLAKE2B aea82d4f0d13a3e7f6bfab0ae3e701713cb0e98ce1fed38c5a079280d2d7197e8502363ac5988439babea3b0a6a6f0bf3de158b94b3e78a4e3de8cca8de2f8cb SHA512 367d56e7f151b99adaef004616caf13e3ce12be0faa61e9fa1795b2ebe184d56e8657b9015cca187ed9aecf13b0fa582595e492195b85e411eb5c8ad5956bbda +EBUILD R-3.4.1.ebuild 6237 BLAKE2B efab9640126c37a2d84640b21247f6481a3c7f7dfa746bc803c647931a0c15712960d1a5be6a0c33e28c211bad0fddfc3515f550ff19ac6f34d43a696c48dd76 SHA512 29afd79f796e87b97b6b216bfe480ed2d1e492fea11f09eed8fb0eef89bfda3963b586ae27e0d81fd54a9993c8e8accc107dce6d8261e159cb844134965e7192 +EBUILD R-3.5.3.ebuild 6233 BLAKE2B f12f73f67da6acd1924bfe41e2700c2a0d659cfbfdf3950b721d6d4330ccfc77efbff9455b4c443845dbbcef0f836a3ea424b19fba12de52f9c086959d64af6e SHA512 56855a8461d93c9cc18d418ae69a6c2f4b87e420bdd4ed9fd0ece914c0a17f6d28124736bbd35a555537e5400f264428b37ebf56ad150e414cfdb6ba8dae4b9e +EBUILD R-3.6.0.ebuild 6233 BLAKE2B f12f73f67da6acd1924bfe41e2700c2a0d659cfbfdf3950b721d6d4330ccfc77efbff9455b4c443845dbbcef0f836a3ea424b19fba12de52f9c086959d64af6e SHA512 56855a8461d93c9cc18d418ae69a6c2f4b87e420bdd4ed9fd0ece914c0a17f6d28124736bbd35a555537e5400f264428b37ebf56ad150e414cfdb6ba8dae4b9e +EBUILD R-3.6.2.ebuild 6314 BLAKE2B 15dc9f85f47794f6ef82c37121046daaa19b36a0b22e0e30bbea7a6e4102deda1f5819b2e4e670a001a5e6fd11cf11108512fb3693ba2bf1037a29313a284db4 SHA512 cd3b7cb01367e3148380b9e912797eec8485f4b53b247be1a69bb6f4896ab2d2050ae7f3eb2a2808080587cd690161989ee53df7cc4710c59f7d80b54f34ff92 MISC metadata.xml 1140 BLAKE2B 774221eb531b4e80f0650b627b9ce53d9a2daf6342b1f19579d2d046e1c83aa497cc764870406b7ea3cf6cbae899cb6d460af92991d62bc6aea8da026a441822 SHA512 297c7e17998f92fb836b0599ce5221aee1ba1e7b1504edb348a602b695faf381d51f32f6118f5ef4bb353f02e92ffc5b3520b8d317d3e30a68a3cce0254fa6b1 diff --git a/dev-lang/R/R-3.4.1.ebuild b/dev-lang/R/R-3.4.1.ebuild index 7c3401e2fc95..ae5fc62ba095 100644 --- a/dev-lang/R/R-3.4.1.ebuild +++ b/dev-lang/R/R-3.4.1.ebuild @@ -133,7 +133,6 @@ src_configure() { --enable-R-shlib \ --disable-R-framework \ --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ rdocdir="${EPREFIX}/usr/share/doc/${PF}" \ $(use_enable java) \ $(use_enable nls) \ diff --git a/dev-lang/R/R-3.5.3.ebuild b/dev-lang/R/R-3.5.3.ebuild index 35f7ce8af6b0..66c38fbe2f16 100644 --- a/dev-lang/R/R-3.5.3.ebuild +++ b/dev-lang/R/R-3.5.3.ebuild @@ -134,7 +134,6 @@ src_configure() { --enable-R-shlib \ --disable-R-framework \ --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ rdocdir="${EPREFIX}/usr/share/doc/${PF}" \ $(use_enable java) \ $(use_enable nls) \ diff --git a/dev-lang/R/R-3.6.0.ebuild b/dev-lang/R/R-3.6.0.ebuild index 35f7ce8af6b0..66c38fbe2f16 100644 --- a/dev-lang/R/R-3.6.0.ebuild +++ b/dev-lang/R/R-3.6.0.ebuild @@ -134,7 +134,6 @@ src_configure() { --enable-R-shlib \ --disable-R-framework \ --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ rdocdir="${EPREFIX}/usr/share/doc/${PF}" \ $(use_enable java) \ $(use_enable nls) \ diff --git a/dev-lang/R/R-3.6.2.ebuild b/dev-lang/R/R-3.6.2.ebuild index f3312585e0cc..d9a391d0f87a 100644 --- a/dev-lang/R/R-3.6.2.ebuild +++ b/dev-lang/R/R-3.6.2.ebuild @@ -136,7 +136,6 @@ src_configure() { --enable-R-shlib \ --disable-R-framework \ --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ rdocdir="${EPREFIX}/usr/share/doc/${PF}" \ $(use_enable java) \ $(use_enable nls) \ diff --git a/dev-lang/coffee-script/Manifest b/dev-lang/coffee-script/Manifest index b0ae9745cdd1..958602dbe0db 100644 --- a/dev-lang/coffee-script/Manifest +++ b/dev-lang/coffee-script/Manifest @@ -1,7 +1,7 @@ DIST coffee-script-1.12.5.tar.gz 1429494 BLAKE2B b64dc0dce9d2dbcbe5e20fcf002e9fe12116e6987ebdb19c82dadec61d90eaf66de5f4560bab5a3df1c8cef9f557bb0f5c5edd3e1fa5e7062cc0641dcbec28bc SHA512 b83981508c99e52957786d66b6c93e65cea98386b247cddfd516146eb4edb7ccb49451cc976d683fc9127b1ed0ea0a4d54cc47be519af1bf9e8b3dd79159d591 DIST coffee-script-1.9.3.tar.gz 810246 BLAKE2B dbca1d690ad80e38d8997c237f8c4c6e8a6b8d5c1362d5173a0c38d75e1389f5d8c09299bbb4902745e77133901857c8c15cec0dc17cbb883acf84854aefb68f SHA512 660826e27f842ed67ec6ef59f734087c95585e03b6b8c6d25c8ecfc567f3161f59034e730b61e5f806edaaa7ec6c805ad6d14902857aaf09cf6193b0fe14f506 DIST coffee-script-2.3.2.tar.gz 1754957 BLAKE2B 7a276a16f4db9c2f53258161af0cb1cebd71fac6acca94d5ee5b0a67e1d59d17ffca8b98f20b3afbe30297963dfa683af16ae01bf0ed6eda49a20a858f6d4850 SHA512 ab50737ffd46db007fc98cbba5ef1fc6c97b20a40b848f9635282ddf19188c59172f984bd62b345b6aae96a92af3ac046cedb568c16db2a5e29d287314e13cd5 -EBUILD coffee-script-1.12.5.ebuild 1124 BLAKE2B 7a002ee5ecfd799a316443b1d344f8316cd1c82272b7b063f30bbddd36eb1d545528a9c69c22901a380575d1aaf4ab30212081f607334e790fced6face4c4365 SHA512 302038208e766821917d463f978b90b69112a482ef4f74af57796344eee403c7d7c94cffd9af528e789a175c501f0b7cd01cf083b4f0d1e5d33606ad2a79c6b0 -EBUILD coffee-script-1.9.3-r1.ebuild 1280 BLAKE2B 6da3bb41c79ed6e70c7aad0bdd653e88692bb601574fd01644867617d47ee59ce189f5e129834dfb6fa582b8abc1db1208a0d8f2aeb2c42ed23eaf158815a35f SHA512 8d13758394658f162a55d01a608ba8fa0d16052700b6f6ab9ba4c274c642e463136035ac7ed6fbdc2be5a46e689e3eec002249a70ccfb009d9cdcce16d3a39ca -EBUILD coffee-script-2.3.2.ebuild 1437 BLAKE2B bab346ec3a3969f8c6960151651b6baa9c8a0b184f278d6752b6253ce3c0e51264ff7468c93bee969f36e23dd77b405a7c27915b865ffcc0b6ef924b00bba5bb SHA512 e09ac406395420982027a15b40efe8f25736c349a406c5404210d7093002f0f214f2a0a6fa410e60fa3f535744a2487ab7c1a8b1a8aaef02af3e4556b3bc8d35 +EBUILD coffee-script-1.12.5.ebuild 1122 BLAKE2B 2c961ac6efeffd94b2c2e9ca317bde35e0babdae4e89fe5f0e0743bd1341e96a607304ba380fc1e2d3ccbfd0fde7b1472cf5c08f45062b0aba87808fcd446425 SHA512 df0ec7f9a9423d2d1bf4bdc2ef76e96fffc254ecc46fb21757926fcbcd78abf842c64e5230dfaabc598555af07fb94387b5abc679643c322449ec9fe5f42dc62 +EBUILD coffee-script-1.9.3-r1.ebuild 1278 BLAKE2B d4de6504891c550cec367ebfc521062237f351c13842449ed45adec659da177b6b7fdc00f163406bf72790297327f170940e67272b8cefb242cc882dd42eed69 SHA512 324df6f9091f776a4962c2a3f95cdd43e680927b5fe6795eea06ba54fde9f0675fbf4e4a7e00922438efd0e8cfb539c5d8943b30d9b4986aa424045efae6357c +EBUILD coffee-script-2.3.2.ebuild 1438 BLAKE2B 3363928ccd5d058aef97c2a04a8b64a13919acd34579ac0a20d49b5f233b1d8f00ff8ec8abf18e2b95e062bf25c1d7b478f5a068131db797b39bbc2ca1548d1f SHA512 f248461f01b431c6b5bdfb8d5cd9b329fc6fc604ff6af0814c960bed2fd845e6e6c8c45b6ebc8efedb9cf95f10303149ce2dbbced36ec1f87b1280daf2c20a2a MISC metadata.xml 343 BLAKE2B 6184b541918376bbe76d529e2afd8f24ae63d7715489c708cebeff2d115fb0e336475e6d5c4e211e443cd6c185d46a79b579f3d14d41b6f66e7d397a85ac922e SHA512 36eec061eb724a7229933450185185c0ac781d1adc1da4a54b067ef34ab7d861cf336c3c7e4b2c7d12a6e1c9400d4bbb960c67a66afd854209a5268e8e3d19f7 diff --git a/dev-lang/coffee-script/coffee-script-1.12.5.ebuild b/dev-lang/coffee-script/coffee-script-1.12.5.ebuild index 6029b25ed394..43791b8fa0d3 100644 --- a/dev-lang/coffee-script/coffee-script-1.12.5.ebuild +++ b/dev-lang/coffee-script/coffee-script-1.12.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -21,7 +21,7 @@ IUSE="doc examples" RDEPEND="net-libs/nodejs" -src_install(){ +src_install() { local npm_module_dir="/usr/$(get_libdir)/node/${PN}" insinto "${npm_module_dir}" doins *.js package.json diff --git a/dev-lang/coffee-script/coffee-script-1.9.3-r1.ebuild b/dev-lang/coffee-script/coffee-script-1.9.3-r1.ebuild index 941e12267f0a..c7bd4d3403ae 100644 --- a/dev-lang/coffee-script/coffee-script-1.9.3-r1.ebuild +++ b/dev-lang/coffee-script/coffee-script-1.9.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -27,7 +27,7 @@ IUSE="doc examples" RDEPEND="net-libs/nodejs" -src_install(){ +src_install() { local npm_module_dir="/usr/$(get_libdir)/node/${PN}" insinto "${npm_module_dir}" doins *.js package.json diff --git a/dev-lang/coffee-script/coffee-script-2.3.2.ebuild b/dev-lang/coffee-script/coffee-script-2.3.2.ebuild index 9616a311be52..ce12a698c64d 100644 --- a/dev-lang/coffee-script/coffee-script-2.3.2.ebuild +++ b/dev-lang/coffee-script/coffee-script-2.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,7 +21,7 @@ IUSE="doc examples" RDEPEND="net-libs/nodejs" -src_install(){ +src_install() { local npm_module_dir="/usr/$(get_libdir)/node/${PN}" insinto "${npm_module_dir}" doins *.js package.json diff --git a/dev-lang/crystal/Manifest b/dev-lang/crystal/Manifest index 140c83ec64a2..e8d98fc83905 100644 --- a/dev-lang/crystal/Manifest +++ b/dev-lang/crystal/Manifest @@ -12,6 +12,10 @@ DIST crystal-0.31.1.tar.gz 2191156 BLAKE2B 072e14fed34cc411cd6d9a57b8c5184e59742 DIST crystal-0.32.1-1-linux-i686.tar.gz 30062609 BLAKE2B 658cd453465a1c4de44c0b010593aa19a68b93569482202baba948dc58f018d38cbefda083592145a141e7dfc574eddb7ccf0a41613a7a7d5ea8d12ed8f72d08 SHA512 34127ad25a1e290b8f17fa7de9465083955ae16a049bab8a927f90df4f2c87c7a59e2c8123f7ec0d0de691130e51749b104ccf11ea68005c267ab98c322156f3 DIST crystal-0.32.1-1-linux-x86_64.tar.gz 27348617 BLAKE2B 96410f00843d21cea4ed6f8d4896438334f577b6e593e72a0be23d3e1a460199bffc456ddb675a257c5a973353c1a8d28f69263b8517e0009e54d2f2f19535fe SHA512 85524c38cd91fbe56ab7d14c3a05a1a3f3e3fc0f618e5fa5af010716f76b1dc0cc415cbc67e16c99fd2e8860412d7e2566f510c751de0ad4373361edbcee0475 DIST crystal-0.32.1.tar.gz 2225383 BLAKE2B 81cdda508945ebea481c3ad784ecdccffe25e4726d2f63feb1a4995b48041fbf2cbe226bebcbf9f9627d2161d167ccb502626a9d51f787dc8e48fd607f310ff8 SHA512 d83575f4c7953054824f13516cdc04bd7576bf7165754d96a9f4970e2a6cbf779b4db6806d3eeac465ed0c223c203ef95fc3bda70d1ef9f7c96ec96cd076283d +DIST crystal-0.33.0-1-linux-i686.tar.gz 29627750 BLAKE2B 284c300eb57e9192c367b1692c95a8da584820ecd068515cf59174106bdcd4341033e68ecdcc64a263dcf1c69ca58f9403e9b4b8e166c86b1b6747e4e0d2ea92 SHA512 8ff065555e5782a84575ddc8210f92bc6d5702692e2674be4fcef470dfeff3ec325954eb665b222cb3f332e335cae4ae49cc06ffe4ce939519d0947225b452b4 +DIST crystal-0.33.0-1-linux-x86_64.tar.gz 27553242 BLAKE2B c24ab3e1577c33de9e9de2fa03f0fe831821b70b72ee9fb421eab9aed8b0ba357547160be9fff20c30b2d52e6c6d75bbde19dc322638c5c3f33ba2aa14dbf4c4 SHA512 7c815335ff882effd9dfc22cbeec6cee6e014805bf048bedf4476b1ecdf3a87bd8d53543c78be3493f937659a88041cd5370814eba043c81f23e7ef707ccd834 +DIST crystal-0.33.0.tar.gz 2242162 BLAKE2B 0d9dbdd230bb190209772fafaeb1d59008cbe90b0bd33f851886bf90e7ac497c0bcef7609d6295dd4a4bad213fb687dea3d16c42ebe3bc92b3e06df156c53570 SHA512 41f518ec5c8f2f2cffb84105e0cc5096d4ba7ef64887ad0089aa37109fa5fa8e28747fe4f4ca8a74012e7b77d8c7a9d72cd9da787a330a4a62b5e55b40f0e57b EBUILD crystal-0.31.1.ebuild 3011 BLAKE2B a97675d76141c4e2fa36b0643cd3174f6cffdb78d5608ffde9eed50627f7d8bd047d828e02bc34d3492736a3b0ae045e08603a50bbaa568709364a8cb69e9e90 SHA512 2989793274aeb9d37a1468c4a419b0fefc463c66fc7dcc97eea6ea59e2fcb7e545897ea4dfb21903210cb0e6da24903f3669a636ce57ea76cb4ed337cf49db8d EBUILD crystal-0.32.1.ebuild 3011 BLAKE2B d2d0ad755ccda9eab4d3daedb6771f67732876d9cfb246939b0c1dd6a45c6a8c9af7368163615368210d9b5a33385cb3788b79bd989b1ca821d42ebf349306a1 SHA512 0adb45e03fb600bd4d231ffbd3efe4d9c932d4c2a0044dea5850155eea352c1bd62d57230be2590705d8cfa5221070da073a1139099276085151a372ef51facd +EBUILD crystal-0.33.0.ebuild 3011 BLAKE2B 04a8bfc50370a7b4295712f69736d9ca8dd6206fe49ac91de069e96f7329b16f9bed9771db16ec147d68cfa57bc1ac021194c1771ec14a8661bc1530913fd80c SHA512 e41635a1a14cb4f0d61d37101fc7521404e79d6d163e1963d2eeb3e7f93c9a947ae064ff55a0e094530b14784ea12f27b587a2f717e2af9b34ab8d4253bc7fe5 MISC metadata.xml 995 BLAKE2B 00f6cfc63cec16ab8c6f983316f5872e63573f2d680da810b9b97d88c2ff6e21c15327a1508d62234e324f7145ca248a9ce1aa7286b0e34d9ee3dcba1481ff25 SHA512 da6a6f834b0d961477b95045756c539df7a968fe240f9f0c1c8183eef3052dddefb8d20547d668b07fece74c96b94bbf18baaac59e7328ff322355227d1adf02 diff --git a/dev-lang/crystal/crystal-0.33.0.ebuild b/dev-lang/crystal/crystal-0.33.0.ebuild new file mode 100644 index 000000000000..5085b24c8b07 --- /dev/null +++ b/dev-lang/crystal/crystal-0.33.0.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 llvm multiprocessing toolchain-funcs + +BV=${PV}-1 +BV_AMD64=${BV}-linux-x86_64 +BV_X86=${BV}-linux-i686 + +DESCRIPTION="The Crystal Programming Language" +HOMEPAGE="https://crystal-lang.org" +SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz + amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz ) + x86? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_X86}.tar.gz )" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc debug examples blocking-stdio-hack +xml +yaml" + +RESTRICT=test # not stable for day-to-day runs + +LLVM_MAX_SLOT=9 + +# dev-libs/boehm-gc[static-libs] dependency problem, check the issue: https://github.com/manastech/crystal/issues/1382 +DEPEND=" + sys-devel/llvm:${LLVM_MAX_SLOT} + dev-libs/boehm-gc[static-libs,threads] + dev-libs/libatomic_ops + dev-libs/libevent + dev-libs/libpcre + sys-libs/libunwind + dev-libs/pcl + dev-libs/gmp:0 +" +RDEPEND="${DEPEND} + xml? ( dev-libs/libxml2 ) + yaml? ( dev-libs/libyaml ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.31.0-verbose.patch + "${FILESDIR}"/${PN}-0.26.1-gentoo-tests-sandbox.patch + "${FILESDIR}"/${PN}-0.27.0-extra-spec-flags.patch + #"${FILESDIR}"/${PN}-0.27.0-max-age-0-test.patch + "${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix.patch + "${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix-2.patch + "${FILESDIR}"/${PN}-0.29.0-no-usr-lib.patch +) + +src_prepare() { + default + + use blocking-stdio-hack && eapply "${FILESDIR}"/"${PN}"-0.22.0-blocking-stdio-hack.patch +} + +src_compile() { + local bootstrap_path=${WORKDIR}/${PN}-${BV}/bin + if [[ ! -d ${bootstrap_path} ]]; then + eerror "Binary tarball does not contain expected directory:" + die "'${bootstrap_path}' path does not exist." + fi + + emake \ + $(usex debug "" release=1) \ + progress=true \ + stats=1 \ + threads=$(makeopts_jobs) \ + verbose=1 \ + \ + CC=$(tc-getCC) \ + CXX=$(tc-getCXX) \ + AR=$(tc-getAR) \ + \ + PATH="${bootstrap_path}:${PATH}" \ + CRYSTAL_PATH=src \ + CRYSTAL_CONFIG_VERSION=${PV} \ + CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal" + use doc && emake docs +} + +src_test() { + # EXTRA_SPEC_FLAGS is useful to debug individual tests + # as part of full build: + # USE=debug EXTRA_SPEC_FLAGS='-e parse_set_cookie' emerge -1 crystal + emake spec \ + $(usex debug "" release=1) \ + progress=true \ + stats=1 \ + threads=$(makeopts_jobs) \ + verbose=1 \ + \ + CC=$(tc-getCC) \ + CXX=$(tc-getCXX) \ + AR=$(tc-getAR) \ + \ + CRYSTAL_PATH=src \ + CRYSTAL_CONFIG_VERSION=${PV} \ + \ + "EXTRA_SPEC_FLAGS=${EXTRA_SPEC_FLAGS}" +} + +src_install() { + insinto /usr/$(get_libdir)/crystal + doins -r src/. + dobin .build/crystal + + insinto /usr/share/zsh/site-functions + newins etc/completion.zsh _crystal + + use examples && dodoc -r samples + + if use doc ; then + docinto api + dodoc -r docs/. + fi + + newbashcomp etc/completion.bash ${PN} +} diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest index 0c9de0586ca0..c8e2c135118e 100644 --- a/dev-lang/elixir/Manifest +++ b/dev-lang/elixir/Manifest @@ -1,8 +1,10 @@ AUX elixir-1.9.1-disable-network-tests.patch 569 BLAKE2B fda6b9b99f80e81883723280de31933c1740167d41ef4783dc663bad277cf58b8782326abc4a72e0d989c513afb9cdf4494e7d79754b18d62baf75255a74aa45 SHA512 465831a389891680412d51d9209497d5b750ff0a5ff72d45807a7dba6ec7757156ee96048bbc81f46c9c24a5b13cdd5161539fdeb4ffcea655c407e29f6675fc DIST elixir-1.10.0.tar.gz 2322668 BLAKE2B b5f393e406904fe38d1f9bd47811a9fc804109cb4c6ca6b4f512dc8a7af251495536b9238fc85126266150bf9ae869c815d68f6a0dfcafe9ff893b05780b4c54 SHA512 d71ef164f7dc3fe4a94a0b5f5f8709e782caeebba322c0a1aaf67ac129416ca0b01dc9fc0a14c71e37e386d176076f0fb35b4d51b17987d03794a92cbe831cc4 DIST elixir-1.10.1.tar.gz 2322975 BLAKE2B 875948d233a726bdf88db4d64d21d227dd5e90f762f10dcc82103e088a2ed633898489a2f0a870a6c4e09ce22e509d117f05b3b3f8b8be6c742f628d612e3baf SHA512 823a685d62b6181be9f3314c1a86b69606dd3d3528a2053060f83802a561d8e136fb32099d51cb90542ea155a0a5768d7e6fc7aa1ae18d2c9f5fd5a5a2ac9cdc +DIST elixir-1.10.2.tar.gz 2323450 BLAKE2B 2d0897af98864966dabc8760d3551caeae39baddc892239c398f3aecf6b72db0ee9d3c8e03fbc8b7a7da0b0dcb08f200fa145d704b8306190eb47a9ccb862bb4 SHA512 a1d1c7847fc8135865d063c6e014bee970066ba07f979f308bec456a732f5366a9343631239965d1caeeaea5cdb644f35185fdfb23f18fcc8c6735a7e3256c0f DIST elixir-1.9.4.tar.gz 2250611 BLAKE2B adc363627dc3997684482ac022927aaa4d315afdb8fbc8981e1b88371eb13be80e01084b67288fc88fc51f0015085743d11289e932093d5608e5ac4dfa0823a8 SHA512 c97b93c7438efd7215408525a3b9f2935a1591cce3da3eb31717282d06aff94e8e3d22c405bac40c671bcfe8e73f3dd1ada315f53dee73ceef0bfe2a7c27e86d EBUILD elixir-1.10.0.ebuild 762 BLAKE2B 0f96cc7db63ce29cafa7fa04ecebcc90fa4a7b6a7f5480a76ea4c6b97734606724e18e379cdc94ff44eedfc725d5794283619868fa9fdf0bd5f2c8839ff68660 SHA512 dee020c702d4118079930f45a7d7e942151aae491818450aa5ac2bf1f949dc44186ed5d74579d871c1b84661991bfae63a6f8b8878d465d412f564dfbdea3735 EBUILD elixir-1.10.1.ebuild 762 BLAKE2B 0f96cc7db63ce29cafa7fa04ecebcc90fa4a7b6a7f5480a76ea4c6b97734606724e18e379cdc94ff44eedfc725d5794283619868fa9fdf0bd5f2c8839ff68660 SHA512 dee020c702d4118079930f45a7d7e942151aae491818450aa5ac2bf1f949dc44186ed5d74579d871c1b84661991bfae63a6f8b8878d465d412f564dfbdea3735 +EBUILD elixir-1.10.2.ebuild 762 BLAKE2B 0f96cc7db63ce29cafa7fa04ecebcc90fa4a7b6a7f5480a76ea4c6b97734606724e18e379cdc94ff44eedfc725d5794283619868fa9fdf0bd5f2c8839ff68660 SHA512 dee020c702d4118079930f45a7d7e942151aae491818450aa5ac2bf1f949dc44186ed5d74579d871c1b84661991bfae63a6f8b8878d465d412f564dfbdea3735 EBUILD elixir-1.9.4.ebuild 756 BLAKE2B 45337b098daa503ea61e9f8f5d8e4ccb6bbd09babb2457dc85a8e96cb79f76ec31d1ef393d015d8fb878b6c4e0d9c4380f39252d8e67b6da5b5e99dc79b77c5b SHA512 97ee97a4b7aece89c3308aa9efc050562e688e491fc313afd31a6400048c1551f734e5222963b187cc7ae4006d112ace23bee093645acfa96d88839136437e8b MISC metadata.xml 790 BLAKE2B 33e4a37225c8f5bd142c5cbbe097ad3330f6c5b1115f834c1c20613281bdc0afa0927734ec3b0a2b1da595980abeec2fcf2bb20e725f5701590d1c3629972910 SHA512 5489797d3771c405edb4c9883082f780279470d7821dbdd1a4790bcdc74c0e31327c8f15286dc421bfe426d7371d6be2819e707389f425101e2d0d0577475586 diff --git a/dev-lang/elixir/elixir-1.10.2.ebuild b/dev-lang/elixir/elixir-1.10.2.ebuild new file mode 100644 index 000000000000..d654108e6c09 --- /dev/null +++ b/dev-lang/elixir/elixir-1.10.2.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Elixir programming language" +HOMEPAGE="https://elixir-lang.org" +SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0 ErlPL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86" +IUSE="" + +DEPEND=">=dev-lang/erlang-21:0=[ssl]" +# 'mix' tool collides with sci-biology/phylip, bug #537514 +RDEPEND="${DEPEND} + !!sci-biology/phylip +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.9.1-disable-network-tests.patch +) + +src_compile() { + emake Q="" +} + +src_install() { + emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" install + dodoc README.md CHANGELOG.md CODE_OF_CONDUCT.md +} diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest index 19e586761481..79ee40f1e5c2 100644 --- a/dev-lang/erlang/Manifest +++ b/dev-lang/erlang/Manifest @@ -17,6 +17,7 @@ DIST erlang-22.1.4.tar.gz 54957524 BLAKE2B 8960dd63eb7ae18544d8b6809760543b276ec DIST erlang-22.1.8.tar.gz 54967877 BLAKE2B cb022e3c5f577605872e7689639fced6c1f6cb7600314f5939107605f0767ca080c65c2f9e0695a04bf53a9e0727553d854a9df57f09ce5f4a958ebd035756e7 SHA512 4260fab3f6cd9338ca167371cd982bcf9557729e93d58c3911e485529ed8ee97089e1de3466745d21206c94276f9865ac4fddcb2803afe915494b43feda46dda DIST erlang-22.2.1.tar.gz 55742915 BLAKE2B cfb49a07289f66ee8bcdc37452c88ec60c90b92febb7d41538166916989e80b612f13bae4ae2ba305aa12c790a74bcd9dc8412207413ba512537193811d177ad SHA512 4c0e5b963def01e02f8550414bee9e15a79681ac19547c4707d4cf3a67924e252dde7f8f94dfeca5eb3d34730acaffd193603711531bdf7c22d47d8880c5e5f4 DIST erlang-22.2.6.tar.gz 55746963 BLAKE2B ebd1e11dc817285307add4147fc4f3c1bba4e9b8a19fa3dd61ec321aa4dfdb056406d76216185a39316787efc9bd766a1e7441b8c261bcb98c4b642c87a27357 SHA512 6da4b25340a37daa30d3a27081b782f24a53edfca0070f6c02ca0332bc8db9b3bad917c43d63470a15a86a44a439072f3ee1472b23ff8163730443e4a811c66b +DIST erlang-22.2.7.tar.gz 55748754 BLAKE2B b090776fead116eb2f53b9a7436c0ad675310e600414cbb705019d0f2a6ae84c28b6795d17d66881cfc70d36b8f984c91ef3d42db73b29296015628789048311 SHA512 1746acd526eda37c769b70bba1ad0f73ee1e658d05d0cbbe4063f34c11f8061932b2cde04df725537f5c5b81b537897ada2f0f9b6b18b7554b0f7596c492906b DIST erlang_doc_html_21.1.tar.gz 32692731 BLAKE2B a7fa8ebe1c876ab7eecd2dd46ffd4d288db6d308e0f131d53c26ee4b67a92cb6fcb89b6c880ef34df395c7ad61fcdc81eac32e0fcf7336be7d517263218146bc SHA512 0d659f55bfb01eecf140a310154724489ef56b6ccbe9ac30f6b053f598276721b80de7b5b3200707cf8a6e77b8854eae5453f655225f431fcc982550539f767f DIST erlang_doc_html_22.1.tar.gz 33824830 BLAKE2B 2d50802fff81eba8bcf5f630da49d68d7cb2098175012e12f13941e69949a109c9f601c3cfaa2700b669415cd0c6c15961d8e4dd94b9b228cee17b661fe5400a SHA512 cc24927a4ff98b04d8f93fbc46bb36ffb34570521e4f31154b778dc17cf1cff60869239c26c327d7a9360c06528f9b380a302b39fa47285e50dfd4656b508202 DIST erlang_doc_html_22.2.tar.gz 33943680 BLAKE2B 4a0df88fe99c882272b07b928541f4d1be5b3b0faceb6463a02f627df1a3b8571c26bfb28967c5824879db987d0afa6a11e9487c3ef7d67a9c8206f4987a3608 SHA512 6d57422839d9270129c7eec440c3670c7f075b2b1ccc4ed4c7c08e79104cc4eff1bf788add14be170c94e5d0faad5d153d107844c5a373b5e01c7d03fc6646a8 @@ -28,4 +29,6 @@ EBUILD erlang-22.1.4.ebuild 4404 BLAKE2B 3e722af7749eb9dc1efa339abdcab48875d1750 EBUILD erlang-22.1.8-r1.ebuild 4409 BLAKE2B ad23a960bf847324e20a0aed506839848335257a9317af46decfb4c4ab7a811f954a0eb2ad16897df323d80d33febc4b371208d466322ac880763300332f4060 SHA512 8ecec73e1cf697ed7e5a7970526466e21e746d64e0c97844c167680a33b44896448125758e2311bcbd53de4c80ae3a697b1a691de59c4df75cc7db4123a02f7d EBUILD erlang-22.2.1-r1.ebuild 4404 BLAKE2B 91ce8b061d3ec01768ff8ec67692dcdc90e5147b3b323c4ccf076d79c270773043b1620dcb3ff64b49a3d55ccf70e6716694aba22ff6ca5be0d2436b544cb25e SHA512 b45df17a92975efc6d3c45c4a9c79cbccd06988f4a289722e9373aae59adf530b2eb523c68554bdeb47aaa2384eb8456a62039302e42d135714add87e606991c EBUILD erlang-22.2.6.ebuild 4450 BLAKE2B d077fa20d38850d1fd9c8f29a0f4b22e82129af1f21a635f45437e6b841e250e15493f943203756e9746739041dff2476fc36ee92f559c6b1a2eb661bc10f119 SHA512 c7d811297276e91fa327d34023474a28e5fcf056af9da63486f0f589c7582d2f47ae62d255dfac79cfbd8ab8c5a8661beb2a595597f88558fc405e77d8563a2e +EBUILD erlang-22.2.7-r1.ebuild 4681 BLAKE2B bc1499555c77331711d6458213253e92dd6c7de6befd1e4b926bf0410324321a7c16bca79e59c53c111fed999530fecd9e0278601980530265099c98e68539ab SHA512 0476757f604704dc7a9e5be58292fc0f3f2ea5d2f7831994c2bdbe73397c76de3024e533445d30b3e5b59449b6e4ae33c52c6cfa2f1ba036d1ac2e1c42cfedf6 +EBUILD erlang-22.2.7.ebuild 4450 BLAKE2B d077fa20d38850d1fd9c8f29a0f4b22e82129af1f21a635f45437e6b841e250e15493f943203756e9746739041dff2476fc36ee92f559c6b1a2eb661bc10f119 SHA512 c7d811297276e91fa327d34023474a28e5fcf056af9da63486f0f589c7582d2f47ae62d255dfac79cfbd8ab8c5a8661beb2a595597f88558fc405e77d8563a2e MISC metadata.xml 905 BLAKE2B c1277904d14789138212ad1c83291d30301558aba707d1eb43765573c32617bfcb0eea43acc80225870cf2fbab011920b64bbecbdd28d414d73eb3c86a00937c SHA512 f79228f075fc6ac58785bc8a6c574546674b7ddd6c4f7420cb616414cf5178c2fa08284668b0d863ae3638891567184d1e8a490e31c4e093724ebff5c177a461 diff --git a/dev-lang/erlang/erlang-22.2.7-r1.ebuild b/dev-lang/erlang/erlang-22.2.7-r1.ebuild new file mode 100644 index 000000000000..b3c069a442bf --- /dev/null +++ b/dev-lang/erlang/erlang-22.2.7-r1.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +WX_GTK_VER="3.0" + +inherit elisp-common java-pkg-opt-2 systemd wxwidgets + +# NOTE: If you need symlinks for binaries please tell maintainers or +# open up a bug to let it be created. + +UPSTREAM_V="$(ver_cut 1-2)" + +DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)" +HOMEPAGE="https://www.erlang.org/" +SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz + http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz + doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )" + +LICENSE="Apache-2.0" +# We use this subslot because Compiled HiPE Code can be loaded on the exact +# same build of ERTS that was used when compiling the code. See +# http://erlang.org/doc/system_principles/misc.html for more information. +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" +IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets" + +RDEPEND=" + acct-group/epmd + acct-user/epmd + sys-libs/ncurses:0 + sys-libs/zlib + emacs? ( >=app-editors/emacs-23.1:* ) + java? ( >=virtual/jdk-1.8:* ) + odbc? ( dev-db/unixODBC ) + sctp? ( net-misc/lksctp-tools ) + ssl? ( + !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + systemd? ( sys-apps/systemd ) + tk? ( dev-lang/tk:0 ) + wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] ) +" +DEPEND="${RDEPEND} + dev-lang/perl +" + +S="${WORKDIR}/otp-OTP-${PV}" + +PATCHES=( + "${FILESDIR}/18.2.1-wx3.0.patch" + "${FILESDIR}/${PN}-22.0-dont-ignore-LDFLAGS.patch" + "${FILESDIR}/${PN}-22.2.2-gcc-10.patch" + "${FILESDIR}/${PN}-22.1.4-asn1-dep.patch" +) + +SITEFILE=50"${PN}"-gentoo.el + +src_prepare() { + default + + ./otp_build autoconf || die +} + +src_configure() { + use wxwidgets && setup-wxwidgets + + local myconf=( + --disable-builtin-zlib + $(use_enable hipe) + $(use_enable kpoll kernel-poll) + $(use_with java javac) + $(use_enable sctp) + $(use_with ssl ssl "${EPREFIX}"/usr) + $(use_enable ssl dynamic-ssl-lib) + $(use_enable systemd) + $(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null") + ) + econf "${myconf[@]}" +} + +src_compile() { + emake + + if use emacs ; then + pushd lib/tools/emacs &>/dev/null || die + elisp-compile *.el + popd &>/dev/null || die + fi +} + +extract_version() { + local path="$1" + local var_name="$2" + sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed" +} + +src_install() { + local erl_libdir_rel="$(get_libdir)/erlang" + local erl_libdir="/usr/${erl_libdir_rel}" + local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)" + local erl_erts_ver="$(extract_version erts VSN)" + local my_manpath="/usr/share/${PN}/man" + + [[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version" + [[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version" + + emake INSTALL_PREFIX="${D}" install + + if use doc ; then + # Note: we explicitly install docs into: + # /usr/share/doc/${PF}/{doc,lib,erts-*} + # To maintain that layout we gather everything in 'html-docs'. + # See bug #684376. + mkdir html-docs || die + mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die + local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. ) + docompress -x /usr/share/doc/${PF} + else + local DOCS=("README.md") + fi + + einstalldocs + + dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl + dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc + dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript + dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call + dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp + + ## Clean up the no longer needed files + rm "${ED}/${erl_libdir}/Install" || die + + insinto "${my_manpath}" + doins -r "${WORKDIR}"/man/* + # extend MANPATH, so the normal man command can find it + # see bug 189639 + newenvd - "90erlang" <<-_EOF_ + MANPATH="${my_manpath}" + _EOF_ + + if use emacs ; then + elisp-install erlang lib/tools/emacs/*.{el,elc} + sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \ + "${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die + elisp-site-file-install "${T}/${SITEFILE}" + fi + + newinitd "${FILESDIR}"/epmd.init-r2 epmd + newconfd "${FILESDIR}"/epmd.confd-r2 epmd + use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-lang/erlang/erlang-22.2.7.ebuild b/dev-lang/erlang/erlang-22.2.7.ebuild new file mode 100644 index 000000000000..c52ed00f231a --- /dev/null +++ b/dev-lang/erlang/erlang-22.2.7.ebuild @@ -0,0 +1,155 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +WX_GTK_VER="3.0" + +inherit elisp-common java-pkg-opt-2 systemd wxwidgets + +# NOTE: If you need symlinks for binaries please tell maintainers or +# open up a bug to let it be created. + +UPSTREAM_V="$(ver_cut 1-2)" + +DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)" +HOMEPAGE="https://www.erlang.org/" +SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz + http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz + doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )" + +LICENSE="Apache-2.0" +# We use this subslot because Compiled HiPE Code can be loaded on the exact +# same build of ERTS that was used when compiling the code. See +# http://erlang.org/doc/system_principles/misc.html for more information. +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" +IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets" + +RDEPEND=" + acct-group/epmd + acct-user/epmd + sys-libs/ncurses:0 + sys-libs/zlib + emacs? ( >=app-editors/emacs-23.1:* ) + java? ( >=virtual/jdk-1.8:* ) + odbc? ( dev-db/unixODBC ) + sctp? ( net-misc/lksctp-tools ) + ssl? ( + !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + systemd? ( sys-apps/systemd ) + tk? ( dev-lang/tk:0 ) + wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] ) +" +DEPEND="${RDEPEND} + dev-lang/perl +" + +S="${WORKDIR}/otp-OTP-${PV}" + +PATCHES=( + "${FILESDIR}/18.2.1-wx3.0.patch" + "${FILESDIR}/${PN}-22.0-dont-ignore-LDFLAGS.patch" + "${FILESDIR}/${PN}-22.2.2-gcc-10.patch" + "${FILESDIR}/${PN}-22.1.4-asn1-dep.patch" +) + +SITEFILE=50"${PN}"-gentoo.el + +src_prepare() { + default + + ./otp_build autoconf || die +} + +src_configure() { + use wxwidgets && setup-wxwidgets + + local myconf=( + --disable-builtin-zlib + $(use_enable hipe) + $(use_enable kpoll kernel-poll) + $(use_with java javac) + $(use_enable sctp) + $(use_with ssl ssl "${EPREFIX}"/usr) + $(use_enable ssl dynamic-ssl-lib) + $(use_enable systemd) + $(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null") + ) + econf "${myconf[@]}" +} + +src_compile() { + emake + + if use emacs ; then + pushd lib/tools/emacs &>/dev/null || die + elisp-compile *.el + popd &>/dev/null || die + fi +} + +extract_version() { + local path="$1" + local var_name="$2" + sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed" +} + +src_install() { + local erl_libdir_rel="$(get_libdir)/erlang" + local erl_libdir="/usr/${erl_libdir_rel}" + local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)" + local erl_erts_ver="$(extract_version erts VSN)" + local my_manpath="/usr/share/${PN}/man" + + [[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version" + [[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version" + + emake INSTALL_PREFIX="${D}" install + + if use doc ; then + local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* ) + docompress -x /usr/share/doc/${PF} + else + local DOCS=("README.md") + fi + + einstalldocs + + dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl + dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc + dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript + dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call + dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp + + ## Clean up the no longer needed files + rm "${ED}/${erl_libdir}/Install" || die + + insinto "${my_manpath}" + doins -r "${WORKDIR}"/man/* + # extend MANPATH, so the normal man command can find it + # see bug 189639 + newenvd - "90erlang" <<-_EOF_ + MANPATH="${my_manpath}" + _EOF_ + + if use emacs ; then + elisp-install erlang lib/tools/emacs/*.{el,elc} + sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \ + "${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die + elisp-site-file-install "${T}/${SITEFILE}" + fi + + newinitd "${FILESDIR}"/epmd.init-r2 epmd + newconfd "${FILESDIR}"/epmd.confd-r2 epmd + use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest index 058b4d4be34a..f1f1399fab68 100644 --- a/dev-lang/gnat-gpl/Manifest +++ b/dev-lang/gnat-gpl/Manifest @@ -36,8 +36,8 @@ DIST gnat-gpl-2014-x86_64-linux-bin.tar.gz 236253400 BLAKE2B c1db70db9442ba24688 DIST gnat-gpl-2016-src.tar.gz 8857249 BLAKE2B 3ff0fe247990e2a612ac989aa389e9ccae2e29c16177975c327b53ae1471030d0a70e5a2e3af219ad9a3288c241f2d18da349d0650f7fde01d439f4e4720de88 SHA512 4a5cb58ede5b4ae2887e64f0f2e12e0e06470d320796f06d02f7ddd932ff0d3b40e6d3e98a81138fff6906548a55153c2a186ff4a6e3d23b9dbe01ca582da1f8 DIST gnat-gpl-2017-src.tar.gz 8783473 BLAKE2B b0415b42f4d3a5e8675591a5602ff0a96945670104064671a232c0c12271ee141a3a5d148b8507bdab83cb8a0677c57b78e690060088308c51732bad3715964f SHA512 ae7314a2241107ed4d962dce08306eeb34c5f11e26183935bbb1ccf3a5eb011d6457c1b6fcded93dd0ee9ba31d791971ebe2a5a5a0ae04ff80d87a670325a098 DIST gnat-gpl-2018-src.tar.gz 8706578 BLAKE2B ba245fd91cc5263d5b8c159d9e75caf6bed21dcaa5fa43734af8775a4008ce5f96bfb84a8b5e6e734ff883314ab3219dacec3fe95a5baa33fb712bfb5ff8bce8 SHA512 0ff7e848ef77f7e772e2a1b01905307a91c332f32329456f5238c4b7eb46cc118709e8682a5fc826d98a7d99fd15a92c194f4a278f04bc465165cfa616cc3c2e -EBUILD gnat-gpl-2016-r4.ebuild 4569 BLAKE2B 2b663a903d8aa3cac8df611b0e75c5c18765889ea451db31e9a5cfe98aee90a5c7da658f516db38c9825ab7fce654e09772ce7587a9018bc5c0e18e158de119c SHA512 77348ee175b0611e0b0aaaeb742674816d734d0dc8f645b1d55ba868912dbfac7c12a56db16bfd809ee42d2f14082919b6f46fe66b4e966334656e8cfebb2912 -EBUILD gnat-gpl-2017-r1.ebuild 4010 BLAKE2B b12c356549760624ce29f6ad118db8cc752252904b3f01d35c5a76909da6879b8ce284f33fc987f301442537a25e7139adb404734adaae46474c0bed88e552be SHA512 f64f3271b0122dd1009189dc96746f9ec1690a6e1a45513874c95231986f5f80f0a869dda747d8792a41466210286c4bb29b534a219af63cbcacc4039f70bd7d -EBUILD gnat-gpl-2018-r3.ebuild 4020 BLAKE2B a2a7f9b746d61d1f68ee18a478a42b8e744292760f7c330bdb806a3749504ac55238fe942dde44507d80c3fc769f7610ffa296c83b3434a4248b6e15ecd287c0 SHA512 648c0a248b0a6ab1c00b0783beecae98735040fe45acccc25389e7ab905a383830faf27e680df88acf01fa54c9a3024004d519e28685b10776522ae86c592910 -EBUILD gnat-gpl-2019-r1.ebuild 3874 BLAKE2B eb3425bbf8b52d6c6d90852c4d028b500a76ac1d270fab2e6168c82f33dc35e2ee4eb280c860e4c69ea7170b9c72b07b56a0e58c24d3ed6768ae8a4be038999b SHA512 ec8f51008199698cbdefaa0e7ec48d0862c97d117f703c841518dab843e1ed319ae662b8d19e9e7a984f27b5b0c7bdbb89cc432d8341135ee04cd55425f18e27 +EBUILD gnat-gpl-2016-r4.ebuild 4568 BLAKE2B 0b393f4fd60acae6bf0c735c364a60bee5897ca84875cbbcad0e9282473b454c6eb7ca0deb28db6c8c63adf1191d0be79820940fcda77fd89e7d9c01cd9b6fc2 SHA512 863bb4b5b4a961605d74cce3d5ea0864c1055d1bb32eaa825a1d79c89471152e9d668d23c387b580f1894d60afab6defa7c2196fdfdc9473e62183af555d6366 +EBUILD gnat-gpl-2017-r1.ebuild 4009 BLAKE2B 3b3db2ca06eac7fa1024d78e31e6aa134d7b932547d7b8fb6102a31ad0ad178b9913128451c79d38c6df924622f78d1c26c9f86c3fe765ce7abc55e7cbdbac84 SHA512 618a17058917ba227e52a26f21626e3ba2d2b3abae304d52719bcb10f1314c51efb7c350fc2c82b557e0aa071e59bffac638eede999587aecd5d1faf4745cbc0 +EBUILD gnat-gpl-2018-r3.ebuild 4019 BLAKE2B 3a58368ea3baa6e29f03037d9d3f5865e130315b803432deb3be852dc00ea0e6c02f89387e2ecaa92cc93bd4cf4ca308c47a17f703bc66bd25584c2dec32f9df SHA512 303dcd36a49c2c5d68e80b116f668242ee1f78ede06d8586f3b39eed85ee514ba5ad5d5aadd95a80e8a554e9876137899b3e8bb558ba32a5607882e9b95180e9 +EBUILD gnat-gpl-2019-r1.ebuild 3873 BLAKE2B 8dd0490473434d5b839c8470bfe0107cc19272a0d05d27f0a26f13126c12f85ca3d7df33b076f5d20daf52fdb3db8f4c265622719257214c9ce065f580716cbc SHA512 0dcdd38fba83cf2fd93931a58e509e8cbce4f63168c221e3c4189b994ea2b496610626f5e036eea9273f99beb3fa3106e975d8207a946da7178c33d4b7d2a904 MISC metadata.xml 2152 BLAKE2B 31bff57d2fd31dd4586511ff401529e315e07eb28f857d2b48c6cbfc2ab1d4269deeb845d70c149c36eaf9d04767e4fab7671aab1b4d31b5c0581361a8ef7ebd SHA512 f16c1bd61c46551986d15a9941a334486092aa32a1e7e922e5d368e57c07ef32fd8ad4f9e14853882f7ad20afc1295062b2578b64d5e6fa4ce9dfd19847299b3 diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild index ae8bf794939c..555b2df05631 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild @@ -161,7 +161,7 @@ src_compile() { gcc_do_make "-C gcc gnattools" } -pkg_postinst () { +pkg_postinst() { toolchain_pkg_postinst einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more" einfo "The compiler binary is gcc-${TOOLCHAIN_GCC_PV}" diff --git a/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild index 759588fab428..8a6cf4555b8c 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild @@ -144,7 +144,7 @@ src_compile() { gcc_do_make "-C gcc gnattools" } -pkg_postinst () { +pkg_postinst() { toolchain_pkg_postinst einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more" einfo "The compiler binary is ${CTARGET}-gcc-${TOOLCHAIN_GCC_PV}" diff --git a/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild index 35dc9364a3d4..6559a30cfa32 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild @@ -142,7 +142,7 @@ src_compile() { gcc_do_make "-C gcc gnattools" } -pkg_postinst () { +pkg_postinst() { toolchain_pkg_postinst einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more" einfo "The compiler binary is ${CTARGET}-gcc-${TOOLCHAIN_GCC_PV}" diff --git a/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild index 3a2b6cba1540..2d74d35e7a04 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild @@ -141,7 +141,7 @@ src_compile() { gcc_do_make "-C gcc gnattools" } -pkg_postinst () { +pkg_postinst() { toolchain_pkg_postinst einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more" einfo "The compiler binary is ${CTARGET}-gcc-${TOOLCHAIN_GCC_PV}" diff --git a/dev-lang/lisaac/Manifest b/dev-lang/lisaac/Manifest index 127396ceb02c..b815d0c67f14 100644 --- a/dev-lang/lisaac/Manifest +++ b/dev-lang/lisaac/Manifest @@ -1,5 +1,5 @@ AUX 50lisaac-gentoo.el 205 BLAKE2B 846e26860287d4ff9ee305a2bf8a614ea1ca3bebc108dad7b6159267db5a99a2bb8ab89ccafaec1d4e312fcb2eaef54772faba7f87190a3e2d486d93086f77f2 SHA512 8ecf7496211067e2a2ffd5458036e7b3964e6528064855905d830e98553d9c190a08fcd0df941625eb8dcfe1f762042186420f00feebcf054d9a499c5cf2d080 AUX lisaac-0.13.1-makefile.patch 1003 BLAKE2B 6eaa34b6a4d2e97ce17e6c5d401f4a8b1e104256f139caa52886620c9b573ad8a58a2079d78be3e73bfbd82fde3c77838df1daa18bb32df07db935ee6c661243 SHA512 4b363a4791468b98e864b641c08886d8070b9c959fdd5fda68ea0c0fa8c8caf0fe80ef7afe99598579c8a7b18222c3846334b6fa6d9c2b3e6fec9fcda6170d6e DIST lisaac-0.13.1.tar.gz 2141871 BLAKE2B 7461eda320bc778cba5f28724eb1afc9451c26df4d4333b546f72a8d7e4add21f3ff369215a51adf841b967699d2746105a651ef11442d60ca3e7fc70a245e72 SHA512 079137d17fae09d57430d6576e9b2c149ca31ba47c0899513bfc447488ba2b0e3432fff8db4f6b141301798e23472738791cd99900c73a463d92397179a44aa9 -EBUILD lisaac-0.13.1-r2.ebuild 1663 BLAKE2B ae7dbffbac6a21456bcb973de30f61a2a6c0273b91ae219aa60d10f4dafaee7c9f41725ced025d238fc4ea01fa56b967509b9a5860f074a2c0004cf621173375 SHA512 1738e8324e15fd07ca990251612a8902f3f884f89a10276dd379569e24c2ce804c11669e1e17c804926f18d17f0a0218c667715ba4e301ea60ef2ca655ebbe0a +EBUILD lisaac-0.13.1-r2.ebuild 1668 BLAKE2B 5802c598e690975390f41dddaf43452ba547aac537471fc1210edd0b6aa8efdcbdd14d58dcca0d34fc9523cf39bee173d70738dd6bf2b3ce2fa959c1152001b5 SHA512 ab391d1744d03ea451c94babe9c7ed78e6ece9674a48d5423e1795fcb09f52e2eeb1e23ca9f67413acea92b68cf43c5d0568c52c7d5b207ebbca5b9cb2e1ce28 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/dev-lang/lisaac/lisaac-0.13.1-r2.ebuild b/dev-lang/lisaac/lisaac-0.13.1-r2.ebuild index dffa1101fd40..7d7646984cb0 100644 --- a/dev-lang/lisaac/lisaac-0.13.1-r2.ebuild +++ b/dev-lang/lisaac/lisaac-0.13.1-r2.ebuild @@ -20,12 +20,12 @@ RDEPEND="${DEPEND}" SITEFILE=50${PN}-gentoo.el -src_prepare(){ +src_prepare() { epatch "${FILESDIR}/${P}-makefile.patch" rm lib/number/essai } -src_compile(){ +src_compile() { emake CC="$(tc-getCC)" if use emacs; then @@ -34,7 +34,7 @@ src_compile(){ fi } -src_install(){ +src_install() { emake DESTDIR="${D}" DOC="/usr/share/doc/${PF}" install if use vim-syntax; then @@ -57,7 +57,7 @@ src_install(){ fi } -pkg_postinst(){ +pkg_postinst() { if use vim-syntax; then elog "Add the following line to your vimrc if you want" elog "to enable the lisaac support :" @@ -68,6 +68,6 @@ pkg_postinst(){ use emacs && elisp-site-regen } -pkg_postrm(){ +pkg_postrm() { use emacs && elisp-site-regen } diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest index 715bf2fe8dfc..b97e649aa007 100644 --- a/dev-lang/luajit/Manifest +++ b/dev-lang/luajit/Manifest @@ -1,6 +1,6 @@ AUX luajit-2-ldconfig.patch 1099 BLAKE2B f18beb00b703aa4fd5c6d959b72469c34fb67ba9dd1513831c36d5bdd21144457d70a58948bfc47660eadb130bb4f77d55858cd4e4b7c33860df749b22b727bd SHA512 a86be88b8cf65c5a11defeeb16dab92c7d3fe774b2ecd289d9485342236e14c99b78700082c024b703179b55aedeee98bef43d624af23673cfa7ac68a492c6b1 DIST LuaJIT-2.0.5.tar.gz 849845 BLAKE2B 961c8622e19b0e66a76a875cb46ad149cb2559b5af41f360dc41dd0d6bb924583e6477dd1329f67c2ac6ea4b8dc42c5e2f4d63ea49400aba4d9e7c7e85e4b085 SHA512 2636675602b4a060b0571c05220db2061dd2f38568e35b2be346a0f5e3128d87057d11d3d0d7567d8cc4e0817b5e4cf2c52a17a48065520962b157816465a9fe DIST LuaJIT-2.1.0-beta3.tar.gz 1025180 BLAKE2B ac3d12e25bd9946ba41aed6672c66884e7256e6be99d7ee8d1260d697453c966b24d60387f278f47233bad44cda61085c9059e6f62c0bc7cfdaaefde282346c5 SHA512 c44e967a0f671ed32b55aee810bc8b3b63737a2d7363b8984ae1949b24f98dbb3f9be7c1e10239fdeb96a3e3c836f606342cbd61838cf9bcadb077443eb5bc12 -EBUILD luajit-2.0.5-r1.ebuild 1464 BLAKE2B b5c2b6f0cf1f2ea6e0492142d97885f6ecf7365b635de9bfd47aba2bc365ffc02b633cb43a206b187485cb437b8c1429c527744c22a72bbb8f9e2ecd25ba48bb SHA512 cb892aa14fbf24aad93ef6e7a5d83d51cba6e0e5879b938296e9ec2566c2ea70d29750ba34756bd476db5e8da79648636208397cb7f5f8604a3581cf440ec5f5 -EBUILD luajit-2.1.0_beta3.ebuild 1203 BLAKE2B efe5c6177e3b10bd392f95f5742dcfadc4b44d8c4f08782a7bdf49cffc28a3c01c4a7786bc5fa3e6ded5ad0f534c787fc9c20be6ecef9620508efeac3d699ca8 SHA512 2f973c5405c804dfcac1b3c8ff2a5da423e3df52d675f1b495b1d10124fa48c0e17f25d1a15c9709c04ea41556832845523d26d5edf08242907e096707dbde6a +EBUILD luajit-2.0.5-r1.ebuild 1466 BLAKE2B ff14fc4cd92ee20c04c6ab4e1f812c463e787ba1f6936ef5c5b36008a27dda3e6fb1d306a2b3249d6dac7ef3e3ecdf00bf5be8c321d75634eb9b31b54c3965c6 SHA512 e7420eb3de6a28aacb43fc2d7f237e587205296c3ec4252e52b0b09945cd8966ed6602d77e30453dabcf44c41809a3c2018398c21bdc3d3f20c3416ed8a8e4d2 +EBUILD luajit-2.1.0_beta3.ebuild 1204 BLAKE2B a58f841f8dd6d7dcf82752ba231080183b49494480c6532555e8b33bb4a0ab19716a96321ae0a1bbc4eb8cff52bbcbfb55a8e9963fbc4e1764d98fcf2fa40ba1 SHA512 3701ba4433fe293786c092f2ad958867aa367a6158db5451a75989643dcd7994205606c4b225cd8e85f5c6d0902c09014342d64f1aa865fe68f3260b6b2dd7a5 MISC metadata.xml 552 BLAKE2B 50666bd08bb7c06c52a28652c0a87988e815c1d3c10cc1425cc7979689fd4738f56aaa6478aaa616a0b76122e42f790b3b415a60078dcc256499019912f0c4d4 SHA512 9d6ef1cb9acf52db52ec192bc51cbab6a7aa198dbf108ed76b25b0e258491b2f8d5ec0981c538546cc96de490c8c1ac852e337ef09ab5898ad4f2c48f5670f07 diff --git a/dev-lang/luajit/luajit-2.0.5-r1.ebuild b/dev-lang/luajit/luajit-2.0.5-r1.ebuild index 6b07deee37a7..0e4dc83ff928 100644 --- a/dev-lang/luajit/luajit-2.0.5-r1.ebuild +++ b/dev-lang/luajit/luajit-2.0.5-r1.ebuild @@ -27,7 +27,7 @@ PATCHES=( "${FILESDIR}/${PN}-2-ldconfig.patch" ) S="${WORKDIR}/${MY_P}" -src_prepare(){ +src_prepare() { if [[ -n ${HOTFIX} ]]; then eapply "${DISTDIR}/${HOTFIX}" fi @@ -55,7 +55,7 @@ src_compile() { _emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")" } -src_install(){ +src_install() { _emake install pax-mark m "${ED}usr/bin/luajit-${MY_PV}" diff --git a/dev-lang/luajit/luajit-2.1.0_beta3.ebuild b/dev-lang/luajit/luajit-2.1.0_beta3.ebuild index 9406beb98c84..b38bb2b260d7 100644 --- a/dev-lang/luajit/luajit-2.1.0_beta3.ebuild +++ b/dev-lang/luajit/luajit-2.1.0_beta3.ebuild @@ -44,7 +44,7 @@ src_compile() { _emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")" } -src_install(){ +src_install() { _emake install pax-mark m "${ED}usr/bin/luajit-${MY_PV}" diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest index 4e51b66af5e7..505ae01a87c8 100644 --- a/dev-lang/mono/Manifest +++ b/dev-lang/mono/Manifest @@ -12,13 +12,13 @@ DIST mono-5.20.1.19.tar.bz2 246790204 BLAKE2B 02e2f60394470a2dd24822b956a84fca78 DIST mono-6.0.0.334.tar.xz 219726296 BLAKE2B 42223f5d26fea5decaf228ffdf96166083d68d2ab4b7e983ceb2ebf7f43c372e73f7923fd38e606aafb9aa79ed04d151716a0029d396ca4a5499fa80244ae9a8 SHA512 7ac473b548f8309cdd781092f786967d2c6f1e3b7ff2da384427d98277456becf1c73cbc488261d48938de1b6d26043c09b0f3fd8d93f8be7d83805dd0f18708 DIST mono-6.4.0.198.tar.xz 230056560 BLAKE2B 725ac790e235569837052e54f2cfa603ea8212e956f11ac8a5feb692bc41ed7e5de37c90a150e95624e41763e7b85496090a426e0dccb378dbb6836e6bf73a6f SHA512 2804f1a2e10de683230fc77684b9f795259e4d494e819afd3c9cf247bed20cac2b7f80612eccc8af619158d077447989784e9f2e56fc741bf601894b1969600d DIST mono-6.6.0.161.tar.xz 241179396 BLAKE2B 88cb0599cd5698500431dc8a78fa3b44a148bdc11d3067e950f0019c6bbeff9ebf2142e90f3b1023721c982fc4a59605ee969d84ee2137f968dee66b1ea0b55c SHA512 0b0c72daef9e1c10c0d566292997d4a923766390793ec1196a063b885e853b47a12503238632879cf7397f03b34909137e24c53db9300a4f209164e973284186 -EBUILD mono-4.4.1.0.ebuild 3384 BLAKE2B fd16089b151c1666ceda7d05285fa8a10143a4157e46b75a3412b42dec80c0929f9ba8d9523ac65b64fb827ea8d1ad88fbe98a5e7d0d12423b970912d0ae50e4 SHA512 6c9c9ce5e19a33e4dbc1b0cdb2d17804a67eed5061e422358c971de5a2eb95b2848c4515312a4b082087c50040c1e7f9c687a134ca30354d8f4bde796432b126 -EBUILD mono-4.8.0.524.ebuild 3024 BLAKE2B b88a949183065faf88c014a025c71300e475b2a5591d4b2c0b09e8df9407cc1657d0caf25a03fd46b8a2857e8387cab1ce8d9f07e2c1e77e429877ff6e9c9b0d SHA512 34f63667140070d5187242dc915ea895947da812673c4f41d9e0e4f6736295b5a3ce4ca5780a860891939af414f9a9ef00089cb856326086c55378655846f873 -EBUILD mono-5.14.0.177.ebuild 2968 BLAKE2B 17e110b05811a8c82cda8a5931cfdee4c4cb9b00ec86c4a5c8e4c205ab20743c8e61876822055e3ba065d9ee9d29595cf08cedcb7a87f4b53468b408c1a3f7d7 SHA512 2385767fee4277490ac3be828baf8c09c99534658ea708e025cdaa43830a36df3c96f5b4a089ac9a9026ab9c4989cf6379b93330ffe29ce1b5beac7198fb5047 -EBUILD mono-5.16.0.220.ebuild 3022 BLAKE2B 4596e60c26b9ea401f6322319a61e4a8faaa0245ab43db186102285497cf4a6864dfcf375f1e722664a049cbbe6ec52e4c84e720f63e8585d2f8c06841c906d5 SHA512 396f4e8a6f2d1b3ea4c960fb0fd571b919734b92b940364fef75f4b1f60a69d9604f089d91c88adddd243718dcd14e92c6e803d58f737a58dbb69293b89651f7 -EBUILD mono-5.18.1.0.ebuild 2791 BLAKE2B 953c99cf90884c4103fb02b73888f4ea03643aee3becdbbaaa40eb960fcb7fefed5b9fe06b395d1ff7a237915ab534a4ee2cf9127dcc47153f23a69e9a1f092f SHA512 ec90f06ac470c152ef215578fced5dc6ad0b3f542d07500f2152e88581c20c827b4307f6acf2841de4d2a9a802e8a4d3bb66f2ad236d60271b7640a8cc8ee2df -EBUILD mono-5.20.1.19-r1.ebuild 3122 BLAKE2B 3be76d48cb6111acd9285bc9571efa1bedc2b05ca8c3aba1c06780b69f9c532dbc708d8fabc4af0dfda1976bfa7f6e0cae2f9f98dced2c384e13df677a0e978a SHA512 308e46700f0180f81775f22a89aa42cb0cc686a032e32962492f57260fd7993a0212fcb20142cdd89f419b0dd68010ac2a8817dd025ff865e6b8800408eee24d -EBUILD mono-6.0.0.334.ebuild 2931 BLAKE2B c3eacc6e29683ff6c5d21e111bb753b50c055a274fae75b0489711071b6727bd490eee659e6d4fba02bcda24b15ca6564b8f4c3d115308fb670bf67c93de88ea SHA512 fe4af821aaf959863137eaf2e3e9a51d527f3be6152a24937b04018a080ff24eb2ac67d4959afc299f4816874b7df6cbea428fb039549022839761ece7fa8110 -EBUILD mono-6.4.0.198.ebuild 2931 BLAKE2B 7a50854ee44677ded0cf0a6f84c14c9ec140d950aac8f09cb8a4d68cc3e17e00e515e2161aa9e9a2a01543b819661b1c579ece727b0c3428e87720c92db729e1 SHA512 e1716e3fd309aa69115b459b5d3875fb82599ab8ed5c500d4c61278fc6bf8b035ef08cff10957d5e921e9385d23f969cc617d2139b887c5c755b7ff39626517f -EBUILD mono-6.6.0.161.ebuild 2931 BLAKE2B 7a50854ee44677ded0cf0a6f84c14c9ec140d950aac8f09cb8a4d68cc3e17e00e515e2161aa9e9a2a01543b819661b1c579ece727b0c3428e87720c92db729e1 SHA512 e1716e3fd309aa69115b459b5d3875fb82599ab8ed5c500d4c61278fc6bf8b035ef08cff10957d5e921e9385d23f969cc617d2139b887c5c755b7ff39626517f +EBUILD mono-4.4.1.0.ebuild 3356 BLAKE2B 9abc9987b5f757155015b01b292791c9c3b15bcf6b9f9f0344941d9fc51387a97f57a9d3cd546fcb425fd58c8c8cecb8b11354aae0bacfbb6bce622fe03b3e04 SHA512 74e2ea9a392aa773762a74f1caa8c842ead27ae702ff8c93485a0bb2ee1b806ea9dfaaf05cb7a750fdc423c6b2b23cce43baeb3b6443ba0bdf3b0bca934d143b +EBUILD mono-4.8.0.524.ebuild 2999 BLAKE2B b0e9921deaaf44bbb3164ecb024e24ab039773111fad97a7d3ecab832063698b648d725061978af9dbba04b9b47c196bed3b55ba603bc5e8ffe2a93f4bf18836 SHA512 243c3b8866fd59e14139a738b5fcedda63a1b6d1ff8a0181796011acec5bfb02f6cc00eb806fe1e3f2f6daee0359a05210797c667253c31b0ffa294337fe3f62 +EBUILD mono-5.14.0.177.ebuild 2943 BLAKE2B b916df4debbc9fba0a6658ba18f9a1282b353cac223d48b0b911f681dea64e171e605dada45bee2c2f1f82179a6f3f75b0422927b79de4cc51f8f4bd027b1782 SHA512 8e50f90e70aee96aec480cdbcefe523d7959bf80757a5b8002fa015a8fe6aed4327b38061e70f91423ec79a1255ac13138cc9dc809ae8ec56dbfa5105775a2ba +EBUILD mono-5.16.0.220.ebuild 2997 BLAKE2B 183c8c8f3233cc5dc3aa096d6b6b626e51dca5ff30ceff483a58e0a7728e29c8250fac7d93758290285aa3d75f01733c6401064f34c47792e0d1028fbe1ff52d SHA512 03083492b88afc723e191cf59e0f0fbb3b99c2221d54732e4a06a233575029247ed4979a6b059107783fc110ffaeb15ee809448dbcabda5d83ac07c308151f77 +EBUILD mono-5.18.1.0.ebuild 2766 BLAKE2B 96d7030731bb1088071ba857fbda3ad2a4b63d0cb3b80eccac97774fd2342c1ec394643c8e3718645a6f5c00c52ccf3e71eade73c3cb5829a3e12f7264e69d16 SHA512 c745781dc23cd29328175e13852a59c6bd2975957020f86bdc8513ab371905a9e5f4d2e334f06d77a6d59fa186c65e86a3da558deadb6fb231fbf1cc7c2e93e2 +EBUILD mono-5.20.1.19-r1.ebuild 3097 BLAKE2B 84979808997343a033bcacfd3a2e08e6d556a8a53527d0504b89792123eac0f16ce4a5d4acf82afcae8b8784c04e9a2181786879f058508889e57b9b2b6d8d10 SHA512 653a36ac9c01cd8202c28b8d28e0215949ad099a086a428204290c3743021c5aaed86f70221fff3199f46e99e7917c969c8685fb21bb49e895f4d137082d2dca +EBUILD mono-6.0.0.334.ebuild 2906 BLAKE2B 565309e361278935741f3f7a048d6ff2d8d5ba9e433cb4f15093e569680bdd0651c9e738288e4ae55ee542ce8703fee26597de166ccd6771299d6497a283645c SHA512 248d87fb1c2885400c34fe8dc865902c4b75f88f93c3878b7cb2a52cb0351f722764c098d9afaec223a8df47debc5df4c35989a4793336f82db70a796d2a9dac +EBUILD mono-6.4.0.198.ebuild 2906 BLAKE2B 6d06006b41ae2011fad394f67b34c3b20ceea63588e92393d9c02d024539a19638a9368cf7e61a46a63ef29ab17a5b6e8b1df33e8c9da0f0f4928d56819e8abe SHA512 9ed6cda5c158d17df7a34b2f767dbdf7ceef826a33c0fe49db205070bf95f31e8cb7ed5ab400a4ecf0e1e58fd32d4aeea4888c30b66c425a6fe53207325a347e +EBUILD mono-6.6.0.161.ebuild 2906 BLAKE2B 6d06006b41ae2011fad394f67b34c3b20ceea63588e92393d9c02d024539a19638a9368cf7e61a46a63ef29ab17a5b6e8b1df33e8c9da0f0f4928d56819e8abe SHA512 9ed6cda5c158d17df7a34b2f767dbdf7ceef826a33c0fe49db205070bf95f31e8cb7ed5ab400a4ecf0e1e58fd32d4aeea4888c30b66c425a6fe53207325a347e MISC metadata.xml 507 BLAKE2B 91655de22fc1ff309c36ecef9d77aa8cada0b8f13ae30677665de837e99b7b43622a1dc0c677b0f5455c06b8e8a295c3c4f39753f66e749163a4f002ee481016 SHA512 e072a1abbf66276b0d139c3e918593010312c2059a0c6feba7b324689cdf90efe28bef0286ad9888125acfdd1fed2dee3e05e79a0aeb7f9ec1809bd128cf8a20 diff --git a/dev-lang/mono/mono-4.4.1.0.ebuild b/dev-lang/mono/mono-4.4.1.0.ebuild index ed7f9c382979..a977985bffbb 100644 --- a/dev-lang/mono/mono-4.4.1.0.ebuild +++ b/dev-lang/mono/mono-4.4.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -87,7 +87,6 @@ src_prepare() { multilib_src_configure() { local myeconfargs=( - --disable-silent-rules $(use_with xen xen_opt) --without-ikvm-native --disable-dtrace diff --git a/dev-lang/mono/mono-4.8.0.524.ebuild b/dev-lang/mono/mono-4.8.0.524.ebuild index d8a805b9937a..c322410123fd 100644 --- a/dev-lang/mono/mono-4.8.0.524.ebuild +++ b/dev-lang/mono/mono-4.8.0.524.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -83,7 +83,6 @@ src_prepare() { multilib_src_configure() { local myeconfargs=( - --disable-silent-rules $(use_with xen xen_opt) --without-ikvm-native --disable-dtrace diff --git a/dev-lang/mono/mono-5.14.0.177.ebuild b/dev-lang/mono/mono-5.14.0.177.ebuild index da0226a8437e..2c4705fb394e 100644 --- a/dev-lang/mono/mono-5.14.0.177.ebuild +++ b/dev-lang/mono/mono-5.14.0.177.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -81,7 +81,6 @@ src_prepare() { multilib_src_configure() { local myeconfargs=( - --disable-silent-rules $(use_with xen xen_opt) --without-ikvm-native --disable-dtrace diff --git a/dev-lang/mono/mono-5.16.0.220.ebuild b/dev-lang/mono/mono-5.16.0.220.ebuild index be71a2df69b4..bfd372235438 100644 --- a/dev-lang/mono/mono-5.16.0.220.ebuild +++ b/dev-lang/mono/mono-5.16.0.220.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -82,7 +82,6 @@ src_prepare() { multilib_src_configure() { local myeconfargs=( - --disable-silent-rules $(use_with xen xen_opt) --without-ikvm-native --disable-dtrace diff --git a/dev-lang/mono/mono-5.18.1.0.ebuild b/dev-lang/mono/mono-5.18.1.0.ebuild index 9601f0ba02ff..a7c4f35b9adf 100644 --- a/dev-lang/mono/mono-5.18.1.0.ebuild +++ b/dev-lang/mono/mono-5.18.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -77,7 +77,6 @@ src_prepare() { multilib_src_configure() { local myeconfargs=( - --disable-silent-rules $(use_with xen xen_opt) --without-ikvm-native --disable-dtrace diff --git a/dev-lang/mono/mono-5.20.1.19-r1.ebuild b/dev-lang/mono/mono-5.20.1.19-r1.ebuild index ca293dd74532..396a9f30519e 100644 --- a/dev-lang/mono/mono-5.20.1.19-r1.ebuild +++ b/dev-lang/mono/mono-5.20.1.19-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -83,7 +83,6 @@ src_prepare() { multilib_src_configure() { local myeconfargs=( - --disable-silent-rules $(use_with xen xen_opt) --without-ikvm-native --disable-dtrace diff --git a/dev-lang/mono/mono-6.0.0.334.ebuild b/dev-lang/mono/mono-6.0.0.334.ebuild index 8093e9eb4e49..0459e60b1b0a 100644 --- a/dev-lang/mono/mono-6.0.0.334.ebuild +++ b/dev-lang/mono/mono-6.0.0.334.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -79,7 +79,6 @@ src_prepare() { multilib_src_configure() { local myeconfargs=( - --disable-silent-rules $(use_with xen xen_opt) --without-ikvm-native --disable-dtrace diff --git a/dev-lang/mono/mono-6.4.0.198.ebuild b/dev-lang/mono/mono-6.4.0.198.ebuild index 93c5f532ff0b..6b165c57333a 100644 --- a/dev-lang/mono/mono-6.4.0.198.ebuild +++ b/dev-lang/mono/mono-6.4.0.198.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -79,7 +79,6 @@ src_prepare() { multilib_src_configure() { local myeconfargs=( - --disable-silent-rules $(use_with xen xen_opt) --without-ikvm-native --disable-dtrace diff --git a/dev-lang/mono/mono-6.6.0.161.ebuild b/dev-lang/mono/mono-6.6.0.161.ebuild index 93c5f532ff0b..6b165c57333a 100644 --- a/dev-lang/mono/mono-6.6.0.161.ebuild +++ b/dev-lang/mono/mono-6.6.0.161.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -79,7 +79,6 @@ src_prepare() { multilib_src_configure() { local myeconfargs=( - --disable-silent-rules $(use_with xen xen_opt) --without-ikvm-native --disable-dtrace diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest index 55a00f90efff..18557e113ff0 100644 --- a/dev-lang/nim/Manifest +++ b/dev-lang/nim/Manifest @@ -1,4 +1,4 @@ AUX nim-0.20.0-paths.patch 934 BLAKE2B 6a4e44c5656cde6d5127bf6a6b8db92cdf8aada0892c27d536d0c1030ed7da8dc97138a8941030101918021f2a301fa683169c8a656fefc6fb7d0fcdb24029d4 SHA512 bf8dbc3e3861ec3ea2718092b981e495194ead5b547e69d01d5d842d128dc4b96b0ba3e95c78afd8fd822d594199315a01de370851ed8f594c091231b9a10ee9 DIST nim-1.0.6.tar.xz 5153708 BLAKE2B c3263d4cf19629093306fa93decf038d8b19b8d810b7e782f84708b6771e2950554cda7c6f3d63e8dc6d2b604649fd31bd7009e51bea49ae556aa973cefc4167 SHA512 8da5281a8d93349996cbbe445e21fa9525c56e5721578ede2ae0f668cb2f29641db7d50a1b1a3e2c404ce56cb83dca10df5cbc84983242646a735b8f58d05f80 -EBUILD nim-1.0.6.ebuild 1686 BLAKE2B c0ed26600bb1f95124bf24f66bf419ebaf58c1e6d3667feffe3431e00beaa6e2cc6032d715d60eb56cb45d6881582f384d80091521f25851c03a17f065ba1567 SHA512 e2d0334a44153576730a458e818e6f28e8b9061483305ebe30b1166cae1f0735603c4cb0cfc050bea5219e5dc3072570312dfd1856fc8d44c522c41c04262171 +EBUILD nim-1.0.6.ebuild 1836 BLAKE2B aec8754c0b4cfdc4ec38261dfe8ce4809b7357f12fa09561773f72759da32f3d96b2e009ad9920a5393d8c35ba23b6a6ccb5de89a5eadae611c6216387b4651e SHA512 7942f252954bd11bacde68972186246fd351316bb866b6816ae2c45fd71f9e7aaa946993855240f4ea91e378681a4f1f08c36a4b83973ec7526915f1852fa0fe MISC metadata.xml 328 BLAKE2B 9205920d8c9b12118456bd186f2e882b3e6f75b7cc3f766def1e79e2e4f7ac695370409ff1555e379516606568f181f4ba3625322f70e41bfffd21d319b0035f SHA512 bf02bc0a8c25d6e157b7ab1ef87c2eac3241d42bc4cf0632a159dcb5d429051018848be81d0cbce228124660ced8694f5de48d64fe10bc7ff5b536b7e7579e49 diff --git a/dev-lang/nim/nim-1.0.6.ebuild b/dev-lang/nim/nim-1.0.6.ebuild index 05a236951686..3f1e8966eb08 100644 --- a/dev-lang/nim/nim-1.0.6.ebuild +++ b/dev-lang/nim/nim-1.0.6.ebuild @@ -48,15 +48,16 @@ src_compile() { _run ./koch boot --parallelBuild:$(makeopts_jobs) -d:release $(nim_use_enable readline useGnuReadline) # build nimble and friends # --stable to avoid pulling HEAD nimble - PATH="./bin:$PATH" _run ./koch --stable tools + PATH="./bin:$PATH" _run ./koch --stable tools --parallelBuild:$(makeopts_jobs) if use doc; then - PATH="./bin:$PATH" _run ./koch doc + # TODO: '--parallelBuild:' does ont seem to work + PATH="./bin:$PATH" _run ./koch doc --parallelBuild:$(makeopts_jobs) fi } src_test() { - PATH="./bin:$PATH" _run ./koch test + PATH="./bin:$PATH" _run ./koch test --parallelBuild:$(makeopts_jobs) } src_install() { diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest index 1acafb03207b..2bd95c026b85 100644 --- a/dev-lang/perl/Manifest +++ b/dev-lang/perl/Manifest @@ -3,5 +3,5 @@ AUX perl-5.26.2-hppa.patch 3231 BLAKE2B d59eab55eea3daceb0d3df39778d43ebaee2c065 DIST perl-5.30.0-patches-1.tar.xz 17352 BLAKE2B 67eb1c4ce6ada27e05962d06fa9c5675ca1d22623b5fd172ce8ceaa17f2e51d61f9451955f9f6acf6d97ea7d71c72b583be1378ccbf9174c88580baec2049a48 SHA512 4fe1f2de5e72e56890858148d20b772df63dce34cb3977ec47d8ed5323c4843929130f660f1558c282c97e65efa1c6d2fdacf9e2dcc0ef1d487a0b69dbb5bbb4 DIST perl-5.30.1.tar.xz 12367844 BLAKE2B 7e5dafb218a993301b986d198c02179d2d93d7418b910f813c7e5bc44ca4d22f004d4d768273ab5d4b6f16103d8a1896237ee14e195d2644fc4c05f5ade5404b SHA512 8f3339efdcd1bb58fa58a90042181bef86bb09e4598c737e446ed43b56d2ab23d67eced5e36fb08fc61e076acfdb572a12e46a1277f5299a3f412054df0b88bf DIST perl-cross-1.3.1.tar.gz 106723 BLAKE2B 473d90dbfe5d69e17d088664c365190982db400b0617d951fb7a4ccb84dd269fd9e861a6255c0469fbf288125db67ed9fc692251f14c31181f6e9dd1dba447bb SHA512 4715c1f65e39a7d0c605558b345a0a037e61afa992b3f723d66277d5ff7f1c7368ff1dfdb726895d75c4afdb6f710743708fdd9e79569a7d14a2d7002cc9f3b2 -EBUILD perl-5.30.1.ebuild 20272 BLAKE2B fe409e1e17cdf05f88e89035c5e26f4eb55bf5331c156f16ec8f80cf1d3303ef83c95284722d9248ec0a495b5196bd60bb788ba88de350f6ecb922eedee61a8a SHA512 7407ef1be4377da7b0b0fe04ff39d208da2b76e2a417d46ab4039a58cdca486e564c64df6f22794184191fbd02d0dfc58f558f84d63951bf4b2ce9dcd6198669 +EBUILD perl-5.30.1.ebuild 20273 BLAKE2B 14c102ee4f93fa15ae7bc336fb936e288cb0394bebd9717c266434ac0f910ec4d6c97f703a83c08fee235cf045cc79bde94de2c82b5efc1b6bc96f7136ca9c08 SHA512 9ba1ca314558287e8305ae77fe465bd053c4f34cc820e381d95f408d974b8b76495264c56de0620b860424e8b1b09516d0a5683f20769a94a46c889aa7251752 MISC metadata.xml 430 BLAKE2B 8625fd07f63a7943a85c3919d6ae6db622b752caa2803c56c72a22b270244261331fbab8b760e6d00acb8480770c9ef1d1beaaa22cc6044660821687c0cd8c33 SHA512 ca4c43e2016b7df707894713465700a90d2b8551b57fc4d660cff75edb1e8cc2456f9ae10431839ad6738f290d4f5911fae360eaa1d4670859d855de3d568583 diff --git a/dev-lang/perl/perl-5.30.1.ebuild b/dev-lang/perl/perl-5.30.1.ebuild index d2378f63b0b9..98cca9ef5715 100644 --- a/dev-lang/perl/perl-5.30.1.ebuild +++ b/dev-lang/perl/perl-5.30.1.ebuild @@ -650,6 +650,6 @@ pkg_postinst() { fi } -pkg_postrm(){ +pkg_postrm() { dual_scripts } diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index e2ed11d10658..3f2a6a94eb29 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -6,14 +6,20 @@ AUX php-freetype-2.9.1.patch 7667 BLAKE2B efc8f829bbad11b3e7b654d0882213ecb9aae7 AUX php-iodbc-header-location.patch 481 BLAKE2B 9ea6a5d529dc7a8c78eeee800900372bc14309a05e352b2838da32e1384b61b507fdb623c9400094aa5b637eb1a87da92c72600eff79b18b8989ef90af56a0fa SHA512 86469f657d8807f005c28fd2149770c881add8f243fdfea087956c7987277597fe400a7af23f624f26da270356604717ed9cd04771154d7cf2ffe7237972372b DIST php-7.2.26.tar.xz 12309176 BLAKE2B 2208aee696fc2aed50b4f08f2dd7ca0f70d9913c22091687f6c694a343e4b5fd5e1f0d0b6b127fe0c00c5611cb60e627c2257a1fad9bff6e9fc8bb921e1eb57d SHA512 457e3420120135e311a22cd11529d5a3efc5885af4f298196f403093141801619d4dcdb38d6a4a5f8d9dcfa619688d8fdf33fea4a30e2d885e987b739a268f12 DIST php-7.2.27.tar.xz 12307512 BLAKE2B 8d51a1a88c718ba9ef683e190f9ed80b46fccfc7b237d9175f5db3012a3d4ae8f698dbe6b2b8f233121be6d08e28bdb1062a357dd6ae2df5228a7e56c8604807 SHA512 02416e2bdfcd47ef660c7403ca25c7358c2f9a685b1dee6a2a95c52d1b1178666f9fa0bb32dc070cfd09febb5c44ecdb70116546142369d7ead4432634dc38c5 +DIST php-7.2.28.tar.xz 12311760 BLAKE2B de27a5aa23ceaa16aef5da3ccda116e846a81d10b96a64727a36004fc9d02a2e77eb867222d619cc13e8a66c754e709a720c4faa3ac26445191b1f4a5e6a5cfb SHA512 c9465a2858a324c6b68cb99424ef2719da9f8a4177ba9aa87605b2633a8a404cf780612eca50249a57c516d2a0bbe07d5e88654590117124e3528840e3dee9ae DIST php-7.3.13.tar.xz 12102012 BLAKE2B 32a346470ea0d0a3db873ae94b5e4dcc650c25e24db244ea94417f092e0458a0825cb99e9c3429000ee5cbd50120824d9bd2a58a7ed2ada1f39c6d7c41b2ba08 SHA512 d0624b3b841fed49d9cea56b17e7c8c7abf8e6572832b6f86c98f48c23f86690c310b460eae27a6fcd41fbfbc2e8a4b56f6bfb0c738fa1db36ce3795454d7798 DIST php-7.3.14.tar.xz 12106072 BLAKE2B 698e6cfe4cc9640c393988626bf344a4bc891cb6d974017a0a176d2c5f6f55cc6073f88bd90926822c7c0534da280a6ae6b8f28b3c983665d7ce8b330246e783 SHA512 053cd51d0fe73e18494d51c104573b73f6af41d21091513319e994cc12398fa792b7d996414d28d6dbf983c38afccc92d47d6fd8c071824ee192067bd955a80a +DIST php-7.3.15.tar.xz 12111464 BLAKE2B eaf4d095138eaf7f4a6e1d12bf8ae21a85d2bc7f7b103c2db1c78cc93a5a0f8676f9b97183f0df188c4c899d924d8ddcbc7207c5bd7d1919b7775d4b2066b29f SHA512 7a578d175e27f20205f6471451665f3141221916dfbd289085bfa64715dcd57cd9bca272fed73f539b066862e196fe1f5f446e2eb1cca9971b4f9a8080663acb DIST php-7.4.1.tar.xz 10245600 BLAKE2B fcbb7de0e9ab74820ca8fdd234cd20908ed8e559e6eeffd576e285a5f4b4b31506ec2e11cc5926464257e08289207462f4b373833b8130500e0944f64dbf6cf5 SHA512 2dd152bdca52ece160feff799622fd4bdd88e0664f629e6149fd14ede6c304dfc40c164fcd9200c041b26342d6248010cf9b53e30c1a8d31640dc3b24d25c4da DIST php-7.4.2.tar.xz 10252304 BLAKE2B cf3b7a6a26ff58fb46024710c9d265d440faff4c5ee583a76c89aa7a73049c8bc6eaf428f53dfbdbb86efef9208503150c9c31b442f960d167babf08380813cf SHA512 e8d4b300d71e48a740b4cd96bf100206615a352bf77822dfe4a289b93738e3419f1371f2b1ec2eb9c9c4b9c87eac69c866a4c51a821e0f5b07a2fa3b0eb8d89b -EBUILD php-7.2.26.ebuild 22483 BLAKE2B bd71d1f60ba8948eb0164ab93f0ca94b3ba2b8331ed011c0d45f8b50567f733b364afb262b5407e8d8156dd4a52119c7f3e4bd76f1a14f2e4807db2971c86d88 SHA512 4ffa41f250c445e9172fbc7348953453a22cb360d1e106c06922bb665f8a8705d390f57f2170973319e0ab930aa32592365865a43bdcdbd3d78751b18b3f0c18 -EBUILD php-7.2.27.ebuild 22461 BLAKE2B 461bf14690e153e6ef1c0af34f11f8323943db2109c6d1808ea3d09478f1f9c7cbea83f669d39b5f630e4abe5fd4b141c7ce9e0ef574b5cd2ff32b63fae6f0a7 SHA512 7f7043597737b2e501860015443a3cf3e97a07dd9c379c91d7b348eca3d9486ded274e271207fe2c074a52a3f0efd2994fa3025e9a13884a7001a60877fb77fd -EBUILD php-7.3.13.ebuild 22495 BLAKE2B 95cc23e098281aba451c63cc02fbf8fb61f80e8afc65f4b3336ad2632a5c15ba9ce11c5af439368a837b6f82a9a4d73677ef080c651cddbddfe7f7496c31dbc2 SHA512 696ae412747384e80f05b015b33072621a9d4105a022a7b9b951ab5133ea072149c7cd6ad3414822e5abaa29d28ee9043ea041d80965cdab2bf87c8eb0b474d3 -EBUILD php-7.3.14.ebuild 22473 BLAKE2B b555f5f4a0be31cac412d8dd1bf1af5a20a1db9e5088252d9f48111f57ac758dae954aecbda25ffd5739123a7ef83145d68b0186ffc675a07e7566fb69dc4106 SHA512 72ab79a1fdc38b900fd1a72196e72f167b46416a56d22a1eb670fc12bcdcecd44589715f4450ad95a10b9490965b80b52899416fb0f5ebe4ab4fc8205f2b295f -EBUILD php-7.4.1.ebuild 21183 BLAKE2B 9762575bb045ac7121a80df9e54ad5d25e0f033340bbeb9beba62f4e3744fa08b1d865e3a3febec6a20bb991fb8dbf0de9d4083a1b938178120d8778b290a1e0 SHA512 de0bb4a496ab689ab35ae8ef487e55591715739abfe9e2ba48aea27e5a3470b0817dfb2c332b501a21e1b305ab39a9c2933d8e4eeed61ec480811e118c9642cc -EBUILD php-7.4.2.ebuild 21191 BLAKE2B 22e8a747e76bbbc612d2626f4ab42bff64adb3d7ac1686b877e2d95ba8775837ecaa9df6e29c6c7fd212e9a59263a153499859e4896c74dd3ef4c5605cec51ed SHA512 df8bc8602de2dd3a07c5e30c4c124e77e28d1e05ce95ef8a8b94b54256c2c16199896a6d8a1177cd79b79d3cce7dcfe2665a848825ea03e5702371872e5b72d4 +DIST php-7.4.3.tar.xz 10261432 BLAKE2B 8542555c5d2237f88ecbedd14fffa0dbaa2a714767e6af28595074e8625e78f1cb25084b151930ba3f9ac1c7f5f7188f1539b51cfa431045af158c6707afc77a SHA512 121f2870bbce99f8ab2d42655a9bf6aed1dc37f3c91c238bc37f448543595d55358c2d023f2d3e08c81b1b21d47be9c2d47ef7a2e776c8ac8ac34482b63e5bf3 +EBUILD php-7.2.26.ebuild 22448 BLAKE2B 53d36d0c5a2e297b1b284626514a94f0c7aaab74d8e5db1837f680d0d275cfe01888cad8ad23781fc663ce0009fbcae8ae3ecb3b3ad36b931b5a168d0a4e0464 SHA512 223657f1b5084758f964fa35b1a35934df5dff5206ecbc6cb13751db46bfefcb496f7d7a16f78f83a0c53657f489d42d7badfcbb9d7cd0d58ad5f5dee07ddf40 +EBUILD php-7.2.27.ebuild 22426 BLAKE2B a4dbc7320bebaeed885b44d326ad1ad3199b4ab5fc0120c7a49c3440a96dcdb172324df1ff8c8226933bb44c5a94542127dcc04e42eb058fcfda06347d7f331a SHA512 d0fe75ee64b3b485e776d1402a2193b3e3e8bbaeffdf05a1ced39acc9e5c3814b0c8e075adc76aabcd843cfa3ca9fd62b03e69b3e9b040db5e738b4f4790b8ee +EBUILD php-7.2.28.ebuild 22405 BLAKE2B 7683c6a238eb886e0ea935804fd574375f97f0bb414901df2a8e5593cb7ff7f78e7faa5d99897db78afcfefe36d4e5365ebcedd559f2f849621b485b62bee06c SHA512 05019377a4836121b4ca375a0d0607c3031031b93aec1033bc81266cf2b14d691a7cf4eb7dc615dc39188ca780e4f2bf1345ddfd454fd8543c94f9c1c90034a7 +EBUILD php-7.3.13.ebuild 22460 BLAKE2B 97acb89cb2f28c4091aeedc3620adc15ae9622589d8e0b174a41185c8ae47533e010aeac04a7ca4854a2dde887586ad51a19e4af4b6f353592d3ace477d1d6d0 SHA512 4322af79a642f573c8c43fadd92b8ea4dd0ad7ca3a7c884b57927c9c9c6745dd1a28b75100ba6f5fee5ee5add6a59cd7c6f23b0d264d95f4be29fa59fa28686d +EBUILD php-7.3.14.ebuild 22438 BLAKE2B b57e0cd0da1f42cd0d7ddfcb083073a71a217f26232ff266db95ae2726696d56302b27cf57b7c18efd37ddbb10bc7ffac2c0a0388d493edd6efb060bf19e5b01 SHA512 fe81f5c55d94b3d8b54b5a6c7a107150be188d6ecc5e2fe4135ef5239c2ccd96c28565c7e67c3c60bbbb1e19a7aa740cc44c635ce0ec51dfaadfdb22a383714c +EBUILD php-7.3.15.ebuild 22417 BLAKE2B df899203e36a9df8b305fbc11db589f7ccdd316d90507931fd5f86906cd0181c2799e6313eb5f9acd81537f2ba71d2edd5c9ac4901b78c9d8442ccdc5da28fcd SHA512 a07815bf43417edcc1628cc636206df266849e127b13dc01f9887ac377985a9edfa0ea3c1c540d6076c7b8f8fc0047dbcc814877f3fb8ca9f0372fc32cf63282 +EBUILD php-7.4.1.ebuild 21148 BLAKE2B 03923341a96754c9ba397aa08692eb12c6a84fa2485aab39ee33e9e8bde02ea6f9a59301b1e0ca974ada6eaade17390ffb3d4397068db39ee46242daf8686e37 SHA512 dd73105d30a747e8d1bfdbafeb999e09da2a88007c328d26eee80a5590a12ac8a8cbd28e17227998ee91ced8c03780ad71200d721a6c7c24e82c3739de31d605 +EBUILD php-7.4.2.ebuild 21156 BLAKE2B bd59183e7e62b12c0c9662db44cf5e3c00388b864fc3e785a844d2aad600fbf027d81ee1e8c7a8f04e0a8691db2a1a0c7a52b14b6ed1a23f670f57cb3da8305e SHA512 199f6df9868b4b1c1e46dbd3ae7cb1a781818aefc9c0c4ee1da04167489b11b782f067779cb9412adbf1479ac69824124cd6f595e2c81dd803ed735eb6b4fc14 +EBUILD php-7.4.3.ebuild 21127 BLAKE2B 2a6c3f3c2c63a487b67b6e05ea00287f6fa47dd6861520a90c505ac05bc357c8217888df0ce3598d1b4331f57e65327331123975f390fbf66996a381a1babb20 SHA512 38ff78d23bb847feec35ee8c83a621cc15d6197683e9b489eb50bf97c041c9f1c60befddb7d862090ffe68a196cab9d5f0f87cb428eb8e912672deda3216ce5a MISC metadata.xml 3216 BLAKE2B 6118c94f2ac3a2f283eb035cbbacb12343476b4ce22594a00cb7ebf063abb106a0ed5557d311127b8c1e2a53263103ded790cd12d20c6b410ab6f7d218d95ed8 SHA512 ffb0b46b30b1add0fc166e3afe1317e70041a0fe849d4c05ceee011c1b5e130fbde3b86eaf876a4c8a2d23fbd7824f95299642b4f60e129436befb00f4b124cc diff --git a/dev-lang/php/php-7.2.26.ebuild b/dev-lang/php/php-7.2.26.ebuild index db454dfb9726..52361ca04b9b 100644 --- a/dev-lang/php/php-7.2.26.ebuild +++ b/dev-lang/php/php-7.2.26.ebuild @@ -181,7 +181,6 @@ php_install_ini() { # 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 diff --git a/dev-lang/php/php-7.2.27.ebuild b/dev-lang/php/php-7.2.27.ebuild index 52352ff4c931..db36a046d76b 100644 --- a/dev-lang/php/php-7.2.27.ebuild +++ b/dev-lang/php/php-7.2.27.ebuild @@ -181,7 +181,6 @@ php_install_ini() { # 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 diff --git a/dev-lang/php/php-7.2.28.ebuild b/dev-lang/php/php-7.2.28.ebuild new file mode 100644 index 000000000000..246350b3a349 --- /dev/null +++ b/dev-lang/php/php-7.2.28.ebuild @@ -0,0 +1,750 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit flag-o-matic systemd autotools + +DESCRIPTION="The PHP language runtime engine" +HOMEPAGE="https://www.php.net/" +SRC_URI="https://www.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="$(ver_cut 1-2)" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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[apache2_modules_unixd(+),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-2.0:0 ) + 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-2[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? ( 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" + +BDEPEND="virtual/pkgconfig" + +# 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 zlib ) + webp? ( gd zlib ) + cjk? ( gd zlib ) + exif? ( gd zlib ) + xpm? ( gd zlib ) + 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? ( hash || ( mysqli pdo ) ) + mysqli? ( hash ) + zip-encryption? ( zip ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}/php-freetype-2.9.1.patch" + "${FILESDIR}/php-7.2.13-intl-use-icu-namespace.patch" +) + +PHP_MV="$(ver_cut 1)" + +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 + + 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 "../ext/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' + + # Bug 669566 - necessary so that build tools are updated for commands like pecl + # Force rebuilding aclocal.m4 + rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare" + eautoreconf +} + +src_configure() { + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn + + 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 #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn + + 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 #nowarn + + # 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.3.13.ebuild b/dev-lang/php/php-7.3.13.ebuild index 79917af499c0..1af2767e3106 100644 --- a/dev-lang/php/php-7.3.13.ebuild +++ b/dev-lang/php/php-7.3.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -182,7 +182,6 @@ php_install_ini() { # 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 diff --git a/dev-lang/php/php-7.3.14.ebuild b/dev-lang/php/php-7.3.14.ebuild index 7c1e337cb47a..ebe16ceac61b 100644 --- a/dev-lang/php/php-7.3.14.ebuild +++ b/dev-lang/php/php-7.3.14.ebuild @@ -182,7 +182,6 @@ php_install_ini() { # 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 diff --git a/dev-lang/php/php-7.3.15.ebuild b/dev-lang/php/php-7.3.15.ebuild new file mode 100644 index 000000000000..26c1bf2cc49b --- /dev/null +++ b/dev-lang/php/php-7.3.15.ebuild @@ -0,0 +1,751 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit flag-o-matic systemd autotools + +MY_PV=${PV/_rc/RC} +DESCRIPTION="The PHP language runtime engine" +HOMEPAGE="https://www.php.net/" +SRC_URI="https://www.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="$(ver_cut 1-2)" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + +S="${WORKDIR}/${PN}-${MY_PV}" + +# 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/libpcre2-10.30[unicode] + fpm? ( acl? ( sys-apps/acl ) ) + apache2? ( www-servers/apache[apache2_modules_unixd(+),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-2.0:0 ) + firebird? ( dev-db/firebird ) + gd? ( virtual/jpeg:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) + gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) + gmp? ( dev-libs/gmp:0= ) + iconv? ( virtual/libiconv ) + imap? ( >=virtual/imap-c-client-2[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? ( 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-1.0.1: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-1.2.0.4:0= ) + zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) + zlib? ( >=sys-libs/zlib-1.2.0.4: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" + +BDEPEND="virtual/pkgconfig" + +# 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 zlib ) + webp? ( gd zlib ) + cjk? ( gd zlib ) + exif? ( gd zlib ) + xpm? ( gd zlib ) + 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 ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}/php-freetype-2.9.1.patch" +) + +PHP_MV="$(ver_cut 1)" + +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 + + 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 "../ext/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' + + # Bug 669566 - necessary so that build tools are updated for commands like pecl + # Force rebuilding aclocal.m4 + rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare" + eautoreconf +} + +src_configure() { + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn + + 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 #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn + + 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 #nowarn + + # 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.4.1.ebuild b/dev-lang/php/php-7.4.1.ebuild index e40c1d79c014..3190c5785155 100644 --- a/dev-lang/php/php-7.4.1.ebuild +++ b/dev-lang/php/php-7.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -172,7 +172,6 @@ php_install_ini() { # 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 diff --git a/dev-lang/php/php-7.4.2.ebuild b/dev-lang/php/php-7.4.2.ebuild index 4123e9850615..4e6b9a033911 100644 --- a/dev-lang/php/php-7.4.2.ebuild +++ b/dev-lang/php/php-7.4.2.ebuild @@ -172,7 +172,6 @@ php_install_ini() { # 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 diff --git a/dev-lang/php/php-7.4.3.ebuild b/dev-lang/php/php-7.4.3.ebuild new file mode 100644 index 000000000000..13020f6424e2 --- /dev/null +++ b/dev-lang/php/php-7.4.3.ebuild @@ -0,0 +1,741 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +WANT_AUTOMAKE="none" + +inherit flag-o-matic systemd autotools + +MY_PV=${PV/_rc/RC} +DESCRIPTION="The PHP language runtime engine" +HOMEPAGE="https://www.php.net/" +SRC_URI="https://www.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="$(ver_cut 1-2)" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + +S="${WORKDIR}/${PN}-${MY_PV}" + +# 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 ffi +fileinfo +filter firebird + +flatfile ftp gd gdbm gmp +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 selinux +session session-mm sharedmem + +simplexml snmp soap sockets sodium spell sqlite ssl + sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp + +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" + +# Without USE=readline or libedit, the interactive "php -a" CLI will hang. +REQUIRED_USE=" + || ( cli cgi fpm apache2 embed phpdbg ) + cli? ( ^^ ( readline libedit ) ) + !cli? ( ?? ( readline libedit ) ) + truetype? ( gd zlib ) + webp? ( gd zlib ) + cjk? ( gd zlib ) + exif? ( gd zlib ) + xpm? ( gd zlib ) + gd? ( zlib ) + simplexml? ( xml ) + soap? ( xml ) + xmlrpc? ( xml iconv ) + xmlreader? ( xml ) + xmlwriter? ( xml ) + xslt? ( xml ) + ldap-sasl? ( ldap ) + qdbm? ( !gdbm ) + session-mm? ( session !threads ) + mysql? ( || ( mysqli pdo ) ) + firebird? ( pdo ) + mssql? ( pdo ) +" + +RESTRICT="!test? ( test )" + +# 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/libpcre2-10.30[unicode] + fpm? ( acl? ( sys-apps/acl ) ) + apache2? ( www-servers/apache[apache2_modules_unixd(+),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-2.0:0 ) + ffi? ( >=virtual/libffi-3.0.11 ) + firebird? ( dev-db/firebird ) + gd? ( virtual/jpeg:0 media-libs/libpng:0= ) + gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) + gmp? ( dev-libs/gmp:0= ) + iconv? ( virtual/libiconv ) + imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) + intl? ( dev-libs/icu:= ) + kerberos? ( virtual/krb5 ) + ldap? ( >=net-nds/openldap-1.2.11 ) + ldap-sasl? ( dev-libs/cyrus-sasl ) + libedit? ( 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? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) + postgres? ( dev-db/postgresql:* ) + qdbm? ( dev-db/qdbm ) + readline? ( sys-libs/readline:0= ) + session-mm? ( dev-libs/mm ) + snmp? ( >=net-analyzer/net-snmp-5.2 ) + sodium? ( dev-libs/libsodium:= ) + spell? ( >=app-text/aspell-0.50 ) + sqlite? ( >=dev-db/sqlite-3.7.6.3 ) + ssl? ( + !libressl? ( >=dev-libs/openssl-1.0.1: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:= ) + webp? ( media-libs/libwebp:0= ) + xml? ( >=dev-libs/libxml2-2.7.6 ) + xpm? ( x11-libs/libXpm ) + xslt? ( dev-libs/libxslt ) + zip? ( >=dev-libs/libzip-1.2.0:= ) + zlib? ( >=sys-libs/zlib-1.2.0.4: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" + +BDEPEND="virtual/pkgconfig" + +PHP_MV="$(ver_cut 1)" + +PATCHES=( "${FILESDIR}/php-iodbc-header-location.patch" ) + +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 + + 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 "../ext/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' + + # Emulate buildconf to support cross-compilation + rm -fr aclocal.m4 autom4te.cache config.cache \ + configure main/php_config.h.in || die + eautoconf --force + eautoheader +} + +src_configure() { + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn + + 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) + $(use_with bzip2 bz2 "${EPREFIX}/usr") + $(use_enable calendar) + $(use_enable coverage gcov) + $(use_enable ctype) + $(use_with curl) + $(use_enable xml dom) + $(use_with enchant) + $(use_enable exif) + $(use_with ffi) + $(use_enable fileinfo) + $(use_enable filter) + $(use_enable ftp) + $(use_with nls gettext "${EPREFIX}/usr") + $(use_with gmp gmp "${EPREFIX}/usr") + $(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) + $(use_enable ipv6) + $(use_enable json) + $(use_with kerberos) + $(use_with xml libxml) + $(use_enable unicode mbstring) + $(use_with ssl openssl) + $(use_enable pcntl) + $(use_enable phar) + $(use_enable pdo) + $(use_enable opcache) + $(use_with postgres pgsql "${EPREFIX}/usr") + $(use_enable posix) + $(use_with spell pspell "${EPREFIX}/usr") + $(use_enable simplexml) + $(use_enable sharedmem shmop) + $(use_with snmp snmp "${EPREFIX}/usr") + $(use_enable soap) + $(use_enable sockets) + $(use_with sodium) + $(use_with sqlite sqlite3) + $(use_enable sysvipc sysvmsg) + $(use_enable sysvipc sysvsem) + $(use_enable sysvipc sysvshm) + $(use_with tidy tidy "${EPREFIX}/usr") + $(use_enable tokenizer) + $(use_enable xml) + $(use_enable xmlreader) + $(use_enable xmlwriter) + $(use_with xmlrpc) + $(use_with xslt xsl) + $(use_with zip) + $(use_with zlib zlib "${EPREFIX}/usr") + $(use_enable 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" ) + fi + + # DBA drivers support + our_conf+=( + $(use_with cdb) + $(use_with berkdb db4 "${EPREFIX}/usr") + $(use_enable flatfile) + $(use_with gdbm gdbm "${EPREFIX}/usr") + $(use_enable inifile) + $(use_with qdbm qdbm "${EPREFIX}/usr") + $(use_with tokyocabinet tcadb "${EPREFIX}/usr") + $(use_with lmdb lmdb "${EPREFIX}/usr") + ) + + # Support for the GD graphics library + our_conf+=( + $(use_with truetype freetype) + $(use_enable cjk gd-jis-conv) + $(use_with gd jpeg) + $(use_with xpm) + $(use_with webp) + ) + # enable gd last, so configure can pick up the previous settings + our_conf+=( $(use_enable gd) ) + + # IMAP support + if use imap ; then + our_conf+=( + $(use_with imap imap "${EPREFIX}/usr") + $(use_with ssl imap-ssl "${EPREFIX}/usr") + ) + fi + + # LDAP support + if use ldap ; then + our_conf+=( + $(use_with ldap ldap "${EPREFIX}/usr") + $(use_with ldap-sasl) + ) + 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 + if use odbc && use iodbc ; then + our_conf+=( + --without-unixODBC + --with-iodbc + $(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr") + ) + elif use odbc ; then + our_conf+=( + --with-unixODBC="${EPREFIX}/usr" + --without-iodbc + $(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr") + ) + else + our_conf+=( + --without-unixODBC + --without-iodbc + --without-pdo-odbc + ) + fi + + # 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) + $(use_with firebird pdo-firebird "${EPREFIX}/usr") + $(use_with oci8-instant-client pdo-oci) + ) + fi + + # readline/libedit support + our_conf+=( + $(use_with readline readline "${EPREFIX}/usr") + $(use_with libedit) + ) + + # Session support + if use session ; then + our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") ) + else + our_conf+=( $(use_enable 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-external-pcre affects ext/pcre + # Many arches don't support pcre-jit + our_conf+=( + --with-external-pcre + --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 #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn + + 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 #nowarn + + # 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/python/Manifest b/dev-lang/python/Manifest index a6c8caef2710..bd3393e28bc7 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -11,7 +11,9 @@ DIST Python-3.6.9.tar.xz 17212164 BLAKE2B ef33dbc1ea3bbeaf92092de867279d759e3a20 DIST Python-3.7.5.tar.xz 17236432 BLAKE2B fb49a3bfd9b1944d567a45682f789ef840e63ed610e0dddb5695da7a84a0bcb50a6fa52097722f09b57d6fc15a5f89aeaa46a061125219e597897086f3dffe40 SHA512 f4f3879881f260f58dbb041fb0f2f210d4b70b02a739e41e50e6fea67d31855a7a29ce4ebef66bfde3d0edf54b946a48f78490f986da965357b835d4dbb3f414 DIST Python-3.7.6.tar.xz 17246360 BLAKE2B b83a440a1ad5b1a2210e03be0522d39f53778774ea725fa41aaaab28cccfcdf007996f1a1d3cb95f8040b71b692189e28db67ba6ec136af82158363a1aadbba6 SHA512 5be022c384728b0c6709d165486f66226d126c521b466ed24d0c4c3c5910ec786a734f4c2c916ac409213c54a492b9fb230fb721c41e3de281676a7e9d8f3171 DIST Python-3.8.1.tar.xz 17828408 BLAKE2B db1841625de89b812cadcd538a990401a4e49d43968dce733c289121e9de9749eaf39e1c772a32e10ed2b40bef215b19ae9c7d88e0ec9e99cd3d467406ea063c SHA512 d41381848cc1ec8009643b71875f395a9ac2c8e12a5b1efef33caf8a9e99a337c790d4354695c85352d11b62092ae372b5af62f78724363fcbf3504ff9a6ddca +DIST Python-3.8.2.tar.xz 17869888 BLAKE2B f42b35bea5e65f1f0a3fa6f1fd3d749fba3fa46d958608a314c1a98d0e3ca890e856da4d40ee489fe546fc02ce0fc9fa2daaaba96a8928d92ae7eb3d2dda3fe4 SHA512 ca37ad0e7c5845f5f228566aa8ff654a8f428c7d4a5aaabff29baebb0ca3219b31ba8bb2607f89e37cf3fc564f023b8407e53a4f2c47bd99122c1cc222613e37 DIST Python-3.9.0a2.tar.xz 17988748 BLAKE2B 3d6a6facacb49d8eeaf01c3194bad8e6c920bd03a8f50ac171016fd61288120dfa06af50583c647e5850b5965fc41e03515042ef1594ec4dcbf39794e999b61a SHA512 3f17869f3ca4db423f66e145e67c9fb4935d8c908c5362de585898343190edb901861701e27ab9187a287880ee42bbb4897aa298967c1862f44b12dbab19d412 +DIST Python-3.9.0a4.tar.xz 18032300 BLAKE2B 1c9ad55c7c055c3a704c4062e092d44b8d778e334e05589e7166777da328df54ef257aeb2e203416710bb9f9f1571d7700c2c12aed5b8e63adf7a1b3aedb08b5 SHA512 8f7ca0a891fb7e7868dfe5f040e9ceb7ce14d036bc5d9eae1493570c5a9631832e796a1972590c444d2347c585b0c8216345375dd1476b4da7bd47e187591afc DIST python-gentoo-patches-2.7.17-r1.tar.xz 14708 BLAKE2B f6e25236a471649de122d0f29506f7a4f34044a568ead47a68980411d9722b761fe1f9d653d5edccb6978b65c8c1eecbef55f403b94f32b37c0ad68e061505a8 SHA512 ecdde5e38c6fe5e69691fb3a68c8f4f43da7857d4abaff763d3cf6ad864ba43c769c03b186b60f2736a1ffb1e3e4c9982715d1b8a99ff3f5740096153bb8a90f DIST python-gentoo-patches-2.7.17.tar.xz 13476 BLAKE2B 788688e2941d2d6d4f768168881b2c3639213a97e214557b3a93f8db44d81e2b6d70be847b7462e54e3786660ebee4ee331402081d92167d74ad149279c3f389 SHA512 1641737635d33607a77ed2ee2462854cec603be39737de3f81abb188702aaf46f039d1616f9dcd413da1f4a8040175c66a2883e496132c2e4ebe8f860b36f9f1 DIST python-gentoo-patches-3.6.10.tar.xz 10964 BLAKE2B e32c8cb3050c7324ee234f585be7fc40cfacc6ad87759eaa300e57289e6dc6cbaed3913f33ad632b8754638e8d71983d8364ceeaad8ef325cfa6d4d2dfb56df0 SHA512 71fea7306c876c63888c4547eaf14dc2e0413dec343609d748cd1b5888e4605d47888758ebc5120a287ce833b69dd538073f91989460da7c40462b53eefca7ce @@ -20,12 +22,14 @@ DIST python-gentoo-patches-3.7.4-1.tar.xz 10100 BLAKE2B 63e8fada89b64b59ba083745 DIST python-gentoo-patches-3.7.6.tar.xz 10084 BLAKE2B 220869e85bdaf9c21b1b05e13803bdb6ecc22ac0f69da77e57fd7c1cd93ef45ec43401b62732842e1bb3467feb6d65c8204120e2741e9eb6f4cab673fd3a8d62 SHA512 4c04b0cf7da55fa7973ab178e3ac2c59bc2142924bdced5954c058053280b6c663d7c39912286d10fe0e82ca30af6a0dd6a56fa85433f836217ca3dcbb284def DIST python-gentoo-patches-3.8.1-r2.tar.xz 10108 BLAKE2B 02d3e2ae95b5cfa67c0ba4ff618fbee51d2342955d0a064b80575beda73902bd72462e4f6dba63743bf9fc031d92c69153ef8bd8a0ab5d6e17bfdf8ed0152da5 SHA512 757f7cf6b0cb6c1493d8ed8e5780780efcb32860a9aeba4f933a3a3fb22c412bebde8854e34609465d8a12cb9545a7b19e5d5dbe87d772bb83acd9fe829b75cc DIST python-gentoo-patches-3.9.0_alpha2.tar.xz 8340 BLAKE2B b93edca01fa46c8eb4e18e0d92c72a3e4ef8dcebf26c0e1c0fab4c82201645ed4c358cf2311c9eb454f6a261ab514985302f81fc86284d3714d662037928963c SHA512 58b0a64d8747f187e6cc4749dc660a443c066e43f509ecc2976b6406bbfb3851a03f686adc36bd58c7c3142a707a387ac25431ca078980914d2219c49a0f2202 -EBUILD python-2.7.17-r1.ebuild 10517 BLAKE2B ce184dd644b29acc45cae7a6549deb3826196e806ebcb1270d0f96637196e0873aa9dc10ef9ec4b42f4eb4f4519a12d3d6a64b61a09fe5c12c420ef0ed4739bc SHA512 9d8755c139741bfeb207227f9574668fe5f1e27c1c1cf342d7ddd90de12c019a98d3f0d13c24b8e1a989729de64ed988704d41ae95b05a1c8e74a742366d8c0d -EBUILD python-2.7.17.ebuild 10793 BLAKE2B 495f0ecb76a4f2b522efa58e2e0fe90f528d6ce00cd69e220c45fa341173e81d5f32b0df6c1c711e52ad55288d1dc1aca7a9079fb7bfaa52e5ab26b62f6f4b79 SHA512 434a86c8e869211c76210f92127288ec49a5bb82b0bda84f9d706e3d504a5e7c4f12ed80928c9d07adbfeded80ee40a877f42264f30e5b766cb2691d92b0a81f -EBUILD python-3.6.10.ebuild 10272 BLAKE2B 61f3c9b29c6ed9ab9139389a4388d9f14d671cdcb38e3257a693f2b2601b8807864405997ef2bffe5c9cecf2a41e0465e03a932409752236cec84af9a2a537a6 SHA512 bfd1dcc3ad3e502d3d0631fc346f3d6dd1c26031e635ee7e4968ad0706fe6fa83099d0781cff637b8c7358b41c4154a802586e26ea2bccc627d6178e5a0edfc0 -EBUILD python-3.6.9.ebuild 10161 BLAKE2B 96021ad77bbfce645b0a1679d1d6c07d3e6f90aae25ca319dc02b6a954758b25032b67b5228ba3da98a29c5a419e792d95a9a9c8ab01479b42750294ddf8ec86 SHA512 5f60fac8eeb4e8e4ff7d3b8d120ce82d3b6217fa4d9d8729f71759396cc46bc412b43412708c139717eb16bda8ee46401d98479336938fd6a68fb5ee741213c8 -EBUILD python-3.7.5-r1.ebuild 9739 BLAKE2B 8b6838dd4cf396e13c2646a04d8be9023ee70d82cf89220e0c1bb40eaaf1be4950c7098682072b14cd52fd030773450854d8e27112463b624db9098fe6fefd20 SHA512 6e47dd00d1faeee06a92fe7a86ef0facb9009b48d5916e354f1cd1ae5f019192128776d9aeee120ff13462913fc04b59c9ba19e4870c8d5b038157e3457d96c1 -EBUILD python-3.7.6.ebuild 9819 BLAKE2B a537a461f520bba579a67444cb7bf17af636ebbecba4f9043eb5ff0bafcb893b00090b3cc7554d14858fffceeb2684e95ca242baa2e38708920e2320cd56736b SHA512 25799241ad45b20c05870bf5d0a208b9fb77eb333ef1d56d51372a14ba52a709f96a9302690459dd64a71d62a531357503b8eb61b89263defa87d1d47c115f22 -EBUILD python-3.8.1.ebuild 9859 BLAKE2B 2afa3d8d8689148f90f7ec8244ccb2efd847c445f10a9062bedf14605385412a0be94d682a017108e357efca097043e6feec6ec3b1ef36daec1608eac94d991f SHA512 709804122850a6bb894e6e1d3d448e8eb47251a2ae8999e3577d6a8f6c16079b776fc81fd46abed3a6051b0821310ac04a3cc2eb10b01eab6f69a323d5b2e997 -EBUILD python-3.9.0_alpha2.ebuild 9353 BLAKE2B bf0e82e9b60870d51731d9560a761c394ca5db361ea45148df2401b3dc28ac2659deda6b46816ee7532a0876a47fafd5ada4b67ad1f1347ff4555aab0bf70b20 SHA512 e37a30460cd928a208e0b36b10befe7320bd711ee560ea2b629bab6ed647875f6a33e1070da47f3002e5086551b3ada65daf5180a5e6b7c70481b8b58bc213ed +EBUILD python-2.7.17-r1.ebuild 10510 BLAKE2B 17317cc2629445458c648b4f3323391738481ed740a887207989f4c2ed8d27d436760b1e88ad27a57b035cedb90a4303c08d8dcb3d866c752d9712bd1b66b8ef SHA512 81069c8873538bd57153d719f0ae56b11215bf9f144435bfb930037236eb6ece83837da8c11c8786ed38a53475bbe9da8b98aad4ed546dba5a4d9925d90de261 +EBUILD python-2.7.17.ebuild 10794 BLAKE2B d9aab08f9a72b5985e0a75d8caead6bfeac3698a3879fb0cbfbad96cf0cdafd3d44e6fef8efcb31333c686886fd7c69c30da0cb8727831a106b189da79040ef5 SHA512 bb42f8d6430b790ca9c563ca0f54981b4d12f5b2042a44ab334f5320a6c708f4cc400174cfaba2c71181372b8da1257c30b9f2b12454aa8a37345790fff3712a +EBUILD python-3.6.10.ebuild 10265 BLAKE2B 5b72f8a980ccf2c5204af3092e51cfdcf29d0c4a2fed792ddbd65601103f8c7f25f7bb3716dfb83854d5341facbdec49ccabdf9770cfeb252dd44fd4355ef32c SHA512 b8cfd24104a35639446aae6ed3ab0ab6a4f58ece1d30c04eb84acfa371d2190766aa01961fa6dc69d297cdb82f64c19b1f5cbfb1eac94a82c99781ad781c4e91 +EBUILD python-3.6.9.ebuild 10162 BLAKE2B 6e2a3bd8f7bcd4be99c8121b93e38f96ce37e8a05f493c06854b8d1c32980c3a350cadef6c9009abb114859552f49f395ddf14942fb1c8598be430a39273b41e SHA512 26391d8816fd5b027b6b9acaba9e274956a83e73f083e268ff7a31ab50995651954e1e752eb7b5b0d71571aae4ff9f9a52daf795c43ff4cbb7124a7cd77ab4a2 +EBUILD python-3.7.5-r1.ebuild 9740 BLAKE2B 1c436dd5c03f0d3ce191aca5a939635426df771b42b3cb2e93b2238fe5849ef187d0fb68208f66ea98275737a40e2d74c0ff939bcd092217783d02af8ca3cf3c SHA512 65406926f1ee75b42b923c0063c599bf9e919769c5cac793391eb1da9889f99bc9c18be060866f5a9b61ab1d0994c007a3b83d917ea8444ed676a53e5c9ee9a5 +EBUILD python-3.7.6.ebuild 9812 BLAKE2B 1927c23eaa4269f15b631a74c2387df34a053be54ca593c767859e590712026bf3eeea79fe93fb2bf403428068955ebbd6b2e5278ffca9bd71ca6193b7c5346f SHA512 b3c1ce69d90d793d326eb53018d0f2c6021b9b353fcf40662a9a0e3a5141777b008f281a5d5bba4635a842063c7a7a5a02f62b363a34280f76ff96c19f3ef30e +EBUILD python-3.8.1.ebuild 9860 BLAKE2B e0669333536ce1ad5863c4b5494df9a4900a9ac7e3d93a102bdc9f6e2f6b48774931ab67e45c8dce7a7e3187fdb7b90a79a2261dd6f47f340a4466394a8ccdad SHA512 de8cf4337c2d29d291a6c67f284fbf324b93617211e04b74b6b30972fb0ddbe8bf9fa36e987a110ed7d2001e4a5b02b815c361c3365f78734f9ae7bdcf8c3061 +EBUILD python-3.8.2.ebuild 9860 BLAKE2B ea4aa94066e9176ae47a522dcb3828f3e97ff787cccd42bdce17ffab9148e8e03f4ad5c149b3eeb61a23438ee5e8e2fb02ae9a873e981f05a432f7e97153d0b3 SHA512 3920e7a484ff8adaa5492a495addd6963ba7bf7a2009b42e796f69872b95ba93c20207556ba90bc15c4a31641181349010a5c24f6cd0baaa2d293b31a8584fe0 +EBUILD python-3.9.0_alpha2.ebuild 9354 BLAKE2B 9372d0dae28b541b2f5c37ffaad78eebab2676877efb05f7615faceae038c23fb04cd69580ac85cbfd84f91d26bb567233f27b0ce530a501e7fa1648e1b60142 SHA512 1c37b504a3fb97d63cbe4ec34f0866fdb109cdd6df04a3549eef1f36786cc03d25036123d7404e241102a7139b24f508bad4e74497721ce2c3a137210bde968b +EBUILD python-3.9.0_alpha4.ebuild 9361 BLAKE2B f19d9c9c1becab883e621787b3042eda1983a253a1171ae8880d7b2a026ae9bd8c42f69c4471ea95eba46fa33b0307572b04a4c6bf7c560ce7b6832d754b7094 SHA512 073583326a6f12bb0649a76b2cbedc2f093a7618dc6a26f7bad205dc16860edb85fea68e3b0a1f4b11846e9095d884d578b600bcbd41b2d4e80e67c195b48d48 MISC metadata.xml 819 BLAKE2B 120c7c65d77488e726c5a0f4aa19469867ea6900e747169fae2f9cf8f14ec2936089d5edfe1935ce610bec26387273e261b1cc4b023680c8c4b229f2141a7223 SHA512 08f45707e5490067a21951b9d37c8ae67064ab67cccc5b8d8c204eab8d4a004fb910627b62989c67b849b89d301618f8f8f7996e99e1ef5bab38a239c49c124d diff --git a/dev-lang/python/python-2.7.17-r1.ebuild b/dev-lang/python/python-2.7.17-r1.ebuild index 912858618a15..041f5ff8e9cd 100644 --- a/dev-lang/python/python-2.7.17-r1.ebuild +++ b/dev-lang/python/python-2.7.17-r1.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="PSF-2" SLOT="${PYVER}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86" IUSE="-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml" # Do not add a dependency on dev-lang/python to this ebuild. @@ -27,9 +27,9 @@ IUSE="-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl # patchset. See bug 447752. RDEPEND="app-arch/bzip2:= + dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= - virtual/libffi:= virtual/libintl berkdb? ( || ( sys-libs/db:5.3 diff --git a/dev-lang/python/python-2.7.17.ebuild b/dev-lang/python/python-2.7.17.ebuild index b44d2e9922b5..52061f5125f2 100644 --- a/dev-lang/python/python-2.7.17.ebuild +++ b/dev-lang/python/python-2.7.17.ebuild @@ -25,8 +25,8 @@ IUSE="-berkdb bluetooth build doc elibc_uclibc examples gdbm hardened ipv6 libre # patchset. See bug 447752. RDEPEND="app-arch/bzip2:0= + dev-libs/libffi:= >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= virtual/libintl berkdb? ( || ( sys-libs/db:5.3 diff --git a/dev-lang/python/python-3.6.10.ebuild b/dev-lang/python/python-3.6.10.ebuild index df29d36f4f4f..91d18edf3fbe 100644 --- a/dev-lang/python/python-3.6.10.ebuild +++ b/dev-lang/python/python-3.6.10.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="PSF-2" SLOT="${PYVER}/${PYVER}m" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86" IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml" RESTRICT="!test? ( test )" @@ -29,9 +29,9 @@ RESTRICT="!test? ( test )" RDEPEND="app-arch/bzip2:= app-arch/xz-utils:= + dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= - virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) diff --git a/dev-lang/python/python-3.6.9.ebuild b/dev-lang/python/python-3.6.9.ebuild index 3f17e399f1c6..bd7684dfc7fe 100644 --- a/dev-lang/python/python-3.6.9.ebuild +++ b/dev-lang/python/python-3.6.9.ebuild @@ -27,8 +27,8 @@ RESTRICT="!test? ( test )" RDEPEND="app-arch/bzip2:0= app-arch/xz-utils:0= + dev-libs/libffi:= >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) diff --git a/dev-lang/python/python-3.7.5-r1.ebuild b/dev-lang/python/python-3.7.5-r1.ebuild index 8a7befb7bcfc..96894e93b7f3 100644 --- a/dev-lang/python/python-3.7.5-r1.ebuild +++ b/dev-lang/python/python-3.7.5-r1.ebuild @@ -27,9 +27,9 @@ RESTRICT="!test? ( test )" RDEPEND="app-arch/bzip2:0= app-arch/xz-utils:0= + dev-libs/libffi:= sys-apps/util-linux:0= >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) diff --git a/dev-lang/python/python-3.7.6.ebuild b/dev-lang/python/python-3.7.6.ebuild index 64583600c824..415eea5f2d12 100644 --- a/dev-lang/python/python-3.7.6.ebuild +++ b/dev-lang/python/python-3.7.6.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="PSF-2" SLOT="${PYVER}/${PYVER}m" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86" IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml" RESTRICT="!test? ( test )" @@ -29,10 +29,10 @@ RESTRICT="!test? ( test )" RDEPEND="app-arch/bzip2:= app-arch/xz-utils:= + dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= - virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) diff --git a/dev-lang/python/python-3.8.1.ebuild b/dev-lang/python/python-3.8.1.ebuild index e91a356a27bd..b499fa145ea8 100644 --- a/dev-lang/python/python-3.8.1.ebuild +++ b/dev-lang/python/python-3.8.1.ebuild @@ -29,10 +29,10 @@ RESTRICT="!test? ( test )" RDEPEND="app-arch/bzip2:= app-arch/xz-utils:= + dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= - virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) diff --git a/dev-lang/python/python-3.8.2.ebuild b/dev-lang/python/python-3.8.2.ebuild new file mode 100644 index 000000000000..0960b3a64978 --- /dev/null +++ b/dev-lang/python/python-3.8.2.ebuild @@ -0,0 +1,343 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs + +MY_P="Python-${PV}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-3.8.1-r2" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE="https://www.python.org/" +SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" +IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml" +RESTRICT="!test? ( test )" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND="app-arch/bzip2:= + app-arch/xz-utils:= + dev-libs/libffi:= + sys-apps/util-linux:= + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= + virtual/libintl + gdbm? ( sys-libs/gdbm:=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( >=sys-libs/readline-4.1:= ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( + !libressl? ( dev-libs/openssl:= ) + libressl? ( dev-libs/libressl:= ) + ) + tk? ( + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= + dev-tcltk/tix + ) + xml? ( >=dev-libs/expat-2.1:= )" +# bluetooth requires headers from bluez +DEPEND="${RDEPEND} + bluetooth? ( net-wireless/bluez ) + test? ( app-arch/xz-utils[extra-filters(+)] ) + virtual/pkgconfig + !sys-devel/gcc[libffi(-)]" +RDEPEND+=" !build? ( app-misc/mime-types )" +PDEPEND=">=app-eselect/eselect-python-20140125-r1" + +src_prepare() { + # Ensure that internal copies of expat, libffi and zlib are not used. + rm -fr Modules/expat || die + rm -fr Modules/_ctypes/libffi* || die + rm -fr Modules/zlib || die + + local PATCHES=( + "${WORKDIR}/${PATCHSET}" + ) + + default + + sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ + setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + + eautoreconf +} + +src_configure() { + local disable + # disable automagic bluetooth headers detection + use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + export PYTHON_DISABLE_MODULES="${disable}" + + if ! use xml; then + ewarn "You have configured Python without XML support." + ewarn "This is NOT a recommended configuration as you" + ewarn "may face problems parsing any XML documents." + fi + + if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then + einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" + fi + + if [[ "$(gcc-major-version)" -ge 4 ]]; then + append-flags -fwrapv + fi + + filter-flags -malign-double + + # https://bugs.gentoo.org/show_bug.cgi?id=50309 + if is-flagq -O3; then + is-flagq -fstack-protector-all && replace-flags -O3 -O2 + use hardened && replace-flags -O3 -O2 + fi + + # https://bugs.gentoo.org/700012 + if is-flagq -flto || is-flagq '-flto=*'; then + append-cflags $(test-flags-CC -ffat-lto-objects) + fi + + # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. + tc-export CXX + + # Set LDFLAGS so we link modules with -lpython3.2 correctly. + # Needed on FreeBSD unless Python 3.2 is already installed. + # Please query BSD team before removing this! + append-ldflags "-L." + + # Fix implicit declarations on cross and prefix builds. Bug #674070. + use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw + + local dbmliborder + if use gdbm; then + dbmliborder+="${dbmliborder:+:}gdbm" + fi + + local myeconfargs=( + --enable-shared + $(use_enable ipv6) + --infodir='${prefix}/share/info' + --mandir='${prefix}/share/man' + --with-computed-gotos + --with-dbmliborder="${dbmliborder}" + --with-libc= + --enable-loadable-sqlite-extensions + --without-ensurepip + --with-system-expat + --with-system-ffi + ) + + OPT="" econf "${myeconfargs[@]}" +} + +src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + + emake CPPFLAGS= CFLAGS= LDFLAGS= + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E python + else + pax-mark m python + fi +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + # Skip failing tests. + local skipped_tests="gdb" + + for test in ${skipped_tests}; do + mv "${S}"/Lib/test/test_${test}.py "${T}" + done + + # bug 660358 + local -x COLUMNS=80 + + local -x PYTHONDONTWRITEBYTECODE= + + emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local result=$? + + for test in ${skipped_tests}; do + mv "${T}/test_${test}.py" "${S}"/Lib/test + done + + elog "The following tests have been skipped:" + for test in ${skipped_tests}; do + elog "test_${test}.py" + done + + elog "If you would like to run them, you may:" + elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'" + elog "and run the tests separately." + + if [[ ${result} -ne 0 ]]; then + die "emake test failed" + fi +} + +src_install() { + local libdir=${ED}/usr/lib/python${PYVER} + + emake DESTDIR="${D}" altinstall + + # Remove static library + rm "${ED}"/usr/$(get_libdir)/libpython*.a || die + + sed \ + -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ + -e "s/\(PY_LDFLAGS=\).*/\1/" \ + -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed" + + # Fix collisions between different slots of Python. + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die + + # Cheap hack to get version with ABIFLAGS + local abiver=$(cd "${ED}/usr/include"; echo python*) + if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm + rm "${ED}/usr/bin/python${PYVER}" || die + dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" + fi + + # python seems to get rebuilt in src_install (bug 569908) + # Work around it for now. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E "${ED}/usr/bin/${abiver}" + else + pax-mark m "${ED}/usr/bin/${abiver}" + fi + + use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die + use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die + + use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die + + dodoc Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + docinto examples + find Tools -name __pycache__ -exec rm -fr {} + || die + dodoc -r Tools + fi + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 + local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ + emake --no-print-directory -s -f - 2>/dev/null) + newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + # for python-exec + local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) + + # if not using a cross-compiler, use the fresh binary + if ! tc-is-cross-compiler; then + local -x PYTHON=./python + local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} + else + vars=( PYTHON "${vars[@]}" ) + fi + + python_export "python${PYVER}" "${vars[@]}" + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_domodule epython.py + + # python-exec wrapping support + local pymajor=${PYVER%.*} + mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" \ + "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die + ln -s "python${pymajor}" "${D}${PYTHON_SCRIPTDIR}/python" || die + # python-config and pythonX-config + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" \ + "${D}${PYTHON_SCRIPTDIR}/python-config" || die + # 2to3, pydoc + ln -s "../../../bin/2to3-${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/idle" || die + fi +} + +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then + python_updater_warning="1" + fi +} + +eselect_python_update() { + if [[ -z "$(eselect python show)" || \ + ! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then + eselect python update + fi + + if [[ -z "$(eselect python show --python${PV%%.*})" || \ + ! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]] + then + eselect python update --python${PV%%.*} + fi +} + +pkg_postinst() { + eselect_python_update + + if [[ "${python_updater_warning}" == "1" ]]; then + ewarn "You have just upgraded from an older version of Python." + ewarn + ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." + fi +} + +pkg_postrm() { + eselect_python_update +} diff --git a/dev-lang/python/python-3.9.0_alpha2.ebuild b/dev-lang/python/python-3.9.0_alpha2.ebuild index 8ed8cafbc9e3..008fa25cdf65 100644 --- a/dev-lang/python/python-3.9.0_alpha2.ebuild +++ b/dev-lang/python/python-3.9.0_alpha2.ebuild @@ -30,10 +30,10 @@ RESTRICT="!test? ( test )" RDEPEND="app-arch/bzip2:= app-arch/xz-utils:= + dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= - virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) diff --git a/dev-lang/python/python-3.9.0_alpha4.ebuild b/dev-lang/python/python-3.9.0_alpha4.ebuild new file mode 100644 index 000000000000..77a4321ff044 --- /dev/null +++ b/dev-lang/python/python-3.9.0_alpha4.ebuild @@ -0,0 +1,324 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools check-reqs flag-o-matic pax-utils python-utils-r1 \ + toolchain-funcs + +MY_P="Python-${PV/_alpha/a}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-3.9.0_alpha2" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE="https://www.python.org/" +SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" +IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml" +RESTRICT="!test? ( test )" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND="app-arch/bzip2:= + app-arch/xz-utils:= + dev-libs/libffi:= + sys-apps/util-linux:= + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= + virtual/libintl + gdbm? ( sys-libs/gdbm:=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( >=sys-libs/readline-4.1:= ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( + !libressl? ( dev-libs/openssl:= ) + libressl? ( dev-libs/libressl:= ) + ) + tk? ( + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= + dev-tcltk/tix + ) + xml? ( >=dev-libs/expat-2.1:= )" +# bluetooth requires headers from bluez +DEPEND="${RDEPEND} + bluetooth? ( net-wireless/bluez ) + test? ( app-arch/xz-utils[extra-filters(+)] ) + virtual/pkgconfig + !sys-devel/gcc[libffi(-)]" +RDEPEND+=" !build? ( app-misc/mime-types )" +PDEPEND=">=app-eselect/eselect-python-20140125-r1" + +# large file tests involve a 2.5G file being copied (duplicated) +CHECKREQS_DISK_BUILD=5500M + +pkg_pretend() { + use test && check-reqs_pkg_pretend + + ewarn "This is an early developer preview of Python 3.9. New features" + ewarn "can still be added up to 2020-05-18. It's not suitable for production" + ewarn "use, and it is not supported for Gentoo packages." +} + +pkg_setup() { + use test && check-reqs_pkg_setup +} + +src_prepare() { + # Ensure that internal copies of expat, libffi and zlib are not used. + rm -fr Modules/expat || die + rm -fr Modules/_ctypes/libffi* || die + rm -fr Modules/zlib || die + + local PATCHES=( + "${WORKDIR}/${PATCHSET}" + ) + + default + + sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ + setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + + eautoreconf +} + +src_configure() { + local disable + # disable automagic bluetooth headers detection + use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + export PYTHON_DISABLE_MODULES="${disable}" + + if ! use xml; then + ewarn "You have configured Python without XML support." + ewarn "This is NOT a recommended configuration as you" + ewarn "may face problems parsing any XML documents." + fi + + if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then + einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" + fi + + if [[ "$(gcc-major-version)" -ge 4 ]]; then + append-flags -fwrapv + fi + + filter-flags -malign-double + + # https://bugs.gentoo.org/show_bug.cgi?id=50309 + if is-flagq -O3; then + is-flagq -fstack-protector-all && replace-flags -O3 -O2 + use hardened && replace-flags -O3 -O2 + fi + + # https://bugs.gentoo.org/700012 + if is-flagq -flto || is-flagq '-flto=*'; then + append-cflags $(test-flags-CC -ffat-lto-objects) + fi + + # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. + tc-export CXX + + # Set LDFLAGS so we link modules with -lpython3.2 correctly. + # Needed on FreeBSD unless Python 3.2 is already installed. + # Please query BSD team before removing this! + append-ldflags "-L." + + # Fix implicit declarations on cross and prefix builds. Bug #674070. + use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw + + local dbmliborder + if use gdbm; then + dbmliborder+="${dbmliborder:+:}gdbm" + fi + + local myeconfargs=( + --enable-shared + $(use_enable ipv6) + --infodir='${prefix}/share/info' + --mandir='${prefix}/share/man' + --with-computed-gotos + --with-dbmliborder="${dbmliborder}" + --with-libc= + --enable-loadable-sqlite-extensions + --without-ensurepip + --with-system-expat + --with-system-ffi + ) + + OPT="" econf "${myeconfargs[@]}" +} + +src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + + emake CPPFLAGS= CFLAGS= LDFLAGS= + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E python + else + pax-mark m python + fi +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + # Skip failing tests. + local skipped_tests="gdb" + + for test in ${skipped_tests}; do + mv "${S}"/Lib/test/test_${test}.py "${T}" + done + + # bug 660358 + local -x COLUMNS=80 + + local -x PYTHONDONTWRITEBYTECODE= + + emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local result=$? + + for test in ${skipped_tests}; do + mv "${T}/test_${test}.py" "${S}"/Lib/test + done + + elog "The following tests have been skipped:" + for test in ${skipped_tests}; do + elog "test_${test}.py" + done + + elog "If you would like to run them, you may:" + elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'" + elog "and run the tests separately." + + if [[ ${result} -ne 0 ]]; then + die "emake test failed" + fi +} + +src_install() { + local libdir=${ED}/usr/lib/python${PYVER} + + emake DESTDIR="${D}" altinstall + + # Remove static library + rm "${ED}"/usr/$(get_libdir)/libpython*.a || die + + sed \ + -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ + -e "s/\(PY_LDFLAGS=\).*/\1/" \ + -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed" + + # Fix collisions between different slots of Python. + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die + + # Cheap hack to get version with ABIFLAGS + local abiver=$(cd "${ED}/usr/include"; echo python*) + if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm + rm "${ED}/usr/bin/python${PYVER}" || die + dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" + fi + + # python seems to get rebuilt in src_install (bug 569908) + # Work around it for now. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E "${ED}/usr/bin/${abiver}" + else + pax-mark m "${ED}/usr/bin/${abiver}" + fi + + use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die + use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die + + dodoc Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + docinto examples + find Tools -name __pycache__ -exec rm -fr {} + || die + dodoc -r Tools + fi + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 + local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ + emake --no-print-directory -s -f - 2>/dev/null) + newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + # for python-exec + local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) + + # if not using a cross-compiler, use the fresh binary + if ! tc-is-cross-compiler; then + local -x PYTHON=./python + local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} + else + vars=( PYTHON "${vars[@]}" ) + fi + + python_export "python${PYVER}" "${vars[@]}" + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_domodule epython.py + + # python-exec wrapping support + local pymajor=${PYVER%.*} + mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" \ + "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die + ln -s "python${pymajor}" "${D}${PYTHON_SCRIPTDIR}/python" || die + # python-config and pythonX-config + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" \ + "${D}${PYTHON_SCRIPTDIR}/python-config" || die + # 2to3, pydoc + ln -s "../../../bin/2to3-${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/idle" || die + fi +} diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest index a042a82d5ad4..371ff7becd61 100644 --- a/dev-lang/ruby/Manifest +++ b/dev-lang/ruby/Manifest @@ -17,8 +17,8 @@ DIST ruby-2.4.9.tar.xz 10078316 BLAKE2B ad83adf6b884a9a36e83cc754077f706afa221a9 DIST ruby-2.5.7.tar.xz 11296440 BLAKE2B 6f3590f30c7b196145a83490abed24b0059521374a03086646186b20670bfed548ea744c910c8eda0d11607d8673644d7fb23ff9091dd2f6dfcbc43080fe0f97 SHA512 63b7c75fab44cd1bd22f22ddec00c740cf379ac7240da0dfafcec54347766695faef47428ce1c433fd77fa96992e976c984697067fa526236d383b12adc9ce75 DIST ruby-2.6.5.tar.xz 11553580 BLAKE2B 07739a92ff17467fe6d31bb4dce56ae35fd9c67bb697ebc00b4845474c75d8377c77916e6e129512cfffcf76bd60e6327e818e899b6160f3222912654d5eb118 SHA512 e8ae3b5d4d23a93d0ef6057235ad0e573665a8b4b6544e1c70b4cce9c4d2fb9094e5c8fe8a9ab7b9996efe3ada603f9b4ef1fd08fb5a83253c1ae2b5e3f202db DIST ruby-2.7.0.tar.xz 11990900 BLAKE2B 0f4969780618979190a92ca317963f825d854ecb437e7031cb7848b04bc9cb9532145968e33f5b8022449bccd1b0828b87a0ed0c0a09b182e2484d0811975a0d SHA512 dd5690c631bf3a2b76cdc06902bcd76a89713a045e136debab9b8a81ff8c433bbb254aa09e4014ca1cf85a69ff4bcb13de11da5e40c224e7268be43ef2194af7 -EBUILD ruby-2.4.9.ebuild 6538 BLAKE2B 27e3cab604a3afa6129afeedf219953602e03575d5a2ecd6934418d44db62bcd50b2ff906e95c7e0f72f6bfc692d301ef0fdbd07f665c4ecd27f50f63082c345 SHA512 7b98735b5cae59e8fb0ab5b5a696f19f85b6d845c2c9bcf4424157c09e2b716efe6f4c4f3f771c618d4faade6ffa66772f525ec03b4519b869d626e0a82d250b -EBUILD ruby-2.5.7.ebuild 6326 BLAKE2B 1a40de5fbe591edca8f3614df2299cc04c290cec1f5bcd328ce95752727523bb255c0e8796ac8bae84a61533117fe38f4b2e7aedd1309451bc950582b688aea6 SHA512 db41c5e9955db491aef8eac0de06b1de41dc5cdbb9d0f03e010761c6b45b0cdf1daf09d3bf9d027cd4d448fe531e2c3c414b34db62fdeba4e65681b2a818c028 -EBUILD ruby-2.6.5.ebuild 6749 BLAKE2B f4302b035fb22dbd28d6e09b9e5c5489ec0b261e05cfdec070b976a2b1c586f03dbaf71493ac7f4a4f9d9c9f25d216b778c7bea2fe2553406d6b3e19ca9acf6a SHA512 1f103835b19b0e2eaad6962ba8866d15cafdfa88ff6d6ea23774844224571fa5884d32a169bc9eb8a7549b4914b497cccd1c142f57598a2cb43df8c6de3bbf5f -EBUILD ruby-2.7.0.ebuild 6875 BLAKE2B 2d1a6565e0bb8c63ffc9aa6c653263aaceb43de12e39c177cddfde992f8d2193322f0bacf6ba752c53b492cdd817b030421fa6a9d19498f98c4e543074949b25 SHA512 362cdc9e7c820f08bdf0a9067f6ad02b779fdf50756dc461120da6b49d71cbaad19a1aac51721037b8cf6a3f6a7aabdad1ed60e93572823af72accea81319f7a +EBUILD ruby-2.4.9.ebuild 6496 BLAKE2B dc4ed619947877f8de54219f13ffdcf78ecbfe6a9e3d28daa3c18085011db0290afe548f08aecb51cb5ddb87ab518f2b2d2336d4cdc68e76b03291c7b2f2ea90 SHA512 ba9883b77f626d837d96d60c24346c1152ecf3d979bde0db5b95bee60b05ebedc9f4051cca23d3d48f3a9558cae55ef5347b4cbf967e6916474ec4506c095842 +EBUILD ruby-2.5.7.ebuild 6284 BLAKE2B bfc70607164302843f9d34d4d3030a4d6ad193fa0827d2c9f83a90ded89e2be1b62605b9af7b09921c831f0e33f7c97f6f0b37ff8d9fe6678461496f66f4de79 SHA512 381811a88455ec77b632c1e978cbe99ad2b9e9028f9902312f358950bdd9fdba076e334134203d1b32528a348f94e101b46366ddab813e53caeb5b5370be53b7 +EBUILD ruby-2.6.5.ebuild 6707 BLAKE2B 3a20a3004f330e76559b4c7eb015cb8917f44f68a202d6b35d0b34769406e9e0a3f61f555550451c5994d8fc49d5ef17bdefff270c3d470933f411814b179102 SHA512 172ebec80945dde8f811db78c2d46af43504a469e32b8ae029841fcb49c7b017074377e950800aa61374010556d1b1a55055b2f2f9ea2aa96bef479d43e0b7f2 +EBUILD ruby-2.7.0.ebuild 6833 BLAKE2B 0732f273ce899e76ceeb3eb3227441547f7c40f62c638256c1ec77b860614c5afa7a6ee20ed0a676364fbca1b8d92be8d596724228e2e32bbd11ade8b79deb9a SHA512 90dbbac46782a70683f12c6f149c0fdae310279e9156a3581f5b6207fec6f31c8d6d26de237005b0cc3f8dbb03ea389782f3eb9305949621c61cfba20a7d83cb MISC metadata.xml 445 BLAKE2B c3b5fae44894da3c78d024a376522aa2ef486cd9435351ddd7fa8b7c9afdc36969251a3b043d5890a368616f0736ae80e2a65a7342b327f30eb3497c5c02d28a SHA512 3818ac938dd6f8a05e18662f83af542fb29af00a476362592afa86bc537a74ddd0abe275784340539b2cd38f97ad1fce8b8c427c65d61c05a90b2118f2d16a91 diff --git a/dev-lang/ruby/ruby-2.4.9.ebuild b/dev-lang/ruby/ruby-2.4.9.ebuild index 8bc38c17be47..a50be1bcc732 100644 --- a/dev-lang/ruby/ruby-2.4.9.ebuild +++ b/dev-lang/ruby/ruby-2.4.9.ebuild @@ -34,7 +34,7 @@ RDEPEND=" dev-lang/tk:0=[threads] ) dev-libs/libyaml - virtual/libffi:= + dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20161226 @@ -129,7 +129,6 @@ src_configure() { INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \ --program-suffix=${MY_SUFFIX} \ --with-soname=ruby${MY_SUFFIX} \ - --docdir=${EPREFIX}/usr/share/doc/${P} \ --enable-shared \ --enable-pthread \ --disable-rpath \ diff --git a/dev-lang/ruby/ruby-2.5.7.ebuild b/dev-lang/ruby/ruby-2.5.7.ebuild index a0b7f3713ffc..afecac45abe4 100644 --- a/dev-lang/ruby/ruby-2.5.7.ebuild +++ b/dev-lang/ruby/ruby-2.5.7.ebuild @@ -34,7 +34,7 @@ RDEPEND=" dev-lang/tk:0=[threads] ) dev-libs/libyaml - virtual/libffi:= + dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20171225 @@ -124,7 +124,6 @@ src_configure() { INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \ --program-suffix=${MY_SUFFIX} \ --with-soname=ruby${MY_SUFFIX} \ - --docdir=${EPREFIX}/usr/share/doc/${P} \ --enable-shared \ --enable-pthread \ --disable-rpath \ diff --git a/dev-lang/ruby/ruby-2.6.5.ebuild b/dev-lang/ruby/ruby-2.6.5.ebuild index 563576964c50..0c21ba4a05f3 100644 --- a/dev-lang/ruby/ruby-2.6.5.ebuild +++ b/dev-lang/ruby/ruby-2.6.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -35,7 +35,7 @@ RDEPEND=" dev-lang/tk:0=[threads] ) dev-libs/libyaml - virtual/libffi:= + dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20171225 @@ -127,7 +127,6 @@ src_configure() { INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \ --program-suffix=${MY_SUFFIX} \ --with-soname=ruby${MY_SUFFIX} \ - --docdir=${EPREFIX}/usr/share/doc/${P} \ --enable-shared \ --enable-pthread \ --disable-rpath \ diff --git a/dev-lang/ruby/ruby-2.7.0.ebuild b/dev-lang/ruby/ruby-2.7.0.ebuild index 99daef051964..a19fc97ffdf1 100644 --- a/dev-lang/ruby/ruby-2.7.0.ebuild +++ b/dev-lang/ruby/ruby-2.7.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -35,7 +35,7 @@ RDEPEND=" dev-lang/tk:0=[threads] ) dev-libs/libyaml - virtual/libffi:= + dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20171225 @@ -130,7 +130,6 @@ src_configure() { INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \ --program-suffix=${MY_SUFFIX} \ --with-soname=ruby${MY_SUFFIX} \ - --docdir=${EPREFIX}/usr/share/doc/${P} \ --enable-shared \ --enable-pthread \ --disable-rpath \ diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest index 5a9b5e696031..2f3f65137454 100644 --- a/dev-lang/rust-bin/Manifest +++ b/dev-lang/rust-bin/Manifest @@ -68,9 +68,24 @@ DIST rust-1.41.0-powerpc64le-unknown-linux-gnu.tar.xz 110799904 BLAKE2B c89548ec DIST rust-1.41.0-s390x-unknown-linux-gnu.tar.xz 115153476 BLAKE2B 1646b42f5a2001f63b653c59d5e30d1b6c9f3a8c2d2d07a779cc530242fee1f5e92ae8dc1af2a81c57f93d615ad519d40ec6f5ceea79e56048ccae7a37d4a5ba SHA512 458b9877bf2569e6e3a0a6692228d4dda68506336587880f6a51254bab5cbb60c5f82673b0d44842137a426411f25146c08447f22e1a5b883dee99f52e30aeb0 DIST rust-1.41.0-x86_64-unknown-linux-gnu.tar.xz 111122952 BLAKE2B e1380cf72c8db8279c7b0d4349f09efb040117b1ca70ed599cd5197c6c8a257a846213db372e5b2df93ee266124a8a410e348dc8d5502a537a9b86159afe7bbb SHA512 1f08ba8b82ee17e4ae8130a092913767bd448a580efa4eb06ca2c926234efc72d9b73e2b846102296b80e324697c0ac6f5d3768fbd159d49d248f307efc244ff DIST rust-1.41.0-x86_64-unknown-linux-musl.tar.xz 96497736 BLAKE2B 3a193cc6d607891c2c7800498dc499d13bc50ce1249cb553271ab3eef69ea8e309f5048bfca9470c61056469a933824527002d5cc3f10f2ef1aea5519226710a SHA512 bcffacbb48b1d76cbf2951e7233951d6d58c4696f13b3ae616ca661bd8c20ebefd9420c494327d91999b76a34a6afe957281187e8fb5ce9cb968a3cfa8c23ea8 -EBUILD rust-bin-1.37.0.ebuild 5454 BLAKE2B 1926d0a074562293290828d49ed14590bc02ae7b481effe961837fd943e7485ecec2c0cab25d93ae66c3e3743127d9da6ad2b0019af48c5c2ddc59ef344692b0 SHA512 bad580b63b3d385d96d4718f71b64e6421dc60c5fa077046e0a7933ed795270f66d9dad87226cbcf8fc1e2d116bc5d5ddaa0311f88c45c75e84bb341a191b387 -EBUILD rust-bin-1.38.0.ebuild 5463 BLAKE2B a5f69dc7e6e25f6d67620a2dceaa31d81a6f9ab4e4d7f4bb7c99b42eaef8bc62e83dc1137ac6afb3dbd03230dd952a40cb27daac7b8c68fd34e2f4179072719b SHA512 5841672a1dc47e5309aee052c70b0fecd35865f4db4b5cb9e46e7e99004d24f077d273d097f9da46e904ec7590c182c7e0c59e96fce856644b2bded13165e32f -EBUILD rust-bin-1.39.0.ebuild 5458 BLAKE2B bf27aa76509ed5b56a6f911b39ca2e2a97650f7a01392f792bf1953db9d6fd4238c1f054e45755a5b8c220598566a0269a0d97e46288a1b7703a9e9e17cf9616 SHA512 ead09fcc84e799fe235a829d28c8998bde0e0eddafa6e980b6c920668c9c1b3575fb798daa324e8f91c2a908520e4785e35dae218f2afaaa06f16f12e4c3134a -EBUILD rust-bin-1.40.0.ebuild 5463 BLAKE2B a5f69dc7e6e25f6d67620a2dceaa31d81a6f9ab4e4d7f4bb7c99b42eaef8bc62e83dc1137ac6afb3dbd03230dd952a40cb27daac7b8c68fd34e2f4179072719b SHA512 5841672a1dc47e5309aee052c70b0fecd35865f4db4b5cb9e46e7e99004d24f077d273d097f9da46e904ec7590c182c7e0c59e96fce856644b2bded13165e32f -EBUILD rust-bin-1.41.0.ebuild 5460 BLAKE2B b5b5aeb1533060ad21e0dfe72cc6255083bdf3099c86450cab81d419254e0025a27a72472bdd14e7e370f680980b4fe5068c921975aec29394848e159a24dfc0 SHA512 5211d8f6918cb3335c870ac822114a04e8d22255322a6468bc0b6fef76528e9e92f9ddc6cafb658040d3564ea6dc7c23537364a41608cbfbad82c3dac5dacfa3 +DIST rust-1.41.1-aarch64-unknown-linux-gnu.tar.xz 96755608 BLAKE2B f8635737089bb028cfac6d6478c4226a78c2c8a8aa12f28cba267744e2e915e062f49edb505f26b6deaeca0d2fdb4ec4b83e791f87bf1eab6c0536dc41e2c641 SHA512 54eac5c380b418c1714931ead7d6284b225bb427fcc501e147240000b71d31b667e308aea7f38f3299b1311ab04f19011b914d37a4581c7a64028965569cd58e +DIST rust-1.41.1-arm-unknown-linux-gnueabi.tar.xz 98856136 BLAKE2B dbb3996a9ae302290886bf1cd4642d99a9b3f883f9d39817bb15f105565147e416e23d19e0d08314b08ed441f1ac528c20d8bee27ccef68cb585d8ef64a19e45 SHA512 1b01acd430af3cf99d838aa367dec4f6e4bfcec91388d4a2323cd781d53246edae0f14687b087b73b87c349f243e3acabe193538ce31303f07d59c6a03c31565 +DIST rust-1.41.1-arm-unknown-linux-gnueabihf.tar.xz 99107336 BLAKE2B 0dd84e7ad6081b8fdcfcb2691496ed3a493e08db4757e6d3bb2aa9a36fc6f020772a84bc21d0c60efeecf635512f25737b8d6b49a53020c4045c89c5b89881d7 SHA512 462e6d354a4b3b848781bb059decc5eb1ebb4d8a31651623d076a2654e2c8fd02f0f87ddafb124efa40cb134c9438eb252035c2b5bfdf936881b14a23bfbfe9f +DIST rust-1.41.1-armv7-unknown-linux-gnueabihf.tar.xz 103399676 BLAKE2B da35342be05e58c11e6f96ab566b6a2f334d6975d4251deb2f41069d4a549ebf58aba43e1f07b99dedf0426ab0a8e8616b32799ca54a5f601d70910deca3efaf SHA512 400bf8d013fe5030243bc0ccb7066ea3d03a2c10727e04b6830ab91dfe9b04f78cfef10794a1c7bb6276fb00c86f1e1c42a74faba19f3125859b3464726d01c2 +DIST rust-1.41.1-i686-unknown-linux-gnu.tar.xz 120834812 BLAKE2B 4615eeb7c63392f66487243743fc57677654e232c786f9f970a9be9996dcb08e265631f6764e09e0444f8bb767b9c76366a26fe8fca9dcc149c81df5c2a3dd18 SHA512 c6d74b2653c537043eb2ea721095ff053def592b4c330bdc104690cfb51d648f515288cc0451743d94260f18a55d6757bcb8eb1e6c0217da3498d08b681ca6af +DIST rust-1.41.1-mips-unknown-linux-gnu.tar.xz 92620720 BLAKE2B dff1be71d459e0256a19fb88f324e59cbf2e10fda693157802a63a08329c7dd4feca4b260510b3a1d6afb4afc9ed9dc549b741f598f3aedf50a982810d0bd140 SHA512 4fdca72b98a4fd25a2ddf33e0f31d9549c39fae9dfad6f1648556f144f82cfb2a487f6777d61476ad18bb0a0ac63810b99bb09a18719ec5344e89fccb16ac693 +DIST rust-1.41.1-mips64-unknown-linux-gnuabi64.tar.xz 96215100 BLAKE2B c52d564010d56df01bac6b2f447d56c00855c52ed8ebe6a2ac1b7786e8c73a1d529be7e7d5a4f7b427892494782aadcc4c8cc54157287d43f58938b0a57486c6 SHA512 2ed84ade11c6f4961e83e06a61d998a7abc9165cc384cc69470658e8244dc399e30c3f983a9f11b0bf88032d855bc47fe6d71f5db95cc7168e6f810c69095633 +DIST rust-1.41.1-mipsel-unknown-linux-gnu.tar.xz 93365592 BLAKE2B cd0d16f99a0976076530fa601f9bfeb61e1204bc278f78db015bc8d1629ce8f19da61a12573fdf9cf0d3d29e56f6915338aeaea3ef4d9b374eeb4095189fe71c SHA512 a0b7cc55ffeb0911d1d82d93cf2f4ea2a683ee76a783952b2f42c0b3c3d02b2bfc7df6f5762af91e6d02963e22a08ba26f143f594dfd6d41ad8198f7e8a862c0 +DIST rust-1.41.1-powerpc-unknown-linux-gnu.tar.xz 98530136 BLAKE2B 41399fcc9f1d88cc5a6fe0651012e4ebd1addde428c22611c30918a09ddad3640fb326bf48f94e5d12a610d2709eecf95c5d023f10bc6636eb6de1808a104e48 SHA512 545b2a4459bbfa7049755cbb63ad6e2917bf03cb9568eccbf3b01ea8f846263fbdc97ad29b42c440fa92dd9737b398196c1cdaf96c9716bba2f9e1d4a3a20125 +DIST rust-1.41.1-powerpc64-unknown-linux-gnu.tar.xz 104058752 BLAKE2B 10b3e3e4970fc05952f83e80e7d133d308045bdd3342199e885d2e6add113ada7959a93010046f48b1fedfe85f0346793fc54e0bf0c55d096f82622e198a928c SHA512 50367685783085cc384be944d4321dfde850f3a0e94de0625a08f17160af2c0b795276f96574d1bea84092cbc1cd3cde619d97fe2e37b07ead17f49164e1c995 +DIST rust-1.41.1-powerpc64le-unknown-linux-gnu.tar.xz 110594504 BLAKE2B eaf9c92ea9599314d12c5f9d0b654b523ceb8f40cc779cdbc2d50b4b07e0a37cd42d34000f0ace9c19154a1bd17110c097e30ee2b617f3a29de4966bb9303301 SHA512 1b2bf6d35321dd0a0fc9735005317f09f8b9a81b520612484530e29156ea254d5cada583e44f7e4a840edde09d70c34f7ead1208d8aa6037c652540dfa38cede +DIST rust-1.41.1-s390x-unknown-linux-gnu.tar.xz 114814112 BLAKE2B ef22c377e1d89ef4ebe78df19d91bcf042e2e1d8997be80d7d40998b18f6b44f8bb1232b1f72e42e3ffb6d1ff235f3cd2f04854e996bbf7be8f6d5d7299e8514 SHA512 f809adc626876df5c6e050362d59189ede5e3991ac41fd129922540abeb728f618e1a3f3925cee34895de5e037141aabb1f8c2b94d4069945d174e38446e8153 +DIST rust-1.41.1-x86_64-unknown-linux-gnu.tar.xz 111202140 BLAKE2B 226c68b1e97cc9be82e81f6c9e065e08514166a65a57159c2f63527063ae5f514650afc2591e0c4854ecd0239dc82cbc9a97b99412608645aca879a71354d857 SHA512 c75d4a18cf9300c6ab480d34c5e4b41be971535931455239330cb2a0e927bcf9cf102498cad5dd1d5d802fd1d9c9d214b80e8ff15aa6be68d3e7f41420cad666 +DIST rust-1.41.1-x86_64-unknown-linux-musl.tar.xz 96076684 BLAKE2B 3672e24a83c1e4c97a0844f9522a9fced19d5ef01c89d44e54bba8683514a86f7a14ea2e8c2f28d03c65b7e2e0358ff3cea2f85de1e69eb5334c55e18a8c8e4f SHA512 29e7b2aae35017d7f4313e0a482712390ffec752e62d8b1bda95d56a1f93ba882a8f610b469b5d2d7fa3d6d35c2cdc4e45d219ad85b8a3f71ba6ce04b1add48b +EBUILD rust-bin-1.37.0.ebuild 5453 BLAKE2B d27536dd8663161825330f129cff24acd359ad7fda13cf3a415c2f4188bcbda5475fbf3dc9b451f80276f5d5461a0615b3db43ee42e05640c4e28390b54c8bb8 SHA512 fface59aa478f4125a05da37d06876867ab473b03bedf86f8ab955ffd1821c93369de730b5dece6a5da3abd558cbd4510b03ea6dfe0b769708ed74886d7a084f +EBUILD rust-bin-1.38.0.ebuild 5462 BLAKE2B 3bb307a5aa670c27ed62ef0465447fd1e9e11d510f1a6a66de6ac773dc507ec6a859d3a596262b48b8b1fc71112e430fb77324d3651194a5b4124f8fe8332251 SHA512 a59650753f0d3658eca4311f1b34fda8fb89935e8421cd2079af274bc165db113efae98c02021403b45b1e96c547d2f2d5ad602b265e8e19e616a070d7a5a189 +EBUILD rust-bin-1.39.0.ebuild 5457 BLAKE2B b2c1cf4bc8fbd50c80c0848a37e41fc17e010f700a2eff222c898d34682adcb13e85be851cfc093f2e4c147f881ca7e910c4bff40f122261c57a8f3684ffd282 SHA512 043357eda5f22565f0c3eee9088fab703b7a2c8d165928f98996f409bd32334a2a4eef0f12b50068dbb7356168c22968fb9c598a137145f64fc55e855754d47c +EBUILD rust-bin-1.40.0.ebuild 5462 BLAKE2B 3bb307a5aa670c27ed62ef0465447fd1e9e11d510f1a6a66de6ac773dc507ec6a859d3a596262b48b8b1fc71112e430fb77324d3651194a5b4124f8fe8332251 SHA512 a59650753f0d3658eca4311f1b34fda8fb89935e8421cd2079af274bc165db113efae98c02021403b45b1e96c547d2f2d5ad602b265e8e19e616a070d7a5a189 +EBUILD rust-bin-1.41.0.ebuild 5459 BLAKE2B 0ee457779c991d5e10efe9a1705879bcb727842a259b8fa3ffab80caa11cdf22c7eff5c52740e9c9d59372d40637ea5380eb45cb528bd55b4b39d93c47cfe32d SHA512 6517514d2d7701e86594a81c218db1f5ae5d738b8366e53de21bbc2911a2e81556e2019c479f966affb1b290e0db5bee6326ea0ccfd8756251c8fa7920afe66a +EBUILD rust-bin-1.41.1.ebuild 5387 BLAKE2B 62fcf3605d748d3c2dca31e0a1abb00abb5f2ae03761f8818d06c77a4228cd0a9cedf90611c4580d89f2acfdcb9197fa7a60f4400fe35c9c46c8a1ab94ed1742 SHA512 790d6acb4936dfb453e32d5cb704579a0cca66e316c179e9e969af9aaec6aa0233b0bf2b001000ccce4920b382402bd1d3a8cc14e8458fbbdccec970f0090147 MISC metadata.xml 381 BLAKE2B 2a378d099ea6bb4ebe56493d1e7196c3207c54212e3c9ef8c0d020a360240cd3a5867b30e1fd3ac0a4da10de11ea6010677cbe63632e97a03ba480496a968cfe SHA512 573b793a11a2f3b7fee167fadc0c4135d16b9452642655fe3e217d6196b4f046afac281542ae361749d1d84c67a4cdd6b4944e364045d9e46e39d69b81fbc92c diff --git a/dev-lang/rust-bin/rust-bin-1.37.0.ebuild b/dev-lang/rust-bin/rust-bin-1.37.0.ebuild index a2f03ec227a5..806582e1e8da 100644 --- a/dev-lang/rust-bin/rust-bin-1.37.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.37.0.ebuild @@ -36,7 +36,7 @@ QA_PREBUILT=" opt/${P}/lib/rustlib/*/lib/*.rlib* " -pkg_pretend () { +pkg_pretend() { if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then die "${CHOST} is not supported by upstream Rust. You must use a hard float version." fi diff --git a/dev-lang/rust-bin/rust-bin-1.38.0.ebuild b/dev-lang/rust-bin/rust-bin-1.38.0.ebuild index 8ae4cfb6ab9e..81f846015348 100644 --- a/dev-lang/rust-bin/rust-bin-1.38.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.38.0.ebuild @@ -36,7 +36,7 @@ QA_PREBUILT=" opt/${P}/lib/rustlib/*/lib/*.rlib* " -pkg_pretend () { +pkg_pretend() { if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then die "${CHOST} is not supported by upstream Rust. You must use a hard float version." fi diff --git a/dev-lang/rust-bin/rust-bin-1.39.0.ebuild b/dev-lang/rust-bin/rust-bin-1.39.0.ebuild index 6660b1a1ef2a..05a8f1bbcc45 100644 --- a/dev-lang/rust-bin/rust-bin-1.39.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.39.0.ebuild @@ -36,7 +36,7 @@ QA_PREBUILT=" opt/${P}/lib/rustlib/*/lib/*.rlib* " -pkg_pretend () { +pkg_pretend() { if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then die "${CHOST} is not supported by upstream Rust. You must use a hard float version." fi diff --git a/dev-lang/rust-bin/rust-bin-1.40.0.ebuild b/dev-lang/rust-bin/rust-bin-1.40.0.ebuild index 8ae4cfb6ab9e..81f846015348 100644 --- a/dev-lang/rust-bin/rust-bin-1.40.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.40.0.ebuild @@ -36,7 +36,7 @@ QA_PREBUILT=" opt/${P}/lib/rustlib/*/lib/*.rlib* " -pkg_pretend () { +pkg_pretend() { if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then die "${CHOST} is not supported by upstream Rust. You must use a hard float version." fi diff --git a/dev-lang/rust-bin/rust-bin-1.41.0.ebuild b/dev-lang/rust-bin/rust-bin-1.41.0.ebuild index 234a574cdba9..e61242a31c03 100644 --- a/dev-lang/rust-bin/rust-bin-1.41.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.41.0.ebuild @@ -36,7 +36,7 @@ QA_PREBUILT=" opt/${P}/lib/rustlib/*/lib/*.rlib* " -pkg_pretend () { +pkg_pretend() { if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then die "${CHOST} is not supported by upstream Rust. You must use a hard float version." fi diff --git a/dev-lang/rust-bin/rust-bin-1.41.1.ebuild b/dev-lang/rust-bin/rust-bin-1.41.1.ebuild new file mode 100644 index 000000000000..51deede915ab --- /dev/null +++ b/dev-lang/rust-bin/rust-bin-1.41.1.ebuild @@ -0,0 +1,167 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 rust-toolchain toolchain-funcs + +MY_P="rust-${PV}" + +DESCRIPTION="Systems programming language from Mozilla" +HOMEPAGE="https://www.rust-lang.org/" +SRC_URI="$(rust_all_arch_uris ${MY_P})" + +LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" +SLOT="stable" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="clippy cpu_flags_x86_sse2 doc libressl rustfmt" + +DEPEND="" +RDEPEND=" + >=app-eselect/eselect-rust-20190311 + sys-libs/zlib + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + net-libs/libssh2 + net-misc/curl[ssl] +" + +REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )" + +QA_PREBUILT=" + opt/${P}/bin/*-${PV} + opt/${P}/lib/*.so + opt/${P}/lib/rustlib/*/bin/* + opt/${P}/lib/rustlib/*/lib/*.so + opt/${P}/lib/rustlib/*/lib/*.rlib* +" + +pkg_pretend() { + if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then + die "${CHOST} is not supported by upstream Rust. You must use a hard float version." + fi +} + +src_unpack() { + default + mv "${WORKDIR}/${MY_P}-$(rust_abi)" "${S}" || die +} + +src_install() { + local std=$(grep 'std' ./components) + local components="rustc,cargo,${std}" + use doc && components="${components},rust-docs" + use clippy && components="${components},clippy-preview" + use rustfmt && components="${components},rustfmt-preview" + ./install.sh \ + --components="${components}" \ + --disable-verify \ + --prefix="${ED}/opt/${P}" \ + --mandir="${ED}/opt/${P}/man" \ + --disable-ldconfig \ + || die + + local rustc=rustc-bin-${PV} + local rustdoc=rustdoc-bin-${PV} + local rustgdb=rust-gdb-bin-${PV} + local rustgdbgui=rust-gdbgui-bin-${PV} + local rustlldb=rust-lldb-bin-${PV} + + mv "${ED}/opt/${P}/bin/rustc" "${ED}/opt/${P}/bin/${rustc}" || die + mv "${ED}/opt/${P}/bin/rustdoc" "${ED}/opt/${P}/bin/${rustdoc}" || die + mv "${ED}/opt/${P}/bin/rust-gdb" "${ED}/opt/${P}/bin/${rustgdb}" || die + mv "${ED}/opt/${P}/bin/rust-gdbgui" "${ED}/opt/${P}/bin/${rustgdbgui}" || die + mv "${ED}/opt/${P}/bin/rust-lldb" "${ED}/opt/${P}/bin/${rustlldb}" || die + + dosym "${rustc}" "/opt/${P}/bin/rustc" + dosym "${rustdoc}" "/opt/${P}/bin/rustdoc" + dosym "${rustgdb}" "/opt/${P}/bin/rust-gdb" + dosym "${rustgdbgui}" "/opt/${P}/bin/rust-gdbgui" + dosym "${rustlldb}" "/opt/${P}/bin/rust-lldb" + + dosym "../../opt/${P}/bin/${rustc}" "/usr/bin/${rustc}" + dosym "../../opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}" + dosym "../../opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}" + dosym "../../opt/${P}/bin/${rustgdbgui}" "/usr/bin/${rustgdbgui}" + dosym "../../opt/${P}/bin/${rustlldb}" "/usr/bin/${rustlldb}" + + local cargo=cargo-bin-${PV} + mv "${ED}/opt/${P}/bin/cargo" "${ED}/opt/${P}/bin/${cargo}" || die + dosym "${cargo}" "/opt/${P}/bin/cargo" + dosym "../../opt/${P}/bin/${cargo}" "/usr/bin/${cargo}" + + if use clippy; then + local clippy_driver=clippy-driver-bin-${PV} + local cargo_clippy=cargo-clippy-bin-${PV} + mv "${ED}/opt/${P}/bin/clippy-driver" "${ED}/opt/${P}/bin/${clippy_driver}" || die + mv "${ED}/opt/${P}/bin/cargo-clippy" "${ED}/opt/${P}/bin/${cargo_clippy}" || die + dosym "${clippy_driver}" "/opt/${P}/bin/clippy-driver" + dosym "${cargo_clippy}" "/opt/${P}/bin/cargo-clippy" + dosym "../../opt/${P}/bin/${clippy_driver}" "/usr/bin/${clippy_driver}" + dosym "../../opt/${P}/bin/${cargo_clippy}" "/usr/bin/${cargo_clippy}" + fi + if use rustfmt; then + local rustfmt=rustfmt-bin-${PV} + local cargo_fmt=cargo-fmt-bin-${PV} + mv "${ED}/opt/${P}/bin/rustfmt" "${ED}/opt/${P}/bin/${rustfmt}" || die + mv "${ED}/opt/${P}/bin/cargo-fmt" "${ED}/opt/${P}/bin/${cargo_fmt}" || die + dosym "${rustfmt}" "/opt/${P}/bin/rustfmt" + dosym "${cargo_fmt}" "/opt/${P}/bin/cargo-fmt" + dosym "../../opt/${P}/bin/${rustfmt}" "/usr/bin/${rustfmt}" + dosym "../../opt/${P}/bin/${cargo_fmt}" "/usr/bin/${cargo_fmt}" + fi + + cat <<-EOF > "${T}"/50${P} + LDPATH="/opt/${P}/lib" + MANPATH="/opt/${P}/man" + EOF + doenvd "${T}"/50${P} + + # note: eselect-rust adds EROOT to all paths below + cat <<-EOF > "${T}/provider-${P}" + /usr/bin/rustdoc + /usr/bin/rust-gdb + /usr/bin/rust-gdbgui + /usr/bin/rust-lldb + EOF + echo /usr/bin/cargo >> "${T}/provider-${P}" + if use clippy; then + echo /usr/bin/clippy-driver >> "${T}/provider-${P}" + echo /usr/bin/cargo-clippy >> "${T}/provider-${P}" + fi + if use rustfmt; then + echo /usr/bin/rustfmt >> "${T}/provider-${P}" + echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" + fi + + insinto /etc/env.d/rust + doins "${T}/provider-${P}" +} + +pkg_postinst() { + eselect rust update --if-unset + + elog "Rust installs a helper script for calling GDB now," + elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}," + + if has_version app-editors/emacs; then + elog "install app-emacs/rust-mode to get emacs support for rust." + fi + + if has_version app-editors/gvim || has_version app-editors/vim; then + elog "install app-vim/rust-vim to get vim support for rust." + fi + + if use elibc_musl; then + ewarn "${PN} on *-musl targets is configured with crt-static" + ewarn "" + ewarn "you will need to set RUSTFLAGS=\"-C target-feature=-crt-static\" in make.conf" + ewarn "to use it with portage, otherwise you may see failures like" + ewarn "error: cannot produce proc-macro for serde_derive v1.0.98 as the target " + ewarn "x86_64-unknown-linux-musl does not support these crate types" + fi +} + +pkg_postrm() { + eselect rust cleanup +} diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest index d81802d316c7..100560c43e2e 100644 --- a/dev-lang/rust/Manifest +++ b/dev-lang/rust/Manifest @@ -81,9 +81,11 @@ DIST rustc-1.38.0-src.tar.xz 96163304 BLAKE2B 1e900b44db64727477ccf8e58e0ebb9ec2 DIST rustc-1.39.0-src.tar.xz 96495140 BLAKE2B 6df6bf0c3b38c28753713acdc477ea6929740c32893171dd9b8620992439e45730ef6f9489a6fc411ff5884c661ac4c07b7b93f5a4174207ed53351d2dea09bf SHA512 8610b2ec77722087c572bd84ac562a5b7c5f1a644aea58c5d5daa07a9aed242703b7816e73e2eaa049f773d5907859e259744a0de700622df005584fd798dab0 DIST rustc-1.40.0-src.tar.xz 92306352 BLAKE2B 762b9592414e5c816540f6fd37d07b3b0ffe97a151968cc8ae77be2fda03a6d66905192985edc65055cc7811dbd90faa2b2c056481f72161c6f7ccbcce13671a SHA512 b5ac3079acefb62d3c985b77f624d7fb68de23a59396fed9ccb292db61641c064f3146ee54d3cf59067b17ebfaadd14a6b2b466def60316bb5b13ba3aef01e1f DIST rustc-1.41.0-src.tar.xz 93763052 BLAKE2B a68524fb6e3abb43d52ae6676a1e9de1c5d33606eaea6e93bb518f10b196d620f2f370c631c32e39a624af71a3bf6911662a9df7eecb8dde78a20c8054a349fc SHA512 0e30fe53b77860085bea0f1f60315eb835b00dd796c5d1b98ed44fe6fc27336dfb064908c86e1669a9cbe81c9ca1495e1c259a8a268bef23b23805a719cef0dd +DIST rustc-1.41.1-src.tar.xz 93754192 BLAKE2B 235ece650d0c75e1c8700ce73d3811997cd0d827b850a6dd435a269f3f86d85849d54755ea346c5ddcbe0d1224836fd78213f6abeab4a9a8c4c3e2d8a05ff7b4 SHA512 ef33565c9cf4e27ca279072bfed3301e0276c09407d49727640746ba78d289de285278d64b1cce8708461fd6c97c7ab2ea8d56e7a4c4a23b2e66e2d164c35fc9 EBUILD rust-1.37.0.ebuild 9481 BLAKE2B a5348fff749d7ec0e36fdb49aac73af9ab0b838bd72c57e76c475705afedebf515f553dcf7fd36680266a8a8601abdc04ccd93b1881c4d39a2bf86b8e7077f1b SHA512 38ac15f899841ef3e59293bf8a26242825c0a73cbba255a86f3d83ecd609497538ad86ed1fa8533975db183a9d6e38408f7c960a7c9c20882ddec60a42668d1c EBUILD rust-1.38.0.ebuild 9439 BLAKE2B 6e9f86c2dbd9a31df3f8203b239da85ab2dcf702609c4c189ed9ac1a319dc8630691e21e64873cb99ac1bd8521cf20b4731938492dbbce5121f613e8b7f64cd9 SHA512 d7f3d0bc258d0acb66cc6552c1da21a441399ff3249a380d6e835e1423763daa3e6c7e29c886f3f51d9017b44c9abf4c96912d8472ced46c748d57be4a6afbf8 EBUILD rust-1.39.0.ebuild 9587 BLAKE2B 14aaadef0d43324ce8f530a93ac651a7e98e3e5014ac62bda1a860ae2f71f65a8a6f3cdb0ccc7662f7f63d9bb7f5afd5a8d388a16022b8114ab7ccce15ba119a SHA512 d83a106687255aaa099d352e389f6dc788f0aaec424b7558058222bd608949e890c6e6885968e01f65376b3633f4e48e7327369ebbbfb49f71bcd46afce585be EBUILD rust-1.40.0-r1.ebuild 9862 BLAKE2B 9db4fcdee5d3d87b6ab651575d7c5039c41eda95c32cc12623ff70cb02b16c228a727767048252ff9daed49ee611101044fba00ec3df5e99a26643397bfc9f3b SHA512 8ad7759e2786169836bb4f96416ea7bf1faf0fa24feae0772823ef75198b7463396b30460a47025200d91d5ebb1562c550965cff0a06410ac8a8aaf17ba9384a EBUILD rust-1.41.0.ebuild 10120 BLAKE2B 031a4873d919ed317de00ada96f833356e327adbd000e30d11460f08b6abc6069aa48f309420746f6938d9e4a42c839a03569f69d2ba8f11fe57852d9afd6a0f SHA512 7ae78ec9e05138cdd71cdeaedf388a7b8bb2958dcad743e59d08f20f3422699bd953fc8ef64a709ced20061b56281b7584224e855d147e51db726ce76923e492 +EBUILD rust-1.41.1.ebuild 10133 BLAKE2B b42a2bca72b9297e91d5b05b66b0c748ec16ffac635357a01f92d4f46f0f088f256697fa6085cffefc2a00dc58b2ff1d967619e2214f3157882a38e861fe2156 SHA512 eaf7bd122efe8ef873c8feb875a014323506fd6b3b44c8f7b4c43194c04d7bf0116ebf2892e1dffb747dc99db2865783f00dc7511464e5886e0fdd7e02f27d61 MISC metadata.xml 885 BLAKE2B 0c22dd218172717e47fba5c3294746470a9adcba729a3585937748ef8e4b8ea118e036753c332eace3dbc6ce82406c15f35948d1857485abe7761c7e4f299c1b SHA512 56f1535f91d2d0126ee70d42ef0ac3ac0e491ce1c539a159db6c429104881227676f6e29412f090631e728093b0902d330c00a8d4d8027c1a07e3632c8e36435 diff --git a/dev-lang/rust/rust-1.41.1.ebuild b/dev-lang/rust/rust-1.41.1.ebuild new file mode 100644 index 000000000000..94d6e304cbbe --- /dev/null +++ b/dev-lang/rust/rust-1.41.1.ebuild @@ -0,0 +1,370 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7} ) + +inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs + +if [[ ${PV} = *beta* ]]; then + betaver=${PV//*beta} + BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}" + MY_P="rustc-beta" + SLOT="beta/${PV}" + SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz" +else + ABI_VER="$(ver_cut 1-2)" + SLOT="stable/${ABI_VER}" + MY_P="rustc-${PV}" + SRC="${MY_P}-src.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +fi + +RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0" + +DESCRIPTION="Systems programming language from Mozilla" +HOMEPAGE="https://www.rust-lang.org/" + +SRC_URI=" + https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz + !system-bootstrap? ( $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION}) ) +" + +ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 + NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore ) +ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) +LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} + +LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" + +IUSE="clippy cpu_flags_x86_sse2 debug doc libressl nightly parallel-compiler rls rustfmt system-bootstrap system-llvm wasm ${ALL_LLVM_TARGETS[*]}" + +# Please keep the LLVM dependency block separate. Since LLVM is slotted, +# we need to *really* make sure we're not pulling more than one slot +# simultaneously. + +# How to use it: +# 1. List all the working slots (with min versions) in ||, newest first. +# 2. Update the := to specify *max* version, e.g. < 10. +# 3. Specify LLVM_MAX_SLOT, e.g. 9. +LLVM_DEPEND=" + || ( + sys-devel/llvm:9[llvm_targets_WebAssembly?] + wasm? ( =sys-devel/lld-9* ) + ) + <sys-devel/llvm-10:= +" +LLVM_MAX_SLOT=9 + +BOOTSTRAP_DEPEND="|| ( >=dev-lang/rust-1.$(($(ver_cut 2) - 1)).0-r1 >=dev-lang/rust-bin-1.$(($(ver_cut 2) - 1)) )" + +COMMON_DEPEND=" + net-libs/libssh2:= + net-libs/http-parser:= + net-misc/curl:=[ssl] + sys-libs/zlib:= + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + elibc_musl? ( sys-libs/libunwind ) + system-llvm? ( + ${LLVM_DEPEND} + ) +" + +DEPEND="${COMMON_DEPEND} + ${PYTHON_DEPS} + || ( + >=sys-devel/gcc-4.7 + >=sys-devel/clang-3.5 + ) + system-bootstrap? ( ${BOOTSTRAP_DEPEND} ) + system-llvm? ( + dev-util/cmake + dev-util/ninja + ) +" + +RDEPEND="${COMMON_DEPEND} + >=app-eselect/eselect-rust-20190311 +" + +REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} ) + parallel-compiler? ( nightly ) + wasm? ( llvm_targets_WebAssembly ) + x86? ( cpu_flags_x86_sse2 ) +" + +QA_FLAGS_IGNORED=" + usr/bin/*-${PV} + usr/lib*/lib*.so + usr/lib/rustlib/*/codegen-backends/librustc_codegen_llvm-llvm.so + usr/lib/rustlib/*/lib/lib*.so +" + +QA_SONAME="usr/lib.*/librustc_macros.*.so" + +PATCHES=( + "${FILESDIR}"/1.40.0-add-soname.patch + "${FILESDIR}"/llvm-gcc10.patch +) + +S="${WORKDIR}/${MY_P}-src" + +toml_usex() { + usex "$1" true false +} + +pre_build_checks() { + CHECKREQS_DISK_BUILD="9G" + eshopts_push -s extglob + if is-flagq '-g?(gdb)?([1-9])'; then + CHECKREQS_DISK_BUILD="15G" + fi + eshopts_pop + check-reqs_pkg_setup +} + +pkg_pretend() { + pre_build_checks +} + +pkg_setup() { + pre_build_checks + python-any-r1_pkg_setup + + # use bundled for now, #707746 + # will need dev-libs/libgit2 slotted dep if re-enabled + #export LIBGIT2_SYS_USE_PKG_CONFIG=1 + export LIBSSH2_SYS_USE_PKG_CONFIG=1 + export PKG_CONFIG_ALLOW_CROSS=1 + + if use system-llvm; then + llvm_pkg_setup + + local llvm_config="$(get_llvm_prefix "$LLVM_MAX_SLOT")/bin/llvm-config" + + export LLVM_LINK_SHARED=1 + export RUSTFLAGS="${RUSTFLAGS} -Lnative=$("${llvm_config}" --libdir)" + fi +} + +src_prepare() { + if ! use system-bootstrap; then + local rust_stage0_root="${WORKDIR}"/rust-stage0 + local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi)" + + "${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig \ + --destdir="${rust_stage0_root}" --prefix=/ || die + fi + + default +} + +src_configure() { + local rust_target="" rust_targets="" arch_cflags + + # Collect rust target names to compile standard libs for all ABIs. + for v in $(multilib_get_enabled_abi_pairs); do + rust_targets="${rust_targets},\"$(rust_abi $(get_abi_CHOST ${v##*.}))\"" + done + if use wasm; then + rust_targets="${rust_targets},\"wasm32-unknown-unknown\"" + fi + rust_targets="${rust_targets#,}" + + local extended="true" tools="\"cargo\"," + if use clippy; then + tools="\"clippy\",$tools" + fi + if use rls; then + tools="\"rls\",\"analysis\",\"src\",$tools" + fi + if use rustfmt; then + tools="\"rustfmt\",$tools" + fi + + local rust_stage0_root + if use system-bootstrap; then + rust_stage0_root="$(rustc --print sysroot)" + else + rust_stage0_root="${WORKDIR}"/rust-stage0 + fi + + rust_target="$(rust_abi)" + + cat <<- EOF > "${S}"/config.toml + [llvm] + optimize = $(toml_usex !debug) + release-debuginfo = $(toml_usex debug) + assertions = $(toml_usex debug) + targets = "${LLVM_TARGETS// /;}" + experimental-targets = "" + link-shared = $(toml_usex system-llvm) + [build] + build = "${rust_target}" + host = ["${rust_target}"] + target = [${rust_targets}] + cargo = "${rust_stage0_root}/bin/cargo" + rustc = "${rust_stage0_root}/bin/rustc" + docs = $(toml_usex doc) + compiler-docs = $(toml_usex doc) + submodules = false + python = "${EPYTHON}" + locked-deps = true + vendor = true + extended = ${extended} + tools = [${tools}] + verbose = 2 + [install] + prefix = "${EPREFIX}/usr" + libdir = "lib" + docdir = "share/doc/${PF}" + mandir = "share/man" + [rust] + optimize = true + debug = $(toml_usex debug) + debug-assertions = $(toml_usex debug) + default-linker = "$(tc-getCC)" + parallel-compiler = $(toml_usex parallel-compiler) + channel = "$(usex nightly nightly stable)" + rpath = false + lld = $(usex system-llvm false $(toml_usex wasm)) + backtrace-on-ice = true + [dist] + src-tarball = false + EOF + + for v in $(multilib_get_enabled_abi_pairs); do + rust_target=$(rust_abi $(get_abi_CHOST ${v##*.})) + arch_cflags="$(get_abi_CFLAGS ${v##*.})" + + cat <<- EOF >> "${S}"/config.env + CFLAGS_${rust_target}=${arch_cflags} + EOF + + cat <<- EOF >> "${S}"/config.toml + [target.${rust_target}] + cc = "$(tc-getBUILD_CC)" + cxx = "$(tc-getBUILD_CXX)" + linker = "$(tc-getCC)" + ar = "$(tc-getAR)" + EOF + # librustc_target/spec/linux_musl_base.rs sets base.crt_static_default = true; + if use elibc_musl; then + cat <<- EOF >> "${S}"/config.toml + crt-static = false + EOF + fi + if use system-llvm; then + cat <<- EOF >> "${S}"/config.toml + llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" + EOF + fi + done + + if use wasm; then + cat <<- EOF >> "${S}"/config.toml + [target.wasm32-unknown-unknown] + linker = "$(usex system-llvm lld rust-lld)" + EOF + fi +} + +src_compile() { + env $(cat "${S}"/config.env)\ + "${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) \ + --exclude src/tools/miri || die # https://github.com/rust-lang/rust/issues/52305 +} + +src_install() { + env DESTDIR="${D}" "${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml \ + --exclude src/tools/miri || die + + # bug #689562, #689160 + rm "${D}/etc/bash_completion.d/cargo" || die + rmdir "${D}"/etc{/bash_completion.d,} || die + dobashcomp build/tmp/dist/cargo-image/etc/bash_completion.d/cargo + + mv "${ED}/usr/bin/rustc" "${ED}/usr/bin/rustc-${PV}" || die + mv "${ED}/usr/bin/rustdoc" "${ED}/usr/bin/rustdoc-${PV}" || die + mv "${ED}/usr/bin/rust-gdb" "${ED}/usr/bin/rust-gdb-${PV}" || die + mv "${ED}/usr/bin/rust-gdbgui" "${ED}/usr/bin/rust-gdbgui-${PV}" || die + mv "${ED}/usr/bin/rust-lldb" "${ED}/usr/bin/rust-lldb-${PV}" || die + mv "${ED}/usr/bin/cargo" "${ED}/usr/bin/cargo-${PV}" || die + if use clippy; then + mv "${ED}/usr/bin/clippy-driver" "${ED}/usr/bin/clippy-driver-${PV}" || die + mv "${ED}/usr/bin/cargo-clippy" "${ED}/usr/bin/cargo-clippy-${PV}" || die + fi + if use rls; then + mv "${ED}/usr/bin/rls" "${ED}/usr/bin/rls-${PV}" || die + fi + if use rustfmt; then + mv "${ED}/usr/bin/rustfmt" "${ED}/usr/bin/rustfmt-${PV}" || die + mv "${ED}/usr/bin/cargo-fmt" "${ED}/usr/bin/cargo-fmt-${PV}" || die + fi + + # Move public shared libs to abi specific libdir + # Private and target specific libs MUST stay in /usr/lib/rustlib/${rust_target}/lib + if [[ $(get_libdir) != lib ]]; then + dodir /usr/$(get_libdir) + mv "${ED}/usr/lib"/*.so "${ED}/usr/$(get_libdir)/" || die + fi + + dodoc COPYRIGHT + + # note: eselect-rust adds EROOT to all paths below + cat <<-EOF > "${T}/provider-${P}" + /usr/bin/rustdoc + /usr/bin/rust-gdb + /usr/bin/rust-gdbgui + /usr/bin/rust-lldb + EOF + echo /usr/bin/cargo >> "${T}/provider-${P}" + if use clippy; then + echo /usr/bin/clippy-driver >> "${T}/provider-${P}" + echo /usr/bin/cargo-clippy >> "${T}/provider-${P}" + fi + if use rls; then + echo /usr/bin/rls >> "${T}/provider-${P}" + fi + if use rustfmt; then + echo /usr/bin/rustfmt >> "${T}/provider-${P}" + echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" + fi + + insinto /etc/env.d/rust + doins "${T}/provider-${P}" +} + +pkg_postinst() { + eselect rust update --if-unset + + elog "Rust installs a helper script for calling GDB and LLDB," + elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}." + + ewarn "cargo is now installed from dev-lang/rust{,-bin} instead of dev-util/cargo." + ewarn "This might have resulted in a dangling symlink for /usr/bin/cargo on some" + ewarn "systems. This can be resolved by calling 'sudo eselect rust set ${P}'." + + if has_version app-editors/emacs; then + elog "install app-emacs/rust-mode to get emacs support for rust." + fi + + if has_version app-editors/gvim || has_version app-editors/vim; then + elog "install app-vim/rust-vim to get vim support for rust." + fi + + if use elibc_musl; then + ewarn "${PN} on *-musl targets is configured with crt-static" + ewarn "" + ewarn "you will need to set RUSTFLAGS=\"-C target-feature=-crt-static\" in make.conf" + ewarn "to use it with portage, otherwise you may see failures like" + ewarn "error: cannot produce proc-macro for serde_derive v1.0.98 as the target " + ewarn "x86_64-unknown-linux-musl does not support these crate types" + fi +} + +pkg_postrm() { + eselect rust cleanup +} diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest index 06bc07a371c0..1956a1518f69 100644 --- a/dev-lang/spidermonkey/Manifest +++ b/dev-lang/spidermonkey/Manifest @@ -18,15 +18,15 @@ DIST spidermonkey-slot0-patches-02.tar.xz 10952 BLAKE2B fb7bf5cdac6c821a48d407ff DIST spidermonkey-slot17-patches-01.tar.xz 2748 BLAKE2B a55504d726f925096de7e066a1d323154bc796018644f347bc1d012ea6ee8441cc19f30689e06fd26bab5a5d2e8376e90bf2c1930a588be8b48865f7bbc524ea SHA512 21a90f85d156de3cca9811317507162a458f908bb447924fcfbf49b7bb70496b611ce7df90b90775316b8ceafda56692be3bf856b168b83ed40b8a5c668eed3f DIST spidermonkey-slot38-patches-01.tar.xz 7472 BLAKE2B 7585aa6f5a84d6ae21e41137fca8da093580182f798f63bfcf2e402e3bf58df4cb3f43cef3eb635044508800f6757247fa3a65ca53230243a455925f436a9510 SHA512 953acee985d192c6d0f18f14c70fdda33a7c8f784c6833ca8b75495044b40a8b3f29b281c40dbfcda0c8570c111a3dd1717c2ef0ffd651c1b50d1f2bff1f6d09 DIST spidermonkey-slot45-patches-01.tar.xz 5092 BLAKE2B 0188a179fc741ab84a93aae1e77f8b765868ca716b8879661bfa678aef918998c9488db3b866a13c79ae28edb43ac0ebb10345b0471b717c4174c61cba9646bc SHA512 d52f038a7b4f7b410b5a1f94a55962adafc5906e7d85f605f3fe45ad49417c2b9d58d853a81b5d2395a2842c9780992d5a2c1a0e67aa77fb09f21aff9aeb0f7a -EBUILD spidermonkey-1.7.0-r3.ebuild 1532 BLAKE2B 2cea14a96f7e76bb54635be64e0d0abc10a4d09c7beabf476101c4d3a655ac2856c54b947aed183499f60ed98e0b9d82aec6ab3b0dd69b1fde0de65f70646cd4 SHA512 60e0095baa81d6a8a93ed5dd9798f5f4de75da19cfb3218620a794a0c1bbf16eab5bf3c272d949c916136409161d50a2e5ae5fc63ae6b424de06a3a5c87b516e -EBUILD spidermonkey-1.8.5-r6.ebuild 4449 BLAKE2B b25416a8524f7f2f0b5a8689b657381de39ff7b582533707b438d76647910c53a549cda9121858203fae57dc1f4ee8c5bd586c9b0da5d63841057151c07ba084 SHA512 e7f731298d5163f7c5dfa2e4c75697dfe8c6cead4152250ca76e5f6cb4af17001b3c7bf0bd6ded4ee86cbd99cc22da5cb6d0e82d4d271ee4a5cb0ef1f8c0e389 -EBUILD spidermonkey-1.8.5-r7.ebuild 3809 BLAKE2B a691f612758f6d67cb8356f74ab3d45a62cbdde06ec6a0bafda9a2b50d123c9cd97dadcadaf2de6ec9b3b39561e2cb48ecf968ff3eb10aaf6f339df0a1a64eee SHA512 50da424ca0e3552bdaf5062722a249cf8e8248e105aa04add5909db1e204635a56b06d26f73b599c1fd1f2d5bc9b4aa84b3e8592d2ceea6fab2792dec4533bc4 -EBUILD spidermonkey-1.8.5-r9.ebuild 4013 BLAKE2B 5cc1b137f41e08eafda73b3006b617b0b99fbdce2052aa6949a84e3b09b4fcea995a50a3782c1cb8aa3e01588ecc74796e582b2d44fa16cf38a2ba30ae1b3d74 SHA512 853e2429bb08f91f13e60371eee227e89e629f28de7c269779c543534801a31ddedc410fb0b48b52b17668cf1d3d0f9b5e178c53a58415988ea41ca10a99fe81 -EBUILD spidermonkey-17.0.0-r5.ebuild 3567 BLAKE2B 72578a665b4bb67f1293ce343d1a1aa877ec7bc99e9d03f49160b98533a1e77e45e6c0ef1724d4e4fed5ed3bd30730b8226cc3fe0578f0d7722d00268a806a54 SHA512 f6586fbd0f3d58b7830e415f692a9e099515d7bddb43228e77f9047f50a7d8e13a1e1551ac6146b509f09f2d371b41e00e015d38a965f354139a99e4428ffae5 -EBUILD spidermonkey-38.3.0.ebuild 3874 BLAKE2B 4ca1be3a4ab911dec59c5e50d19df92248ca86c1900273d7f7710c7df8d5b05f31606f7a19b66222a15107bdc33afdcc8a0da2080e1ed969e855630388ebd881 SHA512 f872abd997e107922ff8fcd2d4a9c0fd10fc7c540da69e4c99dd0a6cf9e2353d6dc0d9cb4b4121c60980abbb27f39c573b20cf4af4fa8f0b1d1578abb29666b4 -EBUILD spidermonkey-45.0.2.ebuild 3981 BLAKE2B 4c1c504b67d68e86e400a3af32bd6adbfa891e3537989e8276f257b988ef408b7e82063a2fac81bff0d8584dfe33bcd560f9c3e9ee48970506a032a19447a2a7 SHA512 2f5898e2d47d624ee7329877d14650756cf192af17a337220a9393d49aa58767fae5f554dbdd5458fc86993a139c46f5d0dfa4c8ae60b75d7b129b3a55d5bb8e -EBUILD spidermonkey-52.9.1_pre1-r1.ebuild 4467 BLAKE2B 4b3ed44e84091307c8bb4808fa189ccdfe354a7dbdef211d36f57ccd38cf565cd28a70035f3e5aaec1fe56fd9bceeaf5ec304aa4f588aa8ee111387f1a655ba7 SHA512 f52ec253b80d31d04549f4ce977fe208030e0c3c1de9ab0a88c6425a36a810bf2a5d35f6137734175dbc7927f827a58cb4e9a511ab2a80cc8c3fde4cb27864a2 -EBUILD spidermonkey-52.9.1_pre1.ebuild 4294 BLAKE2B c7edda3aa3ab838aac5d234f1db564db61609ae3f4a665f9b27d5b7cd50cda33e51c5ada2e79f855d9479c23aba70858d99083e5691f2ea8830e2c3febf2e734 SHA512 1978c031e7dbb49a59e4eb926ee6a0adeefbcac1217a09234f51f86f2abea34d78e867294625310d43b3ab0a4372baef0a40237b040c52df2938b06b90a8251a -EBUILD spidermonkey-60.5.2_p0-r2.ebuild 3867 BLAKE2B 1313244e1d01ce09b7d5a5933dacfd60142f97c3832a488e38daaf75578c714c2c4d93bfd9d9755fe966c27a65ceb6c7ad32bb1ef9e859016cac6a4ddedd1a73 SHA512 efa999b80b95a60057c664e9ce698c2127b4295ee2b6a0b7825325f344c9090237e01dfa6c4a49beac1250a35b5fa6db94b4c3aeae337e4da6507e3042dc7227 -EBUILD spidermonkey-60.5.2_p0-r3.ebuild 4048 BLAKE2B 332cfb311eddcbc4050ef68ea75fc68e32e1e0c3d016a1d6ce82ebcc366d7a07e1c20127e6e70f56bc2a92234632cfca6de19c13897bd9d63d2bc634183e5df7 SHA512 14ba4c22ea8b833bd3f84724655d3b03f2a1c23a0d151c90f3b7c97389f19d4d3bf30f9b4523e2f29a30e7ed316610bea3d974f67d5e3f0edcf0fb1c3776f7e2 +EBUILD spidermonkey-1.7.0-r3.ebuild 1525 BLAKE2B bc8709a762377851c1df610f95d4b9c9063a8be171b6eb4900db464b020d053fbff989cd25161590786631f123aa984c7928a8729faafc91c06c4d75da50b4c0 SHA512 45624955dca00e2edd53190e97292f0f2fd5b53fecda15b7397e65c1e9fb4c017cd7858ef0f9cf660cdbeb8bbbf659db02f716b02ae709ce4d35fc7a3dd4ccbb +EBUILD spidermonkey-1.8.5-r6.ebuild 4443 BLAKE2B 223f3600365eec2f17f68fdcdbdffb02cef9ee885c5932e5bf6415e2a71d316c5a484271076eefdbb887590fe38c95f2a6f2f1a382351b4f51a344115885d703 SHA512 0abf36818323dd5ff05463a9efd7331e0e646b538f07375593e43efab0e233d81aa2918b39f5cf4f12d4fe6514875ed5c955f146bed4291357a4bbd0b17208f5 +EBUILD spidermonkey-1.8.5-r7.ebuild 3803 BLAKE2B 99946ed12f0b123fa38118acd331ab70ce82afa9795534e68507f8a1aa77376db8eaf5e1d9252349bd3bd2b770c0cc5e76a99fe40c5ed7ee82d1ae84e4b4908a SHA512 a5400b6b9b8ca8376710c6aa8117d8181915e35c4af74f43858df990e071288b015be48165329f473aa1b83e6a1b9812d146030902df96196fba649a74729ab0 +EBUILD spidermonkey-1.8.5-r9.ebuild 4007 BLAKE2B 704ff252d2f46b061e69022da0fabde05cc305f8aa1371e8f1ff3de169aca57ae32613b77b144be2e97eb4a0ed24c1e72505fa061f537835bb5e91e275b51c76 SHA512 f7824748ba714a5a5f5e8edc4bc46edc466d14600816fc41052813ef03bb92abf8b447e32c78d6fbfefbf7ddacc15f8d17062f2988a24297e616bc156048d868 +EBUILD spidermonkey-17.0.0-r5.ebuild 3568 BLAKE2B d3fa789a176b35b4e98334ab36bfbfc8e97a5089ac621d98ebab26cd9145275b99166f785e0beda3113f6c641d5bae85b2ba7f6404caff8b5be9761ded9cb339 SHA512 86bfb4b23e43a090cc04c1e8e7f6c7cb3bbf3cb8fda863cdb11aa2a4a419b882d2da7e82c0d0e6979f790b5d824cefc2bf5ad79668fc87339a3342e3ca1c0f09 +EBUILD spidermonkey-38.3.0.ebuild 3875 BLAKE2B 81603891cb59f939fdbc9f7d522e7c65fe13bc7da3bedc8b25c86d9da08f7accf40bf1d6f610006fe815b41caf76043059aba5bc8d16df819e9abd57ddf47bdc SHA512 1b9438b1569ccdcec91be39701cdc89630e5fa6c0b219ebfff6281f56742bfc13932dc41eb505d3ff0d49ec3a04152c3e9d68e8fcee92206600a08b8a0caae04 +EBUILD spidermonkey-45.0.2.ebuild 3982 BLAKE2B 8982dea144298e3f8fb34cd7aeed10945a7bc2f05e9784eb75aa0a60ff81f6f1d90a848bf1a66e125ed6efb1c91a6232b8bdf95641d6fdb55fb0f620cffe2db8 SHA512 e78388a925cc733a7b3c3acc279e972f09b9c5273dac0ef65cda7ae99003e5510b609b04c464dfd21dbf5503baccd8b89aae48b220e54a056ffe6bae2925bcd3 +EBUILD spidermonkey-52.9.1_pre1-r1.ebuild 4468 BLAKE2B 0b95708626e946db02d86cabf3be237fa2cf6d285c30c5f40cf12c6051d3b9757e1519b9c98e829db4a00490ae9defb858e7185f7ae96b7aa07efaaef7c31882 SHA512 f9ceefc6c111be9982ed4364570272c96b29bd610e16bc6e64a2de6e8aa050d408b288a6a6ea5d81749764db9a482dbb0c13200336b5f8572e99522670723a78 +EBUILD spidermonkey-52.9.1_pre1.ebuild 4295 BLAKE2B 6b3fb327f1aff48de511662f6bff6bf0c5048a954f7f8a3655983728f6aa8015b4e82d98c21486230f00ebc09a3118875250364e7d466f6dbdfb8953be3f6d6c SHA512 d9ca1a5067f2f183fb8b02b7abebff8df1272bed39abb3d434109eae02413784e1c1d204b73faa122c908cab66a908a14cf5b400e5c9dbcebe96067dea3dbfab +EBUILD spidermonkey-60.5.2_p0-r2.ebuild 3868 BLAKE2B 98273894874645fce7fbba8995649e3c650c3914d3d71b53b201d268773b075e65d388bc833d2b3657bc34a5872716983353ae8808d5223f61255bc1c6e831e2 SHA512 b256155c75816fb92a0f9f3d04628221589a53cd2089df15229883ea8027f42afdb2543aefe977b469703803b615c3c40802f2a33aae49767ea8553bda133b7d +EBUILD spidermonkey-60.5.2_p0-r3.ebuild 4049 BLAKE2B b1c1348e02acf9cdf4ef815bce814e82cedf469ff35423ea51e42a9208d903aa2202da38f8a40b319d2241a42af942c1e3e836713f314b5ba6a1f43de98da032 SHA512 440747402277d164f71491743366152b06b6fd666517c4972bd11dee360f2d7bf2306e3f34fd375ede99941136b3bffa5716c49e488c128cfc329eb5c6c59303 MISC metadata.xml 906 BLAKE2B 8557bb4bfdce358f543be3ff571177d61beb5713ba6fa4c24c8e91522ca30f8c5b1bf42abd0324164cc6febd04d07c1ae3a311d6d68d62992be6368c20650ca9 SHA512 a411a781913fe81801799d4d801645fd8029ee4fb727431589cb948f97464edd828b8d86969b2207880432db8e8e627fad829fd95394fa121bb0ae97ae8249b0 diff --git a/dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild b/dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild index 6d8b00f7b6b8..04d046f254ed 100644 --- a/dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://archive.mozilla.org/pub/js/${MY_P}.tar.gz LICENSE="NPL-1.1" SLOT="0/js" -KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86" IUSE="threadsafe unicode" S="${WORKDIR}/js/src" diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild index c67caa185273..97c9250c7323 100644 --- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r6.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://archive.mozilla.org/pub/js/${TARBALL_P}.tar.gz LICENSE="NPL-1.1" SLOT="0/mozjs185" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh x86 ~x64-macos" IUSE="debug minimal static-libs test" RESTRICT="!test? ( test )" @@ -34,7 +34,7 @@ DEPEND="${RDEPEND} app-arch/zip virtual/pkgconfig" -pkg_setup(){ +pkg_setup() { if [[ ${MERGE_TYPE} != "binary" ]]; then export LC_ALL="C" fi diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r7.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r7.ebuild index fd28ea6367dd..ade3e165d148 100644 --- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r7.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r7.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://archive.mozilla.org/pub/js/${TARBALL_P}.tar.gz LICENSE="NPL-1.1" SLOT="0/mozjs185" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh x86 ~x64-macos" IUSE="debug minimal static-libs test" RESTRICT="!test? ( test )" @@ -53,7 +53,7 @@ PATCHES=( DOCS=( ${S}/README ) HTML_DOCS=( ${BUILDDIR}/README.html ) -pkg_setup(){ +pkg_setup() { if [[ ${MERGE_TYPE} != "binary" ]]; then export LC_ALL="C" fi diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r9.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r9.ebuild index bca669838263..e5db814edbc4 100644 --- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r9.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -19,7 +19,7 @@ SRC_URI="https://archive.mozilla.org/pub/js/${TARBALL_P}.tar.gz LICENSE="NPL-1.1" SLOT="0/mozjs185" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x64-macos" IUSE="debug minimal static-libs test" RESTRICT="!test? ( test )" @@ -54,7 +54,7 @@ PATCHES=( DOCS=( ${S}/README ) HTML_DOCS=( ${BUILDDIR}/README.html ) -pkg_setup(){ +pkg_setup() { if [[ ${MERGE_TYPE} != "binary" ]]; then export LC_ALL="C" fi diff --git a/dev-lang/spidermonkey/spidermonkey-17.0.0-r5.ebuild b/dev-lang/spidermonkey/spidermonkey-17.0.0-r5.ebuild index 9b4d59218e90..475da252e6e9 100644 --- a/dev-lang/spidermonkey/spidermonkey-17.0.0-r5.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-17.0.0-r5.ebuild @@ -35,7 +35,7 @@ DEPEND="${RDEPEND} app-arch/zip virtual/pkgconfig" -pkg_setup(){ +pkg_setup() { if [[ ${MERGE_TYPE} != "binary" ]]; then python-any-r1_pkg_setup export LC_ALL="C" diff --git a/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild b/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild index b2962d100706..16421949c1ec 100644 --- a/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild @@ -30,7 +30,7 @@ RDEPEND=">=dev-libs/nspr-4.10.10 system-icu? ( >=dev-libs/icu-51.1:= )" DEPEND="${RDEPEND}" -pkg_setup(){ +pkg_setup() { if [[ ${MERGE_TYPE} != "binary" ]]; then moz_pkgsetup fi diff --git a/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild b/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild index f9b6a6f2693b..11e769bf7202 100644 --- a/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild @@ -29,7 +29,7 @@ RDEPEND=">=dev-libs/nspr-4.10.10 system-icu? ( >=dev-libs/icu-51.1:= )" DEPEND="${RDEPEND}" -pkg_setup(){ +pkg_setup() { if [[ ${MERGE_TYPE} != "binary" ]]; then moz_pkgsetup fi diff --git a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r1.ebuild index 816224ccaaf9..b8945962069a 100644 --- a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r1.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -31,7 +31,7 @@ RDEPEND=">=dev-libs/nspr-4.13.1 system-icu? ( >=dev-libs/icu-58.1:= )" DEPEND="${RDEPEND}" -pkg_setup(){ +pkg_setup() { [[ ${MERGE_TYPE} == "binary" ]] || \ moz_pkgsetup diff --git a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild index d556d5cab23d..0590c89489db 100644 --- a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild @@ -31,7 +31,7 @@ RDEPEND=">=dev-libs/nspr-4.13.1 system-icu? ( >=dev-libs/icu-58.1:= )" DEPEND="${RDEPEND}" -pkg_setup(){ +pkg_setup() { [[ ${MERGE_TYPE} == "binary" ]] || \ moz_pkgsetup diff --git a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r2.ebuild index 75bf7cc66f9c..7513a877f330 100644 --- a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r2.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r2.ebuild @@ -38,7 +38,7 @@ pkg_pretend() { check-reqs_pkg_setup } -pkg_setup(){ +pkg_setup() { [[ ${MERGE_TYPE} == "binary" ]] || \ moz_pkgsetup export SHELL="${EPREFIX}/bin/bash" diff --git a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r3.ebuild b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r3.ebuild index 2379bbddba41..d1998882f82b 100644 --- a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r3.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -38,7 +38,7 @@ pkg_pretend() { check-reqs_pkg_setup } -pkg_setup(){ +pkg_setup() { [[ ${MERGE_TYPE} == "binary" ]] || \ moz_pkgsetup export SHELL="${EPREFIX}/bin/bash" diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest index 1bbf55983c81..a95484818488 100644 --- a/dev-lang/swi-prolog/Manifest +++ b/dev-lang/swi-prolog/Manifest @@ -4,10 +4,12 @@ DIST swipl-8.1.18.tar.gz 10865862 BLAKE2B 9728593b9ce890fdb8b4bda8667dbfa9323707 DIST swipl-8.1.19.tar.gz 10865698 BLAKE2B 08da8b7d93a313f621f9bb6abcc509ab6997b673f89483356f6a90f80fd7053acfac611bfaaa2925b3c0d51d7216ea7a1fcbd52dc202961e5a157eb7d0cf0907 SHA512 6094ef47e6c30b5d15f01c8f8c52b125cd04153b9949b6c0a19f4b2e57cd2604377b6b905dec6fa34fd6c6baec1d74d0463c24dfe407fb25643e7e89515b3296 DIST swipl-8.1.20.tar.gz 10866943 BLAKE2B 57efd2dcd7a60589a5f8073703c121c0bcdc988e5da1a638ec542c18b342d51ef6a26ddc2cadc4fd5d79de37134492b9cf447cb0229faf4366f190169c689592 SHA512 c05b57977d9204916dc18cfcc387971f0dcef74d4b5b0cdfd1d134d57faefd81255b668a97d1d09952ea2d0dcadee0997e84305d49d0252549f6f4d57bf84d4e DIST swipl-8.1.21.tar.gz 10867376 BLAKE2B 740ac827190d86e5803c61e09b6c122667fa3d956267a10f052bf35fbbdda3337756764d6a63c963e79321b2f7efb30215d4a9c51eee42f5d73747600120292c SHA512 85bdd1b76a6ca895e4350a688a18cf00a60e83e0ef73b4a4b269881b667504e3d31daefbdc8031423adce025b44d2020819717ef90f35b7a7636792ab4972404 +DIST swipl-8.1.22.tar.gz 10893825 BLAKE2B 7457570728dcf07d9df5c6049366fbe00497063b54eaed3540f80cfab3296da68236afb4816ff65f1fdc74691d0136f3ababc0aceb4da0209675229a13cbdc55 SHA512 7b0154d88688f4dd97ccf198e3e1f11c958345f08f62a5302d33c9530cdad09bf54c47a7f4b107ff2839bc1a354da284bc71f7caaf77e80d53ec412a2c566e5c EBUILD swi-prolog-8.0.3.ebuild 2490 BLAKE2B edc287a8138d4d5e1c1638e316a860aded0a514a76b3b4e66d03977ba277ed280523544a2c6b8187ffb8f3f67035a475e2de80e0bce333dddcab385b06797eb4 SHA512 1c689254578253eb4f138f0ee2f498690c280148c6b544f3995827ed4a11bc61b63e95e1bf85bd83e7ccd0939267964679cf102f7bffb072b122a521d6521a96 EBUILD swi-prolog-8.1.17.ebuild 2594 BLAKE2B f3501afc82f537b8729a49cab6a883fe30aeca2613d963483ae27e97f611629e18d6dd4e4de64d80da627d0d86df9014f0d9ddfade1fe69aac8a54e7b01eb936 SHA512 f2c97e516918257b85af4b3fea975c2deb5879cce17233734659faaffa46072cfa4de6b6b32bed7ae9ccc36e625212b7bdd572f6c00deb4a099bcea8bbc6248b EBUILD swi-prolog-8.1.18.ebuild 2594 BLAKE2B f3501afc82f537b8729a49cab6a883fe30aeca2613d963483ae27e97f611629e18d6dd4e4de64d80da627d0d86df9014f0d9ddfade1fe69aac8a54e7b01eb936 SHA512 f2c97e516918257b85af4b3fea975c2deb5879cce17233734659faaffa46072cfa4de6b6b32bed7ae9ccc36e625212b7bdd572f6c00deb4a099bcea8bbc6248b EBUILD swi-prolog-8.1.19.ebuild 2594 BLAKE2B f3501afc82f537b8729a49cab6a883fe30aeca2613d963483ae27e97f611629e18d6dd4e4de64d80da627d0d86df9014f0d9ddfade1fe69aac8a54e7b01eb936 SHA512 f2c97e516918257b85af4b3fea975c2deb5879cce17233734659faaffa46072cfa4de6b6b32bed7ae9ccc36e625212b7bdd572f6c00deb4a099bcea8bbc6248b EBUILD swi-prolog-8.1.20.ebuild 2594 BLAKE2B d5840bb83530ae6e0b1a00520bec268be97f7695af60f3771849cde506372e7c3ed2181509ff61431354fff79ddb10efcf032b017444cec9afefdfcb078958d5 SHA512 238f4c5eac973338e87cda5426251a43852d0abab3fa084ec09e6b31a754d51c14f8ba05550245bb9225e517345ce7ea6f6df7dab45e384ac56393225b741354 EBUILD swi-prolog-8.1.21.ebuild 2594 BLAKE2B d5840bb83530ae6e0b1a00520bec268be97f7695af60f3771849cde506372e7c3ed2181509ff61431354fff79ddb10efcf032b017444cec9afefdfcb078958d5 SHA512 238f4c5eac973338e87cda5426251a43852d0abab3fa084ec09e6b31a754d51c14f8ba05550245bb9225e517345ce7ea6f6df7dab45e384ac56393225b741354 +EBUILD swi-prolog-8.1.22.ebuild 2594 BLAKE2B d5840bb83530ae6e0b1a00520bec268be97f7695af60f3771849cde506372e7c3ed2181509ff61431354fff79ddb10efcf032b017444cec9afefdfcb078958d5 SHA512 238f4c5eac973338e87cda5426251a43852d0abab3fa084ec09e6b31a754d51c14f8ba05550245bb9225e517345ce7ea6f6df7dab45e384ac56393225b741354 MISC metadata.xml 419 BLAKE2B 6d92e0713ed8da803ff8b6c778e616882af2fdb1426a62ea7bb6a265bbfff9a5c7debb8bf6a25c4ab60ed54a865b79fa3da4a09bc8a9123acf63dcb32107f54e SHA512 f805393c909e4108fe72b94f131d37d45279af1a4b501f9c3ae12d21590ef9c19227ca2a4b2966239ddb84847ce979cfbfcf3f3a2d24b60cb23977c522ff59c3 diff --git a/dev-lang/swi-prolog/swi-prolog-8.1.22.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.22.ebuild new file mode 100644 index 000000000000..67d5ec674d94 --- /dev/null +++ b/dev-lang/swi-prolog/swi-prolog-8.1.22.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils eutils flag-o-matic multilib + +PATCHSET_VER="0" + +DESCRIPTION="versatile implementation of the Prolog programming language" +HOMEPAGE="http://www.swi-prolog.org/" +SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml" +RESTRICT="!test? ( test )" + +RDEPEND="sys-libs/ncurses:= + sys-libs/zlib + archive? ( app-arch/libarchive ) + berkdb? ( >=sys-libs/db-4:= ) + odbc? ( dev-db/unixODBC ) + pcre? ( dev-libs/libpcre ) + readline? ( sys-libs/readline:= ) + libedit? ( dev-libs/libedit ) + gmp? ( dev-libs/gmp:0 ) + ssl? ( + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + ) + java? ( >=virtual/jdk-1.7:= ) + uuid? ( dev-libs/ossp-uuid ) + qt5? ( + dev-qt/qtwidgets:5 + dev-qt/qtgui:5 + ) + X? ( + virtual/jpeg:0 + x11-libs/libX11 + x11-libs/libXft + x11-libs/libXinerama + x11-libs/libXpm + x11-libs/libXt + x11-libs/libICE + x11-libs/libSM ) + yaml? ( dev-libs/libyaml )" + +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto ) + java? ( test? ( =dev-java/junit-3.8* ) )" + +S="${WORKDIR}/swipl-${PV}" +BUILD_DIR="${S}/build" +CMAKE_USE_DIR="${S}" + +src_prepare() { + EPATCH_FORCE=yes + EPATCH_SUFFIX=patch + if [[ -d "${WORKDIR}"/${PV} ]] ; then + epatch "${WORKDIR}"/${PV} + fi + + sed -i -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" CMakeLists.txt || die + + eapply_user + + cmake-utils_src_prepare +} + +src_configure() { + append-flags -fno-strict-aliasing + use debug && append-flags -DO_DEBUG + + mycmakeargs=( + -DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl + -DUSE_GMP=$(usex gmp) + -DINSTALL_DOCUMENTATION=$(use doc && usex archive) + -DSWIPL_PACKAGES_BASIC=$(usex !minimal) + -DSWIPL_PACKAGES_ARCHIVE=$(usex archive) + -DSWIPL_PACKAGES_ODBC=$(usex odbc) + -DSWIPL_PACKAGES_BDB=$(usex berkdb) + -DSWIPL_PACKAGES_PCRE=$(usex pcre) + -DSWIPL_PACKAGES_YAML=$(usex yaml) + -DSWIPL_PACKAGES_SSL=$(usex ssl) + -DSWIPL_PACKAGES_JAVA=$(usex java) + -DSWIPL_PACKAGES_QT=$(usex qt5) + -DSWIPL_PACKAGES_X=$(usex X) + -DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi) + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile \ + XDG_CONFIG_DIRS="${HOME}" \ + XDG_DATA_DIRS="${HOME}" +} + +src_test() { + USE_PUBLIC_NETWORK_TESTS=false \ + USE_ODBC_TESTS=false \ + cmake-utils_src_test -V +} diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest index 06c01288cc91..14f26ab9f3dd 100644 --- a/dev-lang/vala/Manifest +++ b/dev-lang/vala/Manifest @@ -7,16 +7,14 @@ DIST vala-0.40.18.tar.xz 3429060 BLAKE2B 113cebedfefec3a510085e6562012cefedcc687 DIST vala-0.40.19.tar.xz 3435688 BLAKE2B caacacd0ed33a5a1fd465c7494d326941225f4cca052cdeda103430a6313d1f5bf30f254d1f7451663988b1303dc564923ab5717d796673b0af71912c49196ff SHA512 a1ef798ed754192da8677d9dd9627b24c0addd658d38e217ace6889c462a70d1d19c029cd7f660c82b97a48f77eba3b03758ab625ad6ccf4fe20dfd627ecd30a DIST vala-0.44.11.tar.xz 3370248 BLAKE2B c111b6175e6339148e30bedc77f62a9ef3ec912ad0621c9303fc5dba31694173b49ccc433d3681303d64a1e442ed9b7b064f27931369cb13fa028bfc25ffa3c9 SHA512 6111699039ed37084426d7603b82dfa9bd497c66ba7353ee22e8541bf15a2cbb634d315593c093f18c20bac877ae34884e5b570cd25237ce12aa73e941c4c540 DIST vala-0.44.9.tar.xz 3363004 BLAKE2B b87f8f7d9cda5a77486720b8c542c42ed448cfbb6a1bae899591a799dcf25882a0539c3acef282d0ba42a7ea78d68e7a5d99aa4daa306a70afe6938732d03c25 SHA512 9af559a6cb1680013886a4d425e619503d60394f2c7b1ab897cc7830ee566f8122dcd4380b78b551fbf556cead623c245adc1f7f3357b8315be8c120412a3e9f -DIST vala-0.46.5.tar.xz 3375148 BLAKE2B 22bf169159d4f4e23398789e46c39d98a7727cd02e6539104963d34bfe569bad25338b3455ffd32413a36f5cd6061a29bdbbdb275f225f1408d6b34967b64a6c SHA512 eb1763d9c4bfe74441640f7228d44ff7cfd9a379b24b8aa906bc59be4514b319598ffee616d3de1db101134bb163715f33dd1d7a0a10ec03246c7ccf62a4778b DIST vala-0.46.6.tar.xz 3383032 BLAKE2B c7f38cf617f3a0d5a5915ebedd320ef6a5c3714e21618e95756529e1fb09abc12417f31aeefc0111e828da5c2dabd6195b07bb1cc69c6e74f73d72fe7403637a SHA512 ab24c3ad37af62e38289fd085a33f72e178e0b58c1f24c27c58c1010270a4b0e5cb4cc510b6147c51e5796a7ae63aed3a4ac219b24ff985f2546e25c9ad48992 -DIST vala-0.47.4.tar.xz 3408516 BLAKE2B a531bc4698aa40ef413bc0a139225130f8d82bfa2b890ed33e1993203c9c48c345e10dc15bf8b86a0542814a8a41cad330ce15322e68936b6e6b8c31a3516824 SHA512 96d2453ababcb64db7db754a33e0f2e9d60f831a52c39bd086191659efa5941989bdc35b677b992524860f129d28fbbe8e3071e893991b8c8c21d6948d32377f +DIST vala-0.47.92.tar.xz 3422564 BLAKE2B fe204b23f2dbc1bc65641f6c49dd1e0be6ed11bf4a6bf099937b366620247cceb71de231ec3dad426c45e3e72de636ba937fa40e943bc8f9c1f2edca69f5584f SHA512 f5c9342976da04f1145425a1d27303f0fe0ab1c5da8261d813345a9baf375e6f2d86d2a551ef792d58a9ddf7ab6a6acbfae14283a2b0ca7a03f21d354b44675c EBUILD vala-0.36.20.ebuild 804 BLAKE2B 0ce34c37bd7084eff03657ac161df037ff0ece012a11e6df78590fae31b86554a4aeb69637f6b4fb0df9d99c2824cbed3d12d26278058cca5fddd04f341aa001 SHA512 a92306c458421798c3a653ada2248e373af922a506072cbffa187cf62d53a10e2b3ab8487cc810d4cecc073ef359bee7a77d23e5a556399439f45d21dc1de79d EBUILD vala-0.40.16.ebuild 1191 BLAKE2B 3898cbdcbbcfd204a86d0d53f50b2cf164b546ba6fcd253674201ea6e92ff2fd247ee041bda6ebb2ae6d315389f58a2fea1c10ebb1302f98cf3b561a18e23a4e SHA512 8747ff255b4abd158930c93e3affab1ce0403654c76d6ddfb96b006bf8c46913a1369448859c7b3aea72ffd6ec5908201172c61936d158ca4737cab37e6241dc EBUILD vala-0.40.18.ebuild 1192 BLAKE2B ac8b017825026bef4105b39361210c759be3b2b36bfac471ad3e937c67ee59e63726b7d0beea853587018e77d1cb45b5b44d6899619a4d8a355b8b9e19748b43 SHA512 d864dce3a8f3f60d53fc5e4ded0a727979f1711f3f40a20f94fbce32ede8902c8146fb86a3eec364495c351793b16cf817d42c7b555542cadf9d7fddf3d42f5f EBUILD vala-0.40.19.ebuild 1200 BLAKE2B 3accfd2cae135836b2476dfb04da7c627f479f7a3489de231161f412ccaccbcd8df07ed87cde5e75d2fcbd6fc557d52dec453cb50f2dbe2fe46909ae59dcbc93 SHA512 e52d62e05114df2d23f9989ba81c88824fa5460986b8022e43f279205306a68c6b534de30ba9db26b71a9579ba46cecb8a0b68e7454d0d63b5cdd3c93a8961d7 EBUILD vala-0.44.11.ebuild 1115 BLAKE2B 273fb6e1868c95e86f2b17940a8cec199cd315dc80284520bf8440812c9c861c2bd33ab649721a2d212e8d3c48f4c3970996b6656fec679393090d9f654231c3 SHA512 c3206e0fb2ee05696f11147eb67982fabf81004d118ecf45b30636ca64d48920ac025c42236cb05057e5277fa008843bb1239f2036d2f6509deb1c6e3e4f1566 EBUILD vala-0.44.9.ebuild 1113 BLAKE2B 558a67f26468e68c4227dede7d85c16fb74b624968531e142a3984fe6c6f8c0ee3f4d07e0d9cf126d87c81fac2c2243cdc703b97222f7c0287ec66740cc2dac5 SHA512 ad644009ce8c00c2d578fee62e1d31c70958be349061fca62c3ee25249c3f04e233c9492e3182f65234487a940dff35fdd8db011b6afa78c41424fe9cc539a0b -EBUILD vala-0.46.5.ebuild 1316 BLAKE2B a95eccfac99a4e00d44e6208acfbdcb38a5b5db8564dfb37e033fb9d9e759f60ee67e21cdcc57576557d6593b65add6b4fcb9cdcdb4a691f9bace86e8767848a SHA512 36bab891f6580e43f0b1954245a944e95ec85b2066ee87b7e96481d2ad7d89f110187101395525389453b2eea4d20e45879d9a31d5a52ba307d74c6c3e2e2ce6 EBUILD vala-0.46.6.ebuild 1316 BLAKE2B 6783c205ed3da8df3452fccd5b4405dc26f46993e5af226af9e8387e6fc7ddbcf5fdac9f465ac0b5a82aaa6e5d6697c90b65f64b1f7ee7eecdadbb2992de88bb SHA512 235dbcf07c859136f569fae00159497d9693e649e4c234f44239ca73347eb95e69839fe44472ac7d889420a7ba3eb5245d491fb97a4e2c4b80b05e7c8fb70429 -EBUILD vala-0.47.4.ebuild 1316 BLAKE2B 047c254ee4a067bffd15a11b322cb36dfb797d93f4213fafe5c7f4da8599c4f6913fae1ed17f0e2624bb156b56a0a203b89031a573861cc606b3f7d4a6139692 SHA512 ad7a400cc8b18b346193fb451e76948bfa08fb0980e7994b0d364b02817331ab1a923eba88ff4e29dba218ad2bc04563ee624c998a908a6c8c2ce3107ca6048b +EBUILD vala-0.47.92.ebuild 1316 BLAKE2B 047c254ee4a067bffd15a11b322cb36dfb797d93f4213fafe5c7f4da8599c4f6913fae1ed17f0e2624bb156b56a0a203b89031a573861cc606b3f7d4a6139692 SHA512 ad7a400cc8b18b346193fb451e76948bfa08fb0980e7994b0d364b02817331ab1a923eba88ff4e29dba218ad2bc04563ee624c998a908a6c8c2ce3107ca6048b MISC metadata.xml 345 BLAKE2B de3110ae281a87f8cb8f6c10d93705f56f0cfed972cd893a063e66c2629150d491498a29b35b4efe19fa5b6baa740f1d989bad440924befc60ef56423096f108 SHA512 163aa55430a075974d504a5bbb71ad9a249cb215de12a82b3141de18bb05f1e0c2078c02c617cf7d98a97c7f8dd407077183754d8c82c77e80dd0d7b2ec38283 diff --git a/dev-lang/vala/vala-0.46.5.ebuild b/dev-lang/vala/vala-0.46.5.ebuild deleted file mode 100644 index 365332156e80..000000000000 --- a/dev-lang/vala/vala-0.46.5.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit gnome2 - -DESCRIPTION="Compiler for the GObject type system" -HOMEPAGE="https://wiki.gnome.org/Projects/Vala" - -LICENSE="LGPL-2.1+" -SLOT="0.46" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux" -IUSE="test valadoc" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.48.0:2 - >=dev-libs/vala-common-${PV} - valadoc? ( >=media-gfx/graphviz-2.16 ) - !<net-libs/libsoup-2.66.2[vala] -" # Older libsoup generates a libsoup-2.4.vapi that isn't fine for vala:0.46 anymore -# We block here, so libsoup[vala] consumers wouldn't have to >= it, which would be bad -# as the newer is not required with older vala when those are picked instead of 0.46. -# vala-0.45.91 ships a broken libsoup-2.4.vapi copy too, but that'll be fixed by 0.45.92 -DEPEND="${RDEPEND} - dev-libs/libxslt - sys-devel/flex - virtual/pkgconfig - virtual/yacc - test? ( - dev-libs/dbus-glib - >=dev-libs/glib-2.26:2 - dev-libs/gobject-introspection ) -" - -src_configure() { - # weasyprint enables generation of PDF from HTML - gnome2_src_configure \ - --disable-unversioned \ - $(use_enable valadoc) \ - VALAC=: \ - WEASYPRINT=: -} - -src_install() { - default - find "${D}" -name "*.la" -delete || die -} diff --git a/dev-lang/vala/vala-0.47.4.ebuild b/dev-lang/vala/vala-0.47.92.ebuild index e7477d18c547..e7477d18c547 100644 --- a/dev-lang/vala/vala-0.47.4.ebuild +++ b/dev-lang/vala/vala-0.47.92.ebuild |