gentoo resync : 02.09.2020

4 files changed, 10 insertions, 118 deletions

diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index f3a3d0361f49..cafca887a867 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -1,9 +1,7 @@
-DIST libtorrent-1.2.8.tar.gz 3583174 BLAKE2B ead7e28f7c29422526f8eab5611d98ba9a6d3827edf45c3819951a7ffb6f360debb818083bf0fa46e573005c3b9df3d3b4b3515c0498515449708b166e181705 SHA512 2a36412fb399f066de9768f4afd87ddbfc10fcd2a0b3a8be0a43bec6914497e71d9d4ffe4ff8ccc5544a048f799ccba6ce086ab6199f4dee66d1341f02d73f9a
+DIST libtorrent-1.2.9.tar.gz 3584800 BLAKE2B 5160056e227a54992ca4e490ffe0088d080aa9bade7a76f55eac26a644bab720c39a70b90d94f465ec711893249a084d9f77fa496be770585094b9b3ea4a1cdd SHA512 c547d96470f6a89f22adc0f5579ffb98b877a46f0a163698c49f1de57f23af60a7b0d3c1ca482e3ed8d3e35124d14a1d16a53e455f4d69f347fcb33c6ded75a8
 DIST libtorrent-rasterbar-1.1.14.tar.gz 4040571 BLAKE2B 38ea1a71e46bf18c9beeb869280e4949b199ab58c32f41e63f1c15c7c32db0d256b741ea707350e9e153695b9cc28e0a95385944bf76dbd5eb2055e66bb0f919 SHA512 b640ada016f8e68a3fb0e033dd33ab79b345b0f691aa722c4256b8cd8524c6e55067ccd1f11584984bbb82c0f64151f0b5223bd2b8431b899ffca46d2d31fff5
 DIST libtorrent-rasterbar-1.2.6.tar.gz 3611015 BLAKE2B 39323c223927272a4eb9bb93ad70acd62165b9b3eb3f4f45cb76f99a23b1e131b526c8d8370fbd7cc30c7e776a5f9b7990c989ceaa3566272adc25df639fc5ba SHA512 9f03e28449b08e18a98a1f1bf0571f470c56fabd2becde5bde56ad566611c8519b0b387939f285a552d1f0382446633b67d00b6b5ff7083e4d1420a3ce9232fc
-DIST libtorrent-rasterbar-1.2.7.tar.gz 4105179 BLAKE2B 126bb0b287c0573f755e918b3cf32a0a98c14b3b41f676d7842ea58deecc141b046b4bc18579cb9c20b324fb1361794ee6afedeff64d0b76f1bb6a95b82e10f7 SHA512 60dfb31b1300b3aa2219227b3a263ba73aedb54a90aa940c117027651779cb972d6e1badf9519f6ad7947233b54df608b829bab34493ceda9e4cb8913041a752
 EBUILD libtorrent-rasterbar-1.1.14.ebuild 2331 BLAKE2B a127a6db0a7266fc6f8ac0797693166aaf0104f2fa22b964d3630e1f09a0a2713e2e6b0bb089e8589033113432fdb0ec17e526e973bc224ee3c81b59984d88fe SHA512 dad2f1bfc68595be30c72a67eddc439e07bc394567144e6d81da407f5b3c115f0885815dcf5e4081264aa97a1161fb5c762285b3eee1e54ba8809adfc58ce6ac
