gentoo resync : 29.08.2018

5 files changed, 2 insertions, 50 deletions

diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index eac1a59990ce..cb20576972a6 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest
index 48254a97b941..a5fa0145ceb1 100644
--- a/kde-misc/kio-gdrive/Manifest
+++ b/kde-misc/kio-gdrive/Manifest
@@ -1,5 +1,5 @@
 DIST kio-gdrive-1.2.3.tar.xz 44176 BLAKE2B b1cd14f4c3cf8f14b875543370816c105d5b494a3f0119e2ec1b49610bcde3d67757a7006cb6f5c1f529f9e10500edaf724736d2c3caf62a9be7782fdc50f383 SHA512 cd5ec02fa0f0a73a0016957276c07c9435137781da922c6aaa49c8f62c43dce9a5107cdd80acbf40d49ab88bf96a2a6ed43138678c8cd9accd472b6eb428203f
 DIST kio-gdrive-1.2.4.tar.xz 44700 BLAKE2B 067a7e75a073a1bfffa76ba6bab9c76c517231182c0bd8ee6ddff6ab601ddaab4c19716d55072c3c09cdb0656e649bb7cf8b8951d6f458557fc29581109d04c2 SHA512 0430702ebc9412cbc0116f2677046da89ebac82d93afff915b08bf0449b26174975104514b4a000b60e4a0da9714270881b8ff264f2e7f2d9d4715229ff5a238
 EBUILD kio-gdrive-1.2.3.ebuild 1053 BLAKE2B 0606cc225562a217065135f0b63100d8977b3492cabda25d97f005c81bd15c5dbd8803bc8ec2fc0d25d16785219696e5e7b6fb8d2f5acf922acbc048703203cd SHA512 3ff6b362993124e07f76e6bf417e0fa4efe637483872442fd605af6fd386b3c3fe49dc9ba77f111e148d579e6eae1c7b08c94f8cf2c6f255fb48d47f77a1ff50
-EBUILD kio-gdrive-1.2.4.ebuild 1055 BLAKE2B 4bb67a9c7c6f1adaa70b68dad1019bfc185e843b4f525f861d14ee13c74c525e2fe197387c9f4c9a710f2ef9fdd6f339f6ca7b7af1bee0247ebe727ba1ffe1ed SHA512 6664ef68fa0b69c2a1e1cdcf133cbf1426637e5dcef946a6ba381e94c30b5c4912b31e0a611403b445cf13099bb326d7d669d20ffa355a6e057e63512994d389
+EBUILD kio-gdrive-1.2.4.ebuild 1054 BLAKE2B 4ea0e4af38cab88ec84a70871363ab9c84fb47f46d6eb57c3606382f277997469406b0ba317158dfc3d8f3a9389e00376f1cd702874b3bc142b80752120c20c6 SHA512 cb0224e78809d5b811739742efb79567182953b55efa9bc7a0ae6efdddbdc3c51b2df3b95e04a7a835a0ff55a3b053efac025de32bc1ed807593b2ca67f15d05
 MISC metadata.xml 402 BLAKE2B 80f60bca3fa59b7e22727709066453e1002c786c2eda688aa437f86fd99d73aa4b8c35a22571d3f774c55d16b1a4267fb0242253fd38a45890701755cca72afa SHA512 2c94ff5a07cb0a89d93cf798ee2b9a9f163f448e9d6d3185c06d58b42c1a9ef480adfafd540a021d4f9ebab6bb78e979c74e9a83867abff13f66b2b35eaafd21
diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.2.4.ebuild b/kde-misc/kio-gdrive/kio-gdrive-1.2.4.ebuild
index 774e9ad3b50b..306d006924d3 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-1.2.4.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-1.2.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://phabricator.kde.org/project/profile/72/"
 
 if [[ ${KDE_BUILD_TYPE} != live ]] ; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 fi
 
 IUSE="+kaccounts"
diff --git a/kde-misc/wacomtablet/Manifest b/kde-misc/wacomtablet/Manifest
index fb24ab43a9fd..ddb753b0f4bf 100644
--- a/kde-misc/wacomtablet/Manifest
+++ b/kde-misc/wacomtablet/Manifest
@@ -1,5 +1,3 @@
-DIST wacomtablet-3.0.0.tar.xz 707852 BLAKE2B 76dd473a1dbb2b47395b5321df2dd307065d8dc7399748f70f69ea6b3d2dffe8a981ab8e24ee77d72579e00e86769b9d68822d551855432a2c0dc471cf81be6c SHA512 c953ea010fe672706506d15c594d1437e1f42c59abcdd0b5bed32b4cdccafbb612584057a641c66029261088a4b968976a7bcdd03952daa9f05a955ee83c721d
 DIST wacomtablet-3.1.0.tar.xz 722436 BLAKE2B 97469b71d5139e67e4f3de27ed5c6beaa32abdcc159453206da98250d9b68b47c6a1022264a5faf1ac2e0283d0aff3465dad38cadacc52e6ed970261b6157a3d SHA512 763eddaca5471f62fb18e8c9f24d1be2a91e49eeaec4ce0b0ab6c89f1d85b9a6bcf32c67e79dee2e958dfba5bd354b4f4685a080ac06d461150a5da3a78a8915
-EBUILD wacomtablet-3.0.0.ebuild 1129 BLAKE2B ad06039c9f5548ba0aed08d9d596da59cd87256756020c89a73776b1c47bd161b86d8d41245090749071ac3adb0f15cad09bf6bc7c72dcaf0ec6ce8fec46c14d SHA512 fcf91226fb3014a1ee6bfa5cd90b462180472b4cb2f77d3d393319ba3990b597d84512ed99972c639f6736b7df2e894451e5ec2e08ce95518a1970d0a9e631d7
 EBUILD wacomtablet-3.1.0.ebuild 1155 BLAKE2B 2cc5eaff737465906ceb7cae385e96ff9133c0abf97ad7bf7016f09de99680e1d3c5e0eecfcf09983f6d16412836a580415358e78fe6e341ded747dd21be2fff SHA512 0b2d548d8050086e1c495fd7a36e094ba4c172209413850187c088f2f5756459b3e8043babbb5643c744a607095f89c4a48f2319ab6a9265ebee8593e0d3dd6e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/wacomtablet/wacomtablet-3.0.0.ebuild b/kde-misc/wacomtablet/wacomtablet-3.0.0.ebuild
deleted file mode 100644
index 21df62dbbad0..000000000000
--- a/kde-misc/wacomtablet/wacomtablet-3.0.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KControl module for Wacom tablets"
-HOMEPAGE="https://www.linux-apps.com/content/show.php?action=content&content=114856"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	>=x11-drivers/xf86-input-wacom-0.20.0
-	x11-libs/libXi
-	x11-libs/libxcb
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	x11-base/xorg-proto
-	x11-libs/libX11
-"
-RDEPEND="${CDEPEND}
-	!kde-misc/wacomtablet:4
-"