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

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 32 insertions, 16 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/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() {