diff options
Diffstat (limited to 'dev-lang')
63 files changed, 2330 insertions, 1272 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz Binary files differindex 4f701e802d33..c616f19162cc 100644 --- a/dev-lang/Manifest.gz +++ b/dev-lang/Manifest.gz diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest index c7e9ebeb86be..d5bf39a65475 100644 --- a/dev-lang/R/Manifest +++ b/dev-lang/R/Manifest @@ -10,8 +10,8 @@ DIST R-3.3.2.tar.gz 29440670 BLAKE2B 37308fb0caf19c33196b496d5b6f2f1b5b6f75e3ed9 DIST R-3.4.1.tar.gz 30200109 BLAKE2B 03602e9a48759caee8ce047fa6273df7a54af089de4489e21953c0e3fc7bfdf720d924f1e0167d3dbf65f63ed42ac10dea8b45289b921cda1c0e6d25a0063ebb SHA512 19bd50c87dc001ef947c15c1760f27ac8986ff6b43c6d90d3093ae184e42963027ef06faf31ec57ac9e519af7a35a2f53f8ea23ef75d800ebbd02945cedc4651 DIST R-3.5.1.tar.gz 29812849 BLAKE2B 9390934e5da5bd223eee717d4e4c5bd7d47291811318b2fdeac59216081cf9e63119f17bc8fee7235e2426852c50eb5948e6a2a3a632047f41b36460e2584967 SHA512 382cc6e200469dd168799948edcf3a0b869d7ef3b3176fdfc60752f3f37e6ba356323c47d8815a4d9ab6ad3a21cd045d26ef5e75107c8685328e0ffcfd172f7f DIST R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion 13596 BLAKE2B 53338e4a1c4f68beb69247216e553dbcac47f660fbf032bfebf7a660e32d2cff5b11ed35411c52de7e1fd6e00bbf5b5ea19369a325fa0a38bd93d63dc3288cbd SHA512 9ccd19bb1b0c18a2f13035ccd6809447429e197e298fb4d1df808ef345d723b42f75a1b91c349f6dbb46e4a82e59ef33e11300c495d79b63d670d0c0f2b16a06 -EBUILD R-3.2.2.ebuild 6037 BLAKE2B e0a3fc02936429eee12095a4ce5eb5421f9e028e13aea758f7b9a8e106b772f1b965533cc76ce93fbb08f63be0d52f3d38fd1e88f7022fc5f32bb6a45e0e0ad5 SHA512 e49930f4640d6ed0d641c0ffff2e8ce4c7c7238500a1f5d9250620f418c6687998a245b69101ba8186324bf4c8785c9e0125f8626879684c1740ab103795eb53 -EBUILD R-3.3.2.ebuild 6106 BLAKE2B bdc22fd06937cb17e5313b0f36e4f2f0749727114fdec3215df7f0db1f906e92b8bea7d729778507f0217d686f04d1d6f13315551e50a3a7debd0cd5e1dea122 SHA512 b831f6239d61f8f6026e0ad51d5046833ce7c1e8107f7af068be26f66bc275566cd98932a951837d6006014bb40b5196b0d30f40de985366fd094cb9d462f3a6 -EBUILD R-3.4.1.ebuild 6314 BLAKE2B 6287e46cf6ccc1aa201ca89f2936ee001b4befe4259c551e1488f44b5eca3b54f6705741aa8e908d03338e901dee669d54070eb8bd87d1d42c783ccc39b72c26 SHA512 80f4950a291300b4a08934d479c013ceec99c6a9099c07adfee1513940dbe1a3b27db2823855c22b242e82063cb0759344dac9f6d778ade940218de2c126a547 -EBUILD R-3.5.1.ebuild 6311 BLAKE2B f8c22be74d61be715aee736aa4d03c9dd5951aaef1efd95528305ef69e70a46e37bd553802642510866db37b8943c40dd67526103ebb10fb335c78b25ecdd6bf SHA512 a8f4c6047f1b7e397c27622261d7f4e507a723d9255514542905c8d5ffdefbd75cc53e5da46c18c1a3e51ba39241f1e1ba07c1123840d17d3751f04ed80cc464 +EBUILD R-3.2.2.ebuild 6029 BLAKE2B 53a91af83eed96a2c47c61ea3505efdb4f3960206bb6c5c39fbd758578b7b3cebc9d154d6a96c9ea9dfedbe851c0b97ff7066bac74ce598f3821730eb880e6e5 SHA512 45d3213900ba5a817867d1143e5f9d3aa2a418452ff7bd80b5ffdd2c8e056d281b85c0fcc222e3b7c11134ddf097503efee2d1ca5e152f17daa1d41026f69a21 +EBUILD R-3.3.2.ebuild 6097 BLAKE2B 61e6e9f500d6d5f12f8c97c63a183cd0a54c976a4725675cbe3b29f68ca082c8d18e7927132046a94945a692da132c7ab2822039d07abdeefe99c618c1107773 SHA512 0900d19c06a05baa83ab7fb0f802953aa9caab41bd59347e97dd23f6abb4a4f01af5c133db7a5c39a05d8296dc4cef8a8f8b4247c1967b784857ab0979d18ea3 +EBUILD R-3.4.1.ebuild 6305 BLAKE2B 825b0f75bdaa468e635d125f23a19ca694f5fcaf123476811dd4d556ff1126cfea3f0ba0022d6b11d77c2474ef25cbf76442ed33a60fe007798f337a6133194c SHA512 2e6f523d73c6847331f62cd3a1af9b46b67e96c7d610058df0f71c5a0fc49178332a03edc1f499a3c13d1ecf1ab6364e09d2bc8fa94bd8d38700d5489495ca32 +EBUILD R-3.5.1.ebuild 6302 BLAKE2B d2b6b0fa24f3f79c807c99bdcbf7f7898096455df955cd8c08ce8d01b78eac86d32d456c1684e0f7bb087778886c0caaf356d0e9437f22050c7f38dc7002be9e SHA512 41ea0238ff7d823519be6f6be57f4026097be3451a92ee344abcc2fcdd98a99e5bb262f97ef21c5896dd46c2ff672f0ce39c178b68a011341c2f4377850486be MISC metadata.xml 1140 BLAKE2B 774221eb531b4e80f0650b627b9ce53d9a2daf6342b1f19579d2d046e1c83aa497cc764870406b7ea3cf6cbae899cb6d460af92991d62bc6aea8da026a441822 SHA512 297c7e17998f92fb836b0599ce5221aee1ba1e7b1504edb348a602b695faf381d51f32f6118f5ef4bb353f02e92ffc5b3520b8d317d3e30a68a3cce0254fa6b1 diff --git a/dev-lang/R/R-3.2.2.ebuild b/dev-lang/R/R-3.2.2.ebuild index a4ca3845b1ea..df833c293e46 100644 --- a/dev-lang/R/R-3.2.2.ebuild +++ b/dev-lang/R/R-3.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1" SLOT="0" -KEYWORDS="amd64 hppa ia64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="amd64 ia64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X" REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )" diff --git a/dev-lang/R/R-3.3.2.ebuild b/dev-lang/R/R-3.3.2.ebuild index 2a3cb85b5cef..6ca1d812f3ec 100644 --- a/dev-lang/R/R-3.3.2.ebuild +++ b/dev-lang/R/R-3.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ia64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~amd64 ~ia64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X" REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )" diff --git a/dev-lang/R/R-3.4.1.ebuild b/dev-lang/R/R-3.4.1.ebuild index 87ba2dd8f312..e273a93fab87 100644 --- a/dev-lang/R/R-3.4.1.ebuild +++ b/dev-lang/R/R-3.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~hppa ia64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="amd64 ia64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X" REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )" diff --git a/dev-lang/R/R-3.5.1.ebuild b/dev-lang/R/R-3.5.1.ebuild index 23d0c99a3273..6c443c1bd29f 100644 --- a/dev-lang/R/R-3.5.1.ebuild +++ b/dev-lang/R/R-3.5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ia64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~amd64 ~ia64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X" REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )" diff --git a/dev-lang/execline/Manifest b/dev-lang/execline/Manifest index 14b0ac0638c4..2f3d5956d243 100644 --- a/dev-lang/execline/Manifest +++ b/dev-lang/execline/Manifest @@ -1,7 +1,9 @@ DIST execline-2.1.1.0.tar.gz 75967 BLAKE2B 196edcfce385a2a3ef8bc3b16f94401430e06649c1ef9157da603904c296e3601433248046393d0c5ef9805107d09caf21f185b0c3ea3cabfde88508280bd5bd SHA512 250fe449b39a198193f1431b249b342f3c6c499fea12779a55d0e27aec2095285bbf9dc2a48d84eebdf9f540ecf5e67ef39393243ca0fadfc764d2cc95ac0b6b DIST execline-2.3.0.3.tar.gz 82476 BLAKE2B e54bf40037d988848a31b90ca477fb1a297bfc91a6ceb51289944cccc7af36a26b8323c63e8178bd9a252b482a703329c04c9f08a25c2cfe94f5baf60983d04c SHA512 2858ce62853f00f59e0cea8b886cd042f7ad04c6a86208266654d3d2e820b5d440e41cc4efb96fccdcc653d19957d343115a8e8c394b68f23addf941294fb172 DIST execline-2.3.0.4.tar.gz 82774 BLAKE2B a658b538d0a17f15876fe9a822bb7c7e4edba48d2fce1d3c0fe0fd06fd8a414e062a962ca3935992903a4abccf920bf6ee957743609905a6ce498e6fd3deded8 SHA512 ce73b69394ec061ad85cf6f69211180bffe69f1b9716217dadca5894a261f77343d54d5f0339b3822c472720e60c4aa100a0e05dc83f2ad6b926bb53b5141c15 +DIST execline-2.5.0.1.tar.gz 81854 BLAKE2B a70e8c9c3a739fb32573937c9b5c1fb65c730bea7e7760d81b62ea7666727a29ae9902139f78660891e65ed3e6769fc5d6afcb2fb3e030e0c75d3acb6392fd39 SHA512 9e013a83844fc3f5b28c6aea44b446f550dafe52131facf0d7c0648c9ae62c4a62d895f72cedb010754319c0e298fb4c8396d2c6be019cd6218558934bffaea3 EBUILD execline-2.1.1.0.ebuild 1213 BLAKE2B 6fc9dc130bd71bc590e0bf46e763b3936a8c9033fa7b9e267593901470a9a2dc15322c3a18e03fb38676fdd5db0bff0dbd647d1ecc82ece445da23112f7a4ca1 SHA512 788d3961de599828e7acc2159422780edd0c8cf5c0d98aa280d2c4f52eb796b3979dfd9e820ef81007b1c0f7a6252e5805b11c9fbeba5c11b9acc862f4b80bbf EBUILD execline-2.3.0.3.ebuild 1295 BLAKE2B 3b7562389a92c2d92bfcf7b7334638cb7bede79a7b1fc21b57c30661b316e1573c1b56476f94292d499d29ce8f8ccf6279c7f9886e92ed54a89bb2e22c452108 SHA512 f3b3659102780e31c0b6cc61505bf6af2bc1b23af11ca98c4ebb5012b3191f333f2eedc77a7644992c317d4fa3668acabe38f99d80356b07c770cc9b6b2c913f EBUILD execline-2.3.0.4.ebuild 1295 BLAKE2B 00c156c18fbffd8a09272af21cd1b347f8fcabd9d34f5f17f3d9e5ba76c80fcdddfe00a27df02965892b444269f4d3e1bf9d9f41ff2b7d5f67238a72e828d72f SHA512 5f7324afbf7106800542c548214b9d698ad0d2122590df5ea9f5f34433d2d966f7aca43fda286fcf740605358bf0c8d3d47d160cdd714f70dbfcc66db85e20aa +EBUILD execline-2.5.0.1.ebuild 1190 BLAKE2B 9a158994fd21364aec75557447d50142d15bc995b5f4097d8d52dc441864caee948717fbffccb134f35f772bc83723ab20d3b4f1bb85a0e737aff182958ea3aa SHA512 00eb25af751c6efd32869019fe3d6370ae5728f911d1c9db7949cdd046f4c5cc9d5d025e044dd68637ed49a80db2641f912a73ef0de9c53383767454cc0022f0 MISC metadata.xml 808 BLAKE2B 493e9369dca91a49b964006f1abc1a9285a03115b60c13312f83be014d8a8a3a8ab4b3a5b4c21fda6850c317da52440a0f9b5d8fdc5d3536b35d84c059b71731 SHA512 aa5d0e5f6898c853818187a40791e1fed0fce3f3e9429329d9a4224e9fa25165a2336a3202080404c531e8cba718bf6da158b49c108874bf8b72e6d21c9cd31f diff --git a/dev-lang/execline/execline-2.5.0.1.ebuild b/dev-lang/execline/execline-2.5.0.1.ebuild new file mode 100644 index 000000000000..e3d5fb4aabe0 --- /dev/null +++ b/dev-lang/execline/execline-2.5.0.1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="a non-interactive scripting language" +HOMEPAGE="https://www.skarnet.org/software/execline/" +SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="static static-libs" + +REQUIRED_USE="static? ( static-libs )" + +DEPEND=">=dev-libs/skalibs-2.7.0.0[static-libs?]" +RDEPEND="!static? ( >=dev-libs/skalibs-2.7.0.0:= )" + +HTML_DOCS="doc/*" + +src_prepare() { + default + + # Remove QA warning about LDFLAGS addition + sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die + + # configure overrides gentoo's -fstack-protector default + sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die +} + +src_configure() { + econf \ + --bindir=/bin \ + --dynlibdir=/$(get_libdir) \ + --libdir=/usr/$(get_libdir)/${PN} \ + --with-dynlib=/$(get_libdir) \ + --with-lib=/usr/$(get_libdir)/skalibs \ + --with-sysdeps=/usr/$(get_libdir)/skalibs \ + --enable-shared \ + $(use_enable static allstatic) \ + $(use_enable static static-libc) \ + $(use_enable static-libs static) +} diff --git a/dev-lang/ferite/Manifest b/dev-lang/ferite/Manifest index 932c5d38bd7e..1839a7b8c5b1 100644 --- a/dev-lang/ferite/Manifest +++ b/dev-lang/ferite/Manifest @@ -1,4 +1,4 @@ AUX ferite-pcre.patch 1356 BLAKE2B f2c3669e33d12dce6e00d22b5884f0770021eb77297997bd94e777b114f8ae24f7ed23b10d7c877a7bffb61fe9ff0e126bd717ea8c8a8fb8186da89178ba4926 SHA512 e867c4b2fc993963bdf17d992d3dd007f636c85b0c13388480cec0f0ff70b6596274c19cd46b0e3ee11064f607b381f7f76888819ef6fb3bdd0804b07b5087fc DIST ferite-1.1.17.tar.gz 2174774 BLAKE2B 5e55ed4101bc5a9c031afef0d9bfcafdc0c498c4ddc712eb17e3059ebd55b925e6b0343113853b946a31a428e5f71c17a2365e629447bb504453b6a7d61358d8 SHA512 475983b865fba492661e59b7470b7e46889f29ed8ba829b112354963fafcbed6ab4d4677579337c1c4ed730c6fe02897743f56edae335ceda6277da975d1098f -EBUILD ferite-1.1.17-r1.ebuild 2419 BLAKE2B fb80ad9d2c8a3686334bd5d1c1f589965358e48c6d76e915082df64f3b72104bac37ad01c4fee9fca5203e79227b52119a61521b4f1d4b027541cb12bcbe3214 SHA512 bf2c5f4bda036da71a796a15d4b5a2f035fcf90a81800bc3241b55b86b52a6bdba659bff62a257c75e4d8a9499c1c8cae40523623db32299649b56b7de0bef7a +EBUILD ferite-1.1.17-r1.ebuild 2467 BLAKE2B c3610f42a663bca0d35c6234ba0e04c9d6894b46fe06fe43db55ae56b01e1b3dca9fdd915dcc8486fe19b42bb8993ea0f2efe0645abf71a0f865f5e8bd855dd3 SHA512 5bfb72482bea359601365f8d6c0d1fc453f457376478b1231f07bbc67c8f3dfb76fc01a17f628b83a3288a1fffee43229d9e535be4ea2abfd681337fc8aa0460 MISC metadata.xml 243 BLAKE2B fc4ef3433d84176432ef31abd4960ce0e2dcd4979228bf565712a1e574451b34689a8fff3dab4142e3997f084729bba1bc3d2c38d6ddf10d95a11e0b4412e03a SHA512 e3315331fae1a640778867a807694dc624ac88e4dbae2546780534a629d65d054cc6e376245fd31432d663775121cf07d74b2f1cd65d9d2d9cf9137d6598897a diff --git a/dev-lang/ferite/ferite-1.1.17-r1.ebuild b/dev-lang/ferite/ferite-1.1.17-r1.ebuild index 37886bbe0a6e..8b06ab09a724 100644 --- a/dev-lang/ferite/ferite-1.1.17-r1.ebuild +++ b/dev-lang/ferite/ferite-1.1.17-r1.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 - -inherit autotools eutils multilib +EAPI=7 +inherit autotools DESCRIPTION="A clean, lightweight, object oriented scripting language" HOMEPAGE="http://www.ferite.org/" @@ -14,13 +13,17 @@ SLOT="1" KEYWORDS="~alpha amd64 ppc -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" -DEPEND=" - >=dev-libs/libpcre-5 - dev-libs/libxml2" -RDEPEND="${DEPEND}" +RDEPEND=" + dev-libs/boehm-gc[threads] + >=dev-libs/libpcre-5:3 + dev-libs/libxml2:2 +" +DEPEND="${RDEPEND}" src_prepare() { - epatch "${FILESDIR}"/ferite-pcre.patch + default + + eapply "${FILESDIR}"/ferite-pcre.patch # use docsdir variable, install to DESTDIR sed \ @@ -70,9 +73,11 @@ src_configure() { src_install() { cp tools/doc/feritedoc "${T}" || die sed -i -e '/^prefix/s:prefix:${T}:g' "${T}"/feritedoc || die - sed -i -e '/^$prefix/s:$prefix/bin/ferite:'"${ED}"'usr/bin/ferite:' "${T}"/feritedoc || die + sed -i -e '/^$prefix/s:$prefix/bin/ferite:'"${ED}"'/usr/bin/ferite:' "${T}"/feritedoc || die sed -i -e 's:$library_path $library_path:${S}/tools/doc ${S}/tools/doc:' "${T}"/feritedoc || die - export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${ED}usr/lib" + + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${ED}/usr/lib" emake DESTDIR="${D}" LIBDIR="${EPREFIX}"/usr/$(get_libdir) install - prune_libtool_files + + find "${D}" -name '*.la' -delete || die } diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest index ab39b0aa13d4..736fb61d53a5 100644 --- a/dev-lang/gnat-gpl/Manifest +++ b/dev-lang/gnat-gpl/Manifest @@ -13,6 +13,7 @@ DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07 DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 BLAKE2B 96f5ba2028bc6e0ef71e009857c37118a54d13d30de24d697c85e5772f9f2b7853615648cf2e4ee81d8385f6518c64588c0b56675c00f95ef39fca2a808f075e SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517 DIST gcc-4.9-gpl-2016-src.tar.gz 76361760 BLAKE2B 681aac3dd2e04110f58637cc9fe1eb663ce55af16a929a446eb59ce338bec9357e65517890f7fa01d61eec9c5041336722b2b94a5fea27a55ade686fe1fe9fbc SHA512 da1e26b4dbbe0ec634eab4e64d1cdb2632300c24f0885bc72fb57edba6ce29ab92b04eaedd8f8077ea623f1ef1428f53616e8c8d6630328d9790d968b60c67cf DIST gcc-4.9.4-patches-1.2.tar.bz2 25447 BLAKE2B 3141897688409c84cab4ffea67deb220d2218107f279a0cc1758d08c858f3a3856150df48ae37d2f14c6f69bc82de1e87f22cc356f179dfdf47ae9eef28a4182 SHA512 61b1e86e8dbc2838e7b5c88c4a3bab9ed5b6485258b7971799850ffd97cb67ad2564552af4e9ebc860dcc2a4b786c91d2079469468fb95f8e28e2fc981b4c812 +DIST gcc-4.9.4-patches-1.3.tar.bz2 26060 BLAKE2B a61cb29111e8a9e35d810c0c557e901fc0d78e3b62027f5ea622d29becff9492e350c932824b23e5a38604bc3fa6c39fed9db902df4f830a3a362f1a1c2d9f58 SHA512 0214da6712a1b583f028be60e562f742d3d484d930976e2fce7be090113517c0e07faa20f750411b5125902f38a9944fe0c1dc8605d161c5bb11843acdebab75 DIST gcc-4.9.4-piepatches-v0.6.4.tar.bz2 14414 BLAKE2B 2eccd4f2a164fbb32d13c7fe91627a2424c0a5570fe0cac97c2bb1c95294ba3d770832da7c445f75c91791466c5139a1e13753a3a40d87ff5e44e42749adee27 SHA512 243fa272ea0e49f700a76508bab3e03bbb353bcb930581b2f87f9a47df5cd3880e29f20b71612b21190adc463849e1e6ac2a38a49c0002b562d93d436f538285 DIST gcc-4.9.4-uclibc-patches-1.0.tar.bz2 2618 BLAKE2B bff85a4088fb94fdb7a8b0bd552be98ace3e6d145889b6f8b4a1f2db2dad14342d155890ab159b42d5b55d88dfb7c392eb7f92590084e1958f6284c561da30f1 SHA512 5a1f44caa9261f4947101379628143869b31dec67fa28605e8e1f3894d4b7120c3f68ba6deb59da7a74fa906e27ab32cd3767761837dc3dfebc37865d349d6db DIST gcc-4.9.4.tar.bz2 90097606 BLAKE2B 373ff939ea72d6c4a7f3ab899b852b4c919481af2cfe3291281d9354c58a270d2eba73a0f301d90840dfabf423c82b368e113df7a2cb6cc28b2a703b0b6eb585 SHA512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe @@ -21,6 +22,7 @@ DIST gcc-6.3.0-patches-1.0.tar.bz2 7596 BLAKE2B e3c298bd80b83e72d6ea9b4ec777d4f2 DIST gcc-6.3.0.tar.bz2 99903185 BLAKE2B 3dc1e965afcad665d659fbb953978ef297ddbdd4d8918d36b35e977f8a2786b986f6875af2f12c599cc827b2b725d8b79ac021c9b51fb1d6d274318a59aa182c SHA512 234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78 DIST gcc-7-gpl-2018-src.tar.gz 90302033 BLAKE2B 2f79137e176bff04c4fb17ab863302943588226d5b599dfa1acf0e495111be1c581f4e130f911c312916669c4f2707eec5218601db090d5060248b2fe481d710 SHA512 79f06deca5753251de82a703f4a9698c117706290df779291a5405edb06f1c225d1d2416bda0e67dcd87cc308bf79504e89d4bd8e22aa0eedfbf06d88bc37f33 DIST gcc-7.3.0-patches-1.4.tar.bz2 8238 BLAKE2B 72a5dcb046558c8f5c3a75040fe24ce1106c43af7510d6febf667b4377cb9caea5ebe9e1287af90e4ebfffa3f3f22ca85f533acf57c2e2d896f92adc1659b9f5 SHA512 24ed0d82240426efb111bbf48913b96fdc824ae3aa5a653298a726ebe64a40791f484229bbab9cc58f73d658e0b4b83ccd13081cfbea6e1673ef1d076cca3b33 +DIST gcc-7.3.0-patches-1.6.tar.bz2 11313 BLAKE2B cdb823d73a66949cd73f9ebff50cf1cdbb59f04b439a700c239110d36982d70c8acd219402ce8aea26f848d5067856d9aa54470ea683678bbfe9fe08a9f592d1 SHA512 7670deb57e07a83a05f54d962c0faa36d91d8cf43f9f023d3231983e98768d9f90f2a3c9a95f69853086012474fc336bc47fc4af4ab9337b69c89415ce61c1c4 DIST gcc-7.3.0.tar.xz 62462388 BLAKE2B dc8f132b21bd0543c3d9dd17557038aafe65675aa73c540954234a3c972b4c31c939149bd50183d072ab6c8d16919e19daeaaffd619ce2ccd62dbdf9a5bb3302 SHA512 ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4 DIST gcc-interface-4.9-gpl-2016-src.tar.gz 339037 BLAKE2B 8218ea3a3e3ddb11febb5f2fbcfad69ec25251d3ed6bf4f9c70dc9b3720cc2fb3310d704db40bd0c749be89b17a2b3766ddae3d6158313480073856057ad4bcf SHA512 507df314d1890c228c19f458bd51197377deaaa2d6082fe1e71b62b683252ee5fba4adfe2386246e14618b1c77288e0dcb5bf501e2daaca249b6299462c2f6bd DIST gcc-interface-6-gpl-2017-src.tar.gz 347016 BLAKE2B 934c6dac491abece9a6868d28fe9d2a6a1109238fe25c9b94abe83dfc22a1085489f0e0384626da0a3abeebe7537c5715df49a7e2d40577c96eb7ac897b84fd8 SHA512 5833303fce5bf812ccbc71f3d3726c0cb877937d75327edb15097c0b7dba58024a52688392906695ab92fb4e5d7a6623671eac9a05d17937dc0270bafcde920a @@ -30,7 +32,9 @@ 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-r1.ebuild 5680 BLAKE2B 60f04ec0a78d589656ca1c7307c67051cbfe9c97cf2125fc90531631d61e8f28f7b5d8039820033f37145f6780878c4270216c236744b791eb180c577ccbc5b4 SHA512 3879af661544424ef47dd02461e9a815e96411064e1bc12d7ad52dce29ec90a1f836a9619a08d3feb513a245a21f5eaa04e919ba6ff60081fea7bd6faa4f8801 EBUILD gnat-gpl-2016.ebuild 5681 BLAKE2B d1c5db2018a8e8d5c9dbb10caf800aa2b3ea220ed7276fa77c43bdef541e523377ea6024d89db75277a68c28796d8fc5d339bdac52802682cc33e6cb458b3922 SHA512 3a6180130b11c3fc9c417f6cfb0303ee21b6e5c183a547e23e9510ea119d3a5becb31a4a073d5b160f9b7146b35c82ab12ea7bb7cdb53b899e89ca1177c3aebf EBUILD gnat-gpl-2017.ebuild 4916 BLAKE2B 63c46822894529952dec8f45723b09e590c69269bfc4b3408dc6d720fa72b574956aa3e2a8adc51c400baf02414454d3153022e59cb69ebb4c5c9214fefcc40f SHA512 3d7d6b8fac5e9d0be36df050451a959437796d63f30a678d756af7e9aa5a036d13d2a25a2dcbd16aee799c44cb41ade35ca5771a43dc779ec74d341cd835d99b +EBUILD gnat-gpl-2018-r1.ebuild 5001 BLAKE2B 162100c8960728c1c161bf5f7abc89e1e20919e456968b68faaf6a76fb0ca40cd01f223a245a9cc46ccaba0c741a34ff5c2c3a5c6dcc1697f54b2999a6769d63 SHA512 f29bfbfe1e122e6c517f740b9da3a65953cdcae14394810446f3a26c26db81164d48275281d14ad2aa205feaf88780669fe31d8b65c746e84cc39a87c0dba740 EBUILD gnat-gpl-2018.ebuild 4977 BLAKE2B d3444587edad2afcc11eb5a83bcbddc7bdd849140247d9cd049445b356030045709525699e7e616ffa1feda40cd27e141fda5514ef92646e6e56e024e49da504 SHA512 aad1ee06999dec10fa2e7e50867e1a6adbe361de5e795d8f1642831ce2d66559957917d0e9a80cd8498bb447ef8191692f62d162a8760c7831c3468c42946966 MISC metadata.xml 1960 BLAKE2B e66552f4c0655619e736b6af14822d84e6c49aa6c019cb8c8b0e215629f9c8ab68aa55758639e35107120a39c578d82e1036bc0be82ff67728104f44c875d107 SHA512 04f14bcdd96ae4f6e285abfd07de89828eb989ce779aa59decf689920a179d859ffe809d7960e9c3599c2f6fff6ab2aafbb54458da07fa91841c61e0dfca47ab diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2016-r1.ebuild new file mode 100644 index 000000000000..ac29e3d9590c --- /dev/null +++ b/dev-lang/gnat-gpl/gnat-gpl-2016-r1.ebuild @@ -0,0 +1,214 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +PATCH_VER="1.3" +UCLIBC_VER="1.0" + +# Hardened gcc 4 stuff +PIE_VER="0.6.4" +SPECS_VER="0.2.0" +SPECS_GCC_VER="4.4.3" +# arch/libc configurations known to be stable with {PIE,SSP}-by-default +PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64" +PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64" +SSP_STABLE="amd64 x86 mips ppc ppc64 arm" +# uclibc need tls and nptl support for SSP support +# uclibc need to be >= 0.9.33 +SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm" +#end Hardened stuff + +TOOLCHAIN_GCC_PV=4.9.4 + +inherit eutils toolchain-funcs toolchain + +REL=4.9 +MYP=gcc-${REL}-gpl-${PV}-src +BTSTRP_X86=gnat-gpl-2014-x86-linux-bin +BTSTRP_AMD64=gnat-gpl-2014-x86_64-linux-bin + +DESCRIPTION="GNAT Ada Compiler - GPL version" +HOMEPAGE="http://libre.adacore.com/" +SRC_URI+=" + http://mirrors.cdn.adacore.com/art/57399304c7a447658e0aff7f + -> ${P}-src.tar.gz + http://mirrors.cdn.adacore.com/art/573992d4c7a447658d00e1db + -> ${MYP}.tar.gz + http://mirrors.cdn.adacore.com/art/57399232c7a447658e0aff7d + -> gcc-interface-${REL}-gpl-${PV}-src.tar.gz + bootstrap? ( + amd64? ( + http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> + ${BTSTRP_AMD64}.tar.gz + ) + x86? ( + http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> + ${BTSTRP_X86}.tar.gz + ) + )" + +LICENSE+=" GPL-2 GPL-3" +SLOT="${TOOLCHAIN_GCC_PV}" +KEYWORDS="~amd64 ~x86" +IUSE="bootstrap" + +RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}" +DEPEND="${RDEPEND} + elibc_glibc? ( >=sys-libs/glibc-2.8 ) + >=sys-devel/binutils-2.20" + +PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )" + +S="${WORKDIR}"/${MYP} + +FSFGCC=gcc-${TOOLCHAIN_GCC_PV} + +pkg_setup() { + toolchain_pkg_setup + + if use amd64; then + BTSTRP=${BTSTRP_AMD64} + else + BTSTRP=${BTSTRP_X86} + fi + if use bootstrap; then + GCC="${WORKDIR}"/${BTSTRP}/bin/gcc + else + GCC=${ADA:-$(tc-getCC)} + fi + CC=${GCC} + local base=$(basename ${GCC}) + CXX="${base/gcc/g++}" + GNATMAKE="${base/gcc/gnatmake}" + GNATBIND="${base/gcc/gnatbind}" + if [[ ${base} != ${GCC} ]] ; then + local path=$(dirname ${GCC}) + GNATMAKE="${path}/${GNATMAKE}" + GNATBIND="${path}/${GNATBIND}" + CXX="${path}/${CXX}" + fi +} + +src_unpack() { + if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then + eerror "You need a gcc compiler that provides the Ada Compiler:" + eerror "1) use gcc-config to select the right compiler or" + eerror "2) set the bootstrap use flag" + die "ada compiler not available" + fi + + GCC_A_FAKEIT="${P}-src.tar.gz + ${MYP}.tar.gz + ${FSFGCC}.tar.bz2 + gcc-interface-${REL}-gpl-${PV}-src.tar.gz" + if use bootstrap; then + GCC_A_FAKEIT="${GCC_A_FAKEIT} ${BTSTRP}.tar.gz" + fi + + toolchain_src_unpack + if use bootstrap; then + rm ${BTSTRP}/libexec/gcc/${CHOST}/4.7.4/ld || die + fi +} + +src_prepare() { + mv ../${P}-src/src/ada gcc/ || die + mv ../gcc-interface-${REL}-gpl-${PV}-src gcc/ada/gcc-interface || die + + sed -i \ + -e "s:gnatmake:${GNATMAKE}:g" \ + gcc/ada/Make-generated.in || die "sed failed" + + sed -i \ + -e "/xoscons/s:gnatmake:${GNATMAKE}:g" \ + gcc/ada/gcc-interface/Makefile.in || die "sed failed" + + mv ../${FSFGCC}/gcc/doc/gcc.info gcc/doc/ || die + mv ../${FSFGCC}/libjava . || die + rm -r ../${FSFGCC} || die + + cd .. + epatch "${FILESDIR}"/${P}-gentoo.patch + rm patch/10_all_default-fortify-source.patch + rm piepatch/34_all_gcc48_config_i386.patch + cd - + + if has_version '<sys-libs/glibc-2.12' ; then + ewarn "Your host glibc is too old; disabling automatic fortify." + ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315" + EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch" + fi + + # Bug 638056 + epatch "${FILESDIR}/${P}-bootstrap.patch" + + toolchain_src_prepare + + use vanilla && return 0 + # Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs. + [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch +} + +src_configure() { + local trueGCC_BRANCH_VER=${GCC_BRANCH_VER} + GCC_BRANCH_VER=$(gcc-version) + downgrade_arch_flags + GCC_BRANCH_VER=${trueGCC_BRANCH_VER} + toolchain_src_configure \ + --enable-languages=ada \ + --disable-libada \ + CC=${GCC} \ + GNATBIND=${GNATBIND} \ + GNATMAKE=yes +} + +src_compile() { + unset ADAFLAGS + toolchain_src_compile + gcc_do_make "-C gcc gnatlib-shared" + ln -s gcc ../build/prev-gcc || die + ln -s ${CHOST} ../build/prev-${CHOST} || die + gcc_do_make "-C gcc gnattools" +} + +src_install() { + toolchain_src_install + cd "${D}"${BINPATH} + for x in gnat*; do + # For some reason, g77 gets made instead of ${CTARGET}-g77... + # this should take care of that + if [[ -f ${x} ]] ; then + # In case they're hardlinks, clear out the target first + # otherwise the mv below will complain. + rm -f ${CTARGET}-${x} + mv ${x} ${CTARGET}-${x} + fi + + if [[ -f ${CTARGET}-${x} ]] ; then + if ! is_crosscompile ; then + ln -sf ${CTARGET}-${x} ${x} + dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ + /usr/bin/${x}-${GCC_CONFIG_VER} + fi + # Create versioned symlinks + dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ + /usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER} + fi + + if [[ -f ${CTARGET}-${x}-${GCC_CONFIG_VER} ]] ; then + rm -f ${CTARGET}-${x}-${GCC_CONFIG_VER} + ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER} + fi + done +} + +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}" + einfo "Even if the c/c++ compilers are using almost the same patched" + einfo "source as the sys-devel/gcc package its use is not extensively" + einfo "tested, and not supported for updating your system, except for ada" + einfo "related packages" +} diff --git a/dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild new file mode 100644 index 000000000000..13a8539ec192 --- /dev/null +++ b/dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild @@ -0,0 +1,191 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +PATCH_VER="1.6" + +TOOLCHAIN_GCC_PV=7.3.0 +GCC_CONFIG_VER=7.3.1 + +inherit eutils toolchain-funcs toolchain + +REL=7 +MYP=gcc-${REL}-gpl-${PV}-src +BTSTRP_X86=gnat-gpl-2014-x86-linux-bin +BTSTRP_AMD64=gnat-gpl-2014-x86_64-linux-bin + +DESCRIPTION="GNAT Ada Compiler - GPL version" +HOMEPAGE="http://libre.adacore.com/" +SRC_URI+=" + http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa5 + -> ${P}-src.tar.gz + http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa7 + -> ${MYP}.tar.gz + http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa6 + -> gcc-interface-${REL}-gpl-${PV}-src.tar.gz + bootstrap? ( + amd64? ( + http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> + ${BTSTRP_AMD64}.tar.gz + ) + x86? ( + http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> + ${BTSTRP_X86}.tar.gz + ) + )" + +LICENSE+=" GPL-2 GPL-3" +KEYWORDS="~amd64 ~x86" +IUSE="+bootstrap" + +RDEPEND="!sys-devel/gcc:${GCC_CONFIG_VER}" +DEPEND="${RDEPEND} + elibc_glibc? ( >=sys-libs/glibc-2.13 ) + >=sys-devel/binutils-2.20" + +S="${WORKDIR}"/${MYP} +PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )" +FSFGCC=gcc-${TOOLCHAIN_GCC_PV} + +pkg_setup() { + toolchain_pkg_setup + + if use amd64; then + BTSTRP=${BTSTRP_AMD64} + else + BTSTRP=${BTSTRP_X86} + fi + + if use bootstrap; then + GCC="${WORKDIR}"/${BTSTRP}/bin/gcc + else + GCC=${ADA:-$(tc-getCC)} + fi + + gnatbase=$(basename ${GCC}) + gnatpath=$(dirname ${GCC}) + + GNATMAKE=${gnatbase/gcc/gnatmake} + if [[ ${gnatpath} != "." ]] ; then + GNATMAKE="${gnatpath}/${GNATMAKE}" + fi +} + +src_unpack() { + if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then + eerror "You need a gcc compiler that provides the Ada Compiler:" + eerror "1) use gcc-config to select the right compiler or" + eerror "2) set the bootstrap use flag" + die "ada compiler not available" + fi + + GCC_A_FAKEIT=" + ${P}-src.tar.gz + ${MYP}.tar.gz + gcc-interface-${REL}-gpl-${PV}-src.tar.gz" + if use bootstrap; then + GCC_A_FAKEIT="${GCC_A_FAKEIT} ${BTSTRP}.tar.gz" + fi + + toolchain_src_unpack + if use bootstrap; then + rm ${BTSTRP}/libexec/gcc/${CHOST}/4.7.4/ld || die + fi +} + +src_prepare() { + CC=${GCC} + CXX="${gnatbase/gcc/g++}" + GNATBIND="${gnatbase/gcc/gnatbind}" + GNATLINK="${gnatbase/gcc/gnatlink}" + GNATLS="${gnatbase/gcc/gnatls}" + if [[ ${gnatpath} != "." ]] ; then + CXX="${gnatpath}/${CXX}" + GNATBIND="${gnatpath}/${GNATBIND}" + GNATLINK="${gnatpath}/${GNATLINK}" + GNATLS="${gnatpath}/${GNATLS}" + fi + mkdir bin || die + ln -s $(which ${GCC}) bin/gcc || die + ln -s $(which ${CXX}) bin/g++ || die + ln -s $(which ${GNATMAKE}) bin/gnatmake || die + ln -s $(which ${GNATBIND}) bin/gnatbind || die + ln -s $(which ${GNATLINK}) bin/gnatlink || die + ln -s $(which ${GNATLS}) bin/gnatls || die + + cd .. + mv ${P}-src/src/ada ${MYP}/gcc/ || die + mv gcc-interface-${REL}-gpl-${PV}-src ${MYP}/gcc/ada/gcc-interface || die + epatch "${FILESDIR}"/${P}-gentoo.patch + rm patch/91_all_bmi-i386-PR-target-81763.patch || die + rm patch/93_all_copy-constructible-fix.patch || die + rm patch/95*.patch || die + cd - + sed -i \ + -e 's:$(P) ::g' \ + gcc/ada/gcc-interface/Makefile.in \ + || die "sed failed" + toolchain_src_prepare +} + +src_configure() { + export PATH=${PWD}/bin:${PATH} + local trueGCC_BRANCH_VER=${GCC_BRANCH_VER} + GCC_BRANCH_VER=$(gcc-version) + downgrade_arch_flags + GCC_BRANCH_VER=${trueGCC_BRANCH_VER} + toolchain_src_configure \ + --enable-languages=ada \ + --disable-libada +} + +src_compile() { + unset ADAFLAGS + toolchain_src_compile + gcc_do_make "-C gcc gnatlib-shared" + ln -s gcc ../build/prev-gcc || die + ln -s ${CHOST} ../build/prev-${CHOST} || die + gcc_do_make "-C gcc gnattools" +} + +src_install() { + toolchain_src_install + cd "${D}"${BINPATH} + for x in gnat*; do + # For some reason, g77 gets made instead of ${CTARGET}-g77... + # this should take care of that + if [[ -f ${x} ]] ; then + # In case they're hardlinks, clear out the target first + # otherwise the mv below will complain. + rm -f ${CTARGET}-${x} + mv ${x} ${CTARGET}-${x} + fi + + if [[ -f ${CTARGET}-${x} ]] ; then + if ! is_crosscompile ; then + ln -sf ${CTARGET}-${x} ${x} + dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ + /usr/bin/${x}-${GCC_CONFIG_VER} + fi + # Create versioned symlinks + dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ + /usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER} + fi + + if [[ -f ${CTARGET}-${x}-${GCC_CONFIG_VER} ]] ; then + rm -f ${CTARGET}-${x}-${GCC_CONFIG_VER} + ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER} + fi + done +} + +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}" + einfo "Even if the c/c++ compilers are using almost the same patched" + einfo "source as the sys-devel/gcc package its use is not extensively" + einfo "tested, and not supported for updating your system, except for ada" + einfo "related packages" +} diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest index ce7f97e4ba07..794c945bef19 100644 --- a/dev-lang/go/Manifest +++ b/dev-lang/go/Manifest @@ -12,12 +12,14 @@ DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 BLAKE2B 0a45312f090d81ebf46fe59 DIST go1.10.1.src.tar.gz 18305765 BLAKE2B 61b8db22c50b9a4653244dc18267f405607755932d84ea2c475338a9f4a5421da2bb8cc808dbd166aa35c3c8778180bf47d6e51ebe303bc62e582516919058f9 SHA512 13f6b0643a4f92eeca04444b9fa10de38fc3427daea9aa3227cf9a5738ffee1a3f2e355ba5faf711b8506f7de118bdcd3b9064b65407a22613523e29ffd73415 DIST go1.10.2.src.tar.gz 18308678 BLAKE2B 5f16757f879e9be9d2e936bc5e3cefcfd32914dbe7def8252b20ac647c90cfae09dfd7ff782f55cee4b3fecda6cc88c547f20087b571dbd06bc7600510c788bc SHA512 754e60bce1ea3479ebb57bbbb625e3d7875a151e7a6d7a1067478a9e45bde5423f47123d084832bb838acf7675a9d05057b76c1d773e43cae0fb4e7a52acf4a9 DIST go1.10.3.src.tar.gz 18323736 BLAKE2B f07ea774378eb25e28fc29ce6d8d7ed84227d4b93bfa93d38a071fe294da30c3cdc3a559d643e7379873df56b0e2731dbd772e385ffcb4b2e93819db3b4e33f2 SHA512 fd2bd5fcb5c6d0a5336c4b1d2cacb368edbb01359297a83bdedc53f6018642598232f00633fc60fde879050f5f26a810c828d46b5d6626cbcc0702d93ad33fbb +DIST go1.11.1.src.tar.gz 21097206 BLAKE2B 12303f57a92ec64badffea9e98a0361f48b844d423f3ed454ba4bfdd367425e7b318de1cf9b3e7835585f6dbb01f5c07bfb43adbfcc90a590b35984752ef8d3c SHA512 9c19f40b24f2180563705511a5692932c0db3585939053e6d78eea1f394902d37f05b0386f0e7d0c0266178de7e9bd7b003324ed232ce2e5050c9faafafdd979 DIST go1.11.src.tar.gz 21091932 BLAKE2B 029b1c43b6244ab320b24fccca2bac693a0df0f975da2880a24e85fafbd7d6c836f63c609f1df44fb3eacc1c66c3d147858b7a2b9c0c370bb8fdbc8614b35713 SHA512 2758b7924b4b8cffc30b56fbf039b8e23d1a3c42506ed4997bd64531ba742e2c60e95d1fa70cae2ccda45d1959fadccfd2404af87d962530e4b1d3556c4aaf43 DIST go1.9.6.src.tar.gz 16397247 BLAKE2B 36c9077177bd7bbe9b40c422c5faf7aa83fdd8a2360051cb026346a9fea35297d892d6c677962c498ea8531c1748d58a55bbb1db7c1cf323a1d65c0b9b8573fd SHA512 f7863a4fe586414c91465a6a82a47097b2593384688a7c68ad3e9981559047b4faf2c134104ad09a64125576dac557809884d9f125d91108dd51746620a368a2 DIST go1.9.7.src.tar.gz 16401688 BLAKE2B f6fa7b7171595f6bb2b1860c10a34c386b781504b772a37b60ccd613850f916a463bdb1e2bf299c3d8e78e38cbdf0b59e1ee8dfc3597ef888450efb3eb6afc49 SHA512 1ed3375870223a73c9cf94839bfd8894b92f44f9a3ba3b2bec1e9cd8d2212519344c8afcb87a516d6ad3e1ccdc74d9dba225a222bdc5e60f6d73cb474d5f7664 EBUILD go-1.10.1.ebuild 5653 BLAKE2B 4807f630943168bc970ee2f94acdd82b7619c55d0ea7fd33fbc5f5f0107342f1edf18edfe8e4c6f1a75063755c67a8b0c5d578ca3de275d8c960315dead33c5a SHA512 f51d57aa2a504ae77b3f117f2a3f1d088d534a3dcf9ec16d102e71b42a479618a18b495b6aacf967f90d7cbaf47f3e7c39e16d65fa120be1bba7726c552d1e48 EBUILD go-1.10.2.ebuild 5656 BLAKE2B 1a140da0f482e46eaf80aa9836e934440fb309a61519c164999e75340614b383fc18dcc4cf3d70addd42f5ef289c9b167dfdc99abf52159aedb163c7426684e2 SHA512 630d6003c12c9f512f4c259be18e5c5716627968cc4725ed6d016076984aae3f90b30ce542ed8407f95a9db377502265e30b6a36d5725ce36ca3005d2c00535a EBUILD go-1.10.3.ebuild 5653 BLAKE2B 4807f630943168bc970ee2f94acdd82b7619c55d0ea7fd33fbc5f5f0107342f1edf18edfe8e4c6f1a75063755c67a8b0c5d578ca3de275d8c960315dead33c5a SHA512 f51d57aa2a504ae77b3f117f2a3f1d088d534a3dcf9ec16d102e71b42a479618a18b495b6aacf967f90d7cbaf47f3e7c39e16d65fa120be1bba7726c552d1e48 +EBUILD go-1.11.1.ebuild 5653 BLAKE2B 06e491cb9a25870709a9cc04f6e5d45121153bc02b9ff9f6390a006ba175550a2b3ca0adf4f9245b6726ae0b9db39146547f764dd0d466e04fb6552b7f0a26d6 SHA512 30f3f945be04c191e44cbaf2fff47a89cbe910bb2230bafe2817c39cfe4f3da7ea7ad586fa2752bdf378a1e7334e2fd6f392ffeb6d9b3d924c4be765b89a628e EBUILD go-1.11.ebuild 5656 BLAKE2B 1a140da0f482e46eaf80aa9836e934440fb309a61519c164999e75340614b383fc18dcc4cf3d70addd42f5ef289c9b167dfdc99abf52159aedb163c7426684e2 SHA512 630d6003c12c9f512f4c259be18e5c5716627968cc4725ed6d016076984aae3f90b30ce542ed8407f95a9db377502265e30b6a36d5725ce36ca3005d2c00535a EBUILD go-1.9.6.ebuild 5650 BLAKE2B ad97b072bf73db28d60b1afb3bc3fea2159d87edc3ed0433b3e010979b01568caf81f7d6f22959ed854b7870ca5e0397a0f71e2e9488c4bb277ce0bc0a591a9f SHA512 a5a1c5037c52422d98b42c5688ba88918e548c8679d722d7d85dc3c51228ac944400a339a8e6a4018f2f438afec8365cd3550b35e6b595b097eecdec08befc84 EBUILD go-1.9.7.ebuild 5649 BLAKE2B d448a6132d795715d7b42daa2f437b1bfadeae1fb5c4cef936343c0e31bd415bd5a6deab2a3690ddc03afbac612ec2a9d39951dfcdc49b3217016bbc620a25fc SHA512 275f0808e1e1b0687ed1ea85785afd02713e6877fe2a107b614522644fe5b7a81742f16aa8291c4001ef225ff7e31ed4270c3d8dcc991b2d97d20f1174f72f0f diff --git a/dev-lang/go/go-1.11.1.ebuild b/dev-lang/go/go-1.11.1.ebuild new file mode 100644 index 000000000000..3eecca0eb622 --- /dev/null +++ b/dev-lang/go/go-1.11.1.ebuild @@ -0,0 +1,228 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} + +MY_PV=${PV/_/} + +inherit toolchain-funcs + +BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist" +BOOTSTRAP_VERSION="bootstrap-1.8" +BOOTSTRAP_URI=" +amd64? ( ${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz ) +arm? ( ${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz ) +arm64? ( ${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz ) +ppc64? ( + ${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz +) +s390? ( ${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz ) +x86? ( ${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz ) +amd64-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz ) +x86-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz ) +x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz ) +x64-solaris? ( ${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz ) +" + +case ${PV} in +*9999*) + EGIT_REPO_URI="https://github.com/golang/go.git" + inherit git-r3 + ;; +*) + SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz " + S="${WORKDIR}"/go + case ${PV} in + *_beta*|*_rc*) ;; + *) + KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris" + # The upstream tests fail under portage but pass if the build is + # run according to their documentation [1]. + # I am restricting the tests on released versions until this is + # solved. + # [1] https://golang.org/issues/18442 + RESTRICT="test" + ;; + esac +esac +SRC_URI+="!gccgo? ( ${BOOTSTRAP_URI} )" + +DESCRIPTION="A concurrent garbage collected and typesafe programming language" +HOMEPAGE="https://golang.org" + +LICENSE="BSD" +SLOT="0/${PV}" +IUSE="gccgo" + +DEPEND="gccgo? ( >=sys-devel/gcc-5[go] )" +RDEPEND="!<dev-go/go-tools-0_pre20150902" + +# These test data objects have writable/executable stacks. +QA_EXECSTACK=" + usr/lib/go/src/debug/elf/testdata/*.obj + usr/lib/go/src/go/internal/gccgoimporter/testdata/escapeinfo.gox + usr/lib/go/src/go/internal/gccgoimporter/testdata/unicode.gox + usr/lib/go/src/go/internal/gccgoimporter/testdata/time.gox + " + +# Do not complain about CFLAGS, etc, since Go doesn't use them. +QA_FLAGS_IGNORED='.*' + +REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*" + +# The tools in /usr/lib/go should not cause the multilib-strict check to fail. +QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*" + +# Do not strip this package. Stripping is unsupported upstream and may +# fail. +RESTRICT+=" strip" + +DOCS=( +AUTHORS +CONTRIBUTING.md +CONTRIBUTORS +PATENTS +README.md +) + +go_arch() +{ + # By chance most portage arch names match Go + local portage_arch=$(tc-arch $@) + case "${portage_arch}" in + x86) echo 386;; + x64-*) echo amd64;; + ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;; + s390) echo s390x ;; + *) echo "${portage_arch}";; + esac +} + +go_arm() +{ + case "${1:-${CHOST}}" in + armv5*) echo 5;; + armv6*) echo 6;; + armv7*) echo 7;; + *) + die "unknown GOARM for ${1:-${CHOST}}" + ;; + esac +} + +go_os() +{ + case "${1:-${CHOST}}" in + *-linux*) echo linux;; + *-darwin*) echo darwin;; + *-freebsd*) echo freebsd;; + *-netbsd*) echo netbsd;; + *-openbsd*) echo openbsd;; + *-solaris*) echo solaris;; + *-cygwin*|*-interix*|*-winnt*) + echo windows + ;; + *) + die "unknown GOOS for ${1:-${CHOST}}" + ;; + esac +} + +go_tuple() +{ + echo "$(go_os $@)_$(go_arch $@)" +} + +go_cross_compile() +{ + [[ $(go_tuple ${CBUILD}) != $(go_tuple) ]] +} + +pkg_pretend() +{ + # make.bash does not understand cross-compiling a cross-compiler + if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then + die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}" + fi +} + +src_unpack() +{ + if [[ ${PV} = 9999 ]]; then + git-r3_src_unpack + fi + default +} + +src_compile() +{ + export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os)-$(go_arch)-bootstrap + if use gccgo; then + mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die + local go_binary=$(gcc-config --get-bin-path)/go-$(gcc-major-version) + [[ -x ${go_binary} ]] || go_binary=$( + find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) | + sort -V | tail -n1) + [[ -x ${go_binary} ]] || + die "go-$(gcc-major-version): command not found" + ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die + fi + export GOROOT_FINAL="${EPREFIX}"/usr/lib/go + export GOROOT="$(pwd)" + export GOBIN="${GOROOT}/bin" + + # Go's build script does not use BUILD/HOST/TARGET consistently. :( + export GOHOSTARCH=$(go_arch ${CBUILD}) + export GOHOSTOS=$(go_os ${CBUILD}) + export CC=$(tc-getBUILD_CC) + + export GOARCH=$(go_arch) + export GOOS=$(go_os) + export CC_FOR_TARGET=$(tc-getCC) + export CXX_FOR_TARGET=$(tc-getCXX) + if [[ ${ARCH} == arm ]]; then + export GOARM=$(go_arm) + fi + einfo "GOROOT_BOOTSTRAP is ${GOROOT_BOOTSTRAP}" + + cd src + ./make.bash || die "build failed" +} + +src_test() +{ + go_cross_compile && return 0 + + cd src + PATH="${GOBIN}:${PATH}" \ + ./run.bash -no-rebuild || die "tests failed" +} + +src_install() +{ + local bin_path f x + + dodir /usr/lib/go + + # There is a known issue which requires the source tree to be installed [1]. + # Once this is fixed, we can consider using the doc use flag to control + # installing the doc and src directories. + # [1] https://golang.org/issue/2775 + # + # deliberately use cp to retain permissions + cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go + if go_cross_compile; then + bin_path="bin/$(go_tuple)" + else + bin_path=bin + fi + for x in ${bin_path}/*; do + f=${x##*/} + dosym ../lib/go/${bin_path}/${f} /usr/bin/${f} + done + einstalldocs +} diff --git a/dev-lang/mono-basic/Manifest b/dev-lang/mono-basic/Manifest index a7f20c33a3d7..30e8a1ca8ec8 100644 --- a/dev-lang/mono-basic/Manifest +++ b/dev-lang/mono-basic/Manifest @@ -1,5 +1,7 @@ DIST mono-basic-4.6.tar.bz2 2051520 BLAKE2B 0fc4961e9beb0894dcc081ecd06abf8a2e1c3d1aa6bb129b72d2c87ab15e9e779c0305f030515b18bd218ac595cd03ebad2fef5403dfc5aeb7a58b8886d085a0 SHA512 a8b50f9fa0d2e7533429722e584f42ee3e3794e1e013a2ca75b616b2b7b8c755dbe0722187b5e0982b9ebb8b5d22310a21fcfd55a6c027ee6eadcc7887e106d9 DIST mono-basic-4.7.tar.bz2 2051806 BLAKE2B 8d8beb26bfc79c5ff648d671fc92d0f15204694ac735d1ab0c375547f7f4a89519f24bc512ecc16ae93455c7c28978ef2112804335a02b9ccb63e537298e11d5 SHA512 c690f81d7af64d1592bc480be230abc93480728288291fe85de5c8b273eb6127d619c3bd02f2acd285b9b055ef4f2970a764b34f49f15e59ed238d01c151c99a EBUILD mono-basic-4.6-r1.ebuild 362 BLAKE2B 618f679c8799d411890b6cc04659c483e625cf61fcbb90170f40e836b7dc70f0a43b5e8a74e882c41d6e38da6fae1b702b56bff81479cc889ba4a1ca30278254 SHA512 af3b3f01bf27ee045698b2f5eafbdac6aa38e78880059a484c22e0bf271702a105c26e44d2d045bf318d66886b05c221ca7c05ff4e8a87b9f8ba7d1b0c5daed9 +EBUILD mono-basic-4.6-r2.ebuild 376 BLAKE2B 488be1e16d840dc0cfa39a3da5fc5ec5cfb43d41cf9776d771df53a7144698afc459ff75b15097a7f1ac3ff10c460109d18bdb24e55a4d2d9e6efaef4ee4efbf SHA512 75a592dc0813ffeec52c2f5d00da1c56db926e2fb4620dc0073773a787abd046320339cd8dc7b34f846a7faec2f1a1de525fb10e8f27c0c874a2daaa7ef48d8f +EBUILD mono-basic-4.7-r1.ebuild 376 BLAKE2B 488be1e16d840dc0cfa39a3da5fc5ec5cfb43d41cf9776d771df53a7144698afc459ff75b15097a7f1ac3ff10c460109d18bdb24e55a4d2d9e6efaef4ee4efbf SHA512 75a592dc0813ffeec52c2f5d00da1c56db926e2fb4620dc0073773a787abd046320339cd8dc7b34f846a7faec2f1a1de525fb10e8f27c0c874a2daaa7ef48d8f EBUILD mono-basic-4.7.ebuild 360 BLAKE2B 46c2cc0d9f60948231b3242130f042a2a90517d87ebd27630281a0b239ff0ba316c5ae481f0e3226c2c03516ba1f3ee7230d3a2c00eb73eeeec4d2746a82a3b7 SHA512 8c7955d9e62c3f065dabe59c0a4fa3be3f52fa238f3c8033abd8ff45d882b70dc8f326af304bb44b06996e42bc5127a2c40f809853df743f2d48e51e01fac6d3 MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3 diff --git a/dev-lang/mono-basic/mono-basic-4.6-r2.ebuild b/dev-lang/mono-basic/mono-basic-4.6-r2.ebuild new file mode 100644 index 000000000000..9a28161ec719 --- /dev/null +++ b/dev-lang/mono-basic/mono-basic-4.6-r2.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit mono-env + +DESCRIPTION="Visual Basic Compiler and Runtime" +HOMEPAGE="https://www.mono-project.com/docs/about-mono/languages/visualbasic/" + +KEYWORDS="~amd64 ~x86" +LICENSE="LGPL-2 MIT" +SLOT="0" + +RDEPEND="dev-lang/mono" +DEPEND="${RDEPEND}" + +RESTRICT="test" diff --git a/dev-lang/mono-basic/mono-basic-4.7-r1.ebuild b/dev-lang/mono-basic/mono-basic-4.7-r1.ebuild new file mode 100644 index 000000000000..9a28161ec719 --- /dev/null +++ b/dev-lang/mono-basic/mono-basic-4.7-r1.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit mono-env + +DESCRIPTION="Visual Basic Compiler and Runtime" +HOMEPAGE="https://www.mono-project.com/docs/about-mono/languages/visualbasic/" + +KEYWORDS="~amd64 ~x86" +LICENSE="LGPL-2 MIT" +SLOT="0" + +RDEPEND="dev-lang/mono" +DEPEND="${RDEPEND}" + +RESTRICT="test" diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest index 7b03f0fcd927..4f43e3304b5b 100644 --- a/dev-lang/mono/Manifest +++ b/dev-lang/mono/Manifest @@ -4,15 +4,11 @@ AUX mono-4.8.0.371-x86_32.patch 1033 BLAKE2B cfcd8163180de91aec85841ce6c129faba2 AUX mono-5.0.1.1-x86_32.patch 751 BLAKE2B 1a19219c5667715a9afb7dc74ba9714893eea684a0c48945bcb70bdd83e34138a77ca029bcc8341b58af93617b4eab3251885affb3d129e8bf072a0279b8d29b SHA512 8c3d3a65f9d9a9a51c4a01dfd14e32e01bcc7cb98bd4f6a196a2a166968521ff859ccb1efd689c612c8bab5d6a384b148039de5033235a2c0552bc455dd636b7 AUX mono-5.12-try-catch.patch 1267 BLAKE2B e33836d53fd4c9a4e64614d3f309058b2009487a853aee48fae99cd0326095b6dc26e7fbdd178e25f9fc3901f74f937ce5e9d3bb4322ca50e139d13f66c209a5 SHA512 3a82d4bed31b212e23fe24647fc5b9c4788be5f4966377a3bef9f92a51d16181e77e19ca1ec4736792da6a18206986bbb54d967499e2ca7e224201cf811f91b5 DIST mono-4.4.1.0.tar.bz2 85897587 BLAKE2B 79651189e696aa7352704e1ac659302423b1212c88337da8d522aad8e8a49855b74c43020f506b3455ce1a99566e96ae464fecced584b14470d0c8dfe605c5b6 SHA512 d9b6c57c2d9327ea551083b81a2e6cc222ded9a04862056b0dfded1c5df56efbfc4960097df034595012231fe50d172174ab7b3e3f2d8c4c6953ab2106b1cb6a -DIST mono-4.6.1.5.tar.bz2 83174665 BLAKE2B ce4586af882c6592d1615156d009e496b8405dcf3a2b59e53bb58d1949c33d68645506378eab272a6ef340194582333c515b38f635e961edc64767078905a2df SHA512 1d0c1ec2930ecea3faf1be572bc045300ef4a90d3fe7519f2a9c797be79298c61528d83baa5a24a57143a35be80f78297196556c33cd0f345d9907a973fe625a DIST mono-4.8.0.524.tar.bz2 87392723 BLAKE2B ac17c3da6d6c08c4cb72c4fa300ded92625bd8c14c1e45ea9539efa42c8d085759f7bb298fe5df57bd41f18abf83f293d26a9e6272944933fcff0a3c16a7e4f3 SHA512 eb77b768a4a26e6a2a872f4845769cdc83f01af3377ecd6d932437d2a1b54bfd1ce727563906146195a54997b4b624fb75449a6f0bcfe818cbc4e6544841bf2b -DIST mono-5.12.0.226.tar.bz2 213373240 BLAKE2B 6aa8d9962aa51d6a7f8f6106835cef6a4eb626d7af56a09ca185736db2535dbaffd5d97d5d0eef39001b11d41d868706be4788496c8d0036bdbad24c5f6fcc46 SHA512 f4ab3066c9a3545ace0c4af50ddbe58cf5d9ffe4895cc546669f329b91988fcfebab91a070ea46b27536040823a3bbc1bd7e5552a49769988e8271d52662c583 DIST mono-5.14.0.177.tar.bz2 219729440 BLAKE2B c21af7f541e5fcd456faeaf654ded7937da5241feb94b0de464a880915d758791ff7a645dbcb4023e7cced7ab0854bb8da0cc246abc6ab575bb278aa58fdc8c7 SHA512 f13afbe4289e177705642f79f4236710bdc8db8e956782c5370baf22207d6713f7997ec286c7742416c8206d2da205f295437d1afcdc430628d13e32f0e87d2d -DIST mono-5.4.1.6.tar.bz2 204934321 BLAKE2B 7aa3450a9bc4033f8084c4271b215af636e0df72d6349c97e0acd110d91e276d22b735d19bac2fb1e995ec34fa9e041831358a01d5c098b9c5e8b567d98350fe SHA512 d3618e9f127bc95b15feba5bf73317574872208770d83b8b545a9888df81a629e6fb14160db8a38526ffeb005f682e8dd9b8ced84bdb0cbb36dc9e7b28c240a4 +DIST mono-5.16.0.179.tar.bz2 231379081 BLAKE2B bdcb770d28eea953d428b8d41221bb192adf17bd677711fe17b44e2faa174d59adbe7816297c5eafa2589bb871d3bc2bb84b6e99a11df63758ff6f1b83b8814e SHA512 17d29dc19e3694abd236a50dda99ab85a215d1e88b8d6474c8b8b638dfe8a0f8d60ee3d3d5da600a861cfe6a0dda77cbf3594e9c5dd8b599c80363b4f01d9f1e EBUILD mono-4.4.1.0.ebuild 3384 BLAKE2B fd16089b151c1666ceda7d05285fa8a10143a4157e46b75a3412b42dec80c0929f9ba8d9523ac65b64fb827ea8d1ad88fbe98a5e7d0d12423b970912d0ae50e4 SHA512 6c9c9ce5e19a33e4dbc1b0cdb2d17804a67eed5061e422358c971de5a2eb95b2848c4515312a4b082087c50040c1e7f9c687a134ca30354d8f4bde796432b126 -EBUILD mono-4.6.1.5-r1.ebuild 3486 BLAKE2B 6f041f91dce9157a3df0805760355d2b2e2025fdd3b99a2f3413e232aa109d311605fa389a282cb62de7aafebb47a52b6a789957ae965ed42d2e85e6ab3f2e27 SHA512 a242a3a79ba0b671dd77d1b607583c0ea30977d6b5753b55015b5caed6a2754469a9deae115f0a3a4c0e3632bddf7fd0859c2b2712cfd1059a26c5262bfe234f EBUILD mono-4.8.0.524.ebuild 3023 BLAKE2B 8b23acde97ed8ebe05eb7e4c3fab9f1c9b43ee775a460629a122eba13c56120d139c8732267c1fb2cb7ba9d96c3a9943a03c1c9894286205392dac8fd19a467c SHA512 0a229fdcbb0051e96e227f1a2bc2c85eea55f2277b549e866744c650a0c42172f5727abe2b1cf38660254757201b8f577401fb072814d266012058da3a2418ab -EBUILD mono-5.12.0.226.ebuild 2966 BLAKE2B abf2eaf01a1aa04bf1d7c30ba61ccf4fb0126163ebb1290cd5a1a9f7b60c277a85e3b05542cfa98483a0d04d1b82c2488ba7dfbd001f64af393d215a748fb865 SHA512 2e7264375e88eba1cb081ad024701d0adde4d10cfa506cfee2c0d9126f573041d49040fe09ab504ffde118f803863fb403c923dcd25dd018525d3f42d4ae6c87 -EBUILD mono-5.14.0.177.ebuild 2966 BLAKE2B abf2eaf01a1aa04bf1d7c30ba61ccf4fb0126163ebb1290cd5a1a9f7b60c277a85e3b05542cfa98483a0d04d1b82c2488ba7dfbd001f64af393d215a748fb865 SHA512 2e7264375e88eba1cb081ad024701d0adde4d10cfa506cfee2c0d9126f573041d49040fe09ab504ffde118f803863fb403c923dcd25dd018525d3f42d4ae6c87 -EBUILD mono-5.4.1.6.ebuild 2981 BLAKE2B 0fa2e8a0574502869542c87491575b084e1a14eeb3eedc635e2c7f103f492086bf61f6bf4f9fe25d7d5abd80070bbdc6f742dd823c393fa6fb96f6c7a341cd93 SHA512 211b45145d9e37a302b0d0afcfbdc5676be2cbc3e39f5c51d171a3614de96bde1ea29658a95ef6d45da7c2a5d189da90c6f84a52eec20222a5dbb3428b050d02 +EBUILD mono-5.14.0.177.ebuild 2963 BLAKE2B 0be064f7eedc0b8b1e4eeba3998ce4e0ab10a4696630d0fd0a178407e231e1ce0511a3464c6ea7a00a9e5911d936fda6d1d479a11ed000f5cd1caf4f76f63d0d SHA512 66a592f345915c0a3d56138baec0e2127c3f4e0ec653c7fe8e6eec58846ac426ddf0db75adb07b6f5f13f3cadf7702e1a16a4d3f36bcbb8b361f3c33ecd9b1df +EBUILD mono-5.16.0.179-r1.ebuild 3035 BLAKE2B 689cd28b9284d3620f772e12a0ce3762204ce4415d5347ef0c2d34ec1e4491bfcc35a132737e482b928f5899b681393fe44fb97b0dfb0ead73130fd407b7717a SHA512 61869e1ec8eeb0662f6bca5615394ae0f341e1ea80d5495ee7a84a22f25cb987bd516abfda8c4bbc361955421c68b80825cbd1ab6f640f9545c9f5d16fb53473 MISC metadata.xml 507 BLAKE2B 91655de22fc1ff309c36ecef9d77aa8cada0b8f13ae30677665de837e99b7b43622a1dc0c677b0f5455c06b8e8a295c3c4f39753f66e749163a4f002ee481016 SHA512 e072a1abbf66276b0d139c3e918593010312c2059a0c6feba7b324689cdf90efe28bef0286ad9888125acfdd1fed2dee3e05e79a0aeb7f9ec1809bd128cf8a20 diff --git a/dev-lang/mono/mono-4.6.1.5-r1.ebuild b/dev-lang/mono/mono-4.6.1.5-r1.ebuild deleted file mode 100644 index 3ed76fb6a64a..000000000000 --- a/dev-lang/mono/mono-4.6.1.5-r1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils linux-info mono-env flag-o-matic pax-utils versionator multilib-minimal - -DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter" -HOMEPAGE="https://www.mono-project.com/Main_Page" -SRC_URI="https://download.mono-project.com/sources/${PN}/${P}.tar.bz2" - -LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL" -SLOT="0" - -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux" - -IUSE="nls minimal pax_kernel xen doc" - -COMMONDEPEND=" - !minimal? ( >=dev-dotnet/libgdiplus-2.10 ) - ia64? ( sys-libs/libunwind ) - nls? ( sys-devel/gettext ) -" -RDEPEND="${COMMONDEPEND} - || ( www-client/links www-client/lynx ) -" -DEPEND="${COMMONDEPEND} - sys-devel/bc - virtual/yacc - pax_kernel? ( sys-apps/elfix ) -" - -S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)" - -pkg_pretend() { - linux-info_pkg_setup - if use kernel_linux; then - if linux_config_exists; then - linux_chkconfig_builtin SYSVIPC || die "SYSVIPC not enabled in the kernel" - else - # https://github.com/gentoo/gentoo/blob/f200e625bda8de696a28338318c9005b69e34710/eclass/linux-info.eclass#L686 - ewarn "kernel config not found" - ewarn "If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling." - ewarn "See http://bugs.gentoo.org/261869 for more info." - fi - fi -} - -pkg_setup() { - mono-env_pkg_setup -} - -src_prepare() { - # we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't - # get killed in the build proces when MPROTECT is enable. #286280 - # RANDMMAP kill the build proces to #347365 - # use paxmark.sh to get PT/XT logic #532244 - if use pax_kernel ; then - ewarn "We are disabling MPROTECT on the mono binary." - - # issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9 - sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in" - fi - - # mono build system can fail otherwise - strip-flags - - # Fix VB targets - # http://osdir.com/ml/general/2015-05/msg20808.html - #eapply "${FILESDIR}/add_missing_vb_portable_targets.patch" - - # Fix build when sgen disabled - # https://bugzilla.xamarin.com/show_bug.cgi?id=32015 - #eapply "${FILESDIR}/${PN}-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch" - - # TODO: update patch - # Fix atomic_add_i4 support for 32-bit ppc - # https://github.com/mono/mono/compare/f967c79926900343f399c75624deedaba460e544^...8f379f0c8f98493180b508b9e68b9aa76c0c5bdf - #epatch "${FILESDIR}/${PN}-4.0.2.5-fix-ppc-atomic-add-i4.patch" - - # TODO: update patch - #epatch "${FILESDIR}/systemweb3.patch" - #epatch "${FILESDIR}/fix-for-GitExtensions-issue-2710-another-resolution.patch" - #epatch "${FILESDIR}/fix-for-bug36724.patch" - - default - #eapply_user - multilib_copy_sources -} - -multilib_src_configure() { - local myeconfargs=( - --disable-silent-rules - $(use_with xen xen_opt) - --without-ikvm-native - --disable-dtrace - $(use_with doc mcs-docs) - $(use_enable nls) - ) - - econf "${myeconfargs[@]}" -} - -multilib_src_test() { - cd mcs/tests || die - emake check -} - -multilib_src_install() { - default_src_install - - # Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora - # mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html - # for reference. - rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die - rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die -} diff --git a/dev-lang/mono/mono-5.14.0.177.ebuild b/dev-lang/mono/mono-5.14.0.177.ebuild index 4d520080eb69..057c8e099f0a 100644 --- a/dev-lang/mono/mono-5.14.0.177.ebuild +++ b/dev-lang/mono/mono-5.14.0.177.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~arm64" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux" RESTRICT="mirror" SLOT="0" diff --git a/dev-lang/mono/mono-5.12.0.226.ebuild b/dev-lang/mono/mono-5.16.0.179-r1.ebuild index 4d520080eb69..8c768a037192 100644 --- a/dev-lang/mono/mono-5.12.0.226.ebuild +++ b/dev-lang/mono/mono-5.16.0.179-r1.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~arm64" + +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux" + RESTRICT="mirror" SLOT="0" @@ -69,9 +71,9 @@ src_prepare() { # mono build system can fail otherwise strip-flags - #TODO: resolve problem with newer binutils - #bug: https://bugs.gentoo.org/show_bug.cgi?id=600664 - #append-flags -fPIC + # prebuilt files were left in tarball by accident: + rm -rv external/corefx/src/Native/Unix/System.Native/.libs || die + rm -rv external/corefx/src/Native/Unix/System.Native/*.{o,lo} || die default # PATCHES contains configure.ac patch diff --git a/dev-lang/mono/mono-5.4.1.6.ebuild b/dev-lang/mono/mono-5.4.1.6.ebuild deleted file mode 100644 index 22de8a7240e6..000000000000 --- a/dev-lang/mono/mono-5.4.1.6.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils linux-info mono-env flag-o-matic pax-utils versionator multilib-minimal - -DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter" -HOMEPAGE="https://www.mono-project.com/Main_Page" -SRC_URI="https://download.mono-project.com/sources/${PN}/${P}.tar.bz2" - -LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL" -SLOT="0" - -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~arm64" - -IUSE="nls minimal pax_kernel xen doc" - -COMMONDEPEND=" - !minimal? ( >=dev-dotnet/libgdiplus-2.10 ) - ia64? ( sys-libs/libunwind ) - nls? ( sys-devel/gettext ) -" -RDEPEND="${COMMONDEPEND} - || ( www-client/links www-client/lynx ) -" -DEPEND="${COMMONDEPEND} - sys-devel/bc - virtual/yacc - pax_kernel? ( sys-apps/elfix ) - dev-util/cmake -" - -PATCHES=( - "${FILESDIR}"/${PN}-5.0.1.1-x86_32.patch -) - -#S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)" - -pkg_pretend() { - linux-info_pkg_setup - if use kernel_linux; then - if linux_config_exists; then - linux_chkconfig_builtin SYSVIPC || die "SYSVIPC not enabled in the kernel" - else - # https://github.com/gentoo/gentoo/blob/f200e625bda8de696a28338318c9005b69e34710/eclass/linux-info.eclass#L686 - ewarn "kernel config not found" - ewarn "If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling." - ewarn "See https://bugs.gentoo.org/261869 for more info." - fi - fi -} - -pkg_setup() { - mono-env_pkg_setup -} - -src_prepare() { - # we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't - # get killed in the build proces when MPROTECT is enable. #286280 - # RANDMMAP kill the build proces to #347365 - # use paxmark.sh to get PT/XT logic #532244 - if use pax_kernel ; then - ewarn "We are disabling MPROTECT on the mono binary." - - # issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9 - sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in" - fi - - # mono build system can fail otherwise - strip-flags - - #TODO: resolve problem with newer binutils - #bug: https://bugs.gentoo.org/show_bug.cgi?id=600664 - #append-flags -fPIC - - default - # PATCHES contains configure.ac patch - eautoreconf - multilib_copy_sources -} - -multilib_src_configure() { - local myeconfargs=( - --disable-silent-rules - $(use_with xen xen_opt) - --without-ikvm-native - --disable-dtrace - $(use_with doc mcs-docs) - $(use_enable nls) - ) - - econf "${myeconfargs[@]}" -} - -multilib_src_test() { - cd mcs/tests || die - emake check -} - -multilib_src_install() { - default_src_install - - # Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora - # mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html - # for reference. - rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die - rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die -} diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest index 99976d5d6362..197ec453fdf6 100644 --- a/dev-lang/mujs/Manifest +++ b/dev-lang/mujs/Manifest @@ -6,5 +6,5 @@ DIST mujs-1.0.1.tar.gz 116948 BLAKE2B 54d898eff95e65688a51d9df9175964609a55ad324 DIST mujs-1.0.4.tar.xz 91520 BLAKE2B 6ffe62b19b140e2ae63ebe59a3b3bd352936ccba53dda3b0fcf575440dc790a0767c7de8c0a1441d26c11c65074520a80050cc0efa1113be0df51a802e719574 SHA512 a32498fee20ab6ddc8bbf79b4fdd82f3560d4e4b28bbe57c4e8f1df4a8a5367a689b6c9a391761abe47a8f15d2832fede4a508330eb181744b9563ae9954c102 EBUILD mujs-0_p20161202.ebuild 824 BLAKE2B ef5920796454ab2cb26c54149228da8a4903f708fef17972a8bad581778e598b5e682d46f34327873d6fea3925b8310668c57a8ae9339a18624ce418676d8797 SHA512 15f9ad4f8bfa67ba51cf2429a8d985974fd39af83ddc53c238acfa5293b055a116c7de6c91271a975d7b044b6c5cd6c1bb645db5d3400b4399f9f96f7b4cd401 EBUILD mujs-1.0.1-r1.ebuild 1103 BLAKE2B ca260b9e9864f98c2dc94d3297f4ebf98e7e6ccab60803c0abf90981e5b91e6505e9643e1e6d36e6da803a19d3fb935bcdc4dd7cabdfff9abcc5450a5dce9306 SHA512 98525a0a8fea64b8a223b88f082cdf8634e5eca55e51c5c792c6ff3407408e83c69d9d1b9f6bc6e36002bf33b7ce21fe927938c93fac1a925902e643336841e5 -EBUILD mujs-1.0.4.ebuild 1025 BLAKE2B 4b14f7ab8a7073ee7a08de5b0859ba2c23fa34282ec7f7568034e2fef0c07c67f0fd5c33fed076185e8105a9619a8410d9bed99c7ca930d7664d580bf80e679d SHA512 eaf763476bb88f9b5362ce9d126ddcc2189a9b0d10d0ceb74c6fb2b39ea7c32bc15e93b3cf8d37795ed0ecac8190f9ed4c360263623d9d77076359f273bdf125 +EBUILD mujs-1.0.4.ebuild 1018 BLAKE2B 23dc3714367525cb661ce959eda325a039a6cc31b4403717bb3a92e72237d411d7550d967affeb25960218e1a7863db3b9057b05be99a4cef00fc78b09ad979e SHA512 964401b2d68911961c0089efce3afdea3405eb91812061462a4a9ce604217af969ba10c6167904200d1b88ca73efc1e9b5dbf32f99a6e4a98e8e12f5390506bd MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa diff --git a/dev-lang/mujs/mujs-1.0.4.ebuild b/dev-lang/mujs/mujs-1.0.4.ebuild index 91ee7c0085a7..f835e190f0c0 100644 --- a/dev-lang/mujs/mujs-1.0.4.ebuild +++ b/dev-lang/mujs/mujs-1.0.4.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://mujs.com/downloads/${P}.tar.xz" LICENSE="AGPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="static-libs" PATCHES=( diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index 891180eb175c..de92b5079396 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -6,20 +6,20 @@ AUX php-5.6-no-bison-warnings.patch 1428 BLAKE2B d37bc7a1ae803aa4a14d32f0ca5613b AUX php-fpm_at-simple.service 316 BLAKE2B 0ba10f3e3b004fbf14956e1e4f04f59b8a127e6717fe6b92c09b9f931033a11551c75fbbee9010f6b694c5a8758ca0eec9eed457ae304ba0dea8f2c256c3b8d4 SHA512 7367a3f8d3874f8e0c76f331ba613a0250db02f60ad9f87affaf448dcb5bc34bcecb91d88f415764a12b24b46ae3d1b738a002af9f77a4b707e916e83a0021fd AUX php-fpm_at.service 317 BLAKE2B f13fc38fcc0575a8517ee8d07b120efda37eabd2355061d0fdc303604c6b02ad42d7301180d86c977d5e585f5dd685343c592e37a6e0f44933707be79e0b77e0 SHA512 27982f9e2d958bfa75c89c7d3531e48d17fc388b1cdcbc8e09051b236b1184ee2baabdfcc567c19d9fcd067d4b3b86f171015616d8da42fccdabd89432d865e8 AUX php-freetype-2.9.1.patch 7667 BLAKE2B efc8f829bbad11b3e7b654d0882213ecb9aae766060d51f93446a6293a2f607339faba484c7b0b2f9318a5c5442da3c09e25aeda20dbc5e3258bf1009f8625b4 SHA512 0a06189f6fb3513cd2dcf9ddb590360475e2dd9a7aa8b13ab66c389c1ed40ce2361681f017cd3c6219f5b40a0a9d4978e57ca3ee4bacb7657db3285136fd2875 -DIST php-5.6.36.tar.xz 12467560 BLAKE2B 8badaabc668ff3a4b1129f03605a1570729f8196d2e2539fe85bc42a628f2b24ea76c298b194e8466d9218ae98218243430c8d36d73fbd32b042dd6453510361 SHA512 807c68ab85b6685b19707bd18cfd46f3695b2dc67f9f17f85476634e4a80a036cb413ccae05ed5ba529eafe8df57ebf758dd664ed2942ec44f90a6e8b0172e5e DIST php-5.6.38.tar.xz 12467408 BLAKE2B d9ee47e193d80bce8a9ed6ffd3eb13e67ba6d1f597ece2803cd92fddc6245f46cdfe644d6cda12a6bb409b92c1fe748610cc5eb43dea0bf063fda81188ee8b3d SHA512 66c51a8e954b1496c0bad0a2864a2a1537dd1c1c573b553991d6d5bce85fc7bc340e56a21109bc5e9a03799e703204b980b569c95a5c0a1bddb01c8947e7a682 -DIST php-7.0.30.tar.xz 12030228 BLAKE2B cc4c50d108fca68ee98b70a3007893d912d2343dd255faf52e41c1de04f590f427d9edad7b637177ccf1d9c62212ee6060baca13931c0aa14532df548ef159aa SHA512 1f0914ebda79247aa65ace63f6c8c4fcd850b21a82704f7b6482760259239cc5fee4cfd5aa2ed590b56822b4d69330ac472f46537e7f25d59e73ba63a48827c5 DIST php-7.0.32.tar.xz 12030780 BLAKE2B 0c277eac4c931a6e30954cceb7feef8dea1c3ef4aebac91779b7e1a6f90f608faa93d1750a2dc8f354c73304e0f7a9b9ac17bb0d1da4768ddb68925752c11aef SHA512 4a7c9a6b91ad7da69303916202062d639e6f02dcd483e851a44d8c7a2efeb5c9a666097935ab60d700c4445f86a0c68df1515300c57af1cdb76528b54b757608 -DIST php-7.1.18.tar.xz 12213396 BLAKE2B f851c6eb261b8b532e84e73e6f173deb6ac00cd5168a02db9811843540aeadc390a4c5416eb17749cc950bbb1eda1045f538e2b80e4734ea2c0c4e264776bffb SHA512 7eacbc3b98d8b668c90d5c93030263f47ba2e0d4d7820594662590b8b68670f734a2274ae476e3aeac7e030c4ef10411a80da3523383e87a6757e87597caee90 DIST php-7.1.22.tar.xz 12227848 BLAKE2B 72fab94b1c7ecfd3479f6d6c9a76a9d8813f7789402664201615d79ab8b5bb26fb1b7273769c4898a36f0336e0ce4d50bf2f17b81ddb54acc9583e39623e3a5b SHA512 0fc0907d303711dbc4ba0a18618e3e73550c73d13988c769f8d50066017b1efe3feb0d22d5539f69271ea4e9532a3d997e22841cb59bdbf96313169e1c03538d +DIST php-7.1.23.tar.xz 12227528 BLAKE2B d03470b07ae041c4677e100c1b4f7994d3e15d4830eccba3c654c1f3546345c8205cac057011d2d43ab962ebbc01652f6748270daa40aa1e540453923500288c SHA512 d5a451f1a48415175e3117ffa84ef3504275a407698b59c13eeb403958aa27342e04dc4ffea9791b923ac0cc5d6fdacf2e8672f0e19755bae858707c7fc3627f DIST php-7.2.10.tar.xz 12160864 BLAKE2B f1959a00622c1bd11fa87c61d152c802b307f0b9e89b51ed86b40086cda03eeb6652d47b59df8cc7c9b4e79ab687ae1292b978f453e9f07ac352d209b64c62d8 SHA512 aa90fce17034b2649012d66461626ae74c21ea938b1c71c7eb12419e562c641b432df87a7e900c245ad28df39624cf64a1b2f8ffb123608d94cd35e41f09c0fe +DIST php-7.2.11.tar.xz 12132268 BLAKE2B 8007f6a8f4236efb796681d25f2066deeba98e6e136def0c323aa13399951d58d7f218b3544b3bd0418dfe220f87a38b6515547c50f65c641bd09a2d440eb4e1 SHA512 0cd8578147d17d612e013dfc22b73977719177058b39c7b61dd0bfdfb8c2441aba78af49f58c824f7e66c89b5ad201c36fafb89ccf1e2d20f19b79d6a8fed7e5 DIST php-7.3.0RC2.tar.xz 11924624 BLAKE2B caa2c3752e7fcf2226b8351e96277a5af071cbe13f820f4c81cd54b2e98206b403327a97a7360e6a8e1c7e11687af0ddc24b9a08ef3ac3f18cbe488469c17c35 SHA512 6fca734a4dfbd8ef85838439bc965f6d6773ba270207222b710ab75a0254f6c68378763274ba5d6cfe60b6ea14c134a64cb3ef607cc2ef86c7010bac1e282498 -EBUILD php-5.6.36.ebuild 22792 BLAKE2B 0f22bd52f4acb9d69803120c63e3ef3418af89810e98da7b034d4e959b89da3e25e82a579127b427ccb533869e459cc59cbbd7069fa21ba7e05656be3bbb7b65 SHA512 097f033cfb430f5a57258319127c7604888a5026710830a0845d1328be729705834069235a45e326dde4277de6cf0001214b101efa1cb1f5ab7e27be30b2557e -EBUILD php-5.6.38.ebuild 22799 BLAKE2B 63b3709f7fe8812faa62de75d71f16ccb3fac1328e3d6722a4706e827076e89ef3e8430dcee346a35432e0b2d608188d3182eb8c89ecdbc977fb6908061ac120 SHA512 c04a8ff3e45bb7a7660ab702c45de927821316b688572cbdb38dda918485e5af4b2d71180c64696ed5797d29b27f087e119fe903732e9f6e5174e4e740b19dfa -EBUILD php-7.0.30.ebuild 22002 BLAKE2B 5766fabda46f0faf07cfd5121a32af05a7cd51f5ef694c083fd737612bd7575026bfdbaba1a5bf109c316c46d38a233658b75f79ba3622f7ed0139f6e2a4f397 SHA512 535391d50959e2e4f3094f2f6a7b0bc75810c4f5695bca319ed2fc7df4273d9f9e01feb1625992938b84ffd04ef350cf2dfe49e4e83b2dd346af75b79c476f31 -EBUILD php-7.0.32.ebuild 22009 BLAKE2B bf0d62e15cb11ed5669d5e485b53b58f8da8436315212627413b9c4a1a252cc311dce34752b0a4a1dd642715fbbe368fb613b18eb3df30660eff8f2d813b9eb9 SHA512 c1506f4481ed096747185fe438ff4c691f3810fb8aa74bad34d63df4de10df01b39cfc79e93203c8698dfac6ba2eebd11277e3c7bd3623ed386be288a5f4f50a -EBUILD php-7.1.18.ebuild 21845 BLAKE2B 3752df2f5c1e9123e1906c315e07de6142cf4e37b6ae48b24af4858ec1491d4934daab688c747ffc06f6a67e54fa7fd80674a272fbf45bc2b56e0f2ba58bfbfd SHA512 4dccb83f1449520a0f4dfe78605ec1b0fcfaee46b67c32b8bada1811692042081f3c1364adecd077dec940a26cfab8bd4175b836d6a5fb5bf9893e546fc1eff2 -EBUILD php-7.1.22.ebuild 21716 BLAKE2B 282b45ed061c5d8bdc0fb1ca3f67e6f2be8b4f37f85c2e5c3c68ccaeed3b02c56024ecca242a8ef3bbc62ce747a007cd68d67347bed6a0dc0e50afa2bdcf4f8c SHA512 2f97af78bc7ed63a56d69799b4ae59a1ea688c29ddfda7a1910fded87c22bc0db040c242321ac634dc74c6149388ac6ff4fb532fdf1cff2af062dc18ceb7b27d -EBUILD php-7.2.10.ebuild 22247 BLAKE2B 00489d5a607441338ed5002fbbf1f556642ae53d08b2817c569d04a33c9dcba76728f686ada07d88147dba1e4bc37289923ec244e0028477862a528d696b4051 SHA512 a58323e4db11e0e49f6f0e11200ee89e8c591f2cda641fb7baa3947e47115a237d76ef50cb01d29b6dbf349234a72f69e34915fd8e3dd712b0bb350bcafc3e00 +DIST php-7.3.0RC3.tar.xz 11927028 BLAKE2B b88b2abeac532a5c0de6ee92982514e78ef6ef8ef2436c0edb541b83da9bafa925177d76d54bcdd866f7863442691e6aa721356c123d07c3464f18e85abbdf6a SHA512 ef441fc7608ee5ef5062b252292656d42644307b5623ebd87104ca10191080ba83d44e5984e8eef987d8bec0f0ab8139b7c2d16577fe6dcc5f02e71ba87f5ed8 +EBUILD php-5.6.38.ebuild 22798 BLAKE2B 8bef3ae060eeb63fcc492a7c8c8a8b642b84f46ef7ed29e69badeecf26c0f853e974c8f224739875fee1b345987775c05f451908d4731550eab156993a55d23a SHA512 0a97787e0b80643e620815c32b29a56063ddb92c31516ad34f89be9769cc3cf9ba07eb0271d433f330d6493df2b1a63af29bf8b7ede81bdd3fbc2751be5ce561 +EBUILD php-7.0.32.ebuild 22008 BLAKE2B 26829e446d9608f52212a32e0092d83d65966a270a8e4d35f8ac4559f0679a4ff955848eb9c9ae3f7d25300d347a226adc1b71d1b322d09fe512188360f2182f SHA512 a9fdfe7a831fa4ad71ddd4bae29582053ee86a824dc93f02581a3add372561f34d457f2c9198c72c619b10666b679d3f929f6aaf309c2d446a60e9447e8d3cc2 +EBUILD php-7.1.22.ebuild 21715 BLAKE2B 13f34b9730b2f0f22cfcbf26af6575259d08d61f158b0c9bd9b6e7756326037e32e92992ec510bc1649eca0beb2044f820888c7e9b1fa48174974e754947f181 SHA512 187fd61cf4df1cda5c53e14aea0ac327c5e9fab193843165de2afe7e13fdb5b8be1ebab70fcb776dcb8ebe1966feedcc075e589c4ddf1f9f6d3d58f45519a9d4 +EBUILD php-7.1.23.ebuild 21727 BLAKE2B b35aa713090ba294565fee4d2c6edf5ede683083f349b8cb15a3bbed1d4f3761ca5d672891584b9853cd1c7f802898bf604da3d5508cd5c2ad367bb47a2f742d SHA512 8096b4d259c06c0ea3afff51ece85b6d0a7626676fc09c1df027b4f2ce17c6b8ff7d99dfdf8781d3bdc2ed13460e18d4dcdcc9eb7c1149b28687c6b0be976f40 +EBUILD php-7.2.10.ebuild 22246 BLAKE2B e06f62b7f5563d48d9e381b6ab44cc72e9e63831e209ee638321e93b90a1f42abb9a41b757629b45cfa610f7e985f40fbd002c5121acf86d862f8d648ee16f44 SHA512 c662c27b70663131899ffe595476bff326a337d584855e27f62480bf8824e3a3f49caee7c80b4f3aa19ccc40d1f95f3a9c4518621cbd43abd751981ba334e190 +EBUILD php-7.2.11.ebuild 22258 BLAKE2B 3ae1771b15208cdba10d534f69bfcea8ac4930a5f7e31d7bd976dfb7904fe3e60ae80b44c0ca65fa300a1d086587c3754821411059942f8db9df7d4cb6758f0b SHA512 c6aca341ff51f7fd5437b2578e9ce7ee4055a67603c4ad9a25f07ca030c75d58c627db6cdb979aa5ab9619051d1f3de4155cded38e4a17b09562a5842ea5a96a EBUILD php-7.3.0_rc2.ebuild 22329 BLAKE2B 7841e7d459849f06a47128e2c0a8f1997b3d1b6be02081d3dafa624f7ea319da13974cd904ce772260c8e001ae5c594508cf5be9f0426d8fd5da9ff6107111ca SHA512 f81a2d251ded29e6f91f72c736c27f44e8f8f6ef9cdfe57d7b8fefc0c3c27869a83972355d03532db95ba0c9c0b3322870174b7c8c0e57a1f9ea8ec4c40ca4c7 -MISC metadata.xml 2577 BLAKE2B 9b15d6073181a5f5ff7b00ef8b68d24c7ea8763171ae84895ebc4a6925f589d2a02e4e29116c2741b3502b35d32aa58e7ed909e144c0e694f8cce5b4d26ecd3b SHA512 14e6daa693325b8a27157cff22d0b0cae9d89e4dada775f39188f7f36546b78a8b19efedb2f7b6f64ee1375bf29d3af32a8f7d6e7bf0d04cf2a7241abd154afa +EBUILD php-7.3.0_rc3.ebuild 22329 BLAKE2B 7841e7d459849f06a47128e2c0a8f1997b3d1b6be02081d3dafa624f7ea319da13974cd904ce772260c8e001ae5c594508cf5be9f0426d8fd5da9ff6107111ca SHA512 f81a2d251ded29e6f91f72c736c27f44e8f8f6ef9cdfe57d7b8fefc0c3c27869a83972355d03532db95ba0c9c0b3322870174b7c8c0e57a1f9ea8ec4c40ca4c7 +MISC metadata.xml 2525 BLAKE2B 38170625904c1d6cb24a0bfef829b9e819d1ad3de42a69452205520620aaeffef7e2cc3a86a836940a7f0d19d5dcddfd256b970c9d5546c484bd1cba17484154 SHA512 666320279375242858d994456da112111b994445f6c1c5b379294b1d0b981fd103cc52b4c2dfcfb1b1eb49de77d502c8b7cbfb4c1c7ebe1602fdf9fd3b3a8242 diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml index cca331a3fa1f..609c0dce3af1 100644 --- a/dev-lang/php/metadata.xml +++ b/dev-lang/php/metadata.xml @@ -51,7 +51,6 @@ <flag name="xslt">Enable the XSL extension</flag> <flag name="vpx">Enable webp support for GD in php-5.x</flag> <flag name="webp">Enable webp support for GD in php-7.x</flag> - <flag name="zip">Enable ZIP file support</flag> <flag name="zip-encryption">Enable ZIP file encryption from <pkg>dev-libs/libzip</pkg></flag> </use> </pkgmetadata> diff --git a/dev-lang/php/php-5.6.38.ebuild b/dev-lang/php/php-5.6.38.ebuild index 95546dfd2561..471eb29bc1bf 100644 --- a/dev-lang/php/php-5.6.38.ebuild +++ b/dev-lang/php/php-5.6.38.ebuild @@ -18,7 +18,7 @@ LICENSE="PHP-3.01 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" # We can build the following SAPIs in the given order SAPIS="embed cli cgi fpm apache2" diff --git a/dev-lang/php/php-7.0.32.ebuild b/dev-lang/php/php-7.0.32.ebuild index 8158cfae76c1..be14985636af 100644 --- a/dev-lang/php/php-7.0.32.ebuild +++ b/dev-lang/php/php-7.0.32.ebuild @@ -18,7 +18,7 @@ LICENSE="PHP-3.01 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" # We can build the following SAPIs in the given order SAPIS="embed cli cgi fpm apache2 phpdbg" diff --git a/dev-lang/php/php-7.1.22.ebuild b/dev-lang/php/php-7.1.22.ebuild index d748c46a4a94..ec1d9318de48 100644 --- a/dev-lang/php/php-7.1.22.ebuild +++ b/dev-lang/php/php-7.1.22.ebuild @@ -18,7 +18,7 @@ LICENSE="PHP-3.01 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" # We can build the following SAPIs in the given order SAPIS="embed cli cgi fpm apache2 phpdbg" diff --git a/dev-lang/php/php-7.1.18.ebuild b/dev-lang/php/php-7.1.23.ebuild index a9061a4a930f..4f54e9a7a856 100644 --- a/dev-lang/php/php-7.1.18.ebuild +++ b/dev-lang/php/php-7.1.23.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ LICENSE="PHP-3.01 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" # We can build the following SAPIs in the given order SAPIS="embed cli cgi fpm apache2 phpdbg" @@ -60,7 +60,7 @@ COMMON_DEPEND=" coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) + 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= ) @@ -142,12 +142,10 @@ REQUIRED_USE=" readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) - mysql? ( || ( mysqli pdo ) ) + mysql? ( hash || ( mysqli pdo ) ) + mysqli? ( hash ) " PATCHES=( - # hopefully upstream will include the same version check fixes in upcoming releases - # patch added 20180429 - "${FILESDIR}/libressl-compatibility.patch" "${FILESDIR}/php-freetype-2.9.1.patch" ) diff --git a/dev-lang/php/php-7.2.10.ebuild b/dev-lang/php/php-7.2.10.ebuild index e577448e00a3..7d83e1171df3 100644 --- a/dev-lang/php/php-7.2.10.ebuild +++ b/dev-lang/php/php-7.2.10.ebuild @@ -18,7 +18,7 @@ LICENSE="PHP-3.01 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" # We can build the following SAPIs in the given order SAPIS="embed cli cgi fpm apache2 phpdbg" diff --git a/dev-lang/php/php-7.0.30.ebuild b/dev-lang/php/php-7.2.11.ebuild index 94a37d5d0025..761d9460704b 100644 --- a/dev-lang/php/php-7.0.30.ebuild +++ b/dev-lang/php/php-7.2.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ LICENSE="PHP-3.01 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" # We can build the following SAPIs in the given order SAPIS="embed cli cgi fpm apache2 phpdbg" @@ -28,17 +28,17 @@ IUSE="${IUSE} ${SAPIS/cli/+cli} threads" -IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk - coverage crypt +ctype curl debug +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 + 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 sharedmem - +simplexml snmp soap sockets spell sqlite ssl - sysvipc systemd tidy +tokenizer truetype unicode wddx webp - +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" + 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 @@ -49,7 +49,8 @@ COMMON_DEPEND=" fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) - berkdb? ( || ( sys-libs/db:5.3 + 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 @@ -57,22 +58,11 @@ COMMON_DEPEND=" sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - cjk? ( !gd? ( - virtual/jpeg:0 - media-libs/libpng:0= - sys-libs/zlib:0= - ) ) coverage? ( dev-util/lcov ) - crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - exif? ( !gd? ( - virtual/jpeg:0 - media-libs/libpng:0= - sys-libs/zlib:0= - ) ) + enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) + 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 ) @@ -83,6 +73,7 @@ COMMON_DEPEND=" ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) @@ -91,22 +82,20 @@ COMMON_DEPEND=" qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) - sharedmem? ( dev-libs/mm ) + 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/htmltidy ) - truetype? ( - =media-libs/freetype-2* - !gd? ( - virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib: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= ) @@ -114,13 +103,10 @@ COMMON_DEPEND=" 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 - virtual/jpeg:0 - media-libs/libpng:0= sys-libs/zlib:0= - ) + 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= ) " @@ -130,12 +116,12 @@ RDEPEND="${COMMON_DEPEND} 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 - sys-devel/flex - >=sys-devel/m4-1.4.3 - >=sys-devel/libtool-1.5.18" + >=sys-devel/bison-3.0.1" # Without USE=readline or libedit, the interactive "php -a" CLI will hang. REQUIRED_USE=" @@ -159,15 +145,12 @@ REQUIRED_USE=" qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) - sharedmem? ( !threads ) - mysql? ( || ( mysqli pdo ) ) + session-mm? ( session !threads ) + mysql? ( hash || ( mysqli pdo ) ) + mysqli? ( hash ) + zip-encryption? ( zip ) " - PATCHES=( - "${FILESDIR}/mbstring-oniguruma-6.8.patch" - # hopefully upstream will include the same version check fixes in upcoming releases - # patch added 20180429 - "${FILESDIR}/libressl-compatibility.patch" "${FILESDIR}/php-freetype-2.9.1.patch" ) @@ -263,6 +246,7 @@ src_configure() { ) our_conf+=( + $(use_with argon2 password-argon2 "${EPREFIX}/usr") $(use_enable bcmath bcmath) $(use_with bzip2 bz2 "${EPREFIX}/usr") $(use_enable calendar calendar) @@ -288,7 +272,6 @@ src_configure() { $(use_enable xml libxml) $(use_with xml libxml-dir "${EPREFIX}/usr") $(use_enable unicode mbstring) - $(use_with crypt mcrypt "${EPREFIX}/usr") $(use_with unicode onig "${EPREFIX}/usr") $(use_with ssl openssl "${EPREFIX}/usr") $(use_with ssl openssl-dir "${EPREFIX}/usr") @@ -305,6 +288,7 @@ src_configure() { $(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) @@ -318,13 +302,14 @@ src_configure() { $(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 ; then + || use qdbm || use lmdb || use tokyocabinet ; then our_conf+=( "--enable-dba${shared}" ) fi @@ -336,6 +321,7 @@ src_configure() { $(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 @@ -412,7 +398,7 @@ src_configure() { # Session support if use session ; then - our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") ) + our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") ) else our_conf+=( $(use_enable session session) ) fi @@ -423,9 +409,13 @@ src_configure() { # 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 diff --git a/dev-lang/php/php-5.6.36.ebuild b/dev-lang/php/php-7.3.0_rc3.ebuild index 4721afbce53e..38dbc82aca6b 100644 --- a/dev-lang/php/php-5.6.36.ebuild +++ b/dev-lang/php/php-7.3.0_rc3.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools flag-o-matic eapi7-ver systemd +inherit flag-o-matic eapi7-ver systemd +MY_PV=${PV/_rc/RC} DESCRIPTION="The PHP language runtime engine" HOMEPAGE="https://secure.php.net/" -SRC_URI="https://php.net/distributions/${P}.tar.xz" +SRC_URI="https://downloads.php.net/~cmb/${PN}-${MY_PV}.tar.xz" LICENSE="PHP-3.01 BSD @@ -18,37 +19,40 @@ LICENSE="PHP-3.01 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + +S="${WORKDIR}/${PN}-${MY_PV}" # We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" +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 bcmath berkdb bzip2 calendar cdb cjk - coverage crypt +ctype curl debug +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 - mhash mssql mysql libmysqlclient mysqli nls + 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 sharedmem - +simplexml snmp soap sockets spell sqlite ssl - sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx - +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" + 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] + >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) + argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 @@ -57,22 +61,11 @@ COMMON_DEPEND=" sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - cjk? ( !gd? ( - virtual/jpeg:0 - media-libs/libpng:0= - sys-libs/zlib:0= - ) ) coverage? ( dev-util/lcov ) - crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - exif? ( !gd? ( - virtual/jpeg:0 - media-libs/libpng:0= - sys-libs/zlib:0= - ) ) + enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) + 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 ) @@ -83,11 +76,8 @@ COMMON_DEPEND=" ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) - libmysqlclient? ( - mysql? ( virtual/libmysqlclient:= ) - mysqli? ( virtual/libmysqlclient:= ) - ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) @@ -95,39 +85,32 @@ COMMON_DEPEND=" qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) - sharedmem? ( dev-libs/mm ) + 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/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( - virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) - ) + tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) + tokyocabinet? ( dev-db/tokyocabinet ) + truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) - vpx? ( media-libs/libvpx:0= ) 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 - virtual/jpeg:0 - media-libs/libpng:0= sys-libs/zlib:0= - ) + xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib:0= ) - zlib? ( sys-libs/zlib:0= ) + 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} @@ -136,19 +119,19 @@ RDEPEND="${COMMON_DEPEND} 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 - sys-devel/flex - >=sys-devel/m4-1.4.3 - >=sys-devel/libtool-1.5.18" + >=sys-devel/bison-3.0.1" # Without USE=readline or libedit, the interactive "php -a" CLI will hang. REQUIRED_USE=" - || ( cli cgi fpm apache2 embed ) + || ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) - vpx? ( gd zlib ) + webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) @@ -162,17 +145,16 @@ REQUIRED_USE=" ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) - recode? ( !imap !mysql !mysqli !libmysqlclient ) - libmysqlclient? ( || ( - mysql - mysqli - pdo - ) ) - qdbm? ( !gdbm ) readline? ( !libedit ) - sharedmem? ( !threads ) + recode? ( !imap !mysqli !mysql ) + session-mm? ( session !threads ) + mysql? ( || ( mysqli pdo ) ) + zip-encryption? ( zip ) " +PATCHES=( + "${FILESDIR}/php-freetype-2.9.1.patch" +) PHP_MV="$(ver_cut 1)" @@ -216,9 +198,11 @@ php_install_ini() { # SAPI-specific handling if [[ "${sapi}" == "fpm" ]] ; then - einfo "Installing FPM config file php-fpm.conf" + 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} @@ -231,45 +215,17 @@ php_set_ini_dir() { } src_prepare() { - eapply "${FILESDIR}/php-${SLOT}-no-bison-warnings.patch" - eapply "${FILESDIR}/5.6-mbstring-oniguruma-6.8.patch" - eapply "${FILESDIR}/php-freetype-2.9.1.patch" - - # Change PHP branding - # Get the alpha/beta/rc version - sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \ - -i configure.in || die "Unable to change PHP branding" - - # Patch PHP to show Gentoo as the server platform - sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \ - -i configure.in || die "Failed to fix server platform name" - - # Prevent PHP from activating the Apache config, - # as we will do that ourselves - sed -i \ - -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \ - -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \ - configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 \ - || die - - # Patch PHP to support heimdal instead of mit-krb5 - if has_version "app-crypt/heimdal" ; then - sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \ - || die "Failed to fix heimdal libname" - sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \ - || die "Failed to fix heimdal crypt library reference" - fi - - eapply_user - - # Force rebuilding aclocal.m4 - rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare" - eautoreconf - - if [[ ${CHOST} == *-darwin* ]] ; then - # http://bugs.php.net/bug.php?id=48795, bug #343481 - sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die - fi + default + + # In php-7.x, the FPM pool configuration files have been split off + # of the main config. By default the pool config files go in + # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the + # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later + # we'll install the pool configuration file "www.conf" there. + php_set_ini_dir fpm + sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \ + sapi/fpm/php-fpm.conf.in \ + || die 'failed to move the include directory in php-fpm.conf' } src_configure() { @@ -292,6 +248,7 @@ src_configure() { ) our_conf+=( + $(use_with argon2 password-argon2 "${EPREFIX}/usr") $(use_enable bcmath bcmath) $(use_with bzip2 bz2 "${EPREFIX}/usr") $(use_enable calendar calendar) @@ -317,8 +274,6 @@ src_configure() { $(use_enable xml libxml) $(use_with xml libxml-dir "${EPREFIX}/usr") $(use_enable unicode mbstring) - $(use_with crypt mcrypt "${EPREFIX}/usr") - $(use_with mssql mssql "${EPREFIX}/usr") $(use_with unicode onig "${EPREFIX}/usr") $(use_with ssl openssl "${EPREFIX}/usr") $(use_with ssl openssl-dir "${EPREFIX}/usr") @@ -335,8 +290,8 @@ src_configure() { $(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_with sybase-ct sybase-ct "${EPREFIX}/usr") $(use_enable sysvipc sysvmsg) $(use_enable sysvipc sysvsem) $(use_enable sysvipc sysvshm) @@ -349,13 +304,14 @@ src_configure() { $(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 ; then + || use qdbm || use lmdb || use tokyocabinet ; then our_conf+=( "--enable-dba${shared}" ) fi @@ -367,18 +323,20 @@ src_configure() { $(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_with truetype t1lib "${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") - $(use_with vpx vpx-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) ) @@ -404,10 +362,7 @@ src_configure() { # MySQL support local mysqllib="mysqlnd" local mysqlilib="mysqlnd" - use libmysqlclient && mysqllib="${EPREFIX}/usr" - use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config" - our_conf+=( $(use_with mysql mysql "${mysqllib}") ) our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") ) local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock" @@ -427,7 +382,7 @@ src_configure() { # PDO support if use pdo ; then our_conf+=( - $(use_with mssql pdo-dblib) + $(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") @@ -445,7 +400,7 @@ src_configure() { # Session support if use session ; then - our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") ) + our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") ) else our_conf+=( $(use_enable session session) ) fi @@ -456,9 +411,13 @@ src_configure() { # 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 @@ -494,7 +453,7 @@ src_configure() { for sapi in $SAPIS ; do case "$sapi" in - cli|cgi|embed|fpm) + cli|cgi|embed|fpm|phpdbg) if [[ "${one_sapi}" == "${sapi}" ]] ; then sapi_conf+=( "--enable-${sapi}" ) if [[ "fpm" == "${sapi}" ]] ; then @@ -581,7 +540,7 @@ src_install() { # 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/libphp5$(get_libname)" \ + newins ".libs/libphp${PHP_MV}$(get_libname)" \ "libphp${PHP_MV}$(get_libname)" keepdir "/usr/$(get_libdir)/apache2/modules" else @@ -601,6 +560,9 @@ src_install() { embed) source="libs/libphp${PHP_MV}$(get_libname)" ;; + phpdbg) + source="sapi/phpdbg/phpdbg" + ;; *) die "unhandled sapi in src_install" ;; @@ -663,8 +625,12 @@ src_test() { export TEST_PHP_EXECUTABLE="${PHP_BIN}" fi - if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then - export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi" + 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 \ diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index 1b8bd40c1b7a..eaa96b914909 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -40,7 +40,7 @@ DIST python-gentoo-patches-3.6.6.tar.xz 13876 BLAKE2B 4be56b54e70c9b83209734097e DIST python-gentoo-patches-3.7.0.tar.xz 12268 BLAKE2B 758b635ff53b6f7bfabb1db632ee2a5c14b163d6d6f14e4e44c31c9ac1591d411f597d42b05707f586f9ff7c3a030703502307bae732bcf003987939eb5b036d SHA512 19dd5bac06bb40622e74e3b16c7fba83f1178417e686eaf61b2b207602c76beebc8c78d675e401ec4d18add1ca033fd47baf2e48e9abb487593b7d821bcaf509 EBUILD python-2.7.14-r1.ebuild 10806 BLAKE2B fce1997bac1ff3a2f3e11ee8a9477744d4db08186ba8453de7b1a270886596549ae8e5d4fe4f3f214f0e0d421a82ea1b63b09282ed58d7479976bc8df1ee2588 SHA512 5e6aeceb99c833a78078d0dcb50b8af7310a6c3adf5d7f88d3894966ec0eb8f5e1990f562e281aebd4e1f98c1234af102f18146dd8226c69b0ba850eecbb424e EBUILD python-2.7.14-r2.ebuild 11018 BLAKE2B 408b677be84fd7ceb31db5f6af74418adc6576e542aaa4ba2a2a812e94ee3af5a5d73fceea8cbbfac87156c4ae223ab2716814cce26e6bfdded9f3ac888e262c SHA512 0ccf4865666cf97b5ff4d22dc55c243aa8330819177b1b96f20e094ee490838227309f2f0b635e50b356eefdebb49b95aa3759cbb7725f781302e4b4a7a6bae5 -EBUILD python-2.7.15.ebuild 10812 BLAKE2B 53d50ce499b0ba1d33d3cfc4423ec0e2e21ca24ac9bc9cad89f6f93f7ce6d2df1618495969271b9cb2a90b9439c7aafa44f7d0cee4f7e5de88b09a4fb3b27def SHA512 8fbf1f69de2f0c17e39d1385f81a13b166708e017c9b724c27ab13b840bbae0f023111419e575e6dc86b4aa6b5b913c8504433730cec3c12f0d24ea8a05b7bae +EBUILD python-2.7.15.ebuild 10811 BLAKE2B f828de10018c8a29ffec4fc405e5ad92f5d88c5230a4de428755a25494c65ff81e72e85e12a6de152381d4ffc54bdac04b1a699648331660a311b47b25e3c266 SHA512 d76caa98de7a649fab7d630bb14e2bfd38d74822ff42d863dd6d5307b0788d73490c6c83cabd14e126f477a17483bef2af7de5dda921b22e49f7e85ec35bcd18 EBUILD python-3.4.5-r1.ebuild 10657 BLAKE2B 09b69868f6be57e40ed1a439a6dbfd4eb92c71bd67ee5733424e2478f9603b1083c2a4770bcfa8e009e9e0ef6fd81f6ce9a59de246121062c120dcd25eb8a012 SHA512 bfaa81cd21f5311595b9fdfd1c3f4851da18e38f8a4a6b9bda760946ae6f972596fbb03f281a6b81bb59bded2d8b7e6d95dd7594955130bd2f6a78c62f6bfc93 EBUILD python-3.4.6-r1.ebuild 10587 BLAKE2B 0aca5a73b15e5122caa057fe71909f5afdb5ede203a7437ce27618ee64d0ce2164ee81477b8aec316b2cc81bc0b923fddffd5ec6056a271bfceef4e92a23e686 SHA512 0c7fa7b4e4ba49b6ae4fe0bc2119699381560a6c0eeaaaed5d974cbca2c089df4b08c0c19709e57e9da5ecfd934beb1f3cd03419d5d900306ffaeec24053ea57 EBUILD python-3.4.8-r1.ebuild 10844 BLAKE2B c83f03d4ae829a950b2c5f416c700882e3dc796d6703d5bb38d298317c56662bc37053b0128f212d286024f510431d73ed7b8ed7e6317968f204eed8149f812f SHA512 531d32cb98ab3fc112b1c922bba134b18ad8f01a5ba304976222b345a38bcba5359e637a75e032a8537707fc283126e4fcc1b7e4fbdc6b1afb395f59e57f5549 diff --git a/dev-lang/python/python-2.7.15.ebuild b/dev-lang/python/python-2.7.15.ebuild index f6f405968445..92db0aaa6dff 100644 --- a/dev-lang/python/python-2.7.15.ebuild +++ b/dev-lang/python/python-2.7.15.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz LICENSE="PSF-2" SLOT="2.7" -KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="-berkdb bluetooth build doc 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. diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest index bf8b4678ca13..d6b1097817cc 100644 --- a/dev-lang/ruby/Manifest +++ b/dev-lang/ruby/Manifest @@ -8,14 +8,21 @@ AUX 2.5/005_no-undefined-ext.patch 486 BLAKE2B 715f952cab863847f420afb020cac6819 AUX 2.5/009_no-gems.patch 3454 BLAKE2B f2439a799776c39ba16f1503d573c90ea6d74fc2bad3b3874a961add6b605bb064c683080a4258ed1a0e83bca5cb67c02ba68bceb6acea7613ab7166e16a2f4c SHA512 bef8b2763993755b5b6ccba0b5cbe002fd721405d7c274f421ae3d95fa4d0d99cdf946f5fa9a907cac2c3696b2cc23f2f2e030b3a70eca93081e49b02f25a072 AUX 2.5/010-libressl_2.7.patch 638 BLAKE2B 53f5f5d275e2c5482a608a947a1b3c41e9dcdd1763cc57a075e3abd536567852387506ec0ce2f5f49f5eed2246ca9f860d56637a9f18cd17cd49fff6fc92d340 SHA512 986aff99fd35814c94581cdc169cfc5a5f75c87889db5556941809ecaf878b6af838afe2ee108dd7147ea70be6fe9e47f98cce3c1804af0a34f7c1aab8c13d89 DIST ruby-2.3.7.tar.xz 11438124 BLAKE2B 4f7e0422291794b254cb80edd2f0841bbc1e85cd62635024b6d43b23b1bcdc512d92b57d8885b253465cc8ef3c6cbcec97a6ef239dc11cc8b252e941d25e0487 SHA512 fd91c8db3d3aa4cc962a62f27b4d1a71f6b5567ab836e6dbfbbb1553eb269d11e12faf9e36af6c489c33b54fd89dab99bfe81a563158b704877f0628d6f5bc5a +DIST ruby-2.3.8.tar.xz 11465792 BLAKE2B b9c8ef5c943872e3d1426c30cbd720acc66d17cc7bc926f3294e68f17fbc78edef42f6496295800c3d4efd3ae441730723bfcfbc1111e46239359930622697d9 SHA512 06373050e6c1af9cb6a5863aef878b21c8a45fd0e68414e3d546cb73ec3028207d3acc0a9326428f172b9347a30bbe69a16f9dc0bdb739161d677adb2d888095 DIST ruby-2.4.4.tar.xz 10049304 BLAKE2B 76bb2c3f63cda8e6f3814c74dded23568b2f7f12036d745bf55fc4a68e281ef3ae0fe29bf8e194db71f72e724ffe750a31bec9246ad1c01eb05ed93512a6422e SHA512 4dc112a149273d4221484ccbf1260c6c5fcad7e0a6e4bc91e4ef69cbc093d3191f7abd71420f80d680f8ea5d111e6803ba2af32166aa501913639e6d5696fde0 +DIST ruby-2.4.5.tar.xz 10064712 BLAKE2B 0846125e617b43ea302b4c5309b20503577937865d445a6fee766323a188aa552d3a13740c3d38c7be812b19bffb2474021cb7b368cc144d51ea771552f62769 SHA512 658f676c623109f4c7499615e191c98c3dd72cfcaeeaf121337d0b8a33c5243145edd50ec5e2775f988e3cd19788984f105fa165e3049779066566f67172c1b4 DIST ruby-2.5.1.tar.xz 11348108 BLAKE2B ea1019a81f96169ab8d435215362b36b098df373ac4f53ecda328686ec2c13204a38c66bb1bf9504d18e1762e7e6ae277bab3b16bb53b8e628962df715769f3b SHA512 31bacf58469953282cd5d8b51862dcf4b84dedb927c1871bc3fca32fc157fe49187631575a70838705fe246f4555647577a7ecc26894445a7d64de5503dc11b4 +DIST ruby-2.5.3.tar.xz 11453336 BLAKE2B 66c59448a23c22796b43f04a1f84359386b7bee7163da4255426ea75b1c7af0a7a7142991b870a75a72ded56ac49f47c51bc162ebf2be2af0d1b1608b60c02df SHA512 6dcae0e8d0bacdb2cbde636e2030596308b5af53f2eb85d3adccb67b02e6f8f9751e8117d12f8484829fdd9d995f6e327f701d9b433bcf94f1f59d13a1fd7518 DIST ruby-patches-2.3.7.tar.bz2 3030 BLAKE2B 7c1e80ff0569a03672f53820c665933056b46bcf791c9132cb9f358f72df693749f02da65ca7469c3dd0f652d7dc7bfaa03dccd4eb900562361876023fb65b42 SHA512 54cc3f2bfd1967b8558736e5a5240b886a56b22defca5813f45b1f4dca9af169b4d59d60b327ec8411e824970ac6da1cec53cfc31833403742e9d6941e5a78f1 +DIST ruby-patches-2.3.8.tar.bz2 3030 BLAKE2B 7c1e80ff0569a03672f53820c665933056b46bcf791c9132cb9f358f72df693749f02da65ca7469c3dd0f652d7dc7bfaa03dccd4eb900562361876023fb65b42 SHA512 54cc3f2bfd1967b8558736e5a5240b886a56b22defca5813f45b1f4dca9af169b4d59d60b327ec8411e824970ac6da1cec53cfc31833403742e9d6941e5a78f1 DIST ruby-patches-2.4.4.tar.bz2 2898 BLAKE2B e46502dbb0aa25c3d71693a6c04b433bd4de60f194cdd283517c4b08da190356885d9bca4a6765402088185fa8ec681156e8e8eecf0703a2c1ea7bb81adc0bf9 SHA512 d767d43c7df737469247e42e1c4205b8c6850c8f335a2869c884f145c037e9bab10492cc7cd2903f5c33e232cdc5bbdabb3e8da837c7bf420b9d58d1d33149ed DIST ruby-patches-2.5.1.tar.bz2 2986 BLAKE2B 64d64eda19bff94f205a6314c2af59896064fb64c118e0f3859d82aeb7e58478170b9160804ab8faf569054b65228abeecc5900e568e17133c21e9aed9bdf589 SHA512 c2bca3f98c7bb1de267b9f07eb1b0903c499c79e9c9d0166a6924e88e837434f27ddedd7aead7ebbe32f0530f751601ac5486a0db46ee28b94d7cea13e0e7924 EBUILD ruby-2.3.7.ebuild 6872 BLAKE2B d7cf4b0319f63d9485130c17a393671da672e4f6a4227147be161f0f3e941b8f9b2da4b43168018909ac38b002bea7348f8781fa5a7868913e0b88261dbbd874 SHA512 302d8e3feb1d532eab9e9b5e60d258ceec22a44d40c9adba4cc27d5460dc05deb932777163f06e39975756090a448a73af96c801288b0c3912cca4c591a3cd43 +EBUILD ruby-2.3.8.ebuild 6881 BLAKE2B 530d73cf9111885a8ac4c83e22e1f0f00bf309cc06f91f79e03cf40ffaca4c857f29387e3a3f9bd40fad279745afe77880c44f5ff36b9ddb01269448533d8a99 SHA512 31e52b200f366cdac1d3f3b9283f20a12478cb31b7e130417d4ff604ff2dee108ad6655b78176b41c24bd42b18c51ee21cb39718a36e7dfd218d4870ecf39703 EBUILD ruby-2.4.4-r1.ebuild 6613 BLAKE2B 22c7fc546104b77e29e507bcf7a57d23d34df1aaaa3bc7e9e6a865152977718bfe0af970a8defbd5ee2bb22ef1f2d1b4724ef5d80501d000dc109ba5fa5a1715 SHA512 efcdcb89d71e85d03c8b6d076f85ee87fb850327a509ac2f7f1b94e55f212310b5983c3494c8c1a60ace8df3624b0c6518d4421339c63b27d56f967734213291 EBUILD ruby-2.4.4.ebuild 6979 BLAKE2B 70d16f9f2f92572be797934936f8dd25fe074e8bb0aa24e80b86043f38b2dd8f0fc41e2bc4b603894d4026c1d724170dfe094e7a97e621c2bab37a2c968cd224 SHA512 0186b663596a9304c90e18e679f5736a509fd9cb7b456a0294c2b7da5be406467552da80dcfd2d50a5033de03a4ddf213642c139263282228aa3db02ca180c17 +EBUILD ruby-2.4.5.ebuild 6626 BLAKE2B 80e2a13b383820d0cc72a55f8e90b6bda55eac48bcd8b6f5701c1f74c4df18a136ff1e283c6f5d798414d8123f0dc496b1a00dca06568afecb1824fd0037d016 SHA512 95de895451d3688cbba12da2de466b88fd0396960be3309bb2add42d477d19898f2f904339bc4dc5b2c0301765d01c5db47cc1564427e1a30ed6c01877323ff0 EBUILD ruby-2.5.1-r1.ebuild 6405 BLAKE2B 995547ae8855c9abacd956e07a08d250d3dd02d6374bbad0868a281bd712d8234285dc9256776e24dccaa138dc3e2e1ada5801c7425bc7eca44d487b082fb978 SHA512 3172a415da2caefbdec5802ee5a981d1e2a5a442bc0091a88722e61c01e5d90b0679334d50a62ed16b226db4335e610c9c504c3cf43ca5a3ee5e3c096f3b856e EBUILD ruby-2.5.1.ebuild 6771 BLAKE2B ae92da61788df6fc265539f4fac48f2edd7ebbd9625277b9a19b6463c7ba5473e7c83ab6bc3c00d2d85b3acebedc2dc4ca49c60c9fe2313b7fcb16443b245df6 SHA512 8d9d27fbe99aff48991cc6531646fcddb6f97a46b7c4a43e436b27d77f092337c30af7febe3aef74dde2d47056ffa93f78ac63dbb8cc99b5e623599aab9e394c -MISC metadata.xml 911 BLAKE2B 7596a3d7a53742635e3262a0deac45eb6c37e51b473dde2b5da78742baba1ecab42a4a3e2f992cfa8f3765472df896ccff2e2936ba5dedba1aad05c2ab47d9dc SHA512 c5d9f15742132625061303ed71206e937933b402e183edbe0f37ee73ac7ba47b3f7ad54cbf12d1db3900a1f833ea2432790a10a02ba7e1e0c4bf128a716b9d72 +EBUILD ruby-2.5.3.ebuild 6418 BLAKE2B 40d7c916a9d83b0cee36d793c95aae501c7778e4cfe7a83a14f2a54223a4d1984b4fc8fea70712b8e65eabe31beaa98a12040ee4a3ff6f1263d9a3dfa8cca983 SHA512 826075b481abb9656c905a38bf70fbb5067b408afba0bd12f965ae129f3c6bd1f14e307bacd6f922ca212522ee1f016b6d6954a69c5b1054507d41883435a026 +MISC metadata.xml 824 BLAKE2B e426ed390cdea118f3301d329ce93729095bafb0a04db9a64edfd709251d6f16f91153d56976f99b82d7a9df4a452513d65593732ccbd7f71332870b52f369a7 SHA512 b6f4fab5888fb9605164d7f627edc86514ec2f83d9dd8c74003ccc5a0d9b6a306986930e027e81f09928fc7ac6677a7de58cebf75c31c2ada73e2a506a447453 diff --git a/dev-lang/ruby/metadata.xml b/dev-lang/ruby/metadata.xml index 99e5faab0bb7..b8e5451fc581 100644 --- a/dev-lang/ruby/metadata.xml +++ b/dev-lang/ruby/metadata.xml @@ -17,6 +17,5 @@ editing functionality). </flag> <flag name="rdoc">Install <pkg>dev-ruby/rdoc</pkg> after installing Ruby.</flag> - <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for memory allocation.</flag> </use> </pkgmetadata> diff --git a/dev-lang/ruby/ruby-2.3.8.ebuild b/dev-lang/ruby/ruby-2.3.8.ebuild new file mode 100644 index 000000000000..b5d01be70e1d --- /dev/null +++ b/dev-lang/ruby/ruby-2.3.8.ebuild @@ -0,0 +1,242 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +#PATCHSET=1 + +inherit autotools eutils flag-o-matic multilib versionator + +MY_P="${PN}-$(get_version_component_range 1-3)" +S=${WORKDIR}/${MY_P} + +SLOT=$(get_version_component_range 1-2) +MY_SUFFIX=$(delete_version_separator 1 ${SLOT}) +RUBYVERSION=2.3.0 + +if [[ -n ${PATCHSET} ]]; then + if [[ ${PVR} == ${PV} ]]; then + PATCHSET="${PV}-r0.${PATCHSET}" + else + PATCHSET="${PVR}.${PATCHSET}" + fi +else + PATCHSET="${PVR}" +fi + +DESCRIPTION="An object-oriented scripting language" +HOMEPAGE="https://www.ruby-lang.org/" +SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz + https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2" + +LICENSE="|| ( Ruby-BSD BSD-2 )" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline" + +RDEPEND=" + berkdb? ( sys-libs/db:= ) + gdbm? ( sys-libs/gdbm:= ) + jemalloc? ( dev-libs/jemalloc ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl ) + ) + socks5? ( >=net-proxy/dante-1.1.13 ) + tk? ( + dev-lang/tcl:0=[threads] + dev-lang/tk:0=[threads] + ) + ncurses? ( sys-libs/ncurses:0= ) + readline? ( sys-libs/readline:0= ) + dev-libs/libyaml + virtual/libffi:= + sys-libs/zlib + >=app-eselect/eselect-ruby-20151229 + !<dev-ruby/rdoc-3.9.4 + !<dev-ruby/rubygems-1.8.10-r1" + +DEPEND="${RDEPEND}" + +BUNDLED_GEMS=" + >=dev-ruby/did_you_mean-1.0.0:1[ruby_targets_ruby23] + >=dev-ruby/minitest-5.8.3[ruby_targets_ruby23] + >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby23] + >=dev-ruby/power_assert-0.2.6[ruby_targets_ruby23] + >=dev-ruby/rake-10.4.2[ruby_targets_ruby23] + >=dev-ruby/test-unit-3.1.5[ruby_targets_ruby23] +" + +PDEPEND=" + ${BUNDLED_GEMS} + virtual/rubygems[ruby_targets_ruby23] + >=dev-ruby/json-1.8.3[ruby_targets_ruby23] + rdoc? ( >=dev-ruby/rdoc-4.2.1[ruby_targets_ruby23] ) + xemacs? ( app-xemacs/ruby-modes )" + +src_prepare() { + EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \ + epatch "${WORKDIR}/patches" + + einfo "Unbundling gems..." + cd "$S" + # Remove bundled gems that we will install via PDEPEND, bug + # 539700. Use explicit version numbers to ensure rm fails when they + # change so we can update dependencies accordingly. + rm -f gems/{did_you_mean-1.0.0,minitest-5.8.3,net-telnet-0.1.1,power_assert-0.2.6,rake-10.4.2,test-unit-3.1.5}.gem || die + + # Fix a hardcoded lib path in configure script + sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \ + configure.in || die "sed failed" + + eautoreconf +} + +src_configure() { + local modules= myconf= + + # -fomit-frame-pointer makes ruby segfault, see bug #150413. + filter-flags -fomit-frame-pointer + # In many places aliasing rules are broken; play it safe + # as it's risky with newer compilers to leave it as it is. + append-flags -fno-strict-aliasing + # SuperH needs this + use sh && append-flags -mieee + + # Socks support via dante + if use socks5 ; then + # Socks support can't be disabled as long as SOCKS_SERVER is + # set and socks library is present, so need to unset + # SOCKS_SERVER in that case. + unset SOCKS_SERVER + fi + + # Increase GC_MALLOC_LIMIT if set (default is 8000000) + if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then + append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}" + fi + + # ipv6 hack, bug 168939. Needs --enable-ipv6. + use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET" + + # Determine which modules *not* to build depending in the USE flags. + if ! use readline ; then + modules="${modules},readline" + fi + if ! use berkdb ; then + modules="${modules},dbm" + fi + if ! use gdbm ; then + modules="${modules},gdbm" + fi + if ! use ssl ; then + modules="${modules},openssl" + fi + if ! use ncurses ; then + modules="${modules},curses" + fi + if ! use tk ; then + modules="${modules},tk" + fi + + # Provide an empty LIBPATHENV because we disable rpath but we do not + # need LD_LIBRARY_PATH by default since that breaks USE=multitarget + # #564272 + 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 \ + --with-out-ext="${modules}" \ + $(use_with jemalloc jemalloc) \ + $(use_enable socks5 socks) \ + $(use_enable doc install-doc) \ + --enable-ipv6 \ + $(use_enable debug) \ + ${myconf} \ + --enable-option-checking=no \ + || die "econf failed" +} + +src_compile() { + emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed" +} + +src_test() { + emake -j1 V=1 test || die "make test failed" + + elog "Ruby's make test has been run. Ruby also ships with a make check" + elog "that cannot be run until after ruby has been installed." + elog + if use rubytests; then + elog "You have enabled rubytests, so they will be installed to" + elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other" + elog "than root, and you must place them into a writeable directory." + elog "Then call: " + elog + elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb" + else + elog "Enable the rubytests USE flag to install the make check tests" + fi +} + +src_install() { + # Remove the remaining bundled gems. We do this late in the process + # since they are used during the build to e.g. create the + # documentation. + rm -rf ext/json || die + + # Ruby is involved in the install process, we don't want interference here. + unset RUBYOPT + + local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby) + + LD_LIBRARY_PATH="${S}:${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" + RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}" + for d in $(find "${S}/ext" -type d) ; do + RUBYLIB="${RUBYLIB}:$d" + done + export LD_LIBRARY_PATH RUBYLIB + + emake V=1 DESTDIR="${D}" install || die "make install failed" + + # Remove installed rubygems and rdoc copy + rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" + rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed" + rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed" + rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" + + if use doc; then + make DESTDIR="${D}" install-doc || die "make install-doc failed" + fi + + if use examples; then + insinto /usr/share/doc/${PF} + doins -r sample + fi + + dodoc ChangeLog NEWS doc/NEWS* README* || die + + if use rubytests; then + pushd test + insinto /usr/share/${PN}-${SLOT}/test + doins -r . + popd + fi +} + +pkg_postinst() { + if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then + eselect ruby set ruby${MY_SUFFIX} + fi + + elog + elog "To switch between available Ruby profiles, execute as root:" + elog "\teselect ruby set ruby(22|23|...)" + elog +} + +pkg_postrm() { + eselect ruby cleanup +} diff --git a/dev-lang/ruby/ruby-2.4.5.ebuild b/dev-lang/ruby/ruby-2.4.5.ebuild new file mode 100644 index 000000000000..80efa3680809 --- /dev/null +++ b/dev-lang/ruby/ruby-2.4.5.ebuild @@ -0,0 +1,229 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic multilib + +MY_P="${PN}-$(ver_cut 1-3)" +S=${WORKDIR}/${MY_P} + +SLOT=$(ver_cut 1-2) +MY_SUFFIX=$(ver_rs 1 '' ${SLOT}) +RUBYVERSION=${SLOT}.0 + +DESCRIPTION="An object-oriented scripting language" +HOMEPAGE="https://www.ruby-lang.org/" +SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz" + +LICENSE="|| ( Ruby-BSD BSD-2 )" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl static-libs tk xemacs" + +RDEPEND=" + berkdb? ( sys-libs/db:= ) + gdbm? ( sys-libs/gdbm:= ) + jemalloc? ( dev-libs/jemalloc ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl ) + ) + socks5? ( >=net-proxy/dante-1.1.13 ) + tk? ( + dev-lang/tcl:0=[threads] + dev-lang/tk:0=[threads] + ) + dev-libs/libyaml + virtual/libffi:= + sys-libs/zlib + >=app-eselect/eselect-ruby-20161226 + !<dev-ruby/rdoc-3.9.4 + !<dev-ruby/rubygems-1.8.10-r1" + +DEPEND="${RDEPEND}" + +BUNDLED_GEMS=" + >=dev-ruby/did_you_mean-1.1.0:2.4[ruby_targets_ruby24] + >=dev-ruby/minitest-5.10.1[ruby_targets_ruby24] + >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby24] + >=dev-ruby/power_assert-0.4.1[ruby_targets_ruby24] + >=dev-ruby/rake-12.0.0[ruby_targets_ruby24] + >=dev-ruby/test-unit-3.2.3[ruby_targets_ruby24] + >=dev-ruby/xmlrpc-0.2.1[ruby_targets_ruby24] +" + +PDEPEND=" + ${BUNDLED_GEMS} + virtual/rubygems[ruby_targets_ruby24] + >=dev-ruby/json-2.0.2[ruby_targets_ruby24] + rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby24] ) + xemacs? ( app-xemacs/ruby-modes )" + +src_prepare() { + eapply "${FILESDIR}"/${SLOT}/{002,005,009}*.patch + + einfo "Unbundling gems..." + cd "$S" + # Remove bundled gems that we will install via PDEPEND, bug + # 539700. Use explicit version numbers to ensure rm fails when they + # change so we can update dependencies accordingly. + rm -f gems/{did_you_mean-1.1.0,minitest-5.10.1,net-telnet-0.1.1,power_assert-0.4.1,rake-12.0.0,test-unit-3.2.3,xmlrpc-0.2.1}.gem || die + + einfo "Removing bundled libraries..." + rm -fr ext/fiddle/libffi-3.2.1 || die + + # Fix a hardcoded lib path in configure script + sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \ + configure.in || die "sed failed" + + eapply_user + + eautoreconf +} + +src_configure() { + local modules= myconf= + + # -fomit-frame-pointer makes ruby segfault, see bug #150413. + filter-flags -fomit-frame-pointer + # In many places aliasing rules are broken; play it safe + # as it's risky with newer compilers to leave it as it is. + append-flags -fno-strict-aliasing + # SuperH needs this + use sh && append-flags -mieee + + # Socks support via dante + if use socks5 ; then + # Socks support can't be disabled as long as SOCKS_SERVER is + # set and socks library is present, so need to unset + # SOCKS_SERVER in that case. + unset SOCKS_SERVER + fi + + # Increase GC_MALLOC_LIMIT if set (default is 8000000) + if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then + append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}" + fi + + # ipv6 hack, bug 168939. Needs --enable-ipv6. + use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET" + + # Determine which modules *not* to build depending in the USE flags. + if ! use berkdb ; then + modules="${modules},dbm" + fi + if ! use gdbm ; then + modules="${modules},gdbm" + fi + if ! use ssl ; then + modules="${modules},openssl" + fi + if ! use tk ; then + modules="${modules},tk" + fi + + # Provide an empty LIBPATHENV because we disable rpath but we do not + # need LD_LIBRARY_PATH by default since that breaks USE=multitarget + # #564272 + 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 \ + --with-out-ext="${modules}" \ + $(use_with jemalloc jemalloc) \ + $(use_enable socks5 socks) \ + $(use_enable doc install-doc) \ + --enable-ipv6 \ + $(use_enable static-libs static) \ + $(use_enable static-libs install-static-library) \ + $(use_with static-libs static-linked-ext) \ + $(use_enable debug) \ + ${myconf} \ + --enable-option-checking=no \ + || die "econf failed" +} + +src_compile() { + emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed" +} + +src_test() { + emake -j1 V=1 test || die "make test failed" + + elog "Ruby's make test has been run. Ruby also ships with a make check" + elog "that cannot be run until after ruby has been installed." + elog + if use rubytests; then + elog "You have enabled rubytests, so they will be installed to" + elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other" + elog "than root, and you must place them into a writeable directory." + elog "Then call: " + elog + elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb" + else + elog "Enable the rubytests USE flag to install the make check tests" + fi +} + +src_install() { + # Remove the remaining bundled gems. We do this late in the process + # since they are used during the build to e.g. create the + # documentation. + rm -rf ext/json || die + + # Ruby is involved in the install process, we don't want interference here. + unset RUBYOPT + + local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby) + + LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" + RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}" + for d in $(find "${S}/ext" -type d) ; do + RUBYLIB="${RUBYLIB}:$d" + done + export LD_LIBRARY_PATH RUBYLIB + + emake V=1 DESTDIR="${D}" install || die "make install failed" + + # Remove installed rubygems and rdoc copy + rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" + rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed" + rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed" + rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" + + if use doc; then + make DESTDIR="${D}" install-doc || die "make install-doc failed" + fi + + if use examples; then + insinto /usr/share/doc/${PF} + doins -r sample + fi + + dodoc ChangeLog NEWS doc/NEWS* README* || die + + if use rubytests; then + pushd test + insinto /usr/share/${PN}-${SLOT}/test + doins -r . + popd + fi +} + +pkg_postinst() { + if [[ ! -n $(readlink "${EROOT}"usr/bin/ruby) ]] ; then + eselect ruby set ruby${MY_SUFFIX} + fi + + elog + elog "To switch between available Ruby profiles, execute as root:" + elog "\teselect ruby set ruby(23|24|...)" + elog +} + +pkg_postrm() { + eselect ruby cleanup +} diff --git a/dev-lang/ruby/ruby-2.5.3.ebuild b/dev-lang/ruby/ruby-2.5.3.ebuild new file mode 100644 index 000000000000..b837e6034f7a --- /dev/null +++ b/dev-lang/ruby/ruby-2.5.3.ebuild @@ -0,0 +1,224 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic multilib + +MY_P="${PN}-$(ver_cut 1-3)" +S=${WORKDIR}/${MY_P} + +SLOT=$(ver_cut 1-2) +MY_SUFFIX=$(ver_rs 1 '' ${SLOT}) +RUBYVERSION=${SLOT}.0 + +DESCRIPTION="An object-oriented scripting language" +HOMEPAGE="https://www.ruby-lang.org/" +SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz" + +LICENSE="|| ( Ruby-BSD BSD-2 )" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl static-libs tk xemacs" + +RDEPEND=" + berkdb? ( sys-libs/db:= ) + gdbm? ( sys-libs/gdbm:= ) + jemalloc? ( dev-libs/jemalloc ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl ) + ) + socks5? ( >=net-proxy/dante-1.1.13 ) + tk? ( + dev-lang/tcl:0=[threads] + dev-lang/tk:0=[threads] + ) + dev-libs/libyaml + virtual/libffi:= + sys-libs/zlib + >=app-eselect/eselect-ruby-20171225 +" + +DEPEND="${RDEPEND}" + +BUNDLED_GEMS=" + >=dev-ruby/did_you_mean-1.2.0:2.5[ruby_targets_ruby25] + >=dev-ruby/minitest-5.10.3[ruby_targets_ruby25] + >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby25] + >=dev-ruby/power_assert-1.1.1[ruby_targets_ruby25] + >=dev-ruby/rake-12.3.0[ruby_targets_ruby25] + >=dev-ruby/test-unit-3.2.7[ruby_targets_ruby25] + >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby25] +" + +PDEPEND=" + ${BUNDLED_GEMS} + virtual/rubygems[ruby_targets_ruby25] + >=dev-ruby/json-2.0.2[ruby_targets_ruby25] + rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby25] ) + xemacs? ( app-xemacs/ruby-modes )" + +src_prepare() { + eapply "${FILESDIR}"/${SLOT}/{001,005,009}*.patch + + einfo "Unbundling gems..." + cd "$S" + # Remove bundled gems that we will install via PDEPEND, bug + # 539700. Use explicit version numbers to ensure rm fails when they + # change so we can update dependencies accordingly. + rm -f gems/{did_you_mean-1.2.0,minitest-5.10.3,net-telnet-0.1.1,power_assert-1.1.1,rake-12.3.0,test-unit-3.2.7,xmlrpc-0.3.0}.gem || die + + einfo "Removing bundled libraries..." + rm -fr ext/fiddle/libffi-3.2.1 || die + + eapply_user + + eautoreconf +} + +src_configure() { + local modules= myconf= + + # -fomit-frame-pointer makes ruby segfault, see bug #150413. + filter-flags -fomit-frame-pointer + # In many places aliasing rules are broken; play it safe + # as it's risky with newer compilers to leave it as it is. + append-flags -fno-strict-aliasing + # SuperH needs this + use sh && append-flags -mieee + + # Socks support via dante + if use socks5 ; then + # Socks support can't be disabled as long as SOCKS_SERVER is + # set and socks library is present, so need to unset + # SOCKS_SERVER in that case. + unset SOCKS_SERVER + fi + + # Increase GC_MALLOC_LIMIT if set (default is 8000000) + if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then + append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}" + fi + + # ipv6 hack, bug 168939. Needs --enable-ipv6. + use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET" + + # Determine which modules *not* to build depending in the USE flags. + if ! use berkdb ; then + modules="${modules},dbm" + fi + if ! use gdbm ; then + modules="${modules},gdbm" + fi + if ! use ssl ; then + modules="${modules},openssl" + fi + if ! use tk ; then + modules="${modules},tk" + fi + + # Provide an empty LIBPATHENV because we disable rpath but we do not + # need LD_LIBRARY_PATH by default since that breaks USE=multitarget + # #564272 + 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 \ + --with-out-ext="${modules}" \ + $(use_with jemalloc jemalloc) \ + $(use_enable socks5 socks) \ + $(use_enable doc install-doc) \ + --enable-ipv6 \ + $(use_enable static-libs static) \ + $(use_enable static-libs install-static-library) \ + $(use_with static-libs static-linked-ext) \ + $(use_enable debug) \ + ${myconf} \ + --enable-option-checking=no \ + || die "econf failed" +} + +src_compile() { + emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed" +} + +src_test() { + emake -j1 V=1 test || die "make test failed" + + elog "Ruby's make test has been run. Ruby also ships with a make check" + elog "that cannot be run until after ruby has been installed." + elog + if use rubytests; then + elog "You have enabled rubytests, so they will be installed to" + elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other" + elog "than root, and you must place them into a writeable directory." + elog "Then call: " + elog + elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb" + else + elog "Enable the rubytests USE flag to install the make check tests" + fi +} + +src_install() { + # Remove the remaining bundled gems. We do this late in the process + # since they are used during the build to e.g. create the + # documentation. + rm -rf ext/json || die + + # Ruby is involved in the install process, we don't want interference here. + unset RUBYOPT + + local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby) + + LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" + RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}" + for d in $(find "${S}/ext" -type d) ; do + RUBYLIB="${RUBYLIB}:$d" + done + export LD_LIBRARY_PATH RUBYLIB + + emake V=1 DESTDIR="${D}" install || die "make install failed" + + # Remove installed rubygems and rdoc copy + rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" + rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed" + rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed" + rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" + + if use doc; then + make DESTDIR="${D}" install-doc || die "make install-doc failed" + fi + + if use examples; then + insinto /usr/share/doc/${PF} + doins -r sample + fi + + dodoc ChangeLog NEWS doc/NEWS* README* || die + + if use rubytests; then + pushd test + insinto /usr/share/${PN}-${SLOT}/test + doins -r . + popd + fi +} + +pkg_postinst() { + if [[ ! -n $(readlink "${EROOT}"usr/bin/ruby) ]] ; then + eselect ruby set ruby${MY_SUFFIX} + fi + + elog + elog "To switch between available Ruby profiles, execute as root:" + elog "\teselect ruby set ruby(23|24|...)" + elog +} + +pkg_postrm() { + eselect ruby cleanup +} diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest index af03d83974dd..0a8bea7d2a62 100644 --- a/dev-lang/rust-bin/Manifest +++ b/dev-lang/rust-bin/Manifest @@ -4,5 +4,19 @@ DIST rust-1.29.1-arm-unknown-linux-gnueabihf.tar.xz 106051860 BLAKE2B 65d9a5f755 DIST rust-1.29.1-armv7-unknown-linux-gnueabihf.tar.xz 106372416 BLAKE2B 25371071e52a585c3f0b99f5849cf674aedd6d024ce75f6bf7b0d88f485d715b42d6a0f5eb8871890240d1c2488d7ad75c8ac7b4b22dd88e3ce2d049d35ae8ee SHA512 0067476eb0972998cee33f27d8fd6ef51c497bd6edbbd8a289fcf768da525805646569ed029318d4be6ecb6aece6669e3554eb30a14e1d31f2a3e7d5896b14c3 DIST rust-1.29.1-i686-unknown-linux-gnu.tar.xz 150811536 BLAKE2B 999997d268cbbb5485d8efde108462bb0086ed9428a9b7ba8136dac764cd871a39d9503f6b928ce5fd9f1cdbf20dd109877f4404cb4522ccb2d37bfd55b15664 SHA512 8dc2a3b7fb1eef4b009541c473b767d07ab1136b933495b22e3fa56925def80b141b4801ce362ce9986a559fda4299fea35dd4bd7209dc1b3425b44421605df8 DIST rust-1.29.1-x86_64-unknown-linux-gnu.tar.xz 148184680 BLAKE2B be64a44619807be3151162e45cefe79242e965277606b7aac4f0456d34e4cb526b1779c327499c47c484a830c4c566ab1aeaef30cf17ae7d2bdc89ecbf1f5de5 SHA512 69809c2ae77be6a1f71a5f14cea74dee6ac59bb548bc8ed454819ce3db38146ad64b83a6bf2a6d5cea68c807bc8ecf6c7929c4f8365b419e40a23022074efa16 +DIST rust-1.29.2-aarch64-unknown-linux-gnu.tar.xz 99702524 BLAKE2B 669066ada5c88ad966125edca77723fbe0ebc0e19859a96cf02eb28a107df87647bc552358cb5e1f8be1fb79d836f8202f4e59349f123bd95383a3a9cb82d0f0 SHA512 f871359a3b1ac54fb237921204d98ef4fac06830e9835849538397c27d40283662c0f6ab3f6eafe0e9ef63182a460e26d615111055430ece0fe94ddf7ad03914 +DIST rust-1.29.2-arm-unknown-linux-gnueabi.tar.xz 105368092 BLAKE2B 7764689fdaeb2ade9aff248707f472ed35d06d4240b138ddf083ef614227845bf6e1d0be38ebc771e95b0998dab3f550de5abe50ffe89625690611d4bdf53aad SHA512 2ef8fda575b00bf7c6f20a8f2a1b6cb8c3b1de6287c9e07889c9a3a682f73f9470bb5649425652ac47af8f61f49abf21209f6b151c4a5ae42dcea59f6e79f84b +DIST rust-1.29.2-arm-unknown-linux-gnueabihf.tar.xz 105657004 BLAKE2B 5813dde3020afda41e307f4d9ba57c3840ff800bceb0ef494d743095ce6d4da333da208fc72bb36e21209a9ae16e081ca3e7580d59a984ce561d85bcf4b2e2dc SHA512 81d4e392afe3f4bd1ad76a78610e92e8a27afe8f6d0ff1773dbdf35f2041a587c2a0d71db0658ff50fb43460b4f15f23bbb1cc03a018d49d153314e636befb8a +DIST rust-1.29.2-armv7-unknown-linux-gnueabihf.tar.xz 105958932 BLAKE2B 569cbee0ad0eba41c280be934fc5a59c52331b0853d890aad2188c1979a259d90f4092d72dc9e8027255e2ea6b5ea422a06dd9d82f6b2a865fb1d3bcf146c13d SHA512 bff1220781eca904a93d2cefafed3587e3f76e1dc04fbef09a0281295b6c06491c5fa327830c430d31df80eb7a3e64eac7f45739bc118e3626854f96dce246e2 +DIST rust-1.29.2-i686-unknown-linux-gnu.tar.xz 150567444 BLAKE2B d3b3cfa88e89e29cf2e502a2ee11b22ea45cf9fa5ca0611de273062a8885dc0b9206a43175895a873cbfbaa08bf0bbdcf38cca45436b77b47dbac1b09e0fdb68 SHA512 faac22aec54d0754ff991f2a34ed7b8bfefa8dc9720d247eec1c6b671bbc701907146a796699591e4a677a0f378b9d96bfea5b33452f05dd876c668525f9f33d +DIST rust-1.29.2-mips-unknown-linux-gnu.tar.xz 96027696 BLAKE2B e12dbd41e45a5009c218be07f085d75ce99bd7a7daf8917db0127aa03ac78f4883b344b566d3a8947b836d55750388ea5387264e036c75de7ef4ba5dda081d63 SHA512 21d860c6f7219f51b65dced57e0173500e054d2d13300f0ee7721262a8354e5dbc272deb8387fcaaeb16ad793808f87edc6c087f7e442e7434264a3302acf537 +DIST rust-1.29.2-mips64-unknown-linux-gnuabi64.tar.xz 102149796 BLAKE2B 1f40dd40e461769cfb75a671d6f83c650c74031302bd8872861cfdd3432e270e47c150382c6f02c38e7823f35a158de395cbc33f0061e51632d130b6fd0910f9 SHA512 5b98632b80d2ed4cef17bd068adabbe26146a6df68e6e70f2535f61f981c8f935b2491a2dcf388a2afe0cc225f10f9f262342457ce9def8c800364253cac7e67 +DIST rust-1.29.2-mipsel-unknown-linux-gnu.tar.xz 97362256 BLAKE2B 4d3170a8c48a68a606eff5631d198b16ca09953b0d8079c39f5edc6284a037c0b2212c74d098da4fa0a40a0917139022a9746734e9fdeb62e2564337430a4edb SHA512 9c5ca864da672a975730073e3291c2be218c2624a11ec5fc9a2637bdf58c7437ae77910bccbc6678d584a3464036377d4717d7f6ebdd5712e9bc86973e91d0ad +DIST rust-1.29.2-powerpc-unknown-linux-gnu.tar.xz 93639612 BLAKE2B 54fe353f32bedb2567784bfe28ac741f137cc55928e874157f420460831cdb4617fee262c4d3b56d6720dba37bb7b6281c970d4a3002c673aaa85aa70eed922d SHA512 f217cd5169225b290870821b5ba17ad9dfffc99906057c79e91e2a2db5cfd8bc5a83d4e20023e9b73171d15c988e4b28cdbf3f8af2c70657566e6d89658998b0 +DIST rust-1.29.2-powerpc64-unknown-linux-gnu.tar.xz 103432092 BLAKE2B ed700d298770b621767f5439841e3be79c3c02d2b05feb211b8508933d4ca2d13c30cf689c5376cfc93bd374c09aaa4fdc4fb84dd4db264eef6a70cba62b6647 SHA512 1af0b55bc62d7641d33e2d33aadaf474298d3284cb2d914be0240eae54e20f464513db4b04f7518385dc5135498c58ec18e0d4cc6341c9e165847536479f44dc +DIST rust-1.29.2-powerpc64le-unknown-linux-gnu.tar.xz 106607384 BLAKE2B de19f341dcc1cc580e68865d3b0034f781ed4ca0ac1b07c89352409684670c7d0fd5c95ea6018fc7de4fbfacf4f7d0ebeec34c036c0062ca7f776403511df7dd SHA512 b9181da601a467f46713f2f438fc7ad69c46fc310e62a8d45f665744c8578491d832b8624ff454c19c94f1694fa406846a82289250241030a70b2cb4b88913d1 +DIST rust-1.29.2-s390x-unknown-linux-gnu.tar.xz 99114900 BLAKE2B 08e9251bd8e9c9ac6352ab81735b720052b3288b5fd344f6ba69205c7971f362270f0acce7dbd3763b20d3b1e976ff5404151253acb9c29708f36038d23299f1 SHA512 f76a030257edbdd993d7a4e83da895c8b4749904fb2252a125b3e4ef4331a1cb2c389ec54a372bea413718e3dad987e4b17eb29d301c29ba330222502e6b9b75 +DIST rust-1.29.2-x86_64-unknown-linux-gnu.tar.xz 148275708 BLAKE2B bd7c974f5c8cf78a1fbfc73544ecdab97b7f9ab28ed9ab66759eca3e0fa085fdb2689ba5dfc6dccc6746bab91b6b0b544c44cb729e493dddde2f9ed84c96a247 SHA512 8bc05942a72b186ea1765831bea6921f734e2dd58790a8e427a6d63a2db0d9064937d3198ca3febffeba73b1cc3bef716155ef6cb32127ddeef29ac884cde4b8 EBUILD rust-bin-1.29.1.ebuild 5653 BLAKE2B 77ac557fd404c79aa691a6ba7f78b8113c2af5e2e769e6546a9806b02eebf0fc3eab96b9dbd495d47643d33cc7395ccebb9e4cf7f5183f50acec503ff5170046 SHA512 1151d8c5783a0ea17069b00a0d906b2a2777932bd21859bb8095fca2488fc7117634f44ddbcb054621ca1cf7a83ad3662ac986a2bde2a789c2f9d55a8fb015c1 +EBUILD rust-bin-1.29.2.ebuild 4740 BLAKE2B 7398415c37aa858dd14d210bd1715ea98fc28d61fe779e57d39251d30d31201780a90dcf5300ea117111026aaf60fa87372fe1bb47ea791e0b81e3371443f2a7 SHA512 9f16f92c1083daa8f060af48741ccbcad8f3410220fe324ec45b0d5c7c42b12f69bfb6faf28829da7e0522a73d9bee9011c34fa66c7592027325e58d597574b2 MISC metadata.xml 435 BLAKE2B 5725f771e138720715bb1a5f317bbe0757d981da2059320e5be70583c3a98dcc4fc23141a3b489cdcffa2a53dfaf621b0ee0336a3ca6a05bf7bf8db1b06cf0c3 SHA512 af938d75754d54ed33a87410cdac16fe4b74614e3c5e352c2c1f906137f0a3e96a2eb1036d0aa7b2a17b629b05d44fdf44348b53f7720c770c6e6cae2a715f16 diff --git a/dev-lang/rust-bin/rust-bin-1.29.2.ebuild b/dev-lang/rust-bin/rust-bin-1.29.2.ebuild new file mode 100644 index 000000000000..afca3183a7a0 --- /dev/null +++ b/dev-lang/rust-bin/rust-bin-1.29.2.ebuild @@ -0,0 +1,155 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils bash-completion-r1 rust-toolchain versionator 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 ~arm64 ~x86" +IUSE="cargo clippy cpu_flags_x86_sse2 doc libressl rustfmt" + +CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0" + +DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425 + !dev-lang/rust:0 + cargo? ( !dev-util/cargo ) + rustfmt? ( !dev-util/rustfmt ) +" +RDEPEND="${DEPEND} + cargo? ( + sys-libs/zlib + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + net-libs/libssh2 + net-misc/curl[ssl] + )" +PDEPEND="!cargo? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )" +REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )" + +QA_PREBUILT=" + opt/${P}/bin/*-${PV} + opt/${P}/lib/*.so + 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,${std}" + use doc && components="${components},rust-docs" + use cargo && components="${components},cargo" + use clippy && components="${components},clippy-preview" + use rustfmt && components="${components},rustfmt-preview" + ./install.sh \ + --components="${components}" \ + --disable-verify \ + --prefix="${D}/opt/${P}" \ + --mandir="${D}/usr/share/${P}/man" \ + --disable-ldconfig \ + || die + + local rustc=rustc-bin-${PV} + local rustdoc=rustdoc-bin-${PV} + local rustgdb=rust-gdb-bin-${PV} + local rustlldb=rust-lldb-bin-${PV} + + mv "${D}/opt/${P}/bin/rustc" "${D}/opt/${P}/bin/${rustc}" || die + mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die + mv "${D}/opt/${P}/bin/rust-gdb" "${D}/opt/${P}/bin/${rustgdb}" || die + mv "${D}/opt/${P}/bin/rust-lldb" "${D}/opt/${P}/bin/${rustlldb}" || die + + 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/${rustlldb}" "/usr/bin/${rustlldb}" + + if use cargo; then + local cargo=cargo-bin-${PV} + mv "${D}/opt/${P}/bin/cargo" "${D}/opt/${P}/bin/${cargo}" || die + dosym "../../opt/${P}/bin/${cargo}" "/usr/bin/${cargo}" + fi + if use clippy; then + local clippy_driver=clippy-driver-bin-${PV} + local cargo_clippy=cargo-clippy-bin-${PV} + mv "${D}/opt/${P}/bin/clippy-driver" "${D}/opt/${P}/bin/${clippy_driver}" || die + mv "${D}/opt/${P}/bin/cargo-clippy" "${D}/opt/${P}/bin/${cargo_clippy}" || die + 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 "${D}/opt/${P}/bin/rustfmt" "${D}/opt/${P}/bin/${rustfmt}" || die + mv "${D}/opt/${P}/bin/cargo-fmt" "${D}/opt/${P}/bin/${cargo_fmt}" || die + 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="/usr/share/${P}/man" + EOF + doenvd "${T}"/50${P} + + cat <<-EOF > "${T}/provider-${P}" + /usr/bin/rustdoc + /usr/bin/rust-gdb + /usr/bin/rust-lldb + EOF + if use cargo; then + echo /usr/bin/cargo >> "${T}/provider-${P}" + fi + 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 + dodir /etc/env.d/rust + 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 || has_version app-editors/emacs-vcs; 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 has_version 'app-shells/zsh'; then + elog "install app-shells/rust-zshcomp to get zsh completion for rust." + fi +} + +pkg_postrm() { + eselect rust unset --if-invalid +} diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest index 54bfc92a23c5..072e11492805 100644 --- a/dev-lang/rust/Manifest +++ b/dev-lang/rust/Manifest @@ -1,6 +1,19 @@ +AUX 1.29.2-clippy-sysroot.patch 2571 BLAKE2B 1f65355cf47fb1ee2bd15f7424b6bf98106028fa46a8f89ab639acdc3a131684898dcda42abd6d5d7bc09c857990dcea86467b3c96e8e6d47b90726d9176a221 SHA512 2577c7540be9a197343bc06b5de52ba42832cbb2799997bb9778e6e392a421cfe6bce9ce48793d60af7a8f3e0ade0c79e0adbfc1125fbcd89b01e97ab96b8d30 DIST rust-1.28.0-aarch64-unknown-linux-gnu.tar.xz 98937652 BLAKE2B 836d3dd4e583fa50dd317c3bea56257e6ea19defdb38c16be6debb2854e147c8a92c4832263e4ac314136022a176526fe7d3774a3c5a84cd8d364cd2a1532860 SHA512 8d9acbc90ddaa1e0de0234a21798b19b5365ea371a12f9a143c6ebacbb48f57344da6e827e867513be502bce2801de27a0dbbacdf8618c653aeb58026b6c469c +DIST rust-1.28.0-arm-unknown-linux-gnueabi.tar.xz 104676648 BLAKE2B b26b23c3605e6584c51e0e914dbb3be60996e079e52ff2d4850ed43c1f1f7cd5ac575b40dbe852f927d36654f5ab7e384548f3a92b3466bfbb1cda7f9f069bcb SHA512 a1eaf1d7826ebfe222d233cabd8b88073ca2c8dd42a0b870e324dfc63e7290308418222c56802bc421c9bda119dc7c5f3e225ff33cacad5776b79cbcc1a877b2 +DIST rust-1.28.0-arm-unknown-linux-gnueabihf.tar.xz 104992084 BLAKE2B df97766d7abf73f668a2936834bc0f35739289eeeb5395276a2fdfd5b6c0baee3ba1eee1099f19d4f4f1cbd1a33cf62ad888dd3d1856b613ac853c6a17650741 SHA512 3b58b83f38bf8d8e841ae6614d72bb6e6faf75fb7c19abc5451548b0e6de0ef3b64dfbc70481a1e40f74074bfad701aa7a58296b4a0d07957a418bd3cd769917 +DIST rust-1.28.0-armv7-unknown-linux-gnueabihf.tar.xz 105144132 BLAKE2B d9e0791c7dc77ade26d383a5c57117a2b7b50c6a523b31fbf604c0b779c966c5055554f85c718353f2e581bfe8a228369671a8b731f808bc0133ad3fad61f853 SHA512 9142110e0c24657aca41468648d9364c2e6fce60b08ca7113c944a53701fc5a309481a8fdd5845b229bcc750ccad63af561d452c3a3a0727ab1ca7a461b06d3d DIST rust-1.28.0-i686-unknown-linux-gnu.tar.xz 136925948 BLAKE2B 85d9239533920c3f16d7c61bada0caeabceceade29032b70bb4562bfd04fa0158cdd85b8a0a1119506416fa5916ade8a0466bf6c10da457299a6319aa25f9dd6 SHA512 ffdfab46db14f07354b553e02fdb9dc6602c2c52b78d8f17c499f4ddb1e257aa53479df836eb3f06a2548d34296b0277cdb6b4c6f3cec57265823df22752c135 +DIST rust-1.28.0-mips-unknown-linux-gnu.tar.xz 102116424 BLAKE2B 72c7cfa9157c0d7fb6a9dc0698322e5285bc2ef9f914a1be5063c8aeaed8a7d29bbcd71090aa5f09ec5229e38ac08e6883119f03af42ffa794cadf227450049d SHA512 0d2e2785178e235b0effd2a7251e9004c87c21e158c2e6f122eeb10942ce2545e5d67d7ff040b7c277627cc402321fff5ad5186a41f2de581f46633adb1894bf +DIST rust-1.28.0-mips64-unknown-linux-gnuabi64.tar.xz 101617356 BLAKE2B eb0cc524e40cdf20ec16b72418cae9ea03ce946006412153a7c0a173f27a3f8e193a41685295be9917b10ca39565be57b6d3f7c7a7122cbee088a5652081dda1 SHA512 0d7bfafa1340de97efab8db3100d5462afde94e8e54d6543e229d9240aca5a69d469a3e5ac750527d5e40dad11286b40d6be22812655721a0b8bf3ecba485ad6 +DIST rust-1.28.0-mipsel-unknown-linux-gnu.tar.xz 103574324 BLAKE2B 671e8ee0de674e37c8156825603e3cea659c0ad016698c8f208a78afe18cf0411dc953cf683d297079e3eaedddad540dbfa1821950585fb5ffcf74267f0ebcdd SHA512 40233beb18c937f7293a8191d6a9d98c5628b0709ef808e48fac4db10ce0af91cb8d6bec9056dae00149e8e0b1613b1c66960e23302bc0b66b50fbb0994cb018 +DIST rust-1.28.0-powerpc-unknown-linux-gnu.tar.xz 100580084 BLAKE2B 2487976f495e78d8cc8129d81e1eb29cc86d7c523133d9ea42e6425f7607fea74c8a848877e926c53c2dd9599a0c3bede46109e96c3851fd7726b251442fca6c SHA512 450aa028644fc73cf8dadccfabc1a66c360880300479df9c0041f773b3f6b6072afb9aee0221fe51abd4194b86f8cc8b7f14c788b3792858a44bfc8c83bcc03d +DIST rust-1.28.0-powerpc64-unknown-linux-gnu.tar.xz 105788856 BLAKE2B 828082612561ddd186472472e11e1afb9bc24a3332ff5f82a9924fc950b29655e892c974a88ce6c0b04c34a9c7d13856a8629027069808234ffb1e3cfb788e01 SHA512 1bd2c5069beecb765a2305715070e4052d5a66dafe50a5b53bea2c2082b22b3f9a2d2b9fb059c93476f88ee5e602effc18b807e5c964610e8255a3a945931f51 +DIST rust-1.28.0-powerpc64le-unknown-linux-gnu.tar.xz 105822856 BLAKE2B 0cf534a55efff99daf700127fc7bc7b82b93054d054fbf8479a8b247b41381fd82f8672ac12f3e3f53566d816964d83069593817d1932b33902f83994f1bdc33 SHA512 bdbdf3a64a184dd4510a113bbe20c058f42e35321cd2fb7c938487dfc9b1f04320b523ea215dd92a23c2537292eeb064097119e2097d6e24a1c4e237d9d4fc8b +DIST rust-1.28.0-s390x-unknown-linux-gnu.tar.xz 98839840 BLAKE2B bbff015b3d2daf1443781cccb80527cf8c7f86a01ed928b49cc7e87e17f8c6354f6a47dd2356ff75357e09f7f79ec85812bd8458aee9455800fdf88761243e94 SHA512 5ffb44d16c990b8a6377b64e5042a3b2e709bcc7187013dbe4ab3c9d8cd781b6bf07b0d374340e2ccabe9f84fd4731b606cb05a10a739ebcfa49652518a2aa46 DIST rust-1.28.0-x86_64-unknown-linux-gnu.tar.xz 134120432 BLAKE2B 56fb79a98659d9c8e56b8eef87dea3302ee5901bc4507d1c204628370b20cf34b2875c9586faa0acc2bc2b1a5beedeb9b5ba199cfb85d52f268f084a02f04f27 SHA512 4f427c11a9cd22aedd01bd7ed5bee2ba5e00a27db25af4f596cf8627d88eff8e72625eb83729d2e6c6780aaffd44c0e7065a1c8fa22f4899349b72c726cf6a5f DIST rustc-1.29.1-src.tar.xz 61937676 BLAKE2B 6a60249538e1ec62471f4d0e3fc31c0a648433aa6f85ca7341657ea07772e338eb92a629941685808f4b80e84cb025d78aee9d0d6fa71c6635a1647c61bca9bc SHA512 1ded651b4c460e11e5e44c26de88a80fb13c2000097de2ee1e5af89638e12a7e8f43dd756689d4cc4fad45c52d4d43a3c70dd6a3ae550735b9dad5f8defea6a7 +DIST rustc-1.29.2-src.tar.xz 61888912 BLAKE2B f59b0bf45caa6f6136f92ffbaa612bbc6a340c8694ec69d75aadace9180c36753f985641915524388b52cc108f8f5b71840ee3a6c0b1fcff6decb61d2d8a161e SHA512 d8fa9501764348ace8f60f2069bcd016925abe56c8bbc2b87fb52ff796e4bc7284c1fccbb1671416437bb82fde7d9240eeae875d6099914e27e75cfe050e2d38 EBUILD rust-1.29.1.ebuild 7965 BLAKE2B f84b3e11c73b20abf236f457435c56fc2ef160cbd174bb048a24c307a6627680ce266cdd276974a569d0ba715c13f0e1e2e36c2fef3d1600bc4eefefdbc0e3da SHA512 23d46b6feff4016ad6b9e508c58a7d41dfe1568b45b6332efd56c08100d8790f40509cc16b0aed699a839b47ae6bdba700b428c74ed7aa6bd03d8927d6af7233 -MISC metadata.xml 673 BLAKE2B d52ce94b5b6dcf9ceacafd0d7b5cd83c00a5c3fcf4310c1bc26c4c7730d6180f06f3d0addb90572a5ead86a7b9279cfcc95ecb6c7be2b043221f19753ade377d SHA512 7e92c8d0a294e2b4efe1ed5ee396d7434ffe309e0b4e9bf3edca0a4447612a6c8d7982aba2c14b60b2acc099c14242d7fc91f2a828957790400b6ead192c1052 +EBUILD rust-1.29.2.ebuild 7870 BLAKE2B a1c83338300b43ce54f1fbf8a28999a7574121c1eae70ddc7cdfc2587616a255cf83b26bb17a70c94a92d9a651b242e995878b6fbf8a89d4de9131cb202bd0da SHA512 08bfa1f80fa8845a9886f85d3280d0ba000a4c8460ea79148f85a9f67a90fa42a597399ce2a219fd06685c295aca7816008a5d58684c34a36e8e3fd19b3be030 +MISC metadata.xml 570 BLAKE2B 84133a816858a9787c2e5c5ca839e8e1c4586bd428711f356c64ea23396b0fd2d4f00abb66f0de8f9c81f34058c537491dee5c539c27be58e709972a5d344dc0 SHA512 f3c7511b766a86fb0ebc7a8a9c88226ec71761da29f0b2a12eb593f3205170504d733cf09b0fb72103fea12ac323fa115a121ab9deb0609c6115ac571330ad01 diff --git a/dev-lang/rust/files/1.29.2-clippy-sysroot.patch b/dev-lang/rust/files/1.29.2-clippy-sysroot.patch new file mode 100644 index 000000000000..6a527e5a0206 --- /dev/null +++ b/dev-lang/rust/files/1.29.2-clippy-sysroot.patch @@ -0,0 +1,62 @@ +--- a/src/tools/clippy/src/driver.rs 2018-10-04 16:30:42.438486058 +0300 ++++ b/src/tools/clippy/src/driver.rs 2018-10-04 16:31:45.044484028 +0300 +@@ -20,54 +20,22 @@ + return; + } + +- let sys_root = option_env!("SYSROOT") +- .map(String::from) +- .or_else(|| std::env::var("SYSROOT").ok()) +- .or_else(|| { +- let home = option_env!("RUSTUP_HOME").or(option_env!("MULTIRUST_HOME")); +- let toolchain = option_env!("RUSTUP_TOOLCHAIN").or(option_env!("MULTIRUST_TOOLCHAIN")); +- home.and_then(|home| toolchain.map(|toolchain| format!("{}/toolchains/{}", home, toolchain))) +- }) +- .or_else(|| { +- Command::new("rustc") +- .arg("--print") +- .arg("sysroot") +- .output() +- .ok() +- .and_then(|out| String::from_utf8(out.stdout).ok()) +- .map(|s| s.trim().to_owned()) +- }) +- .expect("need to specify SYSROOT env var during clippy compilation, or use rustup or multirust"); +- + // Setting RUSTC_WRAPPER causes Cargo to pass 'rustc' as the first argument. + // We're invoking the compiler programmatically, so we ignore this/ +- let mut orig_args: Vec<String> = env::args().collect(); +- if orig_args.len() <= 1 { ++ let mut args: Vec<String> = env::args().collect(); ++ if args.len() <= 1 { + std::process::exit(1); + } +- if orig_args[1] == "rustc" { ++ if args[1] == "rustc" { + // we still want to be able to invoke it normally though +- orig_args.remove(1); ++ args.remove(1); + } +- // this conditional check for the --sysroot flag is there so users can call +- // `clippy_driver` directly +- // without having to pass --sysroot or anything +- let mut args: Vec<String> = if orig_args.iter().any(|s| s == "--sysroot") { +- orig_args.clone() +- } else { +- orig_args +- .clone() +- .into_iter() +- .chain(Some("--sysroot".to_owned())) +- .chain(Some(sys_root)) +- .collect() +- }; + + // this check ensures that dependencies are built but not linted and the final + // crate is + // linted but not built + let clippy_enabled = env::var("CLIPPY_TESTS").ok().map_or(false, |val| val == "true") +- || orig_args.iter().any(|s| s == "--emit=dep-info,metadata"); ++ || args.iter().any(|s| s == "--emit=dep-info,metadata"); + + if clippy_enabled { + args.extend_from_slice(&["--cfg".to_owned(), r#"feature="cargo-clippy""#.to_owned()]); diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml index 8da6b2e99de0..c6a534bebad8 100644 --- a/dev-lang/rust/metadata.xml +++ b/dev-lang/rust/metadata.xml @@ -8,8 +8,6 @@ <use> <flag name="cargo">Install cargo component</flag> <flag name="clippy">Install clippy component</flag> - <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> as the - standard memory allocator</flag> <flag name="rls">Install rls component</flag> <flag name="rustfmt">Install rustfmt component</flag> <flag name="wasm">Build support for the wasm32-unknown-unknown diff --git a/dev-lang/rust/rust-1.29.2.ebuild b/dev-lang/rust/rust-1.29.2.ebuild new file mode 100644 index 000000000000..b1d1b8dd282a --- /dev/null +++ b/dev-lang/rust/rust-1.29.2.ebuild @@ -0,0 +1,289 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{5,6} pypy ) + +inherit eapi7-ver 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 ~arm64 ~x86" +fi + +CHOST_amd64=x86_64-unknown-linux-gnu +CHOST_x86=i686-unknown-linux-gnu +CHOST_arm64=aarch64-unknown-linux-gnu + +RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0" +RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}" +RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}" +RUST_STAGE0_arm64="rust-${RUST_STAGE0_VERSION}-${CHOST_arm64}" + +CARGO_DEPEND_VERSION="0.$(($(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 + $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION})" + +ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 + NVPTX PowerPC Sparc SystemZ 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="cargo clippy cpu_flags_x86_sse2 debug doc +jemalloc libressl rls rustfmt wasm ${ALL_LLVM_TARGETS[*]}" + +RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425 + jemalloc? ( dev-libs/jemalloc ) + cargo? ( + sys-libs/zlib + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + net-libs/libssh2 + net-libs/http-parser:= + net-misc/curl[ssl] + )" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + || ( + >=sys-devel/gcc-4.7 + >=sys-devel/clang-3.5 + ) + cargo? ( !dev-util/cargo ) + rustfmt? ( !dev-util/rustfmt ) + dev-util/cmake +" +PDEPEND="!cargo? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )" + +REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} ) + x86? ( cpu_flags_x86_sse2 )" + +S="${WORKDIR}/${MY_P}-src" + +PATCHES=( "${FILESDIR}"/${PV}-clippy-sysroot.patch ) + +toml_usex() { + usex "$1" true false +} + +src_prepare() { + local rust_stage0_root="${WORKDIR}"/rust-stage0 + + local rust_stage0_name="RUST_STAGE0_${ARCH}" + local rust_stage0="${!rust_stage0_name}" + + "${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die + + default +} + +src_configure() { + local rust_target="" rust_targets="" rust_target_name arch_cflags + + # Collect rust target names to compile standard libs for all ABIs. + for v in $(multilib_get_enabled_abi_pairs); do + rust_target_name="CHOST_${v##*.}" + rust_targets="${rust_targets},\"${!rust_target_name}\"" + done + if use wasm; then + rust_targets="${rust_targets},\"wasm32-unknown-unknown\"" + fi + rust_targets="${rust_targets#,}" + + local extended="false" tools="" + if use cargo; then + extended="true" + tools="\"cargo\"," + fi + if use clippy; then + extended="true" + tools="\"clippy\",$tools" + fi + if use rls; then + extended="true" + tools="\"rls\",\"analysis\",\"src\",$tools" + fi + if use rustfmt; then + extended="true" + tools="\"rustfmt\",$tools" + fi + + local rust_stage0_root="${WORKDIR}"/rust-stage0 + + rust_target_name="CHOST_${ARCH}" + 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// /;}" + [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) + submodules = false + python = "${EPYTHON}" + locked-deps = true + vendor = true + extended = ${extended} + tools = [${tools}] + [install] + prefix = "${EPREFIX}/usr" + libdir = "$(get_libdir)/${P}" + docdir = "share/doc/${P}" + mandir = "share/${P}/man" + [rust] + optimize = $(toml_usex !debug) + debuginfo = $(toml_usex debug) + debug-assertions = $(toml_usex debug) + use-jemalloc = $(toml_usex jemalloc) + default-linker = "$(tc-getCC)" + channel = "stable" + rpath = false + lld = $(toml_usex wasm) + EOF + + for v in $(multilib_get_enabled_abi_pairs); do + rust_target=$(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 + done + + if use wasm; then + cat <<- EOF >> "${S}"/config.toml + [target.wasm32-unknown-unknown] + linker = "rust-lld" + EOF + fi +} + +src_compile() { + env $(cat "${S}"/config.env)\ + "${EPYTHON}" ./x.py build --config="${S}"/config.toml -j$(makeopts_jobs) \ + --exclude src/tools/miri || die # https://github.com/rust-lang/rust/issues/52305 +} + +src_install() { + local rust_target abi_libdir + + env DESTDIR="${D}" "${EPYTHON}" ./x.py install || die + + mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die + mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die + mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die + mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die + if use cargo; then + mv "${D}/usr/bin/cargo" "${D}/usr/bin/cargo-${PV}" || die + fi + if use clippy; then + mv "${D}/usr/bin/clippy-driver" "${D}/usr/bin/clippy-driver-${PV}" || die + mv "${D}/usr/bin/cargo-clippy" "${D}/usr/bin/cargo-clippy-${PV}" || die + fi + if use rls; then + mv "${D}/usr/bin/rls" "${D}/usr/bin/rls-${PV}" || die + fi + if use rustfmt; then + mv "${D}/usr/bin/rustfmt" "${D}/usr/bin/rustfmt-${PV}" || die + mv "${D}/usr/bin/cargo-fmt" "${D}/usr/bin/cargo-fmt-${PV}" || die + fi + + # Copy shared library versions of standard libraries for all targets + # into the system's abi-dependent lib directories because the rust + # installer only does so for the native ABI. + for v in $(multilib_get_enabled_abi_pairs); do + if [ ${v##*.} = ${DEFAULT_ABI} ]; then + continue + fi + abi_libdir=$(get_abi_LIBDIR ${v##*.}) + rust_target=$(get_abi_CHOST ${v##*.}) + mkdir -p "${D}/usr/${abi_libdir}" + cp "${D}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/lib"/*.so \ + "${D}/usr/${abi_libdir}" || die + done + + dodoc COPYRIGHT + + # FIXME: + # Really not sure if that env is needed, specailly LDPATH + cat <<-EOF > "${T}"/50${P} + LDPATH="/usr/$(get_libdir)/${P}" + MANPATH="/usr/share/${P}/man" + EOF + doenvd "${T}"/50${P} + + cat <<-EOF > "${T}/provider-${P}" + /usr/bin/rustdoc + /usr/bin/rust-gdb + /usr/bin/rust-lldb + EOF + if use cargo; then + echo /usr/bin/cargo >> "${T}/provider-${P}" + fi + 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 + dodir /etc/env.d/rust + 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}." + + if has_version app-editors/emacs || has_version app-editors/emacs-vcs; 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 has_version 'app-shells/zsh'; then + elog "install app-shells/rust-zshcomp to get zsh completion for rust." + fi +} + +pkg_postrm() { + eselect rust unset --if-invalid +} diff --git a/dev-lang/solidity/Manifest b/dev-lang/solidity/Manifest deleted file mode 100644 index b61ff514f917..000000000000 --- a/dev-lang/solidity/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX solidity-0.4.18-fix-cmake-external-jsoncpp.diff 378 BLAKE2B 00e8ae9719e3d7faaf22ff806793ccd47222e4eee34e8528327396dbeb0333a723e5a8959513f980c11a8d7d5fab57fe07a06226b3ec398c201911db65e1bf60 SHA512 44b76b9dd9a1cd37c4fcf39d7aa585873ed9b394d54b0d862b6909dbe905d2202e1d2a9ef0e84e959931b0805d6f049c6567ad424f9561229803768ceafad4ff -DIST solidity-0.4.18.tar.gz 1005571 BLAKE2B b7748f1e9ceb260ee5c02a5e6ddb7a3387a6f1df252889258045cf03e3cab365f1ac41c7e75805a49b71beceb88439855c53b6c59a81d610db48f9fe5256da55 SHA512 aa88060567a50fa833a81ef2c9ce9614ed0fddd9dc82c1546998dacd9a7cad1863882aa0700d830f80fe52bd91659a9fa07434af193624206876ba7224c34eb7 -EBUILD solidity-0.4.18.ebuild 766 BLAKE2B cbba8496a179b2f273efa677f82749ce0b6bca2e2e642c7d01579c9c59ae14233ee80e3ff017f35bb9257cd3f43bbe518d92e14ef7a2f7e76692ed10d52bd12e SHA512 a6a19af46537d59bf273e9a031250fc57d1f743296fd02416c9289921f201d0c98129714d2b6212fddc4bfa8be2f5ca102b77e190c06bb088266b17dad47a42f -MISC metadata.xml 450 BLAKE2B 43358d0df6ec754300e4e95ef6cf3abd0702ab121cd70c58bc7808ee3d47346c5a42843ce895b1a9974bba8ed9716ba5256cd74a31343ac2fc29f4ef60196232 SHA512 8de6f5dadccb7020d6fbbd17a3800dd9a44e4b19f484e38799fd00b240fbd2a4d213454eb7cec2d99ab8ea7834fe5a0d3f792c62420870e55986b2978af9789d diff --git a/dev-lang/solidity/files/solidity-0.4.18-fix-cmake-external-jsoncpp.diff b/dev-lang/solidity/files/solidity-0.4.18-fix-cmake-external-jsoncpp.diff deleted file mode 100644 index 1acafc9d9e36..000000000000 --- a/dev-lang/solidity/files/solidity-0.4.18-fix-cmake-external-jsoncpp.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 24bea3b3..4326927b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -18,7 +18,9 @@ include(EthCcache) - - # Let's find our dependencies - include(EthDependencies) --include(jsoncpp) -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(JSONCPP jsoncpp) -+include_directories("${JSONCPP_INCLUDE_DIRS}") - - find_package(Threads) - diff --git a/dev-lang/solidity/metadata.xml b/dev-lang/solidity/metadata.xml deleted file mode 100644 index e0f4ff855bce..000000000000 --- a/dev-lang/solidity/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>mathy@vanvoorden.be</email> - <name>Mathy Vanvoorden</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <upstream> - <remote-id type="github">ethereum/solidity</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-lang/solidity/solidity-0.4.18.ebuild b/dev-lang/solidity/solidity-0.4.18.ebuild deleted file mode 100644 index 8a36d44a9092..000000000000 --- a/dev-lang/solidity/solidity-0.4.18.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -MY_P="${PN}_${PV}" - -DESCRIPTION="The Solidity Contract-Oriented Programming Language" -HOMEPAGE="https://github.com/ethereum/solidity" -SRC_URI="https://github.com/ethereum/${PN}/releases/download/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="=dev-libs/jsoncpp-1.8.1:= - >=dev-libs/boost-1.54:= -" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - # Upstream downloads and builds a static jsoncpp during build - "${FILESDIR}"/${P}-fix-cmake-external-jsoncpp.diff -) - -src_configure() { - local mycmakeargs=( - "-DBoost_USE_STATIC_LIBS=off" - ) - - cmake-utils_src_configure -} diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest index 2055f6b095e0..25c90fbd852a 100644 --- a/dev-lang/tcl/Manifest +++ b/dev-lang/tcl/Manifest @@ -2,15 +2,11 @@ AUX tcl-8.5.13-multilib.patch 258 BLAKE2B ca0453e8e0f6fdc1302f024ff81a8a6e012d0b AUX tcl-8.5.14-conf.patch 427 BLAKE2B c7d97bccebc45beec003bcf005fab6ed7f544744d81f08778a997b767ea0a60fd07f7b7cbc464ef8252e47717b34c0c42c871331a04740e23caeddbfb351de16 SHA512 e8097acb127966e6f2914c888278acdd9042d881b4d9436853ad7ed2361e8d67a372d4b0b0d5f0333e6bf90220e72df5c5eeffd4b44bc8e94ea9631ddc98cf16 AUX tcl-8.6.8-conf.patch 401 BLAKE2B 278502e983b8c831a2bfe5e61c31d32181558aaebccb2c7a64c52c387ce674ad1543dcedb7b73bfa748e8b40424a59e4696057e3a7f6d0e9f7ddbe838473995f SHA512 8524f80bb54851fc28f1994cbbd9c78756f9f9b1ca31a2f602e2cc557bbb22093bb6cce0ce5099cb90847f3c0ed20503a3d122abb400482869afd2469b3867b8 AUX tcl-8.6.8-libieee.patch 708 BLAKE2B ec8422ce98c68f2dd347bea807059fd8ee94fcd4540bdeb4c8d90cd7f028ff3dbe406ed26593ebd8815e611a1ae40390b4194bf8d3efd1863e8c15d04918681c SHA512 b25d2fbfc753296cef11b1943e19537aaf9f048f033078e516f36bc021107197f77b8f142fc7ace89ae6bdda037871ce7a5c45800ef0bebd04f77a5281bff457 -DIST tcl-core8.6.5-src.tar.gz 5846556 BLAKE2B 9c3c48acffc13be526b507fc19711b21e710a84642d37d494bb46a2d4ac9445a95749fd9556ffbda57d55f90bd566d0c9cd72a800a34f062616aacf57e811aa4 SHA512 b726f7d3193ad92ba64911b8c724d5454c5a93d5f5e95462ec0a6d8ccbbdf20093888f66c83956d7631392ca805c1a80430f102c0a932de3ed55311101e0e09f -DIST tcl-core8.6.6-src.tar.gz 5868427 BLAKE2B 3444d474bfdc4958919dbf75527420614251e3cffb0d18fbbf547ffb83ead544f266b6ea868738ae40e02075cf31be6e753e0f89da02a2a81ededf09fc9dd2e6 SHA512 469a0221ed16569b70986cdde261d0c0df3bf64c493b8d6fc8368eb14597f7c2f6a01f082a1c8f27eb720618956e053cc97fbb9aaf7bb29cc96781cdc8e9518c -DIST tcl-core8.6.7-src.tar.gz 5875027 BLAKE2B bc08e4e6639ba33176c8c1e670b957b8ad62a4790ace4ff8f8dc964f676ca87473c31c28f645d32a8287f844756fa224a077f96f1425f61b9872a4a0ae1429a1 SHA512 95c8c5bcb4fe604a77ca6ba9d49f9e90d156feaa9f3ab97661983f256ab54476b103ec8de01cd47231ed95e6df5e36d60514aed2ba5b8f3619cc5a3698ad3ee5 DIST tcl-core8.6.8-src.tar.gz 5887483 BLAKE2B 2b8428652e451b817fe63a811f910001929cdcbc8a8361cdf4f7df8e13cbf9b18c94a91c22c0f09cc46dc0174a66c44774b485539a8f24c14faee6658547b6b8 SHA512 36e6079b582c205e8c89435b361ef96550541357f473aea2ca4e6f01bd84e50ebd1474a75a1ae90640b9a5b392fb01ddfa71f0fa28e409b3569d88c32b4ddb69 DIST tcl8.5.17-src.tar.gz 4546317 BLAKE2B 27031dd3bd5790d03692e77edf91eb7fae8a40d8d193d8c8ce4e79b21f90e683bfc9d5b71764760223987fb163be844e6096d0aea1058b8ce255731d97e2a0ea SHA512 ad5ddb4cd6378fd6bbea8cd85ceb1cf90392b2e8c49fbfb3e4b35c81d3ae3e3f087697c41fcba8c8e06de1d9e7539397e26d58b864dc01ba65abe4ba4efa9568 +EBUILD tcl-8.5.17-r1.ebuild 3766 BLAKE2B 735b31a87b13a4a107b451f1234699cb1dc4cab210846f992100e8f69543bfb2103e1814cefd1673e7081c6aeafed63cda87e36d433580ddbf5548cb779d8508 SHA512 3c3fadceaafeaad04780a44d40a10bd318d30fff0d1ff38bea683c2bf019ff4a3cb036f7fbc60c79cb095470c3c9a3f59ad8b27caf2ae9e98d2baf0ea6ebab14 EBUILD tcl-8.5.17-r100.ebuild 2790 BLAKE2B d8de982d4d2f103bd5a1271101bc997cd1920c7274078f9004e6983d30326fa0379588d529c3e459f4e93e9e723548aa37fc5e074df768d046bafc3decb4297e SHA512 b09ac13d74992c34c333fba336e07e6baefbe8ee6a94e8c59b17ac40a508bab4146f7a6d00f712ef70b9d5d8d168d259dbbed77d4e5e2e65c2b45ff2769586d7 +EBUILD tcl-8.5.17-r101.ebuild 2850 BLAKE2B f34283905856e79de70e4894578b4d403c203ee00cdba9a96bc4e9c73e45b0fe4b773a40ec82679792380a87a34dc389ef468440bf32b05ab01c500e49b6aa0d SHA512 a057478a7535e9b596139693d5b104b14968cb7223bb90d8a4528d6560323a2bde925f94b349d1c67e1ce976849203b7105c1ad4792560a9628b7108012e7908 EBUILD tcl-8.5.17.ebuild 3706 BLAKE2B 4f5b6c6fb9c25a7d31a1adc45fad8fa432478056d5a0895298ba79f2a5904bcd977a73d60f34355ed5290bf5077f5d74ba050583ebf0e99a119f9d4b14dbfe0b SHA512 11816e9baefbf29264fd844ddeb38fa94686b0b8ca667e7046713860a97945caf122f831d7778b7ac78ab392bd4ac9bc10578c70d74b21c83c5da1b479d9c800 -EBUILD tcl-8.6.5.ebuild 3951 BLAKE2B 91748bc079cafd2cb6f22f8c4870901f2d36fcfc45c115318f98f10bd024de23c926cab98297ba6db1619ead361cd1147ab182c9615995083765b760f078ce6b SHA512 e587e699d26b55dd7dc95527f260449b3ac0f121a1e593a16eb24c34c46fdd72e33399636177ed9c84fcba7032f2b42e1197bffdf95e965912c3f4a77d6d815d -EBUILD tcl-8.6.6.ebuild 4038 BLAKE2B f2412b2e2cdd6f3d70fd90ab70e1ea65bafe9cf77d6274cb3a6c8377778c530c8a926a39fe5b9d2098be646168f6dbd00bd7ded07990d06bdfef3b64e2a5096f SHA512 76b1ad672e9f4102b64d945702f6a4daa0973a46a243a54611b9b13ee524815f61cd9b664eec6ea6f6448b86789cab5c5374cbfdaa8ed28dc2137ff8ce767f0c -EBUILD tcl-8.6.7.ebuild 3964 BLAKE2B a0f5158a4ab510cf394b5df2af7da1c0d9ae4bf5ece4190d766fb3bb17f4e9b7a965456ad8c4f4213e55efc802e73beeed44fa588f7b3463606532b6a1925552 SHA512 fa39358b35da654852e9a097f7ca4dbf85b9dc0b5656805eeb1ccd33b1ba999598ca9ee1456a40676fac8b010e987c37b6ba8fbead23b09cbd7b751b37d89fe7 -EBUILD tcl-8.6.8.ebuild 3995 BLAKE2B a21acbefc4d086965f433fb5576d9b70755ffc17a98205f40de699cc10bdea71cef177dd0f74bff510fb046dcde23cc5b06c3c2faabcc210cf1f1d7e50ce280e SHA512 ab86bb84d7eb467a683838909f05f3c214bfabc7a5c1250de6c736e581be341477c5effe093844fae06cc71ad124215275f8a5a613e6e3716d59da9de76fdfaf +EBUILD tcl-8.6.8.ebuild 3986 BLAKE2B 0d126b490efcf0165049479fe94d0b31157b8237b0d75a4e3d801c6d56f1a28df88788d612aca0f6e45a5488f73e544550e3c62566ca33b9a99e4b3bccbb9637 SHA512 851baf012be74129624423ad882a7580c14e96827ec4b0fb05a82ffe7dc96d11ce87b091ebce8a6297782beb067f7ae4875288dbf436cc22d5aed0aeb66bde48 MISC metadata.xml 318 BLAKE2B 7ea8e51656c255c3aea3bee8849423604a164efff556974f6032de44d33e38bb0378b69c18821cc76f0284064bc84a1a56e79f522f8d7fb0adc50e2e191b5fca SHA512 61f3feb8311f1babb8a4df8c9fcddaab009ffc6d69248f18cb9e001a1659dfcf47f2699008ab83fb563b3417f6ead8113af20db7e3893f488e8d75bb2a3483cf diff --git a/dev-lang/tcl/tcl-8.6.6.ebuild b/dev-lang/tcl/tcl-8.5.17-r1.ebuild index ddba72845ae3..a56e7f4e4506 100644 --- a/dev-lang/tcl/tcl-8.6.6.ebuild +++ b/dev-lang/tcl/tcl-8.5.17-r1.ebuild @@ -1,45 +1,35 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=5 -inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator +inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator multilib-minimal -MY_P="${PN}${PV}" +MY_P="${PN}${PV/_beta/b}" DESCRIPTION="Tool Command Language" HOMEPAGE="http://www.tcl.tk/" -SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz" +SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz" LICENSE="tcltk" -SLOT="0/8.6" +SLOT="0/8.5" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris" -IUSE="debug +threads" +IUSE="debug threads" RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND}" -# Bug 629680: need to disable testing since network-sandbox creates false negatives -RESTRICT="test" SPARENT="${WORKDIR}/${MY_P}" S="${SPARENT}"/unix -PATCHES=( - "${FILESDIR}"/${PN}-8.5.13-multilib.patch +src_prepare() { + epatch "${FILESDIR}"/${PN}-8.5.13-multilib.patch # Bug 125971 - "${FILESDIR}"/${PN}-8.5.14-conf.patch -) - -src_prepare() { - find \ - "${SPARENT}"/compat/* \ - "${SPARENT}"/doc/try.n \ - -delete || die + epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch - pushd "${SPARENT}" &>/dev/null || die - default - popd &>/dev/null || die + # Bug 648570 + epatch "${FILESDIR}"/${PN}-8.6.8-libieee.patch # workaround stack check issues, bug #280934 use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1" @@ -50,14 +40,7 @@ src_prepare() { -e '/chmod/s:555:755:g' \ -i Makefile.in || die - sed \ - -e 's:-O[2s]\?::g' \ - -i tcl.m4 || die - - mv configure.{in,ac} || die - eautoconf - multilib_copy_sources } @@ -81,6 +64,7 @@ multilib_src_install() { local mylibdir=$(get_libdir) S= default + # fix the tclConfig.sh to eliminate refs to the build directory # and drop unnecessary -L inclusion to default system libdir @@ -119,7 +103,7 @@ multilib_src_install() { pkg_postinst() { for version in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 8.6 ${version}; then + if ! version_is_at_least 8.5 ${version}; then echo ewarn "You're upgrading from <${P}, you must recompile the other" ewarn "packages on your system that link with tcl after the upgrade" diff --git a/dev-lang/tcl/tcl-8.6.5.ebuild b/dev-lang/tcl/tcl-8.5.17-r101.ebuild index e76f93f75edb..c210e2d6ada6 100644 --- a/dev-lang/tcl/tcl-8.6.5.ebuild +++ b/dev-lang/tcl/tcl-8.5.17-r101.ebuild @@ -1,43 +1,41 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +# this ebuild is only for the libtcl8.5.so SONAME for ABI compat -inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator +EAPI=5 -MY_P="${PN}${PV}" +inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator multilib-minimal + +MY_P="${PN}${PV/_beta/b}" DESCRIPTION="Tool Command Language" HOMEPAGE="http://www.tcl.tk/" -SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz" +SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz" LICENSE="tcltk" -SLOT="0/8.6" +SLOT="8.5" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris" -IUSE="debug +threads" +IUSE="debug threads" -RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" +RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + !=dev-lang/tcl-8.5*:0" +DEPEND="${RDEPEND} + " SPARENT="${WORKDIR}/${MY_P}" S="${SPARENT}"/unix -PATCHES=( - "${FILESDIR}"/${PN}-8.5.13-multilib.patch - - # Bug 125971 - "${FILESDIR}"/${PN}-8.5.14-conf.patch -) +DOCS=() src_prepare() { - find \ - "${SPARENT}"/compat/* \ - "${SPARENT}"/doc/try.n \ - -delete || die + epatch "${FILESDIR}"/${PN}-8.5.13-multilib.patch + + # Bug 125971 + epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch - pushd "${SPARENT}" &>/dev/null || die - default - popd &>/dev/null || die + # Bug 648570 + epatch "${FILESDIR}"/${PN}-8.6.8-libieee.patch # workaround stack check issues, bug #280934 use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1" @@ -48,14 +46,7 @@ src_prepare() { -e '/chmod/s:555:755:g' \ -i Makefile.in || die - sed \ - -e 's:-O[2s]\?::g' \ - -i tcl.m4 || die - - mv configure.{in,ac} || die - eautoconf - multilib_copy_sources } @@ -74,11 +65,13 @@ multilib_src_configure() { } multilib_src_install() { + dolib.so libtcl8.5.so + dolib.a libtclstub8.5.a + #short version number local v1=$(get_version_component_range 1-2) local mylibdir=$(get_libdir) - S= default # fix the tclConfig.sh to eliminate refs to the build directory # and drop unnecessary -L inclusion to default system libdir @@ -90,42 +83,14 @@ multilib_src_install() { -e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ -e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \ -e "/^TCL_LIB_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \ - -i "${ED}"/usr/${mylibdir}/tclConfig.sh || die + -i tclConfig.sh || die if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then sed \ -e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \ -e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \ - -i "${ED}"/usr/${mylibdir}/tclConfig.sh || die + -i tclConfig.sh || die fi - # install private headers - insinto /usr/${mylibdir}/tcl${v1}/include/unix - doins *.h - insinto /usr/${mylibdir}/tcl${v1}/include/generic - doins "${SPARENT}"/generic/*.h - rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die - - # install symlink for libraries - dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname) - dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a - - if multilib_is_native_abi; then - dosym tclsh${v1} /usr/bin/tclsh - dodoc "${SPARENT}"/{ChangeLog*,README,changes} - fi -} - -pkg_postinst() { - for version in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 8.6 ${version}; then - echo - ewarn "You're upgrading from <${P}, you must recompile the other" - ewarn "packages on your system that link with tcl after the upgrade" - ewarn "completes. To perform this action, please run revdep-rebuild" - ewarn "in package app-portage/gentoolkit." - ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should" - ewarn "upgrade them before this recompilation, too," - echo - fi - done + insinto /usr/${mylibdir}/tcl${v1} + doins tclConfig.sh } diff --git a/dev-lang/tcl/tcl-8.6.7.ebuild b/dev-lang/tcl/tcl-8.6.7.ebuild deleted file mode 100644 index 4240a4a81029..000000000000 --- a/dev-lang/tcl/tcl-8.6.7.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator - -MY_P="${PN}${PV}" - -DESCRIPTION="Tool Command Language" -HOMEPAGE="http://www.tcl.tk/" -SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz" - -LICENSE="tcltk" -SLOT="0/8.6" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="debug +threads" - -RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" - -SPARENT="${WORKDIR}/${MY_P}" -S="${SPARENT}"/unix - -PATCHES=( - "${FILESDIR}"/${PN}-8.5.13-multilib.patch - - # Bug 125971 - "${FILESDIR}"/${PN}-8.5.14-conf.patch -) - -src_prepare() { - find \ - "${SPARENT}"/compat/* \ - "${SPARENT}"/doc/try.n \ - -delete || die - - pushd "${SPARENT}" &>/dev/null || die - default - popd &>/dev/null || die - - # workaround stack check issues, bug #280934 - use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1" - - tc-export CC - - sed \ - -e '/chmod/s:555:755:g' \ - -i Makefile.in || die - - sed \ - -e 's:-O[2s]\?::g' \ - -i tcl.m4 || die - - mv configure.{in,ac} || die - - eautoconf - - multilib_copy_sources -} - -multilib_src_configure() { - # We went ahead and deleted the whole compat/ subdir which means - # the configure tests to detect broken versions need to pass (else - # we'll fail to build). This comes up when cross-compiling, but - # might as well get a minor configure speed up normally. - export ac_cv_func_memcmp_working="yes" - export tcl_cv_str{str,toul,tod}_unbroken="ok" - export tcl_cv_strtod_buggy="no" - - econf \ - $(use_enable threads) \ - $(use_enable debug symbols) -} - -multilib_src_install() { - #short version number - local v1=$(get_version_component_range 1-2) - local mylibdir=$(get_libdir) - - S= default - # fix the tclConfig.sh to eliminate refs to the build directory - # and drop unnecessary -L inclusion to default system libdir - - sed \ - -e "/^TCL_BUILD_LIB_SPEC=/s:-L$(pwd) *::g" \ - -e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ - -e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \ - -e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L$(pwd) *::g" \ - -e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ - -e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \ - -e "/^TCL_LIB_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \ - -i "${ED}"/usr/${mylibdir}/tclConfig.sh || die - if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then - sed \ - -e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \ - -e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \ - -i "${ED}"/usr/${mylibdir}/tclConfig.sh || die - fi - - # install private headers - insinto /usr/${mylibdir}/tcl${v1}/include/unix - doins *.h - insinto /usr/${mylibdir}/tcl${v1}/include/generic - doins "${SPARENT}"/generic/*.h - rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die - - # install symlink for libraries - dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname) - dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a - - if multilib_is_native_abi; then - dosym tclsh${v1} /usr/bin/tclsh - dodoc "${SPARENT}"/{ChangeLog*,README,changes} - fi -} - -pkg_postinst() { - for version in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 8.6 ${version}; then - echo - ewarn "You're upgrading from <${P}, you must recompile the other" - ewarn "packages on your system that link with tcl after the upgrade" - ewarn "completes. To perform this action, please run revdep-rebuild" - ewarn "in package app-portage/gentoolkit." - ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should" - ewarn "upgrade them before this recompilation, too," - echo - fi - done -} diff --git a/dev-lang/tcl/tcl-8.6.8.ebuild b/dev-lang/tcl/tcl-8.6.8.ebuild index 9cbda4fccbbd..31f0fcf3f657 100644 --- a/dev-lang/tcl/tcl-8.6.8.ebuild +++ b/dev-lang/tcl/tcl-8.6.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz" LICENSE="tcltk" SLOT="0/8.6" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug +threads" RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]" diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest index cb7ff9124def..cb1e5f9cf468 100644 --- a/dev-lang/tk/Manifest +++ b/dev-lang/tk/Manifest @@ -5,15 +5,10 @@ AUX tk-8.5.14-conf.patch 569 BLAKE2B 243b538978966531dcf59f76ffb3d1b82bb10c2d80f AUX tk-8.6.8-libieee.patch 708 BLAKE2B ec8422ce98c68f2dd347bea807059fd8ee94fcd4540bdeb4c8d90cd7f028ff3dbe406ed26593ebd8815e611a1ae40390b4194bf8d3efd1863e8c15d04918681c SHA512 b25d2fbfc753296cef11b1943e19537aaf9f048f033078e516f36bc021107197f77b8f142fc7ace89ae6bdda037871ce7a5c45800ef0bebd04f77a5281bff457 DIST tcl8.5.17-src.tar.gz 4546317 BLAKE2B 27031dd3bd5790d03692e77edf91eb7fae8a40d8d193d8c8ce4e79b21f90e683bfc9d5b71764760223987fb163be844e6096d0aea1058b8ce255731d97e2a0ea SHA512 ad5ddb4cd6378fd6bbea8cd85ceb1cf90392b2e8c49fbfb3e4b35c81d3ae3e3f087697c41fcba8c8e06de1d9e7539397e26d58b864dc01ba65abe4ba4efa9568 DIST tk8.5.17-src.tar.gz 4095985 BLAKE2B 4cbb140c30ca717ee499b9ad9e1a3df27a470a78613edbaec425c39afaa41d59276bbe487933a4e77a9722fcafa9113b203cf5c828660bdeb38f667c3263c3cd SHA512 ddadc738c2567e35d1257b59212c8a0eb70a1bf041d986bc6df3b841b51d934d79a0ef389c928223a64516a92cae3357b2c789edca9c8a626ff4c1cf320c4f4f -DIST tk8.6.5-src.tar.gz 4417393 BLAKE2B bff37ac292928095063ebd3131ab8bf9e9d0b075c115c9e9a1f0fe75c2843cae6153b15fc9b964cd16a1251feca13258034d14dadd5fa8967bff6d5fee813f8f SHA512 9acf2ef993a566a7cdd1efe21dc896b09125c65d86df53ab5a78542b21d3f031e9f9d72b81738705636c268b5ce72934c483eb087d5c0114f913c9075db9a3b1 -DIST tk8.6.6-src.tar.gz 4273737 BLAKE2B 65b139fffe628439137a02a72af19be0f7c44956d18852f1ce8892349d0fa370281e475fbbe7451da524ab4e74a8c258ee5ee70b8a146bf1ec71e3bf420314a3 SHA512 223c72ab5a6f6040928c56843598b878efafab44ed4152a38e68aa2800f2c181adc50a8bf23279b7d446493eec43854920e8b649b6a34ecdf31ecc07ccc74044 -DIST tk8.6.7-src.tar.gz 4282972 BLAKE2B b07102365539ee98e2972a5d3bee2bdee89cb4d3873b05c764810b89f0152b71bd0d14d007434a003cd784868afadf6a2a50deffc0c4596b4551a0be7625fd13 SHA512 adf35991b20878d18a6940cb3d24d821586828537edf6d20f9223f2989d317adbcbb5360f3226014d96fe44e7ec06cfdf434309438c90a09878345b7106c7dd9 DIST tk8.6.8-src.tar.gz 4319854 BLAKE2B 167c5dc6c32e49653c04bc067c3d75df022ca230657be32797021b0e2f7748215d9ad0493c8020b8d1be1f005b9b2d561339a6a0b209721c0d05dd222d47d377 SHA512 d0d30637b733fb0b0d38461b6d872934c04af422fcdb7ec41a72331b2529cc94414e6f441f95a98642d69505e4f41469847fedd1cbe58bd08cdd818fcabd1db9 +EBUILD tk-8.5.17-r1.ebuild 3566 BLAKE2B a3eae0668b78a075d72b9c8a6751d341d5e021a1cba8d0501fdfb22a25b00095ba289dc46a4bf567e55639172a94dd0401af46651cea11879cdfa367c1e196f3 SHA512 3d09b21189e2cc5016da816ea1fbe99d393704b32aa31a307cdb52bca0d3c91b413031a4ea90b4e52ba12e49cdc22e38d150317b0190243de788a862c83a65b9 EBUILD tk-8.5.17-r100.ebuild 2162 BLAKE2B e4e280058b3059213d10a20fcabcd54a17e74bf78bd6e18ac5acf3a51a3fd870743ea40dc793b6a0ce5ebbfefe9744f26c900542ed511f4ba2d37c404069bc63 SHA512 e0958680ae7beeb6f5ffe06093f27d482c22cba9dfc71fe727425d8fbe4b20e6270b2ddd6e8860b0f7433f84224f8b8251800570ea81f75209146876fd94bda7 +EBUILD tk-8.5.17-r101.ebuild 2222 BLAKE2B d632b0304e36ffc9d758efd99fa128c83ab655661d25361c747aff17b9dd16ddadd4386ae9586fa131d6e0288228603232eae7ab24088095e48d60ed8c9772e1 SHA512 82594980647370fbae9201e661024216776b8d1e3fa3d198e5181d99e810f681fb5e4cabc00be41dbcd477c99a80c3a1d8822ef285cf294bded8c41f64d63607 EBUILD tk-8.5.17.ebuild 3506 BLAKE2B 073a60dae07cd8dbcb19f626a686cce74d4e8e0f1216b4a8911eae7245ea2ad4d3b0c4d4a947d56ac8fca418e4927421fa264ac50ecbbad5998e05aeb468df19 SHA512 ae25cad437b2ffb91053c82a0222ca0b01329a353d273b2fa326399fe78fcf129957e746c0cfe1488bf2017ee0455161a71897d5d7b793f1d816b8b2df4d0cc9 -EBUILD tk-8.6.5-r1.ebuild 4087 BLAKE2B d69eb5f9a39185136c9b2f171759ce1dbd14a96de033e7baa091280a2d767bb2dcb1d9b9bb3331f898de88fe02bbfecf8d2a2a8b09a2d6b7dbaff700804de51f SHA512 9010eb09e6120e639efad1bd00ef8521ebdfd0fa239465100c4097edcf103c184400ba915412a00157f965ae3e272f833c3efa1d7ec15f069e71f0ebaf18e7a1 -EBUILD tk-8.6.5.ebuild 3988 BLAKE2B e00838e897117cf68940e01d351e1034799a629c85d9ae06a3783d6ff3f3b0524d2463912c0855995d21e96ef3d8721511ecf8bf0e95f98fd9f5bea7d13dc457 SHA512 60fcf475165d06ccb14c75be62c3e3c345e17d82982d6ee54dceb34ba35cbaa924105ec3a2d5751df8e7e336a80b2374b50ef949007e015284e588057215f8e1 -EBUILD tk-8.6.6.ebuild 4085 BLAKE2B 6a7c20d97958042b33d33a773d66d4922e2d03f91da9673f51d1d58e289c9ac810984dc61d83ed885ea5f326f5772bb96d26a8b8cc6191d7f0bdb3060ac32ab9 SHA512 18dc21f5802713c1af13754f7b1708566f72333831066631300cbcdc63c69193be95fa95e903091fedca52abfb94086d9928a0ac7ebbd85e0c98f3a2dd7c4177 -EBUILD tk-8.6.7.ebuild 4094 BLAKE2B 6fe902d52648043a635bba952e896410a0077e74cd5352cbce0133aff3cec207e38cae28e948b6fc8a24871e6be9d5e5fcf0357b7436ce0d990c05663336ac65 SHA512 1d04133b247018dbaaf193705a3a7f5e2797d9f3086364c249c46020a49bdb55f8f2fb2b4d42036e3d1dafb9be5a867b0c5063c03f008a07c3fe2f4d851141f7 -EBUILD tk-8.6.8.ebuild 4124 BLAKE2B 6c33e1d1a4aa9ba5db75596a5e3b20d5b1fe22236acb27f6d614849ff827ecb2cbf9d22aca8f611a7af229d2c2f5899605b8e820c272928efdec5dd31c750908 SHA512 b024951352f421c4e631e209a66cfa7d607704da4190faddef9cffb46c9d96b4580ce73da26994c15bd70eac2d7bf68dba284d6b4d5fc561853cf54c76692e16 +EBUILD tk-8.6.8.ebuild 4116 BLAKE2B dca2259fdb3ae44dcf8f3eb91562b22f9cd8065bc15bad201dee93d868670c13a3026c50e21efa04a8fcb9dfb71b04d824f210914aef85447ac38ce4ed30194b SHA512 ae2c69570844eeee386378ed6b5f66fc8c4dfb2c52a517b8ddf8b65880e600ce7e8cf1fef0e9c04f7e7a549e279f5023d981b5ba2ac82981573aa0265776bb58 MISC metadata.xml 326 BLAKE2B 56e0bdfbc3f6226d3577786996e1d83e0a5e233f08966966b7f18366d103648cc8843afb08b23eb2ff5aafd7faa9b8a53d33f35a273ea5f70191b76d5f9faaea SHA512 0a3bc9dd4103f252027e5df1f1bec25c54b8e595c3161cf2e2e3dc083d9613c1cf7f810bae2eea1e4687d87195091d84c16ceac683d7bb508bd38ad565b5ba7d diff --git a/dev-lang/tk/tk-8.6.5.ebuild b/dev-lang/tk/tk-8.5.17-r1.ebuild index 4d9bc73a8568..10bfdfee32ac 100644 --- a/dev-lang/tk/tk-8.6.5.ebuild +++ b/dev-lang/tk/tk-8.5.17-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=5 -inherit autotools eutils multilib multilib-minimal prefix toolchain-funcs versionator virtualx +inherit autotools eutils multilib prefix toolchain-funcs versionator virtualx MY_P="${PN}${PV/_beta/b}" @@ -12,47 +12,39 @@ HOMEPAGE="http://www.tcl.tk/" SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz" LICENSE="tcltk" -SLOT="0/8.6" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="debug +threads truetype aqua xscreensaver" +SLOT="0/8.5" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="debug threads truetype aqua xscreensaver" RDEPEND=" !aqua? ( - >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] - truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] ) - xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) + media-libs/fontconfig + media-libs/freetype:2 + x11-libs/libX11 + x11-libs/libXt + truetype? ( x11-libs/libXft ) + xscreensaver? ( x11-libs/libXScrnSaver ) ) - ~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]" + ~dev-lang/tcl-${PV}:0=" DEPEND="${RDEPEND} !aqua? ( x11-base/xorg-proto )" -# Not bumped to 8.6 -#RESTRICT=test - SPARENT="${WORKDIR}/${MY_P}" S="${SPARENT}"/unix -PATCHES=( - "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \ - "${FILESDIR}"/${PN}-8.5.13-multilib.patch +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \ + "${FILESDIR}"/${PN}-8.5.13-multilib.patch - "${FILESDIR}"/${PN}-8.4.15-aqua.patch + epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch + eprefixify Makefile.in # Bug 125971 - "${FILESDIR}"/${PN}-8.5.14-conf.patch -) + epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch -src_prepare() { - find \ - "${SPARENT}"/compat/* \ - -delete || die - - pushd "${SPARENT}" &>/dev/null || die - default - popd &>/dev/null || die - eprefixify Makefile.in + # Bug 648570 + epatch "${FILESDIR}"/${PN}-8.6.8-libieee.patch # Make sure we use the right pkg-config, and link against fontconfig # (since the code base uses Fc* functions). @@ -61,26 +53,18 @@ src_prepare() { -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \ -e 's:xft freetype2:xft freetype2 fontconfig:' \ -i configure.in || die - rm configure || die - - tc-export CC + rm -f configure || die sed \ -e '/chmod/s:555:755:g' \ -i Makefile.in || die - sed \ - -e 's:-O[2s]\?::g' \ - -i tcl.m4 || die - - mv configure.{in,ac} || die + tc-export CC eautoconf - - multilib_copy_sources } -multilib_src_configure() { +src_configure() { local mylibdir=$(get_libdir) econf \ @@ -92,11 +76,11 @@ multilib_src_configure() { $(use_enable debug symbols) } -multilib_src_test() { - virtx emake test +src_test() { + Xemake test } -multilib_src_install() { +src_install() { #short version number local v1=$(get_version_component_range 1-2) local mylibdir=$(get_libdir) @@ -110,12 +94,12 @@ multilib_src_install() { # and drop unnecessary -L inclusion to default system libdir sed \ - -e "/^TK_BUILD_LIB_SPEC=/s:-L${S}-\w*\.\w* ::g" \ + -e "/^TK_BUILD_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \ -e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ -e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \ - -e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${S}-\w*\.\w* *::g" \ + -e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \ -e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ - -e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \ + -e "/^TK_BUILD_STUB_LIB_PATH=/s:${SPARENT}.*unix:${EPREFIX}/usr/${mylibdir}:g" \ -e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \ -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then @@ -136,8 +120,7 @@ multilib_src_install() { dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname) dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a - if multilib_is_native_abi; then - dosym wish${v1} /usr/bin/wish - dodoc "${SPARENT}"/{ChangeLog*,README,changes} - fi + dosym wish${v1} /usr/bin/wish + + dodoc "${SPARENT}"/{ChangeLog*,README,changes} } diff --git a/dev-lang/tk/tk-8.5.17-r101.ebuild b/dev-lang/tk/tk-8.5.17-r101.ebuild new file mode 100644 index 000000000000..fdf73fe90c60 --- /dev/null +++ b/dev-lang/tk/tk-8.5.17-r101.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit autotools eutils flag-o-matic multilib prefix toolchain-funcs versionator virtualx + +MY_P="${PN}${PV/_beta/b}" + +DESCRIPTION="Tk Widget Set" +HOMEPAGE="http://www.tcl.tk/" +SRC_URI=" + mirror://sourceforge/tcl/${MY_P}-src.tar.gz + mirror://sourceforge/tcl/${MY_P//tk/tcl}-src.tar.gz + " + +LICENSE="tcltk" +SLOT="8.5" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="debug threads truetype aqua xscreensaver" + +RDEPEND=" + !aqua? ( + media-libs/fontconfig + media-libs/freetype:2 + x11-libs/libX11 + x11-libs/libXt + truetype? ( x11-libs/libXft ) + xscreensaver? ( x11-libs/libXScrnSaver ) + ) + ~dev-lang/tcl-${PV}:8.5= + !=dev-lang/tk-8.5:0" +DEPEND="${RDEPEND} + !aqua? ( x11-base/xorg-proto )" + +SPARENT="${WORKDIR}/${MY_P}" +S="${SPARENT}"/unix + +DOCS=() + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \ + "${FILESDIR}"/${PN}-8.5.13-multilib.patch + + epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch + eprefixify Makefile.in + + # Bug 125971 + epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch + + # Bug 648570 + epatch "${FILESDIR}"/${PN}-8.6.8-libieee.patch + + # Make sure we use the right pkg-config, and link against fontconfig + # (since the code base uses Fc* functions). + sed \ + -e 's/FT_New_Face/XftFontOpen/g' \ + -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \ + -e 's:xft freetype2:xft freetype2 fontconfig:' \ + -i configure.in || die + rm -f configure || die + + append-cppflags \ + -I"${WORKDIR}/${MY_P//tk/tcl}/generic" \ + -I"${WORKDIR}/${MY_P//tk/tcl}/unix" + + sed \ + -e '/chmod/s:555:755:g' \ + -i Makefile.in || die + + tc-export CC + + eautoconf +} + +src_configure() { + local v1=$(get_version_component_range 1-2) + local mylibdir=$(get_libdir) + + econf \ + --with-tcl="${EPREFIX}/usr/${mylibdir}/tcl${v1}" \ + $(use_enable threads) \ + $(use_enable aqua) \ + $(use_enable truetype xft) \ + $(use_enable xscreensaver xss) \ + $(use_enable debug symbols) +} + +src_test() { + Xemake test +} + +src_install() { + dolib.so libtk8.5.so +} diff --git a/dev-lang/tk/tk-8.6.5-r1.ebuild b/dev-lang/tk/tk-8.6.5-r1.ebuild deleted file mode 100644 index aa3bd7ed7297..000000000000 --- a/dev-lang/tk/tk-8.6.5-r1.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils multilib multilib-minimal prefix toolchain-funcs versionator virtualx - -MY_P="${PN}${PV/_beta/b}" - -DESCRIPTION="Tk Widget Set" -HOMEPAGE="http://www.tcl.tk/" -SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz" - -LICENSE="tcltk" -SLOT="0/8.6" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="debug +threads truetype aqua xscreensaver" - -RDEPEND=" - !aqua? ( - >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] - truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] ) - xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) - ) - ~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - !aqua? ( x11-base/xorg-proto )" - -# Not bumped to 8.6 -#RESTRICT=test - -SPARENT="${WORKDIR}/${MY_P}" -S="${SPARENT}"/unix - -PATCHES=( - "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \ - "${FILESDIR}"/${PN}-8.5.13-multilib.patch - - "${FILESDIR}"/${PN}-8.4.15-aqua.patch - - # Bug 125971 - "${FILESDIR}"/${PN}-8.5.14-conf.patch -) - -src_prepare() { - find \ - "${SPARENT}"/compat/* \ - -delete || die - - pushd "${SPARENT}" &>/dev/null || die - default - popd &>/dev/null || die - eprefixify Makefile.in - - # Make sure we use the right pkg-config, and link against fontconfig - # (since the code base uses Fc* functions). - sed \ - -e 's/FT_New_Face/XftFontOpen/g' \ - -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \ - -e 's:xft freetype2:xft freetype2 fontconfig:' \ - -i configure.in || die - rm configure || die - - tc-export CC - - sed \ - -e '/chmod/s:555:755:g' \ - -i Makefile.in || die - - sed \ - -e 's:-O[2s]\?::g' \ - -i tcl.m4 || die - - mv configure.{in,ac} || die - - eautoconf - - multilib_copy_sources -} - -multilib_src_configure() { - if tc-is-cross-compiler ; then - export ac_cv_func_strtod=yes - export tcl_cv_strtod_buggy=1 - fi - - local mylibdir=$(get_libdir) - - econf \ - --with-tcl="${EPREFIX}/usr/${mylibdir}" \ - $(use_enable threads) \ - $(use_enable aqua) \ - $(use_enable truetype xft) \ - $(use_enable xscreensaver xss) \ - $(use_enable debug symbols) -} - -multilib_src_test() { - virtx emake test -} - -multilib_src_install() { - #short version number - local v1=$(get_version_component_range 1-2) - local mylibdir=$(get_libdir) - - S= default - - # normalize $S path, bug #280766 (pkgcore) - local nS="$(cd "${S}"; pwd)" - - # fix the tkConfig.sh to eliminate refs to the build directory - # and drop unnecessary -L inclusion to default system libdir - - sed \ - -e "/^TK_BUILD_LIB_SPEC=/s:-L${S}-\w*\.\w* ::g" \ - -e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ - -e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \ - -e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${S}-\w*\.\w* *::g" \ - -e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ - -e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \ - -e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \ - -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die - if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then - sed \ - -e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \ - -e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \ - -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die - fi - - # install private headers - insinto /usr/${mylibdir}/tk${v1}/include/unix - doins "${S}"/*.h - insinto /usr/${mylibdir}/tk${v1}/include/generic - doins "${SPARENT}"/generic/*.h - rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die - - # install symlink for libraries - dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname) - dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a - - if multilib_is_native_abi; then - dosym wish${v1} /usr/bin/wish - dodoc "${SPARENT}"/{ChangeLog*,README,changes} - fi -} diff --git a/dev-lang/tk/tk-8.6.6.ebuild b/dev-lang/tk/tk-8.6.6.ebuild deleted file mode 100644 index e2326cd6d805..000000000000 --- a/dev-lang/tk/tk-8.6.6.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils multilib multilib-minimal prefix toolchain-funcs versionator virtualx - -MY_P="${PN}${PV/_beta/b}" - -DESCRIPTION="Tk Widget Set" -HOMEPAGE="http://www.tcl.tk/" -SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz" - -LICENSE="tcltk" -SLOT="0/8.6" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="debug +threads truetype aqua xscreensaver" - -RDEPEND=" - !aqua? ( - >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] - truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] ) - xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) - ) - ~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - !aqua? ( x11-base/xorg-proto )" - -# Not bumped to 8.6 -#RESTRICT=test - -SPARENT="${WORKDIR}/${MY_P}" -S="${SPARENT}"/unix - -PATCHES=( - "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \ - "${FILESDIR}"/${PN}-8.5.13-multilib.patch - - "${FILESDIR}"/${PN}-8.4.15-aqua.patch - - # Bug 125971 - "${FILESDIR}"/${PN}-8.5.14-conf.patch -) - -src_prepare() { - find \ - "${SPARENT}"/compat/* \ - -delete || die - - pushd "${SPARENT}" &>/dev/null || die - default - popd &>/dev/null || die - eprefixify Makefile.in - - # Make sure we use the right pkg-config, and link against fontconfig - # (since the code base uses Fc* functions). - sed \ - -e 's/FT_New_Face/XftFontOpen/g' \ - -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \ - -e 's:xft freetype2:xft freetype2 fontconfig:' \ - -i configure.in || die - rm configure || die - - tc-export CC - - sed \ - -e '/chmod/s:555:755:g' \ - -i Makefile.in || die - - sed \ - -e 's:-O[2s]\?::g' \ - -i tcl.m4 || die - - mv configure.{in,ac} || die - - eautoconf - - multilib_copy_sources -} - -multilib_src_configure() { - if tc-is-cross-compiler ; then - export ac_cv_func_strtod=yes - export tcl_cv_strtod_buggy=1 - fi - - local mylibdir=$(get_libdir) - - econf \ - --with-tcl="${EPREFIX}/usr/${mylibdir}" \ - $(use_enable threads) \ - $(use_enable aqua) \ - $(use_enable truetype xft) \ - $(use_enable xscreensaver xss) \ - $(use_enable debug symbols) -} - -multilib_src_test() { - virtx emake test -} - -multilib_src_install() { - #short version number - local v1=$(get_version_component_range 1-2) - local mylibdir=$(get_libdir) - - S= default - - # normalize $S path, bug #280766 (pkgcore) - local nS="$(cd "${S}"; pwd)" - - # fix the tkConfig.sh to eliminate refs to the build directory - # and drop unnecessary -L inclusion to default system libdir - - sed \ - -e "/^TK_BUILD_LIB_SPEC=/s:-L${S}-\w*\.\w* ::g" \ - -e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ - -e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \ - -e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${S}-\w*\.\w* *::g" \ - -e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ - -e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \ - -e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \ - -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die - if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then - sed \ - -e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \ - -e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \ - -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die - fi - - # install private headers - insinto /usr/${mylibdir}/tk${v1}/include/unix - doins "${S}"/*.h - insinto /usr/${mylibdir}/tk${v1}/include/generic - doins "${SPARENT}"/generic/*.h - rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die - - # install symlink for libraries - dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname) - dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a - - if multilib_is_native_abi; then - dosym wish${v1} /usr/bin/wish - dodoc "${SPARENT}"/{ChangeLog*,README,changes} - fi -} diff --git a/dev-lang/tk/tk-8.6.7.ebuild b/dev-lang/tk/tk-8.6.7.ebuild deleted file mode 100644 index 2fa86b88177c..000000000000 --- a/dev-lang/tk/tk-8.6.7.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils multilib multilib-minimal prefix toolchain-funcs versionator virtualx - -MY_P="${PN}${PV/_beta/b}" - -DESCRIPTION="Tk Widget Set" -HOMEPAGE="http://www.tcl.tk/" -SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz" - -LICENSE="tcltk" -SLOT="0/8.6" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="debug +threads truetype aqua xscreensaver" - -RDEPEND=" - !aqua? ( - >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] - truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] ) - xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) - ) - ~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - !aqua? ( x11-base/xorg-proto )" - -# Not bumped to 8.6 -#RESTRICT=test - -SPARENT="${WORKDIR}/${MY_P}" -S="${SPARENT}"/unix - -PATCHES=( - "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \ - "${FILESDIR}"/${PN}-8.5.13-multilib.patch - - "${FILESDIR}"/${PN}-8.4.15-aqua.patch - - # Bug 125971 - "${FILESDIR}"/${PN}-8.5.14-conf.patch -) - -src_prepare() { - find \ - "${SPARENT}"/compat/* \ - -delete || die - - pushd "${SPARENT}" &>/dev/null || die - default - popd &>/dev/null || die - eprefixify Makefile.in - - # Make sure we use the right pkg-config, and link against fontconfig - # (since the code base uses Fc* functions). - sed \ - -e 's/FT_New_Face/XftFontOpen/g' \ - -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \ - -e 's:xft freetype2:xft freetype2 fontconfig:' \ - -i configure.in || die - rm configure || die - - tc-export CC - - sed \ - -e '/chmod/s:555:755:g' \ - -i Makefile.in || die - - sed \ - -e 's:-O[2s]\?::g' \ - -i tcl.m4 || die - - mv configure.{in,ac} || die - - eautoconf - - multilib_copy_sources -} - -multilib_src_configure() { - if tc-is-cross-compiler ; then - export ac_cv_func_strtod=yes - export tcl_cv_strtod_buggy=1 - fi - - local mylibdir=$(get_libdir) - - econf \ - --with-tcl="${EPREFIX}/usr/${mylibdir}" \ - $(use_enable threads) \ - $(use_enable aqua) \ - $(use_enable truetype xft) \ - $(use_enable xscreensaver xss) \ - $(use_enable debug symbols) -} - -multilib_src_test() { - virtx emake test -} - -multilib_src_install() { - #short version number - local v1=$(get_version_component_range 1-2) - local mylibdir=$(get_libdir) - - S= default - - # normalize $S path, bug #280766 (pkgcore) - local nS="$(cd "${S}"; pwd)" - - # fix the tkConfig.sh to eliminate refs to the build directory - # and drop unnecessary -L inclusion to default system libdir - - sed \ - -e "/^TK_BUILD_LIB_SPEC=/s:-L${S}-\w*\.\w* ::g" \ - -e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ - -e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \ - -e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${S}-\w*\.\w* *::g" \ - -e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ - -e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \ - -e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \ - -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die - if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then - sed \ - -e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \ - -e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \ - -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die - fi - - # install private headers - insinto /usr/${mylibdir}/tk${v1}/include/unix - doins "${S}"/*.h - insinto /usr/${mylibdir}/tk${v1}/include/generic - doins "${SPARENT}"/generic/*.h - rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die - - # install symlink for libraries - dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname) - dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a - - if multilib_is_native_abi; then - dosym wish${v1} /usr/bin/wish - dodoc "${SPARENT}"/{ChangeLog*,README,changes} - fi -} diff --git a/dev-lang/tk/tk-8.6.8.ebuild b/dev-lang/tk/tk-8.6.8.ebuild index 6d76b86c92e6..1061b8db122d 100644 --- a/dev-lang/tk/tk-8.6.8.ebuild +++ b/dev-lang/tk/tk-8.6.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz" LICENSE="tcltk" SLOT="0/8.6" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug +threads truetype aqua xscreensaver" RDEPEND=" |