more corrections

MarcT · Dec 3, 2011 · 7d842af · 7d842af
1 parent 1ffd9e0
commit 7d842af
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 100 deletions.
diff --git a/eclass/myth-git.eclass b/eclass/myth-git.eclass
@@ -11,7 +11,7 @@
 # Modified: Marc Tousignant
 #
 
-inherit git eutils flag-o-matic multilib versionator toolchain-funcs
+inherit git-2 eutils flag-o-matic multilib versionator toolchain-funcs
 
 ECLASS=myth-git
 INHERITED="${INHERITED} ${ECLASS}"
@@ -62,7 +62,7 @@ myth-git_src_unpack() {
 		pkg_pro="myththemes.pro"
 	fi
 
-	git_src_unpack
+	git-2_src_unpack
 
 	if has ${_MODULE} ${MYTHPLUGINS} ; then
 		cd ${S}/mythplugins

diff --git a/media-plugins/mythvideo/Manifest b/media-plugins/mythvideo/Manifest
diff --git a/media-plugins/mythvideo/files/mythvideo.daily b/media-plugins/mythvideo/files/mythvideo.daily
diff --git a/media-plugins/mythvideo/files/mythvideo.hourly b/media-plugins/mythvideo/files/mythvideo.hourly
diff --git a/media-plugins/mythvideo/files/mythvideo.weekly b/media-plugins/mythvideo/files/mythvideo.weekly
diff --git a/media-plugins/mythvideo/mythvideo-9999.ebuild b/media-plugins/mythvideo/mythvideo-9999.ebuild
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
@@ -3,4 +3,4 @@ AUX mythbackend.conf 905 RMD160 4cd5cc44d7e06966869518bce9facc40d959a5ed SHA1 b1
 AUX mythbackend.rc6 1702 RMD160 3bb347c2d27883f6340c4239bdfb096f2c426e81 SHA1 5cd60814f484ce7c438b3d49ad4ee06dc24c6604 SHA256 12927586f41fa89cea8a87dbc8934e94032bbf45fcddb2452b7ec760b272b216
 AUX mythfilldatabase.cron 74 RMD160 748e75c79f0ea0de2bd548e04bb1ff92c3f819bb SHA1 a8bf9761d415f0dccb0de218105f61b36374c4b7 SHA256 e4b1c7cc85f1520d8b5ec0534617d7cd3f9f0f691544c4e8595244250bae3138
 AUX mythtv-0.22-sandbox.patch 475 RMD160 a6004ed9327a28828bdc310eba45b95ddcea45e6 SHA1 27fc69bed7c26444c2e94c4bda28d68a28f1a73a SHA256 f0537f4ecd03dc451d7eddead0773257c1afa6252f08cac626afa1d9c69029ae
-EBUILD mythtv-9999.ebuild 5272 RMD160 b1c690c471cf58dc2e339ab6e63fa31f563f5196 SHA1 8b5936e87a35f67e2914c99d28d75aa31515dfc7 SHA256 30ccb094d8005e99d58a91136d9ead09c4b81108b58d2e27300220dd4ef4c94b
+EBUILD mythtv-9999.ebuild 5301 RMD160 48120ee732bc01aab4275b9c57c621f50c107573 SHA1 a0c0f04b0f29448fd5a32cbef117e8b20a780a72 SHA256 0ed6715cbfe5d3f06483fb467a6c7e6fdc779f7f5b3b44aece5d698017a0c368
diff --git a/media-tv/mythtv/mythtv-9999.ebuild b/media-tv/mythtv/mythtv-9999.ebuild
@@ -6,7 +6,8 @@
 # $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-9999.ebuild,v 1.3 2009/07/10 14:05:04 Marc Tousignant Exp $
 
 EAPI="2"
-inherit myth-git qt4 flag-o-matic multilib eutils toolchain-funcs
+inherit myth-git qt4-r2 flag-o-matic multilib eutils toolchain-funcs python
+inherit linux-info
 
 DESCRIPTION="Homebrew PVR project"
 HOMEPAGE="http://www.mythtv.org/"
@@ -125,9 +126,6 @@ setup_pro() {
 src_configure() {
 	use debug && use profile && die "You can not have USE="debug" and USE="profile" at the same time. Must disable one or the other."
 
-	has distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
-	has ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
-
 	use pulseaudio || myconf="${myconf} --disable-audio-pulseoutput"
 
 	myconf="$(use_enable alsa audio-alsa)
@@ -155,6 +153,9 @@ src_configure() {
 
 	use debug && myconf="${myconf} --compile-type=debug"
 	use profile && myconf="${myconf} --compile-type=profile"
+
+	has distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
+	has ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
 }
 
 src_compile() {