Make all ebuilds use mythtv.eclass' SRC_URI, fixing bug #280516. Convert mythtv-0.21_p18314-r* to EAPI 2 for SRC_URI arrows. Adjust all ebuilds to call source preparation commands in src_prepare as they should be in EAPI 2.

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

6 files changed, 36 insertions, 46 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 83065c4a250c..ff87bd73ff3a 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.277 2009/08/16 13:45:16 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.278 2009/08/25 16:52:15 gentoofan23 Exp $
+
+  25 Aug 2009; Thomas Anderson <gentoofan23@gentoo.org>
+  mythtv-0.21_p18314-r1.ebuild, mythtv-0.21_p18314-r2.ebuild,
+  mythtv-0.21_p19961-r1.ebuild, mythtv-0.21_p19961-r2.ebuild:
+  Make all ebuilds use mythtv.eclass' SRC_URI, fixing bug #280516. Convert
+  mythtv-0.21_p18314-r* to EAPI 2 for SRC_URI arrows. Adjust all ebuilds to
+  call source preparation commands in src_prepare as they should be in EAPI
+  2.
 
   16 Aug 2009; Thomas Anderson <gentoofan23@gentoo.org>
   mythtv-0.21_p19961-r2.ebuild:
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 5b45aa3e58f9..67ea72c68cd7 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -9,15 +9,15 @@ AUX mythtv-0.21-mythflix-naming-collision.patch 475 RMD160 5473a9ffc8fbe1eebfe87
 AUX mythtv.logrotate.d 434 RMD160 c76842df30c1e9cc772f57dd3a3532c017d4176d SHA1 f5e772659b2616a55ca7326f65d8917352029b51 SHA256 a9032f190b28c3778340799be668779638ee09cf85e8febc669443f3aaf3578c
 AUX runmythfe 186 RMD160 e4b5bfeaecbf541e6cc45b6a9c0e5c048e3fccd0 SHA1 f5ec9dfd4781b28c0af8745c282ce242141590d8 SHA256 bebc665f37b21193be2f259cb8daf6863dfd4336e4e1424a7a989d6b679964fe
 AUX xinitrc 240 RMD160 9c0c1030aa65c8fd3f20501f45757515a9208a61 SHA1 11795aa8be5bd668d91acdd61aa80d5cc8af5cac SHA256 770990183ce8df60bf3bcbc3a334558155aedd0a80357556261fb938b4254e94
-DIST mythtv-0.21_p18314.tar.bz2 27303543 RMD160 214a0933cad3e5b80c9d26b09dc9fc5e67ed1167 SHA1 e6c01d1140d17b88323fae4359e31d48391a4026 SHA256 f74941eec4d7b925891b75fbb8eb2895e10a12088535dd7d67b522aa30169a50
-DIST mythtv-0.21_p19961.tar.bz2 27193086 RMD160 71ad1091ab9fb4b0109092a2a10f7e3fcad9f72f SHA1 a8a636e71375406e8c873916f527ce2d1083e4e6 SHA256 27fcb3c13add495a201a26b8bdcd2fbe9a45ea09e05d1fec4593324eed5fcfde
+DIST mythtv-0.21_p18314.zip 17926762 RMD160 bdb1a048a5ff1174098f7f79d7fce7e9289dda78 SHA1 0d7711c5800a1243c3e1094077078d075a37e404 SHA256 c4dddb137784f3ebbfe7e13e931f0c56d74768916e86ac57003cf3fda2e20f80
+DIST mythtv-0.21_p19961.zip 17957135 RMD160 f6464fa25b945554bb95646329e0e7716014f074 SHA1 957fab45214dfab071836017d407b612e2bd3db4 SHA256 effd70a7e12cf4628683d702b28f7e79194de0021fb986eae25829cf9375aa13
 DIST mythtv-0.21_p20877.zip 17988425 RMD160 1f5d95f78480ac505c6324c8a008563789c83057 SHA1 ddaf21bbb7075ffe79d920a0e69a53d1233df088 SHA256 7e5b2347fc7d128f30565d1f6cac4631fe8e161b45122dfa4b53e10f24400318
 DIST mythtv-0.22_alpha20959.zip 23243124 RMD160 c851329e96749258d59cad3471be19255db2c453 SHA1 c75199e95a70cc231e7fa14f4f63b5a6ecf77e3a SHA256 ecea342e6f6c423fafb0fbba42cb3cf9af794f76f127cea80e7f594c92ce6bb2
-EBUILD mythtv-0.21_p18314-r1.ebuild 9247 RMD160 bc263afda88cf7124857d7a2c613ba271f33db53 SHA1 301f28f58d5ca48485c688f026fb7e7e8a80b1f1 SHA256 e843b279467be27ac71c0acf56227c2579ae33e9bdddbdc50b376271ab3e87ff
-EBUILD mythtv-0.21_p18314-r2.ebuild 9109 RMD160 1a9bd4d997fa10e9361ca54f10809ced36d9afdc SHA1 a2a08d31016951f9d23f5a3989d2e0dfdaada655 SHA256 f9f1fd75e3752e17910aba88cb733df7cbb1b4607850cf96d98803d6e84d8a7f
-EBUILD mythtv-0.21_p19961-r1.ebuild 9052 RMD160 17b7293ff4490ac6b871a927fe7f918a2806b12b SHA1 0e6d5a36c47622d599aa0ab5df33e05fe44ff47a SHA256 c2677646a079506f4e42626d28faf9044dcaf863b90e4a28ab62940305cd5058
-EBUILD mythtv-0.21_p19961-r2.ebuild 8882 RMD160 543bdeb4aaf640f54702f9abb2e7315d72b0d329 SHA1 e1759e1d693fc82b80be388888417bc80e500a46 SHA256 e470fa7cc24b75ed90e9c1b168f3c86b0682c98e7e54146d3c452acb9b03a936
+EBUILD mythtv-0.21_p18314-r1.ebuild 9205 RMD160 57d9445564ba3710438cd172ef780c70df64cb84 SHA1 bdc5a96177e0b13402c74f5f392243f66dce321d SHA256 740dc8ea276b1d633bc18ac8e261308c593f176aecd68217abca28419d8f50ba
+EBUILD mythtv-0.21_p18314-r2.ebuild 9069 RMD160 78243de55913ade61a22850a7cfdb454652c20f9 SHA1 315c70472101d3907ee25302f9ade31e3cd7655d SHA256 f28c6e10ff903428055775617ada93e1ecfc7a85e972d913879560abd72d11c3
+EBUILD mythtv-0.21_p19961-r1.ebuild 8991 RMD160 dd134a74dc8fca82e504bc9e4bdd222e8cd8e10e SHA1 f6f48cda1db1b397250d8e074caca72c68690c36 SHA256 a06fd184455ac2a3317ce2242cc39f476e6d25fb222d67add8b326d85ecd5d2e
+EBUILD mythtv-0.21_p19961-r2.ebuild 8819 RMD160 1981debca4d7edfa3133b0efb3e2e100e543a595 SHA1 cf621f78f6080cdcd0204589f19eda1ddc232658 SHA256 22254bcbc3c75a9595c3ebfd5e3bc4dfea09dcd72d0cd2251386b1909e89db78
 EBUILD mythtv-0.21_p20877.ebuild 8844 RMD160 07e9079645f385d3abf0ed1e2182abc5b0bf0bdf SHA1 975df4ed94356d88fa74cabb0183af47230b5ccb SHA256 bef2828b900dec0310e76dc9d0e9ba6dac91ae76662948f815bdac9248ee8487
 EBUILD mythtv-0.22_alpha20959.ebuild 8577 RMD160 ddfb13b17489143cbadd9ad9276eb5073225a9d5 SHA1 685565bdf1bbe8682a3fbdfd2e1aaf812592d3ff SHA256 48fa59de6f5393b0c811c7bb8f7b5597c18fb29c590e29a524f0f5b8b9d1ff2f
-MISC ChangeLog 55276 RMD160 4a7bc6bbc2f703e18fdaf1cd9d59710705cb16cb SHA1 81155ee085c73f31119282fc8dbe682b4a6edc1c SHA256 cba77b733e1f4f7d6b706059bbe71d63311d0749cccb4a58486d6e9d01c902dc
+MISC ChangeLog 55689 RMD160 3c62990404c84294adcfa7ecbb9aeb1e4123b3a4 SHA1 430c260f98392a8bf5ef42f5298578eea897e588 SHA256 a923476833f472661c864f9599e1841e334ec782a7e190bad0f97d9a77d173ec
 MISC metadata.xml 3255 RMD160 54a3e730f5cb5d9ade5dbe9b3e5e2b1dbfdd885d SHA1 90601ab1f7dbc73b1fc6bc1f806e4f645aa64783 SHA256 e593e8a37451bcfc150a7441aecfe9518d3879bc6382cb52fd96f13f5fda865a
diff --git a/media-tv/mythtv/mythtv-0.21_p18314-r1.ebuild b/media-tv/mythtv/mythtv-0.21_p18314-r1.ebuild
index 7ab261274b60..63997fddc3bd 100644
--- a/media-tv/mythtv/mythtv-0.21_p18314-r1.ebuild
+++ b/media-tv/mythtv/mythtv-0.21_p18314-r1.ebuild
@@ -1,16 +1,14 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_p18314-r1.ebuild,v 1.7 2009/03/06 18:11:04 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_p18314-r1.ebuild,v 1.8 2009/08/25 16:52:15 gentoofan23 Exp $
 
-EAPI=1
+EAPI=2
 inherit flag-o-matic multilib eutils qt3 mythtv toolchain-funcs python confutils
 
 DESCRIPTION="Homebrew PVR project"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
 IUSE_VIDEO_CARDS="video_cards_nvidia"
 IUSE="aac alsa altivec autostart debug directv dvb dvd fftw ieee1394 jack lcd \
 lirc mmx opengl perl python xvmc ${IUSE_VIDEO_CARDS}"
@@ -72,11 +70,7 @@ pkg_setup() {
 	usermod -a -G ${MYTHTV_GROUPS} mythtv
 }
 
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# upstream wants the revision number in their version.cpp
 	# since the subversion.eclass strips out the .svn directory
 	# svnversion in MythTV's build doesn't work
@@ -94,7 +88,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-0.21-bttv.patch
 }
 
