diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-09-30 11:19:18 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-09-30 11:19:18 +0100 |
commit | 62f67115b5c46134c34f88f4b1cbdacc19384c0a (patch) | |
tree | 0a76b14de203a4c23040e5665e39df8de9867745 /net-libs | |
parent | 265dbe5dbc14c199299496c6db8fce3f76647015 (diff) |
gentoo resync : 30.09.2018
Diffstat (limited to 'net-libs')
30 files changed, 859 insertions, 253 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz Binary files differindex c17ace904107..8b8168a91961 100644 --- a/net-libs/Manifest.gz +++ b/net-libs/Manifest.gz diff --git a/net-libs/davix/Manifest b/net-libs/davix/Manifest index 3136de218839..3751f0c07522 100644 --- a/net-libs/davix/Manifest +++ b/net-libs/davix/Manifest @@ -1,5 +1,7 @@ AUX davix-0.6.7-uio.patch 316 BLAKE2B 71bf63feb080a4c34f8b672516d8237149bee9d360c7b0d289ac6b226e65427651a688679ec42cc2bf30304a53211d33b06fdccdda228e90b40e21ed7da48cea SHA512 0874cc8c04118e97c176e901bfeaafa13d3a76ec8589b045845133f3f8633e7b75a007ba10990ac4ee1bfe344294d27265510f64171cecd9110fd0b41d71ada2 AUX davix-0.6.7-uuid.patch 1868 BLAKE2B 24d94348745db5a6b85acca3d050dd7bf44f5b7eb2c7eded0771f251459bc391e4b8a22ad1ad685918525ff0ef89bd319e562a221530ce70807f2161efdef65d SHA512 683257bf61dca6394e5ab0b375e35ea3e28c85f0e01a308a514f91f1da18aca4c63f57e45db7b3862fd7d9e0f80e7129e518798241bfec1ddefd87affc1bad4e DIST davix-0.6.7.tar 3346429 BLAKE2B 7510c628cd1d346ed5f4dca6100207e5e2efa3a98d0caf63dbe3ba39f58a9b11c330c95cd2d40d60d8f2497355d4cb2f2d7537babfef287a5905f32322363d90 SHA512 5cb830e415a4ab87b7b046fbd8ba615379766f4fa4b886a271b0c248c05968b9a3cb144751b44d5fd62f5e07bdb7610c0505e44f2702147f6f006b49a4b3d8ce +DIST davix-0.6.8.tar 3461829 BLAKE2B 96e23b3d099262b577a078aad9c6ac3adb6a0ab5dd410573a1886a886f828e46af2d6df9904236ae9f1aff5c75e7bec93c81e02bd173d67a13e9f9bfce3225c1 SHA512 7c0e2a427b2a9ad807d104e8ada732a6e806818e0b7b53caf965ce6238637e4c6f5c67e56e7ef89a23004531c62bc1ba6cb7ce1dd0d1aefdc46bdd7b8c48c9c4 EBUILD davix-0.6.7.ebuild 1484 BLAKE2B cacdc4cf848fa97be6fc46f6cbfd651f4a0fb3e9b8b9a5c7f4290b9ec813781eda2ccce8da5513d290f8c2b527f9949271e0c009d3093660a97cb395ce58970c SHA512 cee6b67866faaae5330db9f60a17e71298a00cbb80b3e2efb674bb935a63f14f094f8e61c48f3df2d0f7b1b491d684474166a231e8abeee436d30076d5292579 +EBUILD davix-0.6.8.ebuild 1408 BLAKE2B eec0c2a2fd8a95d2d71035cd1a9170ed7d038760a8c4262a1185e40ccf43f817822b5e844bcaf3f00da77e34f60c7e5c8f83c14c09da7d2bc08865e66eef1a02 SHA512 46ccc73973ac813dababa673da10442f223be28beeb16a9305f9103c616062ef9a7707d282d08cf810027cd757a70b846c92859f16931cae20b9b3ce813800f8 MISC metadata.xml 327 BLAKE2B c075f375c74797f407cff004dd39e41ab7b60d4e5039f8c9d6c214ce7af54ccec989807d1a09656c87dbce164f1da0289c655f215265ef011abd40b47c5fa841 SHA512 12db2d285a12948788387cbb97fdb299ebd3cdaf50832f1271fcb8cae3a9f7acd1deb7aff4392bdd082e97747d714359fa427bcd0ec9f28f2ecea74703ab9ab0 diff --git a/net-libs/davix/davix-0.6.8.ebuild b/net-libs/davix/davix-0.6.8.ebuild new file mode 100644 index 000000000000..943d50f9fb95 --- /dev/null +++ b/net-libs/davix/davix-0.6.8.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils + +DESCRIPTION="High-performance file management over WebDAV/HTTP" +HOMEPAGE="https://dmc.web.cern.ch/projects/davix" +SRC_URI="http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/${PN}/${PV}/${P}.tar.gz -> ${P}.tar" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc ipv6 kernel_linux test tools" + +CDEPEND=" + dev-libs/libxml2:2= + dev-libs/openssl:0= + kernel_linux? ( sys-apps/util-linux ) +" + +DEPEND="${CDEPEND} + doc? ( + app-doc/doxygen[dot] + dev-python/sphinx + ) + virtual/pkgconfig +" + +RDEPEND="${CDEPEND}" + +REQUIRED_USE="test? ( tools )" + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" + -DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}" + -DENABLE_HTML_DOCS=$(usex doc) + -DENABLE_IPV6=$(usex ipv6) + -DENABLE_TOOLS=$(usex tools) + -DHTML_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}/html" + -DSOUND_INSTALL_DIR="${EPREFIX}/usr/share/${PN}/sounds" + -DSTATIC_LIBRARY=OFF + -DSYSCONF_INSTALL_DIR="${EPREFIX}/etc" + -DBUILD_TESTING=$(usex test) + -DUNIT_TESTS=$(usex test) + ) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + if use doc; then + cmake-utils_src_compile doc + fi +} + +src_install() { + cmake-utils_src_install + + if ! use tools; then + rm -rf "${ED}/usr/share/man/man1" + fi +} diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest index c626b27a2ed1..2e00601569f5 100644 --- a/net-libs/gnome-online-accounts/Manifest +++ b/net-libs/gnome-online-accounts/Manifest @@ -1,5 +1,7 @@ DIST gnome-online-accounts-3.24.4.tar.xz 1412004 BLAKE2B 96e92eefeedb94563af755367b4932469d8a55bd545324bb1ebffb4798bd0a499aafe9523abc7c707342b1c78f912c499335708dfb3f9a149567b64877f0bbd9 SHA512 6e12f03d3ff9b9c831705f0310923b2c3e0daeee1304bb3dfa52fd17d6df49656f3380a1ffd9f30f75890340fb7ee23f53789e4df357a0aeba4e31667fd9c45a DIST gnome-online-accounts-3.24.5.tar.xz 1391332 BLAKE2B 9085cbb0c92bfcd338d5feca7ebdd3e3b15483e47fe29faffb8f9fb474663adeaf8d5cc81673c552652c9444e742f2782fd727c93bf488f5c976bde72d00ddce SHA512 8db35d21f0639e7452ec5cb34455b6d48a77fe0755c525f22e5235abe758f09ad5a4685e5e4912a53def298c76a13b558704a83803b5aabecc13a0f9bc3ae0e4 +DIST gnome-online-accounts-3.26.2.tar.xz 1405424 BLAKE2B 99b6bae527809e3c37248b35c0783e8f884577d93d1de04537f19cc2776f6204242469e78b51198c062272736c676bc67e1a3ef1cc4325eea94bb505e060ff0b SHA512 be1a9f4e1944f19937c2718db64c6968fb1f7538cdb6f7ecfa0b48136d37b1aa0c8054ff7a91cf037fac72f1e8ac7b59b69af3db39c585674113538dccf19114 EBUILD gnome-online-accounts-3.24.4.ebuild 2471 BLAKE2B d5748c5b547daaba2a7eddd8141219d00f102f3522bfd3e7d03547db3a7114a9fb739a7d93a642fdcca6a549734ca4c20bd724fbd2d72b9453d8eae407f143fb SHA512 a7356397015414a0a4908eef03f38cb96286268bda14a82bb996ef2df1bdfde5969b0761b0f4a7ded9c4e4d065f682f16f60559b3af6b946fdb53cfc6b56531d EBUILD gnome-online-accounts-3.24.5.ebuild 2473 BLAKE2B f589b5a55606011a556628ec04375cbc47b330100665409a693f8eec7ba15c23de2323b6e5c0f269ca8fc71a118f8a6b493a410b7b7890d569050b353d6b73f6 SHA512 18b212a9b3b3896252eff5d6455adeadea67c8a7f036c2e7018615aec0cd7002babbc431b2d4360d50752a1a5937f7ccd5226970b7f95b7ae61cbc9f5077504d +EBUILD gnome-online-accounts-3.26.2.ebuild 2538 BLAKE2B 0945a91ffdedf584f314027b7cfb428b11075437f274ee1b2e7fa91b2c68992d239404d2e17fe787d6a20acc771c21bf27ef391eb4a747ccc191b260d0f6efb4 SHA512 3279189b7c01a292226819024d92cc42e67ef20595ed23c5785242622a89e72f95b36dc8ecea790d1c92af6606cf2936e495129840ecc20cc177c4004f58bd0a MISC metadata.xml 473 BLAKE2B 316b4409acb16dbde8349acb5bbdeee6cfe96968bb15e90a2c3d96346f6ead282993a48e6b5ea201d9f0b3293e68259b7cd99bab1399cb6a92e1a0cc7291c197 SHA512 fe0bb40a0e1962c67a0208b6c2b9603ae37966b4427b5141efa7f63163fff3eed542a58400c0ac31e508589074c80d130de56733b55c7b10270e2e89de093a03 diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.26.2.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.26.2.ebuild new file mode 100644 index 000000000000..cb8b8feecd49 --- /dev/null +++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.26.2.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +VALA_USE_DEPEND="vapigen" + +inherit gnome2 vala + +DESCRIPTION="GNOME framework for accessing online accounts" +HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts" + +LICENSE="LGPL-2+" +SLOT="0/1" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +IUSE="debug gnome +introspection kerberos vala" # telepathy" +REQUIRED_USE="vala? ( introspection )" + +# pango used in goaeditablelabel +# libsoup used in goaoauthprovider +# goa kerberos provider is incompatible with app-crypt/heimdal, see +# https://bugzilla.gnome.org/show_bug.cgi?id=692250 +# json-glib-0.16 needed for bug #485092 +RDEPEND=" + >=dev-libs/glib-2.52:2 + >=app-crypt/libsecret-0.5 + >=dev-libs/json-glib-0.16 + dev-libs/libxml2:2 + >=net-libs/libsoup-2.42:2.4 + net-libs/rest:0.7 + net-libs/telepathy-glib + >=net-libs/webkit-gtk-2.7.2:4 + >=x11-libs/gtk+-3.19.12:3 + x11-libs/pango + + introspection? ( >=dev-libs/gobject-introspection-0.6.2:= ) + kerberos? ( + app-crypt/gcr:0=[gtk] + app-crypt/mit-krb5 ) +" +# telepathy? ( net-libs/telepathy-glib ) +# goa-daemon can launch gnome-control-center +PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )" + +DEPEND="${RDEPEND} + vala? ( $(vala_depend) ) + dev-libs/libxslt + >=dev-util/gtk-doc-am-1.3 + >=dev-util/gdbus-codegen-2.30.0 + >=dev-util/intltool-0.50.1 + sys-devel/gettext + virtual/pkgconfig + + dev-libs/gobject-introspection-common + gnome-base/gnome-common +" +# eautoreconf needs gobject-introspection-common, gnome-common + +# Due to sub-configure +QA_CONFIGURE_OPTIONS=".*" + +src_prepare() { + use vala && vala_src_prepare + gnome2_src_prepare +} + +src_configure() { + # TODO: Give users a way to set the G/FB/Windows Live secrets + # telepathy optional support is really a badly one, bug #494456 - now default disabled upstream - revisit soon + gnome2_src_configure \ + --disable-static \ + --enable-backend \ + --enable-documentation \ + --enable-exchange \ + --enable-facebook \ + --enable-flickr \ + --enable-foursquare \ + --enable-imap-smtp \ + --enable-lastfm \ + --enable-media-server \ + --enable-owncloud \ + --enable-pocket \ + --enable-telepathy \ + --enable-todoist \ + --enable-windows-live \ + $(usex debug --enable-debug=yes ' ') \ + $(use_enable kerberos) \ + $(use_enable introspection) \ + $(use_enable vala) + #$(use_enable telepathy) + # gudev & cheese from sub-configure is overriden + # by top level configure, and disabled so leave it like that +} diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest index ecbd60ddd8cd..6b99c9d42e30 100644 --- a/net-libs/gnutls/Manifest +++ b/net-libs/gnutls/Manifest @@ -1,5 +1,6 @@ DIST gnutls-3.5.19.tar.xz 7239744 BLAKE2B c12578e79d3e96e1df7a5dc5f05fe9bc4bce4150f7440a73fda8e69d3f137a9ad1ace28b56e976bc319bd7be7305bf93af9c20087229e0b8fefee85b64e8261d SHA512 a78a59505e59c62ca671b34eacaeadcf070a943b12d964b7362962ba05636136638063491c37bb1883807014b8b6cf4f83f7d5b918ed02d5fbb52155679ce52f DIST gnutls-3.6.3.tar.xz 8010284 BLAKE2B 3cbfcfc90b5bbcdcf01ef13b4a306b05e471e6cd14bb5b0c37e1e7358f2b223605901c0495c7ac3227f48ab77db30481050bf1f38de5e18659d7b91b8907aaa9 SHA512 6238502464d229a9777e3076f4c745d16deaada83c9da756ecdcd370947576e0446bda3a7f85d5a099b745bbf8c0134ebdf6632e4b26d61daf170792fb4f5abe -EBUILD gnutls-3.5.19.ebuild 4103 BLAKE2B d8c21b25fbddec8a3d208b7166fa38fe48a7ddad1d91eadf29589f0d2c87be396787c6063c1b52c54fc4cdc05d0d48444fe790cfa73676779f236899cda09c0f SHA512 1e93fdcea631b13856302bc385c904d63f1932c550aaac8d2ddf84d7de31a29a13ad68def39a49c97dd4ff9c1c7008384b84498fd983194dd2db26ac282c0c6d -EBUILD gnutls-3.6.3.ebuild 3760 BLAKE2B b29ffc0c7cefec448af0f1fd4796b40525003da16f76f4acd60c6b5b79c7ef09145eb94aa35fff22b3eba92740961187d1d65ac1a0c4c2feb8a98058943df3f9 SHA512 d6ceae3ddec152c161eff5a9737a5024fb5f71f0319f27de2cb853fee3059910d3496f8c78723db36ce4466c1f1a3ce8f10e8ed9c84c1a9ccae4ad0c1012d904 +EBUILD gnutls-3.5.19-r1.ebuild 4090 BLAKE2B e3436c057d92753371e1b274dcb05a2b170befe90e89ba507bacc09c7d2d7b308e7a0c97967797355c653be492eb6c0187fcc69338cccc2e6aeee877ac11f321 SHA512 368f32b66c4e750b06a81dfd74b9e5d58c1cde20d244e326bd7471f1209bdfaae2a84ce241b01630453fff6d447e812c9d82e539adb6139dac4a63ee00d9b902 +EBUILD gnutls-3.5.19.ebuild 4102 BLAKE2B 8b4eec009a005860f2b138ceca61ce81e59263c640c2214d9729a3dce4c20df09da82c9a9f56b7e44c7f48d70c44c974bef1597f9d97531c03a716bf372e1a10 SHA512 09257ab61c491b99910db2b8b3a39ce4fb9d484d0d5e1a19006b0ee0073f6261b4c6f18d9a86bfe53a2472c4e285c829a256354676c380fa48cff05bcead0e6e +EBUILD gnutls-3.6.3.ebuild 3737 BLAKE2B 8b3bec0c5ce869114ae0a148d324c149e8b41b0a5c031dc67d5558fda8510421dd8376724d7683641dc940175794c5f61f5634591ee03c77e7862abeaca482f8 SHA512 05e8bfb984fe359973b3f7c6720d9df76c7e2db00cb44bfa602dc042cd2516f43e0275ceeb04123b5bf2ba7cd89b8904464c4ff5e22674a80e2f738b6d716247 MISC metadata.xml 1261 BLAKE2B 28e1e92d76bd15212f59e5a118b8fb891e2dd6225dc78353188b90a20f776a0da23d2ee6368a61dd034f8cff0522e4aa0dbaa7ff43919c3c36f396cb9a13bb15 SHA512 80a2e2d7a81cd6f19d361d31b3f7356a3664aa637531943fdb8d0876b13eddbc5a72aeac60506ae751105c35004de8fe5149ce149dd4b56b10c3522428885992 diff --git a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild new file mode 100644 index 000000000000..1635d976bdf4 --- /dev/null +++ b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit libtool multilib-minimal + +DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project" +HOMEPAGE="http://www.gnutls.org/" +SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz" + +LICENSE="GPL-3 LGPL-2.1" +SLOT="0/30" # libgnutls.so number +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib" + +REQUIRED_USE=" + test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )" + +# NOTICE: sys-devel/autogen is required at runtime as we +# use system libopts +RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}] + dev-libs/libunistring:=[${MULTILIB_USEDEP}] + >=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}] + >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] + tools? ( sys-devel/autogen ) + dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] ) + guile? ( >=dev-scheme/guile-2:=[networking] ) + nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) + pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) + idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + test? ( + seccomp? ( sys-libs/libseccomp ) + )" +BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + tools? ( sys-devel/autogen ) + valgrind? ( dev-util/valgrind ) + doc? ( dev-util/gtk-doc ) + nls? ( sys-devel/gettext ) + test-full? ( + app-crypt/dieharder + app-misc/datefudge + dev-libs/softhsm:2[-bindist] + net-dialup/ppp + net-misc/socat + )" + +DOCS=( + README.md + doc/certtool.cfg +) + +HTML_DOCS=() + +pkg_setup() { + # bug#520818 + export TZ=UTC + + use doc && HTML_DOCS+=( + doc/gnutls.html + ) +} + +src_prepare() { + default + + # force regeneration of autogen-ed files + local file + for file in $(grep -l AutoGen-ed src/*.c) ; do + rm src/$(basename ${file} .c).{c,h} || die + done + + # Use sane .so versioning on FreeBSD. + elibtoolize +} + +multilib_src_configure() { + LINGUAS="${LINGUAS//en/en@boldquot en@quot}" + + # remove magic of library detection + # bug#438222 + local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')) + + # TPM needs to be tested before being enabled + libconf+=( --without-tpm ) + + # hardware-accell is disabled on OSX because the asm files force + # GNU-stack (as doesn't support that) and when that's removed ld + # complains about duplicate symbols + [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) + + # Cygwin as does not understand these asm files at all + [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration ) + + ECONF_SOURCE=${S} econf \ + $(multilib_native_enable manpages) \ + $(multilib_native_use_enable doc gtk-doc) \ + $(multilib_native_use_enable doc) \ + $(multilib_native_use_enable guile) \ + $(multilib_native_use_enable seccomp seccomp-tests) \ + $(multilib_native_use_enable test tests) \ + $(multilib_native_use_enable test-full full-test-suite) \ + $(multilib_native_use_enable tools) \ + $(multilib_native_use_enable valgrind valgrind-tests) \ + $(use_enable cxx) \ + $(use_enable dane libdane) \ + $(use_enable nls) \ + $(use_enable openpgp openpgp-authentication) \ + $(use_enable openssl openssl-compatibility) \ + $(use_enable sslv2 ssl2-support) \ + $(use_enable sslv3 ssl3-support) \ + $(use_enable static-libs static) \ + $(use_enable tls-heartbeat heartbeat-support) \ + $(use_with idn libidn2) \ + $(use_with idn) \ + $(use_with pkcs11 p11-kit) \ + $(use_with zlib) \ + --with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \ + --without-included-libtasn1 \ + "${libconf[@]}" +} + +multilib_src_install_all() { + einstalldocs + find "${D}" -name '*.la' -delete || die + + if use examples; then + docinto examples + dodoc doc/examples/*.c + fi +} diff --git a/net-libs/gnutls/gnutls-3.5.19.ebuild b/net-libs/gnutls/gnutls-3.5.19.ebuild index 2b57e94b6b85..39244f5c2a32 100644 --- a/net-libs/gnutls/gnutls-3.5.19.ebuild +++ b/net-libs/gnutls/gnutls-3.5.19.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz" LICENSE="GPL-3 LGPL-2.1" SLOT="0/30" # libgnutls.so number -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib" REQUIRED_USE=" diff --git a/net-libs/gnutls/gnutls-3.6.3.ebuild b/net-libs/gnutls/gnutls-3.6.3.ebuild index fd1664469d06..fefc8766f6af 100644 --- a/net-libs/gnutls/gnutls-3.6.3.ebuild +++ b/net-libs/gnutls/gnutls-3.6.3.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit libtool ltprune multilib-minimal versionator +inherit libtool multilib-minimal DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project" HOMEPAGE="http://www.gnutls.org/" -SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz" +SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz" LICENSE="GPL-3 LGPL-2.1" SLOT="0/30" # libgnutls.so number @@ -25,20 +25,20 @@ RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}] >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] tools? ( sys-devel/autogen ) dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] ) - guile? ( >=dev-scheme/guile-1.8:=[networking] ) + guile? ( >=dev-scheme/guile-2:=[networking] ) nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] ) idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - doc? ( dev-util/gtk-doc ) - nls? ( sys-devel/gettext ) - valgrind? ( dev-util/valgrind ) test? ( seccomp? ( sys-libs/libseccomp ) - ) + )" +BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + tools? ( sys-devel/autogen ) + valgrind? ( dev-util/valgrind ) + doc? ( dev-util/gtk-doc ) + nls? ( sys-devel/gettext ) test-full? ( - guile? ( >=dev-scheme/guile-2 ) app-crypt/dieharder >=app-misc/datefudge-1.22 dev-libs/softhsm:2[-bindist] @@ -120,7 +120,7 @@ multilib_src_configure() { multilib_src_install_all() { einstalldocs - prune_libtool_files --all + find "${D}" -name '*.la' -delete || die if use examples; then docinto examples diff --git a/net-libs/google-cloud-cpp/Manifest b/net-libs/google-cloud-cpp/Manifest index 5cd74808bc8e..8ac73848d8ac 100644 --- a/net-libs/google-cloud-cpp/Manifest +++ b/net-libs/google-cloud-cpp/Manifest @@ -1,7 +1,8 @@ -AUX 0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch 1321 BLAKE2B 93d7a80d64f16e4dec71623b71fc88e648d08423130f57d698989bfd6c9e67ceaab1f2e07f5e5619c60f701148d09d1f71c6e76ab5fb1ddc27ac8735b40b950f SHA512 a947f313aa34d9e6f4023cdaab69fd140cf1ba54947566ba964c3ff63269528035d2896c62b994374ae84a1a55437fdd707fe7e9de0206bb65728b4388b25778 -AUX 0002-cmake-fix-library-issues.patch 9143 BLAKE2B 588609dfca0da2e49823764bdf382bcd3c154d8ec66be2a0625640f0ee26d32de08f120755f416a8e9c5c945008a928549ef3725e2f1654e56a7c10e7cef6b44 SHA512 e33bca9842728799fc632cfd0acefcface9bc9a160bb20e3566c2a397fc6861702050d4bb62088be3f8751f9d1fc728395eedb012e65b5c1818218ef4dee0608 +AUX 0001-Make-the-install-target-work.patch 694 BLAKE2B 21498aaf2e14e76a7df5bcd6ff45910b9bc2cc35518df6af5a5b0c63622c620360f0aa0203121f7a529171591c7a39eef5fb6cf0ed1986a9efd8c5fff2a7dc0c SHA512 4e8648b3f418b3a8839ef5935e9d84d99ab50bdd6d2e9b95f4ca132abdda84305931e146ff4881acc67e5baee59e5a2e9402c604ada26b09d6c1e964b8dfe4b9 +AUX 0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch 1340 BLAKE2B 4f043a50d93f66beb503057179c15cce975f361936c94cba2f727c20ec6328ff83a3c028effe81d00b3426df92b3f89d49827337c2683cedb30fba718cf15696 SHA512 b916425bb94d90a4609ea55ace43c4892a3688f3f49ccecd58ab403637c40694e2f90fb7d88cd3fdbe459372293d3f2ca99789231e064a3d4a308b59169374c3 +AUX 0002-cmake-set-library-soversions.patch 5439 BLAKE2B db60577550006e0088ca991bdad3792e68281f9717238c979be875011f3b870566b604fe0e56c0f05f87e981c0118b50050186f6992d1978980047a2d015ccea SHA512 b58b2a42f9676519866a7309e2e1788138d9c77316d8a5eb9f40e6ae27a2a64c54ed5b023574cd1a47c6f87fe14f96801c9b351066a28e258153282848d64c05 DIST google-cloud-cpp-0.2.0.tar.gz 687020 BLAKE2B 45c09c7cb5b9cc93c87e6d1faedf04f29ae81196dda95660abeadeaaf522376b4e50fd42489476c081e8de7336202d3883ab276c0e2334f1ad1b0e4e1f90fdb8 SHA512 ded3b564ef264a8bff4d81b08f2a97462e063127bf75a006bc7b18d18cfaee2f3cbe5957fe2c56cec06da5a7765854444fad8cd5045579c416c5f3de8462382e DIST googleapis-79ab27f3b70ebc221e265d2e8ab30a8cc2d21fa2.tar.gz 874997 BLAKE2B c837323124d26364c83dba72d4f73f3147ad117468b271e8d9502991c1f9a7b20d4f5405351147b65e99c57d207a2b8c1471228d2060ad238ade5159be1b009e SHA512 774e56fc30a4daf2e88d8d3b6747c1ac369d016e9d52527565b88d93252a22597339c17e612304f8823867da4b6df4b58a42dc9d4d480fc59962ee5314a85ab8 DIST nlohmann-json-3.1.2-json.hpp 595822 BLAKE2B 510278344a510a516606f84aea53c682a64a7d1f4703e41503a1688e7c62ab1df8f197a697bd1149e958d21ab986d1b42cb78db6261b07239d9587756813acf5 SHA512 05df0ad3338f0bca885c0aa9da523922b99016986a9b01426b13888c0febd83bf1f6f063886f6c75f8a656ef79abac6292fe442dc05b1897d546ba5b70be48a5 -EBUILD google-cloud-cpp-0.2.0.ebuild 1607 BLAKE2B 04001060e9e5c60f71c1aa27cd5d5eba0cf2523c4de3724cc16ce2af16468613bf11ca6bf2cdf5f28a862f9bfd4db2ae5754a1be1e27456475a9f9226c3af2f1 SHA512 b0e4b4a786450727fe1284a243a399566c8037b4611c963d708d5e3997ed0f9d479e98d40a6b9cf2fd45de53c3b95d0ed31377b1221d86d0dfc4114eaeb77ec0 +EBUILD google-cloud-cpp-0.2.0-r1.ebuild 1666 BLAKE2B e659352d563d5fb409f112fbf4776616d3e1e7a22485ccfdd2e512ffb59286f6a73d06c271c18e7cc94b11e1d3f8377c98057f3c6b5c9126bd01bd5a15dc020e SHA512 686888bc2909a77a789785ad92414f6e3651d67e8eaa471c1dc20598705592ecc0abc0c5da129bddf8943e9f35d2fc6f6adc9ff6197cb817f1496b2d82065914 MISC metadata.xml 334 BLAKE2B f6f86d6b9621c1f6bb8a540835936ba0eb3ebc9ebee743cf3fdd0f236477378acff8af6528ba194cf1ba74273d3df99eeb012add242471af810afbfbe587321b SHA512 3ddab1ddecbb3f976ed02c450094873ec200d3a42faa601a10a3089d76faadaffa3fa59e48013b471e735a919502988da149f4d19e7d1d7054947462c71581a9 diff --git a/net-libs/google-cloud-cpp/files/0001-Make-the-install-target-work.patch b/net-libs/google-cloud-cpp/files/0001-Make-the-install-target-work.patch new file mode 100644 index 000000000000..f84cb4be3c27 --- /dev/null +++ b/net-libs/google-cloud-cpp/files/0001-Make-the-install-target-work.patch @@ -0,0 +1,12 @@ +diff -ur google-cloud-cpp-0.2.0.orig/google/cloud/storage/CMakeLists.txt google-cloud-cpp-0.2.0/google/cloud/storage/CMakeLists.txt +--- google-cloud-cpp-0.2.0.orig/google/cloud/storage/CMakeLists.txt 2018-09-28 00:39:41.170482472 +0800 ++++ google-cloud-cpp-0.2.0/google/cloud/storage/CMakeLists.txt 2018-09-28 00:42:09.679979597 +0800 +@@ -321,7 +321,7 @@ + PATTERN "testing/*" + EXCLUDE) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/version_info.h DESTINATION +- include/storage/client) ++ include/google/cloud/storage) + + # Setup global variables used in the following *.in files. + set(GOOGLE_CLOUD_CPP_CONFIG_VERSION_MAJOR ${STORAGE_CLIENT_VERSION_MAJOR}) diff --git a/net-libs/google-cloud-cpp/files/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch b/net-libs/google-cloud-cpp/files/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch index d479a82b1e30..a1b9a166ea3c 100644 --- a/net-libs/google-cloud-cpp/files/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch +++ b/net-libs/google-cloud-cpp/files/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch @@ -1,31 +1,31 @@ -From eb0155e90498a5d7341490b9ed123f7638bffe44 Mon Sep 17 00:00:00 2001 +From ef34b197dd23833c0dde9ea20f62681dbafa7a9b Mon Sep 17 00:00:00 2001 From: Jason Zaman <jason@perfinion.com> Date: Fri, 7 Sep 2018 21:19:11 +0800 Subject: [PATCH 1/2] cmake: Fix GOOGLE_CLOUD_CPP_GRPC_PROVIDER=pkg-config The grpc_cpp_plugin executable needs to be marked imported otherwise -cmake will try (and fail) to build it. -Also the location variable was typo'd. +cmake will try (and fail) to build it. Also the location variable was +typo'd. Signed-off-by: Jason Zaman <jason@perfinion.com> --- - cmake/IncludeGrpc.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + cmake/IncludeGrpc.cmake | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cmake/IncludeGrpc.cmake b/cmake/IncludeGrpc.cmake -index 14273cbb..929f984d 100644 +index 36dcfe5c..c18f5cbc 100644 --- a/cmake/IncludeGrpc.cmake +++ b/cmake/IncludeGrpc.cmake -@@ -231,9 +231,9 @@ elseif("${GOOGLE_CLOUD_CPP_GRPC_PROVIDER}" STREQUAL "pkg-config") +@@ -225,9 +225,8 @@ elseif("${GOOGLE_CLOUD_CPP_GRPC_PROVIDER}" STREQUAL "pkg-config") ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Release ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Debug) mark_as_advanced(PROTOC_GRPCPP_PLUGIN_EXECUTABLE) - add_executable(grpc_cpp_plugin ${PROTOC_GRPC_PLUGIN_EXECUTABLE}) + add_executable(grpc_cpp_plugin IMPORTED) set_property(TARGET grpc_cpp_plugin - PROPERTY IMPORTED_LOCATION +- PROPERTY IMPORTED_LOCATION - ${PROTOC_GRPCPP_CPP_PLUGIN_EXECUTABLE}) -+ ${PROTOC_GRPCPP_PLUGIN_EXECUTABLE}) ++ PROPERTY IMPORTED_LOCATION ${PROTOC_GRPCPP_PLUGIN_EXECUTABLE}) endif () -- diff --git a/net-libs/google-cloud-cpp/files/0002-cmake-fix-library-issues.patch b/net-libs/google-cloud-cpp/files/0002-cmake-fix-library-issues.patch deleted file mode 100644 index 23a6d24d54da..000000000000 --- a/net-libs/google-cloud-cpp/files/0002-cmake-fix-library-issues.patch +++ /dev/null @@ -1,180 +0,0 @@ -From 9978d05d4418bf813b8a457a2e49d0fc8fc8b26b Mon Sep 17 00:00:00 2001 -From: Jason Zaman <jason@perfinion.com> -Date: Fri, 7 Sep 2018 22:35:24 +0800 -Subject: [PATCH 2/2] cmake: fix library issues - -Set library soversions so CMake sets the symlinks and soversions -properly. -Install the cmake files in the correct dir. - -Signed-off-by: Jason Zaman <jason@perfinion.com> ---- - google/cloud/CMakeLists.txt | 14 +++++++------- - google/cloud/bigtable/CMakeLists.txt | 11 ++++++++--- - google/cloud/firestore/CMakeLists.txt | 14 ++++++++------ - google/cloud/storage/CMakeLists.txt | 12 +++++++----- - 4 files changed, 30 insertions(+), 21 deletions(-) - -diff --git a/google/cloud/CMakeLists.txt b/google/cloud/CMakeLists.txt -index 4d777261..4e26290c 100644 ---- a/google/cloud/CMakeLists.txt -+++ b/google/cloud/CMakeLists.txt -@@ -99,6 +99,9 @@ target_include_directories(google_cloud_cpp_common - $<INSTALL_INTERFACE:include>) - target_compile_options(google_cloud_cpp_common - PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG}) -+set_target_properties(google_cloud_cpp_common PROPERTIES -+ VERSION ${GOOGLE_CLOUD_CPP_VERSION_MAJOR}.${GOOGLE_CLOUD_CPP_VERSION_MINOR}.${GOOGLE_CLOUD_CPP_VERSION_PATCH} -+ SOVERSION ${GOOGLE_CLOUD_CPP_VERSION_MAJOR}) - - include(CreateBazelConfig) - create_bazel_config(google_cloud_cpp_common) -@@ -150,7 +153,7 @@ endforeach () - - # Export the CMake targets to make it easy to create configuration files. - install(EXPORT google_cloud_cpp_common-targets -- DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/google_cloud_cpp_common") -+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules") - - # Install the libraries and headers in the locations determined by - # GNUInstallDirs -@@ -186,12 +189,9 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_common.pc" - configure_file("config.cmake.in" "google_cloud_cpp_common-config.cmake" @ONLY) - configure_file("${PROJECT_SOURCE_DIR}/google/cloud/config-version.cmake.in" - "google_cloud_cpp_common-config-version.cmake" @ONLY) --install( -- FILES -- "${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_common-config.cmake" -- "${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_common-config-version.cmake" -- DESTINATION -- "${CMAKE_INSTALL_LIBDIR}/cmake/google_cloud_cpp_common") -+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_common-config.cmake" -+ "${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_common-config-version.cmake" -+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules") - - add_subdirectory(bigtable) - add_subdirectory(firestore) -diff --git a/google/cloud/bigtable/CMakeLists.txt b/google/cloud/bigtable/CMakeLists.txt -index 8aaff05c..9bd3effd 100644 ---- a/google/cloud/bigtable/CMakeLists.txt -+++ b/google/cloud/bigtable/CMakeLists.txt -@@ -102,6 +102,9 @@ target_include_directories(bigtable_protos - $<INSTALL_INTERFACE:include>) - target_compile_options(bigtable_protos - PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG}) -+set_target_properties(bigtable_protos PROPERTIES -+ VERSION ${BIGTABLE_CLIENT_VERSION_MAJOR}.${BIGTABLE_CLIENT_VERSION_MINOR}.${BIGTABLE_CLIENT_VERSION_PATCH} -+ SOVERSION ${BIGTABLE_CLIENT_VERSION_MAJOR}) - add_library(bigtable::protos ALIAS bigtable_protos) - - # Enable unit tests -@@ -212,6 +215,9 @@ target_include_directories(bigtable_client - $<INSTALL_INTERFACE:include>) - target_compile_options(bigtable_client - PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG}) -+set_target_properties(bigtable_client PROPERTIES -+ VERSION ${BIGTABLE_CLIENT_VERSION_MAJOR}.${BIGTABLE_CLIENT_VERSION_MINOR}.${BIGTABLE_CLIENT_VERSION_PATCH} -+ SOVERSION ${BIGTABLE_CLIENT_VERSION_MAJOR}) - add_library(bigtable::client ALIAS bigtable_client) - - include(CreateBazelConfig) -@@ -369,7 +375,7 @@ if (NOT ${GOOGLE_CLOUD_CPP_GRPC_PROVIDER} STREQUAL "module") - - # Export the CMake targets to make it easy to create configuration files. - install(EXPORT bigtable-targets -- DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/bigtable_client") -+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules") - endif () - - install(TARGETS bigtable_client -@@ -407,5 +413,4 @@ configure_file("${PROJECT_SOURCE_DIR}/google/cloud/config-version.cmake.in" - "bigtable_client-config-version.cmake" @ONLY) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/bigtable_client-config.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/bigtable_client-config-version.cmake" -- DESTINATION -- "${CMAKE_INSTALL_LIBDIR}/cmake/bigtable_client") -+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules") -diff --git a/google/cloud/firestore/CMakeLists.txt b/google/cloud/firestore/CMakeLists.txt -index 88c5ad6d..63d8add1 100644 ---- a/google/cloud/firestore/CMakeLists.txt -+++ b/google/cloud/firestore/CMakeLists.txt -@@ -62,6 +62,9 @@ target_include_directories(firestore_client - $<INSTALL_INTERFACE:include>) - target_compile_options(firestore_client - PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG}) -+set_target_properties(firestore_client PROPERTIES -+ VERSION ${FIRESTORE_CLIENT_VERSION_MAJOR}.${FIRESTORE_CLIENT_VERSION_MINOR}.${FIRESTORE_CLIENT_VERSION_PATCH} -+ SOVERSION ${FIRESTORE_CLIENT_VERSION_MAJOR}) - add_library(firestore::client ALIAS firestore_client) - - include(CreateBazelConfig) -@@ -104,7 +107,8 @@ install(TARGETS - - # The exports can only be installed if all the dependencies are installed. CMake - # needs to know where the submodules will be installed from, --install(EXPORT firestore-targets DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake) -+install(EXPORT firestore-targets -+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules") - - install(TARGETS firestore_client - EXPORT firestore-targets -@@ -138,8 +142,6 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/firestore_client.pc" DESTINATION - configure_file("config.cmake.in" "firestore_client-config.cmake" @ONLY) - configure_file("${PROJECT_SOURCE_DIR}/google/cloud/config-version.cmake.in" - "firestore_client-config-version.cmake" @ONLY) --install( -- FILES "${CMAKE_CURRENT_BINARY_DIR}/firestore_client-config.cmake" -- "${CMAKE_CURRENT_BINARY_DIR}/firestore_client-config-version.cmake" -- DESTINATION -- ${CMAKE_INSTALL_DATAROOTDIR}/cmake) -+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/firestore_client-config.cmake" -+ "${CMAKE_CURRENT_BINARY_DIR}/firestore_client-config-version.cmake" -+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules") -diff --git a/google/cloud/storage/CMakeLists.txt b/google/cloud/storage/CMakeLists.txt -index c8b641a0..c91bb17c 100644 ---- a/google/cloud/storage/CMakeLists.txt -+++ b/google/cloud/storage/CMakeLists.txt -@@ -216,6 +216,9 @@ target_include_directories(storage_client - $<INSTALL_INTERFACE:include>) - target_compile_options(storage_client - PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG}) -+set_target_properties(storage_client PROPERTIES -+ VERSION ${STORAGE_CLIENT_VERSION_MAJOR}.${STORAGE_CLIENT_VERSION_MINOR}.${STORAGE_CLIENT_VERSION_PATCH} -+ SOVERSION ${STORAGE_CLIENT_VERSION_MAJOR}) - - add_library(storage_client_testing - testing/canonical_errors.h -@@ -326,20 +329,20 @@ install(TARGETS storage_common_options nlohmann_json - - # Export the CMake targets to make it easy to create configuration files. - install(EXPORT storage-targets -- DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/storage_client") -+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules") - - install(TARGETS storage_client - EXPORT storage-targets - RUNTIME DESTINATION bin - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) --install(DIRECTORY . DESTINATION include/storage/client -+install(DIRECTORY . DESTINATION include/google/cloud/storage/client - FILES_MATCHING - PATTERN "*.h" - PATTERN "testing/*" - EXCLUDE) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/version_info.h DESTINATION -- include/storage/client) -+ include/google/cloud/storage/client) - - # Setup global variables used in the following *.in files. - set(GOOGLE_CLOUD_CPP_CONFIG_VERSION_MAJOR ${STORAGE_CLIENT_VERSION_MAJOR}) -@@ -362,5 +365,4 @@ configure_file("${PROJECT_SOURCE_DIR}/google/cloud/config-version.cmake.in" - "storage_client-config-version.cmake" @ONLY) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/storage_client-config.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/storage_client-config-version.cmake" -- DESTINATION -- "${CMAKE_INSTALL_LIBDIR}/cmake/storage_client") -+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules") --- -2.16.4 - diff --git a/net-libs/google-cloud-cpp/files/0002-cmake-set-library-soversions.patch b/net-libs/google-cloud-cpp/files/0002-cmake-set-library-soversions.patch new file mode 100644 index 000000000000..74a57711ed63 --- /dev/null +++ b/net-libs/google-cloud-cpp/files/0002-cmake-set-library-soversions.patch @@ -0,0 +1,130 @@ +From b1d6f58033be92661f91b221b878e333eb02fd7f Mon Sep 17 00:00:00 2001 +From: Jason Zaman <jason@perfinion.com> +Date: Fri, 7 Sep 2018 22:35:24 +0800 +Subject: [PATCH 2/2] cmake: set library soversions + +Set library soversions so CMake sets the symlinks and soversions +properly. Install the cmake files in the correct dir. + +Signed-off-by: Jason Zaman <jason@perfinion.com> +--- + google/cloud/CMakeLists.txt | 7 +++++++ + google/cloud/bigtable/CMakeLists.txt | 14 ++++++++++++++ + google/cloud/firestore/CMakeLists.txt | 12 ++++++++++-- + google/cloud/storage/CMakeLists.txt | 9 ++++++++- + 4 files changed, 39 insertions(+), 3 deletions(-) + +diff --git a/google/cloud/CMakeLists.txt b/google/cloud/CMakeLists.txt +index 3f3f8742..442f4e17 100644 +--- a/google/cloud/CMakeLists.txt ++++ b/google/cloud/CMakeLists.txt +@@ -98,6 +98,13 @@ target_include_directories(google_cloud_cpp_common + $<INSTALL_INTERFACE:include>) + target_compile_options(google_cloud_cpp_common + PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG}) ++set_target_properties( ++ google_cloud_cpp_common ++ PROPERTIES ++ VERSION ++ ${GOOGLE_CLOUD_CPP_VERSION_MAJOR}.${GOOGLE_CLOUD_CPP_VERSION_MINOR}.${GOOGLE_CLOUD_CPP_VERSION_PATCH} ++ SOVERSION ++ ${GOOGLE_CLOUD_CPP_VERSION_MAJOR}) + + include(CreateBazelConfig) + create_bazel_config(google_cloud_cpp_common) +diff --git a/google/cloud/bigtable/CMakeLists.txt b/google/cloud/bigtable/CMakeLists.txt +index 9ed778eb..fd9c8797 100644 +--- a/google/cloud/bigtable/CMakeLists.txt ++++ b/google/cloud/bigtable/CMakeLists.txt +@@ -102,6 +102,13 @@ target_include_directories(bigtable_protos + $<INSTALL_INTERFACE:include>) + target_compile_options(bigtable_protos + PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG}) ++set_target_properties( ++ bigtable_protos ++ PROPERTIES ++ VERSION ++ ${BIGTABLE_CLIENT_VERSION_MAJOR}.${BIGTABLE_CLIENT_VERSION_MINOR}.${BIGTABLE_CLIENT_VERSION_PATCH} ++ SOVERSION ++ ${BIGTABLE_CLIENT_VERSION_MAJOR}) + add_library(bigtable::protos ALIAS bigtable_protos) + + # Enable unit tests +@@ -206,6 +213,13 @@ target_include_directories(bigtable_client + $<INSTALL_INTERFACE:include>) + target_compile_options(bigtable_client + PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG}) ++set_target_properties( ++ bigtable_client ++ PROPERTIES ++ VERSION ++ ${BIGTABLE_CLIENT_VERSION_MAJOR}.${BIGTABLE_CLIENT_VERSION_MINOR}.${BIGTABLE_CLIENT_VERSION_PATCH} ++ SOVERSION ++ ${BIGTABLE_CLIENT_VERSION_MAJOR}) + add_library(bigtable::client ALIAS bigtable_client) + + include(CreateBazelConfig) +diff --git a/google/cloud/firestore/CMakeLists.txt b/google/cloud/firestore/CMakeLists.txt +index 88c5ad6d..c69e48fd 100644 +--- a/google/cloud/firestore/CMakeLists.txt ++++ b/google/cloud/firestore/CMakeLists.txt +@@ -62,6 +62,13 @@ target_include_directories(firestore_client + $<INSTALL_INTERFACE:include>) + target_compile_options(firestore_client + PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG}) ++set_target_properties( ++ firestore_client ++ PROPERTIES ++ VERSION ++ ${FIRESTORE_CLIENT_VERSION_MAJOR}.${FIRESTORE_CLIENT_VERSION_MINOR}.${FIRESTORE_CLIENT_VERSION_PATCH} ++ SOVERSION ++ ${FIRESTORE_CLIENT_VERSION_MAJOR}) + add_library(firestore::client ALIAS firestore_client) + + include(CreateBazelConfig) +@@ -104,7 +111,8 @@ install(TARGETS + + # The exports can only be installed if all the dependencies are installed. CMake + # needs to know where the submodules will be installed from, +-install(EXPORT firestore-targets DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake) ++install(EXPORT firestore-targets ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/firestore_client") + + install(TARGETS firestore_client + EXPORT firestore-targets +@@ -142,4 +150,4 @@ install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/firestore_client-config.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/firestore_client-config-version.cmake" + DESTINATION +- ${CMAKE_INSTALL_DATAROOTDIR}/cmake) ++ "${CMAKE_INSTALL_LIBDIR}/cmake/firestore_client") +diff --git a/google/cloud/storage/CMakeLists.txt b/google/cloud/storage/CMakeLists.txt +index cef3954b..912391cc 100644 +--- a/google/cloud/storage/CMakeLists.txt ++++ b/google/cloud/storage/CMakeLists.txt +@@ -205,6 +205,13 @@ target_include_directories(storage_client + $<INSTALL_INTERFACE:include>) + target_compile_options(storage_client + PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG}) ++set_target_properties( ++ storage_client ++ PROPERTIES ++ VERSION ++ ${STORAGE_CLIENT_VERSION_MAJOR}.${STORAGE_CLIENT_VERSION_MINOR}.${STORAGE_CLIENT_VERSION_PATCH} ++ SOVERSION ++ ${STORAGE_CLIENT_VERSION_MAJOR}) + + add_library(storage_client_testing + testing/canonical_errors.h +@@ -315,7 +322,7 @@ install(TARGETS storage_client + RUNTIME DESTINATION bin + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-install(DIRECTORY . DESTINATION include/storage/client ++install(DIRECTORY . DESTINATION include/google/cloud/storage/client + FILES_MATCHING + PATTERN "*.h" + PATTERN "testing/*" +-- +2.16.4 + diff --git a/net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0.ebuild b/net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0-r1.ebuild index 0cc60cd4db47..c1e409f155e9 100644 --- a/net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0.ebuild +++ b/net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0-r1.ebuild @@ -27,8 +27,9 @@ DEPEND="${RDEPEND} DOCS=( README.md ) PATCHES=( + "${FILESDIR}/0001-Make-the-install-target-work.patch" "${FILESDIR}/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch" - "${FILESDIR}/0002-cmake-fix-library-issues.patch" + "${FILESDIR}/0002-cmake-set-library-soversions.patch" ) src_prepare() { diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest index 319c3becbe57..d29db9271268 100644 --- a/net-libs/libbitcoinconsensus/Manifest +++ b/net-libs/libbitcoinconsensus/Manifest @@ -6,5 +6,5 @@ DIST bitcoin-v0.16.0.tar.gz 6628305 BLAKE2B 69adb5832e2a708431c06bd8ce695f25cfc2 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d EBUILD libbitcoinconsensus-0.15.1.ebuild 2388 BLAKE2B af9dec58358b370c37b770d6a0762af2940f45aa4f8ba723df2ca8f605dc87672a5134c3c773f5c83103efb4df1e0c9efeb8487a584f37b2063e35510bac0e3a SHA512 fbf7381d56add2aaf0b62016f981efbac71031ecf266a6044f0742d86e30054e01c592e276a0c1e1c66f52f99c642a29fd91757cd39ec9905d85aeb4fe726124 EBUILD libbitcoinconsensus-0.16.0.ebuild 2344 BLAKE2B 561422a65b6f7a80500cb5422aa116e7c5bbae782ab29c0a392f57abcd14e55669195a6330145e26f2a52558065c46325d825903a93ba35cd6b5af7c4f24f12b SHA512 93d3638e10b6f3200d30b21c9416240b41752da8f50f04968d917b08e268cfce616b764747705526af0cd9a8d7b886f1a970a8b6cc47bc890a59ec18e70c9fca -EBUILD libbitcoinconsensus-0.16.3.ebuild 2341 BLAKE2B c9ecf5c88ded7b637f573c8afd85bc4de6354497574d2dd48301c9b4010977db2bd37b39a2e42bd82ec6d6dd4f0ffbf7e005ddf0e0a95d97ab78c5ae02dbf276 SHA512 af6467257b09c88b81652f5ec16972d950ec9c1b557812bd6a428740d04a84f3b765c691faea7a0cbe8cde5e2ef297fa88e7122a6dfb5ab94eb8b5759b61de61 +EBUILD libbitcoinconsensus-0.16.3.ebuild 2340 BLAKE2B b815481671655acfdc1ffc7465246dcb322961f7b84a23d7aec7c962d9be745b0685941ecd9ba29847a4fd237ff5c84e4f9d0a1d337fcd7774df37c34f5efe00 SHA512 3f46b0f147c33f25e6182a243e25cbd95a9a00156fbe631fe7030b211929f40839ce00ea3bef2eba364ef2a18c9e2dc604a2ba77f05300da93b1027823c96b2e MISC metadata.xml 679 BLAKE2B 5283fe5aba24ba5d425e68ee4f6b1059378027c116c675d94ffdd44fab28c68ea52434df749a3a906121e2a044e296e8a26975f9653b93e693f3815bddf98d9d SHA512 3a9ccff97c3e952ec4c321184144be64daf4d9a1c03d21cc8aa454162ad1c1d133382cbbf5d21a873ea3bf746ec68c4ed0be0b81e2b562724ca9bd05f481d665 diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.16.3.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.16.3.ebuild index 1a0fa2b228fc..404db5e9f3e4 100644 --- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.16.3.ebuild +++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.16.3.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="+asm knots libressl" DEPEND=" diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest index 12405449ca52..420956decf8d 100644 --- a/net-libs/libnetfilter_conntrack/Manifest +++ b/net-libs/libnetfilter_conntrack/Manifest @@ -4,6 +4,6 @@ DIST libnetfilter_conntrack-1.0.6.tar.bz2 422998 BLAKE2B 7153593e2b6f5e03a5f4579 DIST libnetfilter_conntrack-1.0.7.tar.bz2 346219 BLAKE2B 85388bb2b185fa04ce697b07675cfbd84836873a9d09092b16bba318e93da56085ea5a4726a908ed5d1974aa524bee0f912e2be23f6a4c9e9e46641baf0c6a18 SHA512 5be5ed5daba385d11123a4e497c6334c6bb7e668594e667f85596619afe607f8783c088934098a4c07557d86f9b9157ff67d28541c8f4a80a5454307b979c22b EBUILD libnetfilter_conntrack-1.0.4.ebuild 968 BLAKE2B c1d3943def2e1b3d8eb61006a6426fb23ca0f9062522d8f197c8af3baa366181ba11f1e3ea797d9a461898d8fbdf40036425d36897e3b570dd3932d47f40b5fd SHA512 c1eb29f822d2ed62dea906fb0040b49a9edb966372959cd98a2297dcc88b718c2eb04d6b36d79030d2e473885c299795541a9017005f9f90d6fce176360b660f EBUILD libnetfilter_conntrack-1.0.5.ebuild 981 BLAKE2B a6cf9640745c047eb38ef0cbac268ef21e379289b6230d4042b10b040d8fb0faaecc1bd37a026356e6c2d28c5ba68f73c4172584b63db2eb0f19341c4a3538b4 SHA512 23b8a125ed2dbf01c324411085e8464e60d6eb03980a185b34ff6675065e5a1a6963c001f24d242746f8b8b54e02db20925543f853962dc18694246723b45af2 -EBUILD libnetfilter_conntrack-1.0.6.ebuild 972 BLAKE2B 27fd7f94d9aa40bcfa0346236e44210e30dc026ff766eeb5c88318a040ccd6f9c8f330690cfb05f3728ec859ad01320f9b3f4ab9e8087962467252ee130e80ab SHA512 89a39f7afcab739362733ad5fa3f5abe0a0971bff9efff263e941398ea068e404ac2d44627cc28806d302ffb9801eb0b98d37ed46b5b4f17855fbf5c08535c3d +EBUILD libnetfilter_conntrack-1.0.6.ebuild 969 BLAKE2B 23fe2a76299843350018cdaf39d284764732f55be25f36daa5c0d922ee788bd86169ae0ecf42c5cb1557745d4917f24906eec3d16b347e9609dba5ce69324485 SHA512 6ffe1a4467ab16ad059b4398531187ae8129707986cad0365d600fb4e91ccda2f8b24c2be9b426ac6a7451b994ed0a4b773366fe997f8443c5fd84cd29afadac EBUILD libnetfilter_conntrack-1.0.7.ebuild 979 BLAKE2B f3cc5bfc79799b9e585d68e948d614c1f8c6370a38a551104979f3c111bf56c39ff7c8ed0d476b28246662c576f583f155f3a0ecfe188779c10c3024a191456d SHA512 6105474e9db8329ed22a6bc15f5ded6d7aaf548914e2df09601968028140ee890472ec63c8187984b985b543530569f491f6ee13caa50a1c023ac2d006a80741 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild index 7e714e7d6a91..b7629d8fe9b9 100644 --- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild +++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" IUSE="static-libs" RDEPEND=" diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest index 3b3e5a295aed..7a696a4de9db 100644 --- a/net-libs/libssh/Manifest +++ b/net-libs/libssh/Manifest @@ -7,8 +7,10 @@ AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a28 DIST libssh-0.7.4.tar.xz 351892 BLAKE2B 5427faa04eac7b57f73909f113d933daf667f8311c30364bbf06d4f01121a58f5b560e0a1d9071655ce9b310fa3f3f801e11e880ca3eacde66efa0f49dc51b2b SHA512 94b8183e5c83e339303c1a160c92ccff6159471ac7d189ab66cf6d606d2e803fd616519f079aef1577c947d3a14e315332b05ea08e44d0ab550edbcb768dbea7 DIST libssh-0.7.5.tar.xz 351632 BLAKE2B b41cccb6215c5b7e66742171d91e1081d3c1bf44455b65a5992093d31b28db7a6375e815303e115e02b2458c734d9c61e4b1528ba905bf8a421ca2bbb7221ce6 SHA512 6c7f539899caaedf13d66fa2e0fac1a475ecdfe389131abcbdf908bdebc50a0b9e6b0d43e67e52aea85c32f6aa68e46ca2f50695992f82ded83489f445a8e775 DIST libssh-0.8.2.tar.xz 408412 BLAKE2B bbd531ed511baa84d40c2e156cc63fca09345196e24e485930d8f42fed451529ea6ec2ce6f50276dfa56d5523062bbc45774891ad47ce7c748e8b95bc28b9f8c SHA512 ef9877d2a35f1871139c12452c917a3888172ea29f71d880e824de182695e5a8786bb39ca2f4874a160e156648d52065a8b2e7c040220badf65eee35dcfddeb9 +DIST libssh-0.8.3.tar.xz 422244 BLAKE2B b24e4eed3ad1cd336b1864c68e366788ea62d0df2d527afaabf8d57c2f3e7b490a999bee8e4bfbfac512a77ee2a32cb1a95dbcdbcef2bd8aad5addbed1aeb01f SHA512 09e7ccbb2c584a9e51366a43f08f80cc5775c649886736629ab10f3520432d107c93e94a54c7d7e49a68f8f3b5d268bf1985acbe08d29dbffbfc0c53a4937ea5 EBUILD libssh-0.7.4.ebuild 2510 BLAKE2B f644104dcf0707121f141a2b75bdb57935daf4a01d897b5ffb96d6875e681aecfd9730cd02d6330acdf96256f012643659951ca4cd97e2126bf6991fa88ab14e SHA512 1a7bf07e67bb6caf4a183095347fc512dcfcb98a729db2cc1416f39a3bb201ad3046eec7c82c3aa07c7a9f3c5e6b3d3e908a4d32252b0697bdc76173f287a8df EBUILD libssh-0.7.5-r2.ebuild 2720 BLAKE2B 76d98f803d58cdea91439451e4842c3079bc19c052845d4f18d27fbd94faf4f3028c244b9ccacbfc27edf87490cbad7af73c3f540f012b3c597ca3596f65c20e SHA512 80148669a5bdb2b0a1cdfdd295ef833ccd51270cfdc2986109b2a6b1bad5da3908642c89e929fed5dc2fda20d8104b3dace60c0d87c7c6450bace22d091efc82 EBUILD libssh-0.8.2.ebuild 2883 BLAKE2B f59deaa0db71faae34fb699be9102a6d5c7ac88722390cdf16de2cedbea66368bc102105e6d200edcbaa525f12e5a3553d9a4dc1a852dc45c2989bb3e11c99d8 SHA512 da54bac3c25d77bfbaa0d6d6a1ab84a5fa4d00581ac31cd26c95d26ad669cca65f8538a7829dda348828c9e445bad4953ac8722dc46d443cf5fb5aeb5344e206 -EBUILD libssh-9999.ebuild 2906 BLAKE2B ad375e522342393de0dc8d96c49cce0044f35710394a071d825ff138c76a52eb7d08df05b98a13386072a2ec9cc48ebe14971772cb53b538bdc1d8784c381778 SHA512 be74166f6b03ef623420f0b0263c5ceb6bb42068bedaf442958ba1cc394e05245ba891b598450a7b813ca03a246701f924ddb1fb382af074ab556b465a1723a1 +EBUILD libssh-0.8.3.ebuild 2916 BLAKE2B 93e0101f64f7a11d8a2a83295057cecc7a4cc8cfb9ef0acf49bf00cb6a89bfda5d0e83518d28d60ffddddb069e841b3575e69194373687b77794198ddadfe0d7 SHA512 04d6693527a5d9b97fac07acc487a2bea86b968dd7dafbd3607b5811bd1e1de2edea1e63c28d23e93ea87dd7f841b8e2bdbcb8aaa210378e5f2f90817cd61481 +EBUILD libssh-9999.ebuild 2916 BLAKE2B 93e0101f64f7a11d8a2a83295057cecc7a4cc8cfb9ef0acf49bf00cb6a89bfda5d0e83518d28d60ffddddb069e841b3575e69194373687b77794198ddadfe0d7 SHA512 04d6693527a5d9b97fac07acc487a2bea86b968dd7dafbd3607b5811bd1e1de2edea1e63c28d23e93ea87dd7f841b8e2bdbcb8aaa210378e5f2f90817cd61481 MISC metadata.xml 687 BLAKE2B 788f87388b4ab449521ab57684fa2c52393697e4e9826640473a1bc08bd886d384354362424c64a01a8d091c157610dbb4cebf80243bb4b73d125f47996f4f5f SHA512 95ca85fe4d9070acfeeb6a81505236e004d1e93464f9ba17d6d45968a4ab855121d67b4e09a54812063e924aa8b3a8e7ca3f13b68dc243b4fc0d062fb600fea8 diff --git a/net-libs/libssh/libssh-0.8.3.ebuild b/net-libs/libssh/libssh-0.8.3.ebuild new file mode 100644 index 000000000000..0c794b8a473e --- /dev/null +++ b/net-libs/libssh/libssh-0.8.3.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MY_P="${PN}-${PV/_rc/rc}" +inherit cmake-multilib + +DESCRIPTION="Access a working SSH implementation by means of a library" +HOMEPAGE="https://www.libssh.org/" + +if [[ "${PV}" == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git" +else + inherit eapi7-ver + SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux" +fi + +LICENSE="LGPL-2.1" +SLOT="0/4" # subslot = soname major version +IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib" +# Maintainer: check IUSE-defaults at DefineOptions.cmake + +REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )" + +RDEPEND=" + !gcrypt? ( + !mbedtls? ( + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) + ) + ) + gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) + gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen[dot] ) + test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] ) +" + +DOCS=( AUTHORS README ChangeLog ) + +S="${WORKDIR}/${MY_P}" + +PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" ) + +src_prepare() { + cmake-utils_src_prepare + + # just install the examples, do not compile them + cmake_comment_add_subdirectory examples + + # keyfile torture test is currently broken + sed -i \ + -e '/torture_keyfiles/d' \ + tests/unittests/CMakeLists.txt || die +} + +multilib_src_configure() { + local mycmakeargs=( + -DUNIT_TESTING="$(usex test)" + -DWITH_DEBUG_CALLTRACE="$(usex debug)" + -DWITH_DEBUG_CRYPTO="$(usex debug)" + -DWITH_GCRYPT="$(usex gcrypt)" + -DWITH_GSSAPI="$(usex gssapi)" + -DWITH_MBEDTLS="$(usex mbedtls)" + -DWITH_NACL=no + -DWITH_PCAP="$(usex pcap)" + -DWITH_SERVER="$(usex server)" + -DWITH_SFTP="$(usex sftp)" + -DWITH_STACK_PROTECTOR=OFF + -DWITH_STACK_PROTECTOR_STRONG=OFF + -DWITH_STATIC_LIB="$(usex static-libs)" + -DWITH_ZLIB="$(usex zlib)" + ) + + multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON ) + + cmake-utils_src_configure +} + +multilib_src_compile() { + cmake-utils_src_compile + multilib_is_native_abi && use doc && cmake-utils_src_compile docs +} + +multilib_src_install() { + cmake-utils_src_install + use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) + + # compatibility symlink until all consumers have been updated + # to no longer use libssh_threads.so + dosym libssh.so /usr/$(get_libdir)/libssh_threads.so +} + +multilib_src_install_all() { + use mbedtls && DOCS+=( README.mbedtls ) + einstalldocs + + if use examples; then + docinto examples + dodoc examples/*.{c,h,cpp} + fi +} diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild index 641c1853e986..0c794b8a473e 100644 --- a/net-libs/libssh/libssh-9999.ebuild +++ b/net-libs/libssh/libssh-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -23,6 +23,8 @@ SLOT="0/4" # subslot = soname major version IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib" # Maintainer: check IUSE-defaults at DefineOptions.cmake +REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )" + RDEPEND=" !gcrypt? ( !mbedtls? ( @@ -36,27 +38,21 @@ RDEPEND=" zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) + doc? ( app-doc/doxygen[dot] ) test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] ) " -REQUIRED_USE="?? ( gcrypt mbedtls )" - DOCS=( AUTHORS README ChangeLog ) S="${WORKDIR}/${MY_P}" -PATCHES=( - "${FILESDIR}/${PN}-0.8.0-tests.patch" -) +PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" ) src_prepare() { cmake-utils_src_prepare - # just install the examples do not compile them - sed -i \ - -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \ - CMakeLists.txt || die + # just install the examples, do not compile them + cmake_comment_add_subdirectory examples # keyfile torture test is currently broken sed -i \ @@ -77,28 +73,24 @@ multilib_src_configure() { -DWITH_SERVER="$(usex server)" -DWITH_SFTP="$(usex sftp)" -DWITH_STACK_PROTECTOR=OFF + -DWITH_STACK_PROTECTOR_STRONG=OFF -DWITH_STATIC_LIB="$(usex static-libs)" - -DWITH_STATIC_LIB="$(usex test)" -DWITH_ZLIB="$(usex zlib)" ) + multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON ) + cmake-utils_src_configure } multilib_src_compile() { cmake-utils_src_compile - multilib_is_native_abi && use doc && cmake-utils_src_compile doc + multilib_is_native_abi && use doc && cmake-utils_src_compile docs } multilib_src_install() { cmake-utils_src_install - - if multilib_is_native_abi && use doc ; then - docinto html - dodoc -r doc/html/. - fi - - use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh.a + use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) # compatibility symlink until all consumers have been updated # to no longer use libssh_threads.so @@ -106,6 +98,7 @@ multilib_src_install() { } multilib_src_install_all() { + use mbedtls && DOCS+=( README.mbedtls ) einstalldocs if use examples; then diff --git a/net-libs/nativebiginteger/Manifest b/net-libs/nativebiginteger/Manifest index 0b0625d4e033..38784a3cb1ad 100644 --- a/net-libs/nativebiginteger/Manifest +++ b/net-libs/nativebiginteger/Manifest @@ -7,5 +7,5 @@ AUX nativebiginteger-0.9.36-asmfix.patch 588 BLAKE2B 5bfc18fad9965210068df8cc86d DIST i2psource_0.8.7.tar.bz2 18473515 BLAKE2B 9f79cd2e69f26ba0fadc24b6cad0ff43301c65fd640313688687895de908c6a0c6fd9d1be6c82a6d7478cd4ecf633ce3b8fd4d200cce644512a7b4fa275a0927 SHA512 32b4eb4bf8bc7d6bb692b3ecd6b0a34c4d3d7c94b0d09a4ff330151979ccdaca9a6c88fef9b7e7965a1bba8ef54dbb710d89e0bb19265ee177ce547ff50ca969 DIST i2psource_0.9.36.tar.bz2 29856168 BLAKE2B 0f10101b874bf6fc8415f10b08282947962a6fb8c3eaefde67d3f250d65a159551c24038625aa6712e88b368ccae38d136314025ac19fcb9dd9145251283b357 SHA512 e9023cae1c7dbdd92c9c4823497dfa8497cee3683de1232deddbdc548ba08edefe218bd81e00e952d8a95037c32de8359daaf43c2d5f25c75aba65554d2d47b4 EBUILD nativebiginteger-0.8.7.ebuild 1760 BLAKE2B 2b5d1d3bccc75e254674b87f53563279dc474165f48d567e4e467dbcdb24f02c17f073e88ce597ff4948054af5e0f7d256109b3e90cd40cc0b83745ba190e5a4 SHA512 b6ea041425c3a69962dce78836aa0b0ec08d25cbbe513ddc9a0cf44cfb62d6686baf2491e600abe213b672d2fa675b7d1939284dc00b5210c8432c63426968ae -EBUILD nativebiginteger-0.9.36.ebuild 1312 BLAKE2B 37b70378b5bdc948b8bf7e7df56f4b30ed5ee49ec3a697ef138a953703c79d2e81f5c9ed0b3188185d3b2907bae01b993888c9c6777d0151668313459a8ba3d1 SHA512 833b437b2ec891644617c766bad4d89cbabd2cbf5b5afc55a819ed2e041a6b07f06dc5a7d149faec10d9941b0fef220c1ecab8b24d3d91fb0a1929e478fe6b71 -MISC metadata.xml 256 BLAKE2B d4cddf1e47808cc6fed0829aa4bfe16d930ee2e12bb3e7355ed4871b41e42dac196735be01fe9b38464183039f2df7f88cdd26750461dc9a3268f9844e3373fd SHA512 26e53ead25d8fef36a3759518b200c6a4ea0fc24d2c1f054ed85772cba5644118b231438d723ca25c22a55ed2fcf54e2c467279c9f3b49b6c1ced9997e3f098c +EBUILD nativebiginteger-0.9.36.ebuild 1528 BLAKE2B 6743746aca34ab8a4032a968e5bf2e1036707055ec7bbfe1f5a8cb3a1956cd1f274437db14d3e99c0f1f0732f0302e4dfdb9eb69d6c7e76bff8ddfa81ef83f6f SHA512 c9e455cd73955dbc6a65f39e4c6d83ddf5680d879871893a01656313f72fd7fcb890fa7c2cac3faf85cd1fd9606c575727ce4a6251dab1a1dfefa0ce7c71a661 +MISC metadata.xml 357 BLAKE2B 226a850638c4dba950a9a5f323e318a517dae550e18744deba0bf1252e84341c7e981aed1969ffe38dd441600cd2ca8c10793e663b1263fd311a65aa22c3c69b SHA512 77ead199b8c319b85982036765c8371a888121b3264669afb0a09aba0c79e7587f8da6910a130f737e12d395216cc0d2400ebc8877ecf14cc9e6b9ae0c31e307 diff --git a/net-libs/nativebiginteger/metadata.xml b/net-libs/nativebiginteger/metadata.xml index 3800f75787af..df6b33c99127 100644 --- a/net-libs/nativebiginteger/metadata.xml +++ b/net-libs/nativebiginteger/metadata.xml @@ -2,7 +2,11 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>tommy@gentoo.org</email> - <name>Thomas Sachau (Tommy[D])</name> + <email>tharvik@gmail.com</email> + <name>Tharvik</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> </pkgmetadata> diff --git a/net-libs/nativebiginteger/nativebiginteger-0.9.36.ebuild b/net-libs/nativebiginteger/nativebiginteger-0.9.36.ebuild index d327fc138097..6e2963035dd2 100644 --- a/net-libs/nativebiginteger/nativebiginteger-0.9.36.ebuild +++ b/net-libs/nativebiginteger/nativebiginteger-0.9.36.ebuild @@ -7,7 +7,7 @@ inherit eutils toolchain-funcs multilib java-pkg-opt-2 DESCRIPTION="jbigi JNI library for net.i2p.util.NativeBigInteger java-class from I2P" HOMEPAGE="http://www.i2p2.de" -SRC_URI="http://mirror.i2p2.de/i2psource_${PV}.tar.bz2" +SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2" LICENSE="|| ( public-domain BSD MIT )" SLOT="0" @@ -15,18 +15,28 @@ KEYWORDS="~amd64 ~x86" IUSE="test" -RDEPEND="dev-libs/gmp" +RDEPEND="dev-libs/gmp:0=" DEPEND=" ${RDEPEND} - test? ( >=virtual/jdk-1.7 ) -" + test? ( >=virtual/jdk-1.7 )" -S=${WORKDIR}/i2p-${PV}/core +S="${WORKDIR}/i2p-${PV}/core" PATCHES=( "${FILESDIR}/${P}"-asmfix.patch ) +QA_PRESTRIPPED="usr/lib64/libjcpuid.so" + +QA_SONAME="usr/lib64/libjcpuid.so" + +pkg_setup() { + if use test; then + java-pkg-opt-2_pkg_setup + export JAVA_HOME=$(java-config -O) + fi +} + src_compile() { tc-export CC @@ -34,15 +44,13 @@ src_compile() { ../../build_jbigi.sh dynamic || die 'unable to build jbigi' - if use test - then + if use test; then cd "${S}/java/src" && ejavac -encoding UTF-8 net/i2p/util/NativeBigInteger.java || die 'unable to build tests' fi - if ( use amd64 || use x86 ) - then + if ( use amd64 || use x86 ); then cd "${S}/c/jcpuid" && ./build.sh || die 'unable to build jcpuid' @@ -51,15 +59,14 @@ src_compile() { src_test() { cd java/src && - java -Djava.library.path="${S}/c/jbigi/jbigi/src" net/i2p/util/NativeBigInteger || + $(java-config -J) -Djava.library.path="${S}/c/jbigi/jbigi/src" net/i2p/util/NativeBigInteger || die 'unable to pass tests' } src_install() { dolib c/jbigi/jbigi/src/libjbigi.so - if ( use amd64 || use x86 ) - then + if ( use amd64 || use x86 ); then newlib.so \ "c/jcpuid/lib/freenet/support/CPUInformation/libjcpuid-$(tc-arch)-linux.so" \ libjcpuid.so diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest index 837aabcdf311..2fa261ddb4b8 100644 --- a/net-libs/nodejs/Manifest +++ b/net-libs/nodejs/Manifest @@ -2,6 +2,7 @@ AUX gentoo-global-npm-config.patch 1511 BLAKE2B da2b127df9ac9babc87c1930272244e7 AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3a0b94c87c2a570967aec9d418544c182f2e93f28d2dbe564980a975856ca31ab8c115b28fb9374701889cbebe3bba73d4ac83a SHA512 abe27eab0beb3444186fb3c4ce3c67fbc05b684a606f8f8bc4a5bae570fd8fd988f1ad5d65c442842fb6c7b069dc6e3f82577ba6becb1d934ae1039dac074e03 DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b90da99f10d651a22838c041da07056df81204bb04ce8da083a080062509dcca4d1e3ac2250d651ead8a4cc025028 SHA512 6866608a43eb213f3b715ea0fcc28983fd959ab679c567a1b464f62acd936506f2bce88ea48a60209d8ef8d98259f4b47cd3434893eb4ff82a132775edb37b7b DIST node-v10.10.0.tar.xz 19960760 BLAKE2B dc16e2afba4be727c5169ac5cd77324e0e8d7270c96da141da21a175cfbd64a38f7b51b86264396f3866174abc9095f7c840303208f7193739a1970818d4ff3a SHA512 482518a72cb0bdd5d987a7855856eadaa4fecea933ff7791918edf3097588246782d86b27568c06764ef9f2bca62b64a4d65e4cbd0e934931a72dc5719db7446 +DIST node-v10.11.0.tar.xz 20144576 BLAKE2B 956d940554748f420589adab0f14bd6fcc6a4781cdecd537abd6eb9aa43e9cf754ef009b20d416f1ef4c9a01ef91a27a59a8c080c1c0a49a59388f75713d6286 SHA512 00a678a829de9b836e77dd0806799029b657cf000369ca653540d7e1b82c3895da43dbbfe4d3c2b3b2b1e711bf55b3835a351fad18affdd0c25dcceea8e3406c DIST node-v10.9.0.tar.xz 19987812 BLAKE2B 4a5bd257cd527500b691b15d177bde53158b5e46e710ffeaa45224bae821cfaffdf59f24ad6bdc822cf468b90c1a4422a2f82d29e1d4b2dc0f838e3e0ab5b4ac SHA512 19c7366b4c9d1e255b5ac56e974ff86b9ca87c363534b467ecc3c59e170b891e86c479a2bcda6647c6df686b018caaedea84270e848b93a4f1c80ff04af12461 DIST node-v4.8.7.tar.xz 13370828 BLAKE2B b1ee93a586b66f8582783b1be50667547afe4bf48038ebc0b8148db55542cbc0520ac84ef88e4a7f453cabc245f484c32dbc238c1932bbc708791ceeb5c9d2ab SHA512 25837a31023747723b146c45984a5b2096b61c0aa43cbf45fc8ff50b4bd5079bd0bc9f1dfd3fb076817448dc5537eb93ffb2f345280b7756ba93b67ad757c696 DIST node-v4.9.1.tar.xz 13250164 BLAKE2B 7a689b99bb4bf507f7f21dd2c096a5766d023a8174c0f468cab37365af1920b8700da04157e1a406917790524255ef32c243a74662fd50ef7d3567d189dac9cf SHA512 690c9fdf608e5194069a10955bdd94ec87cb1c308f13bc4d2cae92fa01436ace10fadf58f2e51d477dde6c570b23edc1c71fafea79bfc9cab2903eb2fa5f87aa @@ -11,6 +12,7 @@ DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d DIST node-v9.11.2.tar.xz 18507832 BLAKE2B f5ef210632065f2c99dbe3fd210fa832bdd09670dd8bd736dce2c7ab2fc87c3a717cda11c2a09c325b25a72d99431cbc79c0ee7c202ece5fc41786f1f0aa68e4 SHA512 ca49a1f3aaa8b25faa62c411a96551c8977bb43a22f8f171f27d3585306f379b6a12e55e60ddca04a6f2f8c62a1b3fed9e66c02898d80bf7ca59278536e04c13 EBUILD nodejs-0.12.18.ebuild 3435 BLAKE2B 2fd0c799325e0def135f2618901aee64fd5d950aabe64b4ce52d3d525ce08a7581c68b60fe2e84773e04a0c101d873efe7cbfb08020a0b6f384649d0a265e182 SHA512 6d9a761e4fc8cd35899a10f57e47f00c1222c6573246756599c702e17885422a253b6906b1fc119d4298e562f6bc9994c89f59a405021bed1f6e03c4f53d88f0 EBUILD nodejs-10.10.0.ebuild 6353 BLAKE2B fdb46cd02319dff1cce1b3c19523998da5b7d6ea69058f9b9f3763f093614a84b4dab91151797ce32d529b41d227a051ba489b3c41cffdf3597816bd1a9b926b SHA512 58a08d3e3d69784c41dccb32a3a7cced78e112ae8f30d86ea0d865255292941f953bca23a22bfb8a8a66135a688fe4c87f6af87f0526dc716ce177ab0f41ec66 +EBUILD nodejs-10.11.0.ebuild 6353 BLAKE2B 844b108d90a89a4fc70e1294b3e1efc4181a3555787a3446806ed62b79685a07544184da74face287074af67d2ec8abb9b1a91f3d0370b0d48d7185d1b7015ed SHA512 606e610f800ce9792d689fc813fdc09270ced425b4e76e07e8767853c33041f69d5cfa117976cf583c2bb811cfabf9ab2f86a287ed25b8bff9af4618bcd92660 EBUILD nodejs-10.9.0.ebuild 6353 BLAKE2B 7eb578378be767b686b216346f8f138dc26fe1e50308dc39d6a7add18fe2d8e51f7020b38b70b9aca0844d3523c08b052f513b22adb73bd0a2663893ae596380 SHA512 b09ab8e4c6248dc7512a5ad06bc53f551c71c3ba32ccd4cbca58e451aac432d6000f9686d7e45ffcb9363c5e49d16412c38b9508d12546b8cea626d39f20bc97 EBUILD nodejs-4.8.7.ebuild 4424 BLAKE2B fa72291c5b44ce0ba1a592b329be2cd9afa3539bf8419be567c457ef223d4ef3db32ae612795da32345c69bb8b141c350b312989df2869fea37e5ecd5afe44bd SHA512 461f777fac4899b55829edc55961ac021cbe6569fcec87bdb842c8a8b3db117ef74b0ec1e1ff01264f74ee71153e6a771d94d9bbea8fee753c1ea53b8c26dc9e EBUILD nodejs-4.9.1.ebuild 4425 BLAKE2B c5167cf5f59209054cac22f49fd60803001d39949caf1be2f1c49356726884ec5e853be95eee3173548c1d6668aadc0b1f470c44b95150d959fcd33638614f63 SHA512 23280279876f8e8fa37e764bac0f9049b2fc32d1c405a5d5dc8136e92dac1b896c82944b713fdc99daa35806f814ef15f2b63debeb8bc5a2bccf6b8099c8c31e @@ -19,4 +21,4 @@ EBUILD nodejs-6.14.4.ebuild 6157 BLAKE2B 78f63916625998dce844d3bef4f45f4796e183a EBUILD nodejs-8.12.0.ebuild 6366 BLAKE2B 590769fb2ede5b40fb988057f55dcccf8b2cbd309948df364dfaf96ee6089544469b140265dadba511ee6779fe70a4c7c6d319680f88447f56855b92f039f239 SHA512 d5eca1c4ff0401077e80a14cc057d60e09f8ef98ef0700cf3138a8b28867ab929b5ca6bd6c6681bab69a77d4ee68c4ae4add21d52904f22d633c331283252aa2 EBUILD nodejs-9.11.2.ebuild 6348 BLAKE2B 8e74887ad5e17570c3ecdb608ff21a22813b53d3049de6a608d8a71fcd562fc8f96208601c390861a4ec0c05b4d7219131da93e35e82bb96fde7fa54921c5793 SHA512 6fdd51157c30021589e7d6c2637ce02d376f3e80da578ff1bcefdb3d2473ef689d8fca02c49e1673245a158a90d19af7cf45241d8190d0b76e563c1bedee8449 EBUILD nodejs-99999999.ebuild 6267 BLAKE2B 2858d03713127b51e3897909454354ee34f3ba11273972cf62cad065faa3a571bb1d17c7353ecc3487e9e8809bae45caa9898a05bf7c1871b13cc6bc7d7668ac SHA512 8a8f375e96f33b6c85f7c188b488586c4193708b9d3618e4f83d3f562bfd55baf8034b61b15b8e003611c6209787339adfd07358237b70250de376b1612d0a06 -MISC metadata.xml 581 BLAKE2B cc99932eb293981a0b4e1f48a5fc2289b0b932545efaf00fdfbec10aeb52d95d7ad02268560495386992ff543e043591102415ffac04209b4d473b61a6528f3d SHA512 eb9bf78b19041213354232372bf9f31b8c73073b369abd83d1a399466ecf6f647da60ff393093dd16ade8aa6254bc782ab55cb2a655b0d685a04d84fc13d2706 +MISC metadata.xml 473 BLAKE2B c5c4f0ad6470bd70570d1f547d1355977be676a252416f3fe005733386fa84536aaac9b8e93fb70405fd76608ab2df281c586d80a2f9cc443acd5ca26dc8752a SHA512 f2911891d28329b3f6a21b56976f1507939bd51cb65581f73c2b5716c4610551cbc225450755be2e649e2070e1810ef41ca641d105155ceb1847e9a93ad2ee85 diff --git a/net-libs/nodejs/metadata.xml b/net-libs/nodejs/metadata.xml index 9ef4641644a5..aaaba184187b 100644 --- a/net-libs/nodejs/metadata.xml +++ b/net-libs/nodejs/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>patrick@gentoo.org</email> - <name>Patrick Lauer</name> - </maintainer> - <maintainer type="person"> <email>jer@gentoo.org</email> </maintainer> <use> diff --git a/net-libs/nodejs/nodejs-10.11.0.ebuild b/net-libs/nodejs/nodejs-10.11.0.ebuild new file mode 100644 index 000000000000..8830ea2264cd --- /dev/null +++ b/net-libs/nodejs/nodejs-10.11.0.ebuild @@ -0,0 +1,201 @@ +# 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 ) + npm? ( ssl ) +" + +RDEPEND=" + >=dev-libs/libuv-1.23.0:= + >=net-libs/http-parser-2.8.0:= + >=net-libs/nghttp2-1.33.0 + sys-libs/zlib + icu? ( >=dev-libs/icu-62.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 <command>" +} diff --git a/net-libs/ntirpc/Manifest b/net-libs/ntirpc/Manifest index dcdd1c2447b2..c11025ce8086 100644 --- a/net-libs/ntirpc/Manifest +++ b/net-libs/ntirpc/Manifest @@ -1,3 +1,5 @@ DIST ntirpc-1.6.1.tar.gz 397485 BLAKE2B 2dcc4c3a14eff55b4db52f297b65a48d5dff46ef4b1659912c65ca9104958cca02d542bb3b72f2ce63993414c5d53bb9716b1b1d4ce4b335735ee99da77f3770 SHA512 d176fbe71f1f66e5ee477c1ec2722b77742d36d67856eb4029f1b01474b08349171779a9943c0039d2a30e05debc9ab389d92ea137eabb4d7737fc91e47b0b24 +DIST ntirpc-1.7.0.tar.gz 373195 BLAKE2B 5cfb6c16d1fa3569d37a6b8f51990dd18e713aaaf0f6e6309c36fb8b0bdb6fa0dfcfa81f0e9e185c18dac5b6d422bd9d1b796b245b3dfa519b0f53300ce5c725 SHA512 84fdf62b8a72bcf1b90854536df3c1e3f06c58858d7a2403ee6c085f8585a5d389921a2feb9e0f27ef238dea3a36a9c94b66ea582f290168a8ed21405a452723 EBUILD ntirpc-1.6.1.ebuild 745 BLAKE2B 6e27521646f75937f2133353f0cee42c9197ce40691275ecb09f17f4807992318f16549bf0cea56af7bb6b37a793de213ef99921454aa0602cb6265d21c7523d SHA512 63fddc3d67d9ec404c9d3bb6f7187a61973558997e5e5cd81692b2516d32dbdf0705d530647748b671ccbf78004f0e761f93e8874d8a56509fcbb460cc671595 +EBUILD ntirpc-1.7.0.ebuild 742 BLAKE2B 6c65b2bb30cde7ee1d36fffaaa93fa4ab7afed246d90de97e3410847e0680bddc27a61e30af8cbfd3000d1ce320dc4a179a2d235fda183c36e20d61589341e67 SHA512 8d3a8a5131dea9db88ab3d7a34957478f44e8e628cf176419840fda945c4de02ddfad777c4f3095839b83a8021bd73c05722ab255f78b64525b79ab2dda611dd MISC metadata.xml 427 BLAKE2B ffd3f6c32d343557e17c17eb78cff8a0a14f93a2298cf607169ebbc1d618cbe30df849c6f3b8dc4b34d7e1a17920e9d0b1483523d4b2b2ff481068c0de5a8317 SHA512 99f5af46839fbf52e5217cf831a7a95fa3f5d501d61ff63488aa7989e0ec98151b2f94607a39f879e0e5b0ba79bc732ee7224a9e4196ff9a40fa13253ece0b0c diff --git a/net-libs/ntirpc/ntirpc-1.7.0.ebuild b/net-libs/ntirpc/ntirpc-1.7.0.ebuild new file mode 100644 index 000000000000..07720adb2490 --- /dev/null +++ b/net-libs/ntirpc/ntirpc-1.7.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit cmake-multilib + +DESCRIPTION="Transport Independent RPC library for nfs-ganesha" +HOMEPAGE="https://github.com/nfs-ganesha/ntirpc" +SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gssapi rdma" + +# Since the GSS option only controls some extra files to be enabled, +# there's nothing to list in the depend string for it. +RDEPEND="app-crypt/mit-krb5 + net-libs/libnsl + rdma? ( sys-fabric/librdmacm )" +DEPEND="${RDEPEND}" + +multilib_src_configure() { + local mycmakeargs=( + -DUSE_GSS="$(usex gssapi)" + -DUSE_RPC_RDMA="$(usex rdma)" + ) + cmake-utils_src_configure +} |