diff options
Diffstat (limited to 'net-libs')
31 files changed, 130 insertions, 880 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz Binary files differindex 8e41c1d39d88..666312e6d29b 100644 --- a/net-libs/Manifest.gz +++ b/net-libs/Manifest.gz diff --git a/net-libs/aqbanking/Manifest b/net-libs/aqbanking/Manifest index fdccdbe5daf5..cdee0b3236a7 100644 --- a/net-libs/aqbanking/Manifest +++ b/net-libs/aqbanking/Manifest @@ -1,9 +1,9 @@ DIST aqbanking-5.7.8.tar.gz 3818825 BLAKE2B 6536b11251fda4977fd964f513f4b2bb23cd14d62adffdd18e7508afe85d660b86aa1aadc80fe4ba47c5b393659ba7139c65eaf342795f6f05599efdd2c3904d SHA512 4078c3bc2c0b6f38f853fed064e37b6188c0b8158416ca6482756232ef8fe71e9cc1df0abe8c6bcbe8a7e818c24210f553c367f540d60cb7b7cf0161a9ca7117 DIST aqbanking-5.8.2.tar.gz 3824997 BLAKE2B 529867a9e814d0e46ff2aac1da25a369c9a8722f41364c6ef15dce0ed861b7a5bab104fb5b30a151c6e11071c0a067aa1192a4ceda67ee50698f80053ac8e33a SHA512 2a8d87396fa8926fa338cf0a7744649512ecd773741fa24ad69a52bf65d4df881365c0fc31c3a14f718184032a7f1a596e74f63d6ffdaa05c29aac23e26bd4ae DIST aqbanking-5.99.44beta.tar.gz 2515177 BLAKE2B 5d28137eb1668cb1748eab19837e654b7c28698239f483965b5e402a6aba01fa3048c93a52909a8c2252c41f922063d09e2a7759326df67ca2ea64c065cb1bc0 SHA512 d9825a8808241ace435efe5487b8a87afdf2dfb4e092adaec2d4ae91cde719f0ffda69a46540c88e9d45d7a95a5f5295bfb631584eb688ad9c8afb2e32c714c1 -DIST aqbanking-5.99.45.tar.gz 2521826 BLAKE2B 7cab4ad965faee6a34a6adddaeff0a02e502b2964f6e201f6265c8ae0835b454fbd47b5598c1bd1907f59045146dd9e4bf7a5bf39f31ad504863441e51e9dab3 SHA512 46381ec70610349cb07cb6e73d1985aa979cdb53ed0bcd64e04e8fe9afae1d7fe75227a76a1e7c74ce3b124585799f088eb5147e02ebb568a85142a4cdad42d8 +DIST aqbanking-6.0.1.tar.gz 2551617 BLAKE2B 0f18e63f6fc695b4fb3c5b831d324cf039f02ce740655953bacbcb6fa805e441ac989fa1ef7504cf3417b366acc9dc5562b13788af72faedfd27778bd3097769 SHA512 57a4f1416efddff4ce0a7b1cd5f1035df95a01001fff3b43b0febbb62b322839b1d0e8be2c765863da6de3e30c85726a8866529d9b16162b18d5c204e7eb8081 EBUILD aqbanking-5.7.8.ebuild 1597 BLAKE2B 23dfae67ac7874727307ac8bae890b804ff84cea65f1ec6f239cad33891541ab81e9ab80e6956dddeaf74fc365ceeba6fef5b71bc4eb159630a88f201c52f71b SHA512 5ff2f013a85766a9c292bbcfaaa51dfdad02871d98d7639444d72f02720a6ad616482738ed07064e037c42a64020fe50c586cee724c54027cb94db752eccfabd EBUILD aqbanking-5.8.2.ebuild 1454 BLAKE2B 9c008c308d7ba122076de9d94492619ab13fdbd0bda80ea46d17ef60bb8c5e712be92099e6db4b3a04d39022b39a88a250346dc9277e40623dae15059beb68f2 SHA512 5505c4150f5915cd349b6d6331c5025f9c996df59b377ecf0f441502a34f1c125620bf7824660ec4674d95028de724b11301c97b580a5e2084d823cd89d7b799 EBUILD aqbanking-5.99.44_beta.ebuild 1407 BLAKE2B d9d6b5b1f773b13b30c86b02c04e5477137ac53b932d001dc27a9f833497e44aa8614148d54e78fb63aab54b3489e896daeb44b94161e55f16e40bd1d380c91a SHA512 49ff085ccffe5ffe1805cd7a96235c024c3493d9b496ff332090e377cf22eba8f3731ff2619e4cf7f0cff56d733eafbb684e6fa05bc32af05840dea99cb1a4ee -EBUILD aqbanking-5.99.45.ebuild 1403 BLAKE2B 7f5788997021b4d60dc57c7765726ec821b0ba52f654a7ae0960ca58a5ded8aa88364f109d9a73e4483910d239fb98c0e2795a797564c83400de96f3468d1281 SHA512 1fdf81a416e7339569319bc160049970dba81ccec22a44e76021f66cf83a7084b59b9541707d2fcd83288070c6f167bc25d2395b5d0892aff2fa1be809d1f0aa +EBUILD aqbanking-6.0.1.ebuild 1403 BLAKE2B fec653d12882516fb876e32c7ac67edd7369c43bde81c7be015906bef2bf3a970cb31dcd458a58df24c3beafe2dc2b5355e937e5ff1252ba62733f6034aa318d SHA512 1a32a1d19576b6cd140f401174c5a2c15d1ef768825695c53774d1fa10af81e95aabab93378213523500ec87d2d91ac8e5afde0fa4886c15597ec53a61dcd6f9 MISC metadata.xml 412 BLAKE2B 71c913459f7d3fc1d6bede5ee1e78fd189b840cff496c1e0da86434143be173cb7f00f8457174f9e9b6b22a3a9673a316e7a80649ab6ebaa7cb4c4f7c10270c2 SHA512 d32767c7a1c63a22e61318687c3591d86b2adaab9773d3330b451c099306412003bb07f449c3cbf0791b8d2370e742ecc3922076e9bc8e6c0a1ad7fc92d24999 diff --git a/net-libs/aqbanking/aqbanking-5.99.45.ebuild b/net-libs/aqbanking/aqbanking-6.0.1.ebuild index 10103090ff06..82c1fc073a24 100644 --- a/net-libs/aqbanking/aqbanking-5.99.45.ebuild +++ b/net-libs/aqbanking/aqbanking-6.0.1.ebuild @@ -7,7 +7,7 @@ MY_P="${P/_beta/beta}" DESCRIPTION="Generic Online Banking Interface" HOMEPAGE="https://www.aquamaniac.de/sites/aqbanking/index.php" -SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/232/${MY_P}.tar.gz" +SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/238/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest index e3fd6791fbde..9018dec6f44f 100644 --- a/net-libs/libpcap/Manifest +++ b/net-libs/libpcap/Manifest @@ -3,8 +3,8 @@ AUX libpcap-1.9.0-pcap-config-includedir.patch 907 BLAKE2B 7d616edbc6bd129bbe73c AUX libpcap-1.9.1-pcap-config.patch 1005 BLAKE2B 27f06af3f6634e25bc7eb017923a174191e13d28658e380baa2d48f828736a0ff176de4b5fdaa7c0bf42c36509dfffd0c6d49cec45669d03201fad8efaf90c75 SHA512 57f51c1f2fc093bacf43a96c7156e82946a3f11025b3afe3c24c2704fb4a9a7750e0526d41a17d52d649f55b44d642d5daa3a76f0ae18aaca582591f20acd1c1 AUX libpcap-9999-prefix-darwin.patch 358 BLAKE2B cd2d0dc64fa49fa91451fb668a85684770d43cea038cd59d6e6e6b6b59e29fe258741ecb2aa8bca5621a4042b786ac5944700df40d6d52cb25fdb7fff27f713f SHA512 c3b3d90ad0641bec86bbd8a07e4eb35dc49a6b9f99bf5cccdb6b9134b75e9e6b78649073e69291683de581d1b40ba8c3079a86ec7a621a1fcf33f8a1cf818f75 DIST libpcap-1.9.1.tar.gz 849407 BLAKE2B 700d8b3d25c036033c4f9b652cec6a30d4a45aa418c2ec45698018b3d3fe8d0a61f6759f5734e2c7ff9a8f42cce65fbd8b3e1b1efd44776e53674fbc609da59d SHA512 9ab9da20194e0dfb105daa28c8841118118f5a7f68b5e30e31da6c56eec91430c8ee481f1f9d20aec4d33d7ee9e6fb0b5e08a90a8d7e5ace8e6210e29e7eab0f -EBUILD libpcap-1.9.1-r1.ebuild 1825 BLAKE2B e81ff1dab454449b9bc81f40ffee5002cac35bd06a5c5edc93bede91085bbfd211d2fe2924abdf1e2075d33a718f51d38fe3e2153696a9bb9ce9e3472c8d8eb7 SHA512 1274e2dddab51b5b8b00323b4d062db136a2211c5d58691fb6f3caa18b87d60d52357d84ccd625628b4ae14c95692a8b5e253f99aff1e554cf5a7ee80becc4ae -EBUILD libpcap-1.9.1-r2.ebuild 1865 BLAKE2B ae48e0f880a642a0a034e273f717f829a610b9b30abf521d710fce3ef4b9dbbceb599da1932c697aeceac0448bdbf621103840f399de78147d8ae7680a69c1e5 SHA512 4bb99c14faf5df4f63b14e393d39889de02376e1ecb7575a5a8ce33bc86a995ea4b8708fb7433c7f28977ab99d28d674349f44ed174b4f1b7416ed2d7a3bb8ab -EBUILD libpcap-1.9.1.ebuild 1743 BLAKE2B 7e4f49c43b63ff444a8df369a5352bd4c96c5649e5c666581f56f2fc14644839790f4d2fb433b5e5ff739db30268e810264ad17adec189c149bfad8fed991426 SHA512 12a8d6edee6dc78e86d0960a31ed80e886e80f4cd8b8a50518ba23bd6d0a6276628c13199d0c6c3a71065f5018bc177d0c0ccc143423bfc8293b3b4cf7301c82 -EBUILD libpcap-9999.ebuild 1600 BLAKE2B 363af894e68780edf3c8ce7fba4ff49e55694aed323cc480ee392a76615d0a57dc0d227efc68a106dfc9886351eb3b86923983898c9682ef51659833773edb74 SHA512 91ae960f6994dacd9b60bd0668255399be0bf9908e639ff0a9d183e5dd74cd51e79b65ed7f16b540bbf9b4dfa3973400ffabb2fbb6f8bc4333a5653c34da3019 -MISC metadata.xml 737 BLAKE2B 7f7e72c07f6874cf166ce018d9dbae17802626b6b6ba7cc0e58ce3bb930e24620227784513d984edf5679ebbafe6b934ea950a613c0d1ae181f9ae59b6229f4b SHA512 506133b5d302a92dc51768ebac2ea38d2b12684b14190598f73bc7bc9f345843f6941e056f818e80407af684aeee6120935bf46ed7acc35036f4ca7fa7b0e430 +EBUILD libpcap-1.9.1-r2.ebuild 1884 BLAKE2B a34eee76cbc93af2422a8955cc3acff6f64d3f5f37872a1483a8e8f2a0f31ad9841a7df7d4a92c6bfcf290f72648a0be15e211f41183fa4af5c4c57d20093f90 SHA512 88e91069f211a817e31eca03b089fba36460acb6611df2bf318476925ca1f060908d799cae6272f37c0a7c1a87ef8ee95a15a9fa0a051aefe0b50261edcb7443 +EBUILD libpcap-1.9.1-r3.ebuild 1866 BLAKE2B 29020b5c2af6944dd5fb9d5905495970cc531399a6f61acbd51ecdd6aae6a30c3e1e5b54f9725411c2fa75dc228fca1c55c612afd84f178c63ff125dec1c445e SHA512 6c569bd80d6997af0790df6409b9c13520ac7a9056576311a13309a4c12c3d8c6a339b9c863bab39dea895b085d2424c86c5d1cb0132127fa71ea9290e67f832 +EBUILD libpcap-1.9.1.ebuild 1762 BLAKE2B 0af976643a8d21329d27e4a5cb67ecb7cf0e9eb16c9387ef4b562badb8d55ee851d1c9ec15a42aadcbf67b86bb0579c2fdd3931d5f7e4e52fe34d1a16beb6523 SHA512 757cca1aa5964ce64bd6bee285a3bcc99ab225dfbc63433871964bc84b07d0569ffd2e645a2b98460cba7e539e96048b9cb8526ecbd4b90215881b0c0dca721e +EBUILD libpcap-9999.ebuild 1661 BLAKE2B 306757d0d320e1da01ded053903966f50375f46c14e8d2ea1b9c0fe9282f9b0bee25a8ce8fc9eb5fec2c0fe21d1b3b0d93a5176e71bbc700b7f00ea9f83845d8 SHA512 01caa0d110f040593bb54480ad8b2605105a5a9408571ac35a4ef66ab2cfaf0b3bb40f3777b87d0956895be61d412f87a97af2dcc3ffaba2d0d0c467fed88254 +MISC metadata.xml 829 BLAKE2B e5d6efa30353d6468e2900a2e3b5eb9fad0f1037c5757b791a787d7db88d48261b8237cee5b8d8e9b327c2bc24697d2456216e4a2aa76601d540e3203d7e6515 SHA512 0bfc965079e819a9cb84f3d8eebea92e975dbfabb751979b1c64edd61b07e6508fd52ac64abea5d10305864afcc7c581a29d6f4e6fe8cfb77940ea326ba2f4b2 diff --git a/net-libs/libpcap/libpcap-1.9.1-r2.ebuild b/net-libs/libpcap/libpcap-1.9.1-r2.ebuild index 96323e01da64..d2811226707a 100644 --- a/net-libs/libpcap/libpcap-1.9.1-r2.ebuild +++ b/net-libs/libpcap/libpcap-1.9.1-r2.ebuild @@ -55,6 +55,7 @@ multilib_src_configure() { $(use_enable usb) \ $(use_enable yydebug) \ $(use_with netlink libnl) \ + --disable-rdma \ --enable-ipv6 } diff --git a/net-libs/libpcap/libpcap-1.9.1-r1.ebuild b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild index 704e1bbe519a..9628a24a510e 100644 --- a/net-libs/libpcap/libpcap-1.9.1-r1.ebuild +++ b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild @@ -15,13 +15,15 @@ SRC_URI=" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="bluetooth dbus netlink -remote static-libs usb -yydebug" +KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug" RDEPEND=" bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] ) dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] ) + rdma? ( sys-cluster/rdma-core ) + usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] ) " DEPEND=" ${RDEPEND} @@ -50,6 +52,7 @@ multilib_src_configure() { econf \ $(use_enable bluetooth) \ $(use_enable dbus) \ + $(use_enable rdma) \ $(use_enable remote) \ $(use_enable usb) \ $(use_enable yydebug) \ diff --git a/net-libs/libpcap/libpcap-1.9.1.ebuild b/net-libs/libpcap/libpcap-1.9.1.ebuild index 9f48337ff265..3cf06cfdf4c3 100644 --- a/net-libs/libpcap/libpcap-1.9.1.ebuild +++ b/net-libs/libpcap/libpcap-1.9.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -49,9 +49,10 @@ multilib_src_configure() { ECONF_SOURCE="${S}" \ econf \ $(use_enable bluetooth) \ - $(use_enable usb) \ $(use_enable dbus) \ + $(use_enable usb) \ $(use_with netlink libnl) \ + --disable-rdma \ --enable-ipv6 } diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild index a6571d9395c0..b8aa26910221 100644 --- a/net-libs/libpcap/libpcap-9999.ebuild +++ b/net-libs/libpcap/libpcap-9999.ebuild @@ -13,13 +13,14 @@ HOMEPAGE=" LICENSE="BSD" SLOT="0" -IUSE="bluetooth dbus netlink -remote static-libs usb -yydebug" +IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug" KEYWORDS="" RDEPEND=" bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] ) dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] ) + rdma? ( sys-cluster/rdma-core ) usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] ) " DEPEND=" @@ -45,6 +46,7 @@ multilib_src_configure() { econf \ $(use_enable bluetooth) \ $(use_enable dbus) \ + $(use_enable rdma) \ $(use_enable remote) \ $(use_enable usb) \ $(use_enable yydebug) \ diff --git a/net-libs/libpcap/metadata.xml b/net-libs/libpcap/metadata.xml index 6fb2c6c97aed..9c9e8fcf34ea 100644 --- a/net-libs/libpcap/metadata.xml +++ b/net-libs/libpcap/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <use> <flag name="netlink">Use <pkg>dev-libs/libnl</pkg> to put wireless interfaces in monitor mode.</flag> +<flag name="rdma">Enable RDMA capture support using <pkg>sys-cluster/rdma-core</pkg></flag> <flag name="remote">Enable remote packet capture which may expose libpcap-based applications to attacks by malicious remote capture servers!</flag> <flag name="yydebug">Enable parser debugging code</flag> </use> diff --git a/net-libs/libsignal-protocol-c/Manifest b/net-libs/libsignal-protocol-c/Manifest index c7624baee3b5..37ef4a2ab3df 100644 --- a/net-libs/libsignal-protocol-c/Manifest +++ b/net-libs/libsignal-protocol-c/Manifest @@ -1,4 +1,4 @@ DIST libsignal-protocol-c-2.3.2.tar.gz 271930 BLAKE2B 43e1e384f9f3a81f582445e5f1f10875948b33607aa7feaf98f4b6cc41f5fd30ca9fb7c8426ef66f93cd46a662eb4a57002f5937d68f6fd2fcf0b30b33c60997 SHA512 7c63c42b9a590ed1a60a6f0094668d9948aa04e5965d052c22ae22b176df7c5582b8ec5c0e6c01ad582dfe2b04067380b9734ad08c64785242e90abcdabdfb8d -EBUILD libsignal-protocol-c-2.3.2.ebuild 352 BLAKE2B ed42c8b4b05431d9abaa4ad0318cdfe053309aec56d888f689434a6c10ead72a5f9e7616c50019ed437d48396aeca9435a48c140f1fdafd3ecfd215458c8b35a SHA512 68e8ed4543da7968f66e9a349b4aeec05fd462f2a35d3411cc24db77eefb02d1884b44e932263cfbfc48f857c2a21d16b47c55cc215b9d2e8e521b34b373fb63 -EBUILD libsignal-protocol-c-9999.ebuild 326 BLAKE2B 804b315a202a1710247f6ca621f582098dc328381a84820fdf6e1e79a9cd66cebe697cbaf1d7a43c26c975007a9f259fa1500dd068e98282cc31f7ec63b51ce6 SHA512 ff25cb3b54300cb3dd742213401356bca0f4ce2fe5e3c9034378a4269e2f204698d41691d58af75535615f1df5727e5ad905a55beb208f293aa3ecc35a889690 +EBUILD libsignal-protocol-c-2.3.2.ebuild 337 BLAKE2B f1424152f9ab08997dcdf4ba1d072f8a3cb1d53cc4c070797466b61ececaffb3ca7e0b3a5222517f648e0b8e2b0ede5cfe22839ee14471488a1dc54a15a6604a SHA512 ba3bdea830293943c4f61924e00662d7d8c3cb26a2786123187dac52e49c31e6cd5f6f0274da47f6ee9cb541500adc511e8c5ebaa9af19c28cd6f6cc277c174f +EBUILD libsignal-protocol-c-9999.ebuild 311 BLAKE2B eff7b2e277d09597fa75f319156ea667959517bf1179836b70c8a43f962aaad716acf1fef06b6416c9e2be29b75105c0e4a84b8fc99300a68da654d98db6bf10 SHA512 2cbf0473d0f7d7f5cfe4d87cf842d84e1a87c806571632121727374e7e6622692239cfaafded3332007e43f09f14429fe377e9824b449833bff001bce52454c1 MISC metadata.xml 740 BLAKE2B a55ff6046cc360d761f3df397be99bb31c8b8ce41f947cd1ed18c8d96e8474fe4aed9718bb0c7b2541cec2bad46e2caf0448585afea85ca8376b4cfd9053a01c SHA512 92abe5f5a1b810e92d06099d8f59d248ec69c44ea4ec8dfbec8e637a0f58e272d32b6f1024492c010418d796991232b561131cc50a6fbf46f39b55e4c7b6f32b diff --git a/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild b/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild index fc1c8f6ae91c..4a5341b2b8bb 100644 --- a/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild +++ b/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit multilib cmake-utils +inherit cmake DESCRIPTION="Signal Protocol C Library" HOMEPAGE="https://www.whispersystems.org/" diff --git a/net-libs/libsignal-protocol-c/libsignal-protocol-c-9999.ebuild b/net-libs/libsignal-protocol-c/libsignal-protocol-c-9999.ebuild index e56f24c04c63..b14bcd42a76d 100644 --- a/net-libs/libsignal-protocol-c/libsignal-protocol-c-9999.ebuild +++ b/net-libs/libsignal-protocol-c/libsignal-protocol-c-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit git-r3 multilib cmake-utils +inherit git-r3 cmake DESCRIPTION="Signal Protocol C Library" HOMEPAGE="https://www.whispersystems.org/" diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest index 9356a6c09661..bfc1b2b5a63e 100644 --- a/net-libs/libtirpc/Manifest +++ b/net-libs/libtirpc/Manifest @@ -1,7 +1,8 @@ AUX libtirpc-1.0.2-bcopy-to-memmove.patch 2226 BLAKE2B c0a5244f21d9a5531303b317946fe53b695aafc54095f617a3918f28a94033cd0a30b5f3bfd6fe671b64d4919d255298b55fbb4fa6179c255ff561517361d4e5 SHA512 221c85c47ec56edbdb4ce95e0f67680050b8d9f666c6795ceef7f7720acdf05a535e4afbcdc4e2e5eaeb6edc04bd43f65486df772ad2a0c87987d1c204661f00 +AUX libtirpc-1.2.5-avoid-multiple-definition.patch 1041 BLAKE2B 2fd918dad5c759b49f07335685d01bef8bd1c0127647e097a5fbd58f9ddcfbe1179bedd306917755ce39428fcb4c130f9b628f60233dc2464da96c748fcf96ae SHA512 dd72fdc6fd457d89780c4784772c372eb493df3deac928a7c06709cd3517be5586584751a2a9324fc90157838a6fe594ffe91b4f8baebd6115482d76e94985ca DIST libtirpc-1.1.4.tar.bz2 510924 BLAKE2B 1780f9bb0543583c01b60bda681add0ec2f8718eda4ce4653883c772466178e37d0a3fb47004109f81de470129458561fac4f109f45154c64b6fb729f0212c90 SHA512 392f391f9fc1bd68d81dc44e4058831a64b32790b5c8c37338b0ab416fad2ae4d16389e632596734dba09780347918cc65c6f134e0c1afd09e81ec250785ed23 DIST libtirpc-1.2.5.tar.bz2 513146 BLAKE2B 732e4832f3440d9fa08c45c01c56135ff1b96564c55d33e9b3f16c8361a4f02e49a35638b73110bb72da4bfb78107ccb1b4d475d1ecbdd62dcc156529a372c3e SHA512 d31cd4e22301abe1baddd7e8f45aaaf056a40799e961646691d071084fed50563b5eecdd9b78062fe378be8db7a6d4b87597e21cb81ac925e447148684a2b002 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba EBUILD libtirpc-1.1.4.ebuild 1554 BLAKE2B cd9c64b7e550affa9814e8a5e4b9b8c9d5627640debe472cddc16ea36300841b843eb2fd0dca7e3d5eb339c74b2a063a408246ebdd0c7fed086ff6ce31dd60f6 SHA512 c767bac49fb1fb2a22862ee273f94348e176ce229293ade3d81c4c65fb818be7d49980f2bfb54cb443e1f165fa2ee6c0ae908308a89eeb24e2bfde513cd5c033 -EBUILD libtirpc-1.2.5.ebuild 1513 BLAKE2B 57bc520006881b7199e58fcf5ad5e6b00639fbab84a4785830c8bab517c0448d503395f3c5423bd55c3a349b30ee4aa83a20f02f84770c2ce8ad90f485ee979c SHA512 4a3c6555642a221b0249ee69f32354cab38e4a889ed0370bc10f6b1cdd3288150ef78b8bfdd212359e4f56a42f473ea7376d9a13c6acb000c48d3d40e9d649f0 +EBUILD libtirpc-1.2.5.ebuild 1596 BLAKE2B f560316f374438565bd7dbe35bc569a9882e5a71d9597de0a78f017977f1a3a0c84e6685b785a46325270d0cac7cd93ee8cafb2bfa769d8c3073a13d0125206e SHA512 cf97c65ce6b8cfe8c08db3e8ae85f68e4881f4d2e4b39ef64a6637ddce7a662268229f7cc9e93ba601a080927738ae31f13bb46e997e23194516f44084ecd451 MISC metadata.xml 404 BLAKE2B fb708c5f3f1f4112708810b7fefe2bd1b0d20a15864d730e43cf42480c91d35984238352b419c3bd4b8f3ef831340a781af8b61a857bd6ff36f7521c5dd3c044 SHA512 9fbf0b58cc794cb08cc5075df5ca801d50c2724ca0826700bc18ac8a4a0c0d7231abd1aee8ec6de674b7cf7aa69cd80e7e6b3be90e9aeca36334c11b728db4fa diff --git a/net-libs/libtirpc/files/libtirpc-1.2.5-avoid-multiple-definition.patch b/net-libs/libtirpc/files/libtirpc-1.2.5-avoid-multiple-definition.patch new file mode 100644 index 000000000000..a5fecc54ced3 --- /dev/null +++ b/net-libs/libtirpc/files/libtirpc-1.2.5-avoid-multiple-definition.patch @@ -0,0 +1,44 @@ +From 69682de06816de9b9014441d23bda1918ee2e2fb Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Sun, 19 Jan 2020 16:57:45 -0500 +Subject: [PATCH] Avoid multiple-definiton with gcc -fno-common + +GCC 10 enables -fno-common by default. + +Bug: https://bugs.gentoo.org/705896 +--- + src/rpc_com.h | 3 +-- + src/svc.c | 3 +++ + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/rpc_com.h b/src/rpc_com.h +index 10bec79..76badef 100644 +--- a/src/rpc_com.h ++++ b/src/rpc_com.h +@@ -61,8 +61,7 @@ void __xprt_unregister_unlocked(SVCXPRT *); + void __xprt_set_raddr(SVCXPRT *, const struct sockaddr_storage *); + + +-SVCXPRT **__svc_xports; +-int __svc_maxrec; ++extern int __svc_maxrec; + + #ifdef __cplusplus + } +diff --git a/src/svc.c b/src/svc.c +index b59467b..6db164b 100644 +--- a/src/svc.c ++++ b/src/svc.c +@@ -57,6 +57,9 @@ + + #define max(a, b) (a > b ? a : b) + ++static SVCXPRT **__svc_xports; ++int __svc_maxrec; ++ + /* + * The services list + * Each entry represents a set of procedures (an rpc program). +-- +2.25.0 + diff --git a/net-libs/libtirpc/libtirpc-1.2.5.ebuild b/net-libs/libtirpc/libtirpc-1.2.5.ebuild index 5d80a874a922..9970a7e62550 100644 --- a/net-libs/libtirpc/libtirpc-1.2.5.ebuild +++ b/net-libs/libtirpc/libtirpc-1.2.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -23,6 +23,9 @@ BDEPEND=" src_prepare() { cp -r "${WORKDIR}"/tirpc "${S}"/ || die + local PATCHES=( + "${FILESDIR}"/libtirpc-1.2.5-avoid-multiple-definition.patch + ) default eautoreconf } diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest index adbc0175d562..1025d0beee41 100644 --- a/net-libs/nodejs/Manifest +++ b/net-libs/nodejs/Manifest @@ -1,27 +1,19 @@ AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3a0b94c87c2a570967aec9d418544c182f2e93f28d2dbe564980a975856ca31ab8c115b28fb9374701889cbebe3bba73d4ac83a SHA512 abe27eab0beb3444186fb3c4ce3c67fbc05b684a606f8f8bc4a5bae570fd8fd988f1ad5d65c442842fb6c7b069dc6e3f82577ba6becb1d934ae1039dac074e03 AUX nodejs-13.2.0-paxmarking.patch 2714 BLAKE2B 56371f934f40772845f2a7fb873d59528400358af90612c78d3f47f1af08f3b394ef1eebec0ab477916d523212fdbbe563bb5719442beb5e3969a6fa25cc9989 SHA512 4f68fc72444424c47e7ea31615e4d60821dd6f966102fdc16503e93e8dd32a0f71439f3e6e8b5fbd88f034ef44490b5dcf1b2e00dcec6ed4551b2842d0a20204 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c -DIST node-v10.17.0.tar.xz 21514260 BLAKE2B a37793d78e14d1d2ca861c39f27c5e1dbb47ad26f14aa97139fd9f9be039bd47e528f10c9977725f1ca4b5f4e31a1066715091ffaa488f764c67290bc1c84541 SHA512 4eec936fa8d848b7e261f83b6e25c1bfb06355a7146dcca91b0f64fc401ca32dd1b0758c127b81be7f0d1cc59c3b24b4ec2c17282b4bdb91c5bf71f42f2f7cbc DIST node-v10.18.0.tar.xz 21913328 BLAKE2B 84b0b5157671dcc3e96bb2cfd11e085251fd2942c03b27491f712f5603797bab7503d8f7c0eb45ca8e348b20a0555c1767d4d1964fff474c8590a47eb01523a5 SHA512 8fc9062e150af6f054f1ebebbdf67151b16f14bcca9cbb35338a4c7fcd7fa1c3f05c4a7ace12d4153180cec0007a195cbc94942c4d04c3895384dc18951d2c1c DIST node-v10.18.1.tar.xz 21920068 BLAKE2B 9dc0887a33f0888a347628e5bf15eb3687f15cba264a00317a15336fda48e41da9b4c45df6d0f223f2017c6b55b99eda0c4cd6f5913673da29c52a61450d03e2 SHA512 0979d264ef5286caea61a527771e2ac2fbe1b909a151061dbb7d9e0fde9461edd76b6060f55cfbd49d3ae2e7e10595a2eb4d2e98182e735e7df10940120fb9b6 -DIST node-v12.13.0.tar.xz 22862096 BLAKE2B b0121f45b535bac7baa0103db538070b4beb4b40a6c871c217eebfb1abb5a7821d83d46946047b3385af182f901c0390eb85134c9201be2d03b5745b297271f8 SHA512 a7aa8b1f010ea1df122d9d7b88ee0a9d10e0d79ae2f3d18c706ac6ce36e2e2039c21ea6f3dba3a22a79ed3f6069850a8a3c463dbd64e1e8f4a9dbe8901a89cc8 DIST node-v12.14.0.tar.xz 23244684 BLAKE2B 0e25cbba5e256b139efd45908236f008834afdf01f57a8e84c7e55ba950e56b786cd52eba9a02986eb0e1d38cbf6df38e1cd719d7dcd8085e8c71767adf8155e SHA512 12e887709a54be911c5a81ab7b7be995247b47ebbd2954ca942f9ed8a784ae1a8e4bdb2613e5bb671196f9101d8861cd29e10650a3f0c414db4d096df94b309b DIST node-v12.14.1.tar.xz 23258936 BLAKE2B 125289ce3e342c2e5e7bbb6f0b1af109f0ba8fbf2d6630f2cdc4aa31c25a3d846afe773e84daed9824360a6680a2d21378af4fbc42c6337399a143f92850a82f SHA512 2e2b6fa8351b59450ab5491b5e31dc36ce4d9be13c55a14e6e4d95a82cc8334f9fc35261a56a8843903f8021ff333a333bb4d5f24c92b5d7483d4779c3d88342 -DIST node-v13.5.0.tar.xz 32706024 BLAKE2B 570b2d676919cb333e2f36529e886039f7abfc4f7cd705cabbb2a1115918aa9ffc9d1e54a90e8deac09488f248c007721c090ed0500f113af81b2cda2e8248be SHA512 85bad55334e6ef63be0dbf90cef856c0a0835aa1b32e6ffc418b6a52f88f7ee266505f769f4204c000c766869cd85f7d914c9a3592dd52bcabdb6cb906f433e3 DIST node-v13.6.0.tar.xz 32706824 BLAKE2B 69e66354570e057fe215830a2d5bd157e5decfd1e58e4ead4304e0dfcf64e5adfe48503f3bf54afe2cc27df581a0f2ae79e9b730257ceb70c412bd2a47fa5603 SHA512 e7dc8356ac1b167cc32055e209f13cee82c9251440b6a6cc99b26c91f9625e11bd025cfc1c22b6ece95ea178640209a7c8700d678678b3e8bad26080aa2762c6 DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d13cdaa2b48e83f013885fa3590ba4a28378baf036ed26b7304bf234753d1d4014f72571496f5bb6cd5b221e5f0 SHA512 665d2dba287d78bcd723d7b4d00a6897fb996f4aa69a541e010a3dfeb2614257892117fcce7123966b1ecaddc9269a6667e0e262df693baea1f476c96de55c42 -DIST node-v8.16.2.tar.xz 18531368 BLAKE2B aec2f6257ab9237097e590b70b2e8615b664576b3af2f176260f26460f4f50bb1e00c2aff477a32cdb9ebf83f8b4eadc3ccdc2df431e359904fe4375513fb6c1 SHA512 8b0d4a089a5c80869971ceeffbef3ca03f4de4f53452a9fd16cbd189e5d76c7fdef475c144848c8d657256b41e342c020e11f6acd1880dde92ed0d0e8cf9e600 DIST node-v8.17.0.tar.xz 19013844 BLAKE2B 2f35f61ccc2d67132441dace8b59df6565e5df9e14e6798ab0cb0a024493182881708368248964db30e1213fa7b66301bd73b5146944129d7b14cd2b5b1a9583 SHA512 9f7b0b5695e882b4f727802ad855d398da596f908e64263902781e01f6222a4044be48c104eb76182ddb525dedfc4b28ccd07d64dfa126c462a248d9e8b49fca -EBUILD nodejs-10.17.0.ebuild 6276 BLAKE2B 4e823d8a4f8a994a1ef908d1203d22106be9432f0177cdb88ec1983b6d505a824db35c0c55f59b9af0a9b706bcfb6eb91f337eec5ef28eb109122906bebdfb13 SHA512 9a454f61424ff36a9d84d45c61a366589bbc28e8e4d5bef5341942e9f19a551656e08c7298fa86191c46943230874535155616b553f14094b246ee80a74387b6 -EBUILD nodejs-10.18.0.ebuild 6277 BLAKE2B 61dfe9c3790bb0eaff12b63b78e00c29e0374e57b1ae8d0b110798044dba2657a1dcf14c42df70044d47b1d1db5bb8fedd79df2dd0f98fdb2f2d8a106642aa8e SHA512 0b04c45ec19447fb35aa9bf3e49eb833ac29d742d8187b2bb54330949c768b3dbb11f40800a70f0612ac6fb6ea760d5f92661912d54eca61f7e1a816c8c5a6cd +EBUILD nodejs-10.18.0.ebuild 6276 BLAKE2B 24f1dd3c3af4fec3b456f899744b13b0c9451e55a159db5f56f4fe6a4062942798cd94f0b47b01fa933e51ea2fc91482cf2624e04c43dbd53cecc7bdeb573b57 SHA512 f9a3ca0b9eed22383069c2f4de9a0779ce8a0027bd268f1b8ca41d5d2a55e5010ec45c7d3a990ffbec5acc36d81dced37b30d80bf2b0316828eeeec3ce7827d1 EBUILD nodejs-10.18.1.ebuild 6279 BLAKE2B a620b05278a18edf70fb786e6840238a38b780469479cd9c8fb18deb8c0d89202c0e1ae324b04362538ba1059d6e049e1b7da52f02592a82edf94cc53991e100 SHA512 b243a92aff7c7b3c93321a910c180ae2b26cef726ff96232edfa87352ae38d16ad9fec439428233070df72ba5cfde6a5560a4c798b67b417866b2285af211342 -EBUILD nodejs-12.13.0.ebuild 6400 BLAKE2B 75df2ea0fa35af0d75c67f5ea2fb3c7b6cffb64756d25638f714156d30aeb9b43caecf74f24c344b287926cf9af8a1b48e8b089055f310de4d076631e2c34e90 SHA512 fedcbedb6ca35bbd3ab50f811bfa8747305241cfeea554d5a5f4e8a4ffbf726d6f0630633dcb21523211094bdc5da52484cd5162c343aa419bdc50d6ac448258 -EBUILD nodejs-12.14.0.ebuild 6117 BLAKE2B ec310e1d1e50cf9f48ff6cf7a5bb98fe2239b20e5495ee5902f6a3caf151ddd725d90d8890f8f42024f4a9bd2f9dc298864847376d81bf79adbf2e6d16ad936f SHA512 5fc8e7a8eebb8e81160f56457183bbc3d946990960d96a010382ef809aa0c1d3d40b2868c27f37119049a6e70ab72931bfaf52b641f5a4390a8aa8e62a69f282 +EBUILD nodejs-12.14.0.ebuild 6116 BLAKE2B bcf44cabcf2c5463d1bfb4697212272eec662c41f181b3500ae27aeea17684fc3a5131f6a7e9f3a3a38bf7417c4190f5f3293b691a54899ece793d0c3ff1840e SHA512 6857bd8e8e26e642a133cef54e0df170b6c59a31b46dd68757d6be889c5e360ddbe93f8966eec63d7c91e3cf10a2d71e05b4b07abf001a93380309cdae55dad4 EBUILD nodejs-12.14.1.ebuild 6119 BLAKE2B 10f8e3c7ef7db2c00fdecc6305bd4928a26a4283613878e8486a18e497c310174033a3f1df31289b6aaa3a2b027f0cbce5568ace197716f9188744fe1a07d773 SHA512 132399c18b562103ac953e2d8fbf6a2045fd9de8902b454774e2d14794ce2818601e09b29bac4abb0fa546108c32d6fa73928375bb78c627cac91468947e1d43 -EBUILD nodejs-13.5.0-r1.ebuild 6140 BLAKE2B 4bad792ead15e0999b02dfe46690cf57ce3fc8fd13f3b6986d26f3046bd22ddbea49eb3a85138a0b0c71d17a8d396dd9e4ff646abd14ef2a62e8c93d95127003 SHA512 8c8a81c2d700105026ba30dd6703aa265554843db7fa9b0673b2641d3a1d6cdb9e1f5904e4dd9558f45ca51a188bc6847cf9bb6f474d92c11e7e2918669db671 EBUILD nodejs-13.6.0.ebuild 6140 BLAKE2B 4bad792ead15e0999b02dfe46690cf57ce3fc8fd13f3b6986d26f3046bd22ddbea49eb3a85138a0b0c71d17a8d396dd9e4ff646abd14ef2a62e8c93d95127003 SHA512 8c8a81c2d700105026ba30dd6703aa265554843db7fa9b0673b2641d3a1d6cdb9e1f5904e4dd9558f45ca51a188bc6847cf9bb6f474d92c11e7e2918669db671 -EBUILD nodejs-8.12.0.ebuild 6368 BLAKE2B c45a61ee92c1949717c09ce2c9c08778d634563f3a5699f768f35ee90eccfd3d1076f1c4591efbb3527aabb996791a91f13f288b2b9467fd13482b5ceacb10c5 SHA512 19e79d4b318ecce2f05a736b6201144b3b9ba6186bb5176856c25eeecdd948ebc26246360a9cb2c05368303659668fe77d82ea5ba70e5f65474f3cb1faf06513 -EBUILD nodejs-8.16.2.ebuild 6474 BLAKE2B 1b3ea27bebebac7a516162ea1dfd59c68498e9e49d6c4cb2e54967f0307c01015c6ab4aa4bfb3fff0eed6a22961cee4e74972e85c34af7a2ba4b2625448935e9 SHA512 14f1524bee2fa4bfd31330d2b22ca65c978b74c6702c6991c687412c95b6102c292a9e29adb7ffecd57aa55216ec47ed3881a9ff646605dc9f74d6d8add9b934 -EBUILD nodejs-8.17.0.ebuild 6475 BLAKE2B bd281b428f5155ea409955137da219ef268ceda5922ca2fab9e9f80daa96529e061811f6e703c103cdd8912824dbe87dd28cc7d2d274ecdc1667cccbe80d43c9 SHA512 a6b43f8a0557e0e0dad52374d3b355e80c2e1f46440f9dd1c5668a202df58b1e0ac68d67a0574cca0da6c2e0019cc9d1a1475555491e9535dc333808a1e5ef0c +EBUILD nodejs-8.12.0.ebuild 6352 BLAKE2B 15a9b98d89d83fb5959b3b2582cea6a430e9dad5ac6033d7ea32647122ed8cf6a093f7dd90abb93f8585c7c1506d2c801bd439651a447b366fbe75a43259fa55 SHA512 df0848a3e96a62d6191ff0dbcf7ce55eb8da34913c39960e8eb02eb2b3c6d6f6d2202e884c77612b93048c85e6079cc95469c17e8357690936ea92eba400ba7c +EBUILD nodejs-8.17.0.ebuild 6474 BLAKE2B c7748e57d37a828a52127ba285b1b27b472063badf6784fc42616ca5a88a5151bc95162158d34715018db433d8b9e4875f20a7640b1f5b373012d3eb61b5c0eb SHA512 5ca66326a80139455dbe9f2ccb77e588a50142da005c51261f0223b06b4b52d61693f08ce9d22479b8801c5e219a38267e844f3de5a913fad334ebe1dc55cc3c EBUILD nodejs-99999999.ebuild 6056 BLAKE2B 2a9d1878477e764d612ff1c11aac1d02f322ad883e9460d9bfc6c546686267329c3abcaf6d912240034e52203b3de0f6ba971de93787472fb6f2632efa37c675 SHA512 1d0c40133c8a2d29cba56c4fffde03fc50f8f495313241923e4cc9043ccec746921ccd235682d3130792fce12318d001186b0630c38dab7e533dbdaefc1f8731 MISC metadata.xml 549 BLAKE2B 89d9231225010c703e933104cc5beea0706d4e865c61c6cb4f95194d2e0b0e4445800eae8c1074c5c313ace3cf3de2a71a05eed880f055b477023dff9729ab2e SHA512 e34ee9c52b2793f6dddb1f82f538598b5085a4bfea37e30047bd3e9bfabce52e3b826b8a2fe8e0e0842a288e14d8f3c229815e287354bdb121ba3e86018303c4 diff --git a/net-libs/nodejs/nodejs-10.17.0.ebuild b/net-libs/nodejs/nodejs-10.17.0.ebuild deleted file mode 100644 index 0d092cf3066b..000000000000 --- a/net-libs/nodejs/nodejs-10.17.0.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads" -inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils - -DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" -HOMEPAGE="https://nodejs.org/" -SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" - -LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos" -IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" -REQUIRED_USE=" - inspector? ( icu ssl ) - npm? ( ssl ) -" - -RDEPEND=" - >=dev-libs/libuv-1.28.0:= - >=net-dns/c-ares-1.15.0 - >=net-libs/http-parser-2.9.0:= - >=net-libs/nghttp2-1.39.2 - sys-libs/zlib - icu? ( >=dev-libs/icu-64.2:= ) - ssl? ( >=dev-libs/openssl-1.1.1:0= ) -" -DEPEND=" - ${RDEPEND} - ${PYTHON_DEPS} - systemtap? ( dev-util/systemtap ) - test? ( net-misc/curl ) -" -PATCHES=( - "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch -) -RESTRICT="test" -S="${WORKDIR}/node-v${PV}" - -pkg_pretend() { - (use x86 && ! use cpu_flags_x86_sse2) && \ - die "Your CPU doesn't support the required SSE2 instruction." - - ( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \ - die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer." -} - -src_prepare() { - tc-export CC CXX PKG_CONFIG - export V=1 - export BUILDTYPE=Release - - # fix compilation on Darwin - # https://code.google.com/p/gyp/issues/detail?id=260 - sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die - - # make sure we use python2.* while using gyp - sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die - sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die - - # less verbose install output (stating the same as portage, basically) - sed -i -e "/print/d" tools/install.py || die - - # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 - local LIBDIR=$(get_libdir) - sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die - sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die - - # Avoid writing a depfile, not useful - sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die - - sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die - - # Avoid a test that I've only been able to reproduce from emerge. It doesnt - # seem sandbox related either (invoking it from a sandbox works fine). - # The issue is that no stdin handle is openened when asked for one. - # It doesn't really belong upstream , so it'll just be removed until someone - # with more gentoo-knowledge than me (jbergstroem) figures it out. - rm test/parallel/test-stdout-close-unref.js || die - - # debug builds. change install path, remove optimisations and override buildtype - if use debug; then - sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die - BUILDTYPE=Debug - fi - - default -} - -src_configure() { - xdg_environment_reset - - local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib ) - use debug && myconf+=( --debug ) - use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none ) - use inspector || myconf+=( --without-inspector ) - use npm || myconf+=( --without-npm ) - use snapshot && myconf+=( --with-snapshot ) - use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl ) - - local myarch="" - case ${ABI} in - amd64) myarch="x64";; - arm) myarch="arm";; - arm64) myarch="arm64";; - ppc64) myarch="ppc64";; - x32) myarch="x32";; - x86) myarch="ia32";; - *) myarch="${ABI}";; - esac - - GYP_DEFINES="linux_use_gold_flags=0 - linux_use_bundled_binutils=0 - linux_use_bundled_gold=0" \ - "${PYTHON}" configure \ - --prefix="${EPREFIX}"/usr \ - --dest-cpu=${myarch} \ - $(use_with systemtap dtrace) \ - "${myconf[@]}" || die -} - -src_compile() { - emake -C out mksnapshot - pax-mark m "out/${BUILDTYPE}/mksnapshot" - emake -C out -} - -src_install() { - local LIBDIR="${ED}/usr/$(get_libdir)" - emake install DESTDIR="${D}" - pax-mark -m "${ED}"/usr/bin/node - - # set up a symlink structure that node-gyp expects.. - dodir /usr/include/node/deps/{v8,uv} - dosym . /usr/include/node/src - for var in deps/{uv,v8}/include; do - dosym ../.. /usr/include/node/${var} - done - - if use doc; then - docinto html - dodoc -r "${S}"/doc/* - fi - - if use npm; then - dodir /etc/npm - - # Install bash completion for `npm` - # We need to temporarily replace default config path since - # npm otherwise tries to write outside of the sandbox - local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js" - sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die - local tmp_npm_completion_file="$(emktemp)" - "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" - newbashcomp "${tmp_npm_completion_file}" npm - sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die - - # Move man pages - doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* - - # Clean up - rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die - rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die - - local find_exp="-or -name" - local find_name=() - for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ - ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ - "*.md" "*.markdown" "*.bat" "*.cmd"; do - find_name+=( ${find_exp} "${match}" ) - done - - # Remove various development and/or inappropriate files and - # useless docs of dependend packages. - find "${LIBDIR}"/node_modules \ - \( -type d -name examples \) -or \( -type f \( \ - -iname "LICEN?E*" \ - "${find_name[@]}" \ - \) \) -exec rm -rf "{}" \; - fi - - mv "${D}"/usr/share/doc/node "${D}"/usr/share/doc/${PF} || die -} - -src_test() { - out/${BUILDTYPE}/cctest || die - "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die -} - -pkg_postinst() { - einfo "The global npm config lives in /etc/npm. This deviates slightly" - einfo "from upstream which otherwise would have it live in /usr/etc/." - einfo "" - einfo "Protip: When using node-gyp to install native modules, you can" - einfo "avoid having to download extras by doing the following:" - einfo "$ node-gyp --nodedir /usr/include/node <command>" -} diff --git a/net-libs/nodejs/nodejs-10.18.0.ebuild b/net-libs/nodejs/nodejs-10.18.0.ebuild index a476e3597956..8649f6c562e9 100644 --- a/net-libs/nodejs/nodejs-10.18.0.ebuild +++ b/net-libs/nodejs/nodejs-10.18.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" SLOT="0" -KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos" +KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos" IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" REQUIRED_USE=" inspector? ( icu ssl ) diff --git a/net-libs/nodejs/nodejs-12.13.0.ebuild b/net-libs/nodejs/nodejs-12.13.0.ebuild deleted file mode 100644 index e6741c72ebb5..000000000000 --- a/net-libs/nodejs/nodejs-12.13.0.ebuild +++ /dev/null @@ -1,213 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads" -inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils - -DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" -HOMEPAGE="https://nodejs.org/" -SRC_URI=" - https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz -" - -LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos" -IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" -REQUIRED_USE=" - inspector? ( icu ssl ) - npm? ( ssl ) -" - -RDEPEND=" - >=dev-libs/libuv-1.32.0:= - >=net-dns/c-ares-1.15.0 - >=net-libs/http-parser-2.9.0:= - >=net-libs/nghttp2-1.39.2 - sys-libs/zlib - icu? ( >=dev-libs/icu-64.2:= ) - ssl? ( >=dev-libs/openssl-1.1.1:0= ) -" -BDEPEND=" - ${PYTHON_DEPS} - systemtap? ( dev-util/systemtap ) - test? ( net-misc/curl ) -" -DEPEND=" - ${RDEPEND} -" -PATCHES=( - "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch - "${FILESDIR}"/${PN}-99999999-llhttp.patch -) -RESTRICT="test" -S="${WORKDIR}/node-v${PV}" - -pkg_pretend() { - (use x86 && ! use cpu_flags_x86_sse2) && \ - die "Your CPU doesn't support the required SSE2 instruction." - - ( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \ - die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer." -} - -src_prepare() { - tc-export CC CXX PKG_CONFIG - export V=1 - export BUILDTYPE=Release - - # fix compilation on Darwin - # https://code.google.com/p/gyp/issues/detail?id=260 - sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die - - # make sure we use python2.* while using gyp - sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die - - # less verbose install output (stating the same as portage, basically) - sed -i -e "/print/d" tools/install.py || die - - # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 - local LIBDIR=$(get_libdir) - sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die - sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die - - # Avoid writing a depfile, not useful - sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die - - sed -i -e "/'-O3'/d" common.gypi node.gypi || die - - # Avoid a test that I've only been able to reproduce from emerge. It doesnt - # seem sandbox related either (invoking it from a sandbox works fine). - # The issue is that no stdin handle is openened when asked for one. - # It doesn't really belong upstream , so it'll just be removed until someone - # with more gentoo-knowledge than me (jbergstroem) figures it out. - rm test/parallel/test-stdout-close-unref.js || die - - # debug builds. change install path, remove optimisations and override buildtype - if use debug; then - sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die - BUILDTYPE=Debug - fi - - default -} - -src_configure() { - xdg_environment_reset - - local myconf=( - --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 - --shared-zlib - ) - use debug && myconf+=( --debug ) - use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none ) - use inspector || myconf+=( --without-inspector ) - use npm || myconf+=( --without-npm ) - use snapshot && myconf+=( --with-snapshot ) - use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl ) - - local myarch="" - case ${ABI} in - amd64) myarch="x64";; - arm) myarch="arm";; - arm64) myarch="arm64";; - ppc64) myarch="ppc64";; - x32) myarch="x32";; - x86) myarch="ia32";; - *) myarch="${ABI}";; - esac - - GYP_DEFINES="linux_use_gold_flags=0 - linux_use_bundled_binutils=0 - linux_use_bundled_gold=0" \ - "${PYTHON}" configure \ - --prefix="${EPREFIX}"/usr \ - --dest-cpu=${myarch} \ - $(use_with systemtap dtrace) \ - "${myconf[@]}" || die -} - -src_compile() { - emake -C out mksnapshot - pax-mark m "out/${BUILDTYPE}/mksnapshot" - emake -C out -} - -src_install() { - local LIBDIR="${ED}/usr/$(get_libdir)" - default - - pax-mark -m "${ED}"/usr/bin/node - - # set up a symlink structure that node-gyp expects.. - dodir /usr/include/node/deps/{v8,uv} - dosym . /usr/include/node/src - for var in deps/{uv,v8}/include; do - dosym ../.. /usr/include/node/${var} - done - - if use doc; then - # Patch docs to make them offline readable - for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do - sed -i '/fonts.googleapis.com/ d' $i; - done - # Install docs - docinto html - dodoc -r "${S}"/doc/* - fi - - if use npm; then - dodir /etc/npm - - # Install bash completion for `npm` - # We need to temporarily replace default config path since - # npm otherwise tries to write outside of the sandbox - local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js" - sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die - local tmp_npm_completion_file="$(emktemp)" - "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" - newbashcomp "${tmp_npm_completion_file}" npm - sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die - - # Move man pages - doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* - - # Clean up - rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die - rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die - - local find_exp="-or -name" - local find_name=() - for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ - ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ - "*.md" "*.markdown" "*.bat" "*.cmd"; do - find_name+=( ${find_exp} "${match}" ) - done - - # Remove various development and/or inappropriate files and - # useless docs of dependend packages. - find "${LIBDIR}"/node_modules \ - \( -type d -name examples \) -or \( -type f \( \ - -iname "LICEN?E*" \ - "${find_name[@]}" \ - \) \) -exec rm -rf "{}" \; - fi - - mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die -} - -src_test() { - out/${BUILDTYPE}/cctest || die - "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die -} - -pkg_postinst() { - elog "The global npm config lives in /etc/npm. This deviates slightly" - elog "from upstream which otherwise would have it live in /usr/etc/." - elog "" - elog "Protip: When using node-gyp to install native modules, you can" - elog "avoid having to download extras by doing the following:" - elog "$ node-gyp --nodedir /usr/include/node <command>" -} diff --git a/net-libs/nodejs/nodejs-12.14.0.ebuild b/net-libs/nodejs/nodejs-12.14.0.ebuild index 8468a27e2219..1d622544b67b 100644 --- a/net-libs/nodejs/nodejs-12.14.0.ebuild +++ b/net-libs/nodejs/nodejs-12.14.0.ebuild @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" SLOT="0" -KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos" +KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos" IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" REQUIRED_USE=" inspector? ( icu ssl ) diff --git a/net-libs/nodejs/nodejs-13.5.0-r1.ebuild b/net-libs/nodejs/nodejs-13.5.0-r1.ebuild deleted file mode 100644 index 3f434606d2fe..000000000000 --- a/net-libs/nodejs/nodejs-13.5.0-r1.ebuild +++ /dev/null @@ -1,204 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python{2_7,3_{6,7}} ) -PYTHON_REQ_USE="threads(+)" -inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils - -DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" -HOMEPAGE="https://nodejs.org/" -SRC_URI=" - https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz -" - -LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" -IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl systemtap test" -REQUIRED_USE=" - inspector? ( icu ssl ) - npm? ( ssl ) -" - -RDEPEND=" - >=dev-libs/libuv-1.34.0:= - >=net-dns/c-ares-1.15.0 - >=net-libs/nghttp2-1.40.0 - sys-libs/zlib - icu? ( >=dev-libs/icu-64.2:= ) - ssl? ( >=dev-libs/openssl-1.1.1:0= ) -" -BDEPEND=" - ${PYTHON_DEPS} - systemtap? ( dev-util/systemtap ) - test? ( net-misc/curl ) - pax_kernel? ( sys-apps/elfix ) -" -DEPEND=" - ${RDEPEND} -" -PATCHES=( - "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch -) -RESTRICT="test" -S="${WORKDIR}/node-v${PV}" - -pkg_pretend() { - (use x86 && ! use cpu_flags_x86_sse2) && \ - die "Your CPU doesn't support the required SSE2 instruction." - - ( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \ - die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer." -} - -src_prepare() { - tc-export CC CXX PKG_CONFIG - export V=1 - export BUILDTYPE=Release - - # fix compilation on Darwin - # https://code.google.com/p/gyp/issues/detail?id=260 - sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die - - # less verbose install output (stating the same as portage, basically) - sed -i -e "/print/d" tools/install.py || die - - # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 - local LIBDIR=$(get_libdir) - sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die - sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die - - # Avoid writing a depfile, not useful - sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die - - sed -i -e "/'-O3'/d" common.gypi node.gypi || die - - # Avoid a test that I've only been able to reproduce from emerge. It doesnt - # seem sandbox related either (invoking it from a sandbox works fine). - # The issue is that no stdin handle is openened when asked for one. - # It doesn't really belong upstream , so it'll just be removed until someone - # with more gentoo-knowledge than me (jbergstroem) figures it out. - rm test/parallel/test-stdout-close-unref.js || die - - # debug builds. change install path, remove optimisations and override buildtype - if use debug; then - sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die - BUILDTYPE=Debug - fi - - # We need to disable mprotect on two files when it builds Bug 694100. - use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.2.0-paxmarking.patch ) - - default -} - -src_configure() { - xdg_environment_reset - - local myconf=( - --shared-cares --shared-libuv --shared-nghttp2 --shared-zlib - ) - use debug && myconf+=( --debug ) - use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none ) - use inspector || myconf+=( --without-inspector ) - use npm || myconf+=( --without-npm ) - use snapshot && myconf+=( --with-snapshot ) - use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl ) - - local myarch="" - case ${ABI} in - amd64) myarch="x64";; - arm) myarch="arm";; - arm64) myarch="arm64";; - ppc64) myarch="ppc64";; - x32) myarch="x32";; - x86) myarch="ia32";; - *) myarch="${ABI}";; - esac - - GYP_DEFINES="linux_use_gold_flags=0 - linux_use_bundled_binutils=0 - linux_use_bundled_gold=0" \ - "${EPYTHON}" configure.py \ - --prefix="${EPREFIX}"/usr \ - --dest-cpu=${myarch} \ - $(use_with systemtap dtrace) \ - "${myconf[@]}" || die -} - -src_compile() { - emake -C out -} - -src_install() { - local LIBDIR="${ED}/usr/$(get_libdir)" - default - - pax-mark -m "${ED}"/usr/bin/node - - # set up a symlink structure that node-gyp expects.. - dodir /usr/include/node/deps/{v8,uv} - dosym . /usr/include/node/src - for var in deps/{uv,v8}/include; do - dosym ../.. /usr/include/node/${var} - done - - if use doc; then - docinto html - dodoc -r "${S}"/doc/* - fi - - if use npm; then - dodir /etc/npm - - # Install bash completion for `npm` - # We need to temporarily replace default config path since - # npm otherwise tries to write outside of the sandbox - local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js" - sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die - local tmp_npm_completion_file="$(emktemp)" - "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" - newbashcomp "${tmp_npm_completion_file}" npm - sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die - - # Move man pages - doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* - - # Clean up - rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die - rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die - - local find_exp="-or -name" - local find_name=() - for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ - ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ - "*.md" "*.markdown" "*.bat" "*.cmd"; do - find_name+=( ${find_exp} "${match}" ) - done - - # Remove various development and/or inappropriate files and - # useless docs of dependend packages. - find "${LIBDIR}"/node_modules \ - \( -type d -name examples \) -or \( -type f \( \ - -iname "LICEN?E*" \ - "${find_name[@]}" \ - \) \) -exec rm -rf "{}" \; - fi - - mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die -} - -src_test() { - out/${BUILDTYPE}/cctest || die - "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die -} - -pkg_postinst() { - elog "The global npm config lives in /etc/npm. This deviates slightly" - elog "from upstream which otherwise would have it live in /usr/etc/." - elog "" - elog "Protip: When using node-gyp to install native modules, you can" - elog "avoid having to download extras by doing the following:" - elog "$ node-gyp --nodedir /usr/include/node <command>" -} diff --git a/net-libs/nodejs/nodejs-8.12.0.ebuild b/net-libs/nodejs/nodejs-8.12.0.ebuild index 2e98f86fe29f..42936ad7d0d2 100644 --- a/net-libs/nodejs/nodejs-8.12.0.ebuild +++ b/net-libs/nodejs/nodejs-8.12.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,7 +15,7 @@ SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x64-macos" +KEYWORDS="arm ppc ppc64 ~amd64-linux ~x64-macos" IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" REQUIRED_USE=" inspector? ( icu ssl ) diff --git a/net-libs/nodejs/nodejs-8.16.2.ebuild b/net-libs/nodejs/nodejs-8.16.2.ebuild deleted file mode 100644 index 9796fe0f07f3..000000000000 --- a/net-libs/nodejs/nodejs-8.16.2.ebuild +++ /dev/null @@ -1,210 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads" - -inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils - -DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" -HOMEPAGE="https://nodejs.org/" -SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" - -LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos" -IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" -REQUIRED_USE=" - inspector? ( icu ssl ) - npm? ( ssl ) -" - -RDEPEND=" - >=dev-libs/libuv-1.23.2:= - >=net-dns/c-ares-1.10.1 - >=net-libs/http-parser-2.9.0:= - >=net-libs/nghttp2-1.39.2 - sys-libs/zlib - icu? ( >=dev-libs/icu-60.1:= ) - ssl? ( =dev-libs/openssl-1.0.2*:0=[-bindist] ) -" -BDEPEND=" - ${PYTHON_DEPS} - systemtap? ( dev-util/systemtap ) - test? ( net-misc/curl ) -" -DEPEND=" - ${RDEPEND} -" -PATCHES=( - "${FILESDIR}"/nodejs-10.3.0-global-npm-config.patch -) -RESTRICT="test" -S="${WORKDIR}/node-v${PV}" - -pkg_pretend() { - (use x86 && ! use cpu_flags_x86_sse2) && \ - die "Your CPU doesn't support the required SSE2 instruction." - - ( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \ - die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer." -} - -src_prepare() { - tc-export CC CXX PKG_CONFIG - export V=1 - export BUILDTYPE=Release - - # fix compilation on Darwin - # https://code.google.com/p/gyp/issues/detail?id=260 - sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die - - # make sure we use python2.* while using gyp - sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die - sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die - - # less verbose install output (stating the same as portage, basically) - sed -i -e "/print/d" tools/install.py || die - - # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 - local LIBDIR=$(get_libdir) - sed -i \ - -e "s|lib/|${LIBDIR}/|g" \ - -e 's|share/doc/node/|share/doc/'"${PF}"'/|g' \ - tools/install.py || die - - sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js deps/npm/lib/npm.js || die - - # Avoid writing a depfile, not useful - sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die - - sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die - - # Avoid a test that I've only been able to reproduce from emerge. It doesnt - # seem sandbox related either (invoking it from a sandbox works fine). - # The issue is that no stdin handle is openened when asked for one. - # It doesn't really belong upstream , so it'll just be removed until someone - # with more gentoo-knowledge than me (jbergstroem) figures it out. - rm test/parallel/test-stdout-close-unref.js || die - - # debug builds. change install path, remove optimisations and override buildtype - if use debug; then - sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die - BUILDTYPE=Debug - fi - - default -} - -src_configure() { - xdg_environment_reset - - local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib ) - use debug && myconf+=( --debug ) - use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none ) - use inspector || myconf+=( --without-inspector ) - use npm || myconf+=( --without-npm ) - use snapshot && myconf+=( --with-snapshot ) - use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl ) - - local myarch="" - case ${ABI} in - amd64) myarch="x64";; - arm) myarch="arm";; - arm64) myarch="arm64";; - ppc64) myarch="ppc64";; - x32) myarch="x32";; - x86) myarch="ia32";; - *) myarch="${ABI}";; - esac - - GYP_DEFINES="linux_use_gold_flags=0 - linux_use_bundled_binutils=0 - linux_use_bundled_gold=0" \ - "${PYTHON}" configure \ - --prefix="${EPREFIX}"/usr \ - --dest-cpu=${myarch} \ - $(use_with systemtap dtrace) \ - "${myconf[@]}" || die -} - -src_compile() { - emake -C out mksnapshot - pax-mark m "out/${BUILDTYPE}/mksnapshot" - emake -C out -} - -src_test() { - out/${BUILDTYPE}/cctest || die - "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die -} - -src_install() { - local LIBDIR="${ED}/usr/$(get_libdir)" - emake install DESTDIR="${D}" - pax-mark -m "${ED}"/usr/bin/node - - # set up a symlink structure that node-gyp expects.. - dodir /usr/include/node/deps/{v8,uv} - dosym . /usr/include/node/src - for var in deps/{uv,v8}/include; do - dosym ../.. /usr/include/node/${var} - done - - if use doc; then - # Patch docs to make them offline readable - for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do - sed -i '/fonts.googleapis.com/ d' $i; - done - # Install docs - dodoc -r "${S}"/doc/* - fi - - if use npm; then - dodir /etc/npm - - # Install bash completion for `npm` - # We need to temporarily replace default config path since - # npm otherwise tries to write outside of the sandbox - local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js" - sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die - local tmp_npm_completion_file="$(emktemp)" - "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" - newbashcomp "${tmp_npm_completion_file}" npm - sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die - - # Move man pages - doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* - - # Clean up - rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die - rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die - - local find_exp="-or -name" - local find_name=() - for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ - ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ - "*.md" "*.markdown" "*.bat" "*.cmd"; do - find_name+=( ${find_exp} "${match}" ) - done - - # Remove various development and/or inappropriate files and - # useless docs of dependend packages. - find "${LIBDIR}"/node_modules \ - \( -type d -name examples \) -or \( -type f \( \ - -iname "LICEN?E*" \ - "${find_name[@]}" \ - \) \) -exec rm -rf "{}" \; - fi -} - -pkg_postinst() { - einfo "The global npm config lives in /etc/npm. This deviates slightly" - einfo "from upstream which otherwise would have it live in /usr/etc/." - einfo "" - einfo "Protip: When using node-gyp to install native modules, you can" - einfo "avoid having to download extras by doing the following:" - einfo "$ node-gyp --nodedir /usr/include/node <command>" -} diff --git a/net-libs/nodejs/nodejs-8.17.0.ebuild b/net-libs/nodejs/nodejs-8.17.0.ebuild index 18be7b6849fc..b45783fca1bc 100644 --- a/net-libs/nodejs/nodejs-8.17.0.ebuild +++ b/net-libs/nodejs/nodejs-8.17.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" SLOT="0" -KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos" +KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos" IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test" REQUIRED_USE=" inspector? ( icu ssl ) diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest index d42dbbbfcc64..220e587ff995 100644 --- a/net-libs/tox/Manifest +++ b/net-libs/tox/Manifest @@ -4,7 +4,7 @@ AUX tox-bootstrapd.conf 2397 BLAKE2B 336317dc2b2a7958420164d3ef3197ea2aefbb51822 AUX tox-bootstrapd.service 365 BLAKE2B f17891d280007180811414f85f1f8a4defd85436410113f11cffd60dd14a02cd24a0637c347a75ea11322c050e4030702e9f95f02810705aef512df6558e66d5 SHA512 d565430c53b91343d57b6db573884c9f11aaf8bbddfd70bf3a46a6dede91c01ab8f1371ae052b4dd529cc521bef28924069fc7f4bc3d610c01cbd6d6569707f8 DIST c-toxcore-0.2.10.tar.gz 515842 BLAKE2B 8e79f9a5045b5fef7825e5eb21644625607d86e472ec75ff45ff826712efa515682f9439181d52444b2a6a21472c6e78a3bea5bb7e356373faf733e2644a315d SHA512 8a6a78c52a67be0b727d0d3a8d1cece20ad716a2e694df0aa747eee7764f64c957458584f59db5e727a9803ed7b21adc1ad8d7e80fd6651e7774ca3504b38fc7 DIST c-toxcore-0.2.9.tar.gz 510806 BLAKE2B e67bdb86757d1431cc9d627dbc9afa9f54c3deb7814b38c2126849d10e9225aa58d2b23d175622678be74894ea197d3084719422a605d95eb4c55c4597a79f98 SHA512 917826a906a9ca4f04f34494616b8e36ec9e74c6b0709c50e8fe2dd9da680d170013fef242a3fe1b834e8e54cd2dde6be1c14e5d977f8531436ef34280bc3966 -EBUILD tox-0.2.10.ebuild 3145 BLAKE2B 5c4e33623b746c48d7527ed054919218a18bfa8b44c10cc7acf529d86e179d141428de3753b9c8a5bca7810cf548ed5dca2968140f0d92f37fe62a4c2de6bcf2 SHA512 f22a73a65c2720e0c5a0742f796d8a02cb9a0c07843837e3b8c4c20e2444b7f7dfb313f884c79cb8029b1e51d21eb1ee5eaca18a9e75a961ec0c17feef6a3d71 -EBUILD tox-0.2.9-r1.ebuild 3167 BLAKE2B 62cdc2dfdc2492712eaafd05d96534c429dbc6c49687775bf211d33783d845a36b304778123b7fccf99e680534f4559cda4986e30594e4ebc47cc585ee147a7e SHA512 cfd6ccc8f583dae2bade9d6d17bec74099997521eba68637b7bbb5d5934a91cc31eac6686151ef942057aec24d473ca3666a4b0ee148037665896d8fe9979302 -EBUILD tox-9999.ebuild 3084 BLAKE2B 2265c2ddb19ba08857148cc05623b4bb6a42d9979661f201be265cb25602992aa344c37e1c7863031075478663f70878df877e23c4c7125f9e92a865b0b79ee8 SHA512 c78c1c80f5da28a58f710446b74f03c3b849fece2bfec36f71cefe49a6d045d37076c127c754b7d8e370b01f7ea47075f54e29e77c6962a6abe3345334c268ed +EBUILD tox-0.2.10.ebuild 3121 BLAKE2B e3cd3818d6683edc8d51d8032e30106aae7e31d88501c0e8cf8a09b8bb228977ad5827c30189c4552b14918957c41bbcf95fede6ee90551635bba7b10bc5db14 SHA512 013444d4e295f2a33b9788cbe516c1d1eb6e84722e067213a0b7ec2ceb2b583f03ebeae418a753084495ef6411f0fde898d6016bc9b5a5751949bade7aa7800f +EBUILD tox-0.2.9-r1.ebuild 3143 BLAKE2B 188753e018b3e7f1b0d05aacbdbe1228dfe2a88daee901172a59307263b02e7542142445d57118aaf6ee8ec982f447e2f93edf3cb2fc76c9bf1e38e10fbe948e SHA512 8dd507bac0e293439a24f75209f01086f00e6809f5b6d0e9549b628862edcfa1126ac859b7dd29f410f879322452c47df3e73b1492c8c49b6cf6333c197610f7 +EBUILD tox-9999.ebuild 3060 BLAKE2B f0d9f2b23d07acfbdc154fd5f7da6762ecebbd8c6d147c9d3ecb7f929920d2c3e0fcdbeb9af67ccb78e710ffb97b8bebab964595c5cf2888c2fa6e2164583e2d SHA512 eef7d061bac67a5f93daf601f76b3d252c7df4b422e7e6668581ae10c44253a625a465152c7e916451cc1a4917f0c644b8d3f7ddd9a3a6ea8eaffedeca8cce7d MISC metadata.xml 870 BLAKE2B fe6cd17ce54fce4f002d1952694a0f3b6cbfc55be321de1256590721aa6d2e248bf8e9b080708c6cf06bbf8cccba327dc71a18223500d1a0910d1c6edb9ffc55 SHA512 7600b6b0558499e346cec1d6f5ddfadfa7a9fa97187737febe8076379af759f30f7ba90c46f38c70b69a91b39a365c7deb04182f6cc77ba54da9bd792ceb2025 diff --git a/net-libs/tox/tox-0.2.10.ebuild b/net-libs/tox/tox-0.2.10.ebuild index 11d676ea6137..d8e4d1d2a74b 100644 --- a/net-libs/tox/tox-0.2.10.ebuild +++ b/net-libs/tox/tox-0.2.10.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils systemd +inherit cmake systemd MY_P="c-toxcore-${PV}" DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform" @@ -38,7 +38,7 @@ RDEPEND=" S="${WORKDIR}/${MY_P}" src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare #remove faulty tests for testname in bootstrap lan_discovery save_compatibility tcp_relay tox_many_tcp; do sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die @@ -81,11 +81,11 @@ src_configure() { einfo "Logging disabled" fi - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install if use daemon; then newinitd "${FILESDIR}"/initd tox-dht-daemon diff --git a/net-libs/tox/tox-0.2.9-r1.ebuild b/net-libs/tox/tox-0.2.9-r1.ebuild index 5307394b1288..a6e9875d9fcb 100644 --- a/net-libs/tox/tox-0.2.9-r1.ebuild +++ b/net-libs/tox/tox-0.2.9-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils systemd +inherit cmake systemd MY_P="c-toxcore-${PV}" DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform" @@ -31,7 +31,7 @@ RDEPEND="${DEPEND} S="${WORKDIR}/${MY_P}" src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare #remove faulty tests for testname in bootstrap lan_discovery save_compatibility tcp_relay tox_many_tcp; do sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die @@ -74,11 +74,11 @@ src_configure() { einfo "Logging disabled" fi - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install if use daemon; then newinitd "${FILESDIR}"/initd tox-dht-daemon diff --git a/net-libs/tox/tox-9999.ebuild b/net-libs/tox/tox-9999.ebuild index 02c534562822..151001dd8ee2 100644 --- a/net-libs/tox/tox-9999.ebuild +++ b/net-libs/tox/tox-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils git-r3 systemd +inherit cmake git-r3 systemd DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform" HOMEPAGE="https://tox.chat" @@ -33,7 +33,7 @@ DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND}" src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare #remove faulty tests for testname in bootstrap lan_discovery save_compatibility tcp_relay tox_many_tcp; do sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die @@ -74,11 +74,11 @@ src_configure() { mycmakeargs+=(-DMIN_LOGGER_LEVEL="") einfo "Logging Disabled" fi - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install if use daemon; then newinitd "${FILESDIR}"/initd tox-dht-daemon diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index 984c23d25bcb..cb6594600e9e 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -1,8 +1,9 @@ +AUX 2.26.2-fix-arm-non-unified-build.patch 982 BLAKE2B b2f4ab56030fffdf2504f213f2713117537095b66c6862377051687a4a798e0540dca95774275b5a7c1ac0fdd5a2927e07a6af8b7a992b8710d2edb05be272e2 SHA512 95ab575a4de13036b11691a4d9cb1b4338b118e5983352d66c4ad639104cce564c4a946349347ac461515bd5bef7359f8193a84d7b02f2d1345cba7969fcfcf6 AUX 2.26.2-fix-noGL-build.patch 1491 BLAKE2B 1bdbffea8af3d2d7d8ddefe0b9a057e0dca2cdeead448a5b693f5ba14a74fdd0cc9bb9407c5a6fb9f0ed344bf438678910d746620b5038314b0f0477c6272bd7 SHA512 a1f8d968b1487b7172a2f66f47478c1fc85ea55c64da2fe45ded77463c8e3541bed3f14d16177db881dfeb2d68cd9bcf3a8b411242f5c51a1f302e2d99fd2a8a AUX webkit-gtk-2.24.4-eglmesaext-include.patch 467 BLAKE2B 10bcb2f1b0eda42c6d7e70ceaad929b7321697488ec0021ee6d5e8d91f311d414f82a7806b5fc60156acdaaac491a47aa086a95c7ca0d4fce61dc9066ac2c255 SHA512 4eba604907966df59d3c0771a97c56fcb81f4ddf7adcc77a840350b3867dbbceb46590a7fc15243aa9e3ebf17664b3639bfa55ca3161b381d588e83690e99bf8 AUX webkit-gtk-2.24.4-icu-65.patch 1991 BLAKE2B e69612d43f66e9e31190c3b35e5ea2581ce3726c685e719b4040e670dc7ae236f6a024b5d33659ccac172a9eef442eddf35f4ebfcabc7cfdfd1cfde217f341e1 SHA512 8eab3ddf0dea73f2ba41c3c1ff7f9643334ad52ac61adcb86d1352b9367b03f0ffd072b8f910aaf875134d3f09d1106db7e44f38c8c4756555c0e5fbfe6a53cf DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2 SHA512 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112 DIST webkitgtk-2.26.2.tar.xz 19330000 BLAKE2B c0142aa19572c96e3dff11251316a4527be0357cf101177e056dd40aa9b5346216a4dcc14071d9c1240c101bd03f2179559d0d2bd81308967aba8530208186e0 SHA512 98d47282fd8f766dbe4a74c1a3f618aaeeeed69bd0666ed4e8674ae562b634681b3bd18b0d428df6bfefbaa3e18eb4cfb2fb077f5be4fed34cbc81c8293ec33e EBUILD webkit-gtk-2.24.4.ebuild 8484 BLAKE2B e90d9d5215581ff7c8adb971b3a9f9a4baa77ba96aabe25315bc5af09ba37e130a95e4049b5769c6ff479420bdd9940acf03059e672f27090f961c3f2d5a0d0c SHA512 547a97fe6ae454c820610238aeca287d62e3d7b44feb3b53c0bf21f235bafc8e0e0fb07aa751a90b30ce43aca0648dbe7717516a9b1d9e1875ba1fbe6b9b7674 -EBUILD webkit-gtk-2.26.2.ebuild 8682 BLAKE2B 432bfa6a0177d064f75dba0ee3e2006f5e60f370b96d7ca2de4dfa35a34d3bba2c7ff1d0333b771a5bc7a1509957f2029c86106946e8301126b1d3fb7dd63a51 SHA512 713fdb52ec4f432737dda2fc618848b8672f8f34be17cf313d7b75a56ed3aba05c3d1e3a41837ee949f9af4a0c36f66d00f0ee5b1dbf97606c948f331d7bc295 +EBUILD webkit-gtk-2.26.2.ebuild 8767 BLAKE2B 904b17fc552b38e593b349cf330c021106ee52d0b634d49f6e181b15209568ca8c15720375b6af78344e36d50170abef06833b8b7aaff0e3197005d87d7d9fdf SHA512 356702f01169f66e8b1ecd0401ef04dcd03e485cd86128cdb709cb9a666fc7d726cb1a47da83f27b647bf561b00ebdbf466853348c096379fc6be27d1313efc1 MISC metadata.xml 837 BLAKE2B 58680ed3ff0941924b33c03aef91322437b90c88e46951bf780b99507b7dfd599d055c8109a45e8fde18a9d871c19b9e86d21550cd0a01bc3e02db2f075ccfda SHA512 6a8191200dd2e84ac2cfaedeecc753d8a9201d764acedd2b11c707e8ce21ba5b0e91e73c4342efb33c96a46a65c2a67736cb32599f07219acc9bdd38d453203d diff --git a/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch b/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch new file mode 100644 index 000000000000..0f0959900df2 --- /dev/null +++ b/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch @@ -0,0 +1,27 @@ +Add missing headers required during non-unified build. + +Unified build happens to get them included by the other sources unified +into same source file, thus didn't fail. + +diff -urNp a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp +--- a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp ++++ b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp +@@ -30,6 +30,7 @@ + + #include "BuiltinNames.h" + #include "BytecodeGenerator.h" ++#include "BytecodeStructs.h" + #include "CallFrame.h" + #include "JIT.h" + #include "JSCInlines.h" +diff -urNp a/Source/JavaScriptCore/heap/MachineStackMarker.cpp b/Source/JavaScriptCore/heap/MachineStackMarker.cpp +--- a/Source/JavaScriptCore/heap/MachineStackMarker.cpp ++++ b/Source/JavaScriptCore/heap/MachineStackMarker.cpp +@@ -23,6 +23,7 @@ + #include "MachineStackMarker.h" + + #include "ConservativeRoots.h" ++#include "CPU.h" + #include "MachineContext.h" + #include <setjmp.h> + #include <stdlib.h> diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild index b2ae6bf0f10d..455b181a4dde 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild @@ -167,6 +167,7 @@ src_prepare() { eapply "${FILESDIR}/${PN}-2.24.4-icu-65.patch" # bug 698596 eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108 eapply "${FILESDIR}"/${PV}-fix-noGL-build.patch # bug 704236 + eapply "${FILESDIR}"/${PV}-fix-arm-non-unified-build.patch # bug 704194 cmake-utils_src_prepare gnome2_src_prepare } @@ -203,7 +204,7 @@ src_configure() { local rubyimpl local ruby_interpreter="" for rubyimpl in ${USE_RUBY}; do - if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then + if has_version --host-root "virtual/rubygems[ruby_targets_${rubyimpl}]"; then ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})" fi done |