diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2005-11-17 22:16:43 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2005-11-17 22:16:43 +0000 |
| commit | 5fb914826c93c6e92eefab134159fca2bb6caea6 (patch) | |
| tree | e2f184a0c31c66041605cd18adb0f034bbc6632a /dev-util | |
| parent | Bump to 1.05. (diff) | |
| download | gentoo-2-5fb914826c93c6e92eefab134159fca2bb6caea6.tar.gz gentoo-2-5fb914826c93c6e92eefab134159fca2bb6caea6.tar.bz2 gentoo-2-5fb914826c93c6e92eefab134159fca2bb6caea6.zip | |
replace qmake with ${QTDIR}/bin/qmake in Makefile - fixes broken compilation on hosts with QT4 installed (#112783)
(Portage version: 2.0.51.22-r3)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/esvn/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/esvn/Manifest | 12 | ||||
| -rw-r--r-- | dev-util/esvn/esvn-0.6.11.ebuild | 8 |
3 files changed, 10 insertions, 15 deletions
diff --git a/dev-util/esvn/ChangeLog b/dev-util/esvn/ChangeLog index b6580e849ba3..9f4dfc82c0e4 100644 --- a/dev-util/esvn/ChangeLog +++ b/dev-util/esvn/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/esvn # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/esvn/ChangeLog,v 1.9 2005/10/04 20:33:33 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/esvn/ChangeLog,v 1.10 2005/11/17 22:16:43 mrness Exp $ + + 17 Nov 2005; Alin Nastac <mrness@gentoo.org> esvn-0.6.11.ebuild: + Fix broken compilation on machines with QT4 installed (#112783). 04 Oct 2005; Alin Nastac <mrness@gentoo.org> -esvn-0.6.9.ebuild, esvn-0.6.11.ebuild: diff --git a/dev-util/esvn/Manifest b/dev-util/esvn/Manifest index aaf0e3e94336..bac0d5b531c0 100644 --- a/dev-util/esvn/Manifest +++ b/dev-util/esvn/Manifest @@ -1,14 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 31ee677d1b9f9e5e1517be57a5bf56e1 esvn-0.6.11.ebuild 929 +MD5 09431d75491e7335959aa473c156e921 esvn-0.6.11.ebuild 990 MD5 3c7daecc323b4948bbffc9b2e726e470 ChangeLog 1353 MD5 5082a7fd5f87d44ac35fc01a046116c0 metadata.xml 331 MD5 60ddcbe9222651f7b01134bb1d48cca7 files/digest-esvn-0.6.11 66 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFDQuc5NSP4Vda7IdsRAnqlAJ48NIPOIYsgc2dLS2Kkh0srXMxp0gCffKdH -XMneUwN7dKk5AgH3InbXrXc= -=oslH ------END PGP SIGNATURE----- diff --git a/dev-util/esvn/esvn-0.6.11.ebuild b/dev-util/esvn/esvn-0.6.11.ebuild index 0368b1c41b04..04b6c6746b32 100644 --- a/dev-util/esvn/esvn-0.6.11.ebuild +++ b/dev-util/esvn/esvn-0.6.11.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/dev-util/esvn/esvn-0.6.11.ebuild,v 1.2 2005/10/04 20:33:33 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/esvn/esvn-0.6.11.ebuild,v 1.3 2005/11/17 22:16:43 mrness Exp $ inherit kde-functions @@ -13,6 +13,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="" + RDEPEND=" dev-util/subversion" @@ -22,8 +23,9 @@ S="${WORKDIR}/${PN}" src_unpack() { unpack ${A} || die "failed to unpack sources" - sed -i "s:/usr/share/doc/esvn/html-docs:/usr/share/doc/${PF}/html:" "${S}/src/mainwindow.cpp" || \ - die "failed to replace doc path" + sed -i "s:qmake:${QTDIR}/bin/qmake:" ${S}/Makefile && \ + sed -i "s:/usr/share/doc/esvn/html-docs:/usr/share/doc/${PF}/html:" "${S}/src/mainwindow.cpp" || \ + die "at least one sed has failed" } src_compile() { |