diff options
Diffstat (limited to 'dev-lang')
64 files changed, 2618 insertions, 3074 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz Binary files differindex b0734c72161f..9cbd8a720eb4 100644 --- a/dev-lang/Manifest.gz +++ b/dev-lang/Manifest.gz diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest index d486232bc81c..6e9930466e13 100644 --- a/dev-lang/R/Manifest +++ b/dev-lang/R/Manifest @@ -4,7 +4,7 @@ DIST R-3.4.1.tar.gz 30200109 BLAKE2B 03602e9a48759caee8ce047fa6273df7a54af089de4 DIST R-3.5.3.tar.gz 30205979 BLAKE2B 60dde4c1a7874df0b113630577d943d581d9e0844383a5cb7eda7f62470177d541704a888c33ded216f8b1f088cda493d7716693f5e2451effe3639ce2286dd1 SHA512 077cbd4bc9f19a3a2485afbd4d8e08e0754ddcb9a10164cbc8478f239d5ed0ffaf6796929f154cce1c8aea549c32d460049fc036dc326174d1dbb0a1ddb5f5ef DIST R-3.6.0.tar.gz 30449618 BLAKE2B 2fb2f1252f5ead97ab42eb1f71fa0be1e8aec2f6cce182956ec1c35b43b70b58f579faf5f3ca11efb8e9c24a9ed836b5b690cb23858249bc7f575aca4709bc3b SHA512 b2e17b909b6387abb964492e2e9370f913295ca7ac99bab0e965c43ed3c4635e27468c326fb2bca3c529b03c731b0170d9e777a194ad4d6c5a983c050223d8c8 DIST R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion 13596 BLAKE2B 53338e4a1c4f68beb69247216e553dbcac47f660fbf032bfebf7a660e32d2cff5b11ed35411c52de7e1fd6e00bbf5b5ea19369a325fa0a38bd93d63dc3288cbd SHA512 9ccd19bb1b0c18a2f13035ccd6809447429e197e298fb4d1df808ef345d723b42f75a1b91c349f6dbb46e4a82e59ef33e11300c495d79b63d670d0c0f2b16a06 -EBUILD R-3.4.1.ebuild 6301 BLAKE2B 42e7d1e4ca35ef09328f759d0628e2df1125b4e7a551ef575bab9b0c725697fe004c2ccf4f48e91b12a36275214ab9e1552a294f8d5570a900d4bc95145803cf SHA512 197141befd0b38ccf5aceff887cf62cc2189f77513f3e9ee77362ab6dc62ea04ec42dd26aef14aa64426b1f2c6d0cb241637d8b11b2cf15fb769efdb98310644 -EBUILD R-3.5.3.ebuild 6300 BLAKE2B f77eac78c11e8b897b699c6ed4a0fe1e545e2c649e3441d3733caee988a95017b4934f5b6e006e842e8c51a0ec4263ce9f06b6da4b6be87a4227c9de972cb7d4 SHA512 fcb19b9af710277bbdf07aa766a94784811c7efdb1605ca6d6487f221e48ca31883740aa1aa31289b92aba49e8ec4a8138a338bfa3d3c45219b02068bc669ef2 -EBUILD R-3.6.0.ebuild 6300 BLAKE2B f77eac78c11e8b897b699c6ed4a0fe1e545e2c649e3441d3733caee988a95017b4934f5b6e006e842e8c51a0ec4263ce9f06b6da4b6be87a4227c9de972cb7d4 SHA512 fcb19b9af710277bbdf07aa766a94784811c7efdb1605ca6d6487f221e48ca31883740aa1aa31289b92aba49e8ec4a8138a338bfa3d3c45219b02068bc669ef2 +EBUILD R-3.4.1.ebuild 6307 BLAKE2B 56963ae2e76edb644639667bfdf3211cb884b13c903e635a946dc3e675c1025ffc18ce1b84de2085bb8727b4aeb0c0bba2b42bfb3590e9042d67a9ef825e3012 SHA512 d8c51ab334063f7b1bb148c3d0288f743a70b14947a0ea4d0e495977435f0547e96b82fc50f6e179f3dcb211c2b4171fb5bbd4212dac6aaaab0397339fc6a869 +EBUILD R-3.5.3.ebuild 6306 BLAKE2B 198df68c0ee06adbc10cbae13b18b60d222eda6cbbe32020ca04e324d68dfbaa3617852cc1eea2d15c324c3ddd84e0b366655b56be1b1ffc73cc63cfa197c21f SHA512 5950e847dc6ab3c16ffb879c6ed86d0c4f644cfd4fea5b250b735fee631dfeaa0cd62afd8fa28ca0874dbfb40d0a95ab98dc60289411d1b1956723b05dd1d3dc +EBUILD R-3.6.0.ebuild 6306 BLAKE2B 198df68c0ee06adbc10cbae13b18b60d222eda6cbbe32020ca04e324d68dfbaa3617852cc1eea2d15c324c3ddd84e0b366655b56be1b1ffc73cc63cfa197c21f SHA512 5950e847dc6ab3c16ffb879c6ed86d0c4f644cfd4fea5b250b735fee631dfeaa0cd62afd8fa28ca0874dbfb40d0a95ab98dc60289411d1b1956723b05dd1d3dc MISC metadata.xml 1140 BLAKE2B 774221eb531b4e80f0650b627b9ce53d9a2daf6342b1f19579d2d046e1c83aa497cc764870406b7ea3cf6cbae899cb6d460af92991d62bc6aea8da026a441822 SHA512 297c7e17998f92fb836b0599ce5221aee1ba1e7b1504edb348a602b695faf381d51f32f6118f5ef4bb353f02e92ffc5b3520b8d317d3e30a68a3cce0254fa6b1 diff --git a/dev-lang/R/R-3.4.1.ebuild b/dev-lang/R/R-3.4.1.ebuild index 52d611535b4e..703845547de2 100644 --- a/dev-lang/R/R-3.4.1.ebuild +++ b/dev-lang/R/R-3.4.1.ebuild @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1" SLOT="0" -KEYWORDS="amd64 arm64 ia64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="amd64 arm64 ~hppa ia64 sparc x86 ~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.3.ebuild b/dev-lang/R/R-3.5.3.ebuild index b9a1b267e516..1d09832746b5 100644 --- a/dev-lang/R/R-3.5.3.ebuild +++ b/dev-lang/R/R-3.5.3.ebuild @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~amd64 ~hppa ~ia64 ~sparc ~x86 ~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.6.0.ebuild b/dev-lang/R/R-3.6.0.ebuild index b9a1b267e516..1d09832746b5 100644 --- a/dev-lang/R/R-3.6.0.ebuild +++ b/dev-lang/R/R-3.6.0.ebuild @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~amd64 ~hppa ~ia64 ~sparc ~x86 ~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/cfortran/Manifest b/dev-lang/cfortran/Manifest index fe3e21995d0a..23b49ff0ccc2 100644 --- a/dev-lang/cfortran/Manifest +++ b/dev-lang/cfortran/Manifest @@ -1,5 +1,5 @@ DIST cfortran_4.4-14.diff.gz 23084 BLAKE2B 8e760b3697869c12e94925c4781318fbe7640f0563a2464bf5d9f51a4afcb4bf9c281bab189542f2342d6dbc6f5524b4a48d9f844459d190e9182a96ebefbf9b SHA512 1e0b267efc17c2ba30ca1108d59ef87d1a401e6b88bea2c7045458f8cfad6ec9a05f6bf4a08c1d6cb314c790a4969a1f0fdf0c7b6abc28bae544928aad5b0218 DIST cfortran_4.4.orig.tar.gz 120119 BLAKE2B df4e0650e2718ed0c2009fb1b85330266308b0b584fcdc85e08cad0913bf063ab38824724b43a005a63a6e6bd5152b35115a68659487a992b96d0d38792e6d0a SHA512 969d0db566ecd7ed7945cac7f8ceea1cbd94ab427734ba83882acf97022c83b1417e32515d847fee89144137f58f7041cf5164fc397f3d7526f3aa958f8b038c EBUILD cfortran-4.4-r2.ebuild 1077 BLAKE2B b74276d8a3e2db15922e3d2970ed0f984e63a8842f44a95917f07a60823d2cda914a5bbe5f7d996c628969d344e7a66690904ef3a94f0bd36c3f731bd99e366a SHA512 5394de879072217a8f481aa5f481d14f283517551663d58578612bc63e6279a3b4a76561a30fe4d22206ee5113723c27f97b5acc3dba8d6a933fccadfaaee48c -EBUILD cfortran-4.4-r3.ebuild 1138 BLAKE2B e69c34136467f9603101cb2e911d614be38be41fade238a70fb2939a8ec556a69057b98308250b436f77e0aa78d763eb0f613c058423d72293e0ab6e718126f3 SHA512 e96c4199cd671c5582976e6d62be132484f7266bb29f258d0861e6b6a65399ede2812fc07e4fe4644055d956e5041d392bf8d15099edd04b539fb3f9f604272d +EBUILD cfortran-4.4-r3.ebuild 1137 BLAKE2B da54764b155c15b48528b64eb0b5374e7ee0b34084472c793a957e62ae1e4281f3f3fd1b9e7dc32e3dbee9061e523fee315a026ae15e2a61b5d1c39be66a03c9 SHA512 f6bb9a1cc9a35e5b0b202b1f663e94807e29d157d718fe1a8fef00dd670024683cfefe2d8be4483c40cb0abcf60f2b14c8c81d2adbe3d4c16d394b7bd52c6061 MISC metadata.xml 588 BLAKE2B 9e2c3b0818a3bbc250153d807eb81d08f24d5568fc34eb83aef2a9344c59ca998fe488d27e8d23bc1381e21580015df60519698369394c17361111e470a9313b SHA512 4cc9d7ec3c44afc7e8ca2b43c04ea67c88fa1be09f9c594d83d1d011823566efd4e6b889fc4e95b019885be4223de32d94e0126acf70fe5e7cabf753a9923d40 diff --git a/dev-lang/cfortran/cfortran-4.4-r3.ebuild b/dev-lang/cfortran/cfortran-4.4-r3.ebuild index 6460b81ae738..94b05e0919a3 100644 --- a/dev-lang/cfortran/cfortran-4.4-r3.ebuild +++ b/dev-lang/cfortran/cfortran-4.4-r3.ebuild @@ -15,7 +15,7 @@ SRC_URI=" SLOT="0" LICENSE="LGPL-2" -KEYWORDS="~alpha amd64 ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="alpha amd64 ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="examples" src_unpack() { diff --git a/dev-lang/duktape/Manifest b/dev-lang/duktape/Manifest index 1928ebe9cdc3..3fc7b21d874e 100644 --- a/dev-lang/duktape/Manifest +++ b/dev-lang/duktape/Manifest @@ -1,8 +1,6 @@ AUX duktape.pc 218 BLAKE2B 3864f90f3ec1d77733736e16f99c0bab796502d3306759106357cb500d038304dfd6dc9849c9cde2e77683bf1f38dc7707119b39b66a6b55961b802e8d679520 SHA512 0f4b4e20ea9b348ed8b69623ed4fa09c20a2a951ef4f281b6313961c4aa085be9fc511a948d67713a7d2d9dede984761d5409b25e09da1db10698eb615f7c6fb -DIST duktape-2.1.1.tar.xz 1024568 BLAKE2B 9b8a5ef07052f685233e62a0ffac31c5ca2b41b90a82bd288edb4f7c495457c065dffb162a6b225b2aab48f41758dfca6031efbcf2e4b82fe590abab46465c2d SHA512 51e5146b083b460f005ce93e369aebf9981e33a3e888f3e91fd175b7f018a93981e8f6f9ff9bbd865ad30f1424fcb21c18334450050909cda5f74caf11b25479 -DIST duktape-2.2.0.tar.xz 969136 BLAKE2B f0567bec70a5a0055937007dc2891816bda214295f0373dd1039ee82c5c97111c1601fe3b0421690d968b8ce2d1fd0df18b2e3b786daabb5d1327cee5f980cf0 SHA512 6fe67660ad4cfbab37b9048840bd8c42ee9585441c17253e1f17cb06e4527d1413851bc167d8b013990d5cae9f8e6eb4cb6ff80866f55bd8d67b0cf47580be7c DIST duktape-2.2.1.tar.xz 966496 BLAKE2B fc458035fea9b3c5f26ac538b0ddb19ca0f93b8d20e3d51b3428e72a18797c15e6aeb6111ff05818e54529f199084b2803582d54b19040d16e58462405889449 SHA512 af78a1680cb796e1eedca78264a9c3344cd8149b3c54dc5109f21a0c65ee24097f6f18eceefbf336cda9eda7cb347a0484badfe765f3b93e1c1620b099999f25 -EBUILD duktape-2.1.1.ebuild 980 BLAKE2B 1269eaec8defb134e5a7baf4478ef855efbd50763037826db314d7e91703f2e3fc8479923ec0cb0c9062c63e8d867cb8bd4d9937eb776083846efd3d06a97219 SHA512 8c3cddb808fdc353762b946a4128a0e9aae4a1b6025dc7157993988d6c10e094d5ac46a090734bd9a9cfaf3307f3b066c23941e227b87ea3cbd5793d8993138e -EBUILD duktape-2.2.0.ebuild 980 BLAKE2B 1269eaec8defb134e5a7baf4478ef855efbd50763037826db314d7e91703f2e3fc8479923ec0cb0c9062c63e8d867cb8bd4d9937eb776083846efd3d06a97219 SHA512 8c3cddb808fdc353762b946a4128a0e9aae4a1b6025dc7157993988d6c10e094d5ac46a090734bd9a9cfaf3307f3b066c23941e227b87ea3cbd5793d8993138e +DIST duktape-2.4.0.tar.xz 1027744 BLAKE2B 9fb74b0586a5ccf5ef80d69955ab0ddb94428d463e300a558b5ab6e279d2c416b794434466604caa80581883df85f889694af1dd3ea0aaa4a3d53babb855f3ef SHA512 be6b7c73ae7c3419e8ced375fcff9680946e780b71d30e3be4e4e3b4b3a2710aa8f86530081c64958507a11fc215cacc5409c7d3a1d30b757838a00c748fa281 EBUILD duktape-2.2.1.ebuild 980 BLAKE2B 1269eaec8defb134e5a7baf4478ef855efbd50763037826db314d7e91703f2e3fc8479923ec0cb0c9062c63e8d867cb8bd4d9937eb776083846efd3d06a97219 SHA512 8c3cddb808fdc353762b946a4128a0e9aae4a1b6025dc7157993988d6c10e094d5ac46a090734bd9a9cfaf3307f3b066c23941e227b87ea3cbd5793d8993138e +EBUILD duktape-2.4.0.ebuild 984 BLAKE2B 639c3dbdb610048fc33134671a428deca1fe106f5f54cc7baee3d21b921265c63e168208501e6aaea0f91a578f2d33dd5b110d14f25a7d198542be944346a957 SHA512 7bcadb6b1e5a246bf2b62b3f3ccb7dfc50e9232508d86fbef1481b8b08fdd1b810e5010eff72fb8f88eb590f39ba711294bbd1b9207eeeb524032a57fb10170e MISC metadata.xml 477 BLAKE2B 8aa33e556bbac581fbf57393f8ba92e731e03ab91df9c34f442bec4f02f9ce69d455673e5074b037bd1b134653f1c11850b4f20eb0fa282fb0aa22d9e5c8517d SHA512 72024950f8fdb4c54f48cafd73d139c52230108fa9ba032c72a2bc847ec2d760d280879b17fb032ee22e147a4b9dcab5281e69985a157711a9d03c75c55a06c5 diff --git a/dev-lang/duktape/duktape-2.2.0.ebuild b/dev-lang/duktape/duktape-2.2.0.ebuild deleted file mode 100644 index 311fee357a5a..000000000000 --- a/dev-lang/duktape/duktape-2.2.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Embeddable Javascript engine" -HOMEPAGE="https://duktape.org" -SRC_URI="https://duktape.org/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -src_prepare() { - eapply_user - - # Set install path - sed -i "s#INSTALL_PREFIX=/usr/local#INSTALL_PREFIX=${D::-1}/usr#" \ - Makefile.sharedlibrary || die "failed to set install path" - - # Edit pkgconfig - sed "s#VERSION#${PV}#" "${FILESDIR}/${PN}.pc" > "${S}/${PN}.pc" || die - sed -i "s#LIBDIR#$(get_libdir)#" "${S}/${PN}.pc" || die - - # Set lib folder - sed -i "s#(INSTALL_PREFIX)/lib#(INSTALL_PREFIX)/$(get_libdir)#" \ - Makefile.sharedlibrary || die - - mv Makefile.sharedlibrary Makefile || die "failed to rename makefile" -} - -src_install() { - dodir /usr/$(get_libdir) - dodir /usr/include - emake install - - insinto /usr/$(get_libdir)/pkgconfig/ - doins "${S}/${PN}.pc" -} diff --git a/dev-lang/duktape/duktape-2.1.1.ebuild b/dev-lang/duktape/duktape-2.4.0.ebuild index 311fee357a5a..40429cd2db27 100644 --- a/dev-lang/duktape/duktape-2.1.1.ebuild +++ b/dev-lang/duktape/duktape-2.4.0.ebuild @@ -19,7 +19,7 @@ src_prepare() { eapply_user # Set install path - sed -i "s#INSTALL_PREFIX=/usr/local#INSTALL_PREFIX=${D::-1}/usr#" \ + sed -i "s#INSTALL_PREFIX = /usr/local#INSTALL_PREFIX = ${D::-1}/usr#" \ Makefile.sharedlibrary || die "failed to set install path" # Edit pkgconfig diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest index 5d1bc6d3f6d1..6ba9c9e06aba 100644 --- a/dev-lang/elixir/Manifest +++ b/dev-lang/elixir/Manifest @@ -1,4 +1,3 @@ -AUX elixir-1.9.0-disable-network-tests.patch 494 BLAKE2B 384ec581931a59912a1f494489310a35031ada9962d847855bc9624fa4b96090f5aede7e21076622dea1e7f5bb3a86968479e203738488de6d79659c6165443a SHA512 1a2d46d81adbc76acc726947dc2c4ed7450a4291071d1cd8c9f351ca41675179bb6d4a3a3215d93556485888c433e73bc64cb074d572e72f1b983d77b64da7ae AUX elixir-1.9.1-disable-network-tests.patch 569 BLAKE2B fda6b9b99f80e81883723280de31933c1740167d41ef4783dc663bad277cf58b8782326abc4a72e0d989c513afb9cdf4494e7d79754b18d62baf75255a74aa45 SHA512 465831a389891680412d51d9209497d5b750ff0a5ff72d45807a7dba6ec7757156ee96048bbc81f46c9c24a5b13cdd5161539fdeb4ffcea655c407e29f6675fc DIST elixir-1.4.5.tar.gz 1829098 BLAKE2B bc8e2beafe53c3af507215d913558e295370ed8d3731c8b013f5d1cd2ad1d8a4fad4b3fe1a7ee3397470916f6f6687436ecbaa06c85c47f4b52aa0331b7dad23 SHA512 3fe659a739ded54bfc7d05a96acf3061c860e44cfd7700651d138c7e21997c5703cc62d2bd3b7a258b27064bb222dfdcdc01e4d017451f522f9658a039073611 DIST elixir-1.6.6.tar.gz 2078742 BLAKE2B 4a793ac55db97c1d604d5f0012758d039f4a26eff5866a2ad2b90010f8477a8f62cc8f01a391f93133c927c5da5494b6d10b76f087a4af1206da977b0ec14a17 SHA512 62010100274b99423bb6a660e34ef53a702250a09371ef4b49ec03a3afe8761611b3734aea31763afa361560eb74c6d23e022d4d9bc4453c1bdef36bb37f9b4d diff --git a/dev-lang/elixir/files/elixir-1.9.0-disable-network-tests.patch b/dev-lang/elixir/files/elixir-1.9.0-disable-network-tests.patch deleted file mode 100644 index 9806b5608db3..000000000000 --- a/dev-lang/elixir/files/elixir-1.9.0-disable-network-tests.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/lib/mix/test/mix/tasks/release_test.exs -+++ b/lib/mix/test/mix/tasks/release_test.exs -@@ -265,6 +265,7 @@ defmodule Mix.Tasks.ReleaseTest do - end) - end - -+ @tag :skip - test "executes rpc instructions" do - in_fixture("release_test", fn -> - config = [releases: [permanent1: [include_erts: false]]] -@@ -329,6 +330,7 @@ defmodule Mix.Tasks.ReleaseTest do - end) - end - -+ @tag :skip - @tag :unix - test "runs in daemon mode" do - in_fixture("release_test", fn -> diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest index 22a9fa1dd5ba..9ec8ee46d5d2 100644 --- a/dev-lang/erlang/Manifest +++ b/dev-lang/erlang/Manifest @@ -15,6 +15,8 @@ DIST erlang-21.1.1.tar.gz 53854332 BLAKE2B 32ab508b5a305eb92eac9f49bd513374c5739 DIST erlang-22.0.2.tar.gz 54805264 BLAKE2B d30fd8a7a4ada892f4b8e14c82ab7e20f77caa78573774d0b591a1abcc26c63ae5e0a65ae5c30f0f5cc8a6e4c5e13d167929eb049cbb172fcf2899d61f5ec8dc SHA512 6dbc3705a8b9ba5c8b6694e256c226c882521d87c3af4deb9212c33fff83b510191ea547888d15ced17dd66857fb1d7ba72d9fbd54a5c63091aa86680b960436 DIST erlang-22.0.7.tar.gz 54814307 BLAKE2B 0f44c225bd4d762a529b5c154a086636a3677d0ff44df619ce4cc17eb168b5fdc0d33e1a82c85e9f3daafa1313fede22d702021323252380c76dacde91a3f204 SHA512 cf84cc20b97ed46f9ab3c7f1d77bcf6254ac3ebbb5c1e4e5202f4d5ba3d9c3bf5542567b047edaa68c204bc67ca667b1d96eb8153ac660e628c78fe271b6a8d9 DIST erlang-22.1.1.tar.gz 54951145 BLAKE2B 917813f750eacd3dc7da25f1fa9e1f9c55e6cf1b88ba4e5576caae8554bbac667c87830935c7ddd58723f61e54f3c99ae4ef08660344035dea460e92a40832cc SHA512 ee1a3bb355ffd083c3355caf60189799d322cff2a01314ba5df141ccdc4de45dbfe3967e661e3dfbcf14fc04dc1f855d7a3660f9b2daa2451a83422eda7cba39 +DIST erlang-22.1.3.tar.gz 54957002 BLAKE2B 4ae843b871dec2c365b55380484fd434eac7d97189b94568985154fb524bb99bf4240925b64cccb7ac7dfc9168e731a29db69d90278162f7dda51077ee6441fc SHA512 72e71d7a78a4881d85ebb13a4443385efbf0233f5221c6322a0a28be363f511037aa657ae021f642eafb3983192d3a23c4bf8b6bc3545aa1cc2b27285e9974c7 +DIST erlang-22.1.4.tar.gz 54957524 BLAKE2B 8960dd63eb7ae18544d8b6809760543b276ec230d5a9051d1888269770f6c44b379b6ba85ce9106f7d37b76c41b7683a545ba80569e33195e3e9211f6ced4ee3 SHA512 271a188d46a79cd1c43c3b8059b77c0802af624ff88c6916e0b84994040750d9792f0416937ed98e874256562f27d858916239d79f93b545c98b9703e5018f7b DIST erlang_doc_html_21.1.tar.gz 32692731 BLAKE2B a7fa8ebe1c876ab7eecd2dd46ffd4d288db6d308e0f131d53c26ee4b67a92cb6fcb89b6c880ef34df395c7ad61fcdc81eac32e0fcf7336be7d517263218146bc SHA512 0d659f55bfb01eecf140a310154724489ef56b6ccbe9ac30f6b053f598276721b80de7b5b3200707cf8a6e77b8854eae5453f655225f431fcc982550539f767f DIST erlang_doc_html_22.0.tar.gz 33737075 BLAKE2B f49aba36e9b84e5bc4422052e33aab5cb407dfcf2086ddb8a2370003dc63842acc79a67d9d453ee9e59d7b69416b23527e2d9f564b2d8a58d4c46bc3a93881c4 SHA512 89229a97fb5c78246ce9fa6a2d23446c6c3c2de15617911739e133b7e58714a91b1360af64bf61659d96808a816d84e4c410f8c8efe1e544930f88d73242b6e7 DIST erlang_doc_html_22.1.tar.gz 33824830 BLAKE2B 2d50802fff81eba8bcf5f630da49d68d7cb2098175012e12f13941e69949a109c9f601c3cfaa2700b669415cd0c6c15961d8e4dd94b9b228cee17b661fe5400a SHA512 cc24927a4ff98b04d8f93fbc46bb36ffb34570521e4f31154b778dc17cf1cff60869239c26c327d7a9360c06528f9b380a302b39fa47285e50dfd4656b508202 @@ -24,5 +26,7 @@ DIST erlang_doc_man_22.1.tar.gz 1355169 BLAKE2B eca02e36709587d59099dd87263b3ffc EBUILD erlang-21.1.1.ebuild 4418 BLAKE2B 051bafa85467489c96615c69d7d142423ed674004fecde732be47a53df2f7b91be0fc63a32001f4907fae2baab5ba25f49ffdc8d402ead46ce315e37772e10af SHA512 28b06323df4984d864e2746de4cc41450473a65e4e5fedebba0dc9d03252dd068dea38b1ba5afc5c05973574248a8d9fc11df0c6379d08abc8dab5c5402da4c3 EBUILD erlang-22.0.2-r2.ebuild 4130 BLAKE2B b0ca90d277fd78102862f66806af85a811f3f5ce20b252761f527a58ab6218e2f5223392678b5df9a112736936e94e14bc22ef80bdec8164f589fdd49fca4009 SHA512 4d69fae2f95d7dd139e9a0a5ee94e23b8f4a028a592c3afdbc1fcad3de03bd13bc4bba6e0c8baa9c6b6e448e125309776f60a07407abc556e23c5c184e267f8f EBUILD erlang-22.0.7.ebuild 4154 BLAKE2B e91c02eb7cbed3c9b09e2791d8e4130e4d5fe53769d7b42fb3569c58db9eda666d06bd958351c5d1c4a96552df9a5be9fa2d2ed68bbc101cf1aeb769d8726c64 SHA512 2be08de1657e5b9e767c4a41deacefef1f1170bbc47bcb759dcbb6903d908b099149f740bd5697e15d4468c6953c4934520fa4a1ae689f1c827ddca1a0a02564 -EBUILD erlang-22.1.1.ebuild 4139 BLAKE2B 3eacf6e547b2d06a999102b5926165cc544ea5862f5f2f1e303384573aee6dbc44a1f3809b4dc42c16600fb55658d94849d661f5eccd2718ed6f84f76e37587b SHA512 ee18dec2b0e3d8ee82a5fcb80d289d65cd69de50388e2a6b5d44d9e4930af9cbe87f95f56fb6bef43cc58e7db92c1793c4d30037401dc3b7a5a977c123923fa2 +EBUILD erlang-22.1.1.ebuild 4134 BLAKE2B 4d18913cb67ad7f12fd65d608b88ae0fcac6affa688a3310ed3ec0bf87fbea1abebfbba96f709affea8fb0092f65d71698ac8c7297c8ce757bdbd6c57e1c243d SHA512 85be833467043fc060f2be45dd96038ff2d33d4fa928dd786353af28a105263431039a35eedf9b3aa38dc29a56ba77213eaaa175f3a7d6288db76c9dca30048a +EBUILD erlang-22.1.3.ebuild 4139 BLAKE2B 3eacf6e547b2d06a999102b5926165cc544ea5862f5f2f1e303384573aee6dbc44a1f3809b4dc42c16600fb55658d94849d661f5eccd2718ed6f84f76e37587b SHA512 ee18dec2b0e3d8ee82a5fcb80d289d65cd69de50388e2a6b5d44d9e4930af9cbe87f95f56fb6bef43cc58e7db92c1793c4d30037401dc3b7a5a977c123923fa2 +EBUILD erlang-22.1.4.ebuild 4139 BLAKE2B 3eacf6e547b2d06a999102b5926165cc544ea5862f5f2f1e303384573aee6dbc44a1f3809b4dc42c16600fb55658d94849d661f5eccd2718ed6f84f76e37587b SHA512 ee18dec2b0e3d8ee82a5fcb80d289d65cd69de50388e2a6b5d44d9e4930af9cbe87f95f56fb6bef43cc58e7db92c1793c4d30037401dc3b7a5a977c123923fa2 MISC metadata.xml 684 BLAKE2B fff20139a02c18f3bc978ed0b3920f32fc9b54ef58c809fe504284e74fdb490a6534d90d7835159a57065cd2a0404e1468c5c925ebdc65968c61ba09926f4dbf SHA512 0e85aeb8b4e13fcdd98bb2547bf448504d9cd86399d1afc580629c7f0364595b15f96a05a4727fd7ceee615111c2e533b126548389222945f6c61190d77b215c diff --git a/dev-lang/erlang/erlang-22.1.1.ebuild b/dev-lang/erlang/erlang-22.1.1.ebuild index eff95c9be922..05e4be9a8728 100644 --- a/dev-lang/erlang/erlang-22.1.1.ebuild +++ b/dev-lang/erlang/erlang-22.1.1.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets" RDEPEND=" diff --git a/dev-lang/erlang/erlang-22.1.3.ebuild b/dev-lang/erlang/erlang-22.1.3.ebuild new file mode 100644 index 000000000000..eff95c9be922 --- /dev/null +++ b/dev-lang/erlang/erlang-22.1.3.ebuild @@ -0,0 +1,150 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +WX_GTK_VER="3.0" + +inherit elisp-common java-pkg-opt-2 systemd wxwidgets + +# NOTE: If you need symlinks for binaries please tell maintainers or +# open up a bug to let it be created. + +UPSTREAM_V="$(ver_cut 1-2)" + +DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)" +HOMEPAGE="https://www.erlang.org/" +SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz + http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz + doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" +IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets" + +RDEPEND=" + acct-group/epmd + acct-user/epmd + sys-libs/ncurses:0 + sys-libs/zlib + emacs? ( virtual/emacs ) + java? ( >=virtual/jdk-1.8:* ) + odbc? ( dev-db/unixODBC ) + sctp? ( net-misc/lksctp-tools ) + ssl? ( + !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + systemd? ( sys-apps/systemd ) + tk? ( dev-lang/tk:0 ) + wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] ) +" +DEPEND="${RDEPEND} + dev-lang/perl +" + +S="${WORKDIR}/otp-OTP-${PV}" + +PATCHES=( + "${FILESDIR}/18.2.1-wx3.0.patch" + "${FILESDIR}/${PN}-22.0-dont-ignore-LDFLAGS.patch" +) + +SITEFILE=50"${PN}"-gentoo.el + +src_prepare() { + default + + ./otp_build autoconf || die +} + +src_configure() { + use wxwidgets && setup-wxwidgets + + local myconf=( + --disable-builtin-zlib + $(use_enable hipe) + $(use_enable kpoll kernel-poll) + $(use_with java javac) + $(use_enable sctp) + $(use_with ssl ssl "${EPREFIX}"/usr) + $(use_enable ssl dynamic-ssl-lib) + $(use_enable systemd) + $(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null") + ) + econf "${myconf[@]}" +} + +src_compile() { + emake + + if use emacs ; then + pushd lib/tools/emacs &>/dev/null || die + elisp-compile *.el + popd &>/dev/null || die + fi +} + +extract_version() { + local path="$1" + local var_name="$2" + sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed" +} + +src_install() { + local erl_libdir_rel="$(get_libdir)/erlang" + local erl_libdir="/usr/${erl_libdir_rel}" + local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)" + local erl_erts_ver="$(extract_version erts VSN)" + local my_manpath="/usr/share/${PN}/man" + + [[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version" + [[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version" + + emake INSTALL_PREFIX="${D}" install + + if use doc ; then + local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* ) + docompress -x /usr/share/doc/${PF} + else + local DOCS=("README.md") + fi + + einstalldocs + + dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl + dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc + dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript + dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call + dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp + + ## Clean up the no longer needed files + rm "${ED}/${erl_libdir}/Install" || die + + insinto "${my_manpath}" + doins -r "${WORKDIR}"/man/* + # extend MANPATH, so the normal man command can find it + # see bug 189639 + newenvd - "90erlang" <<-_EOF_ + MANPATH="${my_manpath}" + _EOF_ + + if use emacs ; then + elisp-install erlang lib/tools/emacs/*.{el,elc} + sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \ + "${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die + elisp-site-file-install "${T}/${SITEFILE}" + fi + + newinitd "${FILESDIR}"/epmd.init-r2 epmd + newconfd "${FILESDIR}"/epmd.confd-r1 epmd + use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-lang/erlang/erlang-22.1.4.ebuild b/dev-lang/erlang/erlang-22.1.4.ebuild new file mode 100644 index 000000000000..eff95c9be922 --- /dev/null +++ b/dev-lang/erlang/erlang-22.1.4.ebuild @@ -0,0 +1,150 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +WX_GTK_VER="3.0" + +inherit elisp-common java-pkg-opt-2 systemd wxwidgets + +# NOTE: If you need symlinks for binaries please tell maintainers or +# open up a bug to let it be created. + +UPSTREAM_V="$(ver_cut 1-2)" + +DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)" +HOMEPAGE="https://www.erlang.org/" +SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz + http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz + doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" +IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets" + +RDEPEND=" + acct-group/epmd + acct-user/epmd + sys-libs/ncurses:0 + sys-libs/zlib + emacs? ( virtual/emacs ) + java? ( >=virtual/jdk-1.8:* ) + odbc? ( dev-db/unixODBC ) + sctp? ( net-misc/lksctp-tools ) + ssl? ( + !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + systemd? ( sys-apps/systemd ) + tk? ( dev-lang/tk:0 ) + wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] ) +" +DEPEND="${RDEPEND} + dev-lang/perl +" + +S="${WORKDIR}/otp-OTP-${PV}" + +PATCHES=( + "${FILESDIR}/18.2.1-wx3.0.patch" + "${FILESDIR}/${PN}-22.0-dont-ignore-LDFLAGS.patch" +) + +SITEFILE=50"${PN}"-gentoo.el + +src_prepare() { + default + + ./otp_build autoconf || die +} + +src_configure() { + use wxwidgets && setup-wxwidgets + + local myconf=( + --disable-builtin-zlib + $(use_enable hipe) + $(use_enable kpoll kernel-poll) + $(use_with java javac) + $(use_enable sctp) + $(use_with ssl ssl "${EPREFIX}"/usr) + $(use_enable ssl dynamic-ssl-lib) + $(use_enable systemd) + $(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null") + ) + econf "${myconf[@]}" +} + +src_compile() { + emake + + if use emacs ; then + pushd lib/tools/emacs &>/dev/null || die + elisp-compile *.el + popd &>/dev/null || die + fi +} + +extract_version() { + local path="$1" + local var_name="$2" + sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed" +} + +src_install() { + local erl_libdir_rel="$(get_libdir)/erlang" + local erl_libdir="/usr/${erl_libdir_rel}" + local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)" + local erl_erts_ver="$(extract_version erts VSN)" + local my_manpath="/usr/share/${PN}/man" + + [[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version" + [[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version" + + emake INSTALL_PREFIX="${D}" install + + if use doc ; then + local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* ) + docompress -x /usr/share/doc/${PF} + else + local DOCS=("README.md") + fi + + einstalldocs + + dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl + dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc + dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript + dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call + dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp + + ## Clean up the no longer needed files + rm "${ED}/${erl_libdir}/Install" || die + + insinto "${my_manpath}" + doins -r "${WORKDIR}"/man/* + # extend MANPATH, so the normal man command can find it + # see bug 189639 + newenvd - "90erlang" <<-_EOF_ + MANPATH="${my_manpath}" + _EOF_ + + if use emacs ; then + elisp-install erlang lib/tools/emacs/*.{el,elc} + sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \ + "${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die + elisp-site-file-install "${T}/${SITEFILE}" + fi + + newinitd "${FILESDIR}"/epmd.init-r2 epmd + newconfd "${FILESDIR}"/epmd.confd-r1 epmd + use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest index a83c15d154ac..843d34c9f23c 100644 --- a/dev-lang/go/Manifest +++ b/dev-lang/go/Manifest @@ -10,12 +10,24 @@ DIST go-linux-ppc64le-bootstrap-1.8.tbz 52211575 BLAKE2B 7a28ec5a381369c4e9415c8 DIST go-linux-s390x-bootstrap-1.8.tbz 57124869 BLAKE2B 920a176b8f4fc3a816e724324bbb30a383d599e31a0d2093d24797dbcd0e799a662a3589dbb87d2f5dd16df07c4cf8f1e444e87b540ec732746bb025dc9271f8 SHA512 d429cae870d66217ab2e07c74209d3031d97baa4f899b4d70ae6283a1a5b1434b037904c4cfca0b2bc798d5ba0b358c3739e000eccbc74809baf564c5686df5a DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 BLAKE2B 0a45312f090d81ebf46fe5950cb65c059e2801394231e715e94145d1f918eb59b10472b2385e57ebd5cfb9eca0ad7290fb118436486b665520bb540970f971ab SHA512 52b849e5b9a940e10de7ba3df0ebdf6e1c5d631de9581d936c9edf8f38e6bb3314acbc2b2d5202b0528fde2a359d52bc0c6f39acf9b1b614725e4b4a947ed10d DIST go1.12.10.src.tar.gz 21980044 BLAKE2B 95ebf0a6f04d055e5e9d6f8e2a13835aaf33c4f7113772f7a70af218f4e929a047fc12b0ef9e93a9156877f61361219da16bb2830799247b8200a7648c562abc SHA512 9d40cf8d71daffe43f5872597b316cd1150ae640d852ff0f0be3126cc7bb40b9a0290bb02d7fabdf808f40ab3f67a56d2eaeba3b32299fa9b0a3df03899f6ac2 +DIST go1.12.11.src.tar.gz 21979795 BLAKE2B 421cda167948f1818b95395630d1a0dbfb29b996ffee31992199ce3acd54b5399bf28c5f3490e049bd57ad802aa276aff569c706b7b166198a7e217885eaec4f SHA512 ece666235394a56bc82918166cf14805164397f9609dff89abd5137fca8a0e20e0b48097f49b6aba17bed24f2fadbc685984d687c0cd67e88df31c394f791444 +DIST go1.12.12.src.tar.gz 21980254 BLAKE2B b5d241d584339c999f5fffad427b70c04e431220fd68272f45deef3cf27b4d8039f9161ab64fd7338056978ff3e5e42bbb49aa1cf71e6a8a3aaf7700d5c02e8a SHA512 f173adbe1ad1c5c422a3374aa15d49881059b67cdca61b56ddc477a1b178cf418853aff78c3acec46194e60726805e53d8ac8466780343eb205a2a7285960995 +DIST go1.12.13.src.tar.gz 21980338 BLAKE2B 205bee35a947ccd08f36547530e3de7928f5f3970be89580ddff80f7710dd1dcf4f292c10ec93c27717ce25ce2575f7151129430b80d1fb927872f891166d8db SHA512 a8210ba909c1bb26799625bbf648204dbef5a9f91af323277f76caee489f5912a08e9de686b71fe97d30c7dc171d5f4bcf8a2c2227d02353cfbb7d292c9efc22 DIST go1.12.9.src.tar.gz 21979950 BLAKE2B dca7e3afcabd513c4b8193e93c0a1ed1a2326dccfce9b909d97b3731fffbe7e26712ab164645e06a316baa949b1e0b14a2fea8d23e6f90fd5b72afa0d15b432b SHA512 57041e7fb767f528aa9fc2592d205d3a7c120c73f92dc8d91f17f816e12aa6152c8421b333081800a5f50b1bb656f203a25faf8ed92c69a6ec164ce0a5619c13 DIST go1.13.1.src.tar.gz 21622361 BLAKE2B 08a836d3bd57befed8cd07c4d6faaf9d926629b06e5fe97d1fe364df8b2368310b31b04019fbd0803caf7f52c8927122ba1638c3c26b6fb38c9236ff96eb06d7 SHA512 696fc735271bd76ae59c5015c8efa52121243257f4ffcc1460fd79cf9a5e167db0b30d04137ec71a8789742673c2288bd62d55b546c2d2b2a05e8b3669af8616 +DIST go1.13.2.src.tar.gz 21622878 BLAKE2B b65a495f94bbc1711734a8e171097abea28bfba138fc0ac09998b1fbb2c61e58feea94a3ce79dc2b9f4685df5a5e8fc1d93ea2ecdcb1134149d181d554ec1dc8 SHA512 2741ccbb13abf69cbb575145c65fc9f3c422692009d6bf6e991f6d6e3ddfed94374b242deb5fffbe4a22f64c3734cc7dba0b1438c24ae295eecef2b515504892 +DIST go1.13.3.src.tar.gz 21618379 BLAKE2B 1f45d84b373fb886e7cb4764bb82a003bfd3b8f8aa6bb52a91d8859056341b25e908861a23094ee4034fb7ea2e92ada3bd0985b724ef06a64e823dd5fba8851b SHA512 0999876f995a3d9189640ce15b496ab72a6273649d27acdc190c1d50b88ab8b7facaabfc832334911d178f0b9a645ea4169716ed5c593a7540b075e6901d51f2 +DIST go1.13.4.src.tar.gz 21619153 BLAKE2B 2efc86fd0830b9c8935c856244baaec1e63232dd08b696544da900927ba56fd686b5899ec1640fbcbb21c8c5ac9581cfde3fcb5c06ccfabd0fd2f181b398da46 SHA512 e8155cdceca2ebefd386feef98223bbdc92d9316f7188d4ba701cf43a723b75a9bf67a1eb92ac80987b7a113a2fb6981ef235292bec7dd3964805b7c33abdbb1 DIST go1.13.src.tar.gz 21621948 BLAKE2B dff6024287c0805ec735cb40aef4ffd872bdc17df6e0d531be3d16806292edde2a63299fe7b9b3c97a79f6f864ab0f95962a0cd2e1a0ba0216b3f4bc59bf4bcf SHA512 c6346b1ab256cb743dd98625d8b16cdcc1365b186e039e99747d6c18041045daa065f6bdce17cca0a9800be2dbb34e90adf5518d5295693f80435c02fe5b2cd8 EBUILD go-1.12.10.ebuild 6440 BLAKE2B d18087c473db165632af20bb3787e6feadf24fde6854d4f493ab110ddf67fa3fa285ac676ffde752ddc8cfe0fd2c012acd310b958633ab894a513f44b134854f SHA512 6949c83e29ffb41bac9317b8ffa2d2ae3b990327db2716ed6285cc0053f54935f8e377bf9f45e63cd7d5f2f980d67941ea781f6ed7e65917b9ce0e109021116f +EBUILD go-1.12.11.ebuild 6440 BLAKE2B d18087c473db165632af20bb3787e6feadf24fde6854d4f493ab110ddf67fa3fa285ac676ffde752ddc8cfe0fd2c012acd310b958633ab894a513f44b134854f SHA512 6949c83e29ffb41bac9317b8ffa2d2ae3b990327db2716ed6285cc0053f54935f8e377bf9f45e63cd7d5f2f980d67941ea781f6ed7e65917b9ce0e109021116f +EBUILD go-1.12.12.ebuild 6440 BLAKE2B d18087c473db165632af20bb3787e6feadf24fde6854d4f493ab110ddf67fa3fa285ac676ffde752ddc8cfe0fd2c012acd310b958633ab894a513f44b134854f SHA512 6949c83e29ffb41bac9317b8ffa2d2ae3b990327db2716ed6285cc0053f54935f8e377bf9f45e63cd7d5f2f980d67941ea781f6ed7e65917b9ce0e109021116f +EBUILD go-1.12.13.ebuild 6440 BLAKE2B d18087c473db165632af20bb3787e6feadf24fde6854d4f493ab110ddf67fa3fa285ac676ffde752ddc8cfe0fd2c012acd310b958633ab894a513f44b134854f SHA512 6949c83e29ffb41bac9317b8ffa2d2ae3b990327db2716ed6285cc0053f54935f8e377bf9f45e63cd7d5f2f980d67941ea781f6ed7e65917b9ce0e109021116f EBUILD go-1.12.9.ebuild 6436 BLAKE2B 6f52ccf741bd999cca536d599abe82ba955d0563fde091fd4f2244355ac6c12669750c595b0fbb6b8e50afd35f8101fcabc99b28826be77f626a4df0a76b9528 SHA512 5ee9fd4957f0302ecd931ee87b3b6dc30ba4e010bf5c1e33e94a70197af90f3d6d6c198336205d7a13eb6dee39b103d823483ee28281619adefea0ed38c91025 EBUILD go-1.13.1.ebuild 6440 BLAKE2B d18087c473db165632af20bb3787e6feadf24fde6854d4f493ab110ddf67fa3fa285ac676ffde752ddc8cfe0fd2c012acd310b958633ab894a513f44b134854f SHA512 6949c83e29ffb41bac9317b8ffa2d2ae3b990327db2716ed6285cc0053f54935f8e377bf9f45e63cd7d5f2f980d67941ea781f6ed7e65917b9ce0e109021116f +EBUILD go-1.13.2.ebuild 6440 BLAKE2B d18087c473db165632af20bb3787e6feadf24fde6854d4f493ab110ddf67fa3fa285ac676ffde752ddc8cfe0fd2c012acd310b958633ab894a513f44b134854f SHA512 6949c83e29ffb41bac9317b8ffa2d2ae3b990327db2716ed6285cc0053f54935f8e377bf9f45e63cd7d5f2f980d67941ea781f6ed7e65917b9ce0e109021116f +EBUILD go-1.13.3.ebuild 6440 BLAKE2B d18087c473db165632af20bb3787e6feadf24fde6854d4f493ab110ddf67fa3fa285ac676ffde752ddc8cfe0fd2c012acd310b958633ab894a513f44b134854f SHA512 6949c83e29ffb41bac9317b8ffa2d2ae3b990327db2716ed6285cc0053f54935f8e377bf9f45e63cd7d5f2f980d67941ea781f6ed7e65917b9ce0e109021116f +EBUILD go-1.13.4.ebuild 6440 BLAKE2B d18087c473db165632af20bb3787e6feadf24fde6854d4f493ab110ddf67fa3fa285ac676ffde752ddc8cfe0fd2c012acd310b958633ab894a513f44b134854f SHA512 6949c83e29ffb41bac9317b8ffa2d2ae3b990327db2716ed6285cc0053f54935f8e377bf9f45e63cd7d5f2f980d67941ea781f6ed7e65917b9ce0e109021116f EBUILD go-1.13.ebuild 6440 BLAKE2B d18087c473db165632af20bb3787e6feadf24fde6854d4f493ab110ddf67fa3fa285ac676ffde752ddc8cfe0fd2c012acd310b958633ab894a513f44b134854f SHA512 6949c83e29ffb41bac9317b8ffa2d2ae3b990327db2716ed6285cc0053f54935f8e377bf9f45e63cd7d5f2f980d67941ea781f6ed7e65917b9ce0e109021116f EBUILD go-9999.ebuild 6440 BLAKE2B d18087c473db165632af20bb3787e6feadf24fde6854d4f493ab110ddf67fa3fa285ac676ffde752ddc8cfe0fd2c012acd310b958633ab894a513f44b134854f SHA512 6949c83e29ffb41bac9317b8ffa2d2ae3b990327db2716ed6285cc0053f54935f8e377bf9f45e63cd7d5f2f980d67941ea781f6ed7e65917b9ce0e109021116f MISC metadata.xml 663 BLAKE2B fc92966e1b4a155b4d442842988d0404c0148b029d187ab7294d49dabad771296d63ca3184128ac27cea4e74e7d6cfc8852084ca8f1d15a1d0755586a0bf68de SHA512 f67b7e312cfb2a896552ae73e835d53ffbb0a7c71c30f0a7cb44c65e2753055e185e7a5c48e2cfff33a42609629cc3c32ee56a9d8f61d8429798c1e8424e36bf diff --git a/dev-lang/go/go-1.12.11.ebuild b/dev-lang/go/go-1.12.11.ebuild new file mode 100644 index 000000000000..5e3547cfeada --- /dev/null +++ b/dev-lang/go/go-1.12.11.ebuild @@ -0,0 +1,246 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} + +MY_PV=${PV/_/} + +inherit toolchain-funcs + +BOOTSTRAP_VERSION="bootstrap-1.8" +BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist" +BOOTSTRAP_URI=" + ${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz + ${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-linux ~x86-linux ~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 + +# If gccgo or a previously installed version of dev-lang/go is not being +# used to build Go, there is no way to know the architecture or operating system +# of the build machine, so we need to download all of our bootstrap +# archives to allow this ebuild to work under crossdev. +# +# https://bugs.gentoo.org/671394 +SRC_URI+="!gccgo? ( !system-bootstrap? ( ${BOOTSTRAP_URI} ) )" + +DESCRIPTION="A concurrent garbage collected and typesafe programming language" +HOMEPAGE="https://golang.org" + +LICENSE="BSD" +SLOT="0/${PV}" +IUSE="gccgo system-bootstrap" + +BDEPEND="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/*.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 + [[ ${MERGE_TYPE} != binary ]] && + use system-bootstrap && ! has_version "dev-lang/go" && + die "dev-lang/go must be installed to use the system-bootstrap use flag" +} + +src_unpack() +{ + if [[ ${PV} = 9999 ]]; then + git-r3_src_unpack + else + unpack "go${MY_PV}.src.tar.gz" + fi + use gccgo || use system-bootstrap || + unpack "go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-${BOOTSTRAP_VERSION}.tbz" +} + +src_compile() +{ + export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-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 + elif use system-bootstrap; then + export GOROOT_BOOTSTRAP="${EPREFIX}"/usr/lib/go + 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 + + 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 + + if [[ ${CHOST} == *-darwin* ]] ; then + # fix install_name for test object (binutils_test) on Darwin, it + # is never used in real circumstances + local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/ + libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64 + install_name_tool -id "${libmac64}" "${D}${libmac64}" + fi +} diff --git a/dev-lang/go/go-1.12.12.ebuild b/dev-lang/go/go-1.12.12.ebuild new file mode 100644 index 000000000000..5e3547cfeada --- /dev/null +++ b/dev-lang/go/go-1.12.12.ebuild @@ -0,0 +1,246 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} + +MY_PV=${PV/_/} + +inherit toolchain-funcs + +BOOTSTRAP_VERSION="bootstrap-1.8" +BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist" +BOOTSTRAP_URI=" + ${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz + ${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-linux ~x86-linux ~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 + +# If gccgo or a previously installed version of dev-lang/go is not being +# used to build Go, there is no way to know the architecture or operating system +# of the build machine, so we need to download all of our bootstrap +# archives to allow this ebuild to work under crossdev. +# +# https://bugs.gentoo.org/671394 +SRC_URI+="!gccgo? ( !system-bootstrap? ( ${BOOTSTRAP_URI} ) )" + +DESCRIPTION="A concurrent garbage collected and typesafe programming language" +HOMEPAGE="https://golang.org" + +LICENSE="BSD" +SLOT="0/${PV}" +IUSE="gccgo system-bootstrap" + +BDEPEND="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/*.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 + [[ ${MERGE_TYPE} != binary ]] && + use system-bootstrap && ! has_version "dev-lang/go" && + die "dev-lang/go must be installed to use the system-bootstrap use flag" +} + +src_unpack() +{ + if [[ ${PV} = 9999 ]]; then + git-r3_src_unpack + else + unpack "go${MY_PV}.src.tar.gz" + fi + use gccgo || use system-bootstrap || + unpack "go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-${BOOTSTRAP_VERSION}.tbz" +} + +src_compile() +{ + export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-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 + elif use system-bootstrap; then + export GOROOT_BOOTSTRAP="${EPREFIX}"/usr/lib/go + 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 + + 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 + + if [[ ${CHOST} == *-darwin* ]] ; then + # fix install_name for test object (binutils_test) on Darwin, it + # is never used in real circumstances + local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/ + libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64 + install_name_tool -id "${libmac64}" "${D}${libmac64}" + fi +} diff --git a/dev-lang/go/go-1.12.13.ebuild b/dev-lang/go/go-1.12.13.ebuild new file mode 100644 index 000000000000..5e3547cfeada --- /dev/null +++ b/dev-lang/go/go-1.12.13.ebuild @@ -0,0 +1,246 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} + +MY_PV=${PV/_/} + +inherit toolchain-funcs + +BOOTSTRAP_VERSION="bootstrap-1.8" +BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist" +BOOTSTRAP_URI=" + ${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz + ${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-linux ~x86-linux ~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 + +# If gccgo or a previously installed version of dev-lang/go is not being +# used to build Go, there is no way to know the architecture or operating system +# of the build machine, so we need to download all of our bootstrap +# archives to allow this ebuild to work under crossdev. +# +# https://bugs.gentoo.org/671394 +SRC_URI+="!gccgo? ( !system-bootstrap? ( ${BOOTSTRAP_URI} ) )" + +DESCRIPTION="A concurrent garbage collected and typesafe programming language" +HOMEPAGE="https://golang.org" + +LICENSE="BSD" +SLOT="0/${PV}" +IUSE="gccgo system-bootstrap" + +BDEPEND="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/*.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 + [[ ${MERGE_TYPE} != binary ]] && + use system-bootstrap && ! has_version "dev-lang/go" && + die "dev-lang/go must be installed to use the system-bootstrap use flag" +} + +src_unpack() +{ + if [[ ${PV} = 9999 ]]; then + git-r3_src_unpack + else + unpack "go${MY_PV}.src.tar.gz" + fi + use gccgo || use system-bootstrap || + unpack "go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-${BOOTSTRAP_VERSION}.tbz" +} + +src_compile() +{ + export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-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 + elif use system-bootstrap; then + export GOROOT_BOOTSTRAP="${EPREFIX}"/usr/lib/go + 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 + + 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 + + if [[ ${CHOST} == *-darwin* ]] ; then + # fix install_name for test object (binutils_test) on Darwin, it + # is never used in real circumstances + local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/ + libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64 + install_name_tool -id "${libmac64}" "${D}${libmac64}" + fi +} diff --git a/dev-lang/go/go-1.13.2.ebuild b/dev-lang/go/go-1.13.2.ebuild new file mode 100644 index 000000000000..5e3547cfeada --- /dev/null +++ b/dev-lang/go/go-1.13.2.ebuild @@ -0,0 +1,246 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} + +MY_PV=${PV/_/} + +inherit toolchain-funcs + +BOOTSTRAP_VERSION="bootstrap-1.8" +BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist" +BOOTSTRAP_URI=" + ${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz + ${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-linux ~x86-linux ~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 + +# If gccgo or a previously installed version of dev-lang/go is not being +# used to build Go, there is no way to know the architecture or operating system +# of the build machine, so we need to download all of our bootstrap +# archives to allow this ebuild to work under crossdev. +# +# https://bugs.gentoo.org/671394 +SRC_URI+="!gccgo? ( !system-bootstrap? ( ${BOOTSTRAP_URI} ) )" + +DESCRIPTION="A concurrent garbage collected and typesafe programming language" +HOMEPAGE="https://golang.org" + +LICENSE="BSD" +SLOT="0/${PV}" +IUSE="gccgo system-bootstrap" + +BDEPEND="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/*.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 + [[ ${MERGE_TYPE} != binary ]] && + use system-bootstrap && ! has_version "dev-lang/go" && + die "dev-lang/go must be installed to use the system-bootstrap use flag" +} + +src_unpack() +{ + if [[ ${PV} = 9999 ]]; then + git-r3_src_unpack + else + unpack "go${MY_PV}.src.tar.gz" + fi + use gccgo || use system-bootstrap || + unpack "go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-${BOOTSTRAP_VERSION}.tbz" +} + +src_compile() +{ + export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-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 + elif use system-bootstrap; then + export GOROOT_BOOTSTRAP="${EPREFIX}"/usr/lib/go + 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 + + 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 + + if [[ ${CHOST} == *-darwin* ]] ; then + # fix install_name for test object (binutils_test) on Darwin, it + # is never used in real circumstances + local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/ + libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64 + install_name_tool -id "${libmac64}" "${D}${libmac64}" + fi +} diff --git a/dev-lang/go/go-1.13.3.ebuild b/dev-lang/go/go-1.13.3.ebuild new file mode 100644 index 000000000000..5e3547cfeada --- /dev/null +++ b/dev-lang/go/go-1.13.3.ebuild @@ -0,0 +1,246 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} + +MY_PV=${PV/_/} + +inherit toolchain-funcs + +BOOTSTRAP_VERSION="bootstrap-1.8" +BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist" +BOOTSTRAP_URI=" + ${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz + ${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-linux ~x86-linux ~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 + +# If gccgo or a previously installed version of dev-lang/go is not being +# used to build Go, there is no way to know the architecture or operating system +# of the build machine, so we need to download all of our bootstrap +# archives to allow this ebuild to work under crossdev. +# +# https://bugs.gentoo.org/671394 +SRC_URI+="!gccgo? ( !system-bootstrap? ( ${BOOTSTRAP_URI} ) )" + +DESCRIPTION="A concurrent garbage collected and typesafe programming language" +HOMEPAGE="https://golang.org" + +LICENSE="BSD" +SLOT="0/${PV}" +IUSE="gccgo system-bootstrap" + +BDEPEND="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/*.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 + [[ ${MERGE_TYPE} != binary ]] && + use system-bootstrap && ! has_version "dev-lang/go" && + die "dev-lang/go must be installed to use the system-bootstrap use flag" +} + +src_unpack() +{ + if [[ ${PV} = 9999 ]]; then + git-r3_src_unpack + else + unpack "go${MY_PV}.src.tar.gz" + fi + use gccgo || use system-bootstrap || + unpack "go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-${BOOTSTRAP_VERSION}.tbz" +} + +src_compile() +{ + export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-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 + elif use system-bootstrap; then + export GOROOT_BOOTSTRAP="${EPREFIX}"/usr/lib/go + 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 + + 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 + + if [[ ${CHOST} == *-darwin* ]] ; then + # fix install_name for test object (binutils_test) on Darwin, it + # is never used in real circumstances + local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/ + libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64 + install_name_tool -id "${libmac64}" "${D}${libmac64}" + fi +} diff --git a/dev-lang/go/go-1.13.4.ebuild b/dev-lang/go/go-1.13.4.ebuild new file mode 100644 index 000000000000..5e3547cfeada --- /dev/null +++ b/dev-lang/go/go-1.13.4.ebuild @@ -0,0 +1,246 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} + +MY_PV=${PV/_/} + +inherit toolchain-funcs + +BOOTSTRAP_VERSION="bootstrap-1.8" +BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist" +BOOTSTRAP_URI=" + ${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz + ${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-linux ~x86-linux ~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 + +# If gccgo or a previously installed version of dev-lang/go is not being +# used to build Go, there is no way to know the architecture or operating system +# of the build machine, so we need to download all of our bootstrap +# archives to allow this ebuild to work under crossdev. +# +# https://bugs.gentoo.org/671394 +SRC_URI+="!gccgo? ( !system-bootstrap? ( ${BOOTSTRAP_URI} ) )" + +DESCRIPTION="A concurrent garbage collected and typesafe programming language" +HOMEPAGE="https://golang.org" + +LICENSE="BSD" +SLOT="0/${PV}" +IUSE="gccgo system-bootstrap" + +BDEPEND="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/*.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 + [[ ${MERGE_TYPE} != binary ]] && + use system-bootstrap && ! has_version "dev-lang/go" && + die "dev-lang/go must be installed to use the system-bootstrap use flag" +} + +src_unpack() +{ + if [[ ${PV} = 9999 ]]; then + git-r3_src_unpack + else + unpack "go${MY_PV}.src.tar.gz" + fi + use gccgo || use system-bootstrap || + unpack "go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-${BOOTSTRAP_VERSION}.tbz" +} + +src_compile() +{ + export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-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 + elif use system-bootstrap; then + export GOROOT_BOOTSTRAP="${EPREFIX}"/usr/lib/go + 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 + + 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 + + if [[ ${CHOST} == *-darwin* ]] ; then + # fix install_name for test object (binutils_test) on Darwin, it + # is never used in real circumstances + local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/ + libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64 + install_name_tool -id "${libmac64}" "${D}${libmac64}" + fi +} diff --git a/dev-lang/hy/Manifest b/dev-lang/hy/Manifest index 9572a70c7c2c..f659e2e385c8 100644 --- a/dev-lang/hy/Manifest +++ b/dev-lang/hy/Manifest @@ -9,6 +9,7 @@ DIST hy-0.13.1.tar.gz 383213 BLAKE2B e002218811cadf8db558284e7124114891c76df334a DIST hy-0.14.0.tar.gz 403692 BLAKE2B 4d20574151c443e002e365bceecc11b2bdcd7aa294073c58cba4ec8a958534c9f1256848ef57e4d5dd3ec345decaa53db43768a78af542ba8a59ff50489486b1 SHA512 a04da48592058b8ad3e7d2a787149622bfcf61c01a341ccc166c2e25e18ed7616b6567b529cf4f6d80a9cecf44aac175577ebf185c77e941a11a258f8563da9e DIST hy-0.15.0.tar.gz 411900 BLAKE2B 88a7500ecebacd7995aba1efbabead22ce656b1d6e275c5c726ce9b27746729344adfd35f2dfb4247c6d41101317eecfd98e0379e84f88ffea85bfaef2101797 SHA512 d4a08c7df494c5f9ae9a48e51b642cf8c30850209765fb80304132b57fb1133a839c82945662550d1417f4cae4e15f25da388be180143ed7b28fe8d5129844cc DIST hy-0.16.0.tar.gz 434727 BLAKE2B 05c490049355b496901aea70449e9c30a414bcdd7a5d4a430a672d424eeaa20845d58fd6967433058d4ab6b2969d5744bfdf5dd9cfe976888aeeb35d36a98f91 SHA512 ee9555a58a52bd894904fb0c4892a5c3f0a02b5ab45107ce6ed028840251cc8bd0b1c6264f0f1a345a63352c662861cf3b94049fd58f374dd2ca706ee89c2a4c +DIST hy-0.17.0.tar.gz 438729 BLAKE2B f699198a3181592dc0a1c12ecb85defce5ee592eb3c949635f37af36f39f452b081b18b46a122d515a7246d448c1710eedd8015a14f18dc074c61f0cfccecf8f SHA512 18601bf47df2120f8833a1ae211c416dc90825f31cd50b259adfe0585089a623d0fea13512b2935b093e14d8595c93bc1610939d5f1d664f6acf7ddf7e341542 EBUILD hy-0.10.0.ebuild 807 BLAKE2B 03d4a01ecf3f0446e80ea3e2e925540a9544a5539f558246f6701b2e9fb536b843e9415d4ec525b6d2f2cbc9b619185c930f79d67910d6247a75cb6cf080f2ae SHA512 19341e28a59212b19ac3713773b2f0111b85302b581a0068dbcc433500935f9d8f7289011e4e03211c8fd7ca047aff210236b01be3877f0a4a9c08143b48bc9f EBUILD hy-0.10.1.ebuild 804 BLAKE2B 218819a7413a8c2651d9142efcefc0a292d491e9012612ffda5968ad4a0ba1a22cf7e7fa5101cd24963872972213c996eed027c80273deae0f424e089a5ddecf SHA512 19e604e22dc2b9cc09bbb2c069eb5ee398741e897c6c8343c9d33f8ea77085de8772a278179692db8280ae0039e613b328a8ace37885b199468b3e2bb8e7cbe0 EBUILD hy-0.11.1.ebuild 1067 BLAKE2B 5ffd62ab6ef562192d94c5d8861136adbcbb1c0ac78191f223356fe3786402ae7a119e9708cdbf6a8b9ce960dbdfbf47297348256eef9db44767fbad410981d3 SHA512 297cdeaf66f4f5fc74f0a7bc89f942f93596a74020f253be45dbef5f0462a84d01db858741c5e6d130991a6ec22da233ee905a348f2af5ee099f50f33f6bcdfa @@ -18,5 +19,6 @@ EBUILD hy-0.13.0.ebuild 1029 BLAKE2B 5666e2a28f9f05ab5e96a2760b058bf846e93714212 EBUILD hy-0.13.1.ebuild 1029 BLAKE2B 5666e2a28f9f05ab5e96a2760b058bf846e93714212c59ce31db731ec3a336c8b4313f6fde76aaaa16f779c371c4358a9362fe8cbe46e802546802b282853e05 SHA512 c868bfaed08e27c0489c47b4c9e7a0be5bb9ac98e938cf53b10d0833df9be3a2db371b81c3fef8ed12de7f842641cff30b782b4c755d8642bfe81715db32358e EBUILD hy-0.14.0.ebuild 960 BLAKE2B 81199e92f145174a2b570997e78e82509a56369b81d3538c52d34e4fce561f77df5975ad7f85e2c6c7757866bbcd8173d0e1084a5e37bc9e39146b028ff9548b SHA512 849b75ee4a9a9e25a9c0578af6afac75d79689275c6a6fbc04691c0a581847d19be336f8f11c6f18fcdea01673c087affba9c5dcf1f0d7db3837a7a06f4df905 EBUILD hy-0.15.0.ebuild 1106 BLAKE2B 3612f3d31e1e24e88f02c809cdf6f2696dccfc7446c2d8ac858c9c4494747a28994ab18ca1f0d20c1c01570eed80779c2164cac3b9ea2ee44c6e65853f75c486 SHA512 cc99dd55a60a38e8241f3116e0725a7a0fc9871061f60780e54e679f7d492c93529b0535ca7c95ae4d668dea605622dbeac00522e9005ea389c0b5ab4277a493 -EBUILD hy-0.16.0.ebuild 1106 BLAKE2B afce19e32ec334fdde1dafd9b6ba17ea5a561533a485ebba1512c8224cc5c675367c4fe7427cbceb14cb5400d1bb0241ac7e44b56966598f46015248f44953c5 SHA512 9e8817475f11d15a2e5548726779e6aeb73aadc0d02691f3d39915e9cbb7e797e6ed6991a9a05cf813e30e19d267c4047aac69435de3679103c2b32495a58cef +EBUILD hy-0.16.0.ebuild 1110 BLAKE2B 4ee0e0be2556944d7c7b6ec6e90e20286ee736e7715843b6c8acacdc3ab38b365c6882a92b221d15de3565a645497504895b471760f4ca7f22d42e58e7a9efb6 SHA512 c3fa8620df575c698b0226c2e289ed2fdb5e9e53879e380d7feef0753c19ef0cbd78e4629111a203f39d2230a4671b192e92263f3ab284bc2875984437bbab95 +EBUILD hy-0.17.0.ebuild 1108 BLAKE2B de2c24e40045af259f3e64cdb8d209e9d50dcdce9a0b30bd7f4951f0f4b6f7e829c6340dd3711c98e1028ec71e65ba9dea363a6393f3b7fa915ab2e89438ade2 SHA512 885f703789860edc4d44ec9cdf54db0083ede4389cf2f50038e2e78d6f1ff9f54a76a27bfc530568d193bff9d95e7b4f97d7278244802dfc546bac0661b7899a MISC metadata.xml 331 BLAKE2B 1377771edc92d3cd1ea685b43816a4ffd6c84d06245f00414df594d9d1aee498ca2a5ede2d92c2f0607fd26127730a8f7e1e6eadf6fd916325967b282e32f092 SHA512 97afa7992933d5088e939afd4005e188fd2979ccf7fc21561561b14e1eecfee61e867288c21b4a396fc5ca4926fd3d62c9d8c5be217b9392a5208371fa3aa719 diff --git a/dev-lang/hy/hy-0.16.0.ebuild b/dev-lang/hy/hy-0.16.0.ebuild index 348c322dc9a5..4c1b092914ee 100644 --- a/dev-lang/hy/hy-0.16.0.ebuild +++ b/dev-lang/hy/hy-0.16.0.ebuild @@ -4,7 +4,7 @@ EAPI="7" RESTRICT="test" # needs some pointy sticks. Seriously. -PYTHON_COMPAT=(python{2_7,3_5,3_6}) +PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7}) inherit distutils-r1 eutils DESCRIPTION="A LISP dialect running in python" diff --git a/dev-lang/hy/hy-0.17.0.ebuild b/dev-lang/hy/hy-0.17.0.ebuild new file mode 100644 index 000000000000..53cd1fd34d5c --- /dev/null +++ b/dev-lang/hy/hy-0.17.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +RESTRICT="test" # needs some pointy sticks. Seriously. +PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7}) + +inherit distutils-r1 eutils +DESCRIPTION="A LISP dialect running in python" +HOMEPAGE="http://hylang.org/" +SRC_URI="https://github.com/hylang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="MIT" +SLOT="0" + +KEYWORDS="~amd64 ~x86" +IUSE="test doc" + +RDEPEND=">=dev-python/astor-0.7.1[${PYTHON_USEDEP}] + >=dev-python/clint-0.4[${PYTHON_USEDEP}] + dev-python/flake8[${PYTHON_USEDEP}] + >=dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}] + >=dev-python/rply-0.7.6[${PYTHON_USEDEP}] + " +DEPEND="${RDEPEND} + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + test? ( + dev-python/nose[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + )" + +PATCHES=( "${FILESDIR}"/${PN}-0.15.0-do-not-install-get_version.py.patch ) + +src_prepare() { + default + use doc && HTML_DOCS=( docs/_build/html/. ) +} + +python_compile_all() { + use doc && emake docs +} + +python_test() { + nosetests -vv || die "Tests failed under ${EPYTHON}" +} diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest index 509c59480d98..ce590f05b8e9 100644 --- a/dev-lang/nim/Manifest +++ b/dev-lang/nim/Manifest @@ -1,8 +1,8 @@ AUX nim-0.20.0-paths.patch 934 BLAKE2B 6a4e44c5656cde6d5127bf6a6b8db92cdf8aada0892c27d536d0c1030ed7da8dc97138a8941030101918021f2a301fa683169c8a656fefc6fb7d0fcdb24029d4 SHA512 bf8dbc3e3861ec3ea2718092b981e495194ead5b547e69d01d5d842d128dc4b96b0ba3e95c78afd8fd822d594199315a01de370851ed8f594c091231b9a10ee9 -DIST nim-0.20.0.tar.xz 4997088 BLAKE2B fd03837c1674052145cbed631be4d4028a31fdd46d8b730734781b65d5bbcd9cb118ef7ac14c1bc16f7e056365b5bddf32160bf84566ac4815cb12e330f8e712 SHA512 e41fc9f9337535d07ebdd14ae8195bf9c666a0a242516f24d50241e69d50e89fcb9ac1a0b1fbeee0bc75b0218aeb18698ff2ac87447005dad52dc18da80bb02d DIST nim-0.20.2.tar.xz 5032768 BLAKE2B 583e0b5cede279a0c0a60d4209f9be6237ff5ac070c0e82a075a242d08086e59c88c2ab29cbf3d2c6d7a455709b64086afd11e4928fcc9e81979d5296ef38b64 SHA512 231d95950ca5a7abe86175f93085ea27fae493e4f8dde3c9e086993431f9517781ceffeb4f9e761eb524523df3703d0a315fe53e32bc6daea6a684bf90589282 DIST nim-1.0.0.tar.xz 5136624 BLAKE2B 6c87755f66ace6de44aa80d78840572d3ff96c07c97c7af73cdfe395cdbbfb614ad816b7e2c6b91519dcd341694ab48390d80ac97d82db3c1c9a111e0cbadaa4 SHA512 951bbec06a6a1059214b485c5eddfa3c1be0a4ccf6ba98ac3ee624f57d36e86ae1212ffcb6d1bb7ea0938aabbe95a8a6587b140f3219ddb24ec7c93f5672266f -EBUILD nim-0.20.0.ebuild 1734 BLAKE2B 00de80e0dbcf7e0b30b0884e169ea488dff8e2fcf8688b5bcedda7a37688a5bf61f4a51dfae2ad89995067bc1dc6ebefbaede3c055555d7b664d39681a822958 SHA512 c09d02c2344b3c2f391b8134426e7612fbef028264717921a0af709c430eb579bef0f5c83f075f5800c7c68816bc95d21c9eceae006c8e3634ccc2c618407208 +DIST nim-1.0.2.tar.xz 5139712 BLAKE2B bcb0f0fa2ed6069021a6359e453def7beccb6e767e3e1111ff27d8fb2adb7351336f219a88e2450df3d4aece1dd7f6e1a8fb891aa31581c32bb2535d2cf604a7 SHA512 5d7a45efcf656d5467554c3bbf42d0c62a760ccd107cec439d8375839d2e80baadfb3f598598748ef8e1b32d3eb931caaa273f8e41bbf6f4e16c7afbef745349 EBUILD nim-0.20.2.ebuild 1734 BLAKE2B 00de80e0dbcf7e0b30b0884e169ea488dff8e2fcf8688b5bcedda7a37688a5bf61f4a51dfae2ad89995067bc1dc6ebefbaede3c055555d7b664d39681a822958 SHA512 c09d02c2344b3c2f391b8134426e7612fbef028264717921a0af709c430eb579bef0f5c83f075f5800c7c68816bc95d21c9eceae006c8e3634ccc2c618407208 EBUILD nim-1.0.0.ebuild 1734 BLAKE2B 00de80e0dbcf7e0b30b0884e169ea488dff8e2fcf8688b5bcedda7a37688a5bf61f4a51dfae2ad89995067bc1dc6ebefbaede3c055555d7b664d39681a822958 SHA512 c09d02c2344b3c2f391b8134426e7612fbef028264717921a0af709c430eb579bef0f5c83f075f5800c7c68816bc95d21c9eceae006c8e3634ccc2c618407208 +EBUILD nim-1.0.2.ebuild 1734 BLAKE2B 00de80e0dbcf7e0b30b0884e169ea488dff8e2fcf8688b5bcedda7a37688a5bf61f4a51dfae2ad89995067bc1dc6ebefbaede3c055555d7b664d39681a822958 SHA512 c09d02c2344b3c2f391b8134426e7612fbef028264717921a0af709c430eb579bef0f5c83f075f5800c7c68816bc95d21c9eceae006c8e3634ccc2c618407208 MISC metadata.xml 328 BLAKE2B 9205920d8c9b12118456bd186f2e882b3e6f75b7cc3f766def1e79e2e4f7ac695370409ff1555e379516606568f181f4ba3625322f70e41bfffd21d319b0035f SHA512 bf02bc0a8c25d6e157b7ab1ef87c2eac3241d42bc4cf0632a159dcb5d429051018848be81d0cbce228124660ced8694f5de48d64fe10bc7ff5b536b7e7579e49 diff --git a/dev-lang/nim/nim-0.20.0.ebuild b/dev-lang/nim/nim-1.0.2.ebuild index bb41a8721feb..bb41a8721feb 100644 --- a/dev-lang/nim/nim-0.20.0.ebuild +++ b/dev-lang/nim/nim-1.0.2.ebuild diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest index d63deb079369..2caed3265839 100644 --- a/dev-lang/perl/Manifest +++ b/dev-lang/perl/Manifest @@ -6,20 +6,19 @@ DIST perl-5.24.4-patches-1.tar.xz 24244 BLAKE2B aa4557a887e57d584c738058ed147f1b DIST perl-5.24.4.tar.xz 11580256 BLAKE2B efdb9f0e52604207fc73e040c999f40e364f546e3e872dd6709cc6b5209179742fab083319238142581c324847d5e24a3e6a011decc901827d3eb213d00a1666 SHA512 a50bf162d9e62a558a4137d44383eb3fe2001e1eaa574aad7abae851b544dee1dacb849c101023db49b2740925691f5e367fa36ab5dda90634143076c8e4d2f3 DIST perl-5.26.2-patches-1.tar.xz 17100 BLAKE2B 681239e438945285e006ee1d1e2a9eb888fc9b425e6fbd4822e65e1fe1ced2216de76485b9792d3fee28783a588c09e1d34c294ef43d81055c4566af37fe9b6c SHA512 2a274150d2dba406c6efb67ec236f67032a51ff1788b30ea556e74b2f02fab68f5029ebd4b9d4daeb16b3a63fa7aa1744d323bf637a9d21946f19f33b69da245 DIST perl-5.26.2.tar.xz 11931624 BLAKE2B 2d54b155ace7c70a33adbe9911ba5384281aa49a0f6d4f452f4249b4deb58804268b473457470488f7592e041221f552b09156eb55c10078002aae3715446d9a SHA512 fd54c90da250144c81b94587c01c49fa367f84c54406f1d360ddab4a41589a7b19efc1707f95c95d6357fae66fc3f6f00bf69dd7741db114c7034a14f52be65f -DIST perl-5.28.0-patches-1.tar.xz 17128 BLAKE2B f16843d9ecf27fa7d42dd59e1591d618ba9ad6b14f4e56bab4019af043eb79559cc7dbc4a1b1e580c18b7ba0b5d71c4da3e3f94955889629a655e7028492a066 SHA512 e05a492ba045ac71d20393099815bed8e4f491bed79a352e83537561eb256d4f672e0125c5cca9e45150c01d3ad463a070a49e845b3c17806d9f77a872d0352a -DIST perl-5.28.0.tar.xz 12410536 BLAKE2B 620cca33c6d354b8b200bfff43dd155e6f89b9fe318f530d38c853a2b66fe67cc8410b6e5ab2a793d7ef578f2295a6fc4872483f81b5439d8573d75c5239fcfb SHA512 de701e37371b81cecf06098bb2c09017bde9cebaf9537d58838d0adf605ac2ecf739897b0a73576a7adb74d4cf65591ec4d2ed1f94b7191e695f88cb7e214a39 DIST perl-5.28.2-patches-4.tar.xz 26268 BLAKE2B b32485a4ee0c23ab197641279915d1d2ff0b5fb46dad4e65b0c93a9b38025c5b4fdae2907b3f6aa5e1b6b5f80b5391b149613a0d3759519330c16f9b0e1dff91 SHA512 0c560ed52dcce2e9332192fead7bf0da416e5241616c2ee889cb9ca6fc3a133edb75e63e6e1217b8790c77611b92f57979491b4ffb02364c3f8361745f59c225 DIST perl-5.28.2.tar.xz 12374448 BLAKE2B 82a49fcf3c29ff7241fae7ffaa1bf9f99d8cbfa6d00d5fd9ff7c3c23a461287322e12acba318c8de8507092e33b05549142bc5194bdb4b516994c9cdc0cb3f92 SHA512 0f2e4f7cb5d8cf6e00054b3842907e29b6c85902d97fb881d5bea65edbc875fef4e15e064561fac7c8db4939586576dd76a225026c7cca9624261c887b1fdb08 DIST perl-5.30.0-patches-1.tar.xz 17352 BLAKE2B 67eb1c4ce6ada27e05962d06fa9c5675ca1d22623b5fd172ce8ceaa17f2e51d61f9451955f9f6acf6d97ea7d71c72b583be1378ccbf9174c88580baec2049a48 SHA512 4fe1f2de5e72e56890858148d20b772df63dce34cb3977ec47d8ed5323c4843929130f660f1558c282c97e65efa1c6d2fdacf9e2dcc0ef1d487a0b69dbb5bbb4 DIST perl-5.30.0.tar.xz 12419868 BLAKE2B dbf64d4cb1995475ca5a84e487ecc81a422f835180fe96d88b5095e9bc6eff62863b0789d98f0f3d1265c8683b812839bff1622cfb90470f02a1863b0f827c7e SHA512 68a295eccd64debd9d6a10f0d5577f872a19ad8c2d702798f6b0f45b8c3af6ab3230768056e2131e9e2e2506d1035b27cfd627c845e32263fe448649c4b98ae9 +DIST perl-5.30.1-RC1.tar.xz 12368352 BLAKE2B 6f202c213ead3c5c5b94c4b5752bfc3ae26f180e7000cf9d3c9c70889385849c081deae96c22aa78c3b61adb2aa55b2dda9188463eba745e05e14f5ccdab61e7 SHA512 8562afd568c3387bca0f08faba624aa6b490b9a290aa739dd93489cc50db3ce486d8408481bf7fff9766f03857121acfa436f561971b3bc679ef1e814e13d302 DIST perl-cross-1.1.7.tar.gz 97622 BLAKE2B c58dd51492cfbda6fc58b43d9de45c35dd5ed5768ca8db61b5ac092ad6c0067386597875d6613c75671f026387ba474ce8c28789d6d77b9dcfc4cf4bf7227126 SHA512 b64d487129b295ec6d996606b8b8559de681e1cf7c3e3167d6d646d5d7a848d7929b1ab698d1f950e265213749772fc74d209cea5020b61e133c8f8851b7cfa0 DIST perl-cross-1.1.9.tar.gz 102939 BLAKE2B 438ea75a14c4d60fdf3cb2f3671c736d229a83af210ba4fe6e79b989c6c4b45500d0221ec65bc71e1d43d234ec1daa20b3a19be6ceb01e638810900dbe3664a7 SHA512 002441012bd31f1ea71341707d91f89b76266c187c9d28f947ed5eddbcc6e3155e8dfd4b1814331561c3557764fea25bf6a938f08bcd4adfb5895361ad5a269a -DIST perl-cross-1.2.2.tar.gz 106073 BLAKE2B c4eaf5d60dd0ac88a9653cea399f5583a699d35f94a69a36ef9d3cde0017901ff68029f12a3af6e0fd34d46accbb6be009167fadb790da8065f6b85115f1c9b8 SHA512 49dc190018b891daac68a954e2a9bab6294920f02b585c530dcc47af03e8ab51d402455202d45121fa206ee743986ddd50323658c179d2c15cb6af7a2eb0958c DIST perl-cross-1.2.3.tar.gz 106861 BLAKE2B 1fd23ecafd1450010c6703e43fb84da68f73a78d89309e2469fe2b07543002c27cfef463941f517cc0c690ce3a737781e9e2a8bf5ae8c6938e07be7bead2d704 SHA512 bd4fb3fa835b807c3ffb613a7fe935f92df5d89f603bf3f92fb3d249928f3ba69f078cdd46de5749d53e47bc437756f8e3530d7adc40b6eaa21265295af85616 +DIST perl-cross-1.3.tar.gz 105500 BLAKE2B b4f55401528c49ecd1e456e7e06a5aef1732bd78434543aebd51825f7410d9ce928b31e70f816991c0817df8454c7b6c25a5a4ee0cab044be851cb6dabfa9163 SHA512 06baf02338811ac1d117cdab22480255b01a384f0f74480a87f0cd6a9e282ddda74004353f6f08b314007f0e08e9d62b664c072530d8af53f1485adc5ab680c4 EBUILD perl-5.24.3-r1.ebuild 17371 BLAKE2B c34f343684ae5a03b87098f4c42af0f9ebc370c4cc0ccbdd2607f1286dc874348c653a62e94dc5165d1c3a835aba7fa77eb7c6c092ffa1aec0663d2d0862c28d SHA512 deeaca4b0b5faa7d79178001cef1c42bf49f2f922eb26065ff95f345dbcd8a9ea4638c31b4adca6eb467fbd38fd744396684f042ca5111e55f1cd0c93607614e EBUILD perl-5.24.4.ebuild 17341 BLAKE2B fb09adc05419d6bb6650aaed6dec07067f00b9d9a76c5b194275a708692eba6efefba8fb76592e59ee6b7e2cc998d46491a907abdd0f17606e1a4b5afd8a638c SHA512 4f6b4771e2e1c3a313dbe3d0ac4d4f66cf426572416d9e511be06cd8d6e3a9dd64aa4935f1b1c2470afa2812b26d9e47baaab5c8ce3e3e71f6e835d43ca5f11d EBUILD perl-5.26.2.ebuild 19996 BLAKE2B ade95fa2284eb24825a9bab5b3c34aaf9eb3c9234a690a8bfeadf3379a46105babdc1137c7a71e8d67d3ba474d3e8c01ee7154df43f47e81bd78da305f7cfeaf SHA512 c977506e6cef9224fc35c7055dc9cf495758ac5b30cade305a86aba5d68295884bb315a7b655291d61655a2437904d7c91e4c17a349ea30f18be29fb95e02ad3 -EBUILD perl-5.28.2-r1.ebuild 20175 BLAKE2B 25915a45624e6ec0c3da2dee29c3eb0c9f59813bff89b7d8301d903be9ca6ecfe65ca10135957cdd5dc30e757d32d243ca342c28d18f395707d597f9071fd5c5 SHA512 634e7bb4610811e7881ae4ec28eac31803fd16b9d08354110157a3918d7e9ee84af8c5c6eddc354a43ebcf71f3b852bd5f4df1bbde70f79862d0cbc0fd0e0064 -EBUILD perl-5.28.9999.ebuild 20158 BLAKE2B 33f5d6f26a11f691ec89125bec1b4b24f6d8a2dda44d6c8f51592cdd3aa1827b13a00d4d13a6df5c95acd00c99ca069268206d3d8160c8cac38c729e7cc21759 SHA512 00b3d4a76b6a2174c38c73245cf0a86d3927679fcdd07a5fccdebdc6fe9c77ad92e967913ff38eb904454c2e55568972f26eb6f088e581dae5f5735bb343f563 -EBUILD perl-5.30.0.ebuild 20142 BLAKE2B c3cc867d219115e1b6f6eb77f3469fb02ce9298bda38409d3d445df7d19dd7f451de86cffe05aa1521cc3ccabebbe33c780eb97652b06d3aa65adc168970a6f4 SHA512 5e43cbe7ce51348ad0ae4ee182fa8111b91f60ebe59b2dd1fa1db78b83dcc6a4b53b52ee9a360737000b11337c1e40fdceb6851fa60e90e2b47a883a2f147352 +EBUILD perl-5.28.2-r1.ebuild 20281 BLAKE2B 171d8d0f90d917e9de44c7910516243221e767098091a22624abb6c721645d11da4b7a32f82457eed50483611720941a88b21d7944411720e1f9fb771c212ef7 SHA512 d94e2fd705d8e484522a4458a504280f2592fe3c6e5e3aaa3c8cbc92d8c6e394d448cfcf3f6ea1afd426aa43a08121d41a0b7ef5da47cce9a90f09b82eff2e87 +EBUILD perl-5.30.0.ebuild 20246 BLAKE2B a0edc1dd1cfbcae1954afabebb557f12d55893c7972fe1b67ffc69b10c5f144232a2f8c3c8ed6c017a0b2306273750a93a3c45cf0078c259bb7d798e05b87e24 SHA512 30105b95030ab969051a08df597bf3272c91829fc76191aff530a7985634345218e013d16180b518f9f26c48255d24465f8ba37750dd157883eed572bdd1c6a5 +EBUILD perl-5.30.1_rc1.ebuild 20282 BLAKE2B 5739c13f72d1f2a360c04dd8591442de1cd98b95408ec46bf0e168cd322fdea211fa11038a023b9e73fb3db9f0f6f44ce5763e364eb01f3d9c61237e878b7f01 SHA512 6b89ed00a3fdcc7c1e5ed8e854c4a6c55c57bd0b89052ffdaaad325f98019138a81029f18baf4500af5f7307618efd23d0564babb4c35f30795595c91e440e2a MISC metadata.xml 430 BLAKE2B 8625fd07f63a7943a85c3919d6ae6db622b752caa2803c56c72a22b270244261331fbab8b760e6d00acb8480770c9ef1d1beaaa22cc6044660821687c0cd8c33 SHA512 ca4c43e2016b7df707894713465700a90d2b8551b57fc4d660cff75edb1e8cc2456f9ae10431839ad6738f290d4f5911fae360eaa1d4670859d855de3d568583 diff --git a/dev-lang/perl/perl-5.28.2-r1.ebuild b/dev-lang/perl/perl-5.28.2-r1.ebuild index 9ef9792798d4..7b7d5e187dfd 100644 --- a/dev-lang/perl/perl-5.28.2-r1.ebuild +++ b/dev-lang/perl/perl-5.28.2-r1.ebuild @@ -468,9 +468,11 @@ src_configure() { # fix unaligned access misdetection # https://rt.perl.org/Public/Bug/Display.html?id=133495 - # bug #676062 - use hppa || use sparc || [[ ${CHOST} == sparc*-solaris* ]] && \ - myconf "-Dd_u32align='define'" + # https://rt.perl.org/Public/Bug/Display.html?id=133803 + # bug #676062, bug #688432 + use hppa || use sparc || [[ ${CHOST} == sparc*-solaris* ]] || \ + [[ ${CHOST} == armv5tel* ]] \ + && myconf "-Dd_u32align='define'" # Prefix: the host system needs not to follow Gentoo multilib stuff, and in # Prefix itself we don't do multilib either, so make sure perl can find diff --git a/dev-lang/perl/perl-5.30.0.ebuild b/dev-lang/perl/perl-5.30.0.ebuild index 47ecb930d471..97c325fc8693 100644 --- a/dev-lang/perl/perl-5.30.0.ebuild +++ b/dev-lang/perl/perl-5.30.0.ebuild @@ -6,7 +6,7 @@ EAPI=6 inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessing PATCH_VER=1 -CROSS_VER=1.2.2 +CROSS_VER=1.3 PATCH_BASE="perl-5.30.0-patches-${PATCH_VER}" PATCH_DEV=dilfridge @@ -464,9 +464,11 @@ src_configure() { # fix unaligned access misdetection # https://rt.perl.org/Public/Bug/Display.html?id=133495 - # bug #676062 - use hppa || use sparc || [[ ${CHOST} == sparc*-solaris* ]] && \ - myconf "-Dd_u32align='define'" + # https://rt.perl.org/Public/Bug/Display.html?id=133803 + # bug #676062, bug #688432 + use hppa || use sparc || [[ ${CHOST} == sparc*-solaris* ]] || \ + [[ ${CHOST} == armv5tel* ]] \ + && myconf "-Dd_u32align='define'" # Prefix: the host system needs not to follow Gentoo multilib stuff, and in # Prefix itself we don't do multilib either, so make sure perl can find diff --git a/dev-lang/perl/perl-5.28.9999.ebuild b/dev-lang/perl/perl-5.30.1_rc1.ebuild index c20f1c618a1d..42ca0b6d4850 100644 --- a/dev-lang/perl/perl-5.28.9999.ebuild +++ b/dev-lang/perl/perl-5.30.1_rc1.ebuild @@ -6,17 +6,19 @@ EAPI=6 inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessing PATCH_VER=1 -CROSS_VER=1.2.2 -PATCH_BASE="perl-5.28.0-patches-${PATCH_VER}" +CROSS_VER=1.3 +PATCH_BASE="perl-5.30.0-patches-${PATCH_VER}" +PATCH_DEV=dilfridge -DIST_AUTHOR=XSAWYERX +DIST_AUTHOR=SHAY # Greatest first, don't include yourself # Devel point-releases are not ABI-intercompatible, but stable point releases are # BIN_OLDVERSEN is contains only C-ABI-intercompatible versions -PERL_BIN_OLDVERSEN="" +PERL_BIN_OLDVERSEN="5.30.0" + if [[ "${PV##*.}" == "9999" ]]; then - DIST_VERSION=5.28.0 + DIST_VERSION=5.30.0 else DIST_VERSION="${PV/_rc/-RC}" fi @@ -40,7 +42,7 @@ SRC_URI=" mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz mirror://gentoo/${PATCH_BASE}.tar.xz - https://dev.gentoo.org/~kentnl/distfiles/${PATCH_BASE}.tar.xz + https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz " HOMEPAGE="https://www.perl.org/" @@ -48,7 +50,7 @@ HOMEPAGE="https://www.perl.org/" LICENSE="|| ( Artistic GPL-1+ )" SLOT="0/${SUBSLOT}" -if [[ "${PV##*.}" != "9999" ]]; then +if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi @@ -75,20 +77,20 @@ PDEPEND=" S="${WORKDIR}/${MY_P}" dual_scripts() { - src_remove_dual perl-core/Archive-Tar 2.280.0 ptar ptardiff ptargrep - src_remove_dual perl-core/CPAN 2.200.0 cpan - src_remove_dual perl-core/Digest-SHA 6.10.0 shasum - src_remove_dual perl-core/Encode 2.970.0 enc2xs piconv + src_remove_dual perl-core/Archive-Tar 2.320.0 ptar ptardiff ptargrep + src_remove_dual perl-core/CPAN 2.220.0 cpan + src_remove_dual perl-core/Digest-SHA 6.20.0 shasum + src_remove_dual perl-core/Encode 3.10.0 enc2xs piconv src_remove_dual perl-core/ExtUtils-MakeMaker 7.340.0 instmodsh - src_remove_dual perl-core/ExtUtils-ParseXS 3.390.0 xsubpp - src_remove_dual perl-core/IO-Compress 2.74.0 zipdetails - src_remove_dual perl-core/JSON-PP 2.970.10 json_pp - src_remove_dual perl-core/Module-CoreList 5.201.806.220 corelist + src_remove_dual perl-core/ExtUtils-ParseXS 3.400.0 xsubpp + src_remove_dual perl-core/IO-Compress 2.84.0 zipdetails + src_remove_dual perl-core/JSON-PP 4.20.0 json_pp + src_remove_dual perl-core/Module-CoreList 5.201.910.270 corelist src_remove_dual perl-core/Pod-Parser 1.630.0 pod2usage podchecker podselect src_remove_dual perl-core/Pod-Perldoc 3.280.100 perldoc src_remove_dual perl-core/Test-Harness 3.420.0 prove - src_remove_dual perl-core/podlators 4.100.0 pod2man pod2text - src_remove_dual_man perl-core/podlators 4.100.0 /usr/share/man/man1/perlpodstyle.1 + src_remove_dual perl-core/podlators 4.110.0 pod2man pod2text + src_remove_dual_man perl-core/podlators 4.110.0 /usr/share/man/man1/perlpodstyle.1 } check_rebuild() { @@ -336,6 +338,11 @@ src_prepare() { sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die fi + if [[ ${CHOST} == *-darwin* ]] ; then + # fix install_name (soname) not to reference $D + sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die + fi + default } @@ -350,9 +357,6 @@ src_configure() { export LC_ALL="C" [[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091 - # some arches and -O do not mix :) - use ppc && replace-flags -O? -O1 - # Perl has problems compiling with -Os in your flags with glibc use elibc_uclibc || replace-flags "-Os" "-O2" @@ -365,12 +369,6 @@ src_configure() { # This flag makes compiling crash in interesting ways filter-flags "-malign-double" - # Fixes bug #97645 - use ppc && filter-flags "-mpowerpc-gpopt" - - # Fixes bug #143895 on gcc-4.1.1 - filter-flags "-fsched2-use-superblocks" - # Generic LTO broken since 5.28, triggers EUMM failures filter-flags "-flto" @@ -466,9 +464,11 @@ src_configure() { # fix unaligned access misdetection # https://rt.perl.org/Public/Bug/Display.html?id=133495 - # bug #676062 - use hppa || use sparc || [[ ${CHOST} == sparc*-solaris* ]] && \ - myconf "-Dd_u32align='define'" + # https://rt.perl.org/Public/Bug/Display.html?id=133803 + # bug #676062, bug #688432 + use hppa || use sparc || [[ ${CHOST} == sparc*-solaris* ]] || \ + [[ ${CHOST} == armv5tel* ]] \ + && myconf "-Dd_u32align='define'" # Prefix: the host system needs not to follow Gentoo multilib stuff, and in # Prefix itself we don't do multilib either, so make sure perl can find diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index 45cf6c7f321c..a26a5fe53d60 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -5,24 +5,20 @@ AUX php-fpm_at-simple.service 316 BLAKE2B 0ba10f3e3b004fbf14956e1e4f04f59b8a127e 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.40.tar.xz 12472236 BLAKE2B f41147eaec9b15e965540f9e871691cc88848dd619bae6af85e7bba0130b71ce91bad5cdbbadbb537c42df83369f5c731007339a9d9e21e689e913c135201afc SHA512 997b5a952a60cf9166671cc91fcc34c674dd62bfd5cb0a9cdf3fdf2d088b5d19943d94c1cf193f8ab71fc4957d9a9a4c7c2fb8826f937501c1c0a0858f10e329 -DIST php-7.1.31.tar.xz 12370928 BLAKE2B 18b7d5398380324243321a39d337bd10a7eb82812f3dbb9b2ea9eb4808ef585d6452cc5953b56d24bcf817994e249b8b20cd9b4658e1df6c77de78eecb48a3a7 SHA512 989cd157e0d67c6f03192ce9e1afaa01ff72ccc83f3e6b94ac8dc3d4c2717258a46bd64fb20e4649baec1fe2545805013eedc1de78e556d09c2b0ae64d4272d8 DIST php-7.1.32.tar.xz 12369916 BLAKE2B 26f3756bfa15d8caa9f99f48526eabe66cb389d0ecf534700dcf9e2514de12c1b9d45c634b8e5ce07d1e28cce4c5b5a9cda7780013a7af070fd5e3d250a92616 SHA512 090dd6d79514f97be125e86d741094c149250a11a4f7d5f8dd08e028ae5f0b347afc58787b2002cc7b183d08a56562042e33ef7f1eeb060aafaf6fef67646ab1 -DIST php-7.2.21.tar.xz 12298448 BLAKE2B f82b35fd3cdf45d8c84639d044729602340c2d34695b5603a194e2d504627c0e041ab156c3720d218d8d6ca51c9ef71d8d0ee37585142aa30ed0cce51fbcb91e SHA512 c7fe01626c1e25e8882d8f2b69d77a5479567d2daa3bf25d1ce3f45314a882f79ce9914a2aa1b3052b6289b46873f466e457049ce1db6e31b60ba4995187507c +DIST php-7.1.33.tar.xz 12370228 BLAKE2B 610f501c1729ca3f5fa6f104b9f229046cf1e497f2fdc1194b80b4a5f9ca7f799dc6a458de34dd7a87976b7252ba2f548a8d689e4b2a45c025f1807ab8489f12 SHA512 ed37a79e3402c767f20e55c1cbe27957cc78240eafc719fffccd7d29ae10a45112aa0f29082f56133cd9c25f2750e9e57246d95b4f38d766f49bd29d1397eb1d DIST php-7.2.22.tar.xz 12271632 BLAKE2B be3089066ba1c25c479eedaf3e6dd8f7773a6d87a16ce49d8c5379bc9b25d073b497004ccb219795bcfdc3af1310570f94f109754120c254ea5bbaaf1a5e953f SHA512 526dbcc03726d6e2f146adbdf8d89f0c8acb2575a3c21e5ef14ae256f29447d82154e0b1869c0143d831f81c2da0d943957c51144fb458457d3681cdfbc6d49b -DIST php-7.2.23.tar.xz 12273340 BLAKE2B a3cad87bc23534953a71834347b4e2ff44512c2a0a5ef3ee9fcf8df6dde5c59033963333cb746303131078ff8129e98e6515cd55f80a8f70faa34bcd43e93495 SHA512 8ba928ae8b5f5b698400fc2a10170c06763b3c300889e9b79618c58d40db05997def9eff715b276495172b50aadb46f43719a0635545b476c04cd3abea363b0b -DIST php-7.3.10.tar.xz 12086948 BLAKE2B 0dec94952fde19619d2f27ec9e4076a41d51ba704a0d4ec818d33ecedab1b2fae445e5b6437e4a1a4f689db8b9e4b93ceaec55174f0b1c89670083f9b62522d3 SHA512 b6c5d439db015cf902cd1823a2cbd509221866a416fc02e0382322a15165fcd04d3fe5d6fa2a9efc37a69f2becf4453d5f1ccecf4b1f035b5be7a550f3f97fc9 -DIST php-7.3.8.tar.xz 12064620 BLAKE2B cfe2fde5e48080e13bd21cb2e2ca0c0ae38da03c94d0692e11bfe6722e50bd0b864d629a0ef6aed4ac5d9830ec4b4b214b9abdf917519a0c0cb70a4362fc8390 SHA512 9e9e13845350f3d4a8a80c3e2fe8291996e2749b2c862261b96346c01e5e24640cb81adad5e3b7668b56b2266c1fcbb713e8c38da4f9aa474f5f632f91378a8d +DIST php-7.2.24.tar.xz 12302284 BLAKE2B 3c864e72d9fce1f13295385e20708a632087b2e4ffdc9e0012191cb2e17a3530f26797ad03c595bea60cccf850fe17028f2a379e50f32bd4db82530e0fcd727f SHA512 39597b8328cb4d5284288bdce8dd9c7ef8446e46914de93203700efaf67f85ad5b69df777bea14eef9160b233fb79bcb60f6750c0df011bbf610b62a524689e3 +DIST php-7.3.11.tar.xz 12092412 BLAKE2B 0f326b85756cfb5ca96a43d7bfbe8aebd3bb9e9ede06734fb00dc3551372d53befba9e87f5f6a0b0b9e62d35a2eedacd1fa500e1eeff908e05ff52be730c61b4 SHA512 150cb202efc4cc1df042a2cbb9368a2d29aefd1d0cf1a0b0bd7238ba5cb6c4b828e23f2d42b4ecd77dd54f73141a33fc3b36ca0764320e9ba470c9549a7f0291 DIST php-7.3.9.tar.xz 12064244 BLAKE2B 2837463a74a0ccffc1a2193f9fbce78c98c15dd60214cb5d5d704aed7d74449696c3a516e86f440aed9ff3dc2ed8e7bbebcaf0a1268afa55aca2b642e958abf1 SHA512 017d2ae3cd499a7f6ee30111baf0a119e2f404919575acc5ae91fa6e53a303c9d1b5d165205eec3943c3547ff8759e21fbccc62845e3269176f6fc0f2ba88490 -DIST php-7.4.0RC3.tar.xz 10220844 BLAKE2B dc3912533dc52234c5733c89e9353391ddffebe0f08e0de4b9155707d49db43700bfffb91d27391f56fbb2663752742346d7b2947ea77c4175322003b53d1bb4 SHA512 433f5bdafe753948f9ea837205988ae3c779a03c23505795f4c7c71a6cc62354cf61a2f30aa3480a588b9b44faa184664322616025af74627784d5b64b1e8dfb +DIST php-7.4.0RC5.tar.xz 10229964 BLAKE2B 0525553bbcd948ea76177b433a9ab56f9e5f62866a9e8065a2c061aad54bc962515aa0ff77cce8f38ec799c07cda53f8d23acabf62bd218e4ffe3bda41b270e1 SHA512 a95c1c786ccaa4aac5d1cabc3831775a10b69e806031ddd495d271fafab54c54c3013f2193b4dabedde05047bb18f7d8491e7dee44afcb9a045c049df7ade5ee DIST php-patches-7.1.31bp.tar.bz2 37219 BLAKE2B 4f3ead2f69adf00ac1317371172c8adbb823f597cd8e3cafe7044d6a46671437fd2e5eaef4309a6fd5825123394044543284d3cbe892c918353a5b07c12b7401 SHA512 eb52679d035ceb4124c8e9175024f4f753e20d139479af4a57e01de941991716b2ce37f6190242c1bec46fd5305bad1f91613b04ee849a0d94f4a33ce013781e EBUILD php-5.6.40-r6.ebuild 22945 BLAKE2B ce6cc73791974c39ca920a1b5f393376d033b0f00ef7c71f7ade9d6013bfe495c17ef61691eb4f75372b3e97034874eab2757756c4acae5bce0e7be2fba5579c SHA512 5833e71475fab8a53b48f44543a28b28b2280aae263fe17b57be1bc756438884003a1ff878ef5aa16e1c84be0b207c4e96d428c08d5a82cc1e67d892b9cc914e -EBUILD php-7.1.31.ebuild 21919 BLAKE2B a83472dc2d68de45632467ef609c553f2cfee1466e4bbee928f42633f120c9365fd1c1e1e5847b2191d857a1a74fa74247bbb96e6df56ea93991c7bef645c6a6 SHA512 670d142f4efdfb87c99d8b43c0905da768dbdc89ea75ffbf78b4ce46c3d120350dab5939bdc226baae7f33bf0c2c3eb90a6ebdf402de849c842d37fa9ba80fba EBUILD php-7.1.32.ebuild 21919 BLAKE2B a83472dc2d68de45632467ef609c553f2cfee1466e4bbee928f42633f120c9365fd1c1e1e5847b2191d857a1a74fa74247bbb96e6df56ea93991c7bef645c6a6 SHA512 670d142f4efdfb87c99d8b43c0905da768dbdc89ea75ffbf78b4ce46c3d120350dab5939bdc226baae7f33bf0c2c3eb90a6ebdf402de849c842d37fa9ba80fba -EBUILD php-7.2.21.ebuild 22450 BLAKE2B 74c749b882666d79322a341fb5df1c93f7ff0f43331d583c1dd7055cd1fa6b6612ce96f307371f18aa069f22d3715402e414a476ce4423e86d1dd8b8324721b4 SHA512 6365212c51531de57bd1d48bcc7c0227a1f1b4630dfea706ba05e2ead821e6a6289ac13fb3bb8a0611e7df81cd84500c943ee6d056c36dfc7a1f49018714b5d2 +EBUILD php-7.1.33.ebuild 21921 BLAKE2B d7cf2504c68acb3b91987a11bafde98921e250f449b66da1743022e5eab7b6ee2f2ec4eb794193aab1342121801ab9a58a9d0135159af81dbcd9dd6b4e54ae8d SHA512 7eada2b8ddefebe50b7bf32ed4be21aea85d8b5f0eff6698c3fe7e8c8b884ec5892441c26cb390462222b444ed3d1b46192dab6ea481d52dc57dd6606371e1f4 EBUILD php-7.2.22.ebuild 22476 BLAKE2B fb28b20b20f628341c3c578b45fd01dd196ed71455f344725127e5f76bf094a59c6542effcc96177e2783a3ca40b431be714333d8b1f5c0661ac33ecd23ace3c SHA512 207194149bc2db4a9233484f9c2fe95df61e10c9cd66337b40e01baf2a5b374c0b982bea7a6608489b46e5f318307a4e3b4ebe81278bd38f8682af0354444a73 -EBUILD php-7.2.23.ebuild 22485 BLAKE2B 8fdfc66b38c7aff69afdfd31b8d0230bc8323a335c1e2fcc56654e02db618b6dfbe7f2fc124570ac3cb7181df598d769e18f17d7ef81d1c4c83b832bcc3fd246 SHA512 ea176e0813bdf0439e86f98e617b852d988182309058e214e4128b73e76a210f50b6ad19752fa1a79166be7162e36f53f2488813b3de58440b27fc50c55bd2ba -EBUILD php-7.3.10.ebuild 22471 BLAKE2B b024da6faadc1132ffc8a87153ae00c422c16ab61695d581e970d7f1ba1abe1d31e44b3690f0240fafac55f4b2f36270332e372ee9df2caaf1d39f93a3f65f62 SHA512 3f50f9a652787ae9af72adb3d04d7e083a4a10518abc297a3ddab02dece867871eb687c4e6cb89d87c29d457f79ba59d36fd12ba3a13a663f7e54affb27221c0 -EBUILD php-7.3.8.ebuild 22462 BLAKE2B b0f015bfb3f77b040d2d177e2b4e06ce1772c004f41006a50706d58d76cf5ced4fea5e595083ca1b2b6ed44747e3106d60638d051cf5fe618b90af1037896cbc SHA512 6143ed08a0d37643395e6b25f1930160adcf12599e47679e5aa39557efac53515d55235bb4f9b7609e260e78fbfb47cac1651b874d9abde8f5b1f7e356d45fe7 +EBUILD php-7.2.24.ebuild 22478 BLAKE2B 2c1731ac9c28eefab58182bafb07067784cb98dfbdd1f34dda60830885c36963ba10c47664d7fb6a4ee32a21af790b1db42a291650cb15f881cbc11878a55e6b SHA512 4dbc2e7c897fc9cbf26bb43d00464afa0002ee643d0074dcc40b39bf9a8449ddc90e741b55f517220ecf7397ff3cb592306b1cd73f9daad590f234764ad600e3 +EBUILD php-7.3.11.ebuild 22464 BLAKE2B 504a5ed021cc289b9f78e80b0fcd7d11c45302a2af6846bc1a34b76f6444eb9b174bcef6a8375faba26e0ba94497c55788ee2a2b99cb529f067357b597bdb46b SHA512 f0b8ab4be84081b27c32f39a168ce873b974875dc985893f9596c362a1fc628913ce9c61587a59d9b11344086f5ac7d40adce5302e4471a78fd90c0fe01d99ec EBUILD php-7.3.9.ebuild 22462 BLAKE2B b0f015bfb3f77b040d2d177e2b4e06ce1772c004f41006a50706d58d76cf5ced4fea5e595083ca1b2b6ed44747e3106d60638d051cf5fe618b90af1037896cbc SHA512 6143ed08a0d37643395e6b25f1930160adcf12599e47679e5aa39557efac53515d55235bb4f9b7609e260e78fbfb47cac1651b874d9abde8f5b1f7e356d45fe7 -EBUILD php-7.4.0_rc3.ebuild 20893 BLAKE2B f36e38d947b16e06042f103472f34530cfa4b7b852b4024c6ca9baa07099eb4b8579900a29422902fe270b6e391ed4e919307e79e4f8c46a20cc00ae9f7e6201 SHA512 33495a755c80d11d3029592e7d3a9274548b10fc1491c3eb175de5f2ba98bcdaa3bc152fc60121936cd07a5b75972664731292137384556eb673379f59887b46 +EBUILD php-7.4.0_rc5.ebuild 20862 BLAKE2B aa614cb37c386702e62d15a9e8a838076779920a5cd7b912ec6604a783d7bdfc225a3966fc382f5b5318a95f1d41dcc70286d9cc9438dd71f4c852da397566f5 SHA512 0ea8948a0bca0d8fe233f8a450bcc7b07c48a946b8f6e1f769983a1ff683311041d05c38b47dde963ea35e3a19458a81573247ec00545969323b036087b8c16f MISC metadata.xml 3352 BLAKE2B 155c08bb52b049c3f79557d27ab6be9402cd35797cd385d53fc8c239c0eca089f65e106d54beca0642b8d182bfd0e172886b863a692575e9002140af7a62fa08 SHA512 f37c4c7b709bf91da6db41b0468c36cebffc630dabdcf4d43259017be5cf0577bb329ed0e206ff14d68bacc33425fba4789fc13fa34aa61acccce9fda11eee86 diff --git a/dev-lang/php/php-7.1.31.ebuild b/dev-lang/php/php-7.1.33.ebuild index d6b54b2cba35..26cb59ec1aaf 100644 --- a/dev-lang/php/php-7.1.31.ebuild +++ b/dev-lang/php/php-7.1.33.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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" # We can build the following SAPIs in the given order SAPIS="embed cli cgi fpm apache2 phpdbg" diff --git a/dev-lang/php/php-7.2.21.ebuild b/dev-lang/php/php-7.2.21.ebuild deleted file mode 100644 index cad93b34758e..000000000000 --- a/dev-lang/php/php-7.2.21.ebuild +++ /dev/null @@ -1,748 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic systemd autotools - -DESCRIPTION="The PHP language runtime engine" -HOMEPAGE="https://php.net/" -SRC_URI="https://php.net/distributions/${P}.tar.xz" - -LICENSE="PHP-3.01 - BSD - Zend-2.0 - bcmath? ( LGPL-2.1+ ) - fpm? ( BSD-2 ) - gd? ( gd ) - unicode? ( BSD-2 LGPL-2.1 )" - -SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2 phpdbg" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk - coverage +ctype curl debug - enchant exif +fileinfo +filter firebird - +flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb - mhash mssql mysql mysqli nls - oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm - readline recode selinux +session session-mm sharedmem - +simplexml snmp soap sockets sodium spell sqlite ssl - sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp - +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib" - -# The supported (that is, autodetected) versions of BDB are listed in -# the ./configure script. Other versions *work*, but we need to stick to -# the ones that can be detected to avoid a repeat of bug #564824. -COMMON_DEPEND=" - >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] - >=dev-libs/libpcre-8.32[unicode] - fpm? ( acl? ( sys-apps/acl ) ) - apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) - argon2? ( app-crypt/argon2:= ) - berkdb? ( || ( sys-libs/db:5.3 - sys-libs/db:5.1 - sys-libs/db:4.8 - sys-libs/db:4.7 - sys-libs/db:4.6 - sys-libs/db:4.5 ) ) - bzip2? ( app-arch/bzip2:0= ) - cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - coverage? ( dev-util/lcov ) - curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( <app-text/enchant-2.0:0 ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) - gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) - gmp? ( dev-libs/gmp:0= ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[kerberos=,ssl=] ) - intl? ( dev-libs/icu:= ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - lmdb? ( dev-db/lmdb:= ) - mssql? ( dev-db/freetds[mssql] ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql:* ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline:0= ) - recode? ( app-text/recode ) - session-mm? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - sodium? ( dev-libs/libsodium:= ) - spell? ( >=app-text/aspell-0.50 ) - sqlite? ( >=dev-db/sqlite-3.7.6.3 ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) - tokyocabinet? ( dev-db/tokyocabinet ) - truetype? ( =media-libs/freetype-2* ) - unicode? ( dev-libs/oniguruma:= ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - webp? ( media-libs/libwebp:0= ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( x11-libs/libXpm ) - xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib:0= ) - zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) - zlib? ( sys-libs/zlib:0= ) -" - -RDEPEND="${COMMON_DEPEND} - virtual/mta - fpm? ( - selinux? ( sec-policy/selinux-phpfpm ) - systemd? ( sys-apps/systemd ) )" - -# Bison isn't actually needed when building from a release tarball -# However, the configure script will warn if it's absent or if you -# have an incompatible version installed. See bug 593278. -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils - >=sys-devel/bison-3.0.1" - -BDEPEND="virtual/pkgconfig" - -# Without USE=readline or libedit, the interactive "php -a" CLI will hang. -REQUIRED_USE=" - || ( cli cgi fpm apache2 embed phpdbg ) - cli? ( ^^ ( readline libedit ) ) - truetype? ( gd zlib ) - webp? ( gd zlib ) - cjk? ( gd zlib ) - exif? ( gd zlib ) - xpm? ( gd zlib ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xslt? ( xml ) - ldap-sasl? ( ldap ) - mhash? ( hash ) - phar? ( hash ) - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysqli !mysql ) - session-mm? ( session !threads ) - mysql? ( hash || ( mysqli pdo ) ) - mysqli? ( hash ) - zip-encryption? ( zip ) -" -PATCHES=( - "${FILESDIR}/php-freetype-2.9.1.patch" - "${FILESDIR}/php-7.2.13-intl-use-icu-namespace.patch" -) - -PHP_MV="$(ver_cut 1)" - -php_install_ini() { - local phpsapi="${1}" - - # work out where we are installing the ini file - php_set_ini_dir "${phpsapi}" - - # Always install the production INI file, bug 611214. - local phpinisrc="php.ini-production-${phpsapi}" - cp php.ini-production "${phpinisrc}" || die - - # default to /tmp for save_path, bug #282768 - sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die - - # Set the extension dir - sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \ - -i "${phpinisrc}" || die - - # Set the include path to point to where we want to find PEAR packages - sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die - - dodir "${PHP_INI_DIR#${EPREFIX}}" - insinto "${PHP_INI_DIR#${EPREFIX}}" - newins "${phpinisrc}" php.ini - - elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" - elog - - dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" - dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" - - if use opcache; then - elog "Adding opcache to $PHP_EXT_INI_DIR" - echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \ - "${D}/${PHP_EXT_INI_DIR}"/opcache.ini - dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \ - "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" - fi - - # SAPI-specific handling - if [[ "${sapi}" == "fpm" ]] ; then - einfo "Installing FPM config files php-fpm.conf and www.conf" - insinto "${PHP_INI_DIR#${EPREFIX}}" - doins sapi/fpm/php-fpm.conf - insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d" - doins sapi/fpm/www.conf - fi - - dodoc php.ini-{development,production} -} - -php_set_ini_dir() { - PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" - PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" - PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" -} - -src_prepare() { - default - - # In php-7.x, the FPM pool configuration files have been split off - # of the main config. By default the pool config files go in - # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the - # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later - # we'll install the pool configuration file "www.conf" there. - php_set_ini_dir fpm - sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \ - sapi/fpm/php-fpm.conf.in \ - || die 'failed to move the include directory in php-fpm.conf' - - # Bug 669566 - necessary so that build tools are updated for commands like pecl - # Force rebuilding aclocal.m4 - rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare" - eautoreconf -} - -src_configure() { - addpredict /usr/share/snmp/mibs/.index #nowarn - addpredict /var/lib/net-snmp/mib_indexes #nowarn - - PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" - - # The php-fpm config file wants localstatedir to be ${EPREFIX}/var - # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002. - local our_conf=( - --prefix="${PHP_DESTDIR}" - --mandir="${PHP_DESTDIR}/man" - --infodir="${PHP_DESTDIR}/info" - --libdir="${PHP_DESTDIR}/lib" - --with-libdir="$(get_libdir)" - --localstatedir="${EPREFIX}/var" - --without-pear - $(use_enable threads maintainer-zts) - ) - - our_conf+=( - $(use_with argon2 password-argon2 "${EPREFIX}/usr") - $(use_enable bcmath bcmath) - $(use_with bzip2 bz2 "${EPREFIX}/usr") - $(use_enable calendar calendar) - $(use_enable coverage gcov) - $(use_enable ctype ctype) - $(use_with curl curl "${EPREFIX}/usr") - $(use_enable xml dom) - $(use_with enchant enchant "${EPREFIX}/usr") - $(use_enable exif exif) - $(use_enable fileinfo fileinfo) - $(use_enable filter filter) - $(use_enable ftp ftp) - $(use_with nls gettext "${EPREFIX}/usr") - $(use_with gmp gmp "${EPREFIX}/usr") - $(use_enable hash hash) - $(use_with mhash mhash "${EPREFIX}/usr") - $(use_with iconv iconv \ - $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr")) - $(use_enable intl intl) - $(use_enable ipv6 ipv6) - $(use_enable json json) - $(use_with kerberos kerberos "${EPREFIX}/usr") - $(use_enable xml libxml) - $(use_with xml libxml-dir "${EPREFIX}/usr") - $(use_enable unicode mbstring) - $(use_with unicode onig "${EPREFIX}/usr") - $(use_with ssl openssl "${EPREFIX}/usr") - $(use_with ssl openssl-dir "${EPREFIX}/usr") - $(use_enable pcntl pcntl) - $(use_enable phar phar) - $(use_enable pdo pdo) - $(use_enable opcache opcache) - $(use_with postgres pgsql "${EPREFIX}/usr") - $(use_enable posix posix) - $(use_with spell pspell "${EPREFIX}/usr") - $(use_with recode recode "${EPREFIX}/usr") - $(use_enable simplexml simplexml) - $(use_enable sharedmem shmop) - $(use_with snmp snmp "${EPREFIX}/usr") - $(use_enable soap soap) - $(use_enable sockets sockets) - $(use_with sodium sodium "${EPREFIX}/usr") - $(use_with sqlite sqlite3 "${EPREFIX}/usr") - $(use_enable sysvipc sysvmsg) - $(use_enable sysvipc sysvsem) - $(use_enable sysvipc sysvshm) - $(use_with tidy tidy "${EPREFIX}/usr") - $(use_enable tokenizer tokenizer) - $(use_enable wddx wddx) - $(use_enable xml xml) - $(use_enable xmlreader xmlreader) - $(use_enable xmlwriter xmlwriter) - $(use_with xmlrpc xmlrpc) - $(use_with xslt xsl "${EPREFIX}/usr") - $(use_enable zip zip) - $(use_with zip-encryption libzip "${EPREFIX}/usr") - $(use_with zlib zlib "${EPREFIX}/usr") - $(use_enable debug debug) - ) - - # DBA support - if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ - || use qdbm || use lmdb || use tokyocabinet ; then - our_conf+=( "--enable-dba${shared}" ) - fi - - # DBA drivers support - our_conf+=( - $(use_with cdb cdb) - $(use_with berkdb db4 "${EPREFIX}/usr") - $(use_enable flatfile flatfile) - $(use_with gdbm gdbm "${EPREFIX}/usr") - $(use_enable inifile inifile) - $(use_with qdbm qdbm "${EPREFIX}/usr") - $(use_with lmdb lmdb "${EPREFIX}/usr") - ) - - # Support for the GD graphics library - our_conf+=( - $(use_with truetype freetype-dir "${EPREFIX}/usr") - $(use_enable cjk gd-jis-conv) - $(use_with gd jpeg-dir "${EPREFIX}/usr") - $(use_with gd png-dir "${EPREFIX}/usr") - $(use_with xpm xpm-dir "${EPREFIX}/usr") - ) - if use webp; then - our_conf+=( --with-webp-dir="${EPREFIX}/usr" ) - fi - # enable gd last, so configure can pick up the previous settings - our_conf+=( $(use_with gd gd) ) - - # IMAP support - if use imap ; then - our_conf+=( - $(use_with imap imap "${EPREFIX}/usr") - $(use_with ssl imap-ssl "${EPREFIX}/usr") - ) - fi - - # Interbase/firebird support - our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") ) - - # LDAP support - if use ldap ; then - our_conf+=( - $(use_with ldap ldap "${EPREFIX}/usr") - $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr") - ) - fi - - # MySQL support - local mysqllib="mysqlnd" - local mysqlilib="mysqlnd" - - our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") ) - - local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock" - if use mysql || use mysqli ; then - our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") ) - fi - - # ODBC support - our_conf+=( - $(use_with odbc unixODBC "${EPREFIX}/usr") - $(use_with iodbc iodbc "${EPREFIX}/usr") - ) - - # Oracle support - our_conf+=( $(use_with oci8-instant-client oci8) ) - - # PDO support - if use pdo ; then - our_conf+=( - $(use_with mssql pdo-dblib "${EPREFIX}/usr") - $(use_with mysql pdo-mysql "${mysqllib}") - $(use_with postgres pdo-pgsql) - $(use_with sqlite pdo-sqlite "${EPREFIX}/usr") - $(use_with firebird pdo-firebird "${EPREFIX}/usr") - $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr") - $(use_with oci8-instant-client pdo-oci) - ) - fi - - # readline/libedit support - our_conf+=( - $(use_with readline readline "${EPREFIX}/usr") - $(use_with libedit libedit "${EPREFIX}/usr") - ) - - # Session support - if use session ; then - our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") ) - else - our_conf+=( $(use_enable session session) ) - fi - - # Use pic for shared modules such as apache2's mod_php - our_conf+=( --with-pic ) - - # we use the system copy of pcre - # --with-pcre-regex affects ext/pcre - # --with-pcre-dir affects ext/filter and ext/zip - # --with-pcre-valgrind cannot be enabled with system pcre - # Many arches don't support pcre-jit - our_conf+=( - --with-pcre-regex="${EPREFIX}/usr" - --with-pcre-dir="${EPREFIX}/usr" - --without-pcre-valgrind - --without-pcre-jit - ) - - # Catch CFLAGS problems - # Fixes bug #14067. - # Changed order to run it in reverse for bug #32022 and #12021. - replace-cpu-flags "k6*" "i586" - - # Cache the ./configure test results between SAPIs. - our_conf+=( --cache-file="${T}/config.cache" ) - - # Support user-passed configuration parameters - our_conf+=( ${EXTRA_ECONF:-} ) - - # Support the Apache2 extras, they must be set globally for all - # SAPIs to work correctly, especially for external PHP extensions - - mkdir -p "${WORKDIR}/sapis-build" || die - for one_sapi in $SAPIS ; do - use "${one_sapi}" || continue - php_set_ini_dir "${one_sapi}" - - # The BUILD_DIR variable is used to determine where to output - # the files that autotools creates. This was all originally - # based on the autotools-utils eclass. - BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}" - cp -a "${S}" "${BUILD_DIR}" || die - cd "${BUILD_DIR}" || die - - local sapi_conf=( - --with-config-file-path="${PHP_INI_DIR}" - --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}" - ) - - for sapi in $SAPIS ; do - case "$sapi" in - cli|cgi|embed|fpm|phpdbg) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf+=( "--enable-${sapi}" ) - if [[ "fpm" == "${sapi}" ]] ; then - sapi_conf+=( - $(use_with acl fpm-acl) - $(use_with systemd fpm-systemd) - ) - fi - else - sapi_conf+=( "--disable-${sapi}" ) - fi - ;; - - apache2) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" ) - else - sapi_conf+=( --without-apxs2 ) - fi - ;; - esac - done - - # Construct the $myeconfargs array by concatenating $our_conf - # (the common args) and $sapi_conf (the SAPI-specific args). - local myeconfargs=( "${our_conf[@]}" ) - myeconfargs+=( "${sapi_conf[@]}" ) - - pushd "${BUILD_DIR}" > /dev/null || die - econf "${myeconfargs[@]}" - popd > /dev/null || die - done -} - -src_compile() { - # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index #nowarn - addpredict /var/lib/net-snmp/mib_indexes #nowarn - - for sapi in ${SAPIS} ; do - if use "${sapi}"; then - cd "${WORKDIR}/sapis-build/$sapi" || \ - die "Failed to change dir to ${WORKDIR}/sapis-build/$1" - emake - fi - done -} - -src_install() { - # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index #nowarn - - # grab the first SAPI that got built and install common files from there - local first_sapi="" - for sapi in $SAPIS ; do - if use $sapi ; then - first_sapi=$sapi - break - fi - done - - # Makefile forgets to create this before trying to write to it... - dodir "${PHP_DESTDIR#${EPREFIX}}/bin" - - # Install php environment (without any sapis) - cd "${WORKDIR}/sapis-build/$first_sapi" || die - emake INSTALL_ROOT="${D}" \ - install-build install-headers install-programs - - local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" - - # Create the directory where we'll put version-specific php scripts - keepdir "/usr/share/php${PHP_MV}" - - local sapi="", file="" - local sapi_list="" - - for sapi in ${SAPIS}; do - if use "${sapi}" ; then - einfo "Installing SAPI: ${sapi}" - cd "${WORKDIR}/sapis-build/${sapi}" || die - - if [[ "${sapi}" == "apache2" ]] ; then - # We're specifically not using emake install-sapi as libtool - # may cause unnecessary relink failures (see bug #351266) - insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" - newins ".libs/libphp${PHP_MV}$(get_libname)" \ - "libphp${PHP_MV}$(get_libname)" - keepdir "/usr/$(get_libdir)/apache2/modules" - else - # needed each time, php_install_ini would reset it - local dest="${PHP_DESTDIR#${EPREFIX}}" - into "${dest}" - case "$sapi" in - cli) - source="sapi/cli/php" - ;; - cgi) - source="sapi/cgi/php-cgi" - ;; - fpm) - source="sapi/fpm/php-fpm" - ;; - embed) - source="libs/libphp${PHP_MV}$(get_libname)" - ;; - phpdbg) - source="sapi/phpdbg/phpdbg" - ;; - *) - die "unhandled sapi in src_install" - ;; - esac - - if [[ "${source}" == *"$(get_libname)" ]]; then - dolib.so "${source}" - else - dobin "${source}" - local name="$(basename ${source})" - dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" - fi - fi - - php_install_ini "${sapi}" - - # construct correct SAPI string for php-config - # thanks to ferringb for the bash voodoo - if [[ "${sapi}" == "apache2" ]]; then - sapi_list="${sapi_list:+${sapi_list} }apache2handler" - else - sapi_list="${sapi_list:+${sapi_list} }${sapi}" - fi - fi - done - - # Installing opcache module - if use opcache ; then - into "${PHP_DESTDIR#${EPREFIX}}" - dolib.so "modules/opcache$(get_libname)" - fi - - # Install env.d files - newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}" - sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die - sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die - - # set php-config variable correctly (bug #278439) - sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ - "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die - - if use fpm ; then - if use systemd; then - systemd_newunit "${FILESDIR}/php-fpm_at.service" \ - "php-fpm@${SLOT}.service" - else - systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \ - "php-fpm@${SLOT}.service" - fi - fi -} - -src_test() { - echo ">>> Test phase [test]: ${CATEGORY}/${PF}" - PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" - if [[ ! -x "${PHP_BIN}" ]] ; then - ewarn "Test phase requires USE=cli, skipping" - return - else - export TEST_PHP_EXECUTABLE="${PHP_BIN}" - fi - - if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then - export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" - fi - - if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then - export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" - fi - - REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \ - "session.save_path=${T}" \ - "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \ - "session.save_path=${T}" - - for name in ${EXPECTED_TEST_FAILURES}; do - mv "${name}.out" "${name}.out.orig" 2>/dev/null || die - done - - local failed="$(find -name '*.out')" - if [[ ${failed} != "" ]] ; then - ewarn "The following test cases failed unexpectedly:" - for name in ${failed}; do - ewarn " ${name/.out/}" - done - else - einfo "No unexpected test failures, all fine" - fi - - if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then - local passed="" - for name in ${EXPECTED_TEST_FAILURES}; do - [[ -f "${name}.diff" ]] && continue - passed="${passed} ${name}" - done - if [[ ${passed} != "" ]] ; then - einfo "The following test cases passed unexpectedly:" - for name in ${passed}; do - ewarn " ${passed}" - done - else - einfo "None of the known-to-fail tests passed, all fine" - fi - fi -} - -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - elog - elog "To enable PHP in apache, you will need to add \"-D PHP\" to" - elog "your apache2 command. OpenRC users can append that string to" - elog "APACHE2_OPTS in /etc/conf.d/apache2." - elog - elog "The apache module configuration file 70_mod_php.conf is" - elog "provided (and maintained) by eselect-php." - elog - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} || die - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - # Remove dead symlinks for SAPIs that were just disabled. For - # example, if the user has the cgi SAPI enabled, then he has an - # eselect-php symlink for it. If he later reinstalls PHP with - # USE="-cgi", that symlink will break. This call to eselect is - # supposed to remove that dead link per bug 572436. - eselect php cleanup || die - - if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then - elog "To build extensions for this version of PHP, you will need to" - elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable." - elog - fi - - # Warn about the removal of PHP_INI_VERSION if the user has it set. - if [[ -n "${PHP_INI_VERSION}" ]]; then - ewarn 'The PHP_INI_VERSION variable has been phased out. You may' - ewarn 'remove it from your configuration at your convenience. See' - ewarn - ewarn ' https://bugs.gentoo.org/611214' - ewarn - ewarn 'for more information.' - fi - - elog "For details on how version slotting works, please see" - elog "the wiki:" - elog - elog " https://wiki.gentoo.org/wiki/PHP" - elog -} - -pkg_postrm() { - # This serves two purposes. First, if we have just removed the last - # installed version of PHP, then this will remove any dead symlinks - # belonging to eselect-php. Second, if a user upgrades slots from - # (say) 5.6 to 7.0 and depcleans the old slot, then this will update - # his existing symlinks to point to the new 7.0 installation. The - # latter is bug 432962. - # - # Note: the eselect-php package may not be installed at this point, - # so we can't die() if this command fails. - eselect php cleanup -} diff --git a/dev-lang/php/php-7.2.23.ebuild b/dev-lang/php/php-7.2.24.ebuild index 7a4b01c291e3..6b4cdd11cece 100644 --- a/dev-lang/php/php-7.2.23.ebuild +++ b/dev-lang/php/php-7.2.24.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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" # We can build the following SAPIs in the given order SAPIS="embed cli cgi fpm apache2 phpdbg" diff --git a/dev-lang/php/php-7.3.10.ebuild b/dev-lang/php/php-7.3.10.ebuild deleted file mode 100644 index e466f57d0e3c..000000000000 --- a/dev-lang/php/php-7.3.10.ebuild +++ /dev/null @@ -1,749 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic systemd autotools - -MY_PV=${PV/_rc/RC} -DESCRIPTION="The PHP language runtime engine" -HOMEPAGE="https://php.net/" -SRC_URI="https://php.net/distributions/${P}.tar.xz" - -LICENSE="PHP-3.01 - BSD - Zend-2.0 - bcmath? ( LGPL-2.1+ ) - fpm? ( BSD-2 ) - gd? ( gd ) - unicode? ( BSD-2 LGPL-2.1 )" - -SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" - -S="${WORKDIR}/${PN}-${MY_PV}" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2 phpdbg" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk - coverage +ctype curl debug - enchant exif +fileinfo +filter firebird - +flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb - mhash mssql mysql mysqli nls - oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm - readline recode selinux +session session-mm sharedmem - +simplexml snmp soap sockets sodium spell sqlite ssl - sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp - +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib" - -# The supported (that is, autodetected) versions of BDB are listed in -# the ./configure script. Other versions *work*, but we need to stick to -# the ones that can be detected to avoid a repeat of bug #564824. -COMMON_DEPEND=" - >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] - >=dev-libs/libpcre2-10.30[unicode] - fpm? ( acl? ( sys-apps/acl ) ) - apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) - argon2? ( app-crypt/argon2:= ) - berkdb? ( || ( sys-libs/db:5.3 - sys-libs/db:5.1 - sys-libs/db:4.8 - sys-libs/db:4.7 - sys-libs/db:4.6 - sys-libs/db:4.5 ) ) - bzip2? ( app-arch/bzip2:0= ) - cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - coverage? ( dev-util/lcov ) - curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( <app-text/enchant-2.0:0 ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) - gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) - gmp? ( dev-libs/gmp:0= ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[kerberos=,ssl=] ) - intl? ( dev-libs/icu:= ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - lmdb? ( dev-db/lmdb:= ) - mssql? ( dev-db/freetds[mssql] ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql:* ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline:0= ) - recode? ( app-text/recode ) - session-mm? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - sodium? ( dev-libs/libsodium:= ) - spell? ( >=app-text/aspell-0.50 ) - sqlite? ( >=dev-db/sqlite-3.7.6.3 ) - ssl? ( - !libressl? ( >=dev-libs/openssl-1.0.1:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) - tokyocabinet? ( dev-db/tokyocabinet ) - truetype? ( =media-libs/freetype-2* ) - unicode? ( dev-libs/oniguruma:= ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - webp? ( media-libs/libwebp:0= ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( x11-libs/libXpm ) - xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( >=sys-libs/zlib-1.2.0.4:0= ) - zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) - zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) -" - -RDEPEND="${COMMON_DEPEND} - virtual/mta - fpm? ( - selinux? ( sec-policy/selinux-phpfpm ) - systemd? ( sys-apps/systemd ) )" - -# Bison isn't actually needed when building from a release tarball -# However, the configure script will warn if it's absent or if you -# have an incompatible version installed. See bug 593278. -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils - >=sys-devel/bison-3.0.1" - -BDEPEND="virtual/pkgconfig" - -# Without USE=readline or libedit, the interactive "php -a" CLI will hang. -REQUIRED_USE=" - || ( cli cgi fpm apache2 embed phpdbg ) - cli? ( ^^ ( readline libedit ) ) - truetype? ( gd zlib ) - webp? ( gd zlib ) - cjk? ( gd zlib ) - exif? ( gd zlib ) - xpm? ( gd zlib ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xslt? ( xml ) - ldap-sasl? ( ldap ) - mhash? ( hash ) - phar? ( hash ) - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysqli !mysql ) - session-mm? ( session !threads ) - mysql? ( || ( mysqli pdo ) ) - zip-encryption? ( zip ) -" -PATCHES=( - "${FILESDIR}/php-freetype-2.9.1.patch" -) - -PHP_MV="$(ver_cut 1)" - -php_install_ini() { - local phpsapi="${1}" - - # work out where we are installing the ini file - php_set_ini_dir "${phpsapi}" - - # Always install the production INI file, bug 611214. - local phpinisrc="php.ini-production-${phpsapi}" - cp php.ini-production "${phpinisrc}" || die - - # default to /tmp for save_path, bug #282768 - sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die - - # Set the extension dir - sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \ - -i "${phpinisrc}" || die - - # Set the include path to point to where we want to find PEAR packages - sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die - - dodir "${PHP_INI_DIR#${EPREFIX}}" - insinto "${PHP_INI_DIR#${EPREFIX}}" - newins "${phpinisrc}" php.ini - - elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" - elog - - dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" - dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" - - if use opcache; then - elog "Adding opcache to $PHP_EXT_INI_DIR" - echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \ - "${D}/${PHP_EXT_INI_DIR}"/opcache.ini - dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \ - "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" - fi - - # SAPI-specific handling - if [[ "${sapi}" == "fpm" ]] ; then - einfo "Installing FPM config files php-fpm.conf and www.conf" - insinto "${PHP_INI_DIR#${EPREFIX}}" - doins sapi/fpm/php-fpm.conf - insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d" - doins sapi/fpm/www.conf - fi - - dodoc php.ini-{development,production} -} - -php_set_ini_dir() { - PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" - PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" - PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" -} - -src_prepare() { - default - - # In php-7.x, the FPM pool configuration files have been split off - # of the main config. By default the pool config files go in - # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the - # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later - # we'll install the pool configuration file "www.conf" there. - php_set_ini_dir fpm - sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \ - sapi/fpm/php-fpm.conf.in \ - || die 'failed to move the include directory in php-fpm.conf' - - # Bug 669566 - necessary so that build tools are updated for commands like pecl - # Force rebuilding aclocal.m4 - rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare" - eautoreconf -} - -src_configure() { - addpredict /usr/share/snmp/mibs/.index #nowarn - addpredict /var/lib/net-snmp/mib_indexes #nowarn - - PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" - - # The php-fpm config file wants localstatedir to be ${EPREFIX}/var - # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002. - local our_conf=( - --prefix="${PHP_DESTDIR}" - --mandir="${PHP_DESTDIR}/man" - --infodir="${PHP_DESTDIR}/info" - --libdir="${PHP_DESTDIR}/lib" - --with-libdir="$(get_libdir)" - --localstatedir="${EPREFIX}/var" - --without-pear - $(use_enable threads maintainer-zts) - ) - - our_conf+=( - $(use_with argon2 password-argon2 "${EPREFIX}/usr") - $(use_enable bcmath bcmath) - $(use_with bzip2 bz2 "${EPREFIX}/usr") - $(use_enable calendar calendar) - $(use_enable coverage gcov) - $(use_enable ctype ctype) - $(use_with curl curl "${EPREFIX}/usr") - $(use_enable xml dom) - $(use_with enchant enchant "${EPREFIX}/usr") - $(use_enable exif exif) - $(use_enable fileinfo fileinfo) - $(use_enable filter filter) - $(use_enable ftp ftp) - $(use_with nls gettext "${EPREFIX}/usr") - $(use_with gmp gmp "${EPREFIX}/usr") - $(use_enable hash hash) - $(use_with mhash mhash "${EPREFIX}/usr") - $(use_with iconv iconv \ - $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr")) - $(use_enable intl intl) - $(use_enable ipv6 ipv6) - $(use_enable json json) - $(use_with kerberos kerberos "${EPREFIX}/usr") - $(use_enable xml libxml) - $(use_with xml libxml-dir "${EPREFIX}/usr") - $(use_enable unicode mbstring) - $(use_with unicode onig "${EPREFIX}/usr") - $(use_with ssl openssl "${EPREFIX}/usr") - $(use_with ssl openssl-dir "${EPREFIX}/usr") - $(use_enable pcntl pcntl) - $(use_enable phar phar) - $(use_enable pdo pdo) - $(use_enable opcache opcache) - $(use_with postgres pgsql "${EPREFIX}/usr") - $(use_enable posix posix) - $(use_with spell pspell "${EPREFIX}/usr") - $(use_with recode recode "${EPREFIX}/usr") - $(use_enable simplexml simplexml) - $(use_enable sharedmem shmop) - $(use_with snmp snmp "${EPREFIX}/usr") - $(use_enable soap soap) - $(use_enable sockets sockets) - $(use_with sodium sodium "${EPREFIX}/usr") - $(use_with sqlite sqlite3 "${EPREFIX}/usr") - $(use_enable sysvipc sysvmsg) - $(use_enable sysvipc sysvsem) - $(use_enable sysvipc sysvshm) - $(use_with tidy tidy "${EPREFIX}/usr") - $(use_enable tokenizer tokenizer) - $(use_enable wddx wddx) - $(use_enable xml xml) - $(use_enable xmlreader xmlreader) - $(use_enable xmlwriter xmlwriter) - $(use_with xmlrpc xmlrpc) - $(use_with xslt xsl "${EPREFIX}/usr") - $(use_enable zip zip) - $(use_with zip-encryption libzip "${EPREFIX}/usr") - $(use_with zlib zlib "${EPREFIX}/usr") - $(use_enable debug debug) - ) - - # DBA support - if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ - || use qdbm || use lmdb || use tokyocabinet ; then - our_conf+=( "--enable-dba${shared}" ) - fi - - # DBA drivers support - our_conf+=( - $(use_with cdb cdb) - $(use_with berkdb db4 "${EPREFIX}/usr") - $(use_enable flatfile flatfile) - $(use_with gdbm gdbm "${EPREFIX}/usr") - $(use_enable inifile inifile) - $(use_with qdbm qdbm "${EPREFIX}/usr") - $(use_with lmdb lmdb "${EPREFIX}/usr") - ) - - # Support for the GD graphics library - our_conf+=( - $(use_with truetype freetype-dir "${EPREFIX}/usr") - $(use_enable cjk gd-jis-conv) - $(use_with gd jpeg-dir "${EPREFIX}/usr") - $(use_with gd png-dir "${EPREFIX}/usr") - $(use_with xpm xpm-dir "${EPREFIX}/usr") - ) - if use webp; then - our_conf+=( --with-webp-dir="${EPREFIX}/usr" ) - fi - # enable gd last, so configure can pick up the previous settings - our_conf+=( $(use_with gd gd) ) - - # IMAP support - if use imap ; then - our_conf+=( - $(use_with imap imap "${EPREFIX}/usr") - $(use_with ssl imap-ssl "${EPREFIX}/usr") - ) - fi - - # Interbase/firebird support - our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") ) - - # LDAP support - if use ldap ; then - our_conf+=( - $(use_with ldap ldap "${EPREFIX}/usr") - $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr") - ) - fi - - # MySQL support - local mysqllib="mysqlnd" - local mysqlilib="mysqlnd" - - our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") ) - - local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock" - if use mysql || use mysqli ; then - our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") ) - fi - - # ODBC support - our_conf+=( - $(use_with odbc unixODBC "${EPREFIX}/usr") - $(use_with iodbc iodbc "${EPREFIX}/usr") - ) - - # Oracle support - our_conf+=( $(use_with oci8-instant-client oci8) ) - - # PDO support - if use pdo ; then - our_conf+=( - $(use_with mssql pdo-dblib "${EPREFIX}/usr") - $(use_with mysql pdo-mysql "${mysqllib}") - $(use_with postgres pdo-pgsql) - $(use_with sqlite pdo-sqlite "${EPREFIX}/usr") - $(use_with firebird pdo-firebird "${EPREFIX}/usr") - $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr") - $(use_with oci8-instant-client pdo-oci) - ) - fi - - # readline/libedit support - our_conf+=( - $(use_with readline readline "${EPREFIX}/usr") - $(use_with libedit libedit "${EPREFIX}/usr") - ) - - # Session support - if use session ; then - our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") ) - else - our_conf+=( $(use_enable session session) ) - fi - - # Use pic for shared modules such as apache2's mod_php - our_conf+=( --with-pic ) - - # we use the system copy of pcre - # --with-pcre-regex affects ext/pcre - # --with-pcre-dir affects ext/filter and ext/zip - # --with-pcre-valgrind cannot be enabled with system pcre - # Many arches don't support pcre-jit - our_conf+=( - --with-pcre-regex="${EPREFIX}/usr" - --with-pcre-dir="${EPREFIX}/usr" - --without-pcre-valgrind - --without-pcre-jit - ) - - # Catch CFLAGS problems - # Fixes bug #14067. - # Changed order to run it in reverse for bug #32022 and #12021. - replace-cpu-flags "k6*" "i586" - - # Cache the ./configure test results between SAPIs. - our_conf+=( --cache-file="${T}/config.cache" ) - - # Support user-passed configuration parameters - our_conf+=( ${EXTRA_ECONF:-} ) - - # Support the Apache2 extras, they must be set globally for all - # SAPIs to work correctly, especially for external PHP extensions - - mkdir -p "${WORKDIR}/sapis-build" || die - for one_sapi in $SAPIS ; do - use "${one_sapi}" || continue - php_set_ini_dir "${one_sapi}" - - # The BUILD_DIR variable is used to determine where to output - # the files that autotools creates. This was all originally - # based on the autotools-utils eclass. - BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}" - cp -a "${S}" "${BUILD_DIR}" || die - cd "${BUILD_DIR}" || die - - local sapi_conf=( - --with-config-file-path="${PHP_INI_DIR}" - --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}" - ) - - for sapi in $SAPIS ; do - case "$sapi" in - cli|cgi|embed|fpm|phpdbg) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf+=( "--enable-${sapi}" ) - if [[ "fpm" == "${sapi}" ]] ; then - sapi_conf+=( - $(use_with acl fpm-acl) - $(use_with systemd fpm-systemd) - ) - fi - else - sapi_conf+=( "--disable-${sapi}" ) - fi - ;; - - apache2) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" ) - else - sapi_conf+=( --without-apxs2 ) - fi - ;; - esac - done - - # Construct the $myeconfargs array by concatenating $our_conf - # (the common args) and $sapi_conf (the SAPI-specific args). - local myeconfargs=( "${our_conf[@]}" ) - myeconfargs+=( "${sapi_conf[@]}" ) - - pushd "${BUILD_DIR}" > /dev/null || die - econf "${myeconfargs[@]}" - popd > /dev/null || die - done -} - -src_compile() { - # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index #nowarn - addpredict /var/lib/net-snmp/mib_indexes #nowarn - - for sapi in ${SAPIS} ; do - if use "${sapi}"; then - cd "${WORKDIR}/sapis-build/$sapi" || \ - die "Failed to change dir to ${WORKDIR}/sapis-build/$1" - emake - fi - done -} - -src_install() { - # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index #nowarn - - # grab the first SAPI that got built and install common files from there - local first_sapi="" - for sapi in $SAPIS ; do - if use $sapi ; then - first_sapi=$sapi - break - fi - done - - # Makefile forgets to create this before trying to write to it... - dodir "${PHP_DESTDIR#${EPREFIX}}/bin" - - # Install php environment (without any sapis) - cd "${WORKDIR}/sapis-build/$first_sapi" || die - emake INSTALL_ROOT="${D}" \ - install-build install-headers install-programs - - local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" - - # Create the directory where we'll put version-specific php scripts - keepdir "/usr/share/php${PHP_MV}" - - local sapi="", file="" - local sapi_list="" - - for sapi in ${SAPIS}; do - if use "${sapi}" ; then - einfo "Installing SAPI: ${sapi}" - cd "${WORKDIR}/sapis-build/${sapi}" || die - - if [[ "${sapi}" == "apache2" ]] ; then - # We're specifically not using emake install-sapi as libtool - # may cause unnecessary relink failures (see bug #351266) - insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" - newins ".libs/libphp${PHP_MV}$(get_libname)" \ - "libphp${PHP_MV}$(get_libname)" - keepdir "/usr/$(get_libdir)/apache2/modules" - else - # needed each time, php_install_ini would reset it - local dest="${PHP_DESTDIR#${EPREFIX}}" - into "${dest}" - case "$sapi" in - cli) - source="sapi/cli/php" - ;; - cgi) - source="sapi/cgi/php-cgi" - ;; - fpm) - source="sapi/fpm/php-fpm" - ;; - embed) - source="libs/libphp${PHP_MV}$(get_libname)" - ;; - phpdbg) - source="sapi/phpdbg/phpdbg" - ;; - *) - die "unhandled sapi in src_install" - ;; - esac - - if [[ "${source}" == *"$(get_libname)" ]]; then - dolib.so "${source}" - else - dobin "${source}" - local name="$(basename ${source})" - dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" - fi - fi - - php_install_ini "${sapi}" - - # construct correct SAPI string for php-config - # thanks to ferringb for the bash voodoo - if [[ "${sapi}" == "apache2" ]]; then - sapi_list="${sapi_list:+${sapi_list} }apache2handler" - else - sapi_list="${sapi_list:+${sapi_list} }${sapi}" - fi - fi - done - - # Installing opcache module - if use opcache ; then - into "${PHP_DESTDIR#${EPREFIX}}" - dolib.so "modules/opcache$(get_libname)" - fi - - # Install env.d files - newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}" - sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die - sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die - - # set php-config variable correctly (bug #278439) - sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ - "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die - - if use fpm ; then - if use systemd; then - systemd_newunit "${FILESDIR}/php-fpm_at.service" \ - "php-fpm@${SLOT}.service" - else - systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \ - "php-fpm@${SLOT}.service" - fi - fi -} - -src_test() { - echo ">>> Test phase [test]: ${CATEGORY}/${PF}" - PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" - if [[ ! -x "${PHP_BIN}" ]] ; then - ewarn "Test phase requires USE=cli, skipping" - return - else - export TEST_PHP_EXECUTABLE="${PHP_BIN}" - fi - - if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then - export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" - fi - - if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then - export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" - fi - - REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \ - "session.save_path=${T}" \ - "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \ - "session.save_path=${T}" - - for name in ${EXPECTED_TEST_FAILURES}; do - mv "${name}.out" "${name}.out.orig" 2>/dev/null || die - done - - local failed="$(find -name '*.out')" - if [[ ${failed} != "" ]] ; then - ewarn "The following test cases failed unexpectedly:" - for name in ${failed}; do - ewarn " ${name/.out/}" - done - else - einfo "No unexpected test failures, all fine" - fi - - if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then - local passed="" - for name in ${EXPECTED_TEST_FAILURES}; do - [[ -f "${name}.diff" ]] && continue - passed="${passed} ${name}" - done - if [[ ${passed} != "" ]] ; then - einfo "The following test cases passed unexpectedly:" - for name in ${passed}; do - ewarn " ${passed}" - done - else - einfo "None of the known-to-fail tests passed, all fine" - fi - fi -} - -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - elog - elog "To enable PHP in apache, you will need to add \"-D PHP\" to" - elog "your apache2 command. OpenRC users can append that string to" - elog "APACHE2_OPTS in /etc/conf.d/apache2." - elog - elog "The apache module configuration file 70_mod_php.conf is" - elog "provided (and maintained) by eselect-php." - elog - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} || die - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - # Remove dead symlinks for SAPIs that were just disabled. For - # example, if the user has the cgi SAPI enabled, then he has an - # eselect-php symlink for it. If he later reinstalls PHP with - # USE="-cgi", that symlink will break. This call to eselect is - # supposed to remove that dead link per bug 572436. - eselect php cleanup || die - - if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then - elog "To build extensions for this version of PHP, you will need to" - elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable." - elog - fi - - # Warn about the removal of PHP_INI_VERSION if the user has it set. - if [[ -n "${PHP_INI_VERSION}" ]]; then - ewarn 'The PHP_INI_VERSION variable has been phased out. You may' - ewarn 'remove it from your configuration at your convenience. See' - ewarn - ewarn ' https://bugs.gentoo.org/611214' - ewarn - ewarn 'for more information.' - fi - - elog "For details on how version slotting works, please see" - elog "the wiki:" - elog - elog " https://wiki.gentoo.org/wiki/PHP" - elog -} - -pkg_postrm() { - # This serves two purposes. First, if we have just removed the last - # installed version of PHP, then this will remove any dead symlinks - # belonging to eselect-php. Second, if a user upgrades slots from - # (say) 5.6 to 7.0 and depcleans the old slot, then this will update - # his existing symlinks to point to the new 7.0 installation. The - # latter is bug 432962. - # - # Note: the eselect-php package may not be installed at this point, - # so we can't die() if this command fails. - eselect php cleanup -} diff --git a/dev-lang/php/php-7.3.8.ebuild b/dev-lang/php/php-7.3.11.ebuild index c0862291df30..1dfeb73ef0b8 100644 --- a/dev-lang/php/php-7.3.8.ebuild +++ b/dev-lang/php/php-7.3.11.ebuild @@ -19,7 +19,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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/dev-lang/php/php-7.4.0_rc3.ebuild b/dev-lang/php/php-7.4.0_rc5.ebuild index 2e7801342bf1..ececc5cc430e 100644 --- a/dev-lang/php/php-7.4.0_rc3.ebuild +++ b/dev-lang/php/php-7.4.0_rc5.ebuild @@ -76,7 +76,7 @@ COMMON_DEPEND=" kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) diff --git a/dev-lang/polyml/Manifest b/dev-lang/polyml/Manifest index 5c530d4595e9..0571f7d9bfbe 100644 --- a/dev-lang/polyml/Manifest +++ b/dev-lang/polyml/Manifest @@ -23,4 +23,4 @@ EBUILD polyml-5.5.1.ebuild 1806 BLAKE2B 1ecd752ae24a16765064f85dc6aa380b1762b839 EBUILD polyml-5.5.2.ebuild 1963 BLAKE2B 0afb1711c472cccedc5be5fd0ae16a0334ca86339e29d7b34a027dbde181543b0fc76e9419dc2733cf99bd1bd9a153ba716bc9436c562a339e4c3112dea35f8b SHA512 1f090742acbe4b175a3d26fd785ae5958f8dec0bda6d7fd6a3feeec43bee3606f6b877da4f3dc1401edf67e5ef0bb5bf21e3609beebaf1b651669ef44482cda7 EBUILD polyml-5.6.ebuild 1204 BLAKE2B 787ecb938335da20e70beb7f09967659499d4e4a40265148139aa1ee0d6d5397fb95421398fcc7be790ac13a3cae5edf5c23c542c52a266c5b3418a7a41048ff SHA512 7cbf771fb1d557f5e96bc5c82aa46eb4f6b355fcbcb598601150ad89683da47d1b7a1ba561018e7987f26923ec7039d6deee3a518427b0d39a841fc4ec1f77aa EBUILD polyml-5.8.ebuild 1214 BLAKE2B 2c26b02a8d49677661d9ac15df5dd8e61ddccf2a8e7b5b9d29c727be640b9a9a30494218152fdf4cd837c6cd1892b55bdf6beb07bea19ee93386c60c00b63625 SHA512 5e41ab18a73ec4854ff3f33ea83626b13c3aaf2f373612c5bbba33c4414ae332d5eca488b6985df217344ecd5d78f11a288e882d9fd07088c2a56a35dc2fb7f7 -MISC metadata.xml 670 BLAKE2B 3f5e0084001a3b90b5343ac2005b3a7aadb03b9895311edc46ff64007ac126815a64e8ae674d247a844a8121e61fd7cbbbf0f3ebea733bfd3989210a35e4f72e SHA512 7a2b3853acd46379a5ea03a6ca6d18df36dc1e59cf7bbc29c2b21388fef3c8fb8fb59259e29d5e8b6730b741fd44989ba2d6b1ae3e08117cfa88845d328bba37 +MISC metadata.xml 562 BLAKE2B d0e0542c0805b1d57891bb765ac23cb32f2b37b07ba3986730adc7dc1b720203065483c090fdc8919a1ee2dce965a26d0f570af29f54e0ec7c0acd8ff43e4441 SHA512 be1481ffb11ab311905e734a6eb02883ff25f08d4698ed6dcab4ab76a380ff4eec19eed4db76f77f7ec9a0dc635887e3b7c89a8a153160fd91ab2a8cdec2dbe9 diff --git a/dev-lang/polyml/metadata.xml b/dev-lang/polyml/metadata.xml index 3ebf1da1683a..bdeea6761bc4 100644 --- a/dev-lang/polyml/metadata.xml +++ b/dev-lang/polyml/metadata.xml @@ -5,10 +5,6 @@ <email>ml@gentoo.org</email> <name>Gentoo ML Project</name> </maintainer> - <maintainer type="person"> - <email>tupone@gentoo.org</email> - <name>Tupone Alfredo</name> - </maintainer> <longdescription lang="en"> Poly/ML is a full implementation of Standard ML available as open-source. </longdescription> diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index 9511cd6e9796..e532f3836e1e 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -12,6 +12,7 @@ AUX python-3.5.5-hash-unaligned.patch 1451 BLAKE2B 30a0225118e17bf7f9177d423f50e AUX python-3.5.5-libressl-compatibility.patch 2158 BLAKE2B e171337d466b00720ea960a167abb26a3795ad1c516a770f3c2622753139bf4a166e43e3c479b87eeb62b9e325c3d5de71642e7be4b4d36c3919e0743c226ca6 SHA512 cbb7d9cd8bd8d39ec2a9b39ff494d1d93f4d91190f5f1dcbe293871427b1ad459729dd5ce4cb8efe22e5847b477c24fd5f076bd79c94b3e7d14d159be3313f75 AUX python-3.6.5-hash-unaligned.patch 1293 BLAKE2B d1e22b4f4c55d308b129801464e3464defa3bfba4c63c12bbcd0650f1391e3e30058f07aa3b5ec3a24df8ab5fba4f467343f44a7693f8afe798dbf245db0366a SHA512 2039104f7aac4f8edbacd5f678551aef62c068182104dbb6dcf9ac835c68d0fefa2cc9df97b8f09bb06e1b29f19c5c324f9c3d5f1161fadd223487d503de8e0d AUX python-3.6.5-libressl-compatibility.patch 3852 BLAKE2B 8e6860903f51bd1e783e1547d3eed76059eeea317ce0f2f98bd44df55c9be8a62973f687a029a972cac6cce63687763f824ad878d0548ec8ed71bf4c42d4b45b SHA512 4ae0e189f232d52303645391962c8390b00ae62fec45a03ddbad1b34a3eee5ef24c4d17c8a58709e452618ee0b570c2af7c01e456d285f02f5048fbbd2695ddc +AUX python-3.7.5-hashlib.patch 805 BLAKE2B e4c9c9446e5054f26b55f272c6d0174c0763edecf10e51da1328553a423ca9c444064b789837e520caf88f18474cfbadcc79c43ac8156595a6c05eb66b087d1e SHA512 a08dc39290a1e254e2d76f70b989d8f8f1e6f5aee3ed12b5ff4325d878d025e05d3ccb6de78aa77f63ebb11846a12d7c07d79c7b8dd7804f1b5a6f3082dc992c DIST Python-2.7.15.tar.xz 12642436 BLAKE2B d8783a48ea26695e8d4677397a08194c738d7e4bc8ecaddaab609ad1fd5a1ca07701f707fe38d259f6bd44a39171ef95e7530f3df4bcb4d94abc4d21d7e2d489 SHA512 27ea43eb45fc68f3d2469d5f07636e10801dee11635a430ec8ec922ed790bb426b072da94df885e4dfa1ea8b7a24f2f56dd92f9b0f51e162330f161216bd6de6 DIST Python-2.7.16.tar.xz 12752104 BLAKE2B 7d6b5b853f9974d44e04dd35ecdffaab87511e183b4b01dd4f8f4ee109c4b4ab208f045708f69717be9d3a706aa078b71438ed482c062c0b89c12730eae074ae SHA512 16e814e8dcffc707b595ca2919bd2fa3db0d15794c63d977364652c4a5b92e90e72b8c9e1cc83b5020398bd90a1b397dbdd7cb931c49f1aa4af6ef95414b43e0 DIST Python-3.5.5.tar.xz 15351440 BLAKE2B 217cb7f51e04d57983ce053ff4276d056e17c8223b6f3d87b69f556453fe2ae3d4dc2c1a6b9c2c6aad033cea9b40cd32264d8208cc81a1ec34ff252379bf95b8 SHA512 c9056baee6a2d1fe7f14b1f310db95b78e8972766d086f8ae10954f38f8182956171580bde01ddadebe897f2545a6fbe47669ca3e4887026ac1fae5ee9197f22 @@ -22,6 +23,7 @@ DIST Python-3.6.9.tar.xz 17212164 BLAKE2B ef33dbc1ea3bbeaf92092de867279d759e3a20 DIST Python-3.7.2.tar.xz 17042320 BLAKE2B 79b06b7d38590b7ad00850a4323156bfee07c4cf8531cbc09d262c6eb38721e32b8b0591fc21017e56948dd81763e9061f118f204eda5b9cc0b84e7132b42979 SHA512 6cd2d6d8455558783b99d55985cd7b22d67b98f41a09b4fdd96f680a630a4e035220d2b903f8c59ed513aa5ffe6730fa947ddb55bb72ce36f0e945ef8af5d971 DIST Python-3.7.3.tar.xz 17108364 BLAKE2B ac86ea442519a02f0afcb0d0ec70cb288ae28df63fc9f575ee4d8e03e6e31aff9ad2ff18ff5787d922727bd1c6f1a488f94541cd9787ac932d041c93847dea34 SHA512 6d9b7c0f1764e0f655a39430a3af6f7b5e3c9b7166c042e780677a54b17ad4ca6d0d9cba262c82b1b70bba8f7c28883dad4cc0d7cc194fc7d2c1b5f4f08a763a DIST Python-3.7.4.tar.xz 17131432 BLAKE2B e175f750f1fa610a19a40f382ae5e652de12c775cba41bf575868c0621a8e5c4060a15a5567c207b251de5304f8321191f5bc56388c253d42cf17c5654a88ebb SHA512 71f64668c259f3ed07bd4aa239dbba6cc1b6b0a84d50bbff160664845d7986f757e4d65fca327e62a2d12ba593742ca83a22f7cb6093aff8715ec916c2ba9416 +DIST Python-3.7.5.tar.xz 17236432 BLAKE2B fb49a3bfd9b1944d567a45682f789ef840e63ed610e0dddb5695da7a84a0bcb50a6fa52097722f09b57d6fc15a5f89aeaa46a061125219e597897086f3dffe40 SHA512 f4f3879881f260f58dbb041fb0f2f210d4b70b02a739e41e50e6fea67d31855a7a29ce4ebef66bfde3d0edf54b946a48f78490f986da965357b835d4dbb3f414 DIST python-gentoo-patches-2.7.15.tar.xz 16208 BLAKE2B 5739c2b3a236d48f8e33f0fe6515bfe7a8f99096f6223b402653988feac2513d37d26b6e40e5e049852f42657358170e468ca60097e0e2294e760787c12ad591 SHA512 687fd008d1d41b1e65ce5417f6f6aba84ffd42f7af44ef97c03a7806b28e6888f8df043a0c15187a8b229cc17642853e6feb25494db97f4d10f8a66f8ebcbcca DIST python-gentoo-patches-2.7.16.tar.xz 13904 BLAKE2B 218b46f8656f4a792dcd47eabca6d59a1558276b77676544991ee75914cd76dda84c36f43e72e477b850dd4cb52374d289f20dccd244a3b52ae5debaf3363432 SHA512 83f90545231c663a34c6925352a357a2b15997ac0362578a1893304c5070b5251922585ae8bc1bafb68d306bcddd4cdba4b6406648d473bd3e980eef65fe3ecd DIST python-gentoo-patches-3.5.4-0.tar.xz 11704 BLAKE2B 4a7d71feff18c7c8c109bed10748348484d314183c3de3ec950d5ca5ce7048bb322c470f3f5bff2d63eb7f2ed99c0fe75c621df050273d9d118681b28926061d SHA512 d395a87695f700598026038d6929ea5038abd7d494294037a4dfa02d5262203dbbaa6ae258a5a7f35ff5542f6266dcf69cc0b9c3df2a047cd2f6699a87e182ec @@ -31,13 +33,15 @@ DIST python-gentoo-patches-3.7.2.tar.xz 9776 BLAKE2B fe451c3fb44a1ace4489d1bc68d DIST python-gentoo-patches-3.7.3-0.tar.xz 9800 BLAKE2B b3e1df06cc2c404f08d2da7ea7d44c3612c5b4f908c58d469084b4e78ee4c3024e57879b3f83027d980c9f5e065804e3e144ba734b1da357d3d073c22c14b02e SHA512 deeaf5fbd1d557d4c40c770c1bd772b835bf5ced1842b964fd8ad1aa652b706782301e8a860d6fd1909d90246a8f48a9aaf384d047fca594f96d6771c2901338 DIST python-gentoo-patches-3.7.4-1.tar.xz 10100 BLAKE2B 63e8fada89b64b59ba083745626a1e8a07bec0cf93b7b6ab405c33a0f2932cbe497a331c52895a07f10434b230c438f27c9582efecdd57f3bad15d9aa604d157 SHA512 11b0e811a9890a1235c85426061b35f9964eba64cac0536f4c9e0498b1cc66eb005f14aed34eead735b43e91c2b5babced60e3310f5329231a1706871b95b547 EBUILD python-2.7.15.ebuild 10789 BLAKE2B c974e0ad029ddb6d5e7b156db15fc391998331aeb679837793572ceb6aa36e43003d65814cfdb7b9be021c8ffa48074cf2043199702cda316a58035b9165b2f2 SHA512 45eba035156e05ac023aa6a2671a61137aa21aa074bedc787ee666090532baeeb7f0d19a515530b7826a61008b154e915e517bdb38dfbc3a2286544cfc0fe64e -EBUILD python-2.7.16.ebuild 10819 BLAKE2B ca0d496540785ce79353e127e44c94f92ee2ee33635ba7b21feb19e3454b610d5dcdc40137cf728d11c559494eb430aa43a39ed7aed4d68f3e3c80e4fc7de905 SHA512 8b0a71e652593b3cfb4f64ce70be4d087482474353f69e179e8f8e05b39e703d1d010eb1209f5552928a55e82d212670ae1c25a7cf5b43786e71646c6be420c5 +EBUILD python-2.7.16.ebuild 10816 BLAKE2B c6eb565111c97d61d6082c1aa444f792ff263a7902a6cb591218938289fca8a43b3e12e805eed8a38033b023ac0501025e6174a8b6901c1959d8fba575a73ce6 SHA512 f6b053d94cd4ac135c136d28e5051fc25dedc532103e5ceb54d3920be3b75a863bb2a6112f9a02dc54e9f4a7ca6f9f55a99f7280be56f2eeab3c472048a3a312 EBUILD python-3.5.5.ebuild 10813 BLAKE2B e6f0cd525583c32bb1c0ab4559253b312d19a69406e6d772ac4d74c663394a7cd236a3d6b0cc1c5b0d95dda43e0c4ea1f1d16899b9e401afcd1c6a517529f7f0 SHA512 dd6ae17e7b5c9925615253b973b4e917f0bd7658849fd3f7e1d4420273cf4ce79e97543cebac4e89856a4dff3b768ba2c667acf62c2788e474b3f043d1a25983 -EBUILD python-3.5.7.ebuild 10969 BLAKE2B c868ee04308e0d495e4f88fdac1b9dd8d64ca059202722a66bc8d1da5ea2c350dfd305b336d5a11e4a4c7058eab435f54ae604e65508a354d14fa314aaa45de1 SHA512 a90d9417a75f82dcb183e980a93644a7b5acf1d0414317219a31b6dbb3fc4293ccda3661f814f4f39214429a52491d204d0ebc3392fb52c897118c925557e7e7 +EBUILD python-3.5.7.ebuild 10966 BLAKE2B e570cf9eda702a9ffc09a2979e661f711cbc7e960b09b86a75f2705b87161e91d0088ab240eec9928301d4da43b93dfc842256acd98e1c2f91e51141b05af2ec SHA512 4f9d706166b6a32008f62d0e78e7a33bbe52aff09529b7c73d1b6b8954395ea4a7bbb61e4b09cd2cf607bcd11dbb4af3c0cefb93075086c96e234e3e79b665fd EBUILD python-3.6.5.ebuild 10154 BLAKE2B 05284ffcbf682b8c9ffe2dd1e04a6e47de76af4899abca004861123526642c68deb7e125afee9202b54f42c89f4274d710216d58878274eba7dd0a5a72eb8fbc SHA512 28968bf203bbbb440fac2acf011d5d4d40b3fcc6c1a29c7f620ee0c1f739302dec497468dc788a7655927085fe15fb6ad152f65b057392e3dc46fbe4b711953e EBUILD python-3.6.8.ebuild 10201 BLAKE2B 0bc6249f03da4171528f38505b77a430cc50337e70a0adfb6e897f8f7a08319ac193696f8cf5ad474a8ac1a2f96a75324fd21621a5732e5e9933f618f7fb36f2 SHA512 06b6072ddcf0f52cfe95f78baaa056825003ff763a5e4d243aa9d6ac908453567126f1c7639e5f5154396568d01f9eb77ee3c4bae69b398229d599d164afaee1 -EBUILD python-3.6.9.ebuild 10193 BLAKE2B dee3a4bdcefc113fe2d9ae95e929b25c7ae2c47b811b49704698a9cea52f4921e80ffb3587bf6cfe87ea48260d78a50cab8086d8ef2e4465466fa850f6c055b5 SHA512 edafbf9be2577400d475315d9e93bde096afff65861d12b67f00272ae68a57c5593f9389d052055a5c85b6f8e0b1eb6e27f81ae7b3a8cfb9b10c74c7b4c2d4aa +EBUILD python-3.6.9.ebuild 10190 BLAKE2B 43830f64501bc22173272fa1ab6ad710879071937d4e9803b612c4625fe172838347898cec8c2b8c4f749cb1d07d9fd302ed50b95619ec27b966bb172fca825c SHA512 ef27e85bdf7aa4ff422c05da84be8fc7dcfbb4e4d508e12a8f51d6f4f6a74014f58d1320e62fa9f7721d158008d3c2c004e18dedffcbd02ac1ac43ee645e56fa EBUILD python-3.7.2.ebuild 9627 BLAKE2B 92c3fbd51a8bc9beb21de196c98810f5c586b26599bbf2cdfa11dd85c10d700aee82be8338d92f0abab965c8da0eb1d5b6cd5e097caadfbdcce66d85d67ef51e SHA512 697df3fbdb994c304f1608c4ebc45c93887c13ca03e7394fa4ee4f26f21aa6ca0d5bf204da58fa28b267f75cba2fca3056e6fbe54b89348690af5c831f1108f2 EBUILD python-3.7.3.ebuild 9772 BLAKE2B 52c197f9c85429667de4bc031c393d43785bd21562357890c67cb91296c24867f33045eb81abaa4edae9ccdfa32e12e9c73da8a5d2e66a90c00b699ab70b63f7 SHA512 5afc0a43935363d02374c840248498825c0c9aa237927373fcab89435fefddaa861217ccbf919b04944e2312b4b51b020a2e8f800d74672ab8c966f8f02c19cd EBUILD python-3.7.4-r1.ebuild 9775 BLAKE2B b8ce91301521719529199c1a53779ea909fa8de096d86339dc1adfb37efe0db9374e99952ada8d6c013aca7e1c6804b219a28b4ad5b9f6472889ffcd39dc198c SHA512 7b8011e11bfb315fbcd0e42f321d8e793d6f5f0ceadccecba133861fb53e0c94e09ecc1a7363a55b72a8e376f33d39eab72b878f1f2cde0e055c54724251bdbb +EBUILD python-3.7.5-r1.ebuild 9818 BLAKE2B d4611a2c059fb0305b4d5b9c8b0e515b2c599181336fe49be8a9b65ad24e5fcbbf20f11be660f54042c6f9c2459c46634558ba842363ff1ac8a3f2d3ce0f4028 SHA512 9f05a1e6c8807466e5dc51c5dd3529dd2fb1ece27866a38e4d360a116437baea499ffe0699977fa6c4634b276114b9c20544580863e620d2222ddd4447b7f820 +EBUILD python-3.7.5.ebuild 9775 BLAKE2B b8ce91301521719529199c1a53779ea909fa8de096d86339dc1adfb37efe0db9374e99952ada8d6c013aca7e1c6804b219a28b4ad5b9f6472889ffcd39dc198c SHA512 7b8011e11bfb315fbcd0e42f321d8e793d6f5f0ceadccecba133861fb53e0c94e09ecc1a7363a55b72a8e376f33d39eab72b878f1f2cde0e055c54724251bdbb MISC metadata.xml 819 BLAKE2B 120c7c65d77488e726c5a0f4aa19469867ea6900e747169fae2f9cf8f14ec2936089d5edfe1935ce610bec26387273e261b1cc4b023680c8c4b229f2141a7223 SHA512 08f45707e5490067a21951b9d37c8ae67064ab67cccc5b8d8c204eab8d4a004fb910627b62989c67b849b89d301618f8f8f7996e99e1ef5bab38a239c49c124d diff --git a/dev-lang/python/files/python-3.7.5-hashlib.patch b/dev-lang/python/files/python-3.7.5-hashlib.patch new file mode 100644 index 000000000000..a70a47963109 --- /dev/null +++ b/dev-lang/python/files/python-3.7.5-hashlib.patch @@ -0,0 +1,25 @@ +From 2c0c356ca109d1550bfb09b0da7dec3f80db77a3 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Fri, 18 Oct 2019 16:39:16 -0400 +Subject: [PATCH] Call OPENSSL_init_crypto for openssl >= 1.1.0 + +--- + Modules/_hashopenssl.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c +index b13ade60496..8abbde5120f 100644 +--- a/Modules/_hashopenssl.c ++++ b/Modules/_hashopenssl.c +@@ -1077,6 +1077,8 @@ PyInit__hashlib(void) + /* Load all digest algorithms and initialize cpuid */ + OPENSSL_add_all_algorithms_noconf(); + ERR_load_crypto_strings(); ++#else ++ OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS|OPENSSL_INIT_ADD_ALL_DIGESTS, NULL); + #endif + + /* TODO build EVP_functions openssl_* entries dynamically based +-- +2.23.0 + diff --git a/dev-lang/python/python-2.7.16.ebuild b/dev-lang/python/python-2.7.16.ebuild index 7035e3b6fa52..d156fc2a205e 100644 --- a/dev-lang/python/python-2.7.16.ebuild +++ b/dev-lang/python/python-2.7.16.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" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" 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/python/python-3.5.7.ebuild b/dev-lang/python/python-3.5.7.ebuild index e88a3eb75f87..1930b098f162 100644 --- a/dev-lang/python/python-3.5.7.ebuild +++ b/dev-lang/python/python-3.5.7.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz LICENSE="PSF-2" SLOT="3.5/3.5m" -KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" IUSE="bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml" RESTRICT="!test? ( test )" diff --git a/dev-lang/python/python-3.6.9.ebuild b/dev-lang/python/python-3.6.9.ebuild index 9c9b14ce8cb4..6d41d19996fa 100644 --- a/dev-lang/python/python-3.6.9.ebuild +++ b/dev-lang/python/python-3.6.9.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz LICENSE="PSF-2" SLOT="3.6/3.6m" -KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml" RESTRICT="!test? ( test )" diff --git a/dev-lang/python/python-3.7.5-r1.ebuild b/dev-lang/python/python-3.7.5-r1.ebuild new file mode 100644 index 000000000000..fb27d536f6e8 --- /dev/null +++ b/dev-lang/python/python-3.7.5-r1.ebuild @@ -0,0 +1,329 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs + +MY_P="Python-${PV}" +PATCHSET_VERSION="3.7.4-1" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE="https://www.python.org/" +SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz + https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" + +LICENSE="PSF-2" +SLOT="3.7/3.7m" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" +IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml" +RESTRICT="!test? ( test )" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND="app-arch/bzip2:0= + app-arch/xz-utils:0= + sys-apps/util-linux:0= + >=sys-libs/zlib-1.1.3:0= + virtual/libffi:= + virtual/libintl + gdbm? ( sys-libs/gdbm:0=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:0= ) + readline? ( >=sys-libs/readline-4.1:0= ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + tk? ( + >=dev-lang/tcl-8.0:0= + >=dev-lang/tk-8.0:0= + dev-tcltk/blt:0= + dev-tcltk/tix + ) + xml? ( >=dev-libs/expat-2.1:0= ) + !!<sys-apps/sandbox-2.6-r1" +# bluetooth requires headers from bluez +DEPEND="${RDEPEND} + bluetooth? ( net-wireless/bluez ) + test? ( app-arch/xz-utils[extra-filters(+)] ) + virtual/pkgconfig + !sys-devel/gcc[libffi(-)]" +RDEPEND+=" !build? ( app-misc/mime-types )" +PDEPEND=">=app-eselect/eselect-python-20140125-r1" + +S="${WORKDIR}/${MY_P}" +PYVER=${SLOT%/*} + +src_prepare() { + # Ensure that internal copies of expat, libffi and zlib are not used. + rm -fr Modules/expat + rm -fr Modules/_ctypes/libffi* + rm -fr Modules/zlib + + local PATCHES=( + "${FILESDIR}/python-3.7.5-hashlib.patch" + "${WORKDIR}/patches" + ) + + default + + sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ + setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + + eautoreconf +} + +src_configure() { + local disable + # disable automagic bluetooth headers detection + use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + export PYTHON_DISABLE_MODULES="${disable}" + + if ! use xml; then + ewarn "You have configured Python without XML support." + ewarn "This is NOT a recommended configuration as you" + ewarn "may face problems parsing any XML documents." + fi + + if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then + einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" + fi + + if [[ "$(gcc-major-version)" -ge 4 ]]; then + append-flags -fwrapv + fi + + filter-flags -malign-double + + # https://bugs.gentoo.org/show_bug.cgi?id=50309 + if is-flagq -O3; then + is-flagq -fstack-protector-all && replace-flags -O3 -O2 + use hardened && replace-flags -O3 -O2 + fi + + # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. + tc-export CXX + + # Set LDFLAGS so we link modules with -lpython3.2 correctly. + # Needed on FreeBSD unless Python 3.2 is already installed. + # Please query BSD team before removing this! + append-ldflags "-L." + + # Fix implicit declarations on cross and prefix builds. Bug #674070. + use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw + + local dbmliborder + if use gdbm; then + dbmliborder+="${dbmliborder:+:}gdbm" + fi + + local myeconfargs=( + --enable-shared + $(use_enable ipv6) + --infodir='${prefix}/share/info' + --mandir='${prefix}/share/man' + --with-computed-gotos + --with-dbmliborder="${dbmliborder}" + --with-libc= + --enable-loadable-sqlite-extensions + --without-ensurepip + --with-system-expat + --with-system-ffi + ) + + OPT="" econf "${myeconfargs[@]}" +} + +src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + + emake CPPFLAGS= CFLAGS= LDFLAGS= + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E python + else + pax-mark m python + fi +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + # Skip failing tests. + local skipped_tests="gdb" + + for test in ${skipped_tests}; do + mv "${S}"/Lib/test/test_${test}.py "${T}" + done + + # bug 660358 + local -x COLUMNS=80 + + local -x PYTHONDONTWRITEBYTECODE= + + emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local result=$? + + for test in ${skipped_tests}; do + mv "${T}/test_${test}.py" "${S}"/Lib/test + done + + elog "The following tests have been skipped:" + for test in ${skipped_tests}; do + elog "test_${test}.py" + done + + elog "If you would like to run them, you may:" + elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'" + elog "and run the tests separately." + + if [[ ${result} -ne 0 ]]; then + die "emake test failed" + fi +} + +src_install() { + local libdir=${ED%/}/usr/lib/python${PYVER} + + emake DESTDIR="${D}" altinstall + + sed \ + -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ + -e "s/\(PY_LDFLAGS=\).*/\1/" \ + -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed" + + # Fix collisions between different slots of Python. + rm -f "${ED%/}/usr/$(get_libdir)/libpython3.so" + + # Cheap hack to get version with ABIFLAGS + local abiver=$(cd "${ED%/}/usr/include"; echo python*) + if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm + rm "${ED%/}/usr/bin/python${PYVER}" || die + dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" + fi + + # python seems to get rebuilt in src_install (bug 569908) + # Work around it for now. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E "${ED%/}/usr/bin/${abiver}" + else + pax-mark m "${ED%/}/usr/bin/${abiver}" + fi + + use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die + use tk || rm -r "${ED%/}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die + + use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die + + dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + insinto /usr/share/doc/${PF}/examples + find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr + doins -r "${S}"/Tools + fi + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 + local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ + emake --no-print-directory -s -f - 2>/dev/null) + newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED%/}/etc/conf.d/pydoc-${PYVER}" "${ED%/}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + # for python-exec + local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) + + # if not using a cross-compiler, use the fresh binary + if ! tc-is-cross-compiler; then + local -x PYTHON=./python + local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} + else + vars=( PYTHON "${vars[@]}" ) + fi + + python_export "python${PYVER}" "${vars[@]}" + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_domodule epython.py + + # python-exec wrapping support + local pymajor=${PYVER%.*} + mkdir -p "${D%/}${PYTHON_SCRIPTDIR}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}" || die + ln -s "python${pymajor}" "${D%/}${PYTHON_SCRIPTDIR}/python" || die + # python-config and pythonX-config + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" "${D%/}${PYTHON_SCRIPTDIR}/python-config" || die + # 2to3, pydoc, pyvenv + ln -s "../../../bin/2to3-${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/pydoc" || die + ln -s "../../../bin/pyvenv-${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/pyvenv" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/idle" || die + fi +} + +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then + python_updater_warning="1" + fi +} + +eselect_python_update() { + if [[ -z "$(eselect python show)" || ! -f "${EROOT%/}/usr/bin/$(eselect python show)" ]]; then + eselect python update + fi + + if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT%/}/usr/bin/$(eselect python show --python${PV%%.*})" ]]; then + eselect python update --python${PV%%.*} + fi +} + +pkg_postinst() { + eselect_python_update + + if [[ "${python_updater_warning}" == "1" ]]; then + ewarn "You have just upgraded from an older version of Python." + ewarn + ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." + fi +} + +pkg_postrm() { + eselect_python_update +} diff --git a/dev-lang/python/python-3.7.5.ebuild b/dev-lang/python/python-3.7.5.ebuild new file mode 100644 index 000000000000..6ddae2e9d0b7 --- /dev/null +++ b/dev-lang/python/python-3.7.5.ebuild @@ -0,0 +1,328 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs + +MY_P="Python-${PV}" +PATCHSET_VERSION="3.7.4-1" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE="https://www.python.org/" +SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz + https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" + +LICENSE="PSF-2" +SLOT="3.7/3.7m" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" +IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml" +RESTRICT="!test? ( test )" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND="app-arch/bzip2:0= + app-arch/xz-utils:0= + sys-apps/util-linux:0= + >=sys-libs/zlib-1.1.3:0= + virtual/libffi:= + virtual/libintl + gdbm? ( sys-libs/gdbm:0=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:0= ) + readline? ( >=sys-libs/readline-4.1:0= ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + tk? ( + >=dev-lang/tcl-8.0:0= + >=dev-lang/tk-8.0:0= + dev-tcltk/blt:0= + dev-tcltk/tix + ) + xml? ( >=dev-libs/expat-2.1:0= ) + !!<sys-apps/sandbox-2.6-r1" +# bluetooth requires headers from bluez +DEPEND="${RDEPEND} + bluetooth? ( net-wireless/bluez ) + test? ( app-arch/xz-utils[extra-filters(+)] ) + virtual/pkgconfig + !sys-devel/gcc[libffi(-)]" +RDEPEND+=" !build? ( app-misc/mime-types )" +PDEPEND=">=app-eselect/eselect-python-20140125-r1" + +S="${WORKDIR}/${MY_P}" +PYVER=${SLOT%/*} + +src_prepare() { + # Ensure that internal copies of expat, libffi and zlib are not used. + rm -fr Modules/expat + rm -fr Modules/_ctypes/libffi* + rm -fr Modules/zlib + + local PATCHES=( + "${WORKDIR}/patches" + ) + + default + + sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ + setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + + eautoreconf +} + +src_configure() { + local disable + # disable automagic bluetooth headers detection + use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + export PYTHON_DISABLE_MODULES="${disable}" + + if ! use xml; then + ewarn "You have configured Python without XML support." + ewarn "This is NOT a recommended configuration as you" + ewarn "may face problems parsing any XML documents." + fi + + if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then + einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" + fi + + if [[ "$(gcc-major-version)" -ge 4 ]]; then + append-flags -fwrapv + fi + + filter-flags -malign-double + + # https://bugs.gentoo.org/show_bug.cgi?id=50309 + if is-flagq -O3; then + is-flagq -fstack-protector-all && replace-flags -O3 -O2 + use hardened && replace-flags -O3 -O2 + fi + + # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. + tc-export CXX + + # Set LDFLAGS so we link modules with -lpython3.2 correctly. + # Needed on FreeBSD unless Python 3.2 is already installed. + # Please query BSD team before removing this! + append-ldflags "-L." + + # Fix implicit declarations on cross and prefix builds. Bug #674070. + use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw + + local dbmliborder + if use gdbm; then + dbmliborder+="${dbmliborder:+:}gdbm" + fi + + local myeconfargs=( + --enable-shared + $(use_enable ipv6) + --infodir='${prefix}/share/info' + --mandir='${prefix}/share/man' + --with-computed-gotos + --with-dbmliborder="${dbmliborder}" + --with-libc= + --enable-loadable-sqlite-extensions + --without-ensurepip + --with-system-expat + --with-system-ffi + ) + + OPT="" econf "${myeconfargs[@]}" +} + +src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + + emake CPPFLAGS= CFLAGS= LDFLAGS= + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E python + else + pax-mark m python + fi +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + # Skip failing tests. + local skipped_tests="gdb" + + for test in ${skipped_tests}; do + mv "${S}"/Lib/test/test_${test}.py "${T}" + done + + # bug 660358 + local -x COLUMNS=80 + + local -x PYTHONDONTWRITEBYTECODE= + + emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local result=$? + + for test in ${skipped_tests}; do + mv "${T}/test_${test}.py" "${S}"/Lib/test + done + + elog "The following tests have been skipped:" + for test in ${skipped_tests}; do + elog "test_${test}.py" + done + + elog "If you would like to run them, you may:" + elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'" + elog "and run the tests separately." + + if [[ ${result} -ne 0 ]]; then + die "emake test failed" + fi +} + +src_install() { + local libdir=${ED%/}/usr/lib/python${PYVER} + + emake DESTDIR="${D}" altinstall + + sed \ + -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ + -e "s/\(PY_LDFLAGS=\).*/\1/" \ + -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed" + + # Fix collisions between different slots of Python. + rm -f "${ED%/}/usr/$(get_libdir)/libpython3.so" + + # Cheap hack to get version with ABIFLAGS + local abiver=$(cd "${ED%/}/usr/include"; echo python*) + if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm + rm "${ED%/}/usr/bin/python${PYVER}" || die + dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" + fi + + # python seems to get rebuilt in src_install (bug 569908) + # Work around it for now. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E "${ED%/}/usr/bin/${abiver}" + else + pax-mark m "${ED%/}/usr/bin/${abiver}" + fi + + use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die + use tk || rm -r "${ED%/}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die + + use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die + + dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + insinto /usr/share/doc/${PF}/examples + find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr + doins -r "${S}"/Tools + fi + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 + local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ + emake --no-print-directory -s -f - 2>/dev/null) + newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED%/}/etc/conf.d/pydoc-${PYVER}" "${ED%/}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + # for python-exec + local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) + + # if not using a cross-compiler, use the fresh binary + if ! tc-is-cross-compiler; then + local -x PYTHON=./python + local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} + else + vars=( PYTHON "${vars[@]}" ) + fi + + python_export "python${PYVER}" "${vars[@]}" + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_domodule epython.py + + # python-exec wrapping support + local pymajor=${PYVER%.*} + mkdir -p "${D%/}${PYTHON_SCRIPTDIR}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}" || die + ln -s "python${pymajor}" "${D%/}${PYTHON_SCRIPTDIR}/python" || die + # python-config and pythonX-config + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" "${D%/}${PYTHON_SCRIPTDIR}/python-config" || die + # 2to3, pydoc, pyvenv + ln -s "../../../bin/2to3-${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/pydoc" || die + ln -s "../../../bin/pyvenv-${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/pyvenv" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/idle" || die + fi +} + +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then + python_updater_warning="1" + fi +} + +eselect_python_update() { + if [[ -z "$(eselect python show)" || ! -f "${EROOT%/}/usr/bin/$(eselect python show)" ]]; then + eselect python update + fi + + if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT%/}/usr/bin/$(eselect python show --python${PV%%.*})" ]]; then + eselect python update --python${PV%%.*} + fi +} + +pkg_postinst() { + eselect_python_update + + if [[ "${python_updater_warning}" == "1" ]]; then + ewarn "You have just upgraded from an older version of Python." + ewarn + ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." + fi +} + +pkg_postrm() { + eselect_python_update +} diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest index 82516bcb4458..4a1cf25f921e 100644 --- a/dev-lang/ruby/Manifest +++ b/dev-lang/ruby/Manifest @@ -12,18 +12,10 @@ AUX 2.5/011-no-gems.patch 3139 BLAKE2B ce05d6ef90001b3011167ba0827ef7852173fa508 AUX 2.6/005_no-undefined-ext.patch 486 BLAKE2B 715f952cab863847f420afb020cac6819e4ab4e8f5527bdf550dd51eef37e272e7e89cbda5b6f9f137fdac89dfc5e99d42be8ae5712c255f11a0628cf07dc84d SHA512 6bbded9fce0c091b7cfb170c9dc2b0882b0e8bbf8fe31eaf596f3620853c8c75aa64c2648d5a72a0208a6ab6d711eb080a2d6aa98352933eda3b874bdd39cee8 AUX 2.6/009_no-gems.patch 1261 BLAKE2B 359d0a73c374e5c464eb0343d33272244bb88ba200977007a93f3c3c776779a013174fc2c97717e4ae4a1495011d3baae80e68b07433eab1320955a49aed8b59 SHA512 1607b9c2021e5b5f08cf28c64d3f3ddd077bc47df02a353182a9bc70dc6831ea18e8681d9808bb6841939d64082ae4966081014ee110d2090ec67ffe8faa9b8b AUX 2.6/010-default-gem-location.patch 688 BLAKE2B 4c2074d69b9fe5258a2fe0e38bb501a39f34ad1fa08ef338224edba1f06073138cbe3d831ecdf9910c989a7f0a1c6c6b73ced0d8ff212207a3a3df5f4d90b5de SHA512 65206a6ca42ade0413ae1467f41082f4a93b3166644d2504cff3d280d23da02fd41aea5aca69dd43f6081b436db90a5b1e98725d8fa51519ca302c02ec526ad7 -DIST ruby-2.4.7.tar.xz 10118948 BLAKE2B e85e051e9dbac8e7f87bd6187dc105b89a6bc7197c811bd51bf25b109781b8ec79c02e48887cbac841d38922d278da4ee32d8cf14e180083f4a902d77c4ec2dc SHA512 df637c5803ddd83f759e9c24b0e7ca1f6cae7c7b353409583d92dbffece0d9d02b48905d6552327a1522a4a37d4e2d22c6c11bd991383835be35e2f31739d649 DIST ruby-2.4.9.tar.xz 10078316 BLAKE2B ad83adf6b884a9a36e83cc754077f706afa221a9e8b81d92f6b6a1b829dc0350bdacd67b0b4e1e196a17e3f7d1c65f1e9b38e245aeddf089576eaca7d051701b SHA512 9046575315c29c789427c2d00c832f0c0970e47fd158bbe8e4f2df5cff2ea9c06c65c3493adb4656e5b32ebfdc546092911f98a8ad7f698bc001c290db5888c7 -DIST ruby-2.5.6.tar.xz 11323612 BLAKE2B 5db6d573089a9fba95a1027891a0116c14d495b342ca8f055bd1ad55942f2a15a65a61cc1a0f6f249cd10fe2f6161f3ab0066a6dbce8e480e55b76ca5bdb5cd9 SHA512 4fe5f8bad5d320f8f17b02ce15afee341e7b0074efcfd98d8944e0cb7c448e0660c4553dd5c0328ee3b49fea3247642f85c60bdce431ed57f58b6326dfd48ee1 DIST ruby-2.5.7.tar.xz 11296440 BLAKE2B 6f3590f30c7b196145a83490abed24b0059521374a03086646186b20670bfed548ea744c910c8eda0d11607d8673644d7fb23ff9091dd2f6dfcbc43080fe0f97 SHA512 63b7c75fab44cd1bd22f22ddec00c740cf379ac7240da0dfafcec54347766695faef47428ce1c433fd77fa96992e976c984697067fa526236d383b12adc9ce75 -DIST ruby-2.6.3.tar.xz 11904360 BLAKE2B 8113e5a19b967cdf995a3c8d3c83aeab3bf89e975d3b039c64259e97f20dbe9ebd96ada093f9d330516d16ef78bb0ecbbac8f3facd467aa13f1f70b23b992f82 SHA512 959a613f5cf5b3185a1d7a7ba0e1921166b3930f30461b391b1c9fcfe396f56dc3c736123dfc7b4e72c32a97dc5a1eb1fd7f09bcc3793a3c5526f6644ba421c8 -DIST ruby-2.6.4.tar.xz 11727940 BLAKE2B abeff89d50612d6426e1dc5fd7c15c83ef9714ddb38c64ed14bff6331c619b0a55d4a64bff49177576c3fae8cfcee30127e808f49d11b3e64a2230a043e16bd3 SHA512 930a4162fdb008d2446247908c14269fd13db4dc80bd2bb201a65a69c03f5933f97b4c5079ccd2a12db4934ff97b2debaa10a6c6f5c3060e55873f4397747eaa DIST ruby-2.6.5.tar.xz 11553580 BLAKE2B 07739a92ff17467fe6d31bb4dce56ae35fd9c67bb697ebc00b4845474c75d8377c77916e6e129512cfffcf76bd60e6327e818e899b6160f3222912654d5eb118 SHA512 e8ae3b5d4d23a93d0ef6057235ad0e573665a8b4b6544e1c70b4cce9c4d2fb9094e5c8fe8a9ab7b9996efe3ada603f9b4ef1fd08fb5a83253c1ae2b5e3f202db -EBUILD ruby-2.4.7.ebuild 6647 BLAKE2B 40be143f889c88358eff3b7e8e56b0c1b5932d49315ecb91559b8ce2b9874e5839f75a5575514456dbb343d870c2a4f169fb54773494c7f472ca4a8284d0abb9 SHA512 ff0c7406f40761e1100fb1cb4fc6ae2fbb40db83a68cf77c2516c72c80faab7e92e16024f5ff912b7dbfc6da232607e71590969665773899fb41d93fedf10acf -EBUILD ruby-2.4.9.ebuild 6648 BLAKE2B 7f89ae3ac7ab4d64414b491f94d6e44d0f4d7e46218d65bd7f396dd62603b1df6b347015f83668d8e81ee59a44863dcb951f55d5e462e34c64ea7daff8e2f2f5 SHA512 cd4de65c67ceba85f429974e5686e920625f1e0d2b2cc18d8de456fcf11629f56f50db45e41d894ecc7689b8cb90e502eb7eeb703b1862127bfb34c8a940b20f -EBUILD ruby-2.5.6.ebuild 6437 BLAKE2B 2b7d9223af0ae4ffe45f5356629d6fb4174bd217da576b765b129f5f0a0d58986e15eec0a748feb451fb39954dab3c85f16a6dc45eaf8920747bfc8c498b4f32 SHA512 5f235570cfc01035b478bd4c01cc5283d2d2858b5efb437a49a4b6732c0c54bc388ac6e52c1ef916652b702e4942980b39f795cc2e946177f47e46ff7fba4c8c -EBUILD ruby-2.5.7.ebuild 6438 BLAKE2B de9b0c84bf020f9d6b50d0d912c119c9b6757a386b2cce9eed11bf6009b54e252dfcdb5d4f57ea0dc348778916b0de3597b19ddd5191ee15ae998f726cf5daad SHA512 c9b1c883e90f3f53f959feef94b4f7e67ef6c09110cef8be43eb0fd6691c77b46a925f399294dad5c0ebdd3f20254f4e9a0935c5ab8b421ac5139fb9aeb999eb -EBUILD ruby-2.6.3.ebuild 6892 BLAKE2B dd36bbda5383461ca3dd17823103ee9b3ac3194b52e887b9cb0c28b72734b97a4882762420ae677a52da72bda58b289b0249bd2a8a0e5a0d98b49df8249cfafc SHA512 7cb3536cf36f1bd7010cfdb958673d8c21a896e9a200df2feaa3ac2cead747b5420c80ae5d0742223442552d04a135dc347b51fe5a59cb63a831d154a10fe72c -EBUILD ruby-2.6.4.ebuild 6892 BLAKE2B e4059bf9b2708570202697028ee43ff1cc193d3ed9a4aa68654a049778ed02145466ae24158b02a221e3eef92cccdc2233c4db9e3a25fa2a3c33efa0f3cb2831 SHA512 aeaca4b314c7dca0538070bb3c20a44e623e74d2f83f97502f9f3ce5404519172577ec4770695a9f3f0fee24e6d329b63ab84d76799e0f1ddfb87a8a7482a813 +EBUILD ruby-2.4.9.ebuild 6647 BLAKE2B 40be143f889c88358eff3b7e8e56b0c1b5932d49315ecb91559b8ce2b9874e5839f75a5575514456dbb343d870c2a4f169fb54773494c7f472ca4a8284d0abb9 SHA512 ff0c7406f40761e1100fb1cb4fc6ae2fbb40db83a68cf77c2516c72c80faab7e92e16024f5ff912b7dbfc6da232607e71590969665773899fb41d93fedf10acf +EBUILD ruby-2.5.7.ebuild 6437 BLAKE2B 2b7d9223af0ae4ffe45f5356629d6fb4174bd217da576b765b129f5f0a0d58986e15eec0a748feb451fb39954dab3c85f16a6dc45eaf8920747bfc8c498b4f32 SHA512 5f235570cfc01035b478bd4c01cc5283d2d2858b5efb437a49a4b6732c0c54bc388ac6e52c1ef916652b702e4942980b39f795cc2e946177f47e46ff7fba4c8c EBUILD ruby-2.6.5.ebuild 6892 BLAKE2B e4059bf9b2708570202697028ee43ff1cc193d3ed9a4aa68654a049778ed02145466ae24158b02a221e3eef92cccdc2233c4db9e3a25fa2a3c33efa0f3cb2831 SHA512 aeaca4b314c7dca0538070bb3c20a44e623e74d2f83f97502f9f3ce5404519172577ec4770695a9f3f0fee24e6d329b63ab84d76799e0f1ddfb87a8a7482a813 MISC metadata.xml 445 BLAKE2B c3b5fae44894da3c78d024a376522aa2ef486cd9435351ddd7fa8b7c9afdc36969251a3b043d5890a368616f0736ae80e2a65a7342b327f30eb3497c5c02d28a SHA512 3818ac938dd6f8a05e18662f83af542fb29af00a476362592afa86bc537a74ddd0abe275784340539b2cd38f97ad1fce8b8c427c65d61c05a90b2118f2d16a91 diff --git a/dev-lang/ruby/ruby-2.4.7.ebuild b/dev-lang/ruby/ruby-2.4.7.ebuild deleted file mode 100644 index 855960b6f5cf..000000000000 --- a/dev-lang/ruby/ruby-2.4.7.ebuild +++ /dev/null @@ -1,230 +0,0 @@ -# Copyright 1999-2019 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="https://cache.ruby-lang.org/pub/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" -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/readline:0= - 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-r1[ruby_targets_ruby24] ) - xemacs? ( app-xemacs/ruby-modes )" - -src_prepare() { - eapply "${FILESDIR}"/${SLOT}/{002,005,009,012}*.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.4.9.ebuild b/dev-lang/ruby/ruby-2.4.9.ebuild index 5cf5c3c50bee..855960b6f5cf 100644 --- a/dev-lang/ruby/ruby-2.4.9.ebuild +++ b/dev-lang/ruby/ruby-2.4.9.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/" SRC_URI="https://cache.ruby-lang.org/pub/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" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86" IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs" RDEPEND=" diff --git a/dev-lang/ruby/ruby-2.5.6.ebuild b/dev-lang/ruby/ruby-2.5.6.ebuild deleted file mode 100644 index ccfb4c30760d..000000000000 --- a/dev-lang/ruby/ruby-2.5.6.ebuild +++ /dev/null @@ -1,225 +0,0 @@ -# Copyright 1999-2019 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="https://cache.ruby-lang.org/pub/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" -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/readline:0= - 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-6.1.2[ruby_targets_ruby25] ) - xemacs? ( app-xemacs/ruby-modes )" - -src_prepare() { - eapply "${FILESDIR}"/${SLOT}/{001,005,011}*.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/ruby/ruby-2.5.7.ebuild b/dev-lang/ruby/ruby-2.5.7.ebuild index 34cb5f1f8813..ccfb4c30760d 100644 --- a/dev-lang/ruby/ruby-2.5.7.ebuild +++ b/dev-lang/ruby/ruby-2.5.7.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/" SRC_URI="https://cache.ruby-lang.org/pub/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" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86" IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs" RDEPEND=" diff --git a/dev-lang/ruby/ruby-2.6.3.ebuild b/dev-lang/ruby/ruby-2.6.3.ebuild deleted file mode 100644 index b50b2f69661d..000000000000 --- a/dev-lang/ruby/ruby-2.6.3.ebuild +++ /dev/null @@ -1,237 +0,0 @@ -# Copyright 1999-2019 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="https://cache.ruby-lang.org/pub/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" -IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs" - -RDEPEND=" - berkdb? ( sys-libs/db:= ) - gdbm? ( sys-libs/gdbm:= ) - jemalloc? ( dev-libs/jemalloc ) - jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) - 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/readline:0= - sys-libs/zlib - >=app-eselect/eselect-ruby-20171225 -" - -DEPEND="${RDEPEND}" - -BUNDLED_GEMS=" - >=dev-ruby/did_you_mean-1.2.1[ruby_targets_ruby26] - >=dev-ruby/minitest-5.11.3[ruby_targets_ruby26] - >=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby26] - >=dev-ruby/power_assert-1.1.3[ruby_targets_ruby26] - >=dev-ruby/rake-12.3.2[ruby_targets_ruby26] - >=dev-ruby/test-unit-3.2.9[ruby_targets_ruby26] - >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby26] -" - -PDEPEND=" - ${BUNDLED_GEMS} - virtual/rubygems[ruby_targets_ruby26] - >=dev-ruby/bundler-1.17.2[ruby_targets_ruby26] - >=dev-ruby/json-2.0.2[ruby_targets_ruby26] - rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby26] ) - xemacs? ( app-xemacs/ruby-modes )" - -src_prepare() { - # 005 does not compile bigdecimal and is questionable because it - # compiles ruby in a non-standard way, may be dropped - eapply "${FILESDIR}"/2.6/010*.patch - - einfo "Unbundling gems..." - cd "$S" - # Remove bundled gems that we will install via PDEPEND, bug - # 539700. - rm -fr gems/* || 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 jit jit-support ) \ - $(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" - - # Makefile is broken because it lacks -ldl - rm -rf ext/-test-/popen_deadlock || die -} - -src_compile() { - emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS="" || 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 - rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || 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 - - # Create directory for the default gems - local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}" - mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed" - - emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} 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/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" - - if use doc; then - emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} 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.6.4.ebuild b/dev-lang/ruby/ruby-2.6.4.ebuild deleted file mode 100644 index 57bd24dcd4f5..000000000000 --- a/dev-lang/ruby/ruby-2.6.4.ebuild +++ /dev/null @@ -1,237 +0,0 @@ -# Copyright 1999-2019 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="https://cache.ruby-lang.org/pub/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" -IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs" - -RDEPEND=" - berkdb? ( sys-libs/db:= ) - gdbm? ( sys-libs/gdbm:= ) - jemalloc? ( dev-libs/jemalloc ) - jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) - 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/readline:0= - sys-libs/zlib - >=app-eselect/eselect-ruby-20171225 -" - -DEPEND="${RDEPEND}" - -BUNDLED_GEMS=" - >=dev-ruby/did_you_mean-1.2.1[ruby_targets_ruby26] - >=dev-ruby/minitest-5.11.3[ruby_targets_ruby26] - >=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby26] - >=dev-ruby/power_assert-1.1.3[ruby_targets_ruby26] - >=dev-ruby/rake-12.3.2[ruby_targets_ruby26] - >=dev-ruby/test-unit-3.2.9[ruby_targets_ruby26] - >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby26] -" - -PDEPEND=" - ${BUNDLED_GEMS} - virtual/rubygems[ruby_targets_ruby26] - >=dev-ruby/bundler-1.17.2[ruby_targets_ruby26] - >=dev-ruby/json-2.0.2[ruby_targets_ruby26] - rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby26] ) - xemacs? ( app-xemacs/ruby-modes )" - -src_prepare() { - # 005 does not compile bigdecimal and is questionable because it - # compiles ruby in a non-standard way, may be dropped - eapply "${FILESDIR}"/2.6/010*.patch - - einfo "Unbundling gems..." - cd "$S" - # Remove bundled gems that we will install via PDEPEND, bug - # 539700. - rm -fr gems/* || 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 jit jit-support ) \ - $(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" - - # Makefile is broken because it lacks -ldl - rm -rf ext/-test-/popen_deadlock || die -} - -src_compile() { - emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS="" || 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 - rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || 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 - - # Create directory for the default gems - local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}" - mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed" - - emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} 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/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" - - if use doc; then - emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} 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/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest index 71e441bb567a..0295a1ce61f5 100644 --- a/dev-lang/swi-prolog/Manifest +++ b/dev-lang/swi-prolog/Manifest @@ -1,9 +1,7 @@ DIST swipl-8.0.3.tar.gz 10418553 BLAKE2B d7d381a3070384164f9788060e1c431cc4658dd3e2144fc4c186c9f5395fb7356593766dcaff3ff424f19f917c8a4b56da31b019bd2206a7f794ece549043b76 SHA512 e3a0788befb5499be6f70524ef398dc3282a38891f20519dd23ec92f216fc1919a76656e4b648c3dc9d94e578dc2663439ff976eb52ca0dba5a6594f8d4d3037 -DIST swipl-8.1.12.tar.gz 10762243 BLAKE2B a495b471fc4bbe296e5a7821fb51eba960056bd155f5c33a4d1764556209d6be11229d358aa16e57c4604f0ea6d0a6a73c61d67b7f535c5ed2f5a654c7ea2a17 SHA512 daae1a015ea7089a1ad2ef4a6def8d65fcac84bb78bff06a4012b39cf797c2109f2ce64ff847fbc9bde833bbf3f88ebb0d43884c3989630ca1d921ed4e3c19a2 -DIST swipl-8.1.13.tar.gz 10760459 BLAKE2B 74259267351ced6943cb380464cd0370da66e47919a99cd900c98e76964792eb8d2a0d36b93d2f93c3d65af97fc2bf461aba20d8dc4e1173b5f52fd2d34950d2 SHA512 849d5168c3c722126e60497fd7b086f37541a3d0d2af92edb997c038d6fb5da44502c5a89af473cae89f313a92efcec737774adc462a0dca66833273b3c1c29f DIST swipl-8.1.14.tar.gz 10772544 BLAKE2B d272b6cd5a096d6422a2afc7fe27354c3c0e45462580e05c85916b604b28566d6f454fff1cf72c4194194fdea2577c0c73c9c9e556322eee4d904e079e5a5bd7 SHA512 360c18af7e53c85f33bfa1afbe19f99c6afbe72e8f86436dfc034485f92dd60d1fa1320826438532bd84f842ccba730826efefecdc4fdbae0d2f71bc590c4ae5 +DIST swipl-8.1.15.tar.gz 10786301 BLAKE2B e79795f92e269dfc9b8150d63cfac946285a4a433ae2d4445b381ac37fe5bfb9df2f9d1fe48b3531c430a792d74414fdb0219b2ec14b75a974639246402e67fa SHA512 97d2873acb5c5a9806e6c8a99633a093a62cb3f6c693b42265a97d9c3bb0d44b286627a2a962ba031c99be6a19f5a63eada831b625deb8e22dc9423136788f2e EBUILD swi-prolog-8.0.3.ebuild 2463 BLAKE2B 1aee3b4be56dc6e445fcefc0a9843cb06084cd1e087849266659f9e70152713804b7f75fe189b2738734aa5e8c4be3aeb570fbfab4355bc4f6de0a18dd34e0ad SHA512 5f6b2960cf8febc69ae1e7cbc0470d33be40ec9f07d7ad00d8e4b20d96848010a99a725a2f922b212b9ed1e03c2bc1933e703e82bcaff78d4d63ff82bf9fc1aa -EBUILD swi-prolog-8.1.12.ebuild 2465 BLAKE2B 1fa3a76348cca7b520023a84db9d9b2beeb07ecdea1a289a47d7eb52f0b3d06f99c1e2355136ce20809c885dbb698c609f02e76f393859c043bd4998f4b5a4a9 SHA512 38405b19366bf1c35ea8dccfd28e64c7525091053f7dd919ecc0ff7a3748b7f0bab6a1a09d88b32d83928a207ebb925df9686c527b306b4d967469d42f665954 -EBUILD swi-prolog-8.1.13.ebuild 2465 BLAKE2B 1fa3a76348cca7b520023a84db9d9b2beeb07ecdea1a289a47d7eb52f0b3d06f99c1e2355136ce20809c885dbb698c609f02e76f393859c043bd4998f4b5a4a9 SHA512 38405b19366bf1c35ea8dccfd28e64c7525091053f7dd919ecc0ff7a3748b7f0bab6a1a09d88b32d83928a207ebb925df9686c527b306b4d967469d42f665954 EBUILD swi-prolog-8.1.14.ebuild 2465 BLAKE2B 1fa3a76348cca7b520023a84db9d9b2beeb07ecdea1a289a47d7eb52f0b3d06f99c1e2355136ce20809c885dbb698c609f02e76f393859c043bd4998f4b5a4a9 SHA512 38405b19366bf1c35ea8dccfd28e64c7525091053f7dd919ecc0ff7a3748b7f0bab6a1a09d88b32d83928a207ebb925df9686c527b306b4d967469d42f665954 +EBUILD swi-prolog-8.1.15.ebuild 2567 BLAKE2B 34b0929efa75401f1461da681e237c502ba3ba15c4eb08741fc03bf1961328b0b0a492e4c0ac90da8e6ddfe8398065c06e39986a16a82f0e6b472c398cc597b7 SHA512 941fe6958b110cbfefbfc0ee8c6fc0f59ba8899cfbac15c57e38cd957b01d28fa60c194f88a117239418ff6e2dcac71d73fda8f01350e7cc55145d90913a9fac MISC metadata.xml 419 BLAKE2B 6d92e0713ed8da803ff8b6c778e616882af2fdb1426a62ea7bb6a265bbfff9a5c7debb8bf6a25c4ab60ed54a865b79fa3da4a09bc8a9123acf63dcb32107f54e SHA512 f805393c909e4108fe72b94f131d37d45279af1a4b501f9c3ae12d21590ef9c19227ca2a4b2966239ddb84847ce979cfbfcf3f3a2d24b60cb23977c522ff59c3 diff --git a/dev-lang/swi-prolog/swi-prolog-8.1.13.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.13.ebuild deleted file mode 100644 index b986aa50d899..000000000000 --- a/dev-lang/swi-prolog/swi-prolog-8.1.13.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils eutils flag-o-matic multilib - -PATCHSET_VER="0" - -DESCRIPTION="versatile implementation of the Prolog programming language" -HOMEPAGE="http://www.swi-prolog.org/" -SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml" - -RDEPEND="sys-libs/ncurses:= - sys-libs/zlib - archive? ( app-arch/libarchive ) - berkdb? ( >=sys-libs/db-4:= ) - odbc? ( dev-db/unixODBC ) - pcre? ( dev-libs/libpcre ) - readline? ( sys-libs/readline:= ) - libedit? ( dev-libs/libedit ) - gmp? ( dev-libs/gmp:0 ) - ssl? ( - !libressl? ( dev-libs/openssl:0 ) - libressl? ( dev-libs/libressl ) - ) - java? ( >=virtual/jdk-1.7:= ) - uuid? ( dev-libs/ossp-uuid ) - qt5? ( - dev-qt/qtwidgets:5 - dev-qt/qtgui:5 - ) - X? ( - virtual/jpeg:0 - x11-libs/libX11 - x11-libs/libXft - x11-libs/libXinerama - x11-libs/libXpm - x11-libs/libXt - x11-libs/libICE - x11-libs/libSM ) - yaml? ( dev-libs/libyaml )" - -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto ) - java? ( test? ( =dev-java/junit-3.8* ) )" - -S="${WORKDIR}/swipl-${PV}" -BUILD_DIR="${S}/build" -CMAKE_USE_DIR="${S}" - -src_prepare() { - EPATCH_FORCE=yes - EPATCH_SUFFIX=patch - if [[ -d "${WORKDIR}"/${PV} ]] ; then - epatch "${WORKDIR}"/${PV} - fi - - sed -i -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" CMakeLists.txt || die - - eapply_user - - cmake-utils_src_prepare -} - -src_configure() { - append-flags -fno-strict-aliasing - use debug && append-flags -DO_DEBUG - - mycmakeargs=( - -DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl - -DUSE_GMP=$(usex gmp) - -DINSTALL_DOCUMENTATION=$(use doc && usex archive) - -DSWIPL_PACKAGES_BASIC=$(usex !minimal) - -DSWIPL_PACKAGES_ARCHIVE=$(usex archive) - -DSWIPL_PACKAGES_ODBC=$(usex odbc) - -DSWIPL_PACKAGES_BDB=$(usex berkdb) - -DSWIPL_PACKAGES_PCRE=$(usex pcre) - -DSWIPL_PACKAGES_YAML=$(usex yaml) - -DSWIPL_PACKAGES_SSL=$(usex ssl) - -DSWIPL_PACKAGES_JAVA=$(usex java) - -DSWIPL_PACKAGES_QT=$(usex qt5) - -DSWIPL_PACKAGES_X=$(usex X) - -DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi) - ) - - cmake-utils_src_configure -} - -src_test() { - USE_PUBLIC_NETWORK_TESTS=false \ - USE_ODBC_TESTS=false \ - cmake-utils_src_test -V -} diff --git a/dev-lang/swi-prolog/swi-prolog-8.1.12.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.15.ebuild index b986aa50d899..cdc33c687ea7 100644 --- a/dev-lang/swi-prolog/swi-prolog-8.1.12.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-8.1.15.ebuild @@ -92,6 +92,12 @@ src_configure() { cmake-utils_src_configure } +src_compile() { + cmake-utils_src_compile \ + XDG_CONFIG_DIRS="${HOME}" \ + XDG_DATA_DIRS="${HOME}" +} + src_test() { USE_PUBLIC_NETWORK_TESTS=false \ USE_ODBC_TESTS=false \ diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest index 09ce449d4240..967ed6744d40 100644 --- a/dev-lang/tcl/Manifest +++ b/dev-lang/tcl/Manifest @@ -6,8 +6,6 @@ DIST tcl-core8.6.8-src.tar.gz 5887483 BLAKE2B 2b8428652e451b817fe63a811f91000192 DIST tcl-core8.6.9-src.tar.gz 5932010 BLAKE2B ddc0cff12aeeebbf8d1c799db9e154a9ecbe2a2e2afce97c6f15c408301b7a40119bd1c861aa724c178bd9abfe0616c7bcafd9cf6714ed49cf882c9085222cf3 SHA512 306a38a27729b764bae2eae6c4cdd8cd6aee5de6bd924d6a487c8691ee874e4459abc1fa785183c2f6ff4d2d57be98093dd7460c5a668cf994e8f1c31516ae67 DIST tcl8.5.17-src.tar.gz 4546317 BLAKE2B 27031dd3bd5790d03692e77edf91eb7fae8a40d8d193d8c8ce4e79b21f90e683bfc9d5b71764760223987fb163be844e6096d0aea1058b8ce255731d97e2a0ea SHA512 ad5ddb4cd6378fd6bbea8cd85ceb1cf90392b2e8c49fbfb3e4b35c81d3ae3e3f087697c41fcba8c8e06de1d9e7539397e26d58b864dc01ba65abe4ba4efa9568 EBUILD tcl-8.5.17-r1.ebuild 3744 BLAKE2B 3a522b6760ca4707834e2522be112544d34244b4110065c0fcdfa46279a3007510c87734a0920ca149c87bf8dd782194a4be201cc708ed021acae7ae37d9fcbe SHA512 ab4e60193d0dfdbe8494b66963a53043a816be484ded0982d2594c8a936bd300e133d1174fa260f953bbbb82dd3cdfa76bdee47af83e3b6abf9a771843af8107 -EBUILD tcl-8.5.17-r100.ebuild 2768 BLAKE2B 57cce65b92559909594ada8e86ad4874bcd40805c537e31c93e9d9d779a313053a6a9526f2a6f589632d3f9c42a6eb5a8118dc187839354347ff02739179c7c0 SHA512 4fb28e6c986feb1ec05f702648ffb1906d0d416904888d37846a4861473a408724705cbbb25eb909589f6b742104bd65a23bbbe0f6e254d20efb82536ee7bcf9 -EBUILD tcl-8.5.17-r101.ebuild 2828 BLAKE2B fa786120c9e365b27b9be45e0be743b332aa4e1b5873dfb14b2a685d7904d30207909200a5dc0ddc0ef7ab7a7f808edc30fac67f18a9416180e842b3841aaf7f SHA512 982330ab8aa7b34bd0aefeb5a1c7aa0c4961704559cc67ada7d5c3cfd4fa6ebd33c2b797645977dce6a52c3c4f7d535f487e59600231cc2f231e9d53147ad4cc EBUILD tcl-8.6.8.ebuild 3964 BLAKE2B 5c076578d75b64ea9b8796408e5b9095c06f39186f7b4485f0bd07a0a45b04c1ddfd0bc731a418b554c27f37ffce8e53c7ffa1d84c6506be7dc2d2e1e14d9231 SHA512 014983f3c8cb37de6a8420a95d1821a5f6e13ea3038ac2f90c8d8215bb8070bf21d6c1f845561f23f85ad4fa40e5e1e6bf4d59f0a13b2f5bb502e0b73dd30568 EBUILD tcl-8.6.9.ebuild 3887 BLAKE2B 40bf3d6140d3c589fba7ae78f52193a7b408227156b9b152f4ce4333d2ae8b63e36ff9bc72e768f09453dec38b21be18b2bc65d8a03997d6a002aa70747ff6f8 SHA512 369a8e704ef9edceb04750322d813e6d27e8ee66359c9fe791724d6f50301d98a2cb78bf7fae0fa04dc2a8210fe58630d13e02db7d153dc52eaeb4474183644e MISC metadata.xml 318 BLAKE2B 7ea8e51656c255c3aea3bee8849423604a164efff556974f6032de44d33e38bb0378b69c18821cc76f0284064bc84a1a56e79f522f8d7fb0adc50e2e191b5fca SHA512 61f3feb8311f1babb8a4df8c9fcddaab009ffc6d69248f18cb9e001a1659dfcf47f2699008ab83fb563b3417f6ead8113af20db7e3893f488e8d75bb2a3483cf diff --git a/dev-lang/tcl/tcl-8.5.17-r100.ebuild b/dev-lang/tcl/tcl-8.5.17-r100.ebuild deleted file mode 100644 index d34643083b65..000000000000 --- a/dev-lang/tcl/tcl-8.5.17-r100.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# this ebuild is only for the libtcl8.5.so SONAME for ABI compat - -EAPI=5 - -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/${MY_P}-src.tar.gz" - -LICENSE="tcltk" -SLOT="8.5" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris" -IUSE="debug threads" - -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 - -DOCS=() - -src_prepare() { - epatch "${FILESDIR}"/${PN}-8.5.13-multilib.patch - - # Bug 125971 - epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch - - # 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 - - 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() { - 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) - - # 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 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 tclConfig.sh || die - fi - - insinto /usr/${mylibdir}/tcl${v1} - doins tclConfig.sh -} diff --git a/dev-lang/tcl/tcl-8.5.17-r101.ebuild b/dev-lang/tcl/tcl-8.5.17-r101.ebuild deleted file mode 100644 index 8edd0ea88b7d..000000000000 --- a/dev-lang/tcl/tcl-8.5.17-r101.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# this ebuild is only for the libtcl8.5.so SONAME for ABI compat - -EAPI=5 - -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/${MY_P}-src.tar.gz" - -LICENSE="tcltk" -SLOT="8.5" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris" -IUSE="debug threads" - -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 - -DOCS=() - -src_prepare() { - epatch "${FILESDIR}"/${PN}-8.5.13-multilib.patch - - # Bug 125971 - epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch - - # 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" - - tc-export CC - - sed \ - -e '/chmod/s:555:755:g' \ - -i Makefile.in || 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() { - 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) - - # 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 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 tclConfig.sh || die - fi - - insinto /usr/${mylibdir}/tcl${v1} - doins tclConfig.sh -} diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest index 8a422d22b952..71701e4437a7 100644 --- a/dev-lang/tk/Manifest +++ b/dev-lang/tk/Manifest @@ -4,14 +4,11 @@ AUX tk-8.5.13-multilib.patch 453 BLAKE2B f7c8d90a3aa313e4ebaa6ca3b62a986637e4246 AUX tk-8.5.14-conf.patch 569 BLAKE2B 243b538978966531dcf59f76ffb3d1b82bb10c2d80fc9f31e16165c6f26db96a22ec5953840a316d430153e082e5dd6293edf8f899f0befe60d6e5b1b8ac2279 SHA512 31b53c31253df219d860fc9d067c53379bca571e799a2064e33fb1d9c3f228a001654438eeb5bad5315a6589e7b46f902d87cd54a52d4ed68c0d1d08f24ad544 AUX tk-8.6.8-libieee.patch 708 BLAKE2B ec8422ce98c68f2dd347bea807059fd8ee94fcd4540bdeb4c8d90cd7f028ff3dbe406ed26593ebd8815e611a1ae40390b4194bf8d3efd1863e8c15d04918681c SHA512 b25d2fbfc753296cef11b1943e19537aaf9f048f033078e516f36bc021107197f77b8f142fc7ace89ae6bdda037871ce7a5c45800ef0bebd04f77a5281bff457 AUX tk-8.6.9-conf.patch 407 BLAKE2B 13662318b4c5029802f74551a6a194e27ddb6dbf2e5ceeecc45c98b27a5386a9b9443af7c329fc422c5249c3da6308552d5c879b5629ae47b705c0d2ddac5534 SHA512 10447a13d597c0917d15089dcfab64165927589ea0fbec7073699788f5ba003e561a6af6562b2ee3e3b40df2f9dc0719c2ca4209a927e506710a390c7a67eb70 -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.8-src.tar.gz 4319854 BLAKE2B 167c5dc6c32e49653c04bc067c3d75df022ca230657be32797021b0e2f7748215d9ad0493c8020b8d1be1f005b9b2d561339a6a0b209721c0d05dd222d47d377 SHA512 d0d30637b733fb0b0d38461b6d872934c04af422fcdb7ec41a72331b2529cc94414e6f441f95a98642d69505e4f41469847fedd1cbe58bd08cdd818fcabd1db9 DIST tk8.6.9-src.tar.gz 4364606 BLAKE2B 9c96d977aa72dcc0c8d2a570d644284a1eef217ef082d8a78461bdcb4845e206ccad59cb5bc21ef80e32ea19951fa3a845e45059bb9eaf0756f128a95530260c SHA512 654d73aad006e628110057681477b958b7ec0a42287bc78259fb4b84635e7ebe757e69099d66c0c73479bc506ca66fa5baf13f13b0f403d60b2c54fd48a4a686 DIST tk8.6.9.1-src.tar.gz 4364603 BLAKE2B 3d96637ceadc28977f8b4532be071907d64f11bd22881baf02aa6fa2778b607437edce8f1ed02e7011bcf78468128f7bfe81ee6dac9bd73a796e7fefae130dcf SHA512 b9c811ffc8326331ae03c6fb25ea71f7a5eaeebd9d5a16a51a1671d0f0422268bd351b077e17ae925f0a7eddac9642aa640658615c52d4269c299373af031a92 EBUILD tk-8.5.17-r1.ebuild 3544 BLAKE2B e9cbc567724fcd9b9979143040c5542cb73620cac7210510ce5cc01d12adb0c72de8811f8f123674f971197310c55624759df72ca83c7c1e45a6724aa56b1bf0 SHA512 49e8e6d7659451c90373f7efcc13839192999fe2d8f1610ae9b85e95fa62cf614b98400849346f8d599b17289afad17a8fff84352b65032e332e8af7547efee1 -EBUILD tk-8.5.17-r100.ebuild 2140 BLAKE2B ee172c1953075591b96c0c2d5c30c8f8074944320e80c1e2a2264586417162f2ac31b3922e32add7924a8fdbc770717701ff614090db754f0895f5534969f749 SHA512 dc4d40b559f72be9e415387dbf8234341fc7b129779e0e744e384f924f7b0ba0eb7a9dc89915f89602234187fbecf01274fec4b294038e9915c1b96f92d952c6 -EBUILD tk-8.5.17-r101.ebuild 2200 BLAKE2B 94900c92fce5c076a117ba20bc35121cc8cd37c7e848526c3d742a94f8943b294fdfa7b4d07599701c13a5146fbe142d9d43c83f604065de781087ced78bb595 SHA512 590ebf3d502b4b4e14e570b9b90cb761e69ed24a82ae6e5622dc565d4ccb277f53f805ba223ec1ef802e8b994afd17afee59cbfce0163ddfff54e600c373de1e EBUILD tk-8.6.8.ebuild 4094 BLAKE2B c772432688a75e0716dfaa2d1f13533971dc815cdc7caad7f3283df2136ab77d5109edd0a4299782eb65844ebca9b4abf5ae28d3ee5fdcaf0a12b031344dc82e SHA512 a0781c8c967a33037314cbb9901ae938e6e27ef8a8489c56a3abab581001c9adc64651f2bb3678539b3bb26ca32aeaab771a6da6be02911d044905de4f561ec5 EBUILD tk-8.6.9.1.ebuild 4042 BLAKE2B c04eadf846e56ba490654aa63a9448ce8b5ac21ae22bce6b62153c6d5968660cff4dfbfd3ca914270577aba63003f5ca638c38217710f07a7ae1f88b1aec0429 SHA512 60a6745e086a3e85d2ea4b019e4b2b9b287888589ee3c2c3b402faa98dba308b0e3936fa9ac3af80d51d1c8b30f0cf6ab70681fd9b0daa0ccfe48e3097b2e3cc EBUILD tk-8.6.9.ebuild 4008 BLAKE2B f590b80b0f283b188815f8896fd1c35ab5ac94a4185cdd05d3c5ab2ee551a1d003f21baecd83677adf3e92510f509f7176fb3b181fe86ca92891ff0c40bea694 SHA512 c057ab0441397b0e8971ce336910a2a919c8aa6788e702f11311bcaa23e9ecd80c804d91b756b2de3e480199198c3d45a23005ff1a037a2f080a92724353bbfe diff --git a/dev-lang/tk/tk-8.5.17-r100.ebuild b/dev-lang/tk/tk-8.5.17-r100.ebuild deleted file mode 100644 index fbc3b1cb3191..000000000000 --- a/dev-lang/tk/tk-8.5.17-r100.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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-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 - - # 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.5.17-r101.ebuild b/dev-lang/tk/tk-8.5.17-r101.ebuild deleted file mode 100644 index 164b758d88c7..000000000000 --- a/dev-lang/tk/tk-8.5.17-r101.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# 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-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 -} |