Fix qmake dir per bug #97535

(Portage version: 2.0.51.22-r1)

14 files changed, 44 insertions, 26 deletions

diff --git a/games-strategy/attal/ChangeLog b/games-strategy/attal/ChangeLog
index 56ae08aaf217..896a33e9c10c 100644
--- a/games-strategy/attal/ChangeLog
+++ b/games-strategy/attal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/attal
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/ChangeLog,v 1.11 2005/06/12 12:12:52 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/ChangeLog,v 1.12 2005/07/01 15:05:06 caleb Exp $
+
+  01 Jul 2005; Caleb Tennis <caleb@gentoo.org> attal-0.8.1.ebuild,
+  attal-0.9.2.ebuild, attal-0.9.3.ebuild:
+  Fix qmake dir per bug #97535
 
   12 Jun 2005; Sven Wegener <swegener@gentoo.org> attal-0.8.1.ebuild,
   attal-0.9.2.ebuild, attal-0.9.3.ebuild:
diff --git a/games-strategy/attal/attal-0.8.1.ebuild b/games-strategy/attal/attal-0.8.1.ebuild
index ba5f600f2a3f..e784641a9ee0 100644
--- a/games-strategy/attal/attal-0.8.1.ebuild
+++ b/games-strategy/attal/attal-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/attal-0.8.1.ebuild,v 1.6 2005/06/12 12:12:52 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/attal-0.8.1.ebuild,v 1.7 2005/07/01 15:05:06 caleb Exp $
 
 inherit games eutils
 
