fix sandbox 1.9/2.0 issues, bug #272847. fix up EAPI=2 usage. bump trunk version.

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

5 files changed, 40 insertions, 23 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 0b8dd41a2f1e..f10b72d45de9 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.274 2009/07/19 03:40:27 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.275 2009/07/19 23:59:47 cardoe Exp $
+
+*mythtv-0.22_alpha20959 (19 Jul 2009)
+
+  19 Jul 2009; Doug Goldstein <cardoe@gentoo.org> mythtv-0.21_p20877.ebuild,
+  +files/mythtv-0.21-ldconfig-sanxbox-fix.patch,
+  -mythtv-0.22_alpha19054.ebuild, +mythtv-0.22_alpha20959.ebuild:
+  fix sandbox 1.9/2.0 issues, bug #272847. fix up EAPI=2 usage. bump trunk
+  version.
 
 *mythtv-0.21_p20877 (19 Jul 2009)
 
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 5023e3168873..2ac13aaab7ba 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -7,6 +7,7 @@ AUX mythbackend-0.18.2.rc 1128 RMD160 0297452b3d9fe09479c737d136a73171a35eb643 S
 AUX mythfilldatabase.cron 73 RMD160 ce57516fe3ac3f339ebaad6b88c85366d4dbbc5b SHA1 7ae24184f931336f317eaefaa7c27a8e4531e0ee SHA256 fc5a3b094fd403e9076fbb1903e826ddc97bd579cb0ba7ef6fc11940099fca3d
 AUX mythtv-0.21-bttv.patch 630 RMD160 c80853b7cb9aa6612a96dd798b8dbc7e9ea08db9 SHA1 1dbb90a54e8ff1d4380d4b55c3818bb750d8b93c SHA256 90411dc58532a95b8556053e2ba04adf5f726bc501e13e3d57b37330cb4c969d
 AUX mythtv-0.21-dvb-headers.patch 725 RMD160 dfcf2a2b8dfe7af4f2a6776525c591bd07838bce SHA1 09d78a600f215fbc6cab9384437ed8509ab49a31 SHA256 c6043bf9fb1980d559691d8cb79cf650cb86bef7e63475ec973acdb16cb9a0f8
+AUX mythtv-0.21-ldconfig-sanxbox-fix.patch 448 RMD160 4a5f9f7824c2c31f2a875f2fe25bcbd5b8f87e25 SHA1 2fe5f624ca80ecf097c45e12a3a9cd8038e92377 SHA256 aecead5240507fd0ccadad337160c79a9d7125d47e085f2bf167d9fecd2a804e
 AUX mythtv-0.21-mythflix-naming-collision.patch 475 RMD160 5473a9ffc8fbe1eebfe87a01abd22ea1c666f75f SHA1 008a9e762c59f8d49a69c5d82161a6a3df025a3b SHA256 969e31cc7310870041b6cae07f1a84b57a387f2ad5e96e24094fe0e146c68611
 AUX mythtv.logrotate.d 434 RMD160 c76842df30c1e9cc772f57dd3a3532c017d4176d SHA1 f5e772659b2616a55ca7326f65d8917352029b51 SHA256 a9032f190b28c3778340799be668779638ee09cf85e8febc669443f3aaf3578c
 AUX runmythfe 186 RMD160 e4b5bfeaecbf541e6cc45b6a9c0e5c048e3fccd0 SHA1 f5ec9dfd4781b28c0af8745c282ce242141590d8 SHA256 bebc665f37b21193be2f259cb8daf6863dfd4336e4e1424a7a989d6b679964fe
@@ -14,19 +15,19 @@ AUX xinitrc 240 RMD160 9c0c1030aa65c8fd3f20501f45757515a9208a61 SHA1 11795aa8be5
 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_p20877.zip 17988425 RMD160 1f5d95f78480ac505c6324c8a008563789c83057 SHA1 ddaf21bbb7075ffe79d920a0e69a53d1233df088 SHA256 7e5b2347fc7d128f30565d1f6cac4631fe8e161b45122dfa4b53e10f24400318
-DIST mythtv-0.22_alpha19054.tar.bz2 28313043 RMD160 11de9639953123fe98bc853a0a426fc5df419363 SHA1 af735115935b403ec1da02606358b4db143af8ae SHA256 cf58ea16cfd619b643cc9b018c10d37755869e314513e228a1c15b86066a248e
+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 8879 RMD160 e07a69daf9cc3f13bc88971ba7d6a2f47e131e61 SHA1 3678cf6675c6c9471fadfe12dff4500e51874808 SHA256 276042d6bb75b5770bec22ea2bd5fb3244ff5df4278747426e944d84bdb98903
-EBUILD mythtv-0.21_p20877.ebuild 8824 RMD160 07716aba85f27d22be011c3e5534df7fe797bf35 SHA1 c4f4fe414313881d05894e0bdf4ed38508a502aa SHA256 de999eaa206a7960ee56bd7cb2a27cf78a01433f64668e34fecacff840b74b6b
-EBUILD mythtv-0.22_alpha19054.ebuild 8598 RMD160 edd06a4a1aa0d51197222fb94c1d34685c64a4ef SHA1 731968e20ba8456a3cc474786b0601a53b538a96 SHA256 fd9b433fc547545823b779a024723f7ae7e2891d3bca83bc647a6e01ae35d293
-MISC ChangeLog 54707 RMD160 c6e734744f4dbbabd684824e2991ca73bc3191f3 SHA1 8deea2811db544b7f4f2c96c99961cc1e933bc51 SHA256 4fdbd5965525c73ba8eb13cb4c3e719c7d9616fe6e1d8bf4beb87bc835c492b1
+EBUILD mythtv-0.21_p20877.ebuild 8844 RMD160 07e9079645f385d3abf0ed1e2182abc5b0bf0bdf SHA1 975df4ed94356d88fa74cabb0183af47230b5ccb SHA256 bef2828b900dec0310e76dc9d0e9ba6dac91ae76662948f815bdac9248ee8487
+EBUILD mythtv-0.22_alpha20959.ebuild 8574 RMD160 a0730840ff8d148d4941bf27912c2494c6eafb95 SHA1 41f41bc40f05e5eec068504bc8c03a600c521531 SHA256 c5b96ec55b2973aece4c658eeabec0857d04a78a8a4a956aa02763abdb71f0eb
+MISC ChangeLog 55025 RMD160 76e642d8f1049193729a1cb590f39510b3234083 SHA1 6d35591ea7ee882810afaede46ecde66605a98cb SHA256 8f2c23c536a5e2986d1f133790d884287361d984fb0c5a4e27431c8899a1c6f7
 MISC metadata.xml 3255 RMD160 54a3e730f5cb5d9ade5dbe9b3e5e2b1dbfdd885d SHA1 90601ab1f7dbc73b1fc6bc1f806e4f645aa64783 SHA256 e593e8a37451bcfc150a7441aecfe9518d3879bc6382cb52fd96f13f5fda865a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpilc0ACgkQoeSe8B0zEfxCGgCcDS3rfpVw6wKiWZ5Nse5DSXIj
