fix qmake call to include QMAKE=... for qt3/qt4

Package-Manager: portage-2.1_pre3-r1

5 files changed, 19 insertions, 25 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 6f2ded984b69..153042221bf5 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/mythtv
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.78 2005/12/26 09:15:30 cardoe Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.79 2006/01/09 13:19:38 caleb Exp $
+
+  09 Jan 2006; Caleb Tennis <caleb@gentoo.org> mythtv-0.18.1-r1.ebuild,
+  mythtv-0.18.1-r2.ebuild, mythtv-0.18.2_pre7882.ebuild:
+  fix qmake call to include QMAKE=...
 
 *mythtv-0.18.2_pre7882 (26 Dec 2005)
 
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 483f535cbb63..ee6ca6119c29 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3d7a955abb19e1eed87a1fdea1c35daa ChangeLog 14544
+MD5 32dd8378789ea8f1e47ad43a979133ad ChangeLog 14711
 MD5 4985a61b90909b7f1c926f79a3ba34bf files/0.18-mythbackend.conf 931
 MD5 946d39e6c7d43c06d11d2bc6e09d5c21 files/0.18-mythbackend.rc 1606
 MD5 b288872f9393adf2b30f40b6ee01eac5 files/digest-mythtv-0.18.1-r1 67
@@ -16,13 +13,6 @@ MD5 340e376a796fcc134e37222f01d705b3 files/mythtv-0.18.1-opengl-fix.patch 304
 MD5 fde2b2886b037b199cc815dbcb12617e files/mythtv-0.18.1-x86_64-configure.patch 631
 MD5 0d20a49cff965a0f3ab35cb0600b65b4 files/runmythfe 104
 MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
-MD5 8336f31d54a9088d763d792ecaa636b2 mythtv-0.18.1-r1.ebuild 5085
-MD5 62b1d73674117c29843e35e593f1e130 mythtv-0.18.1-r2.ebuild 5464
-MD5 d164dff7b99a6efb2414ddd53f9d4119 mythtv-0.18.2_pre7882.ebuild 5663
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDr7TABtvusYtCZMsRAuvgAJ9jHtRTtu6eu5FEDf8uvf7X1HuZNACfbm1f
-6GAy76Eh5UxpavAlSCREHvs=
-=FMWn
------END PGP SIGNATURE-----
+MD5 f2c7e6f87a9c718acdd942b22140e2a9 mythtv-0.18.1-r1.ebuild 5109
+MD5 cac72423d3f6c98d2ef628c3e83c4ff2 mythtv-0.18.1-r2.ebuild 5488
+MD5 fb29a88443b913ea42d515a7caf16731 mythtv-0.18.2_pre7882.ebuild 5687
diff --git a/media-tv/mythtv/mythtv-0.18.1-r1.ebuild b/media-tv/mythtv/mythtv-0.18.1-r1.ebuild
index 4cd7eec1e1dc..dfcc0de75808 100644
--- a/media-tv/mythtv/mythtv-0.18.1-r1.ebuild
+++ b/media-tv/mythtv/mythtv-0.18.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.18.1-r1.ebuild,v 1.11 2005/09/06 15:02:07 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.18.1-r1.ebuild,v 1.12 2006/01/09 13:19:38 caleb Exp $
 
 inherit flag-o-matic eutils debug
 
@@ -152,7 +152,7 @@ src_compile() {
 	CXXFLAGS=""
 	econf ${myconf} || die "configure died"
 
-	${QTDIR}/bin/qmake -o "Makefile" mythtv.pro || die "qmake failed"
+	${QTDIR}/bin/qmake QMAKE=${QTDIR}/bin/qmake -o "Makefile" mythtv.pro || die "qmake failed"
 	emake || die "emake failed"
 
 }
diff --git a/media-tv/mythtv/mythtv-0.18.1-r2.ebuild b/media-tv/mythtv/mythtv-0.18.1-r2.ebuild
index b9bd8d66fcfd..5b20dc3708a0 100644
--- a/media-tv/mythtv/mythtv-0.18.1-r2.ebuild
+++ b/media-tv/mythtv/mythtv-0.18.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.18.1-r2.ebuild,v 1.10 2005/09/06 15:02:07 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.18.1-r2.ebuild,v 1.11 2006/01/09 13:19:38 caleb Exp $
 
 inherit flag-o-matic eutils debug
 
@@ -158,7 +158,7 @@ src_compile() {
 	CXXFLAGS=""
 	econf ${myconf} || die "configure died"
 
-	${QTDIR}/bin/qmake -o "Makefile" mythtv.pro || die "qmake failed"
+	${QTDIR}/bin/qmake QMAKE=${QTDIR}/bin/qmake -o "Makefile" mythtv.pro || die "qmake failed"
 	emake || die "emake failed"
 
 }
diff --git a/media-tv/mythtv/mythtv-0.18.2_pre7882.ebuild b/media-tv/mythtv/mythtv-0.18.2_pre7882.ebuild
index 88e6cbae9409..261e5c5a6aea 100644
--- a/media-tv/mythtv/mythtv-0.18.2_pre7882.ebuild
+++ b/media-tv/mythtv/mythtv-0.18.2_pre7882.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.18.2_pre7882.ebuild,v 1.1 2005/12/26 09:15:30 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.18.2_pre7882.ebuild,v 1.2 2006/01/09 13:19:38 caleb Exp $
 
 inherit eutils qt3 flag-o-matic debug
 
@@ -154,7 +154,7 @@ src_compile() {
 	CXXFLAGS=""
 	econf ${myconf} || die "configure died"
 
-	${QTDIR}/bin/qmake -o "Makefile" mythtv.pro || die "qmake failed"
+	${QTDIR}/bin/qmake QMAKE=${QTDIR}/bin/qmake -o "Makefile" mythtv.pro || die "qmake failed"
 	emake || die "emake failed"
 
 }