diff options
29 files changed, 25 insertions, 36 deletions
diff --git a/app-leechcraft/lc-bittorrent/lc-bittorrent-9999.ebuild b/app-leechcraft/lc-bittorrent/lc-bittorrent-9999.ebuild index de743570cd66..4337e2d6adeb 100644 --- a/app-leechcraft/lc-bittorrent/lc-bittorrent-9999.ebuild +++ b/app-leechcraft/lc-bittorrent/lc-bittorrent-9999.ebuild @@ -13,7 +13,7 @@ IUSE="debug geoip" DEPEND=" ~app-leechcraft/lc-core-${PV} - net-libs/rb_libtorrent + net-libs/libtorrent-rasterbar dev-qt/qtxml:5 dev-qt/qtwidgets:5 " diff --git a/net-fs/btfs/btfs-2.11.ebuild b/net-fs/btfs/btfs-2.11.ebuild index feb09559a7b6..9ff5db6e5d71 100644 --- a/net-fs/btfs/btfs-2.11.ebuild +++ b/net-fs/btfs/btfs-2.11.ebuild @@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86" CDEPEND=">=sys-fs/fuse-2.8.0 >=net-misc/curl-7.22.0 dev-libs/boost:= - >=net-libs/rb_libtorrent-0.16.0:=" + >=net-libs/libtorrent-rasterbar-0.16.0:=" DEPEND="${CDEPEND} virtual/pkgconfig" RDEPEND="${CDEPEND} diff --git a/net-fs/btfs/btfs-2.12.ebuild b/net-fs/btfs/btfs-2.12.ebuild index feb09559a7b6..9ff5db6e5d71 100644 --- a/net-fs/btfs/btfs-2.12.ebuild +++ b/net-fs/btfs/btfs-2.12.ebuild @@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86" CDEPEND=">=sys-fs/fuse-2.8.0 >=net-misc/curl-7.22.0 dev-libs/boost:= - >=net-libs/rb_libtorrent-0.16.0:=" + >=net-libs/libtorrent-rasterbar-0.16.0:=" DEPEND="${CDEPEND} virtual/pkgconfig" RDEPEND="${CDEPEND} diff --git a/net-fs/btfs/btfs-2.13.ebuild b/net-fs/btfs/btfs-2.13.ebuild index feb09559a7b6..9ff5db6e5d71 100644 --- a/net-fs/btfs/btfs-2.13.ebuild +++ b/net-fs/btfs/btfs-2.13.ebuild @@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86" CDEPEND=">=sys-fs/fuse-2.8.0 >=net-misc/curl-7.22.0 dev-libs/boost:= - >=net-libs/rb_libtorrent-0.16.0:=" + >=net-libs/libtorrent-rasterbar-0.16.0:=" DEPEND="${CDEPEND} virtual/pkgconfig" RDEPEND="${CDEPEND} diff --git a/net-libs/rb_libtorrent/Manifest b/net-libs/libtorrent-rasterbar/Manifest index 99d34b4f7758..99d34b4f7758 100644 --- a/net-libs/rb_libtorrent/Manifest +++ b/net-libs/libtorrent-rasterbar/Manifest diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.11-fix-abicompat.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-fix-abicompat.patch index eebee122551e..eebee122551e 100644 --- a/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.11-fix-abicompat.patch +++ b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-fix-abicompat.patch diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.11-fix-test_ssl.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-fix-test_ssl.patch index 2add42c7dd2c..2add42c7dd2c 100644 --- a/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.11-fix-test_ssl.patch +++ b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-fix-test_ssl.patch diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.11-move-header.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-move-header.patch index 589998b7fb3d..589998b7fb3d 100644 --- a/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.11-move-header.patch +++ b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-move-header.patch diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.9-test_torrent_parse.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.9-test_torrent_parse.patch index 658c0aa57156..658c0aa57156 100644 --- a/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.9-test_torrent_parse.patch +++ b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.9-test_torrent_parse.patch diff --git a/net-libs/rb_libtorrent/rb_libtorrent-1.0.10.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.10.ebuild index cc933fbd7dde..b5f9a0b39537 100644 --- a/net-libs/rb_libtorrent/rb_libtorrent-1.0.10.ebuild +++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.10.ebuild @@ -10,12 +10,11 @@ DISTUTILS_IN_SOURCE_BUILD=true inherit distutils-r1 eutils versionator -MY_P=libtorrent-rasterbar-${PV} # TODO: rename, bug 576126 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}/${MY_P}.tar.gz" +SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/8" @@ -42,8 +41,6 @@ DEPEND="${RDEPEND} sys-devel/libtool " -S=${WORKDIR}/${MY_P} - PATCHES=( "${FILESDIR}/${PN}-1.0.9-test_torrent_parse.patch" # master branch diff --git a/net-libs/rb_libtorrent/rb_libtorrent-1.0.11.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.11.ebuild index 1bc5f654383e..956de7c8054b 100644 --- a/net-libs/rb_libtorrent/rb_libtorrent-1.0.11.ebuild +++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.11.ebuild @@ -10,12 +10,11 @@ DISTUTILS_IN_SOURCE_BUILD=true inherit distutils-r1 versionator -MY_P=libtorrent-rasterbar-${PV} # TODO: rename, bug 576126 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}/${MY_P}.tar.gz" +SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/8" @@ -44,8 +43,6 @@ RDEPEND="${COMMON_DEPEND} examples? ( !net-p2p/mldonkey ) " -S=${WORKDIR}/${MY_P} - PATCHES=( "${FILESDIR}/${PN}-1.0.9-test_torrent_parse.patch" # RC_1_0 branch diff --git a/net-libs/rb_libtorrent/rb_libtorrent-1.1.1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.1.ebuild index 736789532d78..3de47f94ee69 100644 --- a/net-libs/rb_libtorrent/rb_libtorrent-1.1.1.ebuild +++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,12 +10,11 @@ DISTUTILS_IN_SOURCE_BUILD=true inherit distutils-r1 eutils versionator -MY_P=libtorrent-rasterbar-${PV} # TODO: rename, bug 576126 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}/${MY_P}.tar.gz" +SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/9" @@ -41,8 +40,6 @@ DEPEND="${RDEPEND} sys-devel/libtool " -S=${WORKDIR}/${MY_P} - src_prepare() { default diff --git a/net-libs/rb_libtorrent/rb_libtorrent-1.1.2.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.2.ebuild index 5a8412d4f63d..91626938f9c7 100644 --- a/net-libs/rb_libtorrent/rb_libtorrent-1.1.2.ebuild +++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.2.ebuild @@ -10,12 +10,11 @@ DISTUTILS_IN_SOURCE_BUILD=true inherit distutils-r1 eutils versionator -MY_P=libtorrent-rasterbar-${PV} # TODO: rename, bug 576126 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}/${MY_P}.tar.gz" +SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/9" @@ -41,8 +40,6 @@ DEPEND="${RDEPEND} sys-devel/libtool " -S=${WORKDIR}/${MY_P} - src_prepare() { default diff --git a/net-libs/rb_libtorrent/metadata.xml b/net-libs/libtorrent-rasterbar/metadata.xml index 4133516fb4f6..4133516fb4f6 100644 --- a/net-libs/rb_libtorrent/metadata.xml +++ b/net-libs/libtorrent-rasterbar/metadata.xml diff --git a/net-misc/fatrat/fatrat-1.2.0_beta2.ebuild b/net-misc/fatrat/fatrat-1.2.0_beta2.ebuild index 808e42c11d8f..ab50f764a2ef 100644 --- a/net-misc/fatrat/fatrat-1.2.0_beta2.ebuild +++ b/net-misc/fatrat/fatrat-1.2.0_beta2.ebuild @@ -17,7 +17,7 @@ IUSE="bittorrent +curl doc xmpp nls webinterface" RDEPEND="dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 - bittorrent? ( >=net-libs/rb_libtorrent-0.14.5 + bittorrent? ( >=net-libs/libtorrent-rasterbar-0.14.5 >=dev-cpp/asio-1.1.0 dev-qt/qtwebkit:4 ) curl? ( >=net-misc/curl-7.18.2 ) diff --git a/net-misc/fatrat/fatrat-1.2.0_beta2_p20150803.ebuild b/net-misc/fatrat/fatrat-1.2.0_beta2_p20150803.ebuild index e94bada93afb..67809dc3beb9 100644 --- a/net-misc/fatrat/fatrat-1.2.0_beta2_p20150803.ebuild +++ b/net-misc/fatrat/fatrat-1.2.0_beta2_p20150803.ebuild @@ -25,7 +25,7 @@ RDEPEND="dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 bittorrent? ( - >=net-libs/rb_libtorrent-0.14.5 + >=net-libs/libtorrent-rasterbar-0.14.5 >=dev-cpp/asio-1.1.0 dev-qt/qtwebkit:4 ) diff --git a/net-misc/fatrat/metadata.xml b/net-misc/fatrat/metadata.xml index a025d6c4d8f9..92c93a440df7 100644 --- a/net-misc/fatrat/metadata.xml +++ b/net-misc/fatrat/metadata.xml @@ -9,7 +9,7 @@ FatRat is an open source download manager for Linux. </longdescription> <use> - <flag name="bittorrent">Use the bittorrent protocol via net-libs/rb_libtorrent.</flag> + <flag name="bittorrent">Use the bittorrent protocol via <pkg>net-libs/libtorrent-rasterbar</pkg></flag> <flag name="webinterface">Enable builtin webinterface.</flag> </use> </pkgmetadata> diff --git a/net-p2p/deluge/deluge-1.3.12.ebuild b/net-p2p/deluge/deluge-1.3.12.ebuild index eae377ed2552..211adf6ab7f5 100644 --- a/net-p2p/deluge/deluge-1.3.12.ebuild +++ b/net-p2p/deluge/deluge-1.3.12.ebuild @@ -26,10 +26,10 @@ SLOT="0" IUSE="geoip gtk libnotify setproctitle sound webinterface" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -DEPEND=">=net-libs/rb_libtorrent-0.14.9[python] +DEPEND=">=net-libs/libtorrent-rasterbar-0.14.9[python] dev-python/setuptools[${PYTHON_USEDEP}] dev-util/intltool" -RDEPEND=">=net-libs/rb_libtorrent-0.14.9[python] +RDEPEND=">=net-libs/libtorrent-rasterbar-0.14.9[python] dev-python/chardet[${PYTHON_USEDEP}] dev-python/pyopenssl[${PYTHON_USEDEP}] dev-python/pyxdg[${PYTHON_USEDEP}] diff --git a/net-p2p/deluge/deluge-1.3.13-r2.ebuild b/net-p2p/deluge/deluge-1.3.13-r2.ebuild index 4e4645a1dd4f..537cc88b26e5 100644 --- a/net-p2p/deluge/deluge-1.3.13-r2.ebuild +++ b/net-p2p/deluge/deluge-1.3.13-r2.ebuild @@ -34,7 +34,7 @@ PATCHES=( "${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch" ) -CDEPEND=">=net-libs/rb_libtorrent-0.16.17[python,${PYTHON_USEDEP}]" +CDEPEND=">=net-libs/libtorrent-rasterbar-0.16.17[python,${PYTHON_USEDEP}]" DEPEND="${CDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] dev-util/intltool" diff --git a/net-p2p/deluge/deluge-1.3.14.ebuild b/net-p2p/deluge/deluge-1.3.14.ebuild index 4e4645a1dd4f..537cc88b26e5 100644 --- a/net-p2p/deluge/deluge-1.3.14.ebuild +++ b/net-p2p/deluge/deluge-1.3.14.ebuild @@ -34,7 +34,7 @@ PATCHES=( "${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch" ) -CDEPEND=">=net-libs/rb_libtorrent-0.16.17[python,${PYTHON_USEDEP}]" +CDEPEND=">=net-libs/libtorrent-rasterbar-0.16.17[python,${PYTHON_USEDEP}]" DEPEND="${CDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] dev-util/intltool" diff --git a/net-p2p/deluge/deluge-1.3.9999.ebuild b/net-p2p/deluge/deluge-1.3.9999.ebuild index 96737427d346..8055972cdb31 100644 --- a/net-p2p/deluge/deluge-1.3.9999.ebuild +++ b/net-p2p/deluge/deluge-1.3.9999.ebuild @@ -35,7 +35,7 @@ PATCHES=( "${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch" ) -CDEPEND=">=net-libs/rb_libtorrent-0.14.9[python,${PYTHON_USEDEP}]" +CDEPEND=">=net-libs/libtorrent-rasterbar-0.14.9[python,${PYTHON_USEDEP}]" DEPEND="${CDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] dev-util/intltool" diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild index c6e4259d2aec..42a1addef2d3 100644 --- a/net-p2p/deluge/deluge-9999.ebuild +++ b/net-p2p/deluge/deluge-9999.ebuild @@ -34,7 +34,7 @@ PATCHES=( "${FILESDIR}/${PN}-1.3.12-fix_scheduler_plugin.patch" ) -CDEPEND=">=net-libs/rb_libtorrent-0.14.9[python,${PYTHON_USEDEP}]" +CDEPEND=">=net-libs/libtorrent-rasterbar-0.14.9[python,${PYTHON_USEDEP}]" DEPEND="${CDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] dev-util/intltool" diff --git a/net-p2p/qbittorrent/qbittorrent-3.3.10.ebuild b/net-p2p/qbittorrent/qbittorrent-3.3.10.ebuild index f33532cd9f02..485a4b94e5f5 100644 --- a/net-p2p/qbittorrent/qbittorrent-3.3.10.ebuild +++ b/net-p2p/qbittorrent/qbittorrent-3.3.10.ebuild @@ -30,7 +30,7 @@ RDEPEND=" dev-qt/qtnetwork:5[ssl] >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5,X?] dev-qt/qtxml:5 - >=net-libs/rb_libtorrent-1.0.6 + >=net-libs/libtorrent-rasterbar-1.0.6 sys-libs/zlib dbus? ( dev-qt/qtdbus:5 ) X? ( diff --git a/net-p2p/qbittorrent/qbittorrent-3.3.11.ebuild b/net-p2p/qbittorrent/qbittorrent-3.3.11.ebuild index 1221fe2d7a4d..06ecba507335 100644 --- a/net-p2p/qbittorrent/qbittorrent-3.3.11.ebuild +++ b/net-p2p/qbittorrent/qbittorrent-3.3.11.ebuild @@ -30,7 +30,7 @@ RDEPEND=" dev-qt/qtnetwork:5[ssl] >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5,X?] dev-qt/qtxml:5 - >=net-libs/rb_libtorrent-1.0.6 + >=net-libs/libtorrent-rasterbar-1.0.6 sys-libs/zlib dbus? ( dev-qt/qtdbus:5 ) X? ( diff --git a/net-p2p/qbittorrent/qbittorrent-3.3.7.ebuild b/net-p2p/qbittorrent/qbittorrent-3.3.7.ebuild index 7fbaf8001a9f..270cf58e9b59 100644 --- a/net-p2p/qbittorrent/qbittorrent-3.3.7.ebuild +++ b/net-p2p/qbittorrent/qbittorrent-3.3.7.ebuild @@ -27,7 +27,7 @@ REQUIRED_USE=" RDEPEND=" dev-libs/boost:= - >=net-libs/rb_libtorrent-1.0.6 + >=net-libs/libtorrent-rasterbar-1.0.6 sys-libs/zlib !qt5? ( >=dev-libs/qjson-0.8.1[qt4(+)] diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild index c9cd2adbda54..332e40636c50 100644 --- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild +++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild @@ -27,7 +27,7 @@ REQUIRED_USE=" RDEPEND=" dev-libs/boost:= - >=net-libs/rb_libtorrent-1.0.6 + >=net-libs/libtorrent-rasterbar-1.0.6 sys-libs/zlib !qt5? ( >=dev-libs/qjson-0.8.1[qt4(+)] diff --git a/net-p2p/tribler/tribler-6.3.3-r1.ebuild b/net-p2p/tribler/tribler-6.3.3-r1.ebuild index d91b623846e9..930e4c6da40b 100644 --- a/net-p2p/tribler/tribler-6.3.3-r1.ebuild +++ b/net-p2p/tribler/tribler-6.3.3-r1.ebuild @@ -29,7 +29,7 @@ RDEPEND=" dev-python/twisted-core dev-python/wxpython dev-libs/openssl:0[-bindist] - net-libs/rb_libtorrent[python] + net-libs/libtorrent-rasterbar[python] vlc? ( media-video/vlc media-video/ffmpeg:0 diff --git a/profiles/package.mask b/profiles/package.mask index e1a08fdfe95e..a5f780e6440b 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -350,7 +350,7 @@ x11-libs/gtk+:1 # Markos Chandras <hwoarang@gentoo.org> (10 Dec 2016) # Reverse dependencies need testing, wrt bug #580760 ->=net-libs/rb_libtorrent-1.1.1 +>=net-libs/libtorrent-rasterbar-1.1.1 # Kent Fredric (19 Nov 2016) # virtual/perl-MathBigInt-1.999.726+ Mask Block diff --git a/profiles/updates/1Q-2017 b/profiles/updates/1Q-2017 index 225b927b70a8..10a538b5c153 100644 --- a/profiles/updates/1Q-2017 +++ b/profiles/updates/1Q-2017 @@ -32,3 +32,4 @@ move net-misc/6tunnel net-vpn/6tunnel move net-misc/i2pd net-vpn/i2pd move net-misc/tor net-vpn/tor move net-p2p/i2p net-vpn/i2p +move net-libs/rb_libtorrent net-libs/libtorrent-rasterbar |