gentoo resync : 07.07.2018

4 files changed, 143 insertions, 0 deletions

diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
index 36f495082d75..14c00d7e3997 100644
--- a/net-libs/libtorrent/Manifest
+++ b/net-libs/libtorrent/Manifest
@@ -1,3 +1,5 @@
+AUX libtorrent-0.13.7-execinfo-configure.patch 907 BLAKE2B 7af92d6e3901a8683f86a61e27072ab0d002d54a30bcb756cc9c0fb56621b09cada5bae2ccd7149fa18f98ebcb01544eea6eb0ab0dba71706c6208944b1d1111 SHA512 4bf8c5063f82833f84da6cef56bd892d77bba30d66a2fff4e4705629dfedb222fd025001ae78841d0ccff67d5b9f14ba46d5b569332a03eeab2f78331a254f89
+AUX libtorrent-0.13.7-kqueue-configure.patch 1439 BLAKE2B f7a55999fe7760ad7edf9b1d6e2b3d64e457a115517d8f188ff3ffa6f0e32bf9039b5c8fd690345955b46f902c013aa1be05ef0a2f4729eb9f283f9972540e61 SHA512 795789be85bd461d907d52884a6fe9ef2f7e100b27d5aba0920bf7d56b5e812391796f277c02f9246c3b792a43e1f25144a4f4064a4c68b436a03c2a287623af
 AUX libtorrent-0001-Fix-the-DH-parameters-generation-with-OpenSSL-1.1.patch 3172 BLAKE2B 2a56ba61b9516b3cf430a79c146c81bd2934449fd46f85bc41ecfc5032faba58cdde86233790bf9d456b28f6760132096188afaeca5b8356ce586e6ad9fbd494 SHA512 e427b4b96a92e1dbbb8883d84688984b9ec7c6815f333bca8a0ad0a8a32b25766100a8182a3d11720563d376501f64b71d86d92379450e41da706dd47e0381d5
 AUX libtorrent-cppunit.patch 1023 BLAKE2B 3d9b3191c1207e1a38a55aeb233e13f8a84e0fcb34e5b8b13801224dac916e730a2c9d1620ca3ebe559a44d04a0d0051e7383071f25a5d5e560a5e141f81e93d SHA512 0f4c22c647a13a3ef80f79f12b04b08f797cbb3a50be48102a7258b7167e943dcc26f5ae26e3ff827b74709d2a6e2981fa131f7baefb6cf79467930e9533113f
 AUX libtorrent-openssl-1.1-part2.patch 1902 BLAKE2B 1d0e405a0a72be250c7a79e410860d8a0afefda3f574d3854469620157d1a3184d63d902af9694d27c786728beb45d93225c09a8b427edf630675fe251d63298 SHA512 baee88e7609fe3976d59bd220c545473a336765fe9f618502cbc6450b43f8c384b56afeea379d42b2f2ee748ab088badb841140d2ea82a91b9f34cd25ff05ef3
@@ -7,5 +9,6 @@ DIST libtorrent-0.13.7.tar.gz 782854 BLAKE2B 940e6162567d391f3d05034bf6d7d55a400
 EBUILD libtorrent-0.13.6-r1.ebuild 1723 BLAKE2B e44859672997bfa57b8023b77a8ed5a3242c54399e36796efabab19f0aef05190b4824c50bd85cb93abad7ce61162d50fe77020b87e491212c62dbf03a04e81a SHA512 77536744824d8fdd01e80a8c3ccba6e2f94b6f225939da940aeb092efe939b117756add5874cedbcabd23e2e17c69d10472cd63f1dbf56864b09c1df7ad94f3d
 EBUILD libtorrent-0.13.6-r2.ebuild 1944 BLAKE2B 978da5af4a45f8b93b3d8b7c16f03f52ef44d9f4c4300d8a1403e9b3b43e4581b37c445d8223f814981fa37f8bdf0d40fb592d7063a868346e3bd799bee5d90f SHA512 28f45a819da82ec6af8c51ab7713f8f32a19486f7836fc0affe8859a846515467b9498987e6af44cac3d2f6e90b81a333dedd513e9323d980e2af5844d071739
 EBUILD libtorrent-0.13.6.ebuild 1336 BLAKE2B e98ec085623bfc322acd68dd2367b7e6bedb497b3ccdf914e19089108468db1ad16cef264b5423e2c8ea355e1eca398a418f9ecfa877a5d7865b0d2f1c740af3 SHA512 2e240a54774583deb1a43e3b26eb58f209885b894fc9dab5469b10d06e80cbf8aa94de57184c3be3faf60a7839b6003687c1c5bb463bf9594e688fb791e97bfa
