gentoo resync : 12.08.2018

7 files changed, 2 insertions, 208 deletions

diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index b8a36a598a39..0ddc93454ba8 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -1,16 +1,10 @@
-AUX rtorrent-0.9.1-ncurses.patch 416 BLAKE2B 7e94844be4d5c2e50f8d0b88d6c2861d129b8b0627b56a78cbc4d2b47fb028aaea73ce9233118587139a0dad4cd24ba4c001679b168f7ec8150f5e0ec2450310 SHA512 bc36d56880fbfb99d6e5cb19688d733d79a89c8aec88913f5962ea72503e4103b34eb2a67be76bbe80c35beda972f6fc5dbf1947f89624bf5e117774688e7cf8
-AUX rtorrent-0.9.4-tinfo.patch 1137 BLAKE2B 3b48a7755e858f1d6d22d0051c824b8fdf9ed24e1e390996a5dbb28d0d75733a9d9cabe86d5b75b5cea75e52251b3770295219bc4e1d49a15ab906672809a3dd SHA512 5f571daa1bdaa8823bbbf52c66df3ff88be487e3fdaa8ea4f45c26b13336995a4a81a712766a8181bc85746e458652bb11c4dcc28d76da3137025e52e614c179
-AUX rtorrent-0.9.6-cppunit-pkgconfig.patch 857 BLAKE2B 89a3d1e869e6d97a3ce511e5ed8f8eec025ad5de77fc17252a3c66cb8c232bfde919f8a0535728e19d43a1575b38323b382150e2e3c54cba8481243c84fff2b7 SHA512 94cf317ef2ec8dae361fa82df156bee153f58c927bdc4f203c5318ba839f8a7024021a4d2e90771b067f313c8ff524659b41aaa386b1a2341561f196c97fc03f
 AUX rtorrent-0.9.7-execinfo-configure.patch 907 BLAKE2B e94c2ec320ca3a7734860eca7efc520a924babf30ea30faedfa5cb38d6a5dd71ad5c16f1f12fc0759ebacd15d7faf6e2638c8c42bac00e020398d8e2e14a0981 SHA512 3f667508aec829b174a4d3adeb6336f77786f91e34d1d2c52c23f7da453422e433a69872000859799721315546519554bd25e0b6ce1b57fc32f6399f718cdf22
 AUX rtorrent-0.9.7-tinfo.patch 1457 BLAKE2B abbca9424939f02f341cfb4f15c10d4e17624add223e6c2365b795555ee7e70f6abc3e6dfe8455bef493df7c549df3117cbd9f19095a9219b106da8191d5c951 SHA512 7f4a9262dfd4a89329cf90818d49c76c0310318bb6bf61055336235a319b5717a6b6d25903c93cf4160b718f17d78cf9192138b72d8ddd1f46494c001bf30979
 AUX rtorrent.1 18204 BLAKE2B 4e757f00d9a08978e09593e89b17fb7d7e4afe7f5064ed8bb7d9316f1450471ec42e006478df43eb2a7d4fdcea0445237b0e053f54bd1f4e8ad7db2878b628a1 SHA512 f2d3fb87fd7c321822ce9e61cc334682f9692e3f86b42cb3d7d5826dec53d56e631e20455e0ea1e53448c11386988a6e7a70a91ed2923f90852956ad3fdafcfe
 AUX rtorrentd.conf 13 BLAKE2B 80db665e7f75c50c02134cced87847926d23ea256868fb6d1213faaa8be1879cbc69e72f006b49b33dc99c0a9dcace2db90c8917ca272554c348bd1e6293514c SHA512 f241452b812a1837660f9ad52881feacc02825e82ea7ac19acc662b4219dd58997ea908275b8c9ee78ed791babf79c1a91069dc6d5b5fb3c461e3026cdeab73f
 AUX rtorrentd.init 871 BLAKE2B 3f83e6bb52044e293127aaf7ae505c1dc6422698360537edb5c898e512e52fc42efff34f000937f00f16839c5b02beb64540af42ae6b1849a81424bfbf392656 SHA512 f71d55ed18ef9d32c56be5508c91cafb0f10609cf5402e7ff1b63a7166b9b52a58aa6c580a7709e4449a279caba6adcf4f2fc76a6768a82f12993a3df92124aa
 AUX rtorrentd_at.service 308 BLAKE2B 2aac1f49a25d35136db25a13c08d1847d21701272d56a6ca06eee6a8426719c340a041568cc1d575fae341a49fa1f53a132ba11ff73180b1bee246197d8119c2 SHA512 cc707500af2dbb0cc0c8297512807f9312445cf70de00bcf2f7267388834f1d0454eaaa9a8b52387e5f84288400286414225c55af0f560f61a8d0858971a8615
