gentoo resync : 30.12.2017

4 files changed, 5 insertions, 151 deletions

diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index 171a82be68a5..aa55570a77eb 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,6 +1,3 @@
-AUX kbibtex-0.6.2-webkit.patch 2775 BLAKE2B cf924c59ae27393fdc44b4326612f17afaadc644ef48aa940622a6d83054a6f0ef4826faa2973feab7a8adff9bdbc3bee69d2737ba772fba9ee8a01654f38cf8 SHA512 742407fff818b164a3bd730d60f52dc92f32c4cea97ca9b28465e833b442fde6edaaf1e7dd34851cd569a627548b20e905b8e6ffc744cb1c8dbf81fd3337813b
-DIST kbibtex-0.6.2.tar.xz 3081364 BLAKE2B 8f52c4afea73dae10d3277aabd78a010c0bd2e0437084a87c5b8f5f2d99b40bf63ea4eb04b80699af2e7324e2436a38597394d4aabb076444c1f175327e3f77b SHA512 aa23e80cb273c0ae721ecc917f540070deea520fea2d7ca7ee97fde2c6918dba84769ad083fed93b9d0260539273c20c214b92c94269b413f46cb644d16dc270
 DIST kbibtex-0.8_pre20171110.tar.gz 11423893 BLAKE2B 78bcd72da35775d9927f35b865aba1e5ee88fd6391e5b354dd23d319a17a18c5aa521d32f58f1827a86bf33d1a42e7bef19940fdd1b83e67124b7335520bb1cd SHA512 719c40e78e22dc936a5395bf299962b4ec657df89877df78f17139dcd9b45a7ed98ff213a7c8a0cf0eeb4960a3b10cafaf7521e334a3269f96e2abdcdd67c913
-EBUILD kbibtex-0.6.2.ebuild 668 BLAKE2B 56c51b453a7fb3e34c527f83ca7c71f7b307d0c9a088fb110d3c1fb10cd691e9f9572fc16a6c33e3cd5927a73cf55437da9c4b0812d3e5d0ea2fea62070d0e1e SHA512 8f7cad285dabeb9816ed881f0a55a9f155516730891896e1b87bfb39be97f420e411d6a282a21593b69579e3599bca4523133c64e7d1ab108cd699e2754909b8
-EBUILD kbibtex-0.8_pre20171110.ebuild 1978 BLAKE2B 89ae915d284e37f0efcb9a66cb0373514366c02aa665dba1bf28190a504829e97c1fa354fc04dfc9bd0b166a9458de5b930c7f5bfc391fa18915598bccecae10 SHA512 0c6019abd821cbe51bb5419658ae41e3fa4a6a4261ebc44beb68dbb05ca43bd17e0d0d1d4be4d79cc125f83f6b5f8dae87724b00fbba5ccd570ab8c0fecd8121
+EBUILD kbibtex-0.8_pre20171110.ebuild 2020 BLAKE2B ca9745e19d3027331fdcbac79d82523f94ed68c4e54fc010893af630a3999d7649722bf1967429c31682c22cdced400f97e16436444abd9ca70226a5bd4efac7 SHA512 439f465078496bb6bbbc4b9c208af0e4f9cf8c45743e868b26a348275acc4754a9ee8920f6a70cdbfb06f166d6fc1cbdbf9f53bbd5bf79c009070d748f3ce274
 MISC metadata.xml 518 BLAKE2B e10a5e38918c43315c3804c787f80c6df00f7a37da896784a1ee932a90c7f6c15d8a1fc69313314dadaf01461b65e6be78b189226ccae9fda5422950a86edb63 SHA512 be7be6b52a067ed23384344706adaa13cd06667e768a9b5adc2d93b2edeb5feec426dc83395a226219a469bb5fbe99d378b5e1c87ea82e17a05c9751f03e12bb
