Fixed up init script a bit

Removed old ~arch ebuilds that have been superseded

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

7 files changed, 41 insertions, 125 deletions

diff --git a/net-p2p/rtorrent/ChangeLog b/net-p2p/rtorrent/ChangeLog
index 24d2c970bf64..8948af64f35b 100644
--- a/net-p2p/rtorrent/ChangeLog
+++ b/net-p2p/rtorrent/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-p2p/rtorrent
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.158 2011/04/03 16:13:58 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.159 2011/04/11 21:24:18 sochotnicky Exp $
+
+*rtorrent-0.8.7-r1 (11 Apr 2011)
+*rtorrent-0.8.6-r3 (11 Apr 2011)
+
+  11 Apr 2011; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+  -rtorrent-0.8.5.ebuild, -rtorrent-0.8.6.ebuild, -rtorrent-0.8.6-r2.ebuild,
+  +rtorrent-0.8.6-r3.ebuild, -rtorrent-0.8.7.ebuild,
+  +rtorrent-0.8.7-r1.ebuild, files/rtorrentd.init:
+  Fixed up init script a bit
+  Removed old ~arch ebuilds that have been superseded
 
 *rtorrent-0.8.7 (03 Apr 2011)
 
diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index eaefd9d09bbb..242e50244eb9 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -1,15 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX rtorrent-0.8.2-gcc34.patch 659 RMD160 c89a0c7b2acb6db4ce19fbb7a75f1da65638cd2b SHA1 d1afe3ca20a9b9b60056b7941ae7f81dcee558a0 SHA256 a89b48546be2c0728129feff223ed4e03a7c40bbc37e9bead9c13cf20c5cd00d
 AUX rtorrent-0.8.6-canvas-fix.patch 11607 RMD160 01f3be5ecf0769a44e31f9852eb3da5454e85c75 SHA1 4d60d95845df05c9864ca50d3f84726d2b93ab14 SHA256 a843dcd8c3b7fe0179c24d53cb485d2f11156a189e58911bbd14e5e30db71925
 AUX rtorrent-0.8.6-ncurses.patch 572 RMD160 c0e390c444e50d69d8dbe4727c76b5962651a570 SHA1 2267dce2ddfb1ea865ba50c95e4a5beaf24da533 SHA256 4bcc6f33fad67d14f44cfdc63409fc94ef917dc120c46e60ce175d36af3fcb02
 AUX rtorrentd.conf 13 RMD160 aafd4d8440f40ae380b482876968f80267dff3bd SHA1 8b50885e27a2ff85cd28fccb56c11ead26d0ba49 SHA256 6725e7a3ed74f1432bd6b317f2aec7f9609bc20dd81dbbfcc632342c9f99177b
-AUX rtorrentd.init 709 RMD160 c615550d62bf8a7a9d91140e1cd8075429e2865c SHA1 d1102674a40a00dd5b124b0d619541b9fdf58fcc SHA256 7c01751832043828667dce8180d0885ad562fcd9d2aa03bc3c7d46106ceedcad
-DIST rtorrent-0.8.5.tar.gz 512889 RMD160 ebf5bc3a39ec8b9905513a706a480452498ca991 SHA1 ebab4af5c3c5f31803e0880fadd303ecbc6adba8 SHA256 0ec6991772e9318fa5e687b5c2c8b5e0166d8def8d729373e8ae20b815984665
+AUX rtorrentd.init 738 RMD160 ad8f44fedbc50436916cdf4d8f4dd0c7a455c8d3 SHA1 406561f68aa5c488e025aa174a82aa19534ef0cd SHA256 68d6db59c00226ffd7c155b4613ab67b71c41f02164e69d5a55fa3bdbf43ced3
 DIST rtorrent-0.8.6.tar.gz 521045 RMD160 3d5109d4ee26c663b376e0b9f610ab6055c57ba9 SHA1 ffce3959ba91738bb444d689db3db1e2375b14ce SHA256 8c96c68e1524162abd1fc4b612d0c3d924fccc25159c0b3f208e69281f0b32db
 DIST rtorrent-0.8.7.tar.gz 547435 RMD160 52564096341088087c7a316c8e7637df77b672b6 SHA1 691c95e948d02927edc05321e52cd1c63513fabc SHA256 1fd0c9b2b3fe81b035209417c4dd4514473411f16b15ffe7fefe87eaff1a58d2
-EBUILD rtorrent-0.8.5.ebuild 2000 RMD160 0c6823b9621504141aa3f59f20944f3e47d10e1c SHA1 a7a67e6efbdd3af293278deb1f3d66df82386774 SHA256 39ba63825c2982b48bcfdb6ed4b2364e38118e8d38d204df1c5fdabc6006ca69
 EBUILD rtorrent-0.8.6-r1.ebuild 1596 RMD160 c4558712e434a91bd49bb99049badd7e8c1e975f SHA1 e2c47673cea00308d5dc63dcce21dfa4229ff8f3 SHA256 1c177f4f112c0e21611f404f1c15d98ec1be13f92fdc0e54bb587bd3c9677ce5
