commit: cd9ec0ed5640e05a515e3f68cad24e9dad23c3c7 Author: Jason Zaman <perfinion <AT> gentoo <DOT> org> AuthorDate: Sat Aug 19 06:59:36 2017 +0000 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> CommitDate: Sat Aug 19 10:06:56 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd9ec0ed
net-p2p/rtorrent: fix building against cppunit (bug 620908) Thanks to Nado and Ben Kohler Package-Manager: Portage-2.3.6, Repoman-2.3.1 .../files/rtorrent-0.9.6-cppunit-pkgconfig.patch | 28 ++++++++++ net-p2p/rtorrent/rtorrent-0.9.6-r1.ebuild | 63 ++++++++++++++++++++++ 2 files changed, 91 insertions(+) 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 new file mode 100644 index 00000000000..753f4cb8a7f --- /dev/null +++ b/net-p2p/rtorrent/files/rtorrent-0.9.6-cppunit-pkgconfig.patch @@ -0,0 +1,28 @@ +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 new file mode 100644 index 00000000000..483629ab5db --- /dev/null +++ b/net-p2p/rtorrent/rtorrent-0.9.6-r1.ebuild @@ -0,0 +1,63 @@ +# 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" "[email protected]" + fi +}
