Fix qmake dir per bug #97535

Package-Manager: portage-2.0.51.22-r1

8 files changed, 35 insertions, 30 deletions

diff --git a/dev-python/qscintilla/ChangeLog b/dev-python/qscintilla/ChangeLog
index 643969b4c977..0884de6b37e9 100644
--- a/dev-python/qscintilla/ChangeLog
+++ b/dev-python/qscintilla/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/qscintilla
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.42 2005/04/21 19:01:59 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.43 2005/07/01 14:58:49 caleb Exp $
+
+  01 Jul 2005; Caleb Tennis <caleb@gentoo.org> qscintilla-1.4-r1.ebuild,
+  qscintilla-1.5-r1.ebuild, qscintilla-1.5.1.ebuild, qscintilla-1.54.ebuild,
+  qscintilla-1.60.ebuild, qscintilla-1.61.ebuild:
+  Fix qmake dir per bug #97535
 
   21 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
   qscintilla-1.61.ebuild:
diff --git a/dev-python/qscintilla/Manifest b/dev-python/qscintilla/Manifest
index 48b466e34c58..491149da59c2 100644
--- a/dev-python/qscintilla/Manifest
+++ b/dev-python/qscintilla/Manifest
@@ -1,19 +1,19 @@
-MD5 2bf5a82c276abb993cdbbb913f179941 qscintilla-1.54.ebuild 1046
+MD5 c195576fa1dee5f16f622b62ed56ee4c qscintilla-1.4-r1.ebuild 1895
+MD5 45aa666bef90a1c398be6dc5e513c1ee qscintilla-1.61.ebuild 1338
+MD5 4ecb5e2888be20bebc140033542fa98a qscintilla-1.5.1.ebuild 1899
+MD5 8fe0fa213f8b9d537810ff54acc4f400 qscintilla-1.54.ebuild 1059
+MD5 971da6e5909833327d3e56ac1f048685 qscintilla-1.60.ebuild 1255
+MD5 a363c9c2303df4fbe22470d88514232e ChangeLog 5285
 MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
-MD5 5f68bd1e64124d71df30abbbc3717374 ChangeLog 5054
-MD5 4294b60e1800b02f408bd5bb859bffd8 qscintilla-1.60.ebuild 1242
-MD5 47834e7142876d1098fac62864ebb734 qscintilla-1.5-r1.ebuild 1882
-MD5 55bc026bdd2a0eebf59ffb767e650102 qscintilla-1.5.1.ebuild 1886
-MD5 d7c6a16291462e797bb2d64a4ae6532d qscintilla-1.4-r1.ebuild 1882
-MD5 12fe690795ffc576562be6aa46034f4a qscintilla-1.61.ebuild 1315
-MD5 3e38fc9aaa4fc7b9ab49400211086e08 files/digest-qscintilla-1.61 75
-MD5 7421557a35d6c2f2d95d70e20358346b files/digest-qscintilla-1.5-r1 75
-MD5 367f1bef2c17aa8fbc890fa134776db0 files/digest-qscintilla-1.54 79
-MD5 a9d71d6103367fa01a62735815dbe6ca files/digest-qscintilla-1.60 75
-MD5 3e38fc9aaa4fc7b9ab49400211086e08 files/digest-qscintilla-1.4-r1 75
-MD5 f5f52f3b6f62b4b9c0ca4adb2af8d99a files/qscintilla-1.4-sandbox.patch 1041
-MD5 b3387e20eba70b27a4290523e89753e4 files/digest-qscintilla-1.5.1 77
-MD5 e2ef183d503f0d553f92c182d655be67 files/qscintilla-1.61-sandbox.patch 710
+MD5 7aae17abf7f4a4a802fe8337ac8920cc qscintilla-1.5-r1.ebuild 1895
 MD5 680820a26d1487ebc8330eaa923f3599 files/qscintilla-1.54-sandbox.patch 783
