Gentoo Archives: gentoo-commits

From: Jason Zaman <perfinion@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libtorrent/files/, net-libs/libtorrent/
Date: Fri, 10 Aug 2018 09:02:30
Message-Id: 1533891649.e50ffcc2e188a03aab940c28a5621f166c786a99.perfinion@gentoo
1 commit: e50ffcc2e188a03aab940c28a5621f166c786a99
2 Author: Stephen Shkardoon <ss23 <AT> ss23 <DOT> geek <DOT> nz>
3 AuthorDate: Fri Aug 10 08:38:45 2018 +0000
4 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 10 09:00:49 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e50ffcc2
7
8 net-libs/libtorrent: remove old version 0.13.6.*
9
10 Package-Manager: Portage-2.3.40, Repoman-2.3.9
11
12 net-libs/libtorrent/Manifest | 1 -
13 net-libs/libtorrent/files/libtorrent-cppunit.patch | 36 -----------
14 net-libs/libtorrent/libtorrent-0.13.6-r1.ebuild | 61 -------------------
15 net-libs/libtorrent/libtorrent-0.13.6-r2.ebuild | 69 ----------------------
16 net-libs/libtorrent/libtorrent-0.13.6.ebuild | 52 ----------------
17 5 files changed, 219 deletions(-)
18
19 diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
20 index edb5f26ca27..400d43d513e 100644
21 --- a/net-libs/libtorrent/Manifest
22 +++ b/net-libs/libtorrent/Manifest
23 @@ -1,2 +1 @@
24 -DIST libtorrent-0.13.6.tar.gz 781253 BLAKE2B f5293309b0e6b64a3659ea839528f94b346e1698f6892383b11f30b6d10d161d88582159ac9f4b1864d47e5f8c84cb3830376dde531d84c47327e7c342c75bbb SHA512 b8aea4060357a8a40d15d42f1f698ef6f3ebdc885000bfbfa5bf9c81af8c88b5503a107e05c214e3e8489126928d336356c5e7e0eaf836b6b84a3cf74633b050
25 DIST libtorrent-0.13.7.tar.gz 782854 BLAKE2B 940e6162567d391f3d05034bf6d7d55a40070da7e2fd3279b1aa6acd169ca2783e7a2040efc472285f918c434e74380ec40fcddb823871ecf441c85670b9f273 SHA512 7bf3e87dbd19eb4e6806dff8a01c3ec61ea960bbd809d4bcbee96a46e169f97d0baf0fc85ab4a1efbbab07850e9b1060bae46c453ea6c42f5c23f8d921295efb
26
27 diff --git a/net-libs/libtorrent/files/libtorrent-cppunit.patch b/net-libs/libtorrent/files/libtorrent-cppunit.patch
28 deleted file mode 100644
29 index eed21733b29..00000000000
30 --- a/net-libs/libtorrent/files/libtorrent-cppunit.patch
31 +++ /dev/null
32 @@ -1,36 +0,0 @@
33 -From b8b24b58a9bed6db1c886ea71a9bb407fb41fc2f Mon Sep 17 00:00:00 2001
34 -From: rakshasa <sundell.software@×××××.com>
35 -Date: Sun, 23 Oct 2016 08:54:11 +0900
36 -Subject: [PATCH] Use pkg-config for cppunit.
37 -
38 ----
39 - configure.ac | 9 +++++----
40 - 1 file changed, 5 insertions(+), 4 deletions(-)
41 -
42 -diff --git a/configure.ac b/configure.ac
43 -index 2b3eb7ab..65e34872 100644
44 ---- a/configure.ac
45 -+++ b/configure.ac
46 -@@ -19,7 +19,6 @@ AC_SUBST(LIBTORRENT_INTERFACE_VERSION_NO)
47 -
48 - AM_INIT_AUTOMAKE
49 - AC_CONFIG_HEADERS(config.h)
50 --AM_PATH_CPPUNIT(1.9.6)
51 -
52 - AC_PROG_CXX
53 -
54 -@@ -60,9 +59,11 @@ CC_ATTRIBUTE_VISIBILITY
55 - AX_PTHREAD
56 - AX_CHECK_ZLIB
57 -
58 --CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
59 --CXXFLAGS="$PTHREAD_CFLAGS $CXXFLAGS"
60 --LIBS="$PTHREAD_LIBS $LIBS"
61 -+PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
62 -+
63 -+CFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CFLAGS"
64 -+CXXFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CXXFLAGS"
65 -+LIBS="$PTHREAD_LIBS $CPPUNIT_LIBS $LIBS"
66 -
67 - AC_ARG_ENABLE(openssl,
68 - [ --disable-openssl Don't use OpenSSL's SHA1 implementation.],
69
70 diff --git a/net-libs/libtorrent/libtorrent-0.13.6-r1.ebuild b/net-libs/libtorrent/libtorrent-0.13.6-r1.ebuild
71 deleted file mode 100644
72 index 402b6608920..00000000000
73 --- a/net-libs/libtorrent/libtorrent-0.13.6-r1.ebuild
74 +++ /dev/null
75 @@ -1,61 +0,0 @@
76 -# Copyright 1999-2018 Gentoo Foundation
77 -# Distributed under the terms of the GNU General Public License v2
78 -
79 -EAPI=5
80 -
81 -inherit eutils libtool toolchain-funcs
82 -
83 -DESCRIPTION="BitTorrent library written in C++ for *nix"
84 -HOMEPAGE="https://rakshasa.github.io/rtorrent/"
85 -SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
86 -
87 -LICENSE="GPL-2"
88 -
89 -# The README says that the library ABI is not yet stable and dependencies on
90 -# the library should be an explicit, syncronized version until the library
91 -# has had more time to mature. Until it matures we should not include a soname
92 -# subslot.
93 -SLOT="0"
94 -
95 -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"
96 -IUSE="debug ipv6 libressl ssl test"
97 -
98 -RDEPEND="
99 - sys-libs/zlib
100 - >=dev-libs/libsigc++-2.2.2:2
101 - ssl? (
102 - !libressl? ( <dev-libs/openssl-1.1:0= )
103 - libressl? ( dev-libs/libressl:= )
104 - )"
105 -DEPEND="${RDEPEND}
106 - virtual/pkgconfig
107 - test? ( dev-util/cppunit )"
108 -
109 -src_prepare() {
110 - elibtoolize
111 -}
112 -
113 -src_configure() {
114 - # bug 518582
115 - local disable_instrumentation
116 - 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
117 - $(tc-getCC) ${CFLAGS} -o /dev/null -x c "${T}/sync_add_and_fetch.c" >/dev/null 2>&1
118 - if [[ $? -ne 0 ]]; then
119 - disable_instrumentation="--disable-instrumentation"
120 - fi
121 -
122 - # configure needs bash or script bombs out on some null shift, bug #291229
123 - CONFIG_SHELL=${BASH} econf \
124 - --enable-aligned \
125 - $(use_enable debug) \
126 - $(use_enable ipv6) \
127 - $(use_enable ssl openssl) \
128 - ${disable_instrumentation} \
129 - --with-posix-fallocate
130 -}
131 -
132 -src_install() {
133 - default
134 -
135 - prune_libtool_files --all
136 -}
137
138 diff --git a/net-libs/libtorrent/libtorrent-0.13.6-r2.ebuild b/net-libs/libtorrent/libtorrent-0.13.6-r2.ebuild
139 deleted file mode 100644
140 index 52019c36aa2..00000000000
141 --- a/net-libs/libtorrent/libtorrent-0.13.6-r2.ebuild
142 +++ /dev/null
143 @@ -1,69 +0,0 @@
144 -# Copyright 1999-2018 Gentoo Foundation
145 -# Distributed under the terms of the GNU General Public License v2
146 -
147 -EAPI=6
148 -
149 -inherit autotools toolchain-funcs
150 -
151 -DESCRIPTION="BitTorrent library written in C++ for *nix"
152 -HOMEPAGE="https://rakshasa.github.io/rtorrent/"
153 -SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
154 -
155 -LICENSE="GPL-2"
156 -
157 -# The README says that the library ABI is not yet stable and dependencies on
158 -# the library should be an explicit, syncronized version until the library
159 -# has had more time to mature. Until it matures we should not include a soname
160 -# subslot.
161 -SLOT="0"
162 -
163 -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"
164 -IUSE="debug ipv6 libressl ssl test"
165 -
166 -RDEPEND="
167 - sys-libs/zlib
168 - >=dev-libs/libsigc++-2.2.2:2
169 - ssl? (
170 - !libressl? ( dev-libs/openssl:0= )
171 - libressl? ( dev-libs/libressl:= )
172 - )"
173 -DEPEND="${RDEPEND}
174 - virtual/pkgconfig
175 - dev-util/cppunit"
176 -
177 -PATCHES=(
178 - "${FILESDIR}/${PN}-cppunit.patch"
179 - "${FILESDIR}/${PN}-0001-Fix-the-DH-parameters-generation-with-OpenSSL-1.1.patch"
180 - "${FILESDIR}/${PN}-openssl-1.1-part2.patch"
181 - "${FILESDIR}/${PN}-openssl-1.1-part3.patch"
182 -)
183 -
184 -src_prepare() {
185 - default
186 - eautoreconf
187 -}
188 -
189 -src_configure() {
190 - # bug 518582
191 - local disable_instrumentation
192 - 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
193 - $(tc-getCC) ${CFLAGS} -o /dev/null -x c "${T}/sync_add_and_fetch.c" >/dev/null 2>&1
194 - if [[ $? -ne 0 ]]; then
195 - disable_instrumentation="--disable-instrumentation"
196 - fi
197 -
198 - # configure needs bash or script bombs out on some null shift, bug #291229
199 - CONFIG_SHELL=${BASH} econf \
200 - --enable-aligned \
201 - $(use_enable debug) \
202 - $(use_enable ipv6) \
203 - $(use_enable ssl openssl) \
204 - ${disable_instrumentation} \
205 - --with-posix-fallocate
206 -}
207 -
208 -src_install() {
209 - default
210 -
211 - find "${D}" -name '*.la' -delete
212 -}
213
214 diff --git a/net-libs/libtorrent/libtorrent-0.13.6.ebuild b/net-libs/libtorrent/libtorrent-0.13.6.ebuild
215 deleted file mode 100644
216 index 90e62d00ecf..00000000000
217 --- a/net-libs/libtorrent/libtorrent-0.13.6.ebuild
218 +++ /dev/null
219 @@ -1,52 +0,0 @@
220 -# Copyright 1999-2018 Gentoo Foundation
221 -# Distributed under the terms of the GNU General Public License v2
222 -
223 -EAPI=5
224 -
225 -inherit eutils libtool toolchain-funcs
226 -
227 -DESCRIPTION="BitTorrent library written in C++ for *nix"
228 -HOMEPAGE="https://rakshasa.github.io/rtorrent/"
229 -SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
230 -
231 -LICENSE="GPL-2"
232 -
233 -# The README says that the library ABI is not yet stable and dependencies on
234 -# the library should be an explicit, syncronized version until the library
235 -# has had more time to mature. Until it matures we should not include a soname
236 -# subslot.
237 -SLOT="0"
238 -
239 -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"
240 -IUSE="debug ipv6 libressl ssl test"
241 -
242 -RDEPEND="
243 - sys-libs/zlib
244 - >=dev-libs/libsigc++-2.2.2:2
245 - ssl? (
246 - !libressl? ( <dev-libs/openssl-1.1:0= )
247 - libressl? ( dev-libs/libressl:= )
248 - )"
249 -DEPEND="${RDEPEND}
250 - virtual/pkgconfig
251 - test? ( dev-util/cppunit )"
252 -
253 -src_prepare() {
254 - elibtoolize
255 -}
256 -
257 -src_configure() {
258 - # configure needs bash or script bombs out on some null shift, bug #291229
259 - CONFIG_SHELL=${BASH} econf \
260 - --enable-aligned \
261 - $(use_enable debug) \
262 - $(use_enable ipv6) \
263 - $(use_enable ssl openssl) \
264 - --with-posix-fallocate
265 -}
266 -
267 -src_install() {
268 - default
269 -
270 - prune_libtool_files --all
271 -}