gentoo resync : 13.01.2018

6 files changed, 2 insertions, 72 deletions

diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 8cf8949366d1..9fbecc8b6d7b 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/basket/Manifest b/kde-misc/basket/Manifest
index 02f3ea3e3226..0c6db4753782 100644
--- a/kde-misc/basket/Manifest
+++ b/kde-misc/basket/Manifest
@@ -1,4 +1,4 @@
 AUX basket-2.49a_p20170225-fixes.patch 2428 BLAKE2B 1b1ed57b33d819ac8bde1f4d26b768c69b2414a90363dcbb83ed92378124cf9c46980c3999e6cc8295114f4eb956a298e0a62b9f53e17927d9f2d3657ba32539 SHA512 52aa945f6994fce6c6204ae3893ccc7c656a1c97aeee85062328f7d9f8fdadc354abc0307865b0b2053a1d2da6c95fd1431d9c1e15f699acdd333c16dc1bd27b
 DIST basket-2.49a_p20170225.tar.gz 4680129 BLAKE2B f6a7acc8b83596815a79f9dd73879f9471d2a9ae9096d521ef98faeaaa2f3f2c6dc46c05ed0097fa1b20cf66479b5127b625eb60b0257fb1579bfc1d73f2e989 SHA512 87d454d33bfa881ac5958a4d02c5775b8d54e83c6b86e1b2732565132b2d0339be630a3ab0bbd0169da950aa43750e4088add45a94ce10fd3ffa05e0b3e26b1c
-EBUILD basket-2.49a_p20170225-r1.ebuild 1902 BLAKE2B e2476253e623c07caac40c7477802049f63ad91b3af4573c6aece440fda941cd1b901f6c31a961d058f3916f11a1a1bbc3d7ea31ae76e51af369ec8410850d6f SHA512 3d0012399a25791fe9f3a0bb5d4ebd3e40d669aff4889e1fcf078f0de1401c52c9e8e87d581417c4cad52f5b60986d54dfa51b956ec4d414e427530099e4be89
+EBUILD basket-2.49a_p20170225-r1.ebuild 1879 BLAKE2B 90c8056b6f525f0082d14d673fd1550e982b56115ec67f47d7231e52803a5ab321adf0142f18c17d66c5a173a17fb870e37e1191ef3931c6448e21353550a6b0 SHA512 2f40dbb560c00393ae415d8fa07c1592517c098d043fa3d484cc563f96f11595bfec3fdf0bec927a2a2f65cf0e51ca919b66d1f12a58181550abfb49edeb549b
 MISC metadata.xml 336 BLAKE2B 0a9704885fd7a47cb2b0b01f51baf34c3cfac7eefcfb06c4328d83aa51b4909e5ad20a29ffc7df79df38d01d1a86e37ece806a0f905714eb0e86a29f12e2aade SHA512 8c2e68454f9153eefec98b4c918de8390de6e3384b0d3339b64bcbe54592e582c933a372852444f031fe0574e4d1ad3e4b6fcd80fe9f610cd6624e13eaec3eb0
diff --git a/kde-misc/basket/basket-2.49a_p20170225-r1.ebuild b/kde-misc/basket/basket-2.49a_p20170225-r1.ebuild
index 6effe58212f8..779c7f651e2a 100644
--- a/kde-misc/basket/basket-2.49a_p20170225-r1.ebuild
+++ b/kde-misc/basket/basket-2.49a_p20170225-r1.ebuild
@@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5 vcs-snapshot
 
 DESCRIPTION="A DropDrawers clone. Multiple information organizer"
-HOMEPAGE="http://basket.kde.org/ https://github.com/basket-notepads/basket"
+HOMEPAGE="https://github.com/basket-notepads/basket"
 SRC_URI="https://github.com/${PN}-notepads/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/kde-misc/wacomtablet/Manifest b/kde-misc/wacomtablet/Manifest