+MD5 f5f52f3b6f62b4b9c0ca4adb2af8d99a files/qscintilla-1.4-sandbox.patch 1041
 MD5 dc22cd37e5a193d127ad169db2cf6753 files/qscintilla-1.60-sandbox.patch 710
+MD5 367f1bef2c17aa8fbc890fa134776db0 files/digest-qscintilla-1.54 79
+MD5 a9d71d6103367fa01a62735815dbe6ca files/digest-qscintilla-1.60 75
+MD5 3e38fc9aaa4fc7b9ab49400211086e08 files/digest-qscintilla-1.61 75
 MD5 bacbcf22f2420b5d982a6d04f171b44a files/qscintilla-1.5-sandbox.patch 1041
+MD5 e2ef183d503f0d553f92c182d655be67 files/qscintilla-1.61-sandbox.patch 710
+MD5 b3387e20eba70b27a4290523e89753e4 files/digest-qscintilla-1.5.1 77
+MD5 3e38fc9aaa4fc7b9ab49400211086e08 files/digest-qscintilla-1.4-r1 75
+MD5 7421557a35d6c2f2d95d70e20358346b files/digest-qscintilla-1.5-r1 75
diff --git a/dev-python/qscintilla/qscintilla-1.4-r1.ebuild b/dev-python/qscintilla/qscintilla-1.4-r1.ebuild
index 536bb6d24bcc..3d0694bddf51 100644
--- a/dev-python/qscintilla/qscintilla-1.4-r1.ebuild
+++ b/dev-python/qscintilla/qscintilla-1.4-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/dev-python/qscintilla/qscintilla-1.4-r1.ebuild,v 1.1 2005/02/21 19:44:47 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.4-r1.ebuild,v 1.2 2005/07/01 14:58:49 caleb Exp $
 
 inherit eutils
 
@@ -32,7 +32,7 @@ src_unpack() {
 	sed -i -e "s:DESTDIR = \$(QTDIR)/lib:DESTDIR = \${destdir}:" qscintilla.pro
 	echo -e "\nQMAKE_CFLAGS_RELEASE=${CFLAGS} -w\nQMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w\nQMAKE_LFLAGS_RELEASE=${LDFLAGS}" >> qscintilla.pro
 
-	qmake -o Makefile qscintilla.pro
+	${QTDIR}/bin/qmake -o Makefile qscintilla.pro
 	epatch ${FILESDIR}/${P}-sandbox.patch
 }
 
diff --git a/dev-python/qscintilla/qscintilla-1.5-r1.ebuild b/dev-python/qscintilla/qscintilla-1.5-r1.ebuild
index 221c199364fd..12e6f607f671 100644
--- a/dev-python/qscintilla/qscintilla-1.5-r1.ebuild
+++ b/dev-python/qscintilla/qscintilla-1.5-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/dev-python/qscintilla/qscintilla-1.5-r1.ebuild,v 1.1 2005/02/21 19:44:47 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.5-r1.ebuild,v 1.2 2005/07/01 14:58:49 caleb Exp $
 
 inherit eutils
 
@@ -32,7 +32,7 @@ src_unpack() {
 	sed -i -e "s:DESTDIR = \$(QTDIR)/lib:DESTDIR = \${destdir}:" qscintilla.pro
 	echo -e "\nQMAKE_CFLAGS_RELEASE=${CFLAGS} -w\nQMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w\nQMAKE_LFLAGS_RELEASE=${LDFLAGS}" >> qscintilla.pro
 
-	qmake -o Makefile qscintilla.pro
+	${QTDIR}/bin/qmake -o Makefile qscintilla.pro
 	epatch ${FILESDIR}/${P}-sandbox.patch
 }
 
