[gentoo-commits] repo/gentoo:master commit in: net-p2p/rtorrent/files/, net-p2p/rtorrent/

[Jason Zaman]

commit:     fc0ccfb9a6015e5eaf040f695224b39b1358f76a
Author:     Stephen Shkardoon <ss23 <AT> ss23 <DOT> geek <DOT> nz>
AuthorDate: Fri Aug 10 08:44:19 2018 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Fri Aug 10 09:01:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc0ccfb9

net-p2p/rtorrent: remove old version 0.9.6.*

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-p2p/rtorrent/Manifest                          |  1 -
 .../rtorrent/files/rtorrent-0.9.1-ncurses.patch    | 10 ----
 net-p2p/rtorrent/files/rtorrent-0.9.4-tinfo.patch  | 37 -------------
 .../files/rtorrent-0.9.6-cppunit-pkgconfig.patch   | 28 ----------
 net-p2p/rtorrent/rtorrent-0.9.6-r1.ebuild          | 63 ----------------------
 net-p2p/rtorrent/rtorrent-0.9.6.ebuild             | 62 ---------------------
 6 files changed, 201 deletions(-)

diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index 180ca6b41a6..b7c90d413c5 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -1,2 +1 @@
-DIST rtorrent-0.9.6.tar.gz 610845 BLAKE2B 4a4faccffe79e7d877e3be9a9b16edcea87f1969ee2689f7789ebd738a19a5a41f5eae3b33c5b874b5c31ad8e872baa88374fae2047dbc76d4f1c0bc6d7ecbd4 SHA512 704f7b79d5bc78b817da21a6886662a5a97fde210a110c50f708bdc18e1dcf3ef5c5f4e2740261d41221cfc69c19926bf34e10057adf10601da9e6e06b2cef75
 DIST rtorrent-0.9.7.tar.gz 610149 BLAKE2B 3f1316b0142dade9662630ad40132c5968d7b0ded32d7ae13d1ec1fdb7fec794812203fece367bf6abfd02212ed94d308046d40eb3e7562c408e8da13b23c23d SHA512 e663bd8984bcec91868beaf16d215708bdea8872338365ba6a05c9ea830b2aff045257bbc8bd0414d84009ee85852822c97bb073dfb41c21e3b0081ecaeecc00

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 260cd9a3842..00000000000
--- 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 21ee708782b..00000000000
--- 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 753f4cb8a7f..00000000000
--- 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 1067098b666..00000000000
--- 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 6de316711cb..00000000000
--- 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
-}