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

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

[Alexey Shvetsov]

commit:     523e376976d53d678f0b438983d1b91b93b085b2
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Tue May 17 13:24:45 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Tue May 17 13:24:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/alexxy.git;a=commit;h=523e3769

Update ebuild

(Portage version: 2.2.0_alpha33/git/Linux x86_64, signed Manifest commit with key CE4F54B8)

---
 net-p2p/rtorrent/Manifest             |   16 +++++++++++-
 net-p2p/rtorrent/files/rtorrentd.conf |    1 +
 net-p2p/rtorrent/files/rtorrentd.init |   34 ++++++++++++++++++++++++++++
 net-p2p/rtorrent/metadata.xml         |    1 +
 net-p2p/rtorrent/rtorrent-9999.ebuild |   40 ++++++++++++++++++++++----------
 5 files changed, 77 insertions(+), 15 deletions(-)

diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index 336ab3e..4e029da 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -1,2 +1,14 @@
-EBUILD rtorrent-9999.ebuild 1065 RMD160 d896a3778eccfef81564750d0a2cfc356380014f SHA1 56ccdf1163739fcfafdea327b5453ddf28cdaf3c SHA256 712115c726af3b42606cfe91aedea2be10da60588336fcbdd6c98717daa9c445
-MISC metadata.xml 392 RMD160 45e0a49396ec9062dec01e806cafeee78ed65b5f SHA1 772978675923bad143b16b772257ea5fb868bf56 SHA256 fd16df5847e039632256655ff60ce329cbdd92b87f3397b8810e1665480c62a2
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX rtorrentd.conf 13 RMD160 aafd4d8440f40ae380b482876968f80267dff3bd SHA1 8b50885e27a2ff85cd28fccb56c11ead26d0ba49 SHA256 6725e7a3ed74f1432bd6b317f2aec7f9609bc20dd81dbbfcc632342c9f99177b
+AUX rtorrentd.init 837 RMD160 d20e886080480cb4f87dc7272b36db22ca4d76da SHA1 35e261746de7ca1396240047e1b2bd426a8b1857 SHA256 d8b29a500439a6be30b94b29af3f6b7fa7c61c067af59cf46b9d197268858242
+EBUILD rtorrent-9999.ebuild 1684 RMD160 89176bf8b10233bc84241ad8300b7d393c482a04 SHA1 dd163b0524ab307af98f61e78257dd06de6f2b68 SHA256 e0c29d92ea9dc008c2fdeb2c4a5ee4f31952791d0487f3962544c125ef3fa554
+MISC metadata.xml 461 RMD160 20828b74a80b51c1df06f6dba3aa63fbe7eec437 SHA1 7d50936803d36c9e88d2030bcf6647d4cede9d09 SHA256 db7942b39f614d72ff07b2ca64acbddd975cc016761d0037eb9edf786a4b295d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3Sdx0ACgkQ5BmOA85PVLhNfQCgiymPJMokJm7VL8zDRWt2na3G
+xxgAoJd5+29UkJYVk7UevItFs22aEPS2
+=pZQh
+-----END PGP SIGNATURE-----

diff --git a/net-p2p/rtorrent/files/rtorrentd.conf b/net-p2p/rtorrent/files/rtorrentd.conf
new file mode 100644
index 0000000..5ff2328
--- /dev/null
+++ b/net-p2p/rtorrent/files/rtorrentd.conf
@@ -0,0 +1 @@
+USER="$USER"

