Fix qmake path error from bug #103589

(Portage version: 2.1_pre3-r1)

8 files changed, 37 insertions, 37 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index 9fa0fe2198c4..a0e40bea8d88 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,11 @@
 # 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.81 2005/11/11 13:54:57 ferdy Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.82 2006/01/03 02:16:08 caleb Exp $
+
+  03 Jan 2006; 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,
+  psi-0.10_rc2.ebuild:
+  Fix qmake path error from bug #103589
 
   11 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org> psi-0.9.3-r4.ebuild:
   marked ~alpha wrt bug #108985
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 2ce574ab9c5d..29af62f41951 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,33 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f67fb9545a019937912440c7fcebf9b2 psi-0.9.3-r2.ebuild 9438
-MD5 c6a5a7a51b5f9288f1363128d48edec1 psi-0.9.3-r4.ebuild 9131
-MD5 0691899c53d869d2909e460646237a98 psi-0.9.3-r1.ebuild 8151
-MD5 605af285d446205b316ffa6dceca96a2 psi-0.9.3-r3.ebuild 9836
-MD5 bda0d669067cfd90503324e8b3345105 psi-0.10_rc2.ebuild 8815
 MD5 270aa4319e3570472605ddb627e45ea0 ChangeLog 9856
-MD5 9b91ead14acbf0da98d3b33e75c67e79 metadata.xml 306
-MD5 b35105d488f11cae19484290159023b1 files/psi-add-status-history.patch 13703
+MD5 c1ccb520f5b861da2a97cf5a4c17cc20 files/digest-psi-0.10_rc2 1984
 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 0d5cafd17325fc912c4855252d73378f files/psi-indicator.png 300
-MD5 0250867fe42d1dc91e798336869a09d6 files/vcard-photo-interface.patch 32494
-MD5 0dacabdec9ce29cc56faadeeff01ec3b files/psi-pathfix2.patch 364
+MD5 beb3eefd03626a48e73775691c6c794b files/digest-psi-0.9.3-r4 1975
+MD5 b35105d488f11cae19484290159023b1 files/psi-add-status-history.patch 13703
+MD5 1c741813b6d820d43475058dbfab3100 files/psi-desktop.patch 492
 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 0dacabdec9ce29cc56faadeeff01ec3b files/psi-pathfix2.patch 364
 MD5 893421922de588e6a40fbe8357976279 files/psi-reverse_trayicon.patch 937
-MD5 c1ccb520f5b861da2a97cf5a4c17cc20 files/digest-psi-0.10_rc2 1984
-MD5 1c741813b6d820d43475058dbfab3100 files/psi-desktop.patch 492
 MD5 c2528c15be8277434647506d791663d8 files/psi-reverse_trayicon2.patch 937
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDdKLsViELBEf1JB0RAoX+AJ9q6d7ONg9R5dnRqwkIfOmhMeFJywCeN7Ga
-rIf3jPOzMjGBM6qTa/ZiMvg=
-=/+o6
------END PGP SIGNATURE-----
+MD5 18253b59a4622a06bc3a17a4eef93d22 files/psi-status_indicator++_add-on_roster-nr.patch 9821
+MD5 0250867fe42d1dc91e798336869a09d6 files/vcard-photo-interface.patch 32494
+MD5 9b91ead14acbf0da98d3b33e75c67e79 metadata.xml 306
+MD5 bda0d669067cfd90503324e8b3345105 psi-0.10_rc2.ebuild 8815
+MD5 0691899c53d869d2909e460646237a98 psi-0.9.3-r1.ebuild 8151
+MD5 f67fb9545a019937912440c7fcebf9b2 psi-0.9.3-r2.ebuild 9438
+MD5 605af285d446205b316ffa6dceca96a2 psi-0.9.3-r3.ebuild 9836
+MD5 f9f2ccc0e91f674bac1bf9637a355ada psi-0.9.3-r4.ebuild 9160
diff --git a/net-im/psi/files/digest-psi-0.9.3-r4 b/net-im/psi/files/digest-psi-0.9.3-r4
index f89263f8d622..b16d8313fa6e 100644
--- a/net-im/psi/files/digest-psi-0.9.3-r4
+++ b/net-im/psi/files/digest-psi-0.9.3-r4
@@ -1,5 +1,5 @@
-MD5 d20f3bb530235a246bc2d92308089744 psi-0.9.3.tar.bz2 1423322
 MD5 b148793cf8f1f6d93df089263b0b8ccf psi-0.9.3-gentoo-extras-0.5.tar.bz2 105895