-DIST rtorrent-0.9.6.tar.gz 610845 BLAKE2B 4a4faccffe79e7d877e3be9a9b16edcea87f1969ee2689f7789ebd738a19a5a41f5eae3b33c5b874b5c31ad8e872baa88374fae2047dbc76d4f1c0bc6d7ecbd4 SHA512 704f7b79d5bc78b817da21a6886662a5a97fde210a110c50f708bdc18e1dcf3ef5c5f4e2740261d41221cfc69c19926bf34e10057adf10601da9e6e06b2cef75
 DIST rtorrent-0.9.7.tar.gz 610149 BLAKE2B 3f1316b0142dade9662630ad40132c5968d7b0ded32d7ae13d1ec1fdb7fec794812203fece367bf6abfd02212ed94d308046d40eb3e7562c408e8da13b23c23d SHA512 e663bd8984bcec91868beaf16d215708bdea8872338365ba6a05c9ea830b2aff045257bbc8bd0414d84009ee85852822c97bb073dfb41c21e3b0081ecaeecc00
-EBUILD rtorrent-0.9.6-r1.ebuild 1661 BLAKE2B 3b051276ea6b869219bc999793189f9ae49586d5e30e59d5cda59bf0c4d02b5af22cb1d35dd135a18e7930f7118f416ef07ca54a33bd2867def21857975b6b34 SHA512 7d2821df7ae04bda406f0afe964bf1edb858d407181e157c476a278a0a1daccfa77acaa1126e9a36bff4f6033b4289a239c91e9517260b611b93f3940c187272
-EBUILD rtorrent-0.9.6.ebuild 1607 BLAKE2B 7bba30c404e10bb4e723ebffe0f1cbf0da15750259cf2e5a3061e0768ea6cae78d4be6b51be8ec1266e2df1bfb2081d6d5bff8318c33b00e51e01487f9cf62f3 SHA512 8fe7ab26bd876073b09ae926e979a32d926374a411a70753b7133731f5a381ec2577df095689fa9fc7d759792e62dae7734324e24446b3c01f4f97322f17f04b
-EBUILD rtorrent-0.9.7-r1.ebuild 1937 BLAKE2B ea0d89115b19e4c057e96821794c8b43d45097992fcaf485b15cd0171c91c22329791c609a72e2bf7a28fbca7864e492e60b776ba7bbaea65147a94bd83efc80 SHA512 294a073a9b7148a7830ddf673f842f3c47a57406c138b212ca61496f6ee8d4feff366318dfc981c15f1433be9dabc63c8e89d5feb4b6049327ba7bd177c8a80c
+EBUILD rtorrent-0.9.7-r1.ebuild 1935 BLAKE2B b0d440f6df64adebbb687391352de0542346132b90356361bcdf3a9037aed756ec0445f78d75a38d5336a805102be6f4fd4181c70ff6378b6556c78795107153 SHA512 5957237764d33c28ee2a065c9dc6388cf1c41c1a0d7822b5297a4d84232f2580de14de3f090a795ff3ee7dedad9fde95fd742b3f3c78e505244a773fd4809ee4
 EBUILD rtorrent-0.9.7.ebuild 1885 BLAKE2B 53df5b61398a823e1ec9495ea351ce4636e5c314a105240e774fe80cdd4ea0b05727b8a5aaf609d8460beb80766fb7c7b373400f7cf1932489b75dcfc6f9bbec SHA512 4a6a21e792f0fdf3d6a0b1e66778e78a04ef80485e4a5905cbda8e4a8e4af0da14f6514b14a47c74b6ae7934a8949e022f82e189e28d61c822fa40006fcd3ace
 MISC metadata.xml 676 BLAKE2B ec4ff11bbb2ba69ce911f527e77d14f2891307bf9f321a7da4eda884dd0bb93961275592617e19070f958b9ac91372133130f33770f527623076f5b5338e0969 SHA512 f2e5e3a709b1be52e3947529e4aa4bc9d279820333287d562c0254b761962ebb19ad9a47c8c9f181eb103ae1580ebd4d68b8ce1684598cde0aad0faa126dbbd6
