public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libtorrent/files/, net-libs/libtorrent/
@ 2018-05-20 13:46 Jason Zaman
  0 siblings, 0 replies; 7+ messages in thread
From: Jason Zaman @ 2018-05-20 13:46 UTC (permalink / raw
  To: gentoo-commits

commit:     c02b0a1017107506f92c6f705bf2b5c9bcada806
Author:     Stephen Shkardoon <ss23 <AT> ss23 <DOT> geek <DOT> nz>
AuthorDate: Sun May 20 07:42:12 2018 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun May 20 13:45:46 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c02b0a10

net-libs/libtorrent: support openssl-1.1

Closes: https://bugs.gentoo.org/655696

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 ...DH-parameters-generation-with-OpenSSL-1.1.patch | 105 +++++++++++++++++++++
 net-libs/libtorrent/files/libtorrent-cppunit.patch |  36 +++++++
 .../files/libtorrent-openssl-1.1-part2.patch       |  57 +++++++++++
 .../files/libtorrent-openssl-1.1-part3.patch       |  68 +++++++++++++
 net-libs/libtorrent/libtorrent-0.13.6-r2.ebuild    |  69 ++++++++++++++
 5 files changed, 335 insertions(+)

diff --git a/net-libs/libtorrent/files/libtorrent-0001-Fix-the-DH-parameters-generation-with-OpenSSL-1.1.patch b/net-libs/libtorrent/files/libtorrent-0001-Fix-the-DH-parameters-generation-with-OpenSSL-1.1.patch
new file mode 100644
index 00000000000..55d0cb901b7
--- /dev/null
+++ b/net-libs/libtorrent/files/libtorrent-0001-Fix-the-DH-parameters-generation-with-OpenSSL-1.1.patch
@@ -0,0 +1,105 @@
+From 4607bbf78040789dee29266878ce109136b984ef Mon Sep 17 00:00:00 2001
+From: rakshasa <sundell.software@gmail.com>
+Date: Tue, 20 Dec 2016 19:51:02 +0900
+Subject: [PATCH] Added support for openssl 1.1.
+
+---
+ configure.ac                |  4 ++++
+ src/utils/diffie_hellman.cc | 36 ++++++++++++++++++++++++++++++++++--
+ 2 files changed, 38 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 65e34872..27e33570 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -69,12 +69,15 @@ AC_ARG_ENABLE(openssl,
+   [  --disable-openssl       Don't use OpenSSL's SHA1 implementation.],
+   [
+     if test "$enableval" = "yes"; then
++dnl move to scripts.
+       PKG_CHECK_MODULES(OPENSSL, libcrypto,
+         CXXFLAGS="$CXXFLAGS $OPENSSL_CFLAGS";
+         LIBS="$LIBS $OPENSSL_LIBS")
+ 
+       AC_DEFINE(USE_OPENSSL, 1, Using OpenSSL.)
+       AC_DEFINE(USE_OPENSSL_SHA, 1, Using OpenSSL's SHA1 implementation.)
++      AC_CHECK_LIB([crypto], [DH_set0_pqg], [AC_DEFINE(USE_OPENSSL_1_1, 1, Using OpenSSL 1.1.)])
++
+     else
+       AC_DEFINE(USE_NSS_SHA, 1, Using Mozilla's SHA1 implementation.)
+     fi
+@@ -85,6 +88,7 @@ AC_ARG_ENABLE(openssl,
+ 
+     AC_DEFINE(USE_OPENSSL, 1, Using OpenSSL.)
+     AC_DEFINE(USE_OPENSSL_SHA, 1, Using OpenSSL's SHA1 implementation.)
++    AC_CHECK_LIB([crypto], [DH_set0_pqg], [AC_DEFINE(USE_OPENSSL_1_1, 1, Using OpenSSL 1.1.)])
+   ]
+ )
+ 
+diff --git a/src/utils/diffie_hellman.cc b/src/utils/diffie_hellman.cc
+index aa653d45..7ec13165 100644
+--- a/src/utils/diffie_hellman.cc
++++ b/src/utils/diffie_hellman.cc
+@@ -54,11 +54,23 @@ DiffieHellman::DiffieHellman(const unsigned char *prime, int primeLength,
+   m_secret(NULL), m_size(0) {
+ 
+ #ifdef USE_OPENSSL
++
+   m_dh = DH_new();
++
++#ifdef USE_OPENSSL_1_1
++  BIGNUM * const dh_p = BN_bin2bn(prime, primeLength, NULL);
++  BIGNUM * const dh_g = BN_bin2bn(generator, generatorLength, NULL);
++
++  if (dh_p == NULL || dh_g == NULL ||
++      !DH_set0_pqg(m_dh, dh_p, NULL, dh_g))
++	  throw internal_error("Could not generate Diffie-Hellman parameters");
++#else
+   m_dh->p = BN_bin2bn(prime, primeLength, NULL);
+   m_dh->g = BN_bin2bn(generator, generatorLength, NULL);
++#endif
+ 
+   DH_generate_key(m_dh);
++
+ #else
+   throw internal_error("Compiled without encryption support.");
+ #endif
+@@ -74,7 +86,19 @@ DiffieHellman::~DiffieHellman() {
+ bool
+ DiffieHellman::is_valid() const {
+ #ifdef USE_OPENSSL
++  if (m_dh == NULL)
++    return false;
++
++#ifdef USE_OPENSSL_1_1
++  const BIGNUM *pub_key;
++
++  DH_get0_key(m_dh, &pub_key, NULL);
++
++  return pub_key != NULL;
++#else
+   return m_dh != NULL && m_dh->pub_key != NULL;
++#endif
++
+ #else
+   return false;
+ #endif
+@@ -103,8 +127,16 @@ DiffieHellman::store_pub_key(unsigned char* dest, unsigned int length) {
+ #ifdef USE_OPENSSL
+   std::memset(dest, 0, length);
+ 
+-  if ((int)length >= BN_num_bytes(m_dh->pub_key))
+-    BN_bn2bin(m_dh->pub_key, dest + length - BN_num_bytes(m_dh->pub_key));
++  const BIGNUM *pub_key;
++
++#ifdef USE_OPENSSL_1_1
++  DH_get0_key(m_dh, &pub_key, NULL);
++#else
++  pub_key = m_dh->pub_key;
++#endif
++
++  if ((int)length >= BN_num_bytes(pub_key))
++    BN_bn2bin(pub_key, dest + length - BN_num_bytes(pub_key));
+ #endif
+ }
+ 

diff --git a/net-libs/libtorrent/files/libtorrent-cppunit.patch b/net-libs/libtorrent/files/libtorrent-cppunit.patch
new file mode 100644
index 00000000000..eed21733b29
--- /dev/null
+++ b/net-libs/libtorrent/files/libtorrent-cppunit.patch
@@ -0,0 +1,36 @@
+From b8b24b58a9bed6db1c886ea71a9bb407fb41fc2f Mon Sep 17 00:00:00 2001
+From: rakshasa <sundell.software@gmail.com>
+Date: Sun, 23 Oct 2016 08:54:11 +0900
+Subject: [PATCH] Use pkg-config for cppunit.
+
+---
+ configure.ac | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2b3eb7ab..65e34872 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,7 +19,6 @@ AC_SUBST(LIBTORRENT_INTERFACE_VERSION_NO)
+ 
+ AM_INIT_AUTOMAKE
+ AC_CONFIG_HEADERS(config.h)
+-AM_PATH_CPPUNIT(1.9.6)
+ 
+ AC_PROG_CXX
+ 
+@@ -60,9 +59,11 @@ CC_ATTRIBUTE_VISIBILITY
+ AX_PTHREAD
+ AX_CHECK_ZLIB
+ 
+-CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
+-CXXFLAGS="$PTHREAD_CFLAGS $CXXFLAGS"
+-LIBS="$PTHREAD_LIBS $LIBS"
++PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
++
++CFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CFLAGS"
++CXXFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CXXFLAGS"
++LIBS="$PTHREAD_LIBS $CPPUNIT_LIBS $LIBS"
+ 
+ AC_ARG_ENABLE(openssl,
+   [  --disable-openssl       Don't use OpenSSL's SHA1 implementation.],

diff --git a/net-libs/libtorrent/files/libtorrent-openssl-1.1-part2.patch b/net-libs/libtorrent/files/libtorrent-openssl-1.1-part2.patch
new file mode 100644
index 00000000000..60542e4b446
--- /dev/null
+++ b/net-libs/libtorrent/files/libtorrent-openssl-1.1-part2.patch
@@ -0,0 +1,57 @@
+From 43213fecfad863e2c9e47accde9b76496ff6d1e5 Mon Sep 17 00:00:00 2001
+From: rakshasa <sundell.software@gmail.com>
+Date: Sun, 25 Dec 2016 11:58:04 +0900
+Subject: [PATCH] Cleaned up openssl automake script.
+
+---
+ configure.ac | 37 ++-----------------------------------
+ 1 file changed, 2 insertions(+), 35 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 27e33570..33f755c9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -65,41 +65,8 @@ CFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CFLAGS"
+ CXXFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CXXFLAGS"
+ LIBS="$PTHREAD_LIBS $CPPUNIT_LIBS $LIBS"
+ 
+-AC_ARG_ENABLE(openssl,
+-  [  --disable-openssl       Don't use OpenSSL's SHA1 implementation.],
+-  [
+-    if test "$enableval" = "yes"; then
+-dnl move to scripts.
+-      PKG_CHECK_MODULES(OPENSSL, libcrypto,
+-        CXXFLAGS="$CXXFLAGS $OPENSSL_CFLAGS";
+-        LIBS="$LIBS $OPENSSL_LIBS")
+-
+-      AC_DEFINE(USE_OPENSSL, 1, Using OpenSSL.)
+-      AC_DEFINE(USE_OPENSSL_SHA, 1, Using OpenSSL's SHA1 implementation.)
+-      AC_CHECK_LIB([crypto], [DH_set0_pqg], [AC_DEFINE(USE_OPENSSL_1_1, 1, Using OpenSSL 1.1.)])
+-
+-    else
+-      AC_DEFINE(USE_NSS_SHA, 1, Using Mozilla's SHA1 implementation.)
+-    fi
+-  ],[
+-    PKG_CHECK_MODULES(OPENSSL, libcrypto,
+-      CXXFLAGS="$CXXFLAGS $OPENSSL_CFLAGS";
+-      LIBS="$LIBS $OPENSSL_LIBS")
+-
+-    AC_DEFINE(USE_OPENSSL, 1, Using OpenSSL.)
+-    AC_DEFINE(USE_OPENSSL_SHA, 1, Using OpenSSL's SHA1 implementation.)
+-    AC_CHECK_LIB([crypto], [DH_set0_pqg], [AC_DEFINE(USE_OPENSSL_1_1, 1, Using OpenSSL 1.1.)])
+-  ]
+-)
+-
+-AC_ARG_ENABLE(cyrus-rc4,
+-  [  --enable-cyrus-rc4=PFX  Use Cyrus RC4 implementation.],
+-  [
+-    CXXFLAGS="$CXXFLAGS -I${enableval}/include";
+-    LIBS="$LIBS -lrc4 -L${enableval}/lib"
+-    AC_DEFINE(USE_CYRUS_RC4, 1, Using Cyrus RC4 implementation.)
+-  ]
+-)
++TORRENT_ARG_OPENSSL
++TORRENT_ARG_CYRUS_RC4
+ 
+ AC_CHECK_FUNCS(posix_memalign)
+ 

diff --git a/net-libs/libtorrent/files/libtorrent-openssl-1.1-part3.patch b/net-libs/libtorrent/files/libtorrent-openssl-1.1-part3.patch
new file mode 100644
index 00000000000..3fc338d8b08
--- /dev/null
+++ b/net-libs/libtorrent/files/libtorrent-openssl-1.1-part3.patch
@@ -0,0 +1,68 @@
+From d36561c8cc91698f3075c264af6d7d99e13cbff0 Mon Sep 17 00:00:00 2001
+From: rakshasa <sundell.software@gmail.com>
+Date: Sun, 25 Dec 2016 12:09:35 +0900
+Subject: [PATCH] More stuff.
+
+---
+ Makefile.am    |  1 +
+ scripts/ssl.m4 | 39 +++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 40 insertions(+)
+ create mode 100644 scripts/ssl.m4
+
+diff --git a/Makefile.am b/Makefile.am
+index f175e634..9507b9ea 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -8,6 +8,7 @@ EXTRA_DIST= \
+ 	scripts/checks.m4 \
+ 	scripts/common.m4 \
+ 	scripts/attributes.m4 \
++	scripts/ssl.m4 \
+ 	doc/main.xml \
+ 	doc/http.xml \
+ 	doc/torrent.xml \
+diff --git a/scripts/ssl.m4 b/scripts/ssl.m4
+new file mode 100644
+index 00000000..e9cf6303
+--- /dev/null
++++ b/scripts/ssl.m4
+@@ -0,0 +1,39 @@
++AC_DEFUN([TORRENT_CHECK_OPENSSL],
++  [
++    PKG_CHECK_MODULES(OPENSSL, libcrypto,
++      CXXFLAGS="$CXXFLAGS $OPENSSL_CFLAGS";
++      LIBS="$LIBS $OPENSSL_LIBS")
++
++    AC_DEFINE(USE_OPENSSL, 1, Using OpenSSL.)
++    AC_DEFINE(USE_OPENSSL_SHA, 1, Using OpenSSL's SHA1 implementation.)
++    AC_CHECK_LIB([crypto], [DH_set0_pqg], [AC_DEFINE(USE_OPENSSL_1_1, 1, Using OpenSSL 1.1.)])
++  ]
++)
++
++AC_DEFUN([TORRENT_ARG_OPENSSL],
++  [
++    AC_ARG_ENABLE(openssl,
++      [  --disable-openssl       Don't use OpenSSL's SHA1 implementation.],
++      [
++        if test "$enableval" = "yes"; then
++          TORRENT_CHECK_OPENSSL
++        else
++          AC_DEFINE(USE_NSS_SHA, 1, Using Mozilla's SHA1 implementation.)
++        fi
++      ],[
++        TORRENT_CHECK_OPENSSL
++      ])
++  ]
++)
++
++AC_DEFUN([TORRENT_ARG_CYRUS_RC4],
++  [
++    AC_ARG_ENABLE(cyrus-rc4,
++      [  --enable-cyrus-rc4=PFX  Use Cyrus RC4 implementation.],
++      [
++        CXXFLAGS="$CXXFLAGS -I${enableval}/include";
++        LIBS="$LIBS -lrc4 -L${enableval}/lib"
++        AC_DEFINE(USE_CYRUS_RC4, 1, Using Cyrus RC4 implementation.)
++      ])
++  ]
++)

diff --git a/net-libs/libtorrent/libtorrent-0.13.6-r2.ebuild b/net-libs/libtorrent/libtorrent-0.13.6-r2.ebuild
new file mode 100644
index 00000000000..52019c36aa2
--- /dev/null
+++ b/net-libs/libtorrent/libtorrent-0.13.6-r2.ebuild
@@ -0,0 +1,69 @@
+# 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 ipv6 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}-cppunit.patch"
+	"${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"
+)
+
+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 ipv6) \
+		$(use_enable ssl openssl) \
+		${disable_instrumentation} \
+		--with-posix-fallocate
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libtorrent/files/, net-libs/libtorrent/
@ 2018-08-10  9:02 Jason Zaman
  0 siblings, 0 replies; 7+ messages in thread
From: Jason Zaman @ 2018-08-10  9:02 UTC (permalink / raw
  To: gentoo-commits

commit:     e50ffcc2e188a03aab940c28a5621f166c786a99
Author:     Stephen Shkardoon <ss23 <AT> ss23 <DOT> geek <DOT> nz>
AuthorDate: Fri Aug 10 08:38:45 2018 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Fri Aug 10 09:00:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e50ffcc2

net-libs/libtorrent: remove old version 0.13.6.*

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-libs/libtorrent/Manifest                       |  1 -
 net-libs/libtorrent/files/libtorrent-cppunit.patch | 36 -----------
 net-libs/libtorrent/libtorrent-0.13.6-r1.ebuild    | 61 -------------------
 net-libs/libtorrent/libtorrent-0.13.6-r2.ebuild    | 69 ----------------------
 net-libs/libtorrent/libtorrent-0.13.6.ebuild       | 52 ----------------
 5 files changed, 219 deletions(-)

diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
index edb5f26ca27..400d43d513e 100644
--- a/net-libs/libtorrent/Manifest
+++ b/net-libs/libtorrent/Manifest
@@ -1,2 +1 @@
-DIST libtorrent-0.13.6.tar.gz 781253 BLAKE2B f5293309b0e6b64a3659ea839528f94b346e1698f6892383b11f30b6d10d161d88582159ac9f4b1864d47e5f8c84cb3830376dde531d84c47327e7c342c75bbb SHA512 b8aea4060357a8a40d15d42f1f698ef6f3ebdc885000bfbfa5bf9c81af8c88b5503a107e05c214e3e8489126928d336356c5e7e0eaf836b6b84a3cf74633b050
 DIST libtorrent-0.13.7.tar.gz 782854 BLAKE2B 940e6162567d391f3d05034bf6d7d55a40070da7e2fd3279b1aa6acd169ca2783e7a2040efc472285f918c434e74380ec40fcddb823871ecf441c85670b9f273 SHA512 7bf3e87dbd19eb4e6806dff8a01c3ec61ea960bbd809d4bcbee96a46e169f97d0baf0fc85ab4a1efbbab07850e9b1060bae46c453ea6c42f5c23f8d921295efb

diff --git a/net-libs/libtorrent/files/libtorrent-cppunit.patch b/net-libs/libtorrent/files/libtorrent-cppunit.patch
deleted file mode 100644
index eed21733b29..00000000000
--- a/net-libs/libtorrent/files/libtorrent-cppunit.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From b8b24b58a9bed6db1c886ea71a9bb407fb41fc2f Mon Sep 17 00:00:00 2001
-From: rakshasa <sundell.software@gmail.com>
-Date: Sun, 23 Oct 2016 08:54:11 +0900
-Subject: [PATCH] Use pkg-config for cppunit.
-
----
- configure.ac | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2b3eb7ab..65e34872 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -19,7 +19,6 @@ AC_SUBST(LIBTORRENT_INTERFACE_VERSION_NO)
- 
- AM_INIT_AUTOMAKE
- AC_CONFIG_HEADERS(config.h)
--AM_PATH_CPPUNIT(1.9.6)
- 
- AC_PROG_CXX
- 
-@@ -60,9 +59,11 @@ CC_ATTRIBUTE_VISIBILITY
- AX_PTHREAD
- AX_CHECK_ZLIB
- 
--CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
--CXXFLAGS="$PTHREAD_CFLAGS $CXXFLAGS"
--LIBS="$PTHREAD_LIBS $LIBS"
-+PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
-+
-+CFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CFLAGS"
-+CXXFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CXXFLAGS"
-+LIBS="$PTHREAD_LIBS $CPPUNIT_LIBS $LIBS"
- 
- AC_ARG_ENABLE(openssl,
-   [  --disable-openssl       Don't use OpenSSL's SHA1 implementation.],

diff --git a/net-libs/libtorrent/libtorrent-0.13.6-r1.ebuild b/net-libs/libtorrent/libtorrent-0.13.6-r1.ebuild
deleted file mode 100644
index 402b6608920..00000000000
--- a/net-libs/libtorrent/libtorrent-0.13.6-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils libtool 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 ipv6 libressl ssl test"
-
-RDEPEND="
-	sys-libs/zlib
-	>=dev-libs/libsigc++-2.2.2:2
-	ssl? (
-	    !libressl? ( <dev-libs/openssl-1.1:0= )
-	    libressl? ( dev-libs/libressl:= )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-util/cppunit )"
-
-src_prepare() {
-	elibtoolize
-}
-
-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 ipv6) \
-		$(use_enable ssl openssl) \
-		${disable_instrumentation} \
-		--with-posix-fallocate
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-}

diff --git a/net-libs/libtorrent/libtorrent-0.13.6-r2.ebuild b/net-libs/libtorrent/libtorrent-0.13.6-r2.ebuild
deleted file mode 100644
index 52019c36aa2..00000000000
--- a/net-libs/libtorrent/libtorrent-0.13.6-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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 ipv6 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}-cppunit.patch"
-	"${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"
-)
-
-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 ipv6) \
-		$(use_enable ssl openssl) \
-		${disable_instrumentation} \
-		--with-posix-fallocate
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete
-}

diff --git a/net-libs/libtorrent/libtorrent-0.13.6.ebuild b/net-libs/libtorrent/libtorrent-0.13.6.ebuild
deleted file mode 100644
index 90e62d00ecf..00000000000
--- a/net-libs/libtorrent/libtorrent-0.13.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils libtool 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 ipv6 libressl ssl test"
-
-RDEPEND="
-	sys-libs/zlib
-	>=dev-libs/libsigc++-2.2.2:2
-	ssl? (
-	    !libressl? ( <dev-libs/openssl-1.1:0= )
-	    libressl? ( dev-libs/libressl:= )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-util/cppunit )"
-
-src_prepare() {
-	elibtoolize
-}
-
-src_configure() {
-	# configure needs bash or script bombs out on some null shift, bug #291229
-	CONFIG_SHELL=${BASH} econf \
-		--enable-aligned \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_enable ssl openssl) \
-		--with-posix-fallocate
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libtorrent/files/, net-libs/libtorrent/
@ 2022-07-02 13:16 David Seifert
  0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2022-07-02 13:16 UTC (permalink / raw
  To: gentoo-commits

commit:     2d473b12ad24cbcd94edc07dcbbb5a0f57d6d8a8
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 13:15:58 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 13:15:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d473b12

net-libs/libtorrent: [QA] update EAPI 6 -> 8

Closes: https://bugs.gentoo.org/740698
Closes: https://bugs.gentoo.org/836085
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../files/libtorrent-0.13.8-sysroot.patch          | 33 ++++++++++++++++++++++
 ....13.8-r1.ebuild => libtorrent-0.13.8-r2.ebuild} | 30 +++++++++++---------
 2 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/net-libs/libtorrent/files/libtorrent-0.13.8-sysroot.patch b/net-libs/libtorrent/files/libtorrent-0.13.8-sysroot.patch
new file mode 100644
index 000000000000..9f696c01ef61
--- /dev/null
+++ b/net-libs/libtorrent/files/libtorrent-0.13.8-sysroot.patch
@@ -0,0 +1,33 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -43,7 +43,6 @@
+ TORRENT_ENABLE_INTERRUPT_SOCKET
+ 
+ TORRENT_ENABLE_ARCH
+-TORRENT_WITH_SYSROOT
+ 
+ dnl TORRENT_WITH_XFS
+ TORRENT_WITHOUT_KQUEUE
+@@ -59,8 +58,7 @@
+ CC_ATTRIBUTE_VISIBILITY
+ 
+ AX_PTHREAD
+-AX_CHECK_ZLIB
+-
++PKG_CHECK_MODULES([ZLIB], [zlib])
+ PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
+ 
+ CFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CFLAGS"
+--- a/src/torrent/utils/Makefile.am
++++ b/src/torrent/utils/Makefile.am
+@@ -23,8 +23,9 @@
+ 	thread_interrupt.h \
+ 	uri_parser.cc \
+ 	uri_parser.h
++libsub_torrentutils_la_LIBADD = $(ZLIB_LIBS)
+ 
+-AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. -I$(top_srcdir)
++AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. -I$(top_srcdir) $(ZLIB_CFLAGS)
+ 
+ libtorrentincludedir = $(includedir)/torrent/utils
+ libtorrentinclude_HEADERS = \

diff --git a/net-libs/libtorrent/libtorrent-0.13.8-r1.ebuild b/net-libs/libtorrent/libtorrent-0.13.8-r2.ebuild
similarity index 80%
rename from net-libs/libtorrent/libtorrent-0.13.8-r1.ebuild
rename to net-libs/libtorrent/libtorrent-0.13.8-r2.ebuild
index 5d3d38cc3667..5bb36208d46b 100644
--- a/net-libs/libtorrent/libtorrent-0.13.8-r1.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.13.8-r2.ebuild
@@ -1,35 +1,37 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit toolchain-funcs
+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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="debug ssl test"
-RESTRICT="!test? ( test )"
+IUSE="debug ssl"
 
 # cppunit dependency - https://github.com/rakshasa/libtorrent/issues/182
 RDEPEND="
 	dev-util/cppunit:=
 	sys-libs/zlib
-	ssl? (
-		dev-libs/openssl:0=
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	ssl? ( dev-libs/openssl:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.13.8-sysroot.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
 	# bug 518582
@@ -37,6 +39,7 @@ src_configure() {
 	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
+		einfo "Disabling instrumentation"
 		disable_instrumentation="--disable-instrumentation"
 	fi
 
@@ -46,12 +49,11 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable ssl openssl) \
 		${disable_instrumentation} \
-		--with-posix-fallocate \
-		--with-zlib="${EROOT%/}/usr/"
+		--with-posix-fallocate
 }
 
 src_install() {
 	default
 
-	find "${D}" -name '*.la' -delete
+	find "${ED}" -type f -name '*.la' -delete || die
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libtorrent/files/, net-libs/libtorrent/
@ 2024-11-09  1:53 Jason Zaman
  0 siblings, 0 replies; 7+ messages in thread
From: Jason Zaman @ 2024-11-09  1:53 UTC (permalink / raw
  To: gentoo-commits

commit:     21e1bb6b03f9d652ed25064f252d7519ac3ba1c6
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Tue Oct 29 23:42:35 2024 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 01:51:29 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21e1bb6b

net-libs/libtorrent: add 0.14.0

fix SRC_URI

updated patch for zlib
new patch for remove tests for ip addresses

I think the workaround for instrumentation is no more required, but I can't
test it.

Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>

 net-libs/libtorrent/Manifest                       |  1 +
 .../files/libtorrent-0.14.0-sysroot.patch          | 37 ++++++++++++
 .../files/libtorrent-0.14.0-tests-address.patch    | 13 +++++
 net-libs/libtorrent/libtorrent-0.14.0.ebuild       | 67 ++++++++++++++++++++++
 4 files changed, 118 insertions(+)

diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
index b7cba0b5c684..4203eebb5065 100644
--- a/net-libs/libtorrent/Manifest
+++ b/net-libs/libtorrent/Manifest
@@ -1 +1,2 @@
 DIST libtorrent-0.13.8.tar.gz 834027 BLAKE2B 374f33af52a45c244182d36bacd6b42eea9edc179e42fb40f4170a47a0cdd39cfb3f42f82fc26ab36718afb9a28a8dd72ca139b3646bbc1c2887444905438cdd SHA512 417177df5b27cd8c6a6317063b0846da2690de4633836466728605c2edad2de407d29d321cc481b8d1352dd0ff6dd89f4566a830424a8cf986f2fddb04704da4
+DIST libtorrent-0.14.0.tar.gz 809617 BLAKE2B 321a3911e22b148744439ceb87adb470036516bef6c75f55f860b1f985d7b61bced11c93aaf0a703bd6d0089816dbfdaaa9420b28619ed9dafa4d1495b6763bc SHA512 d61b93778068849a706fa46b5b1c4fbab9246d8a1b45e574987d987eaba50145dd98be65cf969fb4d38a1e4c3bae03b283103163d415506598b8673740d8ac58

diff --git a/net-libs/libtorrent/files/libtorrent-0.14.0-sysroot.patch b/net-libs/libtorrent/files/libtorrent-0.14.0-sysroot.patch
new file mode 100644
index 000000000000..91b158d91acb
--- /dev/null
+++ b/net-libs/libtorrent/files/libtorrent-0.14.0-sysroot.patch
@@ -0,0 +1,37 @@
+diff --git a/configure.ac b/configure.ac
+index 741f81f..e2a55de 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -42,7 +42,6 @@ TORRENT_ENABLE_ALIGNED
+ TORRENT_ENABLE_INTERRUPT_SOCKET
+ 
+ TORRENT_ENABLE_ARCH
+-TORRENT_WITH_SYSROOT
+ 
+ dnl TORRENT_WITH_XFS
+ TORRENT_WITHOUT_KQUEUE
+@@ -75,9 +74,8 @@ AC_ARG_ENABLE(execinfo,
+     AX_EXECINFO
+   ])
+ 
+-AX_CHECK_ZLIB
+ AX_PTHREAD
+-
++PKG_CHECK_MODULES([ZLIB], [zlib])
+ PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
+ 
+ CFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CFLAGS"
+diff --git a/src/torrent/Makefile.am b/src/torrent/Makefile.am
+index 5de7e8a..8754a9c 100644
+--- a/src/torrent/Makefile.am
++++ b/src/torrent/Makefile.am
+@@ -137,7 +137,8 @@ libtorrent_torrent_la_SOURCES = \
+ 	tracker_list.cc \
+ 	tracker_list.h
+ 
+-AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)
++libtorrent_torrent_la_LIBADD = $(ZLIB_LIBS)
++AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir) $(ZLIB_CFLAGS)
+ 
+ libtorrent_torrent_data_includedir = $(includedir)/torrent/data
+ libtorrent_torrent_data_include_HEADERS = \

diff --git a/net-libs/libtorrent/files/libtorrent-0.14.0-tests-address.patch b/net-libs/libtorrent/files/libtorrent-0.14.0-tests-address.patch
new file mode 100644
index 000000000000..56cc0e35be08
--- /dev/null
+++ b/net-libs/libtorrent/files/libtorrent-0.14.0-tests-address.patch
@@ -0,0 +1,13 @@
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 0221796..6e23502 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -39,8 +39,6 @@ LibTorrent_Test_Common = \
+ 	helpers/utils.h
+ 
+ LibTorrent_Test_Torrent_Net_SOURCES = $(LibTorrent_Test_Common) \
+-	torrent/net/test_address_info.cc \
+-	torrent/net/test_address_info.h \
+ 	torrent/net/test_fd.cc \
+ 	torrent/net/test_fd.h \
+ 	torrent/net/test_socket_address.cc \

diff --git a/net-libs/libtorrent/libtorrent-0.14.0.ebuild b/net-libs/libtorrent/libtorrent-0.14.0.ebuild
new file mode 100644
index 000000000000..0ecffde196a0
--- /dev/null
+++ b/net-libs/libtorrent/libtorrent-0.14.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="BitTorrent library written in C++ for *nix"
+HOMEPAGE="https://rakshasa.github.io/rtorrent/"
+# rtorrent-archive is an exact match to the tarballs also uploaded to
+# https://github.com/rakshasa/rtorrent/releases, but the problem with that more
+# common path is the libtorrent/rtorrent versions are not in sync, so updating
+# libtorrent wouldnt be more annoying.
+SRC_URI="https://github.com/rakshasa/rtorrent-archive/raw/master/${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 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="debug ssl"
+
+# cppunit dependency - https://github.com/rakshasa/libtorrent/issues/182
+RDEPEND="
+	dev-util/cppunit:=
+	sys-libs/zlib
+	ssl? ( dev-libs/openssl:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.14.0-sysroot.patch
+	"${FILESDIR}"/${PN}-0.14.0-tests-address.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
+		einfo "Disabling instrumentation"
+		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
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libtorrent/files/, net-libs/libtorrent/
@ 2025-05-04  6:08 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2025-05-04  6:08 UTC (permalink / raw
  To: gentoo-commits

commit:     27d1ce487d0182d9dcf0c8fc5e08b296c1225c93
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Fri May  2 16:33:21 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May  4 06:07:14 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27d1ce48

net-libs/libtorrent: add 0.15.3

deps/iuse :
rm ssl useflag, unconditionnally required now
net-libs/udns (unbundled)

use myeconfargs array

arch :
due to net-libs/udns, drop arm, arm64, mips, riscv
using a system-udns flag with p.mask to switch on bundled version
to avoid unkeywording would be nonsense.

Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Part-of: https://github.com/gentoo/gentoo/pull/41912
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/libtorrent/Manifest                       |  1 +
 .../files/libtorrent-0.15.3-unbundle_udns.patch    | 54 +++++++++++++++
 net-libs/libtorrent/libtorrent-0.15.3.ebuild       | 80 ++++++++++++++++++++++
 3 files changed, 135 insertions(+)

diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
index 40fdff284841..10edbfb0c9ea 100644
--- a/net-libs/libtorrent/Manifest
+++ b/net-libs/libtorrent/Manifest
@@ -1,3 +1,4 @@
 DIST libtorrent-0.13.8.tar.gz 834027 BLAKE2B 374f33af52a45c244182d36bacd6b42eea9edc179e42fb40f4170a47a0cdd39cfb3f42f82fc26ab36718afb9a28a8dd72ca139b3646bbc1c2887444905438cdd SHA512 417177df5b27cd8c6a6317063b0846da2690de4633836466728605c2edad2de407d29d321cc481b8d1352dd0ff6dd89f4566a830424a8cf986f2fddb04704da4
 DIST libtorrent-0.14.0.tar.gz 809617 BLAKE2B 321a3911e22b148744439ceb87adb470036516bef6c75f55f860b1f985d7b61bced11c93aaf0a703bd6d0089816dbfdaaa9420b28619ed9dafa4d1495b6763bc SHA512 d61b93778068849a706fa46b5b1c4fbab9246d8a1b45e574987d987eaba50145dd98be65cf969fb4d38a1e4c3bae03b283103163d415506598b8673740d8ac58
 DIST libtorrent-0.15.1.tar.gz 805722 BLAKE2B 7b4b9aba8133a2a20a5dd39d451c9478c44f133ae3b5929b79cbd25fb0754b4bc64291a75da898ed335a808b992d67ffa7a3a431420da7073d2fb3c927109649 SHA512 e7d607fc3e31e2d6f4643c6760a271324a4f8f102e07228aca13427073426a393b12006329206fa14108d93c2f378a8db3761b0e14ff3ae391551777b4b04a6a
+DIST libtorrent-0.15.3.tar.gz 872751 BLAKE2B e1a851273e9341f1e71806ada0417d0123f6a7d0fc0965f6a957bbc55981072385d8ae1c59af18c64d5157457532d39af037cbd9313e2646020bdfb70fc48323 SHA512 795a1ff115b37df5899a59ff23524cde95380c323b5a11f369d7f43eb250843cf57ed4a2f39880992ecc05d5724c149cd2955ee6c621193f95d13875af341cec

diff --git a/net-libs/libtorrent/files/libtorrent-0.15.3-unbundle_udns.patch b/net-libs/libtorrent/files/libtorrent-0.15.3-unbundle_udns.patch
new file mode 100644
index 000000000000..d5c0b6838eb5
--- /dev/null
+++ b/net-libs/libtorrent/files/libtorrent-0.15.3-unbundle_udns.patch
@@ -0,0 +1,54 @@
+diff --git a/src/net/udns_library.cc b/src/net/udns_library.cc
+index 788e7eee..73b7e210 100644
+--- a/src/net/udns_library.cc
++++ b/src/net/udns_library.cc
+@@ -12,23 +12,6 @@
+ 
+ extern "C" {
+ 
+-#include "net/udns/udns.h"
+-
+-#include "net/udns/udns_XtoX.c"
+-#include "net/udns/udns_bl.c"
+-#include "net/udns/udns_codes.c"
+-#include "net/udns/udns_dn.c"
+-#include "net/udns/udns_dntosp.c"
+-#include "net/udns/udns_init.c"
+-#include "net/udns/udns_jran.c"
+-#include "net/udns/udns_misc.c"
+-#include "net/udns/udns_parse.c"
+-#include "net/udns/udns_resolver.c"
+-#include "net/udns/udns_rr_a.c"
+-#include "net/udns/udns_rr_mx.c"
+-#include "net/udns/udns_rr_naptr.c"
+-#include "net/udns/udns_rr_ptr.c"
+-#include "net/udns/udns_rr_srv.c"
+-#include "net/udns/udns_rr_txt.c"
++#include <udns.h>
+ 
+ }
+diff --git a/src/net/udns_library.h b/src/net/udns_library.h
+index b09b398a..bdb1bcdf 100644
+--- a/src/net/udns_library.h
++++ b/src/net/udns_library.h
+@@ -1,6 +1,6 @@
+ #ifndef TORRENT_NET_UDNS_LIBRARY_H
+ #define TORRENT_NET_UDNS_LIBRARY_H
+ 
+-#include "net/udns/udns.h"
++#include <udns.h>
+ 
+ #endif
+diff --git a/src/net/udns_resolver.cc b/src/net/udns_resolver.cc
+index e35e5fc1..f697112d 100644
+--- a/src/net/udns_resolver.cc
++++ b/src/net/udns_resolver.cc
+@@ -8,7 +8,7 @@
+ 
+ #include "globals.h"
+ #include "manager.h"
+-#include "net/udns/udns.h"
++#include <udns.h>
+ #include "torrent/common.h"
+ #include "torrent/poll.h"
+ #include "torrent/net/socket_address.h"

diff --git a/net-libs/libtorrent/libtorrent-0.15.3.ebuild b/net-libs/libtorrent/libtorrent-0.15.3.ebuild
new file mode 100644
index 000000000000..39e7965bf314
--- /dev/null
+++ b/net-libs/libtorrent/libtorrent-0.15.3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="BitTorrent library written in C++ for *nix"
+HOMEPAGE="https://rakshasa.github.io/rtorrent/"
+SRC_URI="https://github.com/rakshasa/rtorrent/releases/download/v${PV}/${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 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/openssl:=
+	net-libs/udns
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.14.0-tests-address.patch
+	"${FILESDIR}"/${PN}-0.15.3-unbundle_udns.patch
+)
+
+src_prepare() {
+	default
+
+	# use system-udns
+	rm -r src/net/udns || die
+
+	if [[ ${CHOST} != *-darwin* ]]; then
+		# syslibroot is only for macos, change to sysroot for others
+		sed -i 's/Wl,-syslibroot,/Wl,--sysroot,/' "${S}/scripts/common.m4" || die
+	fi
+	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
+		einfo "Disabling instrumentation"
+		disable_instrumentation="--disable-instrumentation"
+	fi
+
+	# configure needs bash or script bombs out on some null shift, bug #291229
+	export CONFIG_SHELL=${BASH}
+
+	local myeconfargs=(
+		LIBS="-ludns"
+		--enable-aligned
+		$(use_enable debug)
+		${disable_instrumentation}
+		--with-posix-fallocate
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libtorrent/files/, net-libs/libtorrent/
@ 2025-06-06 14:09 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2025-06-06 14:09 UTC (permalink / raw
  To: gentoo-commits

commit:     0d814aa9d6512eeb5eacf36a57da5d12a4d7f026
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Thu Jun  5 07:57:19 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  6 14:08:09 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d814aa9

net-libs/libtorrent: drop 0.14.0

even if it's stable, net-p2p/rtorrent synced version can't be
stabilized (see bug below)

keep 0.15.1 for keywords

Bug: https://bugs.gentoo.org/946551
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Part-of: https://github.com/gentoo/gentoo/pull/42454
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/libtorrent/Manifest                       |  1 -
 .../files/libtorrent-0.14.0-sysroot.patch          | 37 ------------
 net-libs/libtorrent/libtorrent-0.14.0.ebuild       | 67 ----------------------
 3 files changed, 105 deletions(-)

diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
index cfb30180f251..f25a78561ff1 100644
--- a/net-libs/libtorrent/Manifest
+++ b/net-libs/libtorrent/Manifest
@@ -1,5 +1,4 @@
 DIST libtorrent-0.13.8.tar.gz 834027 BLAKE2B 374f33af52a45c244182d36bacd6b42eea9edc179e42fb40f4170a47a0cdd39cfb3f42f82fc26ab36718afb9a28a8dd72ca139b3646bbc1c2887444905438cdd SHA512 417177df5b27cd8c6a6317063b0846da2690de4633836466728605c2edad2de407d29d321cc481b8d1352dd0ff6dd89f4566a830424a8cf986f2fddb04704da4
-DIST libtorrent-0.14.0.tar.gz 809617 BLAKE2B 321a3911e22b148744439ceb87adb470036516bef6c75f55f860b1f985d7b61bced11c93aaf0a703bd6d0089816dbfdaaa9420b28619ed9dafa4d1495b6763bc SHA512 d61b93778068849a706fa46b5b1c4fbab9246d8a1b45e574987d987eaba50145dd98be65cf969fb4d38a1e4c3bae03b283103163d415506598b8673740d8ac58
 DIST libtorrent-0.15.1.tar.gz 805722 BLAKE2B 7b4b9aba8133a2a20a5dd39d451c9478c44f133ae3b5929b79cbd25fb0754b4bc64291a75da898ed335a808b992d67ffa7a3a431420da7073d2fb3c927109649 SHA512 e7d607fc3e31e2d6f4643c6760a271324a4f8f102e07228aca13427073426a393b12006329206fa14108d93c2f378a8db3761b0e14ff3ae391551777b4b04a6a
 DIST libtorrent-0.15.3.tar.gz 872751 BLAKE2B e1a851273e9341f1e71806ada0417d0123f6a7d0fc0965f6a957bbc55981072385d8ae1c59af18c64d5157457532d39af037cbd9313e2646020bdfb70fc48323 SHA512 795a1ff115b37df5899a59ff23524cde95380c323b5a11f369d7f43eb250843cf57ed4a2f39880992ecc05d5724c149cd2955ee6c621193f95d13875af341cec
 DIST libtorrent-0.15.4.tar.gz 870746 BLAKE2B 5f47edb90bd0cff73b40caefa8ecb44fb71ccae497a2b7482424e223d84ff46c227b4189111cd2f5172d4eab201191403eceb8dcbf9a3d16ccb704083674f7dc SHA512 4c25497f669537087c3de013660dffbd94d867a74e7cf356f26c4afb976cc8ebf3e7feeb704c761c07275940430d161e15a0ffa995ee0b38b8eb2ce90683ff29

diff --git a/net-libs/libtorrent/files/libtorrent-0.14.0-sysroot.patch b/net-libs/libtorrent/files/libtorrent-0.14.0-sysroot.patch
deleted file mode 100644
index 91b158d91acb..000000000000
--- a/net-libs/libtorrent/files/libtorrent-0.14.0-sysroot.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 741f81f..e2a55de 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -42,7 +42,6 @@ TORRENT_ENABLE_ALIGNED
- TORRENT_ENABLE_INTERRUPT_SOCKET
- 
- TORRENT_ENABLE_ARCH
--TORRENT_WITH_SYSROOT
- 
- dnl TORRENT_WITH_XFS
- TORRENT_WITHOUT_KQUEUE
-@@ -75,9 +74,8 @@ AC_ARG_ENABLE(execinfo,
-     AX_EXECINFO
-   ])
- 
--AX_CHECK_ZLIB
- AX_PTHREAD
--
-+PKG_CHECK_MODULES([ZLIB], [zlib])
- PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
- 
- CFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CFLAGS"
-diff --git a/src/torrent/Makefile.am b/src/torrent/Makefile.am
-index 5de7e8a..8754a9c 100644
---- a/src/torrent/Makefile.am
-+++ b/src/torrent/Makefile.am
-@@ -137,7 +137,8 @@ libtorrent_torrent_la_SOURCES = \
- 	tracker_list.cc \
- 	tracker_list.h
- 
--AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)
-+libtorrent_torrent_la_LIBADD = $(ZLIB_LIBS)
-+AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir) $(ZLIB_CFLAGS)
- 
- libtorrent_torrent_data_includedir = $(includedir)/torrent/data
- libtorrent_torrent_data_include_HEADERS = \

diff --git a/net-libs/libtorrent/libtorrent-0.14.0.ebuild b/net-libs/libtorrent/libtorrent-0.14.0.ebuild
deleted file mode 100644
index df71144e3132..000000000000
--- a/net-libs/libtorrent/libtorrent-0.14.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="BitTorrent library written in C++ for *nix"
-HOMEPAGE="https://rakshasa.github.io/rtorrent/"
-# rtorrent-archive is an exact match to the tarballs also uploaded to
-# https://github.com/rakshasa/rtorrent/releases, but the problem with that more
-# common path is the libtorrent/rtorrent versions are not in sync, so updating
-# libtorrent wouldnt be more annoying.
-SRC_URI="https://github.com/rakshasa/rtorrent-archive/raw/master/${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 arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="debug ssl"
-
-# cppunit dependency - https://github.com/rakshasa/libtorrent/issues/182
-RDEPEND="
-	dev-util/cppunit:=
-	sys-libs/zlib
-	ssl? ( dev-libs/openssl:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.14.0-sysroot.patch
-	"${FILESDIR}"/${PN}-0.14.0-tests-address.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
-		einfo "Disabling instrumentation"
-		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
-}
-
-src_install() {
-	default
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libtorrent/files/, net-libs/libtorrent/
@ 2025-06-26 19:55 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2025-06-26 19:55 UTC (permalink / raw
  To: gentoo-commits

commit:     88ccd84b98135825b5698ce6d617cd3bb34912c3
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Mon Jun 23 16:07:15 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 26 19:54:35 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88ccd84b

net-libs/libtorrent: drop 0.15.3, 0.15.4

Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Part-of: https://github.com/gentoo/gentoo/pull/42714
Closes: https://github.com/gentoo/gentoo/pull/42714
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/libtorrent/Manifest                       |  2 -
 .../files/libtorrent-0.15.4-fix_inv_chunks.patch   | 33 ---------
 net-libs/libtorrent/libtorrent-0.15.3.ebuild       | 80 ---------------------
 net-libs/libtorrent/libtorrent-0.15.4.ebuild       | 82 ----------------------
 4 files changed, 197 deletions(-)

diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
index fec29d08ad08..49081bf4cf4d 100644
--- a/net-libs/libtorrent/Manifest
+++ b/net-libs/libtorrent/Manifest
@@ -1,5 +1,3 @@
 DIST libtorrent-0.13.8.tar.gz 834027 BLAKE2B 374f33af52a45c244182d36bacd6b42eea9edc179e42fb40f4170a47a0cdd39cfb3f42f82fc26ab36718afb9a28a8dd72ca139b3646bbc1c2887444905438cdd SHA512 417177df5b27cd8c6a6317063b0846da2690de4633836466728605c2edad2de407d29d321cc481b8d1352dd0ff6dd89f4566a830424a8cf986f2fddb04704da4
 DIST libtorrent-0.15.1.tar.gz 805722 BLAKE2B 7b4b9aba8133a2a20a5dd39d451c9478c44f133ae3b5929b79cbd25fb0754b4bc64291a75da898ed335a808b992d67ffa7a3a431420da7073d2fb3c927109649 SHA512 e7d607fc3e31e2d6f4643c6760a271324a4f8f102e07228aca13427073426a393b12006329206fa14108d93c2f378a8db3761b0e14ff3ae391551777b4b04a6a
-DIST libtorrent-0.15.3.tar.gz 872751 BLAKE2B e1a851273e9341f1e71806ada0417d0123f6a7d0fc0965f6a957bbc55981072385d8ae1c59af18c64d5157457532d39af037cbd9313e2646020bdfb70fc48323 SHA512 795a1ff115b37df5899a59ff23524cde95380c323b5a11f369d7f43eb250843cf57ed4a2f39880992ecc05d5724c149cd2955ee6c621193f95d13875af341cec
-DIST libtorrent-0.15.4.tar.gz 870746 BLAKE2B 5f47edb90bd0cff73b40caefa8ecb44fb71ccae497a2b7482424e223d84ff46c227b4189111cd2f5172d4eab201191403eceb8dcbf9a3d16ccb704083674f7dc SHA512 4c25497f669537087c3de013660dffbd94d867a74e7cf356f26c4afb976cc8ebf3e7feeb704c761c07275940430d161e15a0ffa995ee0b38b8eb2ce90683ff29
 DIST libtorrent-0.15.5.tar.gz 870807 BLAKE2B f59677fa39086a01ceb4b982b3328990e6eea72473a2eb4d8df7cbf23e289ec8c75ff3022ff373bdde441d7dc73fcdf9f2e314a580edaf14811d33f53ca5b52a SHA512 78444410b76f81e4f230d7e64ce187d24be027ae456d5082253970f85f7c1ade9d988073ba213427deae81d766abc3eebe7a48d7cd28a1cd3c2c597737deb599

diff --git a/net-libs/libtorrent/files/libtorrent-0.15.4-fix_inv_chunks.patch b/net-libs/libtorrent/files/libtorrent-0.15.4-fix_inv_chunks.patch
deleted file mode 100644
index 0ea021f66aee..000000000000
--- a/net-libs/libtorrent/files/libtorrent-0.15.4-fix_inv_chunks.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://github.com/rakshasa/rtorrent/issues/1506
-From a0a364e2863356f51d41a27ce7620471666c5c56 Mon Sep 17 00:00:00 2001
-From: rakshasa <sundell.software@gmail.com>
-Date: Sun, 1 Jun 2025 18:20:30 +0200
-Subject: [PATCH] When encountering invalid completed chunks value ignore it.
-
----
- src/torrent/utils/resume.cc | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/src/torrent/utils/resume.cc b/src/torrent/utils/resume.cc
-index dc9f95a52..cb5fbb5c3 100644
---- a/src/torrent/utils/resume.cc
-+++ b/src/torrent/utils/resume.cc
-@@ -417,8 +417,16 @@ resume_load_file_priorities(Download download, const Object& object) {
-         filesItr->get_key_value("priority") >= 0 && filesItr->get_key_value("priority") <= PRIORITY_HIGH)
-       (*listItr)->set_priority(static_cast<priority_enum>(filesItr->get_key_value("priority")));
- 
--    if (filesItr->has_key_value("completed"))
--      (*listItr)->set_completed_chunks(filesItr->get_key_value("completed"));
-+    if (filesItr->has_key_value("completed")) {
-+      auto completed = filesItr->get_key_value("completed");
-+
-+      if (completed < 0 || completed > (*listItr)->size_chunks()) {
-+        LT_LOG_LOAD_INVALID("invalid completed chunks value: %" PRIi64 ", resetting to 0", completed);
-+        completed = 0;
-+      }
-+
-+      (*listItr)->set_completed_chunks(completed);
-+    }
-   }
- }
- 

diff --git a/net-libs/libtorrent/libtorrent-0.15.3.ebuild b/net-libs/libtorrent/libtorrent-0.15.3.ebuild
deleted file mode 100644
index 4062ad2db90d..000000000000
--- a/net-libs/libtorrent/libtorrent-0.15.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="BitTorrent library written in C++ for *nix"
-HOMEPAGE="https://rakshasa.github.io/rtorrent/"
-SRC_URI="https://github.com/rakshasa/rtorrent/releases/download/v${PV}/${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 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:=
-	net-libs/udns
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( dev-util/cppunit )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.14.0-tests-address.patch
-	"${FILESDIR}"/${PN}-0.15.3-unbundle_udns.patch
-)
-
-src_prepare() {
-	default
-
-	# use system-udns
-	rm -r src/net/udns || die
-
-	if [[ ${CHOST} != *-darwin* ]]; then
-		# syslibroot is only for macos, change to sysroot for others
-		sed -i 's/Wl,-syslibroot,/Wl,--sysroot,/' "${S}/scripts/common.m4" || die
-	fi
-	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
-		einfo "Disabling instrumentation"
-		disable_instrumentation="--disable-instrumentation"
-	fi
-
-	# configure needs bash or script bombs out on some null shift, bug #291229
-	export CONFIG_SHELL=${BASH}
-
-	local myeconfargs=(
-		LIBS="-ludns"
-		--enable-aligned
-		$(use_enable debug)
-		${disable_instrumentation}
-		--with-posix-fallocate
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}

diff --git a/net-libs/libtorrent/libtorrent-0.15.4.ebuild b/net-libs/libtorrent/libtorrent-0.15.4.ebuild
deleted file mode 100644
index 5340e905db9f..000000000000
--- a/net-libs/libtorrent/libtorrent-0.15.4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="BitTorrent library written in C++ for *nix"
-HOMEPAGE="https://rakshasa.github.io/rtorrent/"
-SRC_URI="https://github.com/rakshasa/rtorrent/releases/download/v${PV}/${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 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:=
-	net-libs/udns
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( dev-util/cppunit )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.14.0-tests-address.patch
-	"${FILESDIR}"/${PN}-0.15.3-unbundle_udns.patch
-	# from upstream. To be removed in next release
-	"${FILESDIR}"/${PN}-0.15.4-fix_inv_chunks.patch
-)
-
-src_prepare() {
-	default
-
-	# use system-udns
-	rm -r src/net/udns || die
-
-	if [[ ${CHOST} != *-darwin* ]]; then
-		# syslibroot is only for macos, change to sysroot for others
-		sed -i 's/Wl,-syslibroot,/Wl,--sysroot,/' "${S}/scripts/common.m4" || die
-	fi
-	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
-		einfo "Disabling instrumentation"
-		disable_instrumentation="--disable-instrumentation"
-	fi
-
-	# configure needs bash or script bombs out on some null shift, bug #291229
-	export CONFIG_SHELL=${BASH}
-
-	local myeconfargs=(
-		LIBS="-ludns"
-		--enable-aligned
-		$(use_enable debug)
-		${disable_instrumentation}
-		--with-posix-fallocate
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2025-06-26 19:55 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-06-06 14:09 [gentoo-commits] repo/gentoo:master commit in: net-libs/libtorrent/files/, net-libs/libtorrent/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2025-06-26 19:55 Sam James
2025-05-04  6:08 Sam James
2024-11-09  1:53 Jason Zaman
2022-07-02 13:16 David Seifert
2018-08-10  9:02 Jason Zaman
2018-05-20 13:46 Jason Zaman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox