Fix qmake dir per bug #97535

Package-Manager: portage-2.0.51.22-r1

6 files changed, 22 insertions, 28 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index 4ca09f63e376..ab72126eb69e 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/psi
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.70 2005/06/28 20:34:23 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.71 2005/07/01 15:10:13 caleb Exp $
+
+  01 Jul 2005; Caleb Tennis <caleb@gentoo.org> psi-0.9.3-r1.ebuild,
+  psi-0.9.3-r2.ebuild, psi-0.9.3-r3.ebuild, psi-0.9.3-r4.ebuild:
+  Fix qmake dir per bug #97535
 
   28 Jun 2005; Gustavo Felisberto <humpback@gentoo.org>;
   +files/psi-status_indicator++_add-on_roster-nr.patch,
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 3455197766e3..afbdfe7527ab 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,28 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e60fd2cfd833b274656f57813677d7d9 ChangeLog 9054
+MD5 9a1bd73f597b384ff20940d9c4e9e3ea psi-0.9.3-r2.ebuild 9415
+MD5 7e06059293e0f5c3d26a71702c0d39a6 psi-0.9.3-r4.ebuild 9020
+MD5 9475e3b3d2cdf69a3ddab52f7384e16c psi-0.9.3-r1.ebuild 8128
+MD5 1103a5bafea110e85e710773f588b792 psi-0.9.3-r3.ebuild 9814
+MD5 565cc579996af0d2d8dcf9f47449e17a ChangeLog 9216
 MD5 9b91ead14acbf0da98d3b33e75c67e79 metadata.xml 306
-MD5 e6f5de8ed652b522a8dbc50a42bb0015 psi-0.9.3-r1.ebuild 8118
-MD5 849d8f11e7e35325f45a2e79278f6a4d psi-0.9.3-r2.ebuild 9405
-MD5 4df38ef8d0270123661efa4f2a4850da psi-0.9.3-r3.ebuild 9804
-MD5 33ce30c8534698ff96f1a685fb2691b9 psi-0.9.3-r4.ebuild 9010
 MD5 fc8fae7a49b592b4f2c2914c21494c11 files/digest-psi-0.9.3-r1 1924
 MD5 db2a4c5b68dbb0147392a4657f2dbc92 files/digest-psi-0.9.3-r2 2132
 MD5 839e6fa5502e1f03a660918bc30e48b5 files/digest-psi-0.9.3-r3 2211
 MD5 55307aeb75ba675468f91832d951eff7 files/digest-psi-0.9.3-r4 1975
-MD5 1c741813b6d820d43475058dbfab3100 files/psi-desktop.patch 492
+MD5 0d5cafd17325fc912c4855252d73378f files/psi-indicator.png 300
+MD5 0250867fe42d1dc91e798336869a09d6 files/vcard-photo-interface.patch 32494
 MD5 4195bf9d000383fae25545249a3f8709 files/psi-desktop_file_and_icons_directories.patch 1454
+MD5 18253b59a4622a06bc3a17a4eef93d22 files/psi-status_indicator++_add-on_roster-nr.patch 9821
 MD5 5fa629c5177a7b1c5090428e22b7ec30 files/psi-emergency.png 295
-MD5 0d5cafd17325fc912c4855252d73378f files/psi-indicator.png 300
 MD5 76f5cc28b75698adddaa068e5f4593f5 files/psi-pathfix.patch 462
 MD5 893421922de588e6a40fbe8357976279 files/psi-reverse_trayicon.patch 937