-2P0AnRcWQT0Veyzj7HbzxvzyQkO4yctX
-=47pF
+iEYEARECAAYFAkpjs30ACgkQoeSe8B0zEfwh1ACfat+E2lmvCP3pw5Mp3MMycZQd
+3NkAn24WYe0+ANKY7NkE3Jm19EUaJbAK
+=notU
 -----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/files/mythtv-0.21-ldconfig-sanxbox-fix.patch b/media-tv/mythtv/files/mythtv-0.21-ldconfig-sanxbox-fix.patch
new file mode 100644
index 000000000000..fbe256a3fa40
--- /dev/null
+++ b/media-tv/mythtv/files/mythtv-0.21-ldconfig-sanxbox-fix.patch
@@ -0,0 +1,13 @@
+diff -ruN a/programs/mythfrontend/mythfrontend.pro b/mythtv.new/programs/mythfrontend/mythfrontend.pro
+--- a/programs/mythfrontend/mythfrontend.pro	2009-06-07 12:32:17.000000000 -0700
++++ b/programs/mythfrontend/mythfrontend.pro	2009-06-07 12:34:45.000000000 -0700
+@@ -16,6 +16,9 @@
+ setting.files += MFEXML_scpd.xml
+ setting.extra = -ldconfig
+ 
++# Gentoo sandbox-2.0:
++setting.extra -= -ldconfig
++
+ INSTALLS += setting
+ 
+ QMAKE_CLEAN += $(TARGET)
diff --git a/media-tv/mythtv/mythtv-0.21_p20877.ebuild b/media-tv/mythtv/mythtv-0.21_p20877.ebuild
index 5a12e29393e9..701b385e8292 100644
--- a/media-tv/mythtv/mythtv-0.21_p20877.ebuild
+++ b/media-tv/mythtv/mythtv-0.21_p20877.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_p20877.ebuild,v 1.1 2009/07/19 03:40:27 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_p20877.ebuild,v 1.2 2009/07/19 23:59:47 cardoe Exp $
 
 EAPI=2
 inherit flag-o-matic multilib eutils qt3 mythtv toolchain-funcs python confutils
@@ -68,19 +68,18 @@ 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
-	sed -e "s:\`(svnversion \$\${SVNTREEDIR} 2>\/dev\/null) || echo Unknown\`:${MYTHTV_REV}:" \
+	sed -e "s:\`(svnversion 2>\/dev\/null) || echo Unknown\`:${MYTHTV_REV}:" \
 		-i "${S}"/version.pro || die "svnversion sed failed"
 
 	# Perl bits need to go into vender_perl and not site_perl
 	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
 		-i "${S}"/bindings/perl/perl.pro
+
+	epatch "${FILESDIR}/${PN}-0.21-ldconfig-sanxbox-fix.patch"
 }
 
 src_configure() {
diff --git a/media-tv/mythtv/mythtv-0.22_alpha19054.ebuild b/media-tv/mythtv/mythtv-0.22_alpha20959.ebuild
index 98b38cb15ac9..40ac11275bd0 100644
--- a/media-tv/mythtv/mythtv-0.22_alpha19054.ebuild
+++ b/media-tv/mythtv/mythtv-0.22_alpha20959.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.22_alpha19054.ebuild,v 1.3 2009/03/06 18:11:04 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.22_alpha20959.ebuild,v 1.1 2009/07/19 23:59:47 cardoe Exp $
 
 EAPI=2
 inherit flag-o-matic multilib eutils qt4 mythtv toolchain-funcs python
@@ -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="alsa altivec autostart debug directv dvb dvd \
 fftw ieee1394 jack lcd lirc mmx perl python \
@@ -71,20 +69,18 @@ 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
-	sed -e "s:\`(svnversion \$\${SVNTREEDIR} 2>\/dev\/null) || echo Unknown\`:${MYTHTV_REV}:" \
+	sed -e "s:\`(svnversion 2>\/dev\/null) || echo Unknown\`:${MYTHTV_REV}:" \
 		-i "${S}"/version.pro || die "svnversion sed failed"
 
 	# Perl bits need to go into vender_perl and not site_perl
 	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
 		-i "${S}"/bindings/perl/perl.pro
+
+	epatch "${FILESDIR}/${PN}-0.21-ldconfig-sanxbox-fix.patch"
 }
 
 src_configure() {