gentoo resync : 18.08.2019

6 files changed, 2 insertions, 166 deletions

diff --git a/kde-misc/wacomtablet/Manifest b/kde-misc/wacomtablet/Manifest
index e474806a5cfb..224a2a367ebc 100644
--- a/kde-misc/wacomtablet/Manifest
+++ b/kde-misc/wacomtablet/Manifest
@@ -1,8 +1,3 @@
-AUX wacomtablet-3.1.1-correct-width-height-values.patch 2189 BLAKE2B 27f363d4e02c9ff0244a1ff9fabdc6370d572dcb37d87b8db00b3a47ac12e45523aaf8c9edc2281a228db88a6aadb617eb6c8db39f47cb849d87e87284a208c3 SHA512 0bf21e7a5714f2805d8b273992091b926413bcbbb549d43c1caa066589700dd70da28c9e282b2158487d1528eb8370e3e5f715c4b662b9929ed4a2a720b5d085
-AUX wacomtablet-3.1.1-gcc9.patch 1196 BLAKE2B 2e8b7d2f3808b09caa1ed733a6d0876172324809ecc0567a8fffbf962bdcd03fee8399fdc5fbb1b5196530538c04513965ec2df0540c58eb8fd5ecd577ad6409 SHA512 600725f86e5b4eaa654731c14c4c7c4d4d5c8980634faadd5697a866667ca27356213d25c07918fee70ee056cd7d890d612e80c6bd7c0f4e4058be39dddba263
-AUX wacomtablet-3.1.1-xlib-optional.patch 838 BLAKE2B 997d42737c593c5074b6541ca91a1976afc36c7f43041ecd90a32d309c856a9b9b7fb203b135cf997a9a944e9a47febefdc196b36fde94975677ba16b2f17be4 SHA512 b7b8e3c1a2ad97788d6a1bbebc3183b4b1e13ab6295bfc716d5e083a0a317fcd6ba75b49051706c9d776a028a40d3f7cc8edec9b1186b67cdd727ef3e2019990
-DIST wacomtablet-3.1.1.tar.xz 724176 BLAKE2B 062f05067b9ca423527f1fbbc498d3228fba9333f96e918493a00c3ceb669a23c3ab9297bf6c2d3d161559f1d9cf6ccff8f502971718e71a360f3db2e7d9bd67 SHA512 91f8ab9326b8307d63e09c7d75d613553f16c6cb93837cc404cb251aeda93078011b0c5aa0fc20ca4613d82421d73804cc55fa71a688bf4dd0f1d616733ade97
 DIST wacomtablet-3.2.0.tar.xz 728468 BLAKE2B f741c8989f94cdc5b4839df5d91a6728c48308880c489e031d4615a58e82dddda75dcd1cd04b941035c1aece3ed4f7889508629100852cbcaafc063d7e0f8d1e SHA512 acbabd6d6546bc85f0ed4e245668dc89b1c2ecaedd3754bf7ad8027b90f3ae81e5312395376de272dcbd416a9a1115bff2481351bd3f418bef7fa06d0db0c5a6
