commit: a520a7ebaaf7d6cc515a47a9c910c673d6a3b5c6 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jun 20 11:52:27 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Jun 20 21:17:32 2019 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a520a7eb
app-text/goldendict: EAPI-7 bump (sync with Gentoo ebuild repo) Package-Manager: Portage-2.3.67, Repoman-2.3.15 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...ndict-1.5.0-qtsingleapplication-unbundle.patch} | 0 app-text/goldendict/goldendict-9999.ebuild | 32 +++++++++++----------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app-text/goldendict/files/goldendict-9999-qtsingleapplication-unbundle.patch b/app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch similarity index 100% rename from app-text/goldendict/files/goldendict-9999-qtsingleapplication-unbundle.patch rename to app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch diff --git a/app-text/goldendict/goldendict-9999.ebuild b/app-text/goldendict/goldendict-9999.ebuild index 74aae628..32672acb 100644 --- a/app-text/goldendict/goldendict-9999.ebuild +++ b/app-text/goldendict/goldendict-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils git-r3 qmake-utils +inherit desktop git-r3 qmake-utils DESCRIPTION="Feature-rich dictionary lookup program" HOMEPAGE="http://goldendict.org/"; @@ -14,7 +14,11 @@ SLOT="0" KEYWORDS="" IUSE="debug ffmpeg libav" -RDEPEND=" +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" +DEPEND=" app-arch/bzip2 >=app-text/hunspell-1.2:= dev-libs/eb @@ -24,7 +28,7 @@ RDEPEND=" dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 - dev-qt/qtsingleapplication[qt5(+)] + dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 @@ -41,19 +45,18 @@ RDEPEND=" !libav? ( media-video/ffmpeg:0= ) ) " -DEPEND="${RDEPEND} - virtual/pkgconfig -" +RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${P}-qtsingleapplication-unbundle.patch" ) +PATCHES=( "${FILESDIR}/${PN}-1.5.0-qtsingleapplication-unbundle.patch" ) src_prepare() { default + # disable git + sed -i -e '/git describe/s/^/#/' ${PN}.pro || die + # fix installation path - sed -i \ - -e '/PREFIX = /s:/usr/local:/usr:' \ - ${PN}.pro || die + sed -i -e '/PREFIX = /s:/usr/local:/usr:' ${PN}.pro || die # add trailing semicolon sed -i -e '/^Categories/s/$/;/' redist/${PN}.desktop || die @@ -61,10 +64,7 @@ src_prepare() { src_configure() { local myconf=() - - if ! use ffmpeg && ! use libav ; then - myconf+=( DISABLE_INTERNAL_PLAYER=1 ) - fi + use ffmpeg || myconf+=( DISABLE_INTERNAL_PLAYER=1 ) eqmake5 "${myconf[@]}" }
