From 7b9f15840068dfaeea5684f8a1af1fe460dfa14c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 2 Jun 2018 17:18:14 +0100 Subject: gentoo resync : 02.06.2018 --- net-libs/Manifest.gz | Bin 34217 -> 34194 bytes net-libs/grpc/Manifest | 4 +- net-libs/grpc/grpc-1.11.0-r1.ebuild | 66 ------- net-libs/grpc/grpc-1.12.0.ebuild | 66 +++++++ net-libs/gupnp-igd/Manifest | 2 +- net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild | 2 +- net-libs/libmicrodns/Manifest | 2 +- net-libs/libmicrodns/libmicrodns-0.0.9.ebuild | 2 +- net-libs/libpcapnav/Manifest | 2 +- net-libs/libpcapnav/libpcapnav-0.8.ebuild | 4 +- net-libs/libssh2/Manifest | 2 +- net-libs/libssh2/libssh2-1.8.0-r1.ebuild | 2 +- net-libs/libyahoo2/Manifest | 4 +- .../libyahoo2/files/libyahoo2-1.0.1-asneeded.patch | 4 +- net-libs/libyahoo2/libyahoo2-1.0.1.ebuild | 29 +-- net-libs/nodejs/Manifest | 5 +- .../files/nodejs-10.3.0-global-npm-config.patch | 20 +++ net-libs/nodejs/nodejs-10.0.0.ebuild | 200 --------------------- net-libs/nodejs/nodejs-10.3.0.ebuild | 200 +++++++++++++++++++++ net-libs/signon-oauth2/Manifest | 4 + .../signon-oauth2-0.24-disable-examples.patch | 14 ++ .../signon-oauth2-0.24-dont-install-tests.patch | 11 ++ net-libs/signon-oauth2/signon-oauth2-0.24.ebuild | 50 ++++++ 23 files changed, 401 insertions(+), 294 deletions(-) delete mode 100644 net-libs/grpc/grpc-1.11.0-r1.ebuild create mode 100644 net-libs/grpc/grpc-1.12.0.ebuild create mode 100644 net-libs/nodejs/files/nodejs-10.3.0-global-npm-config.patch delete mode 100644 net-libs/nodejs/nodejs-10.0.0.ebuild create mode 100644 net-libs/nodejs/nodejs-10.3.0.ebuild create mode 100644 net-libs/signon-oauth2/files/signon-oauth2-0.24-disable-examples.patch create mode 100644 net-libs/signon-oauth2/files/signon-oauth2-0.24-dont-install-tests.patch create mode 100644 net-libs/signon-oauth2/signon-oauth2-0.24.ebuild (limited to 'net-libs') diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz index b5d340287704..174595608d41 100644 Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest index bdf10dc09aa7..3c6ee14c5929 100644 --- a/net-libs/grpc/Manifest +++ b/net-libs/grpc/Manifest @@ -3,6 +3,6 @@ AUX 0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch 1227 BLAKE2B 2791f596cc2e9feb63 AUX 0003-grpc-1.3.0-Don-t-run-ldconfig.patch 1957 BLAKE2B 945ca98ffe0a55bd6e277d3c6d967014d77df8fdf7c708fa275e003df6fda5ce32206069a9a173c41f1d77d8eec38444190bdf15cdd5891142ec5d632bf9af8b SHA512 8e691f56cf6ac348d2516ffe022216fe92132c4266bdc55989238fca37ef3e4cb8c08f261ea41a3c4cd36b5e6dbd20122d75cff77a3924959b5e2e9302a494be AUX 0004-grpc-1.11.0-fix-cpp-so-version.patch 3700 BLAKE2B 4d198daaff28d5a69b52594fb3d430e7013c15623e4becd1f0fe402a30d48da191b2920b650da5d84a09a16b136049b66678b5a6aad3963bb6bd2d4f2866b900 SHA512 484e535bcf3d18b780e0ae7b3ab82c23cac3d296af215876f73a07b869fad68e484a3de1a006cbdf4ee302582970b47c08aa4a0b34f59442509134316b6b3f82 AUX 0005-grpc-1.11.0-pkgconfig-libdir.patch 2295 BLAKE2B 9e9cfb9f150c30bf55a5443e387c9d0e8f3507fdaba56c2ab5cc318f51959e45bda8e0cee39487d8116b76c15da1a7ca9da1e02a5e29bdbc7edf85d508e5e857 SHA512 4648fceb8a6b8a364126ba20ef2cc2f5b4baddfb4f622de93f377714eff793e05062f5bb02b39e2699b00f3cce309fb23a9ea35a9fef3a1df4e3682bd707e8d5 -DIST grpc-1.11.0.tar.gz 13431990 BLAKE2B d7aabd86fdaba8f8fc6fa17b411b496bbd51ef0a759d4bd77c0391e472c88f4252270ceddc19fb59a2b725d612236e1aef959f4b313551cb38204c51d1ca216b SHA512 3127cf0e66cd0712d905e6008adf6f80d787ad97eae2fba38fa3f4d343849a3dc3ca8f2ccbc82020e812fdb272e9577584c298a5b623fbdcac40c1efd7877855 -EBUILD grpc-1.11.0-r1.ebuild 1532 BLAKE2B 1e41ce56b3a191269ba9bece06304399fe8abff72333545d204cf664af140372336111ec8ba5390b6a8e6d671d6e85be5f0845f7d6bbd33d08fab0e3baab254a SHA512 c7600d243d3f36567792fec8810538084b935a83523cb400c8cd26fa185fd48d65b165c9801943d96f3f4567aecbdeefe57f2e794e255a16b2bf39cf17355282 +DIST grpc-1.12.0.tar.gz 13692310 BLAKE2B 86b9063416140453718c51df4f238bb3d5ac8549ece065c95d3c461c069358badec5a9a77aef694cd11a09f53e060f9ea51f3b40d9a2424837605c4899a21c57 SHA512 68a8c261ea570790974769d6c0ca8138cf4242b79e9ff74a11b10d35a27f98ff24c03f3d05932ac46811c0ba7d1a094388ae8dbeb495fc8e723ad74695994d49 +EBUILD grpc-1.12.0.ebuild 1532 BLAKE2B 1e41ce56b3a191269ba9bece06304399fe8abff72333545d204cf664af140372336111ec8ba5390b6a8e6d671d6e85be5f0845f7d6bbd33d08fab0e3baab254a SHA512 c7600d243d3f36567792fec8810538084b935a83523cb400c8cd26fa185fd48d65b165c9801943d96f3f4567aecbdeefe57f2e794e255a16b2bf39cf17355282 MISC metadata.xml 327 BLAKE2B e99ce0019fedc9b171e83503cbc1fde434fdc24d9de08ab8b26487391a5ef93ff207a2196c0f9e08b7cffbf4770fc67f1fbaeb886e7f95a02cdc3a67432494d6 SHA512 e8fa242a316ef93660b3b7601e1a6c2bbf356a77f4c0f678c34e299c3cdc051b77a79167a47a81d2a7d2b3b85c9059c3918a02e3df1c63b07c3f3812de47bd63 diff --git a/net-libs/grpc/grpc-1.11.0-r1.ebuild b/net-libs/grpc/grpc-1.11.0-r1.ebuild deleted file mode 100644 index a232297d5cfc..000000000000 --- a/net-libs/grpc/grpc-1.11.0-r1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{5,6} ) -inherit python-r1 toolchain-funcs multilib flag-o-matic - -DESCRIPTION="Modern open source high performance RPC framework" -HOMEPAGE="http://www.grpc.io" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - >=dev-libs/openssl-1.0.2:0=[-bindist] - >=dev-libs/protobuf-3:= - net-dns/c-ares:= - sys-libs/zlib:=" - -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/0001-grpc-1.11.0-Fix-cross-compiling.patch" - "${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch" - "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch" - "${FILESDIR}/0004-grpc-1.11.0-fix-cpp-so-version.patch" - "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch" -) - -src_prepare() { - sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir" - default -} - -src_compile() { - tc-export CC CXX PKG_CONFIG - emake \ - V=1 \ - prefix=/usr \ - INSTALL_LIBDIR="$(get_libdir)" \ - AR="$(tc-getAR)" \ - AROPTS="rcs" \ - CFLAGS="${CFLAGS}" \ - LD="${CC}" \ - LDXX="${CXX}" \ - STRIP=true \ - HOST_CC="$(tc-getBUILD_CC)" \ - HOST_CXX="$(tc-getBUILD_CXX)" \ - HOST_LD="$(tc-getBUILD_CC)" \ - HOST_LDXX="$(tc-getBUILD_CXX)" \ - HOST_AR="$(tc-getBUILD_AR)" -} - -src_install() { - emake \ - prefix="${D}"/usr \ - INSTALL_LIBDIR="$(get_libdir)" \ - STRIP=true \ - install -} diff --git a/net-libs/grpc/grpc-1.12.0.ebuild b/net-libs/grpc/grpc-1.12.0.ebuild new file mode 100644 index 000000000000..a232297d5cfc --- /dev/null +++ b/net-libs/grpc/grpc-1.12.0.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{5,6} ) +inherit python-r1 toolchain-funcs multilib flag-o-matic + +DESCRIPTION="Modern open source high performance RPC framework" +HOMEPAGE="http://www.grpc.io" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + >=dev-libs/openssl-1.0.2:0=[-bindist] + >=dev-libs/protobuf-3:= + net-dns/c-ares:= + sys-libs/zlib:=" + +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/0001-grpc-1.11.0-Fix-cross-compiling.patch" + "${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch" + "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch" + "${FILESDIR}/0004-grpc-1.11.0-fix-cpp-so-version.patch" + "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch" +) + +src_prepare() { + sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir" + default +} + +src_compile() { + tc-export CC CXX PKG_CONFIG + emake \ + V=1 \ + prefix=/usr \ + INSTALL_LIBDIR="$(get_libdir)" \ + AR="$(tc-getAR)" \ + AROPTS="rcs" \ + CFLAGS="${CFLAGS}" \ + LD="${CC}" \ + LDXX="${CXX}" \ + STRIP=true \ + HOST_CC="$(tc-getBUILD_CC)" \ + HOST_CXX="$(tc-getBUILD_CXX)" \ + HOST_LD="$(tc-getBUILD_CC)" \ + HOST_LDXX="$(tc-getBUILD_CXX)" \ + HOST_AR="$(tc-getBUILD_AR)" +} + +src_install() { + emake \ + prefix="${D}"/usr \ + INSTALL_LIBDIR="$(get_libdir)" \ + STRIP=true \ + install +} diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest index 23e7e4040983..6ecc12ca6ed3 100644 --- a/net-libs/gupnp-igd/Manifest +++ b/net-libs/gupnp-igd/Manifest @@ -2,5 +2,5 @@ AUX gupnp-igd-0.1.11-disable_static_modules.patch 250 BLAKE2B dcc3697895faa8f525 DIST gupnp-igd-0.2.4.tar.xz 272004 BLAKE2B d195187faab17fcb5510afec0d024071936c5d61ac9ce4b4fd266cbc1ac238876935b588d91d7e55d3280ded4a0b39560a3b3bdbfec9cbccc3ab883ab1f75e1c SHA512 4da8d401935c4237661310aec0acb38e9c9fe54aeb6b2ef1c9533a8576dbd2d9f9db3b50c4e86b7efc81c80059a10ea52f73517dab23f3cdc0f91a5c0944dab8 DIST gupnp-igd-0.2.5.tar.xz 287964 BLAKE2B 2267b991a0137006f122b3454bfb1bd9df0fd7fae2c47b50a394a2859f6e04375b55447830f6606c8a25260b9cafb75329cbdcd201c220a66fe881dce368abfe SHA512 3d2af29d10c2939a81c8745a50d9cc20be53f97a2112cec6e45bf05373d807d86404b61c776fea34b15ac341f9b7bfff2f3c48901dd241e64e18b5bc7e614cc8 EBUILD gupnp-igd-0.2.4.ebuild 2338 BLAKE2B 3e12803fb56566c218f22168798484b736ac33242c7f59bfed562a379f911879f3111cd37a533d63138647cf41bc3634efe8d12711d8efb1a90235ee45432a28 SHA512 3a251b986fcbbe0bafd702a62e86cebdba7fd70743a8760541569cf7582d4cf7363d425ec297e6e38ff6de7d0a8c5cdc07aad43e94c2670a66745c8facbd69ee -EBUILD gupnp-igd-0.2.5.ebuild 1164 BLAKE2B 38ad82facb4270717a0a1c468f76622ff68af72e98e36bebd8fa3b96d114b5b1c7faf0d06078d9c56a7fc59851d72fc671c89867f04f33cbbd1506290841edc9 SHA512 bd6de7ff5d6c71ce4aaa42418bc2dd98252b1714fa0f5dc0e42c636a375977ed1b23c1e38d7cf7c9adb093506ac3be0fe8d15305362f44919a5917b4a4592eee +EBUILD gupnp-igd-0.2.5.ebuild 1163 BLAKE2B 1a3c90a2c8c9c70816da75fee0c9655a1b5267fe1a108d0d86bd5728771a578d5d6a91725108d467ea1db68a08cc38075c64480eaebef3cafebcdd45aa5253fb SHA512 23940e772f6acbedaad1438677ff69ddda9c9997b8ca7ca3a927e8e4042510b3b52071e5e32c61ff5ab1d4ab06744a250c909bf3cb232f39678a442bfe8d241f MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild index a967b8444917..f825b004821b 100644 --- a/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild +++ b/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="http://gupnp.org" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86" IUSE="+introspection" RDEPEND=" diff --git a/net-libs/libmicrodns/Manifest b/net-libs/libmicrodns/Manifest index f26cba5356f0..9c02921b9ca9 100644 --- a/net-libs/libmicrodns/Manifest +++ b/net-libs/libmicrodns/Manifest @@ -1,5 +1,5 @@ AUX libmicrodns-0.0.9-null-addr-fix.patch 945 BLAKE2B 40b777b9d0d1a781d1ee3ff82a2370d0ca414c687d665b0df1aa9750e9bde79c027e661c9ead963edb366858c46f6118139903f77d8d4ef99df99b8c28d28268 SHA512 83ef122e8192f34608965e9d6a479ce73abf98c28028f5749e0c53cc677225fae25f501573b671425754b14fb1b871a29caff6e116ed19700cae464b4b7b4236 DIST libmicrodns-0.0.9.tar.gz 57333 BLAKE2B a9e1d099d4588863dee3c2735a2e3f9cd46212729c342e06cccad1a8e997e85964e7f917ce97f50c0cccd21c1662ef9baf7392333ea666ff65b0577f57bab692 SHA512 6f7dbf1a324fed847131745498895ab0773dfc3c7bb96a05bf0fd3df0c0ce19d7f607789f7a5350d34e91e7ba323ee57196eb37ce351f83a9faa82c5fc8d89a8 -EBUILD libmicrodns-0.0.9.ebuild 623 BLAKE2B 966cbaf6370c1f5a51f02f9bb7fd6b759116540a748a19a1fe6a1741567e63f39c60214cda1303760e751d8573b3a873da4b6dd71b5ef25682c8799769756125 SHA512 b74f8364892c9e265de7bee6aaf5fa863155605ad75e31e67232f14ed4830a258bccd781a47ca45fd1918b581e8511d77cd234af4906da1a690b3eea2303e887 +EBUILD libmicrodns-0.0.9.ebuild 621 BLAKE2B f2c25fd94dac1cf03d93623232622c2fbdc4cee2b1e34508b686cafd74aabac531d16dc9ccb7a6008ef5b69abcbaf49b8e102d024fb0bf119813723f412926e4 SHA512 7a91c06f47182f689cab4b03b9577e3a51fd4d99e0faf490b9a06ef35db0477966b721bb3321271b11500aaabd592564ce0c82c8caf4a274ae39753e4818857b EBUILD libmicrodns-9999.ebuild 547 BLAKE2B 9e2f1b42a8bfdf1ff226c6ab31c69d4925b7257d1f8f63f3442b42bb3001acdd3c34d96f6f8078f426db8c7a687842524910efacbc2486f6da28619a847414bf SHA512 fcb52e9ec7308571d795fd4449e4ec05ee4ff46dc6b9a7d3f3c4509d5481c16d1240cce3fbe739cebc2a8f67bad3890dfa4b657047e3bc30f1aab9468fb14c9f MISC metadata.xml 430 BLAKE2B 94c8e7b19ca9899428db5b67c33d492423ab83f354e878271bdc6ce9b6602c78892b5069ce38032e837e68285c2979bfb43ea11650d734ae6061089a3f2d1232 SHA512 7ca90565928898c788ac8b87abff3909c5d1c0947c57e4ba30b0929a794ac943c20f2002601d2614dca35c2e3b09432653378bd66eaa6f53881c8cc6f86b892c diff --git a/net-libs/libmicrodns/libmicrodns-0.0.9.ebuild b/net-libs/libmicrodns/libmicrodns-0.0.9.ebuild index 1f0919ac552a..d0d8de13031c 100644 --- a/net-libs/libmicrodns/libmicrodns-0.0.9.ebuild +++ b/net-libs/libmicrodns/libmicrodns-0.0.9.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/videolabs/${PN}" else SRC_URI="https://github.com/videolabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" fi LICENSE="LGPL-2.1" diff --git a/net-libs/libpcapnav/Manifest b/net-libs/libpcapnav/Manifest index 2af0f736df37..9180ca2953df 100644 --- a/net-libs/libpcapnav/Manifest +++ b/net-libs/libpcapnav/Manifest @@ -1,4 +1,4 @@ AUX libpcapnav-0.8-includes.patch 395 BLAKE2B 6904addab4a42d233780616364a4603bf691133313614d3f3b36a4b736aa1acbe77d07f0f7751e7069fbadc1e1c87bcf6086b1cde574731dabf0a9a4cfe243d9 SHA512 04570a0f0b5c33565e79922e878171bb98640d2961cc9378c64e17a7144636960fe099bcca4c043d8a4532b98fe7960fdfa24af8145df5c8682af4dcc5d9b99c DIST libpcapnav-0.8.tar.gz 387476 BLAKE2B f3027f17307a76fe6baad6fc79ce054726def17c834b814a07c628f8420fe481e661d72e72d7b3dde494ca17b2e36abba3a27d02f68924f88c2a89d57fae8b44 SHA512 bc0357d17228c157de5b480532df37a62459882d5a4fb8d2285fe4e86c1dca301e7cc505f2917bb3421d926bed263d93b2c587311431d9c3a5b02f04c93fdf18 -EBUILD libpcapnav-0.8.ebuild 805 BLAKE2B d3c2e8c8b123a8db08678435abeeebd9d2b236eac0b314e52cfdd9821c325d73362c332f7dbf03ba92f4bcc99fef371cac0059f8252d2f653aa610574cd7661d SHA512 c84102927600a1739c0eaa741b7a49a340c71090bc4ca203e67e6bf00133044ae8cc7cb60bfce87420f3bfdd108f595f96d383bbaf4627a42ac0a5ec4945a43c +EBUILD libpcapnav-0.8.ebuild 810 BLAKE2B 4d1983fca48a94041d8f396892f05196960b8c6ccb6695b4629442a76d9aea9bef83201121851285a7b1780906895b98265ce37f8f42b1c03a914fa6a95fb03b SHA512 07de2202c50c992542ec085875835079837f4ba420f5be2870e384f6f7e3583a509b1b03dd0511c435e6d49be4261fa04c5db9407048f346520191fb2808f50f MISC metadata.xml 357 BLAKE2B ddcf544a7ae28909b7fb7810c0a6bb368099397e2bf7d6e68a2475c5d701d7589aacf0a15f76f00f68b623a7b37c46d60a5faa3c92f1ac73eb2d99fa29b48ccc SHA512 9cf449d26b416d995b8371fe2e6aed6964080b8b84bf0ceace749ceebd4ddbcc8b3d7d9c1d8c2a07a4c7cb880492ffc8b34ad31b4602a646e004f3aaf52f3ae8 diff --git a/net-libs/libpcapnav/libpcapnav-0.8.ebuild b/net-libs/libpcapnav/libpcapnav-0.8.ebuild index e489ebd83f27..ff67813df5aa 100644 --- a/net-libs/libpcapnav/libpcapnav-0.8.ebuild +++ b/net-libs/libpcapnav/libpcapnav-0.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/netdude/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~sparc x86" +KEYWORDS="amd64 ~arm ~sparc x86" IUSE="doc static-libs" DEPEND="net-libs/libpcap" diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest index 336a3e5e89b8..e3d759b195d1 100644 --- a/net-libs/libssh2/Manifest +++ b/net-libs/libssh2/Manifest @@ -3,6 +3,6 @@ AUX libssh2-1.8.0-mansyntax_sh.patch 770 BLAKE2B 743bb8032baab056fb578429bf540c8 DIST libssh2-1.7.0.tar.gz 811714 BLAKE2B 488f6b9ea2bf072aba17e8d70136e9bf64b38a4cb6cb572fcdf0253ec5d9afa479c75858b42299e2be39589b9454ccfdd5f7c4a2e355e8e8b5037b2b637a8a4c SHA512 0f9dfd83196129568c00383e2e4fea29b3d8c4f3b1690f550a6748d1db68cc437b4ed083f5d3d4646365fdc839819619aea96eeaef5ab072c7023d13f08b5153 DIST libssh2-1.8.0.tar.gz 854916 BLAKE2B 618c4a19789f2e5eda85852760dffff5672d420d2fa50393b05b7398a1913f74e5f6695f078628050ac9851965d6e45cf410b7c4590a8f18d67c718c829ab352 SHA512 289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558 EBUILD libssh2-1.7.0.ebuild 1208 BLAKE2B c6031ef07a5e4692fed353bc0db362a77287b6834fdd4ed52743ef41a7cf2975097f1d854e8722df19dbd27b6982e99c57f461edaed1f64d1c708a9f737348ec SHA512 717aa9d9a636a099e7a6f63a1713414ab1055f6eb3691587bb4be6f80a8eb224fc702bcbf369c8b6252d7e0990f75584c379f2a9db7640c616874f13bc94e1d3 -EBUILD libssh2-1.8.0-r1.ebuild 1288 BLAKE2B d706a0f770a56807a21853d103bca18a0e95d671966ba4555aef6cf764b008e4fee17b2bfca2e06765b80ae0dc235aecd0578b10f0d7ae36f9e0e14269d1cf46 SHA512 91a07698c53b45a38928ce387c192a04bb3104d57e012bd7892f6d0fa6e5a96215c7dd4b866f7e8058347533d54f093cf309b45e99b0748cc1ddd2d3194e1b9a +EBUILD libssh2-1.8.0-r1.ebuild 1283 BLAKE2B 295c15e3842687f1f9a6b8389f9ce4102531a1394039553999e120a6f2264c7026872acbc7687ee11f94efe2db3a4ce5e3152d9974b5573bc83f13977a36226e SHA512 33038086465f551f1be6cd3c6e38ce793e3b33b1c476a0441e95aef135c8dbc62f0721a45953ca59e4ff0cd51a7093e2cbd333e8e6c21dcb99ce69a6c34180d2 EBUILD libssh2-9999.ebuild 1131 BLAKE2B d4413bf097b892cb8fa1747614e0194ea0db57c91b00dad158da1b88405e3d1d6d9372efd5c39447f4a7c87b2e3d215f66df8bcc212e1fc599b839e8275ff6f2 SHA512 a9ed6e5e56b005f8c46f957befa279360e127f30b95a33f98e0f3dcd73fa3e921f45e5577f4d2632b841ee1ae002011b1042e1f67ac55bab2e56bbc19ef532c5 MISC metadata.xml 432 BLAKE2B b528bab0bd90699af37096d4b6a4e06767e39011b4ef299600c8d35987768693224869ef5e05255ff28edb0ae8e14c38a04e20df953391a3df527d8609700a8f SHA512 c0fd5dce9a697c02886aeea4e001695bf51c6cec82a1c32d58a839dbd63f0085f9005c3504d40bd858bcca80ec2018bbf44bca64dd7692029e158612da39cabd diff --git a/net-libs/libssh2/libssh2-1.8.0-r1.ebuild b/net-libs/libssh2/libssh2-1.8.0-r1.ebuild index 1b296bd8dfbc..88ba4dabf366 100644 --- a/net-libs/libssh2/libssh2-1.8.0-r1.ebuild +++ b/net-libs/libssh2/libssh2-1.8.0-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" IUSE="gcrypt libressl static-libs test zlib" DEPEND=" diff --git a/net-libs/libyahoo2/Manifest b/net-libs/libyahoo2/Manifest index b5631611e511..27794e55b311 100644 --- a/net-libs/libyahoo2/Manifest +++ b/net-libs/libyahoo2/Manifest @@ -1,4 +1,4 @@ -AUX libyahoo2-1.0.1-asneeded.patch 379 BLAKE2B 790b9b31cf8c8a14e7d46097ea600d19dcf7efc82f99af383d6c97505c7f797874b0d49b01ade0cc850aa6b050df120b79e3826282c2ac1dda1f43b9f92287a2 SHA512 287ecd3cc8963ef79dddb337e2b7b240a725c009eb3b169951af086070f1bb72d3a4221b4bb6e02893efb22d2314f3fd70074abc887ff56396ef9f5eb5b342ed +AUX libyahoo2-1.0.1-asneeded.patch 383 BLAKE2B f7ac99739c5d04345bf1ece82767170929aed65a471f0ed9f5212529402683813cc8b879a32690c082db2fa791f3767e402abb6ce8b98dca3567e04f02684035 SHA512 47e241ea5890c28ac3d7c5326eba5ef0fc3f6965fe6726769854835b7b98140e33b603678605bcd9487c8ce57156ac54d16ded8eaeea63f23d2c06eee55872b4 DIST libyahoo2-1.0.1.tar.gz 507023 BLAKE2B 5972d8ac250e9ec76bf080fda2bd4f1bdf8898a8496a38e6e31a534ec94a164d54d6a640c098ff804325645f05627e520566883223981abeb97a03f22bd21b47 SHA512 fc522f80c21945e748cfc1051ab615993d2a6c5cf7467d86e04fb8fbeaf8ce3fd925c190a6b57ec4fb9f7ed3df7b2e4c61d141965f8fb8ccf5461e0b36665b86 -EBUILD libyahoo2-1.0.1.ebuild 946 BLAKE2B 4ccca860eef7e884dbbd704c3bf4a06ccbe41fce4a09b09677ff109251c9e73b0821812982e11ab15b8c9bbe14b6decbf517b569589b4c2907ddf43a954f1d76 SHA512 8732fd8582939992a31bfa80d118ed7e61697f1d7fa747a8bd5480647fcaae37741fdf69289ff95dfe2218201c91710b1754acee6f0496e8cdc9622a796e4bdc +EBUILD libyahoo2-1.0.1.ebuild 931 BLAKE2B bf19b82d74710bca452e2c0d91af89d1e03cc926e48b66cc3c3dd6ac318d3e6a60adb2807651079bcfc22e9fee5b23b02e64ca663289d2027cb5ceb75e112dce SHA512 f20a0d972207a7082a2b58e7224c400fc584b9b604f994ef91158f5ae0f8daccc000f37fce5b6527262924b14320ca8d29ac02183ef5a1ff414b443632d3c62e MISC metadata.xml 246 BLAKE2B 2095d570255d285eaf7669d02b3e7045eedd43bb9b563bf05aff327106fa6b30fe37b99a6160a68bc040357733b9e5d8553b61263f396ff8a1fb19658962a65a SHA512 967f79698c434269734a15532f1c4834a5a2a02786d2f25ad7d1f5d323d292a910eec84ff1256c68aab5ca662e3105aa9dcea8cf18c43b0d62121f6352b36343 diff --git a/net-libs/libyahoo2/files/libyahoo2-1.0.1-asneeded.patch b/net-libs/libyahoo2/files/libyahoo2-1.0.1-asneeded.patch index b05190a02a71..4e0f1142cd52 100644 --- a/net-libs/libyahoo2/files/libyahoo2-1.0.1-asneeded.patch +++ b/net-libs/libyahoo2/files/libyahoo2-1.0.1-asneeded.patch @@ -1,5 +1,5 @@ ---- src/Makefile.am -+++ src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -21,11 +21,9 @@ noinst_PROGRAMS = yahoo autoresponder diff --git a/net-libs/libyahoo2/libyahoo2-1.0.1.ebuild b/net-libs/libyahoo2/libyahoo2-1.0.1.ebuild index 0cd41ed48213..66739a597faf 100644 --- a/net-libs/libyahoo2/libyahoo2-1.0.1.ebuild +++ b/net-libs/libyahoo2/libyahoo2-1.0.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=2 -inherit autotools eutils +EAPI=7 +inherit autotools DESCRIPTION="interface to the new Yahoo! Messenger protocol" HOMEPAGE="http://libyahoo2.sourceforge.net/" @@ -11,33 +11,40 @@ SRC_URI="mirror://sourceforge/libyahoo2/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="static-libs ssl" +IUSE="libressl ssl static-libs" RDEPEND="dev-libs/glib:2 - ssl? ( dev-libs/openssl )" + ssl? ( + libressl? ( dev-libs/libressl:0= ) + !libressl? ( dev-libs/openssl:0= ) + ) +" DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}/${P}-asneeded.patch" +) + src_prepare() { - epatch "${FILESDIR}"/${P}-asneeded.patch + default sed -i -e 's:-ansi -pedantic::' configure.ac || die #240912 eautoreconf } src_configure() { econf \ - --disable-dependency-tracking \ $(use_enable static-libs static) \ $(use_enable ssl sample-client) } src_install() { - emake DESTDIR="${D}" install || die + default if use ssl; then - dobin src/.libs/{autoresponder,yahoo} || die + dobin src/.libs/{autoresponder,yahoo} fi - dodoc AUTHORS ChangeLog doc/*.txt NEWS README TODO + dodoc doc/*.txt - find "${D}" -name '*.la' -exec rm -f '{}' + + find "${D}" -name '*.la' -delete || die "Pruning failed" } diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest index 22129213f514..9621696c58ec 100644 --- a/net-libs/nodejs/Manifest +++ b/net-libs/nodejs/Manifest @@ -1,7 +1,8 @@ AUX gentoo-global-npm-config.patch 1511 BLAKE2B da2b127df9ac9babc87c1930272244e7f89ac1931543fa524e13fb3c53d2b5a9cbdf0d93dc0cae207822dee3c8f71e2a12fca3d608f6de8589ad2c0064f0855b SHA512 b6c8bf88bd44d5461cbad0354273a6f964429d1cde48ab4c8bef9f50452de22bfc5d15707c5c9adc2a0d8000a6b1be4cffdee039618b627fb0d291886309cc3f +AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 705ba235f707c750971a64ea3d631925ba457b3914b0cdb2582236c07a44ca060430336948fdada8153a9f5af9ebc5a7a4e948231a0a2c4412326c7188f4204a SHA512 6af7daccd660bfffefe5c155c364feb6cfd2044f1c230a31f138a20830833657c3c5a029d459dbf565ebf3ed5a356d006003693c7112cd37757977781f513eeb DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b90da99f10d651a22838c041da07056df81204bb04ce8da083a080062509dcca4d1e3ac2250d651ead8a4cc025028 SHA512 6866608a43eb213f3b715ea0fcc28983fd959ab679c567a1b464f62acd936506f2bce88ea48a60209d8ef8d98259f4b47cd3434893eb4ff82a132775edb37b7b -DIST node-v10.0.0.tar.xz 19248896 BLAKE2B 3ab8313e44d57a2f04442d23311a4d824a9d0b89c7d3ee06042f843ce0bde39e59c1ef2eb0d77cde4c46d649b074cf08d1109c91b0914c23b048c75f29e79727 SHA512 9d686da290f84c5fdab39cce08161787661b4df1e3e37bd242e5f5f3ff8285b6bca3ada16e155fcf0fbb9ec8ca8736dc7d02788cee2d66f6fab87c1a29048f4e DIST node-v10.1.0.tar.xz 19363748 BLAKE2B 931349d204764472706f44473b2ea0e1399dad84d0595cecfc2cbd71670df25f05c2c2ac77e4c18852f523d5b0cf853ca83739fc96a46e1f5e76ae51cab006c9 SHA512 f98da47849de8a50d9986d0176c39914f3993e579a3d482153cb0fceb64d7c79443fd230a80946361008e4fac58b7b99292c906961fb57ef14ccecfd1da07156 +DIST node-v10.3.0.tar.xz 19464004 BLAKE2B 3bd88c231402728874c9c2916225d995a64e79e311d45869910192b6c46d450e12c4b20c9045bead85de24d3e46eb65793a9a886df87545836c0875c88a98cd1 SHA512 c52c798f16b69c0266014e9f53d5243d49e71af9fb411400d526a054995f0d2d2a150d31842160af0feffbd240e36dd97b870eb8c1fbacd3a7b18a143746df7e DIST node-v4.8.7.tar.xz 13370828 BLAKE2B b1ee93a586b66f8582783b1be50667547afe4bf48038ebc0b8148db55542cbc0520ac84ef88e4a7f453cabc245f484c32dbc238c1932bbc708791ceeb5c9d2ab SHA512 25837a31023747723b146c45984a5b2096b61c0aa43cbf45fc8ff50b4bd5079bd0bc9f1dfd3fb076817448dc5537eb93ffb2f345280b7756ba93b67ad757c696 DIST node-v4.9.1.tar.xz 13250164 BLAKE2B 7a689b99bb4bf507f7f21dd2c096a5766d023a8174c0f468cab37365af1920b8700da04157e1a406917790524255ef32c243a74662fd50ef7d3567d189dac9cf SHA512 690c9fdf608e5194069a10955bdd94ec87cb1c308f13bc4d2cae92fa01436ace10fadf58f2e51d477dde6c570b23edc1c71fafea79bfc9cab2903eb2fa5f87aa DIST node-v6.11.5.tar.xz 15699404 BLAKE2B ba2df91bf5ef38cedb60b42919cf56f16807e619a81876fc92a5741e49da7ec91c4239d00f549c5e80d0bb8282bb9b396dd984507916cd18d61b403a3a7cef94 SHA512 62490725ef7957294c1bddf21ef0626c7472876791210168116501255ecee58457e9de9b044e10033706243299bbfd1495efeca169596fbf26f5eeba6d8fa4c9 @@ -11,8 +12,8 @@ DIST node-v8.11.1.tar.xz 18279516 BLAKE2B b06f31571c93455d16899e3ba57d1e5835951b DIST node-v8.11.2.tar.xz 18318444 BLAKE2B 04041462526dbcd6c4b852f9ca1dd1ed868a1afef51f6560eecf0c58a659c0cb5adb54e4b791655948ffadd6be4e53a07ca02baffc997c9b2f1b2cd9492b314a SHA512 b1aa109d0c1e498b840d14c91d6c268ed0f11e214a0dd9469ba10c06712909ceb7c38eed56c564a7b262f414ecda399074785c2f757b46827914cda2791102f5 DIST node-v9.11.1.tar.xz 18500884 BLAKE2B ac086b59144ed7393a7c0293616c1ef2b149e23ac67ba8ccf324c2c1f97b18435889e4fb2f1c205834e3309728853dcdbf34d00cc319a10bfed7cbea9fdf01e3 SHA512 6e5ed333ebb678c08fca8f567708874a50bd9311e326196bf86ca77db3046dd196b50208bcffb7f3435f0c031d47dff5471465c840be12903f3c683802000a1e EBUILD nodejs-0.12.18.ebuild 3435 BLAKE2B 2fd0c799325e0def135f2618901aee64fd5d950aabe64b4ce52d3d525ce08a7581c68b60fe2e84773e04a0c101d873efe7cbfb08020a0b6f384649d0a265e182 SHA512 6d9a761e4fc8cd35899a10f57e47f00c1222c6573246756599c702e17885422a253b6906b1fc119d4298e562f6bc9994c89f59a405021bed1f6e03c4f53d88f0 -EBUILD nodejs-10.0.0.ebuild 6333 BLAKE2B 5ca8e721fa5bfbf5c7bb4602de9e15228de138cde1ae522b673cfc61f601c9019e1988b472566172eb13471c91c0941b4d1d42db79d52f64a3be820322c77a7c SHA512 91492cd5bc82b5b454aa418b6b176ca6ad6417a7edd032c68f0c36cae4f7799d2da62791835656d5ba7487f1eb9f663f7347bd2b73c1fb1efd5fa2c732626e55 EBUILD nodejs-10.1.0.ebuild 6333 BLAKE2B 552ecbfaf9e2c973d3673ebd93df67821c55ba41896fbeeda4386572f8a33a23a39ead9ff04b449c1224bef3f6fd212c94cbb6f08f4b55bae8db6ea78245b005 SHA512 6d43a12494acea5d298517d41dc93abb3b863020fecf0696aee6b4cfa7147696807eeaeaa90ea3e538563bc6311e052ff0682df708be4945d3ab744d7124fe93 +EBUILD nodejs-10.3.0.ebuild 6339 BLAKE2B c1642519de2c47f964c1a8f32ed4cf5caa2fcaa42d0ca3bee0189d1662fdb170b0ddf80e9a2fbbe7bd51d146623aff652d5c6ef7030a94257c90d76eb63992af SHA512 8e276ab90bf81f0f27da9f8b1d393ed608f98dab610ff3b6c48674e9bcad3a4fbe3cc5da8efb2e1aad4c04a19a4b6be1b7638af295462f8e99c7c7938125f04c EBUILD nodejs-4.8.7.ebuild 4431 BLAKE2B ebdf991fab56e0e40958ec1d08570a8d32732237115fa6b468e788d4d92245c553d4f0e6187a83bb5cf57ee1aee334002cbf255925cc5f3788d566d9204316a8 SHA512 dfd48068f1f246211a001fd9b180cbf5344b6948714f17eb6435be604e4138f8bcd72812b8d782c33d1569f25b907736ffd92b7852b2542f63f2dadf06ac1ca8 EBUILD nodejs-4.9.1.ebuild 4432 BLAKE2B 3650a661997bdfeef6097b4e356a186a2b829c0f2224624b71ad832b1e957ce9e841136b83f62c53b8e524993b4eb8e203c1d10176f98f09503047e058804fbc SHA512 98b52c0ebade643785b90d8362fc047b361c4c29e5a7e81b59c581978025a24c9562171fca342d29855f4881985db4d8f017b2711c5ab4e54f0dbdf18aa69a03 EBUILD nodejs-6.11.5.ebuild 6089 BLAKE2B d1b1c07ac7eb975d28291fca7fc10688e316e1fd62419f6cf87c9ce7952e074afb23eb89f40df0d336dd4c0f0d22ed40157035b7e6b8e2730eb2ef95a538ba60 SHA512 9a4310b2b53b0f58e855f35dd04052f4b1b8e0a8c9341486321b5e78ecd5df0078fcc614c3786d6f54799ce031c3046868d8970a041ad67fc7be0bd6e789cdb1 diff --git a/net-libs/nodejs/files/nodejs-10.3.0-global-npm-config.patch b/net-libs/nodejs/files/nodejs-10.3.0-global-npm-config.patch new file mode 100644 index 000000000000..e2bbbbe97a38 --- /dev/null +++ b/net-libs/nodejs/files/nodejs-10.3.0-global-npm-config.patch @@ -0,0 +1,20 @@ +--- a/deps/npm/lib/config/core.js ++++ b/deps/npm/lib/config/core.js +@@ -153,11 +153,13 @@ + // Eg, `npm config get globalconfig --prefix ~/local` should + // return `~/local/etc/npmrc` + // annoying humans and their expectations! +- if (conf.get('prefix')) { +- var etc = path.resolve(conf.get('prefix'), 'etc') +- defaults.globalconfig = path.resolve(etc, 'npmrc') +- defaults.globalignorefile = path.resolve(etc, 'npmignore') ++ // gentoo deviates wrt global config; store in /etc/npm ++ var globalconfig = path.resolve('/etc', 'npm') ++ mkdirp(globalconfig, function () { ++ defaults.globalconfig = path.resolve(globalconfig, 'npmrc') ++ defaults.globalignorefile = path.resolve(globalconfig, 'npmignore') + } ++ }) + + conf.addFile(conf.get('globalconfig'), 'global') + diff --git a/net-libs/nodejs/nodejs-10.0.0.ebuild b/net-libs/nodejs/nodejs-10.0.0.ebuild deleted file mode 100644 index f2952fc37161..000000000000 --- a/net-libs/nodejs/nodejs-10.0.0.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads" - -inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs - -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=" - ${PYTHON_REQUIRED_USE} - inspector? ( icu ssl ) -" - -RDEPEND=" - >=dev-libs/libuv-1.20.2:= - >=net-libs/http-parser-2.8.0:= - >=net-libs/nghttp2-1.29.0 - sys-libs/zlib - icu? ( >=dev-libs/icu-61.1:= ) - ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] ) -" -DEPEND=" - ${RDEPEND} - ${PYTHON_DEPS} - systemtap? ( dev-util/systemtap ) - test? ( net-misc/curl ) -" -S="${WORKDIR}/node-v${PV}" -PATCHES=( - "${FILESDIR}"/gentoo-global-npm-config.patch -) - -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}'/" 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() { - local myconf=( --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 - # 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! - dohtml -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 -} - -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 " -} diff --git a/net-libs/nodejs/nodejs-10.3.0.ebuild b/net-libs/nodejs/nodejs-10.3.0.ebuild new file mode 100644 index 000000000000..45f560f36a3d --- /dev/null +++ b/net-libs/nodejs/nodejs-10.3.0.ebuild @@ -0,0 +1,200 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="threads" + +inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs + +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=" + ${PYTHON_REQUIRED_USE} + inspector? ( icu ssl ) +" + +RDEPEND=" + >=dev-libs/libuv-1.20.3:= + >=net-libs/http-parser-2.8.0:= + >=net-libs/nghttp2-1.29.0 + sys-libs/zlib + icu? ( >=dev-libs/icu-61.1:= ) + ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] ) +" +DEPEND=" + ${RDEPEND} + ${PYTHON_DEPS} + systemtap? ( dev-util/systemtap ) + test? ( net-misc/curl ) +" +S="${WORKDIR}/node-v${PV}" +PATCHES=( + "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch +) + +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}'/" 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() { + local myconf=( --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 + # 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! + dohtml -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 +} + +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 " +} diff --git a/net-libs/signon-oauth2/Manifest b/net-libs/signon-oauth2/Manifest index d3c6c07e6660..3912f12dc8ef 100644 --- a/net-libs/signon-oauth2/Manifest +++ b/net-libs/signon-oauth2/Manifest @@ -1,4 +1,8 @@ AUX signon-oauth2-0.21-unused-dependency.patch 295 BLAKE2B d4d2e49edaafdbcce8c813a2f1760f527abc1172b34780a0d08505dc0a967baa20b9a75e00a75389d1f25ac86788d0c199751fff692721035f05324109691e86 SHA512 16a1b68ca0d32f1948691cb1372852ec3e45ecac4eb4a2f6fff040400692aa699907e82e73da445e556c5f9107d8048f7803b45bed07d293206a692dddc38b48 +AUX signon-oauth2-0.24-disable-examples.patch 331 BLAKE2B 259170e4ef75d002dbdcb8494cd0a3e6ea7fb77e5222db600c8d7a5d731af147cd5c7149b7e15e724607018331a29a53d589c2e6f60f614248e7badff5e63056 SHA512 a12e14d59987925dc0c14d407455c95d49751fc3bda66211898c1308a76d4f910b7ba4fdbfe98902a457980f7037f9853c5a007ee82df690375e5e430afa587d +AUX signon-oauth2-0.24-dont-install-tests.patch 352 BLAKE2B 6dfa625f68f0178947414dee97ab22a34e366353a7b5b07e166c426a5b86ab418faf31a8bcd868d297ae4b92d10a8231f403810f66d6f4dbfd31a0afeba4165a SHA512 af1908f5e2549182823847df5ef80b933adc6d4a15f39c63d4a82cb8540e97a29c60c7056f17fb2db314ed92d51594d5f76687862018a70f1de592ecb3a928d1 DIST signon-oauth2-0.21.tar.bz2 37819 BLAKE2B 5de9add1952ba94e12b776c7f4b462bfc31ce01c148d8819b6e159510c4b00f4d2fc915a62f585b1061d46efbeb92406e3c117452e4e7f5575404fea3ab20601 SHA512 b0f97353e87c08420c3132f3357522b526a7c48df807ab833e05297ebfc86e0e8f25d4d3aa94e8ebc4aa1d9bc77856d63c43e5b5e9f3e63628f7710b9a056fd0 +DIST signon-oauth2-0.24.tar.gz 39011 BLAKE2B 41b672d1f489321b2f93f245530da1e51867eb4f0d1675ba72240f59f5ab7d6d2a079899e1a6dbc63c82bc53e1fab467c6696f5171c98ab00243d5ec9ddd92f4 SHA512 8a1e5be7f34419ded7841cb4de62e03ab56556f39ae40e3e11b549d45c6c51edc6888d1aab254c0ba6746d6306bb8b92dd24e473387542d6a987208c20acf6d9 EBUILD signon-oauth2-0.21-r1.ebuild 841 BLAKE2B a6d424f9e2720dc7e1289fb9e0dd432fd8f3c0a6b2015f83fb86a29681cfc73e88892ea0d27ee262d34a420fbfd8f5fc7a2785172ea16ba0b5093611c986d50d SHA512 8fe420882ef3212253a9a0c3ab3111cdd1e0ebf0bd57fa2a7174b4ebb94478e464a909484e619c373de72fb9880f9d4de5fcded607b49dbe5894410c3f924cca +EBUILD signon-oauth2-0.24.ebuild 945 BLAKE2B 8fe23bd251c2313faed2e5bc441f026ce096759d99fd348e7a8f90635034b7fbfb2146759aaf3d5875c5944bc3fcaac02d5f2c73ef8b2d949529e16e41e35393 SHA512 cbb548ebf497f5c679c93a063e40994c9d72cf883498f6a37578d5999bf050e3dc6ac1bf930116ab1dddb608b68e2a26155bc06855b8ad24e4e80ef1e0e8e834 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/net-libs/signon-oauth2/files/signon-oauth2-0.24-disable-examples.patch b/net-libs/signon-oauth2/files/signon-oauth2-0.24-disable-examples.patch new file mode 100644 index 000000000000..dd730e449773 --- /dev/null +++ b/net-libs/signon-oauth2/files/signon-oauth2-0.24-disable-examples.patch @@ -0,0 +1,14 @@ +Author: Diane Trout +Description: Don't install the examples as they end up conflicting with + other packages. +--- a/signon-oauth2.pro ++++ b/signon-oauth2.pro +@@ -3,7 +3,7 @@ + + TEMPLATE = subdirs + CONFIG += ordered +-SUBDIRS = src tests example ++SUBDIRS = src tests + + include( common-installs-config.pri ) + diff --git a/net-libs/signon-oauth2/files/signon-oauth2-0.24-dont-install-tests.patch b/net-libs/signon-oauth2/files/signon-oauth2-0.24-dont-install-tests.patch new file mode 100644 index 000000000000..615bc8b562d2 --- /dev/null +++ b/net-libs/signon-oauth2/files/signon-oauth2-0.24-dont-install-tests.patch @@ -0,0 +1,11 @@ +--- a/tests/tests.pro 2018-05-29 22:51:43.766914590 +0200 ++++ b/tests/tests.pro 2018-05-29 22:52:45.247259336 +0200 +@@ -32,8 +32,6 @@ + target.path = $${INSTALL_PREFIX}/bin + testsuite.path = $${INSTALL_PREFIX}/share/$$TARGET + testsuite.files = tests.xml +-INSTALLS += target \ +- testsuite + + check.depends = $$TARGET + check.commands = ./$$TARGET || : diff --git a/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild b/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild new file mode 100644 index 000000000000..ea3dd0c41f71 --- /dev/null +++ b/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN=signon-plugin-oauth2 +MY_PV=VERSION_${PV} +inherit qmake-utils + +DESCRIPTION="OAuth2 plugin for Signon daemon" +HOMEPAGE="https://01.org/gsso/" +SRC_URI="https://gitlab.com/accounts-sso/${MY_PN}/-/archive/${MY_PV}/${MY_PN}-${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtnetwork:5[ssl] + net-libs/signond +" +DEPEND="${RDEPEND} + test? ( dev-qt/qttest:5 ) +" + +S="${WORKDIR}/${MY_PN}-${MY_PV}" + +PATCHES=( + "${FILESDIR}/${P}-disable-examples.patch" + "${FILESDIR}/${P}-dont-install-tests.patch" +) + +src_prepare() { + default + + if ! use test; then + sed -i -e '/^SUBDIRS/s/tests//' signon-oauth2.pro || die "Failed to disable tests" + fi +} + +src_configure() { + eqmake5 \ + LIBDIR=/usr/$(get_libdir) +} + +src_install() { + emake INSTALL_ROOT="${D}" install +} -- cgit v1.2.3