diff --git a/net-p2p/rtorrent/files/rtorrentd.init b/net-p2p/rtorrent/files/rtorrentd.init
new file mode 100644
index 0000000..e160b99
--- /dev/null
+++ b/net-p2p/rtorrent/files/rtorrentd.init
@@ -0,0 +1,34 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/files/rtorrentd.init,v 1.7 2011/05/09 21:34:21 sochotnicky Exp $
+
+depend() {
+	use net ypbind nis
+	after slapd mysqld postgresql
+}
+
+start() {
+	PWHOME="$(getent passwd $USER | awk -F: '{ print $6 }')"
+
+	ebegin "Starting rtorrent"
+	env TERM="xterm" \
+		start-stop-daemon \
+			--start \
+			--make-pidfile \
+			--pidfile /var/run/rtorrentd.pid \
+			--background \
+			--user $USER \
+			--chuid $USER \
+			--env HOME="${PWHOME:-/home/$USER}" \
+			--name rtorrent \
+			--exec /usr/bin/screen -- -D -m -S rtorrentd /usr/bin/rtorrent
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping rtorrent"
+	start-stop-daemon --stop --signal 15 \
+			--pidfile /var/run/rtorrentd.pid
+	eend $?
+}

diff --git a/net-p2p/rtorrent/metadata.xml b/net-p2p/rtorrent/metadata.xml
index 7a0964c..dd9423d 100644
--- a/net-p2p/rtorrent/metadata.xml
+++ b/net-p2p/rtorrent/metadata.xml
@@ -9,6 +9,7 @@
 	<flag name='daemon'>Uses <pkg>app-misc/screen</pkg> to daemonize this
 		application
 	</flag>
+	<flag name='color'>Add custom color support for torrent list</flag>
 </use>
 
 </pkgmetadata>

diff --git a/net-p2p/rtorrent/rtorrent-9999.ebuild b/net-p2p/rtorrent/rtorrent-9999.ebuild
index a00fc1c..2d07376 100644
--- a/net-p2p/rtorrent/rtorrent-9999.ebuild
+++ b/net-p2p/rtorrent/rtorrent-9999.ebuild
@@ -1,43 +1,46 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.7-r3.ebuild,v 1.1 2011/05/09 21:34:21 sochotnicky Exp $
 
-EAPI="4"
+EAPI=4
 
-inherit subversion autotools
+inherit autotools eutils subversion
 
 DESCRIPTION="BitTorrent Client using libtorrent"
-HOMEPAGE="http://libtorrent.rakshasa.no"
+HOMEPAGE="http://libtorrent.rakshasa.no/"
 ESVN_REPO_URI="svn://rakshasa.no/libtorrent/trunk/rtorrent"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="daemon debug ipv6 xmlrpc"
+IUSE="color daemon debug ipv6 test xmlrpc"
 
-DEPEND="
-	>=net-libs/libtorrent-${PV}[ipv6=]
-	>=dev-libs/libsigc++-2.2.2
+COMMON_DEPEND=">=net-libs/libtorrent-0.12.${PV##*.}
+	>=dev-libs/libsigc++-2.2.2:2
 	>=net-misc/curl-7.19.1
 	sys-libs/ncurses
 	xmlrpc? ( dev-libs/xmlrpc-c )"
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
 	daemon? ( app-misc/screen )"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-util/cppunit )
+	dev-util/pkgconfig"
 
 src_prepare() {
+	use color && EPATCH_OPTS="-p1" epatch "${FILESDIR}"/${P}-canvas-fix.patch
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		$(use_enable debug debug extra-debug werror) \
+		--disable-dependency-tracking \
+		$(use_enable debug) \
 		$(use_enable ipv6) \
-		$(use_with xmlrpc xmlrpc-c) \
-		|| die "econf failed"
+		$(use_with xmlrpc xmlrpc-c)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS README TODO doc/rtorrent.rc
 
 	if use daemon; then
@@ -45,3 +48,14 @@ src_install() {
 		newconfd "${FILESDIR}/rtorrentd.conf" rtorrentd || die "newconfd failed"
 	fi
 }
+
+pkg_postinst() {
+	if use color; then
+		elog "rtorrent colors patch"
+		elog "Set colors using the options below in .rtorrent.rc:"
+		elog "Options: done_fg_color, done_bg_color, active_fg_color, active_bg_color"
+		elog "Colors: 0 = black, 1 = red, 2 = green, 3 = yellow, 4 = blue,"
+		elog "5 = magenta, 6 = cyan and 7 = white"
+		elog "Example: done_fg_color = 1"
+	fi
+}