-EBUILD rtorrent-0.8.6-r2.ebuild 1660 RMD160 472d6ac7e907f628f218e87c0f9e6d88528e4d87 SHA1 01a250035a75cd56965c9d20652dc8bd2ed3c045 SHA256 7ad3524127003ed2c9324d5d29ad705ce828bd79a8b1b424d1fdfbc2673d8d74
-EBUILD rtorrent-0.8.6.ebuild 1260 RMD160 1d11acf95e73102ffaa158211d447750572b3dda SHA1 9d407e75bb2af04f96e9a27240436af6fb723b5c SHA256 bec7c3c93a1764903200e13fa0e77377af870da05acb6e8856ce9702877fd1b9
-EBUILD rtorrent-0.8.7.ebuild 1667 RMD160 302e8ccc2457f99531d7a12f34523db79018a058 SHA1 1bb0bf61603e45ddb04598057f5af37b7248d675 SHA256 3e12f44e13ed523c107d46c521c84c28fb3876585176c88aa059485f410c4593
-MISC ChangeLog 22930 RMD160 17341214fa11e3e9c75785618a686b26b1b96e6b SHA1 d2b1ad0b0ae3e27f9546f26fc1f4450d96ec6c20 SHA256 8d97ae78f42254bc0fed37aef0c9f1daaf8b9554f3264ac21c545b6fc79cc3a7
+EBUILD rtorrent-0.8.6-r3.ebuild 1666 RMD160 15d70858c72a7660aef38e5d04bab2b72a6d0f6c SHA1 59a4fbf99f0a2f44f39dd64393c34fd9a968be12 SHA256 1a893a7fe86b45ad6c59732cdb753d97e4c35ca19d9f2d21c2175ce99709cd72
+EBUILD rtorrent-0.8.7-r1.ebuild 1674 RMD160 48ff251d4307dcbc22e3d4f623be690869026587 SHA1 ef5356a35da35d4476f90d1b9ee56d4e478b2032 SHA256 3193e4f8abb9ab84ff4d6e29087cf03386f97fc3ba2cc9fae8294c76216cc78f
+MISC ChangeLog 23327 RMD160 aef4e746a43eead1eba6877b0dad7a526d6d0275 SHA1 424430e006f5f0414aa83bad9a92b4a221320c1c SHA256 9a58469bd962d1655c9c1e24dcb4b550a18452b37e55ef3bdc3daae0aa178e19
 MISC metadata.xml 392 RMD160 45e0a49396ec9062dec01e806cafeee78ed65b5f SHA1 772978675923bad143b16b772257ea5fb868bf56 SHA256 fd16df5847e039632256655ff60ce329cbdd92b87f3397b8810e1665480c62a2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNo3GQAAoJELy9dS57CHJB//QP/A4qDMjpwv2uop2dDgajJ2TP
