diff options
| author |   Jonathan Callen <abcd@gentoo.org> | 2009-12-25 15:33:39 +0000 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2009-12-25 15:33:39 +0000 |
| commit | 9187c367566cb408cd908bf597964704faa9faa1 (patch) | |
| tree | 8168ab1c4295eec87abb2516de566b863be9acf3 /x11-libs/qt-assistant | |
| parent | Add prefix keywords (diff) | |
| download | gentoo-2-9187c367566cb408cd908bf597964704faa9faa1.tar.gz gentoo-2-9187c367566cb408cd908bf597964704faa9faa1.tar.bz2 gentoo-2-9187c367566cb408cd908bf597964704faa9faa1.zip | |
Add prefix support, revbump due to otherwise unresolvable USE deps
(Portage version: -svn/cvs/Linux i686)
Diffstat (limited to 'x11-libs/qt-assistant')
| -rw-r--r-- | x11-libs/qt-assistant/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-libs/qt-assistant/qt-assistant-4.6.0-r1.ebuild (renamed from x11-libs/qt-assistant/qt-assistant-4.6.0.ebuild) | 14 |
2 files changed, 14 insertions, 8 deletions
diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog index 56a0a496830c..9aaecaf7f9fb 100644 --- a/x11-libs/qt-assistant/ChangeLog +++ b/x11-libs/qt-assistant/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/qt-assistant # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.63 2009/12/01 18:06:05 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.64 2009/12/25 15:33:39 abcd Exp $ + +*qt-assistant-4.6.0-r1 (25 Dec 2009) + + 25 Dec 2009; Jonathan Callen <abcd@gentoo.org> -qt-assistant-4.6.0.ebuild, + +qt-assistant-4.6.0-r1.ebuild: + Add prefix support, revbump due to otherwise unresolvable USE deps 01 Dec 2009; Theo Chatzimichos <tampakrap@gentoo.org> -qt-assistant-4.6.0_rc1.ebuild: diff --git a/x11-libs/qt-assistant/qt-assistant-4.6.0.ebuild b/x11-libs/qt-assistant/qt-assistant-4.6.0-r1.ebuild index af08dd1fa044..f217fea3f4c9 100644 --- a/x11-libs/qt-assistant/qt-assistant-4.6.0.ebuild +++ b/x11-libs/qt-assistant/qt-assistant-4.6.0-r1.ebuild @@ -1,19 +1,19 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.0.ebuild,v 1.1 2009/12/01 14:48:01 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.0-r1.ebuild,v 1.1 2009/12/25 15:33:39 abcd Exp $ EAPI="2" inherit qt4-build DESCRIPTION="The assistant help module for the Qt toolkit." SLOT="4" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" IUSE="" DEPEND=" - ~x11-libs/qt-gui-${PV} - ~x11-libs/qt-sql-${PV}[sqlite] - ~x11-libs/qt-webkit-${PV} + ~x11-libs/qt-gui-${PV}[aqua=] + ~x11-libs/qt-sql-${PV}[aqua=,sqlite] + ~x11-libs/qt-webkit-${PV}[aqua=] " RDEPEND="${DEPEND}" @@ -46,7 +46,7 @@ src_configure() { src_compile() { # help libQtHelp find freshly built libQtCLucene (bug #289811) - export LD_LIBRARY_PATH="${S}/lib" + export LD_LIBRARY_PATH="${S}/lib" DYLD_LIBRARY_PATH="${S}/lib" qt4-build_src_compile # ugly hack to build docs cd "${S}" @@ -60,7 +60,7 @@ src_install() { # note that emake install_qchdocs fails for undefined reason so we use a # workaround cd "${S}" - insinto "${QTDOCDIR}" + insinto ${QTDOCDIR#${EPREFIX}} doins -r "${S}"/doc/qch || die "doins qch documentation failed" dobin "${S}"/bin/qdoc3 || die "Installing qdoc3 failed" #emake INSTALL_ROOT="${D}" install_qchdocs || die "emake install_qchdocs failed" |