diff options
| author |   Patrick Kursawe <phosphan@gentoo.org> | 2005-07-25 16:33:10 +0000 |
|---|---|---|
| committer | Patrick Kursawe <phosphan@gentoo.org> | 2005-07-25 16:33:10 +0000 |
| commit | 2f0efe1167b5f08a495ebdbb4cc55322b74ed9dd (patch) | |
| tree | 79efbb5f72f28540466bce6a1c7b0694a4e4da4b /sci-misc | |
| parent | Added an upstream patch. Thanks to Hans Lub <hlub@knoware.nl> (bug #100230) f... (diff) | |
| download | gentoo-2-2f0efe1167b5f08a495ebdbb4cc55322b74ed9dd.tar.gz gentoo-2-2f0efe1167b5f08a495ebdbb4cc55322b74ed9dd.tar.bz2 gentoo-2-2f0efe1167b5f08a495ebdbb4cc55322b74ed9dd.zip | |
fixing #99808
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'sci-misc')
| -rw-r--r-- | sci-misc/qcad/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-misc/qcad/Manifest | 4 | ||||
| -rw-r--r-- | sci-misc/qcad/qcad-2.0.4.0-r1.ebuild | 9 |
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..b8dfd978c963 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 c2d02ee8c144f538cf46c209a0e4a403 qcad-2.0.4.0-r1.ebuild 2661 +MD5 ac2cc247241a898a62bc9c217729dff9 ChangeLog 5738 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 |