gentoo resync : 22.01.2019

4 files changed, 59 insertions, 1 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 4eb2dc6742b3..6d965adedaf1 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 314283ded32c..7a5c82af3847 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,7 +1,8 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
+AUX kinfocenter-5.14.5-hwids.patch 1727 BLAKE2B 771c4c771c6926cc044cc512b7c1ebe5b528be50a7bcd9fc2d6f56675a26261c6c6cb5bae20c7992efd67581a7067b4ed09f21984d72a94ea1ce664234eb4c39 SHA512 cd348c2339528993795c292c99d9befd01033d4a80487bc1487013ba3db7879fbffb3ab5b1ef3125580ad0bed8a8827cfde366cfca770e71c5aca440742a744d
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
 DIST kinfocenter-5.14.3.tar.xz 1322480 BLAKE2B 447de617a858fee4cb807cf776a945207387317c5e8be6cc41c445f3ea8647620ab30b2495d26c3446ace3447fb3693e6ed7e385874bca34b8118658bca608c1 SHA512 6d07299cb2145cfe172dc79cfe849b03000fe770e397fd050b053b2f40f09dec5d5ffa9336223320597b965a0c612c0b09333e20fb54c3edb41773d473f9998a
 DIST kinfocenter-5.14.5.tar.xz 1323212 BLAKE2B cf248445aec1320e18f11e58d9e02a95b1535446bc207ed75b76d18ca81af12feac221cf847bf73ecb4e0036432e6055c2801b34b9673ae289330468b2184c94 SHA512 df38b40eef89d4b4a6e7f6e5e72325122c5ed924fa01dd59e6d99ffef61a9bcd89e11dac8412ea0a95ecc0b68469cad6921ad529a247b59aaab3dc7a7d09a04c
 EBUILD kinfocenter-5.14.3.ebuild 2484 BLAKE2B 6893355e5e305ac324fdfd5c7277b83d105286826c3aade3605f3662e7805c9effcad153a7ff26b357e1e254631567560067443fb1684648e321f8aa64288e8d SHA512 ca0dcbe3eac5131c437ec38730650a753cc0928d24253f292dd5976c13992b980222782e83376dcd6e3567e208db5681a700d87bceaa0bc1ebab172a9c498653
-EBUILD kinfocenter-5.14.5.ebuild 2557 BLAKE2B 5968095aa0fed5cab2e05ed31635abb1d3b373ff9a9539646d9b197cde30a0a86bb54a267f41cee786118476591c371f3a4512a0bcc8e78a422d1d22728e09b7 SHA512 58e4f3bfe83a22eb3bcdd1bb644d7cabba64fd38b2452d66d2beb6106cf17fd81bae32692350d3416e0684d8fdd64a7af127d0806b8f339ef2f6cda7e8ad838a
+EBUILD kinfocenter-5.14.5-r1.ebuild 2665 BLAKE2B b8f306777bd784c381d519e090f5d38ecd615ba0a2bc127085ffbac7bd494dda44df204a608f08c9a48e2d87252afd8782b7fcf4aae27bf18f3ae2393457b722 SHA512 546afb05345e012dad2ff57b6d334e7f2bad22092d3a7cb24198f249466cff606f9599b205cf0a1993cb1ef3d0391df7505fee22aaccc55ed6f2da858b9fecaf
 MISC metadata.xml 390 BLAKE2B a47af94b17ade0ad2f4b4a44bac8ac1245c29a6551a059c95967ce2d5cd4420a975210bf0e4658c2152aaf5a894f934cac0d35aae015368bf1f8f8b1cbbbb069 SHA512 4ea690f0f5ac41b58d840949297d462e0fa7433bdece54d63b08a913d8a9001bf6d144e28d5e672712abf35e784c2b17faf31f0a879d6109417ce95ccdc0ef3b
diff --git a/kde-plasma/kinfocenter/files/kinfocenter-5.14.5-hwids.patch b/kde-plasma/kinfocenter/files/kinfocenter-5.14.5-hwids.patch
new file mode 100644
index 000000000000..a29f71f7786b
--- /dev/null
+++ b/kde-plasma/kinfocenter/files/kinfocenter-5.14.5-hwids.patch
@@ -0,0 +1,52 @@
+From e556c25c888a6e16e818945ac5bc81e455ddd4bc Mon Sep 17 00:00:00 2001
+From: Alexandre Ferreira <alexandref75@gmail.com>
+Date: Tue, 15 Jan 2019 13:29:25 +0000
+Subject: Fix USB view
+
+Summary:
+Fix
+BUG: 402949
+
+Reviewers: #plasma, cfeck, davidedmundson
+
+Reviewed By: #plasma, davidedmundson
+
+Subscribers: asturmlechner, davidedmundson, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D18032
+---
+ Modules/usbview/usbdb.cpp      | 3 +++
+ Modules/usbview/usbdevices.cpp | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Modules/usbview/usbdb.cpp b/Modules/usbview/usbdb.cpp
+index 2c62f16..e68d5c0 100644
+--- a/Modules/usbview/usbdb.cpp
++++ b/Modules/usbview/usbdb.cpp
+@@ -21,6 +21,9 @@
+ USBDB::USBDB() {
+ 	QString db = QStringLiteral("/usr/share/hwdata/usb.ids"); /* on Fedora and Arch*/
+ 	if (!QFile::exists(db)) {
++		db = QStringLiteral("/usr/share/misc/usb.ids"); /* on Gentoo */
++	}
++	if (!QFile::exists(db)) {
+                 //cannot use locate(AppDataLocation) as the app is kinfocenter
+ 		db = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kcmusb"), QStandardPaths::LocateDirectory);
+                 if (!db.isEmpty())
+diff --git a/Modules/usbview/usbdevices.cpp b/Modules/usbview/usbdevices.cpp
+index 1fb32e7..7b6fe1c 100644
+--- a/Modules/usbview/usbdevices.cpp
++++ b/Modules/usbview/usbdevices.cpp
+@@ -103,7 +103,7 @@ void USBDevice::parseSysDir(int bus, int parent, int level, const QString& dname
+ 			continue;
+ 
+ 		USBDevice* dev = new USBDevice();
+-        dev->parseSysDir(bus, ++level, _device, dname + QLatin1Char('/') + *it);
++        dev->parseSysDir(bus, _device, ++level, dname + QLatin1Char('/') + *it);
+ 	}
+ }
+ 
+-- 
+cgit v1.1
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.14.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.14.5-r1.ebuild
index 18e67662aa0e..6523f277be2b 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.14.5.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.14.5-r1.ebuild
@@ -35,6 +35,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtdeclarative)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	sys-apps/hwids[pci,usb]
 	x11-libs/libX11
 	ieee1394? ( sys-libs/libraw1394 )
 	opengl? (
@@ -59,6 +60,8 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-plasma/kinfocenter:4
 "
 
+PATCHES=( "${FILESDIR}/${P}-hwids.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package ieee1394 RAW1394)
@@ -79,6 +82,8 @@ src_configure() {
 src_install() {
 	kde5_src_install
 
+	rm -r "${D}"/usr/share/kcmusb || die
+
 	insinto /etc/xdg
 	doins "${FILESDIR}"/kcm-about-distrorc