diff --git a/net-p2p/rtorrent/files/rtorrent-0.9.1-ncurses.patch b/net-p2p/rtorrent/files/rtorrent-0.9.1-ncurses.patch
deleted file mode 100644
index 260cd9a38425..000000000000
--- a/net-p2p/rtorrent/files/rtorrent-0.9.1-ncurses.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/display/canvas.h
-+++ src/display/canvas.h
-@@ -48,5 +48,5 @@ class Canvas {
- public:
-   typedef std::vector<Attributes> attributes_list;
- 
--  Canvas(int x = 0, int y = 0, int width = 0, int height = 0);
-+  Canvas(int x = 0, int y = 0, int width = 1, int height = 1);
-   ~Canvas() { delwin(m_window); }
-   void                refresh()                                               { wnoutrefresh(m_window); }
diff --git a/net-p2p/rtorrent/files/rtorrent-0.9.4-tinfo.patch b/net-p2p/rtorrent/files/rtorrent-0.9.4-tinfo.patch
deleted file mode 100644
index 21ee708782b3..000000000000
--- a/net-p2p/rtorrent/files/rtorrent-0.9.4-tinfo.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-bug 462788
-
- configure.ac | 18 ++++++++++++------
- 1 file changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 430c15d..50ce687 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -31,15 +31,21 @@ TORRENT_WITHOUT_STATVFS()
- TORRENT_WITHOUT_STATFS()
- 
- AX_PTHREAD([], AC_MSG_ERROR([requires pthread]))
--AX_WITH_CURSES()
--
--if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then
--   AC_MSG_ERROR([requires either NcursesW or Ncurses library])
--fi
-+PKG_CHECK_MODULES([CURSES],[ncursesw],[
-+	AC_DEFINE(HAVE_NCURSESW_CURSES_H, 1)
-+	],
-+	[PKG_CHECK_MODULES([CURSES],[ncurses],[
-+		AC_DEFINE(HAVE_NCURSES_H, 1)
-+		],
-+		[AX_WITH_CURSES()
-+		if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then
-+			AC_MSG_ERROR([requires either NcursesW or Ncurses library])
-+		fi])
-+	])
- 
- CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS"
- CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS"
--LIBS="$PTHREAD_LIBS $CURSES_LIB $LIBS"
-+LIBS="$PTHREAD_LIBS $CURSES_LIB $CURSES_LIBS $LIBS"
- 
- PKG_CHECK_MODULES([libcurl], libcurl >= 7.15.4,
- 	          CXXFLAGS="$CXXFLAGS $libcurl_CFLAGS";
diff --git a/net-p2p/rtorrent/files/rtorrent-0.9.6-cppunit-pkgconfig.patch b/net-p2p/rtorrent/files/rtorrent-0.9.6-cppunit-pkgconfig.patch
deleted file mode 100644
index 753f4cb8a7f3..000000000000
--- a/net-p2p/rtorrent/files/rtorrent-0.9.6-cppunit-pkgconfig.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/620908
-
-diff -ur a/configure.ac b/configure.ac
---- a/configure.ac	2017-08-17 08:52:49.596897308 -0500
-+++ b/configure.ac	2017-08-17 08:54:57.171515415 -0500
-@@ -4,7 +4,6 @@
- 
- AM_INIT_AUTOMAKE
- AC_CONFIG_HEADERS(config.h)
--AM_PATH_CPPUNIT(1.9.6)
- 
- AC_PROG_CXX
- AC_PROG_LIBTOOL
-@@ -43,9 +42,11 @@
- 		fi])
- 	])
- 
--CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS"
--CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS"
--LIBS="$PTHREAD_LIBS $CURSES_LIB $CURSES_LIBS $LIBS"
-+PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
-+
-+CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CURSES_CFLAGS"
-+CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CURSES_CFLAGS"
-+LIBS="$PTHREAD_LIBS $CURSES_LIB $CURSES_LIBS $CPPUNIT_LIBS $LIBS"
- 
- PKG_CHECK_MODULES([libcurl], libcurl >= 7.15.4,
- 	          CXXFLAGS="$CXXFLAGS $libcurl_CFLAGS";
diff --git a/net-p2p/rtorrent/rtorrent-0.9.6-r1.ebuild b/net-p2p/rtorrent/rtorrent-0.9.6-r1.ebuild
deleted file mode 100644
index 1067098b6667..000000000000
--- a/net-p2p/rtorrent/rtorrent-0.9.6-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils systemd
-
-DESCRIPTION="BitTorrent Client using libtorrent"
-HOMEPAGE="https://rakshasa.github.io/rtorrent/"
-SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-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="daemon debug ipv6 selinux test xmlrpc"
-
-COMMON_DEPEND="~net-libs/libtorrent-0.13.${PV##*.}
-	>=dev-libs/libsigc++-2.2.2:2
-	>=net-misc/curl-7.19.1
-	sys-libs/ncurses:0=
-	xmlrpc? ( dev-libs/xmlrpc-c )"
-RDEPEND="${COMMON_DEPEND}
-	daemon? ( app-misc/screen )
-	selinux? ( sec-policy/selinux-rtorrent )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/cppunit
-	virtual/pkgconfig"
-
-DOCS=( doc/rtorrent.rc )
-
-src_prepare() {
-	# bug #358271
-	epatch \
-		"${FILESDIR}"/${PN}-0.9.1-ncurses.patch \
-		"${FILESDIR}"/${PN}-0.9.4-tinfo.patch \
-		"${FILESDIR}"/${PN}-0.9.6-cppunit-pkgconfig.patch
-
-	# https://github.com/rakshasa/rtorrent/issues/332
-	cp "${FILESDIR}"/rtorrent.1 "${S}"/doc/ || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# configure needs bash or script bombs out on some null shift, bug #291229
-	CONFIG_SHELL=${BASH} econf \
-		--disable-dependency-tracking \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_with xmlrpc xmlrpc-c)
-}
-
-src_install() {
-	default
-	doman doc/rtorrent.1
-
-	if use daemon; then
-		newinitd "${FILESDIR}/rtorrentd.init" rtorrentd
-		newconfd "${FILESDIR}/rtorrentd.conf" rtorrentd
-		systemd_newunit "${FILESDIR}/rtorrentd_at.service" "rtorrentd@.service"
-	fi
-}
diff --git a/net-p2p/rtorrent/rtorrent-0.9.6.ebuild b/net-p2p/rtorrent/rtorrent-0.9.6.ebuild
deleted file mode 100644
index 6de316711cbf..000000000000
--- a/net-p2p/rtorrent/rtorrent-0.9.6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils systemd
-
-DESCRIPTION="BitTorrent Client using libtorrent"
-HOMEPAGE="https://rakshasa.github.io/rtorrent/"
-SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-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="daemon debug ipv6 selinux test xmlrpc"
-
-COMMON_DEPEND="~net-libs/libtorrent-0.13.${PV##*.}
-	>=dev-libs/libsigc++-2.2.2:2
-	>=net-misc/curl-7.19.1
-	sys-libs/ncurses:0=
-	xmlrpc? ( dev-libs/xmlrpc-c )"
-RDEPEND="${COMMON_DEPEND}
-	daemon? ( app-misc/screen )
-	selinux? ( sec-policy/selinux-rtorrent )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/cppunit
-	virtual/pkgconfig"
-
-DOCS=( doc/rtorrent.rc )
-
-src_prepare() {
-	# bug #358271
-	epatch \
-		"${FILESDIR}"/${PN}-0.9.1-ncurses.patch \
-		"${FILESDIR}"/${PN}-0.9.4-tinfo.patch
-
-	# https://github.com/rakshasa/rtorrent/issues/332
-	cp "${FILESDIR}"/rtorrent.1 "${S}"/doc/ || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# configure needs bash or script bombs out on some null shift, bug #291229
-	CONFIG_SHELL=${BASH} econf \
-		--disable-dependency-tracking \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_with xmlrpc xmlrpc-c)
-}
-
-src_install() {
-	default
-	doman doc/rtorrent.1
-
-	if use daemon; then
-		newinitd "${FILESDIR}/rtorrentd.init" rtorrentd
-		newconfd "${FILESDIR}/rtorrentd.conf" rtorrentd
-		systemd_newunit "${FILESDIR}/rtorrentd_at.service" "rtorrentd@.service"
-	fi
-}
diff --git a/net-p2p/rtorrent/rtorrent-0.9.7-r1.ebuild b/net-p2p/rtorrent/rtorrent-0.9.7-r1.ebuild
index 74bf66d2a2c7..69bb963736d2 100644
--- a/net-p2p/rtorrent/rtorrent-0.9.7-r1.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.9.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 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"
+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="daemon debug selinux test xmlrpc"
 
 COMMON_DEPEND="~net-libs/libtorrent-0.13.${PV##*.}