gentoo resync : 21.10.2017

3 files changed, 5 insertions, 107 deletions

diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 49a9d700ac25..3e6a098e99a9 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -5,10 +5,8 @@ AUX libtorrent-rasterbar-1.0.11-move-header.patch 1277 SHA256 76b30ae734a927ac8f
 AUX libtorrent-rasterbar-1.0.9-test_torrent_parse.patch 1240 SHA256 c736e1e6641b19d47f11b13e7e732a6344357c47b1c65aa6108ed9eaae641002 SHA512 8e6cca0ac5d1e1b43e771921c64258b61e5c3c1249ae9c1b80d784153d919aff1eb7ebf3141a7bc5b926553b2c3c027a5659703da52b9f901c77bb288436edbb WHIRLPOOL 8ed51aa4b0aecb65c886f73cc1276e845a7e1527a76cc623b49965754018f399721d0f19a5c40452927a69ac390439b40ecbca5c09f68d131f5d935a0c4bce10
 DIST libtorrent-rasterbar-1.0.10.tar.gz 3324494 SHA256 a865ceaca8b14acdd7be56d361ce4e64361299647e157ef7b3ac7e2812ca4c3e SHA512 08976239ec12e2d67a974dadf3f16330f48e4b6de314f9d97c5fbbdbc696b76b6b1f8e20ceab6830d46d17b1bfd7e2fe4048fb1a5a97ece12c242c0cd0f7ded2 WHIRLPOOL 1e4ef2fb41eef0b825bd7c8c665638e3f689c3cefca3caa18a01c328caad9d31cd417fb49d25a7d55da6457a89e35a891427d70fb4f4d070c74be2e2e0347a60
 DIST libtorrent-rasterbar-1.0.11.tar.gz 3325786 SHA256 828d686770346f6da2c143c5a2844c5f5e407eb4a37982e90022763508abd62f SHA512 770d16b241174ae4b121af9b2ac7bcde8b14c6ed99352b827b760a3cbdc2c0ebd0d505319762897720c5f72acdff506ee9948ac1140e6d4591805eca5439b184 WHIRLPOOL e56bfe0830cfc7776436552171b14b08913d99a2c726c9eefa828027caaa96d9c3d97e6442a3b53f315eaa3e7e0f68175d813dbab1d6de1da5937054fc6cac9c
-DIST libtorrent-rasterbar-1.1.4.tar.gz 3917557 SHA256 ccf42367803a6df7edcf4756d1f7d0a9ce6158ec33b851b3b58fd470ac4eeba6 SHA512 50f5dfffbd9e6ba21dbe328be17962f29088a326c2c2bf177e1137ed2900323b9a5bae75ee63635404928452f206c72dd4f9100438a6b802bd36b11430e51bc3 WHIRLPOOL f1231e97cdaf820910dafbaf83f9edadf3b70a8fadc71b370e9813d9b9893e6ee893fccfc71a20438ca0b138ac9035c220b656843e7af2755451bf6587f07fc5
 DIST libtorrent-rasterbar-1.1.5.tar.gz 3942894 SHA256 103134068389155a0f2bccaca72a57765460eb8188495089dcad280dcf426930 SHA512 d0e7fe944c8a396aaf79ce80c7513be07a855bc8a9eee3bca46ed83d5e190aaa5ea4dc9a8a7208e27e18ae8f15733e6e34eabd375f0bde43d4dc4607840782e7 WHIRLPOOL 1f78afceb67a69418d2afac915616812fe3a223c548ba2baf7e643fc5e63c79bd87998473ac4b6cab6ac0093d7f43ac91bcfba41c9d6ce0fc1ac46914fce74d2
 EBUILD libtorrent-rasterbar-1.0.10.ebuild 2431 SHA256 c2b6473d53562301ec57d3ea147d30a61715b5ba3ca027f9c2c90bd4c63c6f44 SHA512 44a727e1e5f8fc1e18d1ba64807fc822e166afb1e2b7b274343232f526972d865c22feccd593dcbdcc488557f139a7aeb6a85bae4cf2e29f8c271a204dfd6857 WHIRLPOOL 8a8ebff96da931f3c402189b1d040998a14f578efcc5efedb5d4b80f71ff3ac94c757c76e6ff0bb832c8bb4dc8cd93b665ed903f05675c10cc1f3f931302ba8c
 EBUILD libtorrent-rasterbar-1.0.11-r1.ebuild 2623 SHA256 5cbf92b7321c8ace0bb9f09219c049ecb09631fe00394d4b4e9840f318bd1362 SHA512 486a328d3ee6cb6d434a75f3368995a28b85193e9aa3b8a761d52c710e201112b2a9a89fd127ae87370d2eebc5cc06c4122f792c21d80c0d698c1125f673bd77 WHIRLPOOL c3b2a633fdc1535e3da2381c79a49da4baf0a94d06dca1a4483cd46388c3c3ae8a2aab04ada68e5895c1226b87bc2d479fc9cb71b2e050aaf0cfeaacfdd8b838