index 62bc2b1671d3..566348402406 100644
--- a/kde-misc/wacomtablet/Manifest
+++ b/kde-misc/wacomtablet/Manifest
@@ -1,6 +1,3 @@
-AUX wacomtablet-3.0.0_beta1-ecm.patch 515 BLAKE2B b3f87b4e9dbe12d0e21d620758a10293053c18c9a52605686371b777f0ee0cf560ecb00a03b925c83ec0b24292ef6cdaf221671664084405a1e557441eb2e33b SHA512 4d261007ab8c034c43024b6224ee89b37487d1d1ea7997e78af35a4d1659900b7961a0db35dbd3627f36b7f5dc32d715559be92f4f1231527af30957ca4cb8aa
-DIST 114856-wacomtablet-3.0.0~beta1.tar.xz 655684 BLAKE2B 666d1e60c7caa763a3e884936f800c122ea0e6151dea89bd44b5d50b203444b3429dac8b0376c5129f29b3103ff2d82ae353eaae7324c422e590c5a8dee88806 SHA512 cf95cbd8f3489bf0d18acfec72ca964685060ae7c7a554b118f5086a46a1e97be67f674f1bf1db6ce15638fcdcfca5043e7438af09ced8acd9fb601c44f433fb
 DIST wacomtablet-2.9.82.tar.xz 708508 BLAKE2B f9f10354f5db42e9acc43b05d00c168bd6f5200ea7d7f7fb4c7f0f3042ab2327d78145f6388e1c607528e14c6e6bd6a33929f952943dba330e02d761634ca37c SHA512 ba1b8d15ed4ce52c14ca0ac494cfb9200b9c891c6ac19ee5a306496e1c04f6abc8b83290bc31199a634ed8b4b4469dc185a967be183f1ed6b53956bc19038904
-EBUILD wacomtablet-3.0.0_beta1.ebuild 1329 BLAKE2B eae5208b475276eda78f9050f23d338b8526c2345d19d998aca1eb92b7c6eed21b359454a73b0f9b8498b2dffbeface34b4ff96ce65615e0238bfc44644323a1 SHA512 110b6373c282417434fbd210287b9e20ba9e3d5133b56eebcdd485f560ce59ac14dcd76583f5132ce66e207fc4b2a72b486ed75820ab12101323170c03f6264d
 EBUILD wacomtablet-3.0.0_beta2.ebuild 1272 BLAKE2B a3d29c51a1f836e75dfeff33feb5339f9857f70136ad617892400020f0042d943305ccc0de27d558b19dc51eeed4a6b3eabeb66b6bc868b6c2f4d8b67635bc35 SHA512 d9e0d99e34885203d92691d7e536712bc62b70824d1d6e2d2482c4437bb3aaac097d3eaf56d08575ed04c5ecbef2db10644ec27c2ec89eba5fa0bcbd384f66cc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/wacomtablet/files/wacomtablet-3.0.0_beta1-ecm.patch b/kde-misc/wacomtablet/files/wacomtablet-3.0.0_beta1-ecm.patch
deleted file mode 100644
index dabb90370195..000000000000
--- a/kde-misc/wacomtablet/files/wacomtablet-3.0.0_beta1-ecm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN wacomtablet-3.0.0~beta1.orig/CMakeLists.txt wacomtablet-3.0.0~beta1/CMakeLists.txt
---- wacomtablet-3.0.0~beta1.orig/CMakeLists.txt	2015-10-28 18:53:01.000000000 +0100
-+++ wacomtablet-3.0.0~beta1/CMakeLists.txt	2016-04-20 17:41:06.087315610 +0200
-@@ -66,5 +66,5 @@
- 
- feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
- 
--include(MacroOptionalAddSubdirectory)
--macro_optional_add_subdirectory( po )
-+include(ECMOptionalAddSubdirectory)
-+ecm_optional_add_subdirectory( po )
diff --git a/kde-misc/wacomtablet/wacomtablet-3.0.0_beta1.ebuild b/kde-misc/wacomtablet/wacomtablet-3.0.0_beta1.ebuild
deleted file mode 100644
index 68e289eca042..000000000000
--- a/kde-misc/wacomtablet/wacomtablet-3.0.0_beta1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-#EGIT_BRANCH="releng3.0"
-KDE_HANDBOOK="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KControl module for Wacom tablets"
-HOMEPAGE="http://kde-apps.org/content/show.php?action=content&content=114856"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-MY_PV=${PV/_/\~}
-MY_P=${PN}-${MY_PV}
-SRC_URI="http://kde-apps.org/CONTENT/content-files/114856-${MY_P}.tar.xz"
-
-S=${WORKDIR}/${MY_P}
-
-CDEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(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/libX11
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libxcb
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	x11-proto/xproto
-"
-RDEPEND="${CDEPEND}
-	!kde-misc/wacomtablet:4
-"
-
-PATCHES=( "${FILESDIR}/${P}-ecm.patch" )