gentoo resync : 30.06.2018

3 files changed, 4 insertions, 90 deletions

diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index d4fb74782b66..dbbe03ff611f 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,5 +1,3 @@
-DIST kbibtex-0.7.95.tar.xz 4060200 BLAKE2B aa08cd10c4e67bd8cdfc52803df03326a3c49b86aff699d7be2c40082f5d7359ef8aeb399dd3ab7c6b62f63274ad5d545c6acdaf4f77ed2b922583346557e76a SHA512 683456504861271df46d4b423ed8994f7e97d653e3b634c81c14b0187efa51ebae6d72bc4ccbe7cf18682ccfd9ff2cfcc2ba399a1d7f6bac62e3cb9e79710cd6
-DIST kbibtex-0.8_pre20171110.tar.gz 11423893 BLAKE2B 78bcd72da35775d9927f35b865aba1e5ee88fd6391e5b354dd23d319a17a18c5aa521d32f58f1827a86bf33d1a42e7bef19940fdd1b83e67124b7335520bb1cd SHA512 719c40e78e22dc936a5395bf299962b4ec657df89877df78f17139dcd9b45a7ed98ff213a7c8a0cf0eeb4960a3b10cafaf7521e334a3269f96e2abdcdd67c913
-EBUILD kbibtex-0.8_pre20171110-r1.ebuild 2023 BLAKE2B 034890e5745e0d58442f985ad50a6abb543cb83a3f18f77d18110bc9e83b0b893e3d2937836bc4d0437114ea343bde2e78325c4a6c250a33708b14e56ed67901 SHA512 11b1445ecde7738e4f8a1818b8c7772d460c08dbbf9b8925c6f2eba095e54b9b53bd075cb5a3c0b616d6bba74194bfe4c225dff8ebe530bcc3dd855762666de0
-EBUILD kbibtex-0.8_pre20180526-r1.ebuild 1991 BLAKE2B 22fc9408993aa7c551b1eb9b9b02932c89a226650791a91db1af54238380e63582ce8cbdf7c610383023be26a4d362f1e81a42292d4926aafd386a7a4a4e4209 SHA512 7af2687fb97565c478bb38f1fdde5efdac067fcf360c3d356b63ba171dadfb955e1dd02a8e6d0375468caaf3073570d4537d9232a110d41cd297b72382f23719
+DIST kbibtex-0.8.1.tar.xz 4060484 BLAKE2B 1dd100b0c469955f273907d79765268fdefdd4ae05faa851f4c1823c41f312810f2992113cda97c1f8e19c4c3bf35e7e79c6a0bc12cde60995edbd903a9b5ae3 SHA512 73c318b1d29de98761f43de9828a48e943528f413c6c2489e916f88ef4ba1424a300bd9eddd10fa763985322248ef863cad1b8cfc681f083eb9acdabd6c6dfea
+EBUILD kbibtex-0.8.1.ebuild 1939 BLAKE2B 391e01cd97909347fd764878562f327754be35dda6ca3f9d1e6e657638f75bb477bc583747dad0dff3d940842d1806dcf6e3937c4c5eb34b4b0b355f2ba299b8 SHA512 59844f3d031fdac85f1bbfbbb352fe693dd7b4030bb938fcb26543a4a81787ca54e36aff184dfb2ad9d881cd2054e95a4d3857f9d10197a3dec44521cba44356
 MISC metadata.xml 518 BLAKE2B e10a5e38918c43315c3804c787f80c6df00f7a37da896784a1ee932a90c7f6c15d8a1fc69313314dadaf01461b65e6be78b189226ccae9fda5422950a86edb63 SHA512 be7be6b52a067ed23384344706adaa13cd06667e768a9b5adc2d93b2edeb5feec426dc83395a226219a469bb5fbe99d378b5e1c87ea82e17a05c9751f03e12bb
diff --git a/app-text/kbibtex/kbibtex-0.8_pre20180526-r1.ebuild b/app-text/kbibtex/kbibtex-0.8.1.ebuild
index e581fd7cf61f..498364c65ead 100644
--- a/app-text/kbibtex/kbibtex-0.8_pre20180526-r1.ebuild
+++ b/app-text/kbibtex/kbibtex-0.8.1.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=6
 
-MY_PV=0.7.95
 KDE_HANDBOOK="optional"
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
@@ -12,8 +11,8 @@ 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/unstable/KBibTeX/${PN}-${MY_PV}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://kde/stable/KBibTeX/${PV}/${P}.tar.xz"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
@@ -62,8 +61,6 @@ RDEPEND="${DEPEND}
 
 RESTRICT+=" test"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
diff --git a/app-text/kbibtex/kbibtex-0.8_pre20171110-r1.ebuild b/app-text/kbibtex/kbibtex-0.8_pre20171110-r1.ebuild
deleted file mode 100644
index 80b33afdabdd..000000000000
--- a/app-text/kbibtex/kbibtex-0.8_pre20171110-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=4ce7c51f163508f293c3fd39a716770cbb14ef7d
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5 vcs-snapshot
-
-DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX"
-HOMEPAGE="https://userbase.kde.org/KBibTeX"
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-IUSE="webengine webkit zotero"
-
-REQUIRED_USE="?? ( webengine webkit )"
-
-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 ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(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') )
-	webkit? ( $(add_qt_dep qtwebkit) )
-	zotero? (
-		app-crypt/qca[qt5(+)]
-		dev-libs/qoauth:5
-	)
-"
-RDEPEND="${DEPEND}
-	!app-text/kbibtex:4
-	dev-tex/bibtex2html
-	x11-misc/shared-mime-info
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
-		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
-		$(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
-}