-EBUILD wacomtablet-3.1.1-r1.ebuild 1421 BLAKE2B 8dbf7b906bf70518862ad2fa080765fc3d0d79e1b66eb623d92b802238083606212f3db3d786ef0ca9509c7d4d24c749d8f812ef3e9360f546b15ae0868e9c70 SHA512 a90b92226ade230fb3ca28475bd3ecf2d3dcc132454161f310a4aa2aea7e41f8fd6ddbc70ed3066d17c12ef821f425b37c9e487597d349ee200809bf0915d7f2
-EBUILD wacomtablet-3.2.0.ebuild 1242 BLAKE2B fea43a4b19bff73f52a6b7bc6012dc9759cb295dbb056843c89db9ee9161d584363d8ab7c65e9d9bf2426f407541649f9a73e64dd145597a0e84c7ce630e21c8 SHA512 1123eff796f65fd0b75b4e79036399177d55ea6ac9888d0efe5ca58a696155c59aefa433abc09b6e72f72a883d205fb2743ace89ea026513195ed170d2359d47
+EBUILD wacomtablet-3.2.0.ebuild 1240 BLAKE2B b73a09d09824ad69a3dad83f843c4adcfe39c4890ac48d4a061ebdf85a151b3845a52eda11085430d53971cc1a214bd245b5f3779648bf535c16ab70cfd11223 SHA512 b25b53f9ebd7ddc6da7887d70f6ed13edfe5870610cbbf0e7efcdc10b28a9857067a9733e8cd820a22ffd400dee0fb01a989990f51d72e6b0498719ccb7db56f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/wacomtablet/files/wacomtablet-3.1.1-correct-width-height-values.patch b/kde-misc/wacomtablet/files/wacomtablet-3.1.1-correct-width-height-values.patch
deleted file mode 100644
index 805539728870..000000000000
--- a/kde-misc/wacomtablet/files/wacomtablet-3.1.1-correct-width-height-values.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From fd099f89c5ded7e20c3a852d5539e9a0b269e11d Mon Sep 17 00:00:00 2001
-From: Jason Gerecke <jason.gerecke@wacom.com>
-Date: Thu, 13 Jun 2019 23:49:12 +0300
-Subject: Correct width/height values from X11Wacom::getMaximumTabletArea
-
-Summary:
-The "Wacom Tablet Area" property contains four values that define the
-top-left and bottom-right tablet coordinates of the tablet's input
-area. The driver will scale input coordinates according to the input
-area such that the border of the input area matches up with the border
-of the desktop or mapped monitor.
-
-Crucially, these coordinates are *NOT* necessarily equal to (0,0) and
-(SENSOR_MAX_X, SENSOR_MAX_Y) after a reset. In particular, many display
-tablet have sensors that are slightly larger than the display itself
-and so have their reset areas equal to something like (400, 400) and
-(SENSOR_MAX_X - 400, SENSOR_MAX_Y - 400) so that the pen is correctly
-mapped.
-
-This commit updates X11Wacom::getMaximumTabletArea to properly set the
-width and height properties by calculating the difference between the
-min and max values of X and Y. This is particularly important to ensure
-that the calibration routines work correctly.
-
-Ref: https://bugs.kde.org/show_bug.cgi?id=407712
-
-Reviewers: valeriymalov
-
-Reviewed By: valeriymalov
-
-Differential Revision: https://phabricator.kde.org/D21775
----
- src/common/x11wacom.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/common/x11wacom.cpp b/src/common/x11wacom.cpp
-index e269480..a4d95c8 100644
---- a/src/common/x11wacom.cpp
-+++ b/src/common/x11wacom.cpp
-@@ -70,8 +70,8 @@ const TabletArea X11Wacom::getMaximumTabletArea(const QString& deviceName)
-     if (x11Device.getLongProperty(areaProperty, maximumArea, 4) && maximumArea.size() == 4) {
-         maximumAreaRect.setX(maximumArea.at(0));
-         maximumAreaRect.setY(maximumArea.at(1));
--        maximumAreaRect.setWidth(maximumArea.at(2));
--        maximumAreaRect.setHeight(maximumArea.at(3));
-+        maximumAreaRect.setWidth(maximumArea.at(2) - maximumArea.at(0));
-+        maximumAreaRect.setHeight(maximumArea.at(3) - maximumArea.at(1));
-     }
- 
-     // reset the area back to the previous value
--- 
-cgit v1.1
diff --git a/kde-misc/wacomtablet/files/wacomtablet-3.1.1-gcc9.patch b/kde-misc/wacomtablet/files/wacomtablet-3.1.1-gcc9.patch
deleted file mode 100644
index 6b0cc5dec637..000000000000
--- a/kde-misc/wacomtablet/files/wacomtablet-3.1.1-gcc9.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 810487c4fa240f6de598b04929bb08de8937feb5 Mon Sep 17 00:00:00 2001
-From: Valerii Malov <jazzvoid@gmail.com>
-Date: Sun, 28 Apr 2019 19:10:43 +0300
-Subject: (Supposedly) fix building with gcc9
-
-I don't really have access to gcc9 right now to test, but this should
-fix "static assertion failed: unique_ptr's deleter must be invocable
-with a pointer"
-
-CCBUG: 407015
----
- src/common/libwacomwrapper.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/common/libwacomwrapper.cpp b/src/common/libwacomwrapper.cpp
-index 1d11fc3..92a559a 100644
---- a/src/common/libwacomwrapper.cpp
-+++ b/src/common/libwacomwrapper.cpp
-@@ -60,7 +60,7 @@ libWacomWrapper::~libWacomWrapper()
- bool libWacomWrapper::lookupTabletInfo(int tabletId, int vendorId, TabletInformation &tabletInfo)
- {
-     qCDebug(COMMON) << "LibWacom lookup for" << tabletId << vendorId;
--    auto errorDeleter = [](WacomError *&e){libwacom_error_free(&e);};
-+    auto errorDeleter = [](WacomError *e){libwacom_error_free(&e);};
-     std::unique_ptr<WacomError, decltype(errorDeleter)>
-             error(libwacom_error_new(), errorDeleter);
-     std::unique_ptr<WacomDevice, decltype(&libwacom_destroy)>
--- 
-cgit v1.1
diff --git a/kde-misc/wacomtablet/files/wacomtablet-3.1.1-xlib-optional.patch b/kde-misc/wacomtablet/files/wacomtablet-3.1.1-xlib-optional.patch
deleted file mode 100644
index ae40d90a64b0..000000000000
--- a/kde-misc/wacomtablet/files/wacomtablet-3.1.1-xlib-optional.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/CMakeLists.txt	2019-03-24 18:34:44.642298259 +0100
-+++ b/CMakeLists.txt	2019-03-24 18:38:45.593440974 +0100
-@@ -24,7 +24,7 @@
- find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets DBus X11Extras Qml)
- find_package(KF5 REQUIRED COMPONENTS CoreAddons I18n GlobalAccel Config XmlGui WidgetsAddons WindowSystem Notifications DBusAddons Plasma DocTools)
- find_package(XCB OPTIONAL_COMPONENTS XINPUT)
--find_package(X11 REQUIRED COMPONENTS XLIB)
-+find_package(X11 REQUIRED)
- find_package(XorgWacom REQUIRED)
- find_package(LibWacom REQUIRED)
- 
-@@ -41,6 +41,7 @@
-     set(USING_X_LIBRARIES XCB::XINPUT ${X11_Xinput_LIB})
-     add_definitions(-DHAVE_XCB_XINPUT)
- else()
-+    find_package(X11 REQUIRED COMPONENTS XLIB)
-     message(STATUS "Falling back to X11_XINPUT.")
-     set(USING_X_LIBRARIES ${X11_LIBRARIES} ${X11_Xinput_LIB})
- endif()
diff --git a/kde-misc/wacomtablet/wacomtablet-3.1.1-r1.ebuild b/kde-misc/wacomtablet/wacomtablet-3.1.1-r1.ebuild
deleted file mode 100644
index 87b034ac93ac..000000000000
--- a/kde-misc/wacomtablet/wacomtablet-3.1.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="System settings module for Wacom tablets"
-HOMEPAGE="https://userbase.kde.org/Wacomtablet https://store.kde.org/p/1127862"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="sys-devel/gettext"
-RDEPEND="
-	$(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)
-	>=dev-libs/libwacom-0.30
-	>=x11-drivers/xf86-input-wacom-0.20.0
-	x11-libs/libXi
-	x11-libs/libxcb
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libX11
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-xlib-optional.patch" # bug 681674
-	"${FILESDIR}/${P}-gcc9.patch" # bug 686822
-	"${FILESDIR}/${P}-correct-width-height-values.patch" # KDE-Bug 407712
-)
-
-src_test() {
-	# test needs DBus, bug 675548
-	local myctestargs=(
-		-E "(Test.KDED.DBusTabletService)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild b/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
index 5071ef8da86f..74a5f2521ad7 100644
--- a/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
+++ b/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://userbase.kde.org/Wacomtablet https://store.kde.org/p/1127862"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="sys-devel/gettext"