commit: b50cd8e2f5c04e20f0bb070bc2b072e8e375d3f6 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Oct 12 15:21:19 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Oct 12 16:15:20 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b50cd8e2
app-text/cb2bib: Drop useless REQUIRED_USE, drop IUSE="webengine" - Non-deprecated QtWebEngine is default now - IUSE=webkit alone checks preference Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-text/cb2bib/cb2bib-2.0.0.ebuild | 16 +++++++++------- app-text/cb2bib/metadata.xml | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app-text/cb2bib/cb2bib-2.0.0.ebuild b/app-text/cb2bib/cb2bib-2.0.0.ebuild index 3eb3286f590..da1a1c1f278 100644 --- a/app-text/cb2bib/cb2bib-2.0.0.ebuild +++ b/app-text/cb2bib/cb2bib-2.0.0.ebuild @@ -12,9 +12,7 @@ SRC_URI="https://www.molspaces.com/dl/progs/${P}.tar.gz"; LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86" -IUSE="+lzo webengine +webkit" - -REQUIRED_USE="?? ( webkit webengine )" +IUSE="+lzo webkit" DEPEND=" dev-qt/qtcore:5 @@ -22,7 +20,7 @@ DEPEND=" dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 lzo? ( dev-libs/lzo:2 ) - webengine? ( dev-qt/qtwebengine:5[widgets] ) + !webkit? ( dev-qt/qtwebengine:5[widgets] ) webkit? ( dev-qt/qtwebkit:5 ) " RDEPEND="${DEPEND}" @@ -32,10 +30,14 @@ DOCS=( AUTHORS CHANGELOG COPYRIGHT ) src_prepare() { default - sed -i -e "s|../AUTHORS ../COPYRIGHT ../LICENSE ../CHANGELOG||" src/src.pro || die + sed -e "s|../AUTHORS ../COPYRIGHT ../LICENSE ../CHANGELOG||" \ + -i src/src.pro || die - use webengine || sed -i -e "s/qtHaveModule(webenginewidgets)/false/g" src/src.pro || die - use webkit || sed -i -e "s/qtHaveModule(webkitwidgets)/false/g" src/src.pro || die + if use webkit; then + sed -i -e "s/qtHaveModule(webenginewidgets)/false/g" src/src.pro || die + else + sed -i -e "s/qtHaveModule(webkitwidgets)/false/g" src/src.pro || die + fi } src_configure() { diff --git a/app-text/cb2bib/metadata.xml b/app-text/cb2bib/metadata.xml index dca6445c892..bb01d3fe4e6 100644 --- a/app-text/cb2bib/metadata.xml +++ b/app-text/cb2bib/metadata.xml @@ -6,7 +6,7 @@ <name>Gentoo Qt Project</name> </maintainer> <use> - <flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> instead of <pkg>dev-qt/qtwebkit</pkg></flag> + <flag name="webkit">Use <pkg>dev-qt/qtwebkit</pkg> instead of <pkg>dev-qt/qtwebengine</pkg></flag> </use> <upstream> <bugs-to>mailto:[email protected]</bugs-to>
