Fix qmake path error from bug #103589

Package-Manager: portage-2.1_pre3-r1

7 files changed, 23 insertions, 13 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/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"