-MD5 18253b59a4622a06bc3a17a4eef93d22 files/psi-status_indicator++_add-on_roster-nr.patch 9821
-MD5 0250867fe42d1dc91e798336869a09d6 files/vcard-photo-interface.patch 32494
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCwbMz8zY1VwezZiERAk9LAKCDb2D4h9+H8XEFShXQQJAuIbFq9wCeOBS7
-Aw6Iud8WJ5tVbnBGjJNSjpQ=
-=rkg7
------END PGP SIGNATURE-----
+MD5 1c741813b6d820d43475058dbfab3100 files/psi-desktop.patch 492
diff --git a/net-im/psi/psi-0.9.3-r1.ebuild b/net-im/psi/psi-0.9.3-r1.ebuild
index 5157d48c26ec..5b3c051d8f79 100644
--- a/net-im/psi/psi-0.9.3-r1.ebuild
+++ b/net-im/psi/psi-0.9.3-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/net-im/psi/psi-0.9.3-r1.ebuild,v 1.8 2005/06/27 18:30:44 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.9.3-r1.ebuild,v 1.9 2005/07/01 15:10:13 caleb Exp $
 
 inherit eutils
 
@@ -188,7 +188,7 @@ src_compile() {
 	use kde || myconf="${myconf} --disable-kde"
 	./configure --prefix=/usr $myconf || die "Configure failed"
 	# for CXXFLAGS from make.conf
-	qmake psi.pro \
+	${QTDIR}/bin/qmake psi.pro \
 		QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
 		QMAKE_RPATH= \
 		|| die "Qmake failed"
diff --git a/net-im/psi/psi-0.9.3-r2.ebuild b/net-im/psi/psi-0.9.3-r2.ebuild
index b47d10556dfd..f4614a53ae04 100644
--- a/net-im/psi/psi-0.9.3-r2.ebuild
+++ b/net-im/psi/psi-0.9.3-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/net-im/psi/psi-0.9.3-r2.ebuild,v 1.7 2005/06/27 18:30:44 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.9.3-r2.ebuild,v 1.8 2005/07/01 15:10:13 caleb Exp $
 
 inherit eutils
 
@@ -216,7 +216,7 @@ src_compile() {
 	use kde || myconf="${myconf} --disable-kde"
 	./configure --prefix=/usr $myconf || die "Configure failed"
 	# for CXXFLAGS from make.conf
-	qmake psi.pro \
+	${QTDIR}/bin/qmake psi.pro \
 		QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
 		QMAKE_RPATH= \
 		|| die "Qmake failed"
diff --git a/net-im/psi/psi-0.9.3-r3.ebuild b/net-im/psi/psi-0.9.3-r3.ebuild
index 274403784fb6..0227c87d3371 100644
--- a/net-im/psi/psi-0.9.3-r3.ebuild
+++ b/net-im/psi/psi-0.9.3-r3.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-im/psi/psi-0.9.3-r3.ebuild,v 1.4 2005/06/27 18:30:44 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.9.3-r3.ebuild,v 1.5 2005/07/01 15:10:13 caleb Exp $
 
 inherit eutils
 
@@ -224,7 +224,7 @@ src_compile() {
 	use kde || myconf="${myconf} --disable-kde"
 	./configure --prefix=/usr $myconf || die "Configure failed"
 	# for CXXFLAGS from make.conf
-	qmake psi.pro \
+	${QTDIR}/bin/qmake psi.pro \
 		QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
 		QMAKE_RPATH= \
 		|| die "Qmake failed"
diff --git a/net-im/psi/psi-0.9.3-r4.ebuild b/net-im/psi/psi-0.9.3-r4.ebuild
index 24c97409d3c3..d14e9c325f3a 100644
--- a/net-im/psi/psi-0.9.3-r4.ebuild
+++ b/net-im/psi/psi-0.9.3-r4.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-im/psi/psi-0.9.3-r4.ebuild,v 1.4 2005/06/28 20:34:23 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.9.3-r4.ebuild,v 1.5 2005/07/01 15:10:13 caleb Exp $
 
 inherit eutils
 
@@ -207,7 +207,7 @@ src_compile() {
 	use kde || myconf="${myconf} --disable-kde"
 	./configure --prefix=/usr $myconf || die "Configure failed"
 	# for CXXFLAGS from make.conf
-	qmake psi.pro \
+	${QTDIR}/bin/qmake psi.pro \
 		QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
 		QMAKE_RPATH= \
 		|| die "Qmake failed"