-src_compile() {
+src_configure() {
 	local myconf="--prefix=/usr
 		--mandir=/usr/share/man
 		--libdir-name=$(get_libdir)"
@@ -177,8 +171,10 @@ src_compile() {
 	CFLAGS=""
 	CXXFLAGS=""
 	einfo "Running ./configure ${myconf}"
-	./configure ${myconf} || die "configure died"
+	sh configure ${myconf} || die "configure died"
+}
 
+src_compile() {
 	eqmake3 mythtv.pro -o "Makefile" || die "eqmake3 failed"
 	emake || die "emake failed"
 
diff --git a/media-tv/mythtv/mythtv-0.21_p18314-r2.ebuild b/media-tv/mythtv/mythtv-0.21_p18314-r2.ebuild
index 5610e8724346..c52f2a4c763e 100644
--- a/media-tv/mythtv/mythtv-0.21_p18314-r2.ebuild
+++ b/media-tv/mythtv/mythtv-0.21_p18314-r2.ebuild
@@ -1,16 +1,14 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_p18314-r2.ebuild,v 1.1 2009/05/29 20:13:06 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_p18314-r2.ebuild,v 1.2 2009/08/25 16:52:15 gentoofan23 Exp $
 
-EAPI=1
+EAPI=2
 inherit flag-o-matic multilib eutils qt3 mythtv toolchain-funcs python confutils
 
 DESCRIPTION="Homebrew PVR project"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
 IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_via"
 IUSE="aac alsa altivec autostart debug directv dvb dvd fftw ieee1394 jack lcd \
 lirc mmx opengl perl python xvmc ${IUSE_VIDEO_CARDS}"
@@ -72,11 +70,7 @@ pkg_setup() {
 	usermod -a -G ${MYTHTV_GROUPS} mythtv
 }
 
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# upstream wants the revision number in their version.cpp
 	# since the subversion.eclass strips out the .svn directory
 	# svnversion in MythTV's build doesn't work
@@ -98,7 +92,7 @@ src_unpack() {
 
 }
 
-src_compile() {
+src_configure() {
 	local myconf="--prefix=/usr
 		--mandir=/usr/share/man
 		--libdir-name=$(get_libdir)"
@@ -178,8 +172,10 @@ src_compile() {
 	CFLAGS=""
 	CXXFLAGS=""
 	einfo "Running ./configure ${myconf}"
-	./configure ${myconf} || die "configure died"
+	sh configure ${myconf} || die "configure died"
+}
 
+src_compile() {
 	eqmake3 mythtv.pro -o "Makefile" || die "eqmake3 failed"
 	emake || die "emake failed"
 
diff --git a/media-tv/mythtv/mythtv-0.21_p19961-r1.ebuild b/media-tv/mythtv/mythtv-0.21_p19961-r1.ebuild
index d848f346020b..f7f5df74d633 100644
--- a/media-tv/mythtv/mythtv-0.21_p19961-r1.ebuild
+++ b/media-tv/mythtv/mythtv-0.21_p19961-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_p19961-r1.ebuild,v 1.3 2009/03/06 18:11:04 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_p19961-r1.ebuild,v 1.4 2009/08/25 16:52:15 gentoofan23 Exp $
 
 EAPI=2
 inherit flag-o-matic multilib eutils qt3 mythtv toolchain-funcs python confutils
@@ -9,8 +9,6 @@ DESCRIPTION="Homebrew PVR project"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
 IUSE_VIDEO_CARDS="video_cards_nvidia"
 IUSE="aac alsa altivec autostart debug directv dvb dvd fftw ieee1394 jack lcd \
 lirc mmx opengl perl python xvmc ${IUSE_VIDEO_CARDS}"
@@ -69,10 +67,7 @@ pkg_setup() {
 	usermod -a -G ${MYTHTV_GROUPS} mythtv
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# upstream wants the revision number in their version.cpp
 	# since the subversion.eclass strips out the .svn directory
 	# svnversion in MythTV's build doesn't work
@@ -167,7 +162,7 @@ src_configure() {
 	CFLAGS=""
 	CXXFLAGS=""
 	einfo "Running ./configure ${myconf}"
-	./configure ${myconf} || die "configure died"
+	sh configure ${myconf} || die "configure died"
 }
 
 src_compile() {
diff --git a/media-tv/mythtv/mythtv-0.21_p19961-r2.ebuild b/media-tv/mythtv/mythtv-0.21_p19961-r2.ebuild
index 8debff2da4d1..50b9626032ce 100644
--- a/media-tv/mythtv/mythtv-0.21_p19961-r2.ebuild
+++ b/media-tv/mythtv/mythtv-0.21_p19961-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_p19961-r2.ebuild,v 1.2 2009/08/16 13:45:16 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_p19961-r2.ebuild,v 1.3 2009/08/25 16:52:15 gentoofan23 Exp $
 
 EAPI=2
 inherit flag-o-matic multilib eutils qt3 mythtv toolchain-funcs python confutils
@@ -9,8 +9,6 @@ DESCRIPTION="Homebrew PVR project"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~x86"
 
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
 IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_via"
 IUSE="aac alsa altivec autostart debug directv dvb dvd fftw ieee1394 jack lcd \
 lirc mmx opengl perl python xvmc ${IUSE_VIDEO_CARDS}"
@@ -70,10 +68,7 @@ pkg_setup() {
 	usermod -a -G ${MYTHTV_GROUPS} mythtv
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# upstream wants the revision number in their version.cpp
 	# since the subversion.eclass strips out the .svn directory
 	# svnversion in MythTV's build doesn't work
@@ -165,7 +160,7 @@ src_configure() {
 	CFLAGS=""
 	CXXFLAGS=""
 	einfo "Running ./configure ${myconf}"
-	./configure ${myconf} || die "configure died"
+	sh configure ${myconf} || die "configure died"
 }
 
 src_compile() {