@@ -31,7 +31,7 @@ src_unpack() {
 			*/*.pro \
 			|| die "renaming ${lib}"
 	done
-	qmake -o Makefile Makefile.pro || die "qmake failed"
+	${QTDIR}/bin/qmake -o Makefile Makefile.pro || die "qmake failed"
 	sed -i \
 		"s:\./themes/:${GAMES_DATADIR}/${PN}/themes/:" \
 		`grep -Rl '\./themes/' *` \
diff --git a/games-strategy/attal/attal-0.9.2.ebuild b/games-strategy/attal/attal-0.9.2.ebuild
index fa3aa00abcb1..18deaf8e7961 100644
--- a/games-strategy/attal/attal-0.9.2.ebuild
+++ b/games-strategy/attal/attal-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/attal-0.9.2.ebuild,v 1.3 2005/06/12 12:12:52 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/attal-0.9.2.ebuild,v 1.4 2005/07/01 15:05:06 caleb Exp $
 
 inherit games eutils flag-o-matic
 
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	qmake -o Makefile Makefile.pro || die "qmake failed"
+	${QTDIR}/bin/qmake -o Makefile Makefile.pro || die "qmake failed"
 	sed -i \
 		"s:\./themes/:${GAMES_DATADIR}/${PN}/themes/:" \
 		`grep -Rl '\./themes/' *` \
diff --git a/games-strategy/attal/attal-0.9.3.ebuild b/games-strategy/attal/attal-0.9.3.ebuild
index 4dfc6646c75f..23c924da80e7 100644
--- a/games-strategy/attal/attal-0.9.3.ebuild
+++ b/games-strategy/attal/attal-0.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/attal-0.9.3.ebuild,v 1.2 2005/06/12 12:12:52 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/attal-0.9.3.ebuild,v 1.3 2005/07/01 15:05:06 caleb Exp $
 
 inherit eutils flag-o-matic games
 
@@ -31,7 +31,7 @@ src_unpack() {
 		-e "s:\"\./:\"${GAMES_DATADIR}/${PN}/:" \
 		libCommon/displayHelp.cpp \
 		|| die "sed failed"
-	qmake -o Makefile Makefile.pro || die "qmake failed"
+	${QTDIR}/bin/qmake -o Makefile Makefile.pro || die "qmake failed"
 	sed -i \
 		"s:\./themes/:${GAMES_DATADIR}/${PN}/themes/:" \
 		`grep -Rl '\./themes/' *` \
diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 90e9ea020d24..00674d39762d 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.72 2005/06/29 07:50:10 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.73 2005/07/01 15:06:01 caleb Exp $
+
+  01 Jul 2005; Caleb Tennis <caleb@gentoo.org> mythtv-0.18.1-r1.ebuild,
+  mythtv-0.18.1-r2.ebuild:
+  Fix qmake dir per bug #97535
 
   29 Jun 2005; Doug Goldstein <cardoe@gentoo.org>
   -files/mythtv-0.17-qt334-dst-fix.patch, -files/mythbackend.conf,
diff --git a/media-tv/mythtv/mythtv-0.18.1-r1.ebuild b/media-tv/mythtv/mythtv-0.18.1-r1.ebuild
index af2a488a5818..e799c89bf919 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
 # 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.7 2005/06/21 21:47:08 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.18.1-r1.ebuild,v 1.8 2005/07/01 15:06:01 caleb Exp $
 
 inherit flag-o-matic eutils debug
 
@@ -152,7 +152,7 @@ src_compile() {
 	CXXFLAGS=""
 	econf ${myconf} || die "configure died"
 
-	qmake -o "Makefile" mythtv.pro || die "qmake failed"
+	${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 d78ed9b925d3..8d62b1452dc1 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
 # 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.6 2005/06/29 04:39:01 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.18.1-r2.ebuild,v 1.7 2005/07/01 15:06:01 caleb Exp $
 
 inherit flag-o-matic eutils debug
 
@@ -154,7 +154,7 @@ src_compile() {
 	CXXFLAGS=""
 	econf ${myconf} || die "configure died"
 
-	qmake -o "Makefile" mythtv.pro || die "qmake failed"
+	${QTDIR}/bin/qmake -o "Makefile" mythtv.pro || die "qmake failed"
 	emake || die "emake failed"
 
 }
diff --git a/media-video/qdvdauthor/ChangeLog b/media-video/qdvdauthor/ChangeLog
index 5bf49232da6c..787396278b2e 100644
--- a/media-video/qdvdauthor/ChangeLog
+++ b/media-video/qdvdauthor/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/qdvdauthor
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qdvdauthor/ChangeLog,v 1.3 2005/04/20 21:59:32 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qdvdauthor/ChangeLog,v 1.4 2005/07/01 15:06:59 caleb Exp $
+
+  01 Jul 2005; Caleb Tennis <caleb@gentoo.org> qdvdauthor-0.0.9.ebuild:
+  Fix qmake dir per bug #97535
 
   20 Apr 2005; Simon Stelling <blubb@gentoo.org> qdvdauthor-0.0.9.ebuild:
   added ~amd64
diff --git a/media-video/qdvdauthor/qdvdauthor-0.0.9.ebuild b/media-video/qdvdauthor/qdvdauthor-0.0.9.ebuild
index 27ea76cbb151..c6a016c6a1a5 100644
--- a/media-video/qdvdauthor/qdvdauthor-0.0.9.ebuild
+++ b/media-video/qdvdauthor/qdvdauthor-0.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qdvdauthor/qdvdauthor-0.0.9.ebuild,v 1.2 2005/04/20 21:59:32 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qdvdauthor/qdvdauthor-0.0.9.ebuild,v 1.3 2005/07/01 15:06:59 caleb Exp $
 
 inherit kde-functions
 
@@ -36,14 +36,14 @@ src_compile() {
 	#export QT_LIB="$QTDIR"
 	sed -i "s|/usr/local/bin|/usr/bin|g" qdvdauthor/qdvdauthor.cpp qdvdauthor/dialogexecute.cpp doc/sound.txt
 	cd qdvdauthor
-	qmake qdvdauthor.pro
+	${QTDIR}/bin/qmake qdvdauthor.pro
 
 	# fixing Makefile, so that we can use our CFLAGS
 	sed -i -e "s|^CFLAGS.*-O2|CFLAGS = ${CFLAGS} |g" -e "s|^CXXFLAGS.*-O2|CXXFLAGS = ${CXXFLAGS} |g" Makefile
 	emake || die "emake qdvdauthor failed"
 
 	cd qslideshow
-	qmake qslideshow.pro
+	${QTDIR}/bin/qmake qslideshow.pro
 	# fixing Makefile, so that we can use our CFLAGS
 	sed -i -e "s|^CFLAGS.*-O2|CFLAGS   = ${CFLAGS} |g" -e "s|^CXXFLAGS.*-O2|CXXFLAGS = ${CXXFLAGS} |g" Makefile
 	emake || die "emake qslideshow failed"
diff --git a/net-analyzer/snmpmon/ChangeLog b/net-analyzer/snmpmon/ChangeLog
index 509ecc2e3755..ef0aec5177bc 100644
--- a/net-analyzer/snmpmon/ChangeLog
+++ b/net-analyzer/snmpmon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/snmpmon
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snmpmon/ChangeLog,v 1.3 2004/09/29 00:58:00 weeve Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snmpmon/ChangeLog,v 1.4 2005/07/01 15:08:32 caleb Exp $
+
+  01 Jul 2005; Caleb Tennis <caleb@gentoo.org> snmpmon-0.5.ebuild:
+  Fix qmake dir per bug #97535
 
   28 Sep 2004; Jason Wever <weeve@gentoo.org> snmpmon-0.5.ebuild:
   Added ~sparc keyword, resolves bug #65746.
diff --git a/net-analyzer/snmpmon/snmpmon-0.5.ebuild b/net-analyzer/snmpmon/snmpmon-0.5.ebuild
index 3be26b213287..6e1550d8fb3c 100644
--- a/net-analyzer/snmpmon/snmpmon-0.5.ebuild
+++ b/net-analyzer/snmpmon/snmpmon-0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snmpmon/snmpmon-0.5.ebuild,v 1.3 2004/09/29 00:58:00 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snmpmon/snmpmon-0.5.ebuild,v 1.4 2005/07/01 15:08:32 caleb Exp $
 
 IUSE=""
 
@@ -20,7 +20,7 @@ KEYWORDS="x86 ~sparc"
 DEPEND=">=net-analyzer/net-snmp-5.0.9-r1"
 
 src_compile() {
-	qmake -o Makefile snmpmon.pro
+	${QTDIR}/bin/qmake -o Makefile snmpmon.pro
 	sed -i -e "s/CFLAGS   = -pipe -w -O2/CFLAGS   = ${CFLAGS} -w/" Makefile
 	sed -i -e "s/CXXFLAGS = -pipe -w -O2/CXXFLAGS = ${CXXFLAGS} -w/" Makefile
 	addpredict ${QTDIR}/etc/settings
diff --git a/net-dialup/qlcr/ChangeLog b/net-dialup/qlcr/ChangeLog
index 7d4ad5047ceb..4c71d25fc958 100644
--- a/net-dialup/qlcr/ChangeLog
+++ b/net-dialup/qlcr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/qlcr
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/qlcr/ChangeLog,v 1.2 2005/06/14 11:20:09 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/qlcr/ChangeLog,v 1.3 2005/07/01 15:09:09 caleb Exp $
+
+  01 Jul 2005; Caleb Tennis <caleb@gentoo.org> qlcr-0.4.0.ebuild,
+  qlcr-0.4.1.ebuild:
+  Fix qmake dir per bug #97535
 
 *qlcr-0.4.1 (14 Jun 2005)
 
diff --git a/net-dialup/qlcr/qlcr-0.4.0.ebuild b/net-dialup/qlcr/qlcr-0.4.0.ebuild
index 64bc1dc537d9..f1a845ca0ad4 100644
--- a/net-dialup/qlcr/qlcr-0.4.0.ebuild
+++ b/net-dialup/qlcr/qlcr-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/qlcr/qlcr-0.4.0.ebuild,v 1.1 2005/02/26 11:32:04 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/qlcr/qlcr-0.4.0.ebuild,v 1.2 2005/07/01 15:09:09 caleb Exp $
 
 inherit eutils kde-functions
 set-qtdir 3
@@ -22,7 +22,7 @@ DEPEND=">=x11-libs/qt-3.3
 
 src_compile() {
 	cd src
-	qmake -o Makefile qlcr.pro || die "qmake failed."
+	${QTDIR}/bin/qmake -o Makefile qlcr.pro || die "qmake failed."
 	emake || die "Make failed."
 }
 
diff --git a/net-dialup/qlcr/qlcr-0.4.1.ebuild b/net-dialup/qlcr/qlcr-0.4.1.ebuild
index 9fa4a9cb57b3..544f915cdfc8 100644
--- a/net-dialup/qlcr/qlcr-0.4.1.ebuild
+++ b/net-dialup/qlcr/qlcr-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/qlcr/qlcr-0.4.1.ebuild,v 1.1 2005/06/14 11:20:09 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/qlcr/qlcr-0.4.1.ebuild,v 1.2 2005/07/01 15:09:09 caleb Exp $
 
 inherit eutils kde-functions
 set-qtdir 3
@@ -22,7 +22,7 @@ DEPEND=">=x11-libs/qt-3.3
 
 src_compile() {
 	cd src
-	qmake -o Makefile qlcr.pro || die "qmake failed"
+	${QTDIR}/bin/qmake -o Makefile qlcr.pro || die "qmake failed"
 	emake || die "emake failed"
 }