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

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

6 files changed, 13 insertions, 196 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/Manifest b/net-p2p/rtorrent/Manifest
index fabb12f50acc..8a6d1764c89c 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -8,15 +8,10 @@ AUX rtorrent-0.8.2-fix_utf8_filenames.patch 8196 RMD160 80af83b87f3794a3e6d9c121
 AUX rtorrent-0.8.2-gcc34.patch 659 RMD160 c89a0c7b2acb6db4ce19fbb7a75f1da65638cd2b SHA1 d1afe3ca20a9b9b60056b7941ae7f81dcee558a0 SHA256 a89b48546be2c0728129feff223ed4e03a7c40bbc37e9bead9c13cf20c5cd00d
 AUX rtorrent-0.8.4-gcc44.patch 3147 RMD160 39e39fab5e4d847c049bc44e2254dec941af61fc SHA1 b877e02cb0b7f486a432d3eee0073fbeb69b9abe SHA256 7f449b47580a5162204ec0fad039e15950995f00e75ea944b02c2c926390e4aa
 AUX rtorrentd.conf 13 RMD160 aafd4d8440f40ae380b482876968f80267dff3bd SHA1 8b50885e27a2ff85cd28fccb56c11ead26d0ba49 SHA256 6725e7a3ed74f1432bd6b317f2aec7f9609bc20dd81dbbfcc632342c9f99177b
-AUX rtorrentd.init 569 RMD160 592533e8909195854cce014d818fdc63ff8926ee SHA1 3feec5baca10bccbfb9b6658d3d1fc61f75ee593 SHA256 ae909789dceb1c620b2ba6587e2d661a6e8340e7cf98636b3c81a3db259b1170
-DIST rtorrent-0.7.9.tar.gz 489174 RMD160 8cfee138c0142ad22830b3d518e198f163063a84 SHA1 0b53bd3b2c15f93352607ab3685916fe27033450 SHA256 f06f72b1fec94177147b1db0aab15be4f62d1b0354811a67ae74e0cd1e50a119
-DIST rtorrent-0.8.2.tar.gz 506015 RMD160 e86b0082d1788e4e7cd8fcf631f7f857d642c799 SHA1 891093c5d600c2e3853eadbbec369a12dfe6ec11 SHA256 76135a63869e43fa0392829bb45d94c0aa55e94350dddc272685ccfac1bbb2ed
+AUX rtorrentd.init 639 RMD160 5027e5f00fc7ec85fa813396386fc53dca4d2fed SHA1 526f435894392cbc8bab630360f46bd75ed69477 SHA256 943de3bee11024f0e5da915dfceb21ffd20f7c31748c200f1031be403f1a3b39
 DIST rtorrent-0.8.3.tar.gz 512961 RMD160 bbb51aa44b72ed34c53bfd20dd15fa4aafe302d5 SHA1 c6233de4b4b8d3901472696581ed88a0cd07d11d SHA256 554456550ca6e792297d6d39367120af5b2bd6181d514a43faf4e2f565721908
 DIST rtorrent-0.8.4.tar.gz 518306 RMD160 a7a65a136161dc89e93479cee776cc084dce4ee0 SHA1 83a7c0dbeb46bb074ae075d9faf5d05f0df17571 SHA256 257722380b39e84e700e9f2d2f6600ba724723f1ed59327bfce47a57d293eeee
-EBUILD rtorrent-0.7.9.ebuild 1351 RMD160 6781bc353f8811e3c3d899db86bee7a094ab51d4 SHA1 721b2157c0939e750da5e9e15f2637223d0ce798 SHA256 569338bd91040351fd81d577e9f0c000ce6402d10c1c5c77b457d38caaaef12e
-EBUILD rtorrent-0.8.2-r3.ebuild 1982 RMD160 dfcabbfc847363ed2062b10048c0849c17d757b2 SHA1 5cae42c6ccccb90edc8ca181bf0b3050b11da2e0 SHA256 3843b9da6c4202471b2380decf02cad68a58141efd137e6440c47c05d2510f67
-EBUILD rtorrent-0.8.2-r5.ebuild 2154 RMD160 d0ed0b3fa51bbb6cdf9a25efbff1f7996afae0f9 SHA1 e2dd23117e4c1402d045e9ed7ba1082a12ef6c85 SHA256 4cf50345b785da5bd86e3e70256120f50ea42907d02aa052cdbc88932084a2fd
 EBUILD rtorrent-0.8.3.ebuild 1751 RMD160 64f0f649ce0fd9ae7f929acd93baa18c06abb7c2 SHA1 278a30c989a47df74e514ff78337ac87640031d1 SHA256 d48fac483a6a2d9f87c677ee7671feb284eb4f361156db12d8beadc25ebb43c7
 EBUILD rtorrent-0.8.4-r1.ebuild 2033 RMD160 9946b39f21c2f1c38982b18d565401e53069a265 SHA1 04d66964ff70bffe322800e6d7844972930d8f42 SHA256 a1868245c1cfab612a8687844cfbd9dbea8d568ccf1191e7c2e99c6b2d09e2d2
-MISC ChangeLog 19945 RMD160 5461e7dda28f3e9c4eb49bdea6ed28e8f90b8497 SHA1 7d4245989a57043a18f64d2eab207c09077df6c8 SHA256 dbaf22c9ef1abc819f70204e3f249c28ef379c7d4975bf93629235644981bc54
+MISC ChangeLog 20205 RMD160 1aeb3c7d16b436da6688b6b71a36fa51ad298140 SHA1 0675a6d85be75f7fe799be42282f69d8dc2e3e03 SHA256 826287f8b7015c783f57e02a5fef61dca00aee94fb40d4777ab3c6bb79c90dc7
 MISC metadata.xml 834 RMD160 6dfc56bd58b08c2be67506de9f22e186de2abe81 SHA1 3aaf9f22e1697b291f9d7564b48416d4f9231057 SHA256 6b74449e8e0a52a8b36f82e855d52e14d47e7a7bd76a7f66b9da2a66ff981eda
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."
-}