media-tv/pytivo-wmcbrine: version bump for pyTivo

4 files changed, 23 insertions, 14 deletions

diff --git a/media-tv/pytivo-wmcbrine/ChangeLog b/media-tv/pytivo-wmcbrine/ChangeLog
index ffa3cd9e5..ed73a88c9 100644
--- a/media-tv/pytivo-wmcbrine/ChangeLog
+++ b/media-tv/pytivo-wmcbrine/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*pytivo-wmcbrine-20120910 (13 Oct 2012)
+
+  13 Oct 2012; John Ratliff (jdratlif) <webmaster@technoplaza.net>
+  -pytivo-wmcbrine-20100808.ebuild, +pytivo-wmcbrine-20120910.ebuild,
+  +files/pytivo, -files/pyTivo.initd.sh:
+  Version bump for pytivo-wmcbrine. Thanks to _AxS_, SebastienP, and Tommy[D]
+
   22 Jun 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   pytivo-wmcbrine-20100808.ebuild:
   inherit user eclass instead of eutils eclass for enewuser
diff --git a/media-tv/pytivo-wmcbrine/Manifest b/media-tv/pytivo-wmcbrine/Manifest
index 742123ff4..fc4290e70 100644
--- a/media-tv/pytivo-wmcbrine/Manifest
+++ b/media-tv/pytivo-wmcbrine/Manifest
@@ -1,5 +1,4 @@
-AUX pyTivo.initd.sh 503 RMD160 501b1db8baea05f47d7cfec5bbc33f87fd8cee92 SHA1 524745a2f3df80ca84735a0e9a0fab381eb7cc1a SHA256 e101cb3126237ddbfd89fc16bd2a6463ced4ccefae63c2d333d0bc32ff196696
-DIST pytivo-wmcbrine-20100808.tar.gz 372098 RMD160 c03a9dc23ac9ebb2446a890ce8ae1ce447557d13 SHA1 7111a0ac106ee759db5ef976353d45444a8fca8e SHA256 c1c06d501985cca840fa3f50cf43c8b94a214450143d58aafb3a1dd31f47eb4f
-EBUILD pytivo-wmcbrine-20100808.ebuild 1531 RMD160 8de199ba0073cdc692e61dedccaee117560ef7e5 SHA1 edc30e8c707ae240449a5ee11fe46eaf74da4ef7 SHA256 a8589c31aa885407c5283f7268886aa7d0f03d634fbafcdaf2037da4679126ed
-MISC ChangeLog 1298 RMD160 941233d1115bd6e30319d85f8d06844c1038c4bf SHA1 db536fedd8baa4cf2767a751b808891064853acc SHA256 520e1fc0be1e240e5185e6097ea09b8b262e52edb64267025a97a939ceb289f1
-MISC metadata.xml 208 RMD160 c18611400760e42bdd001905be0a63c2e963bcea SHA1 595816105cac477cb85792a182e15888029118a1 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82
+AUX pytivo 509 SHA256 c66dda6a86ca961a70eee100d443c15836e513fafc0808bd99fadea8f27d0307 SHA512 b66bd37047b2f86d499bf5866bfd703769e8a7960ab94be67ed68c9ce745c0eddb1f1afb3b98a7fbfdba4ccae7aba3e6981e8839d0020b8a8af650407ed0891f WHIRLPOOL 800e731dfa65653e5e827d3b8fd2b18e195bda7188b478fc98e814751d291a4623459136f26c04b45f9c12be1bc162b8a8f33f154b5405775e9bbc8203f4499b
+EBUILD pytivo-wmcbrine-20120910.ebuild 1566 SHA256 8c3161fe7e7e0b7858c2d738f72f3437d956ae93dfd8f38f95db27ea4ba6e631 SHA512 d5b610102f528b6ecf8229378e56fae1efe4d984cf820155b49be328c272eeb4f133fff531907cbd0541e30f3ed03aa16b6c1dde9a15410998412ff77562960a WHIRLPOOL b6093b18f67d36b0539be4280facbafbe7544f453821125cc54bf616152961097160c9f58d331acf526f87525dfd42078815bd0bb89cbdd43416575fb2ff0dce
+MISC ChangeLog 1596 SHA256 3e656fc7508150954143d62dad2e76231d994513ce18a9c06d8133351839126e SHA512 be8e3d43a8e9906b23a5d50e5d5cd31a45f1f10f035013c065e60bc1e0ee0af3ed2e78446524dfbf4eb2bf504d3d5e78c3ce4e6ec10b5266b672a0a8e870dd66 WHIRLPOOL 378ce38ccaf517fe665c750d90a69d89cf653201efca947258fd469915c7794d1ff59607b58470f8113ab36cce69d126d581b69fd2f5415126353f44cf3c50de
+MISC metadata.xml 208 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82 SHA512 21d90d4547c76c80e50e134359dfbec42b158bbc16e4741738bdde5f67b7926d158dae1905948a477405b74e754ce4ed63cad910f220a709db8dfccf160e5288 WHIRLPOOL 33ec53f42c7a8c4c419989bd94e083c417574463e19c9c1322e6b96d0f5a6a52e3dd69fbedf2d11a7a77d24a93b81f3a604b6b33cac62548389537bf3e42df0e
diff --git a/media-tv/pytivo-wmcbrine/files/pyTivo.initd.sh b/media-tv/pytivo-wmcbrine/files/pytivo
index 8a2f2e426..62a4070b5 100644
--- a/media-tv/pytivo-wmcbrine/files/pyTivo.initd.sh
+++ b/media-tv/pytivo-wmcbrine/files/pytivo
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -11,8 +11,8 @@ depend() {
 start() {
 	ebegin "Starting pyTivo"
 	start-stop-daemon --start --exec /usr/bin/pytivo \
-		--pidfile /var/run/pytivo.pid -m -N 19 -c pytivo:pytivo \
-		-- > /dev/null 2>&1 &
+		--pidfile /var/run/pytivo.pid -m -N 19 -u pytivo:pytivo \
+		-- > /tmp/pyTivo.log 2>&1 &
 	eend $?
 }
 
diff --git a/media-tv/pytivo-wmcbrine/pytivo-wmcbrine-20100808.ebuild b/media-tv/pytivo-wmcbrine/pytivo-wmcbrine-20120910.ebuild
index 7f5111f94..525ea7e1e 100644
--- a/media-tv/pytivo-wmcbrine/pytivo-wmcbrine-20100808.ebuild
+++ b/media-tv/pytivo-wmcbrine/pytivo-wmcbrine-20120910.ebuild
@@ -6,11 +6,14 @@ EAPI="2"
 
 PYTHON_DEPEND="2"
 
-inherit multilib python user
+inherit git-2 multilib python user
 
 DESCRIPTION="An HMO and GoBack server for Tivo"
 HOMEPAGE="http://pytivo.sourceforge.net/"
-SRC_URI="http://ompldr.org/vNWtudQ/${P}.tar.bz2 -> ${P}.tar.gz"
+SRC_URI=""
+
+EGIT_REPO_URI="git://github.com/wmcbrine/pytivo.git"
+EGIT_COMMIT="cf0971e929661dabd3a34f363500f8d6f575d58f"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,12 +24,13 @@ DEPEND=""
 RDEPEND="${DEPEND}
 	virtual/ffmpeg"
 
-S="${WORKDIR}/wmcbrine"
-
 pkg_setup() {
 	enewgroup pytivo
 	enewuser pytivo -1 -1 -1 pytivo
 	python_set_active_version 2
+}
+
+src_prepare() {
 	python_convert_shebangs -r 2 .
 }
 
@@ -39,8 +43,7 @@ src_install() {
 
 	fperms 0755 ${MY_LIBDIR}/pyTivo.py || die "Cannot set permissions"
 
-	newinitd "${FILESDIR}"/pyTivo.initd.sh pytivo \
-		|| die "Cannot create init.d launcher"
+	doinitd "${FILESDIR}"/pytivo || die "Cannot create init.d launcher"
 
 	dodoc README || die "Cannot install docs"
 	newdoc pyTivo.conf.dist pyTivo.conf || die "Cannot install docs"