+MD5 d20f3bb530235a246bc2d92308089744 psi-0.9.3.tar.bz2 1423322
 MD5 2885ffd0943e95edc0b8521309b01d32 psi_ar-0.9.3.tar.bz2 31466
 MD5 874f8f0aebcdc1294748546a59ddaefb psi_ca-0.9.3.tar.bz2 15750
 MD5 990dea4e96f093d07c5d5523c9875c6a psi_cs-0.9.3-a.tar.bz2 35212
diff --git a/net-im/psi/psi-0.10_rc2.ebuild b/net-im/psi/psi-0.10_rc2.ebuild
index 058274d3284b..f9720ef98422 100644
--- a/net-im/psi/psi-0.10_rc2.ebuild
+++ b/net-im/psi/psi-0.10_rc2.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/net-im/psi/psi-0.10_rc2.ebuild,v 1.1 2005/09/03 23:06:09 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.10_rc2.ebuild,v 1.2 2006/01/03 02:16:08 caleb Exp $
 
 inherit eutils
 
@@ -202,6 +202,7 @@ src_compile() {
 	./configure --prefix=/usr $myconf || die "Configure failed"
 
 	${QTDIR}/bin/qmake psi.pro \
+			QMAKE=${QTDIR}/bin/qmake \
 			QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS} ${extras}" \
 			QMAKE_RPATH= \
 			|| die "Qmake failed"
diff --git a/net-im/psi/psi-0.9.3-r1.ebuild b/net-im/psi/psi-0.9.3-r1.ebuild
index 9764a46c73fc..50bbbeef723d 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
+# Copyright 1999-2006 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.12 2005/08/13 00:09:22 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.9.3-r1.ebuild,v 1.13 2006/01/03 02:16:08 caleb Exp $
 
 inherit eutils qt3
 
@@ -189,6 +189,7 @@ src_compile() {
 	./configure --prefix=/usr $myconf || die "Configure failed"
 	# for CXXFLAGS from make.conf
 	${QTDIR}/bin/qmake psi.pro \
+		QMAKE=${QTDIR}/bin/qmake \
 		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 a7f9108e9e1f..2d073104d5c4 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
+# Copyright 1999-2006 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.11 2005/08/13 00:09:22 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.9.3-r2.ebuild,v 1.12 2006/01/03 02:16:08 caleb Exp $
 
 inherit eutils qt3
 
@@ -217,6 +217,7 @@ src_compile() {
 	./configure --prefix=/usr $myconf || die "Configure failed"
 	# for CXXFLAGS from make.conf
 	${QTDIR}/bin/qmake psi.pro \
+		QMAKE=${QTDIR}/bin/qmake \
 		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 1cd49cdcacc2..1776667cfa8a 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
+# Copyright 1999-2006 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.8 2005/08/13 00:09:22 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.9.3-r3.ebuild,v 1.9 2006/01/03 02:16:08 caleb Exp $
 
 inherit eutils qt3
 
@@ -225,6 +225,7 @@ src_compile() {
 	./configure --prefix=/usr $myconf || die "Configure failed"
 	# for CXXFLAGS from make.conf
 	${QTDIR}/bin/qmake psi.pro \
+		QMAKE=${QTDIR}/bin/qmake \
 		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 84d791112eb0..8db9f3c6d525 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
+# Copyright 1999-2006 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.14 2005/11/11 13:54:57 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.9.3-r4.ebuild,v 1.15 2006/01/03 02:16:08 caleb Exp $
 
 inherit eutils qt3
 
@@ -210,6 +210,7 @@ src_compile() {
 	./configure --prefix=/usr $myconf || die "Configure failed"
 	# for CXXFLAGS from make.conf
 	${QTDIR}/bin/qmake psi.pro \
+		QMAKE=${QTDIR}/bin/qmake \
 		QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
 		QMAKE_RPATH= \
 		|| die "Qmake failed"