diff --git a/app-text/kbibtex/files/kbibtex-0.6.2-webkit.patch b/app-text/kbibtex/files/kbibtex-0.6.2-webkit.patch
deleted file mode 100644
index c59a7fb9caf1..000000000000
--- a/app-text/kbibtex/files/kbibtex-0.6.2-webkit.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-commit 2cd09d41ed559461a0f0a346ebec3dea82c06947
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Sat Jan 21 18:26:46 2017 +0100
-
-    Add option to disable Qt4WebKit even if present
-    
-    - Link against Qt4WebKit only if(HAVE_WEBKIT)
-    - Remove Qt4WebKit linking from tests
-    
-    REVIEW: 129863
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ee3d810..1acbf8a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -48,6 +48,12 @@ set(
- )
- 
- option(
-+    WITH_QTWEBKIT
-+    "Enable QtWebkit support"
-+    ON
-+)
-+
-+option(
-     UNITY_BUILD
-     "Compile multiple C++ files in one big, merged file (\"Unity build\")\nSee also http://t-fischer.dreamwidth.org/3054.html"
- )
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 04222a7..0b7be01 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -37,24 +37,41 @@ include(
- # check if QtWebKit is available, which seems to be not available
- # on e.g. RedHat Enterprise Linux 6 or Scientific Linux 6
- if(
--    QT_QTWEBKIT_FOUND
-+    WITH_QTWEBKIT
- )
--    message(
--        STATUS
--        "Found QtWebKit, enabling WebKit support"
-+    if(
-+        QT_QTWEBKIT_FOUND
-+    )
-+        message(
-+            STATUS
-+            "Found QtWebKit, enabling WebKit support"
-+        )
-+        add_definitions(
-+            -DHAVE_QTWEBKIT
-+        )
-+        set(
-+            OPTIONAL_QTWEBKIT_LIBRARIES
-+            ${QT_QTWEBKIT_LIBRARIES}
-+        )
-+    else(
-+        QT_QTWEBKIT_FOUND
-     )
--    add_definitions(
--        -DHAVE_QTWEBKIT
-+        message(
-+            STATUS
-+            "QtWebKit not found, disabling WebKit support"
-+        )
-+    endif(
-+        QT_QTWEBKIT_FOUND
-     )
- else(
--    QT_QTWEBKIT_FOUND
-+    WITH_QTWEBKIT
- )
-     message(
-         STATUS
--        "QtWebKit not found, disabling WebKit support"
-+        "QtWebKit support disabled by configure"
-     )
- endif(
--    QT_QTWEBKIT_FOUND
-+    WITH_QTWEBKIT
- )
- 
- add_definitions(
-diff --git a/src/networking/CMakeLists.txt b/src/networking/CMakeLists.txt
-index efa14f4..f7ade08 100644
---- a/src/networking/CMakeLists.txt
-+++ b/src/networking/CMakeLists.txt
-@@ -131,7 +131,7 @@ target_link_libraries(
-     kbibtexnetworking
-     LINK_PRIVATE
-     ${QT_QTCORE_LIBRARY}
--    ${QT_QTWEBKIT_LIBRARY}
-+    ${OPTIONAL_QTWEBKIT_LIBRARIES}
-     ${KDE4_KDECORE_LIBS}
-     ${KDE4_KIO_LIBS}
-     ${POPPLER_QT4_LIBRARIES}
-diff --git a/src/program/CMakeLists.txt b/src/program/CMakeLists.txt
-index a9fe213..fa57506 100644
---- a/src/program/CMakeLists.txt
-+++ b/src/program/CMakeLists.txt
-@@ -65,7 +65,7 @@ kde4_add_executable(
- target_link_libraries(
-     kbibtex
-     LINK_PRIVATE
--    ${QT_QTWEBKIT_LIBRARIES}
-+    ${OPTIONAL_QTWEBKIT_LIBRARIES}
-     ${KDE4_KIO_LIBS}
-     ${KDE4_KPARTS_LIBS}
-     ${KDE4_KFILE_LIBS}
diff --git a/app-text/kbibtex/kbibtex-0.6.2.ebuild b/app-text/kbibtex/kbibtex-0.6.2.ebuild
deleted file mode 100644
index 1ed3726917b9..000000000000
--- a/app-text/kbibtex/kbibtex-0.6.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde4-base
-
-DESCRIPTION="BibTeX editor by KDE to edit bibliographies used with LaTeX"
-HOMEPAGE="https://userbase.kde.org/KBibTeX"
-SRC_URI="mirror://kde/stable/KBibTeX/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="
-	app-text/poppler[qt4]
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/qoauth:0
-	virtual/tex-base
-	x11-libs/libqxt
-"
-RDEPEND="${DEPEND}
-	dev-tex/bibtex2html
-"
-
-PATCHES=( "${FILESDIR}/${P}-webkit.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_QTWEBKIT=OFF
-	)
-
-	kde4-base_src_configure
-}
diff --git a/app-text/kbibtex/kbibtex-0.8_pre20171110.ebuild b/app-text/kbibtex/kbibtex-0.8_pre20171110.ebuild
index 07a54326f655..bbe15b44b125 100644
--- a/app-text/kbibtex/kbibtex-0.8_pre20171110.ebuild
+++ b/app-text/kbibtex/kbibtex-0.8_pre20171110.ebuild
@@ -6,13 +6,14 @@ 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"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
@@ -59,6 +60,8 @@ RDEPEND="${DEPEND}
 	x11-misc/shared-mime-info
 "
 
+RESTRICT+=" test"
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)