+EBUILD libtorrent-0.13.7-r1.ebuild 2019 BLAKE2B 79334ae020fc24c83cea12af9e7989d7a3c6042896a7a679587bf59606fd88d7c0773e565ee1bed13850111412cad9d193dfd84def9713dffd9c0ed4fc3e395d SHA512 84c50b4272f383005066b01f1f616bcc6d6be32da297d420b38f2dd5368221b7a4a6f8d65c256520af8cdf778f4c6d970d05bccb6d49308e9dbeab89e1d7d975
 EBUILD libtorrent-0.13.7.ebuild 1881 BLAKE2B 9d3da29480ade423da553d47232dd23ae84fb31fb468492f6f80bc9869799c581194c8b5d93ed41844955adf24158cbc1e1ef52d0b00c8a8ddadfe093306938c SHA512 2c6b7628a15bc5b2ad22e9d06e502fe8916980191b985f0ae304536ce5bc1d8dd11b61d41780baf54a2b7ed7635bd9f695b68fbd2c6ec1d54f2ea6152802bef2
 MISC metadata.xml 443 BLAKE2B 2a25f3804cf9c29cd16835e22dd67e7a94fe2dbce0c7c4a85e0a9042a79f798349a55f1282d6c92b19afbb10120d9e9b5a30e03f082d90b622593ee7d8fa5e67 SHA512 32c9f1b9d21fb99768d60d842a49a80a844f8a6ea94c012a97fa94369916a2fd6df0965dbb394e0de2360c79c01355f8a4872b2d0032b3eef5c6a4490c53ef82