diff --git a/dev-python/qscintilla/qscintilla-1.5.1.ebuild b/dev-python/qscintilla/qscintilla-1.5.1.ebuild
index 691f9daaeab7..ba1852e72cf4 100644
--- a/dev-python/qscintilla/qscintilla-1.5.1.ebuild
+++ b/dev-python/qscintilla/qscintilla-1.5.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/dev-python/qscintilla/qscintilla-1.5.1.ebuild,v 1.1 2005/03/06 23:21:49 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.5.1.ebuild,v 1.2 2005/07/01 14:58:49 caleb Exp $
 
 inherit eutils
 
@@ -32,7 +32,7 @@ src_unpack() {
 	sed -i -e "s:DESTDIR = \$(QTDIR)/lib:DESTDIR = \${destdir}:" qscintilla.pro
 	echo -e "\nQMAKE_CFLAGS_RELEASE=${CFLAGS} -w\nQMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w\nQMAKE_LFLAGS_RELEASE=${LDFLAGS}" >> qscintilla.pro
 
-	qmake -o Makefile qscintilla.pro
+	${QTDIR}/bin/qmake -o Makefile qscintilla.pro
 	epatch ${FILESDIR}/${PN}-1.5-sandbox.patch
 }
 
diff --git a/dev-python/qscintilla/qscintilla-1.54.ebuild b/dev-python/qscintilla/qscintilla-1.54.ebuild
index c0a05e81f650..83ec3861b674 100644
--- a/dev-python/qscintilla/qscintilla-1.54.ebuild
+++ b/dev-python/qscintilla/qscintilla-1.54.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/dev-python/qscintilla/qscintilla-1.54.ebuild,v 1.11 2005/02/20 15:58:42 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.54.ebuild,v 1.12 2005/07/01 14:58:49 caleb Exp $
 
 
 inherit eutils
@@ -20,7 +20,7 @@ src_unpack() {
 
 	unpack ${P}-x11-gpl-1.2.tar.gz
 	cd ${S}/qt
-	qmake -o Makefile qscintilla.pro
+	${QTDIR}/bin/qmake -o Makefile qscintilla.pro
 	epatch ${FILESDIR}/${P}-sandbox.patch
 	mkdir -p ${D}/${QTDIR}/lib
 
diff --git a/dev-python/qscintilla/qscintilla-1.60.ebuild b/dev-python/qscintilla/qscintilla-1.60.ebuild
index 0de31d2b8e4f..334fea8ef1fb 100644
--- a/dev-python/qscintilla/qscintilla-1.60.ebuild
+++ b/dev-python/qscintilla/qscintilla-1.60.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/dev-python/qscintilla/qscintilla-1.60.ebuild,v 1.10 2005/02/20 15:58:42 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.60.ebuild,v 1.11 2005/07/01 14:58:49 caleb Exp $
 
 inherit eutils
 
@@ -21,7 +21,7 @@ DEPEND="virtual/libc
 
 src_compile() {
 	cd ${S}/qt
-	qmake -o Makefile qscintilla.pro
+	${QTDIR}/bin/qmake -o Makefile qscintilla.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
 	epatch ${FILESDIR}/${P}-sandbox.patch
diff --git a/dev-python/qscintilla/qscintilla-1.61.ebuild b/dev-python/qscintilla/qscintilla-1.61.ebuild
index daf8435d994a..2375272c1927 100644
--- a/dev-python/qscintilla/qscintilla-1.61.ebuild
+++ b/dev-python/qscintilla/qscintilla-1.61.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.61.ebuild,v 1.10 2005/04/21 19:01:59 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.61.ebuild,v 1.11 2005/07/01 14:58:49 caleb Exp $
 
-inherit eutils
+inherit eutils qt
 
 MY_P=${P}-gpl-1.4
 S=${WORKDIR}/${MY_P}
@@ -18,12 +18,12 @@ IUSE="doc"
 
 DEPEND="virtual/libc
 	sys-apps/sed
-	x11-libs/qt"
+	$(qt_min_version 3)"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}/qt
-	qmake -o Makefile qscintilla.pro
+	${QTDIR}/bin/qmake -o Makefile qscintilla.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
 	epatch ${FILESDIR}/${P}-sandbox.patch