diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2013-02-15 20:50:33 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2013-02-15 20:50:33 +0000 |
| commit | 1c4d0c2fbcd49499bb58cf598ea22143f6f1b2fe (patch) | |
| tree | a5dad0a9198fb9ed5f57708434f141d5501f5d4a /app-misc | |
| parent | Don't show elog messages always (#457596) (diff) | |
| download | gentoo-2-1c4d0c2fbcd49499bb58cf598ea22143f6f1b2fe.tar.gz gentoo-2-1c4d0c2fbcd49499bb58cf598ea22143f6f1b2fe.tar.bz2 gentoo-2-1c4d0c2fbcd49499bb58cf598ea22143f6f1b2fe.zip | |
Add missing webkit useflags. Don't run eqmake4 when qt4 is disabled. Bug #457744
(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key B4AFF2C2)
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/recoll/ChangeLog | 6 | ||||
| -rw-r--r-- | app-misc/recoll/recoll-1.18.1.ebuild | 18 |
2 files changed, 15 insertions, 9 deletions
diff --git a/app-misc/recoll/ChangeLog b/app-misc/recoll/ChangeLog index 6358a181be9c..e4d039e64e23 100644 --- a/app-misc/recoll/ChangeLog +++ b/app-misc/recoll/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/recoll # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/ChangeLog,v 1.14 2013/01/30 19:20:11 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/ChangeLog,v 1.15 2013/02/15 20:50:33 hwoarang Exp $ + + 15 Feb 2013; Markos Chandras <hwoarang@gentoo.org> recoll-1.18.1.ebuild: + Add missing webkit useflags. Don't run eqmake4 when qt4 is disabled. Bug + #457744 *recoll-1.18.1 (30 Jan 2013) diff --git a/app-misc/recoll/recoll-1.18.1.ebuild b/app-misc/recoll/recoll-1.18.1.ebuild index 1521b8660dce..7c38b141f79c 100644 --- a/app-misc/recoll/recoll-1.18.1.ebuild +++ b/app-misc/recoll/recoll-1.18.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/recoll-1.18.1.ebuild,v 1.1 2013/01/30 19:20:11 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/recoll-1.18.1.ebuild,v 1.2 2013/02/15 20:50:33 hwoarang Exp $ EAPI="4" @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" INDEX_HELPERS="audio chm djvu dvi exif postscript ics info lyx msdoc msppt msxls pdf rtf tex wordperfect xml" -IUSE="+spell inotify +qt4 +session camelcase xattr fam ${INDEX_HELPERS}" +IUSE="+spell inotify +qt4 +session camelcase xattr webkit fam ${INDEX_HELPERS}" DEPEND=" virtual/libiconv @@ -23,10 +23,8 @@ DEPEND=" sys-libs/zlib spell? ( app-text/aspell ) !inotify? ( fam? ( virtual/fam ) ) - qt4? ( - x11-libs/qt-core:4[qt3support] - x11-libs/qt-webkit:4 - ) + qt4? ( x11-libs/qt-core:4[qt3support] ) + webkit? ( x11-libs/qt-webkit:4 ) session? ( inotify? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) !inotify? ( fam? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) ) @@ -103,7 +101,9 @@ src_prepare() { src_configure() { local qtconf - use qt4 && qtconf="QMAKEPATH=/usr/bin/qmake" + if use qt4 || use webkit; then + qtconf="QMAKEPATH=/usr/bin/qmake" + fi econf \ $(use_with spell aspell) \ @@ -115,7 +115,9 @@ src_configure() { $(use_with inotify) \ $(use_enable session x11mon) \ ${qtconf} - cd qtgui && eqmake4 ${PN}.pro && cd .. + if use qt4; then + cd qtgui && eqmake4 ${PN}.pro && cd .. + fi } src_compile() { |