+zjSIRUUwDwFbZlCxGaEoxQW97Desaqi/A3TQ55tPPrXLfbvJ5CKFR47vN5TdOnmf
+sNwQabzNRuvC55eb5Yi8m1m9qobe5EM4oqR7MFvdx5rKVTBvNf0UF+O8M0+7DbsW
+e2ginhOj95OWs+ns8XnWTVokjukfHfcLcMo3b/XlqcHXA+OO4QmL85BgiVi7y4UM
+pZPedoDgzHcAhvxK0oXBolGyB6uQk4LRnHeUeno7Q68Ji5GueR7kICEjjy23A/yG
+hzUJNUVhUz6MN+JakqPVkQZNL1EVlfl4G8H420YlqdUgcW6zMc+5KGtAqLWIbgUp
+SVWUEh4DfkDrfR2AizCx5LBRfLpIgf7A7sRiCNcSXvu4yx8yfDhNiWjKBTqBQe+C
+WbJZq9iji8igra0Vmq+iwBXtdIGacGLlwnyVvkaHbozdnTZiGVK0WEEJF0VfMY7Q
+3wydBisdDwF8rcrNS+TD7MV+YcTLGWzgUH8lNgNHXAeiVuCi5YIjpQNLy1pjLl5r
+1oaT2V0qX78MUYuqH5IME6xMTc0LU6vV/FwmIZ8Yk/usiZXuUfIYKGZibB9D5w1E
+nYZD1AmH6o9JVXKIThKjOU2mFkH49iLhGXk3H5xyDQt/TOgqdcMmBPDzTUp7l3ME
+o+b43HhLGkpx2r2SMjg0
+=2kne
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/rtorrent/files/rtorrentd.init b/net-p2p/rtorrent/files/rtorrentd.init
index ce32395e7254..9d64a9a81159 100644
--- a/net-p2p/rtorrent/files/rtorrentd.init
+++ b/net-p2p/rtorrent/files/rtorrentd.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# 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.5 2010/03/18 20:30:24 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/files/rtorrentd.init,v 1.6 2011/04/11 21:24:18 sochotnicky Exp $
 
 depend() {
 	use net ypbind nis
@@ -16,9 +16,10 @@ start() {
 		start-stop-daemon \
 			--start \
 			--user $USER \
+			--chuid $USER \
 			--env HOME="${PWHOME:-/home/$USER}" \
 			--name rtorrent \
-			--exec /usr/bin/screen -- -dmS rtorrentd /usr/bin/rtorrent
+			--exec /usr/bin/screen -- -d -m -S rtorrentd /usr/bin/rtorrent
 	eend $?
 }
 
diff --git a/net-p2p/rtorrent/rtorrent-0.8.5.ebuild b/net-p2p/rtorrent/rtorrent-0.8.5.ebuild
deleted file mode 100644
index d392c3cbf5d7..000000000000
--- a/net-p2p/rtorrent/rtorrent-0.8.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.5.ebuild,v 1.8 2009/12/28 20:35:30 armin76 Exp $
-
-inherit base eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="BitTorrent Client using libtorrent"
-HOMEPAGE="http://libtorrent.rakshasa.no/"
-SRC_URI="http://libtorrent.rakshasa.no/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="daemon debug ipv6 xmlrpc"
-
-COMMON_DEPEND=">=net-libs/libtorrent-0.12.${PV##*.}
-	>=dev-libs/libsigc++-2.2.2
-	>=net-misc/curl-7.19.1
-	sys-libs/ncurses
-	xmlrpc? ( dev-libs/xmlrpc-c )"
-RDEPEND="${COMMON_DEPEND}
-	daemon? ( app-misc/screen )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-0.8.2-gcc34.patch" )
-
-src_compile() {
-	replace-flags -Os -O2
-	append-flags -fno-strict-aliasing
-
-	if [[ $(tc-arch) = "x86" ]]; then
-		filter-flags -fomit-frame-pointer -fforce-addr
-	fi
-
-	econf	$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_with xmlrpc xmlrpc-c) \
-		--disable-dependency-tracking \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS README TODO doc/rtorrent.rc
-
-	if use daemon; then
-		newinitd "${FILESDIR}/rtorrentd.init" rtorrentd || die "newinitd failed"
-		newconfd "${FILESDIR}/rtorrentd.conf" rtorrentd || die "newconfd failed"
-	fi
-}
-
-pkg_postinst() {
-	elog "rtorrent now supports a configuration file."
-	elog "A sample configuration file for rtorrent can be found"
-	elog "in rtorrent.rc in ${ROOT}usr/share/doc/${PF}/"
-	elog ""
-	ewarn "If you're upgrading from rtorrent <0.8.0, you will have to delete your"
-	ewarn "session directory or run the fixSession080-c.py script from this address:"
-	ewarn "http://rssdler.googlecode.com/files/fixSession080-c.py"
-	ewarn "See http://libtorrent.rakshasa.no/wiki/LibTorrentKnownIssues for more info."
-}
diff --git a/net-p2p/rtorrent/rtorrent-0.8.6-r2.ebuild b/net-p2p/rtorrent/rtorrent-0.8.6-r3.ebuild
index f49560280b7d..3ac83a9a21ee 100644
--- a/net-p2p/rtorrent/rtorrent-0.8.6-r2.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.8.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.6-r2.ebuild,v 1.1 2011/03/28 10:52:45 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.6-r3.ebuild,v 1.1 2011/04/11 21:24:18 sochotnicky Exp $
 
 EAPI=2
 
diff --git a/net-p2p/rtorrent/rtorrent-0.8.6.ebuild b/net-p2p/rtorrent/rtorrent-0.8.6.ebuild
deleted file mode 100644
index 3f17d2d1ed1e..000000000000
--- a/net-p2p/rtorrent/rtorrent-0.8.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.6.ebuild,v 1.3 2010/01/21 11:19:34 cla Exp $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="BitTorrent Client using libtorrent"
-HOMEPAGE="http://libtorrent.rakshasa.no/"
-SRC_URI="http://libtorrent.rakshasa.no/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="daemon debug ipv6 xmlrpc"
-
-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="${COMMON_DEPEND}
-	daemon? ( app-misc/screen )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-canvas-fix.patch
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_with xmlrpc xmlrpc-c)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS README TODO doc/rtorrent.rc
-
-	if use daemon; then
-		newinitd "${FILESDIR}/rtorrentd.init" rtorrentd || die "newinitd failed"
-		newconfd "${FILESDIR}/rtorrentd.conf" rtorrentd || die "newconfd failed"
-	fi
-}
diff --git a/net-p2p/rtorrent/rtorrent-0.8.7.ebuild b/net-p2p/rtorrent/rtorrent-0.8.7-r1.ebuild
index d9e01754c3ca..46de76cce941 100644
--- a/net-p2p/rtorrent/rtorrent-0.8.7.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.8.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.7.ebuild,v 1.1 2011/04/03 16:13:58 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.7-r1.ebuild,v 1.1 2011/04/11 21:24:18 sochotnicky Exp $
 
 EAPI=2