gentoo resync : 15.01.2020

3 files changed, 4 insertions, 85 deletions

diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index 7c43cdd6be36..cd40fabe1405 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,5 +1,3 @@
 DIST kbibtex-0.9.1.tar.xz 4185284 BLAKE2B 437fb2473095e89bc26446bf4dfcdd56ff0b402e604fe67f2f76073628e8e7f3fc8982c56aa24174303dde101c42d19abfac2b3c1e371bf930ff6bdb4307b7c0 SHA512 710ef3f0ddfe4869f079068723a2056866be9aab5907ea7eb00efb4b597270e4c1ec9464d6a15509e2a62749393d27bf0798022367536d3c879a0cbd10dc3129
-DIST kbibtex-0.9.tar.xz 4184288 BLAKE2B 90baf7c4960540566c59b198de307703d0f34ff6f4284933c187625b2e4065739fb16b004408fec5929d4923e7f651091915841c94ef09797419daa737ae39eb SHA512 bdd849094f66feb1bd6d02131580cb5d2e1f8d172a4e36141a48d3fc38375b5f4512078d13d6310f326b5cb7b15364616308eaac6c2c10ef897f8f752e1f6682
-EBUILD kbibtex-0.9.1.ebuild 2068 BLAKE2B 66ccdcb837c30348cb54d42574383d187bd6a9227b982a76c40215079de91401bcba3d6d6fd30b1d426af914e2c6bccf2954acf772177dc0e03929b4a276f923 SHA512 ef2df625328319313afdd32997e357d9a4db46b59b06ff060868cbc46b4abdf959eba6fcc7550c85b6f0d07f12832f1250e6e310ca05c8c47a591039779b65e0
-EBUILD kbibtex-0.9.ebuild 1882 BLAKE2B 90b416cddbbc4652a3b0cf29bb11960e800be20b7fd9519e566f26845bfbb5dea2680530d392bfc87a050f16686a39e0d1ce4e4d317b322d2f0693870c4aae3c SHA512 89998954808ef13654240a26b18a8ada4e3bffd20c7ef8b6b4839f3d867d4ab21852ce74118cb0755e689c55b03da5bc44282ccefe1415a28f5cb7d4dfcf89b7
+EBUILD kbibtex-0.9.1.ebuild 2060 BLAKE2B f880aa792f236a7525c42b7dcee2caebe5770b9893c47be6f4fdebe6c77b99d37fa94a5bfdd4acb00006cf12200904414e670264286dcf94f1c57f8352e81a84 SHA512 62e204d3e7451301d0845c7a652e9ea16fe710f32f46ae7229ec50ee3fb800d7a9074df0a9ec35b327af3be7d2bada93f862d26d1471725bddb808ef263508df
 MISC metadata.xml 440 BLAKE2B e5121ee173f89412a1bf3339de23a9e13fcec40f52c82129ebd185732759e4ad586b922d31e6470f91e03ba2ce614ba6de75dcb340e0f20d5b799c3476bde23b SHA512 cb2f6751bff9d468dde56635a792813de84b6c383e488ab5764c9656e54a892f5a9b9fd4932d49ec603bae4716f9f0bdd3cbe90b0c796017fceeb6b61196f1ef
diff --git a/app-text/kbibtex/kbibtex-0.9.1.ebuild b/app-text/kbibtex/kbibtex-0.9.1.ebuild
index e01569d3b7fd..89524913afe2 100644
--- a/app-text/kbibtex/kbibtex-0.9.1.ebuild
+++ b/app-text/kbibtex/kbibtex-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ HOMEPAGE="https://userbase.kde.org/KBibTeX"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://kde/stable/KBibTeX/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
@@ -68,7 +68,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
 		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		$(cmake-utils_use_find_package zotero Qca-qt5)
+		$(cmake_use_find_package zotero Qca-qt5)
 	)
 
 	ecm_src_configure
diff --git a/app-text/kbibtex/kbibtex-0.9.ebuild b/app-text/kbibtex/kbibtex-0.9.ebuild
deleted file mode 100644
index 3d572fc00944..000000000000
--- a/app-text/kbibtex/kbibtex-0.9.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX"
-HOMEPAGE="https://userbase.kde.org/KBibTeX"
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/KBibTeX/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-IUSE="webengine zotero"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	app-text/poppler[qt5]
-	dev-libs/icu:=
-	virtual/tex-base
-	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
-	zotero? (
-		app-crypt/qca[qt5(+)]
-		dev-libs/qoauth:5
-	)
-"
-RDEPEND="${DEPEND}
-	!app-text/kbibtex:4
-	dev-tex/bibtex2html
-"
-
-RESTRICT+=" test"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
-		$(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
-		$(cmake-utils_use_find_package zotero Qca-qt5)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-apps/okular:${SLOT}" ; then
-		elog "For PDF or PostScript document preview support, please install kde-apps/okular:${SLOT}"
-	fi
-}