summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/qwt/ChangeLog8
-rw-r--r--x11-libs/qwt/Manifest16
-rw-r--r--x11-libs/qwt/qwt-4.2.0-r1.ebuild8
-rw-r--r--x11-libs/qwt/qwt-4.2.0.ebuild8
4 files changed, 17 insertions, 23 deletions
diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog
index 0db568aa7d5f..4bfab3c00f4f 100644
--- a/x11-libs/qwt/ChangeLog
+++ b/x11-libs/qwt/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/qwt
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.25 2005/10/14 01:42:30 cryos Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.26 2006/01/03 12:23:27 caleb Exp $
+
+ 03 Jan 2006; Caleb Tennis <caleb@gentoo.org> qwt-4.2.0.ebuild,
+ qwt-4.2.0-r1.ebuild:
+ Fix qt3/qt4 qmake issue
*qwt-4.2.0-r1 (14 Oct 2005)
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 241af32b281a..8aff950f4d78 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 137b20a841965f09bab79e09c7ad759b ChangeLog 3984
+MD5 ac07d631a3673642cbcf5cf2b056ccd4 ChangeLog 4099
MD5 73ff067302f4cd37fba77ed8baeda94b files/digest-qwt-4.2.0 62
MD5 73ff067302f4cd37fba77ed8baeda94b files/digest-qwt-4.2.0-r1 62
MD5 c000c0728c9136f1b54cbc3a5fc07644 metadata.xml 220
-MD5 8db867be6245f92c1eee15090ac5bb88 qwt-4.2.0-r1.ebuild 1526
-MD5 d3c608370a711cda1c08bce558c47ee6 qwt-4.2.0.ebuild 1486
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDTw0VntT9W3vfTuoRAuNdAJ9WNh124C05i1MUzj6/KPKvFViLVgCgl699
-D4SVhXCqrT3YEMJ4VSWZ36Y=
-=xOvZ
------END PGP SIGNATURE-----
+MD5 27b6d2315f5aef387e9937bd81b3b853 qwt-4.2.0-r1.ebuild 1576
+MD5 1b5d784db584bc91665649bd2943f8ee qwt-4.2.0.ebuild 1533
diff --git a/x11-libs/qwt/qwt-4.2.0-r1.ebuild b/x11-libs/qwt/qwt-4.2.0-r1.ebuild
index 9a860350f668..d650dc9c453f 100644
--- a/x11-libs/qwt/qwt-4.2.0-r1.ebuild
+++ b/x11-libs/qwt/qwt-4.2.0-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/x11-libs/qwt/qwt-4.2.0-r1.ebuild,v 1.1 2005/10/14 01:42:30 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-4.2.0-r1.ebuild,v 1.2 2006/01/03 12:23:27 caleb Exp $
inherit multilib
@@ -36,10 +36,10 @@ src_unpack () {
src_compile () {
addwrite ${QTDIR}/etc/settings
- ${QTDIR}/bin/qmake qwt.pro
+ ${QTDIR}/bin/qmake QMAKE=${QTDIR}/bin/qmake qwt.pro
emake || die
cd designer
- ${QTDIR}/bin/qmake qwtplugin.pro
+ ${QTDIR}/bin/qmake QMAKE=${QTDIR}/bin/qmake qwtplugin.pro
emake || die
}
diff --git a/x11-libs/qwt/qwt-4.2.0.ebuild b/x11-libs/qwt/qwt-4.2.0.ebuild
index 8dc0c6c60450..94c911bc6f6b 100644
--- a/x11-libs/qwt/qwt-4.2.0.ebuild
+++ b/x11-libs/qwt/qwt-4.2.0.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/x11-libs/qwt/qwt-4.2.0.ebuild,v 1.6 2005/08/24 16:51:06 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-4.2.0.ebuild,v 1.7 2006/01/03 12:23:27 caleb Exp $
MY_PV="${PV/_r/r}"
@@ -34,10 +34,10 @@ src_unpack () {
src_compile () {
addwrite ${QTDIR}/etc/settings
- ${QTDIR}/bin/qmake qwt.pro
+ ${QTDIR}/bin/qmake QMAKE=${QTDIR}/bin/qmake qwt.pro
emake || die
cd designer
- ${QTDIR}/bin/qmake qwtplugin.pro
+ ${QTDIR}/bin/qmake QMAKE=${QTDIR}/bin/qmake qwtplugin.pro
emake || die
}