diff --git a/net-libs/libtorrent/files/libtorrent-0.13.7-execinfo-configure.patch b/net-libs/libtorrent/files/libtorrent-0.13.7-execinfo-configure.patch
new file mode 100644
index 000000000000..1865e48992c4
--- /dev/null
+++ b/net-libs/libtorrent/files/libtorrent-0.13.7-execinfo-configure.patch
@@ -0,0 +1,24 @@
+From f4dadb3850ef15dd7898d07fca72d2fa7e32ca6f Mon Sep 17 00:00:00 2001
+From: Stephen Shkardoon <ss23@ss23.geek.nz>
+Date: Mon, 25 Jun 2018 20:05:18 +1200
+Subject: [PATCH] Use AC_COMPILE instead of AC_RUN to check for execinfo.h
+
+This way enables cross compiling, since we don't need to run anything
+during the configure script.
+---
+ scripts/common.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/common.m4 b/scripts/common.m4
+index ff023928..b6d051f5 100644
+--- a/scripts/common.m4
++++ b/scripts/common.m4
+@@ -153,7 +153,7 @@ dnl   Need to fix this so that it uses the stuff defined by the system.
+ AC_DEFUN([TORRENT_CHECK_EXECINFO], [
+   AC_MSG_CHECKING(for execinfo.h)
+ 
+-  AC_RUN_IFELSE([AC_LANG_SOURCE([
++  AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+       #include <execinfo.h>
+       int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}
+       ])],
diff --git a/net-libs/libtorrent/files/libtorrent-0.13.7-kqueue-configure.patch b/net-libs/libtorrent/files/libtorrent-0.13.7-kqueue-configure.patch
new file mode 100644
index 000000000000..af8e53ddd233
--- /dev/null
+++ b/net-libs/libtorrent/files/libtorrent-0.13.7-kqueue-configure.patch
@@ -0,0 +1,46 @@
+From 755daf78769b048c868e6b62c68b4e545494c181 Mon Sep 17 00:00:00 2001
+From: Stephen Shkardoon <ss23@ss23.geek.nz>
+Date: Thu, 21 Jun 2018 14:38:30 +1200
+Subject: [PATCH] Modify configure to prevent unnecessary kqueue checks
+
+By only running the TORRENT_CHECK_KQUEUE_SOCKET_ONLY check if kqueue support
+is already detected, we increase the number of platforms that we can
+cross compile on.
+Otherwise, the cross compilation fails due to TORRENT_CHECK_KQUEUE_SOCKET_ONLY
+using AC_RUN_IFELSE, which fails during cross compilation.
+---
+ scripts/checks.m4 | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/scripts/checks.m4 b/scripts/checks.m4
+index 8d77fc5e..c9333561 100644
+--- a/scripts/checks.m4
++++ b/scripts/checks.m4
+@@ -88,6 +88,7 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [
+     [
+       AC_DEFINE(USE_KQUEUE, 1, Use kqueue.)
+       AC_MSG_RESULT(yes)
++      TORRENT_CHECK_KQUEUE_SOCKET_ONLY
+     ], [
+       AC_MSG_RESULT(no)
+     ])
+@@ -137,7 +138,6 @@ AC_DEFUN([TORRENT_WITH_KQUEUE], [
+     [
+         if test "$withval" = "yes"; then
+           TORRENT_CHECK_KQUEUE
+-          TORRENT_CHECK_KQUEUE_SOCKET_ONLY
+         fi
+     ])
+ ])
+@@ -149,11 +149,9 @@ AC_DEFUN([TORRENT_WITHOUT_KQUEUE], [
+     [
+       if test "$withval" = "yes"; then
+         TORRENT_CHECK_KQUEUE
+-        TORRENT_CHECK_KQUEUE_SOCKET_ONLY
+       fi
+     ], [
+         TORRENT_CHECK_KQUEUE
+-        TORRENT_CHECK_KQUEUE_SOCKET_ONLY
+     ])
+ ])
+ 
diff --git a/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild b/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild
new file mode 100644
index 000000000000..9b0f0ae7df4d
--- /dev/null
+++ b/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="BitTorrent library written in C++ for *nix"
+HOMEPAGE="https://rakshasa.github.io/rtorrent/"
+SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+
+# The README says that the library ABI is not yet stable and dependencies on
+# the library should be an explicit, syncronized version until the library
+# has had more time to mature. Until it matures we should not include a soname
+# subslot.
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="debug libressl ssl test"
+
+RDEPEND="
+	sys-libs/zlib
+	>=dev-libs/libsigc++-2.2.2:2
+	ssl? (
+	    !libressl? ( dev-libs/openssl:0= )
+	    libressl? ( dev-libs/libressl:= )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/cppunit"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0001-Fix-the-DH-parameters-generation-with-OpenSSL-1.1.patch"
+	"${FILESDIR}/${PN}-openssl-1.1-part2.patch"
+	"${FILESDIR}/${PN}-openssl-1.1-part3.patch"
+	"${FILESDIR}/${PN}-0.13.7-kqueue-configure.patch"
+	"${FILESDIR}/${PN}-0.13.7-execinfo-configure.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# bug 518582
+	local disable_instrumentation
+	echo -e "#include <inttypes.h>\nint main(){ int64_t var = 7; __sync_add_and_fetch(&var, 1); return 0;}" > "${T}/sync_add_and_fetch.c" || die
+	$(tc-getCC) ${CFLAGS} -o /dev/null -x c "${T}/sync_add_and_fetch.c" >/dev/null 2>&1
+	if [[ $? -ne 0 ]]; then
+		disable_instrumentation="--disable-instrumentation"
+	fi
+
+	# configure needs bash or script bombs out on some null shift, bug #291229
+	CONFIG_SHELL=${BASH} econf \
+		--enable-aligned \
+		$(use_enable debug) \
+		$(use_enable ssl openssl) \
+		${disable_instrumentation} \
+		--with-posix-fallocate \
+		--with-zlib="${EROOT%/}/usr/"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete
+}