kde-plasma/kinfocenter: Fix USB device IDs w/ correct path to hwids

See also: https://bugs.kde.org/show_bug.cgi?id=402949
Thanks-to: Alexandre Ferreira <alexandref75@gmail.com>
Closes: https://bugs.gentoo.org/675350
Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

2 files changed, 157 insertions, 0 deletions

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-r1.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.14.5-r1.ebuild
new file mode 100644
index 000000000000..6523f277be2b
--- /dev/null
+++ b/kde-plasma/kinfocenter/kinfocenter-5.14.5-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Utility providing information about the computer hardware"
+HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/"
+SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gles2 ieee1394 +opengl +pci wayland"
+
+REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(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? (
+		$(add_qt_dep qtgui 'gles2=')
+		media-libs/mesa[gles2?]
+		!gles2? ( media-libs/glu )
+	)
+	pci? ( sys-apps/pciutils )
+	wayland? (
+		$(add_frameworks_dep kwayland)
+		media-libs/mesa[egl]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep plasma)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	$(add_qt_dep qtquickcontrols)
+	!kde-apps/kcontrol:4
+	!kde-misc/about-distro
+	!kde-plasma/kinfocenter:4
+"
+
+PATCHES=( "${FILESDIR}/${P}-hwids.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package ieee1394 RAW1394)
+		$(cmake-utils_use_find_package pci PCIUTILS)
+		$(cmake-utils_use_find_package wayland EGL)
+		$(cmake-utils_use_find_package wayland KF5Wayland)
+	)
+
+	if has_version "dev-qt/qtgui[gles2]"; then
+		mycmakeargs+=( $(cmake-utils_use_find_package gles2 OpenGLES) )
+	else
+		mycmakeargs+=( $(cmake-utils_use_find_package opengl OpenGL) )
+	fi
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	rm -r "${D}"/usr/share/kcmusb || die
+
+	insinto /etc/xdg
+	doins "${FILESDIR}"/kcm-about-distrorc
+
+	insinto /usr/share/${PN}
+	doins "${DISTDIR}"/glogo-small.png
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		if ! has_version "net-fs/nfs-utils"; then
+			elog "Installing net-fs/nfs-utils will enable the NFS information module."
+		fi
+		if ! has_version "net-fs/samba"; then
+			elog "Installing net-fs/samba will enable the Samba status information module."
+		fi
+	fi
+}