Allow init script to find homedir instead of hardcoding it, patch by Michał Górny, bug 265969

(Portage version: 2.1.6.13/cvs/Linux x86_64)

5 files changed, 11 insertions, 189 deletions

diff --git a/net-p2p/rtorrent/ChangeLog b/net-p2p/rtorrent/ChangeLog
index 300ad36efc08..ca5d7522bb3b 100644
--- a/net-p2p/rtorrent/ChangeLog
+++ b/net-p2p/rtorrent/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/rtorrent
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.135 2009/03/06 00:13:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.136 2009/05/20 03:08:11 darkside Exp $
+
+  20 May 2009; Jeremy Olexa <darkside@gentoo.org> files/rtorrentd.init,
+  -rtorrent-0.7.9.ebuild, -rtorrent-0.8.2-r3.ebuild,
+  -rtorrent-0.8.2-r5.ebuild:
+  Allow init script to find homedir instead of hardcoding it, patch by Michał
+  Górny, bug 265969
 
   06 Mar 2009; Jeroen Roovers <jer@gentoo.org> rtorrent-0.8.4-r1.ebuild:
   Stable for HPPA (bug #255756).
diff --git a/net-p2p/rtorrent/files/rtorrentd.init b/net-p2p/rtorrent/files/rtorrentd.init
index 316cd2b4faec..8516c5417486 100644
--- a/net-p2p/rtorrent/files/rtorrentd.init
+++ b/net-p2p/rtorrent/files/rtorrentd.init
@@ -1,17 +1,19 @@
 #!/sbin/runscript
 # Copyright 1999-2008 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.1 2008/12/26 07:01:43 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/files/rtorrentd.init,v 1.2 2009/05/20 03:08:12 darkside Exp $
 
 depend() {
 	use net.*
 }
 
 start() {
+	PWHOME="$(getent passwd $USER | awk -F: '{ print $6 }')"
+
 	ebegin "Starting rtorrent"
 	start-stop-daemon --start --chuid $USER \
 	--env TERM="xterm" \
-	--env HOME="/home/$USER" \
+	--env HOME="${PWHOME:-/home/$USER}" \
 	--exec /usr/bin/screen -- -dmS rtorrentd /usr/bin/rtorrent
 	eend $?
 }
diff --git a/net-p2p/rtorrent/rtorrent-0.7.9.ebuild b/net-p2p/rtorrent/rtorrent-0.7.9.ebuild
deleted file mode 100644
index 966994199c59..000000000000
--- a/net-p2p/rtorrent/rtorrent-0.7.9.ebuild
+++ /dev/null
@@ -1,50 +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.7.9.ebuild,v 1.10 2009/03/01 19:52:19 loki_val Exp $
-
-inherit 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 hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="debug xmlrpc"
-
-RDEPEND=">=net-libs/libtorrent-0.11.${PV##*.}
-	>=dev-libs/libsigc++-2.0
-	>=net-misc/curl-7.15
-	sys-libs/ncurses
-	xmlrpc? ( dev-libs/xmlrpc-c )"
-DEPEND="${RDEPEND}
-        dev-util/pkgconfig"
-
-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_with xmlrpc xmlrpc-c) \
-		--disable-dependency-tracking \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-pkg_postinst() {
-	elog "rtorrent now supports a configuration file."
-	elog "A sample configuration file for rtorrent is can be found"
-	elog "in rtorrent.rc in ${ROOT}usr/share/doc/${PF}/"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS README TODO doc/rtorrent.rc
-}
diff --git a/net-p2p/rtorrent/rtorrent-0.8.2-r3.ebuild b/net-p2p/rtorrent/rtorrent-0.8.2-r3.ebuild
deleted file mode 100644
index 1ff4882cde5d..000000000000
--- a/net-p2p/rtorrent/rtorrent-0.8.2-r3.ebuild
+++ /dev/null
@@ -1,66 +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.2-r3.ebuild,v 1.11 2009/03/01 19:52:19 loki_val Exp $
-
-inherit 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 hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="debug ipv6 xmlrpc"
-
-RDEPEND=">=net-libs/libtorrent-0.12.${PV##*.}
-	>=dev-libs/libsigc++-2
-	>=net-misc/curl-7.18
-	sys-libs/ncurses
-	xmlrpc? ( dev-libs/xmlrpc-c )"
-DEPEND="${RDEPEND}
-        dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.8.0+gcc-4.3.patch
-	epatch "${FILESDIR}"/${P}-fix_start_stop_filter.patch
-	epatch "${FILESDIR}"/${P}-fix_conn_type_seed.patch
-	epatch "${FILESDIR}"/${P}-fix_load_cache.patch
-	epatch "${FILESDIR}"/${P}-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
-}
-
-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.2-r5.ebuild b/net-p2p/rtorrent/rtorrent-0.8.2-r5.ebuild
deleted file mode 100644
index 75a7805155c3..000000000000
--- a/net-p2p/rtorrent/rtorrent-0.8.2-r5.ebuild
+++ /dev/null
@@ -1,70 +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.2-r5.ebuild,v 1.10 2009/03/01 19:52:19 loki_val Exp $
-
-inherit eutils autotools 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 hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="debug ipv6 xmlrpc"
-
-RDEPEND=">=net-libs/libtorrent-0.12.${PV##*.}
-	>=dev-libs/libsigc++-2
-	>=net-misc/curl-7.18
-	sys-libs/ncurses
-	xmlrpc? ( dev-libs/xmlrpc-c )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.8.0+gcc-4.3.patch
-	epatch "${FILESDIR}"/${P}-fix_start_stop_filter.patch
-	epatch "${FILESDIR}"/${P}-fix_conn_type_seed.patch
-	epatch "${FILESDIR}"/${P}-fix_load_cache.patch
-	epatch "${FILESDIR}"/${P}-fix_utf8_filenames.patch
-	epatch "${FILESDIR}"/${P}-fix-configure-execinfo.patch
-	epatch "${FILESDIR}"/${P}-gcc34.patch
-	epatch "${FILESDIR}"/${P}-fix_scgi_crash.patch
-	eautoreconf
-}
-
-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
-}
-
-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."
-}