Fixed up init script a bit

Removed old ~arch ebuilds that have been superseded

(Portage version: 2.1.9.42/cvs/Linux x86_64)

6 files changed, 17 insertions, 118 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/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