summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Kursawe <phosphan@gentoo.org>2005-07-25 16:33:10 +0000
committerPatrick Kursawe <phosphan@gentoo.org>2005-07-25 16:33:10 +0000
commit75601d8853d1af5b94a92decbc582893a4de997b (patch)
tree585c00684e1b15a54f8bf6d4a77b400bacffaa79 /sci-misc/qcad
parentAdded an upstream patch. Thanks to Hans Lub <hlub@knoware.nl> (bug #100230) f... (diff)
downloadhistorical-75601d8853d1af5b94a92decbc582893a4de997b.tar.gz
historical-75601d8853d1af5b94a92decbc582893a4de997b.tar.bz2
historical-75601d8853d1af5b94a92decbc582893a4de997b.zip
fixing #99808
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'sci-misc/qcad')
-rw-r--r--sci-misc/qcad/ChangeLog5
-rw-r--r--sci-misc/qcad/Manifest4
-rw-r--r--sci-misc/qcad/qcad-2.0.4.0-r1.ebuild9
3 files changed, 12 insertions, 6 deletions
diff --git a/sci-misc/qcad/ChangeLog b/sci-misc/qcad/ChangeLog
index fcbcbd309831..653404f8d284 100644
--- a/sci-misc/qcad/ChangeLog
+++ b/sci-misc/qcad/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-misc/qcad
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/ChangeLog,v 1.7 2005/07/21 15:55:20 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/ChangeLog,v 1.8 2005/07/25 16:33:10 phosphan Exp $
+
+ 25 Jul 2005; Patrick Kursawe <phosphan@gentoo.org> qcad-2.0.4.0-r1.ebuild:
+ Patching Makefiles and scripts to contain full path to qmake (bug #99808)
21 Jul 2005; Caleb Tennis <caleb@gentoo.org> qcad-2.0.4.0-r1.ebuild:
Put a blocker on Qt4 until the Makefiles are patched
diff --git a/sci-misc/qcad/Manifest b/sci-misc/qcad/Manifest
index 42d6a03bc7b2..2c7e34e59a29 100644
--- a/sci-misc/qcad/Manifest
+++ b/sci-misc/qcad/Manifest
@@ -1,5 +1,5 @@
-MD5 52a13e7deeb1f31de9d7f2c45bf7a023 qcad-2.0.4.0-r1.ebuild 2519
-MD5 2707f43368e0a45f6cc5c41c94983625 ChangeLog 5584
+MD5 d71e676517179228956f94648d7ba0ee qcad-2.0.4.0-r1.ebuild 2664
+MD5 ff028998f5f701d561740d5cebc25117 ChangeLog 5741
MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
MD5 c79cda60b6383bbd7cd5c59e5975444e files/manual.patch-r1 841
MD5 03a389a58ed129eda4567585a4094a33 files/qcad-2.0.4.0-1.src-gentoo.patch 2177
diff --git a/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild b/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild
index cce3dd3aefe7..66043fc040ac 100644
--- a/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild
+++ b/sci-misc/qcad/qcad-2.0.4.0-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/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild,v 1.5 2005/07/21 15:55:20 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild,v 1.6 2005/07/25 16:33:10 phosphan Exp $
inherit kde-functions eutils
@@ -21,8 +21,7 @@ KEYWORDS="x86 ppc amd64"
need-qt 3.3
DEPEND="${DEPEND}
- >=sys-apps/sed-4
- !=x11-libs/qt-4*"
+ >=sys-apps/sed-4"
src_unpack() {
unpack ${A}
@@ -32,6 +31,10 @@ src_unpack() {
echo >> defs.pro "CONFIG += thread release"
echo >> defs.pro "QMAKE_CFLAGS_RELEASE += ${CFLAGS}"
echo >> defs.pro "QMAKE_CXXFLAGS_RELEASE += ${CXXFLAGS}"
+ for file in */Makefile scripts/build_qcad.sh; do
+ sed -i -e 's~qmake~${QTDIR}/bin/qmake~g' $file || \
+ die "unable to correct path to qmake in $file"
+ done
epatch ${FILESDIR}/${MY_P}-gentoo.patch
epatch ${FILESDIR}/manual.patch-r1
cd ${S}/scripts