-EBUILD libtorrent-rasterbar-1.1.4.ebuild 2334 SHA256 99111ace0270ab88dc27cf8542285b6d603f26bf7889d063c17175f5d40a272d SHA512 c40d33148287943821e6da1ac724cf7124af40d44364b2875ca1f429dd021d8fc237244d0eb23f5df70dcd4d1276f251033e329caafef647c6a731d82c23fbae WHIRLPOOL 12d6e247f9894f3c8a9c056547e4705d161bb87e0d9a2ea4488b88295e41dac69274c9dd38353f0eb678a151653685e97af15a52f8b6d92dfe2841b7a2c4f5fb
-EBUILD libtorrent-rasterbar-1.1.5.ebuild 2334 SHA256 99111ace0270ab88dc27cf8542285b6d603f26bf7889d063c17175f5d40a272d SHA512 c40d33148287943821e6da1ac724cf7124af40d44364b2875ca1f429dd021d8fc237244d0eb23f5df70dcd4d1276f251033e329caafef647c6a731d82c23fbae WHIRLPOOL 12d6e247f9894f3c8a9c056547e4705d161bb87e0d9a2ea4488b88295e41dac69274c9dd38353f0eb678a151653685e97af15a52f8b6d92dfe2841b7a2c4f5fb
+EBUILD libtorrent-rasterbar-1.1.5-r1.ebuild 2402 SHA256 40233eee2963010229498247cf8081f1307a6ba51ab3b028ca009b9706365bd9 SHA512 2286e415d754cefbb77fd85ab0bad0ad50811c75c936c2446d09350b9ed2144c39fc8b14c7ec2862fd3c61cce0dfd96ff8e633c03aeb29991331834b0e2f4f52 WHIRLPOOL 2a5a7e0fc15bab29016e6f6942935ad9ac4bce2e40a5ced46e9a93c5307803aff78e74feb79501026a9e5d89ef7e7aed241dc011581b3143825e18ee6b222819
 MISC metadata.xml 527 SHA256 e53fe78e5ff72e704f0119e0226da2416169291e7a840340c811dd123d72538e SHA512 7dd3d0492dd77ffb05fa50b96253d8e7cc01c86b9eedf3891a5b8b09e49ef8d51747890a874609c077d95d5144f949bb31db9bb40e0ba520a3917a548db129f3 WHIRLPOOL 8f531637c7660ea459f60795f94db29f575552fb6a015283c9253d01d7c7140028b645985109e838bdb45ecab9e43acb57b58269c8af69523e3eb7ba1f07f06e
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.4.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.5-r1.ebuild
index 86fa8d7e920c..ccafa8fcf824 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.4.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.5-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 DISTUTILS_OPTIONAL=true
 DISTUTILS_IN_SOURCE_BUILD=true
 
-inherit distutils-r1 eutils versionator
+inherit distutils-r1 flag-o-matic versionator
 
 MY_PV=$(replace_all_version_separators _)
 
@@ -54,6 +54,8 @@ src_prepare() {
 }
 
 src_configure() {
+	append-cxxflags -std=c++11 # bug 634506
+
 	local myeconfargs=(
 		$(use_enable debug)
 		$(use_enable debug logging)
@@ -98,5 +100,5 @@ src_install() {
 	}
 	use python && distutils-r1_src_install
 
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.5.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.5.ebuild
deleted file mode 100644
index 86fa8d7e920c..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.5.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit distutils-r1 eutils versionator
-
-MY_PV=$(replace_all_version_separators _)
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="http://libtorrent.org"
-SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug +dht doc examples libressl python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	virtual/libiconv
-	examples? ( !net-p2p/mldonkey )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-src_prepare() {
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
-	# prepend -I${S}/... to ensure bindings use the right headers
-	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug logging)
-		$(use_enable debug disk-stats)
-		$(use_enable dht dht $(usex debug logging yes))
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-libiconv
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		python_configure() {
-			econf "${myeconfargs[@]}" \
-				--enable-python-binding \
-				--with-boost-python="${EPYTHON#python}"
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	prune_libtool_files
-}