-EBUILD libtorrent-rasterbar-1.2.6.ebuild 2516 BLAKE2B 62917b73acec8bdb2b7112402dece5f50ebb888d4bddb581e124eb03b2da7e72f245e27cdfb542fba80e8a48ef9a99f02cee7fff0741733fa1914af5c760cf79 SHA512 9e762812c7f09fc129e3309c9883c24e8ea425daf938e8a0b3a88fddbd729980330b515a372eb016e0d711b67c862fefa315402f024836b4529a3deb9a033c2c
-EBUILD libtorrent-rasterbar-1.2.7.ebuild 2454 BLAKE2B fc6c9d855dc9fa56ee0fec1ca77d0e31cf19e749004617046d67835d537107621342a8d854a6d58ef86d33269d823ec7236b8d178feaae937e1fe04ab489a501 SHA512 780ff64b582acdb7d39698d08fd22f3a80739afd917698571a441b7599b6f24a21075315233dbbbaa588a0da577f8bd3700a3edd072a1e7bf59fd52e29a95064
-EBUILD libtorrent-rasterbar-1.2.8.ebuild 2489 BLAKE2B 53bec76310e46e9e3e01cb58ff079e4c415b30116638431f2568e7e645841772e92b2abd3123a58b13ddc6cbeca7a0d6aa1d65c8a4e057c32d197069b61cc978 SHA512 7368f58d563d1af074049d7fa9a534b2fdf5fa8b8d06e0d49f15ffa5ae0a208783a941d9dc2ce0f4ea6a6c3f0913c568b1ff7395b082e5daf4d917a0032d9d64
+EBUILD libtorrent-rasterbar-1.2.6.ebuild 2499 BLAKE2B 6d231b994347cfec324e0d7ccd754af3855903d2cba91d131ec748ae600fed32208d0f2d0836e38232e85ea1bdad9c34e0d07e42236d9c5fc525f1ce3a88adf0 SHA512 7e324f71303f21b936fde171c3cbfbd1ec56dd4f53dd11eaffdd133e1fa2c0e07469a4d55cd1389e326caca358718a7d7b215a847a180d265c38eac66d0269ba
+EBUILD libtorrent-rasterbar-1.2.9.ebuild 2708 BLAKE2B 8745111f5bcf2a4884fad006764883e315623912fb318ec8fb590b30d27f1fb6915003a72d056441c56bd8c4eb920798c5dba7b853fe08a40ad6d7b17fb1f53e SHA512 b7f71dab2e5064ab464b0ee0a0febf08ed81c7dfbd96816b664240d143448639da76f3bbf8953ecc6b5176992132005b1d6131078dab1084e064220400d106ad
 MISC metadata.xml 524 BLAKE2B cb56b15139e8d52871acb1f2979178e182c385658d3fb59025e3f19e1844deb4c0442c12ad490c645d456ec09dd68c268fd6863a205f30a0c241a3d02f10a45b SHA512 47c117d10a88cd13375fa10bfaaa827012d0451713bfff80c587295f68f1243051c477611d9b830a7b525ff2bd77d38c2a45f172ecbe18ba66827e3e6ca664f3
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6.ebuild
index 2fb8281a2df6..45cbda7f47c4 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6.ebuild
@@ -72,7 +72,7 @@ src_configure() {
 		$(use_enable ssl encryption)
 		$(use_enable static-libs static)
 		$(use_enable test tests)
-		--with-boost="${EPREFIX}/usr"
+		--with-boost
 		--with-libiconv
 		--enable-logging
 	)
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.7.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.7.ebuild
deleted file mode 100644
index 5db9e76e2041..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.7.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit autotools distutils-r1
-
-MY_PV=$(ver_rs 1-2 '_')
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
-SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent_${MY_PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug +dht doc examples libressl python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-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() {
-	touch "${S}"/build-aux/config.rpath || die
-	eautoreconf
-
-	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 export-all)
-		$(use_enable debug logging)
-		$(use_enable dht)
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-boost="${EPREFIX}/usr"
-		--with-libiconv
-		--enable-logging
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		python_configure() {
-			econf "${myeconfargs[@]}" \
-				--enable-python-binding \
-				--with-boost-python="boost_${EPYTHON/./}"
-		}
-		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
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.8.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.9.ebuild
index ffb200fbe91e..1500e4416637 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.8.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.9.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads(+)"
 DISTUTILS_OPTIONAL=true
 DISTUTILS_IN_SOURCE_BUILD=true
 
-inherit autotools distutils-r1
+inherit autotools flag-o-matic distutils-r1
 
 DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
 HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
@@ -45,6 +45,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	mkdir -p "${S}"/build-aux || die
 	touch "${S}"/build-aux/config.rpath || die
+	append-cxxflags -std=c++14
 	eautoreconf
 
 	default
@@ -70,7 +71,7 @@ src_configure() {
 		$(use_enable ssl encryption)
 		$(use_enable static-libs static)
 		$(use_enable test tests)
-		--with-boost="${EPREFIX}/usr"
+		--with-boost
 		--with-libiconv
 		--enable-logging
 	)
@@ -81,6 +82,9 @@ src_configure() {
 			econf "${myeconfargs[@]}" \
 				--enable-python-binding \
 				--with-boost-python="boost_${EPYTHON/./}"
+				# git rid of c++11
+				sed s/-std=c++11//g < bindings/python/compile_cmd > bindings/python/compile_cmd.new || die
+				mv -f bindings/python/compile_cmd.new bindings/python/compile_cmd || die
 		}
 		distutils-r1_src_configure
 	fi