gentoo resync : 25.04.2020

4 files changed, 74 insertions, 36 deletions

diff --git a/x11-misc/qxkb/Manifest b/x11-misc/qxkb/Manifest
index fe31e7261344..6d9ff3456d92 100644
--- a/x11-misc/qxkb/Manifest
+++ b/x11-misc/qxkb/Manifest
@@ -1,3 +1,4 @@
-DIST qxkb-0.5.1_pre20150305.tar.gz 176169 BLAKE2B 13b61c951b0cbbee025a78806afc4999e1d63dcc979f43d78218ff8ef6552a1f8057d704560dcf569863c0b2b46e8c3ce292e98fc77f7acfc3f92fc9fdc68a05 SHA512 bfb16af22e12977432a77814ad5d3e8f5ed91c46b885505bba242eb864795837ed09cdd97ac3161f9c82a142ed7fe1d4b37e8d3aa8990cedf956904da290ab44
-EBUILD qxkb-0.5.1_pre20150305.ebuild 739 BLAKE2B e80eb56a35df8dfaf173b15f2ac3a7ff273c85402608359a8fe1201d7c267338e242cdcfd905e7182485b26611d2b878b855600078476a4120638053d1f96456 SHA512 5b5da2f2de919bfe8318100060ba15c308565267685188b825aec8d1f6fae48863b88b215f4fb31025ec6a7b0a221cdfc7a7155adbf10ba99f63dc97c785a496
+AUX qxkb-0.5.1_pre20190821-desktop.patch 1639 BLAKE2B 158d42fd95dd9fab6584adca86d475b2673e349dd79fa2bf694ed0a26fa37daebf3a1def2abeea22a0570390a5406e08a3b3d7b19e0ae503e0f0f18a0824490f SHA512 08a11f2659a5e77bfaa9df5e22e555f147f393dc4c003fd68b704a624d48120bf647f3fb6f659999073f20b4ea32ce09b7b225fe6c202497d7a1c10960f80dc8
+DIST qxkb-0.5.1_pre20190821.tar.gz 176133 BLAKE2B f04dffdb0fcb56e57002ec7384b12345c1bfd13988250701d7aed892552083c6ffe92cab133ea9e7e38b98aba8d47697f029e86288eca8d8571fbe023ff9b57a SHA512 2e95c471006ea8ba3b942d2725bad8ad47d74b8131a99055583782b0d844f0c41b539619e01bb2f6a634ffb1c2db87ca97c69352f761474c2895547207c3932d
+EBUILD qxkb-0.5.1_pre20190821.ebuild 689 BLAKE2B f9a0055e4fa01990da5739a03202033e4340bff9dfb44b0bdeb7dea939eb9271d44410ddeb5d159493a51fb7a795b56f20f3daf71c8c6cf497a8b6a082e3da68 SHA512 e7aa066f218af1f161ac1027b844143061697cf1e8d79b7ee62b62cf84fdcf71761de3c0c9f54a5a8d9038a033f90e98a3800f59252d40e248858f94b745d198
 MISC metadata.xml 323 BLAKE2B bafea289cd876df5467aacfe957ece4a4432d3d93bc8bd4b2bbb78f152fae1b661a0f8a8bc23fe6828a753f9a83c26c97b11378fbb75559cba0ae2417145e44a SHA512 57a0ffd3dd0fa5bfd23de1417c061bd7c2b21c7ded7ddedaf09cd807d9dac8708d3b868d20c0108aa94a228cf8296e45edd6562f7d520760cbf7ee0f25a93509
diff --git a/x11-misc/qxkb/files/qxkb-0.5.1_pre20190821-desktop.patch b/x11-misc/qxkb/files/qxkb-0.5.1_pre20190821-desktop.patch
new file mode 100644
index 000000000000..fcd9cdfb2003
--- /dev/null
+++ b/x11-misc/qxkb/files/qxkb-0.5.1_pre20190821-desktop.patch
@@ -0,0 +1,36 @@
+Fixing QA issue and s/Qt4/Qt5/
+
+ * QA Notice: This package installs one or more .desktop files that do not
+ * pass validation.
+ * 
+ * /usr/share/applications/qxkb.desktop: warning: value "Application;Qt;Utility;"
+ * for key "Categories" in group "Desktop Entry" contains a deprecated value "Application"
+ *
+
+--- a/desktop/qxkb.desktop	2019-08-21 12:55:03.000000000 +0200
++++ b/desktop/qxkb.desktop	2020-04-14 20:16:07.754707291 +0200
+@@ -3,17 +3,17 @@
+ Type=Application
+ Exec=qxkb
+ Terminal=false
+-Categories=Application;Qt;Utility;
++Categories=Qt;Utility;
+ Icon=qxkb
+ Name=QXKB
+ Name[sr]=КјуИксКБ
+ Name[sr@ijekavian]=КјуИксКБ
+-Comment=Qt4-X11 Keyboard  switcher
+-Comment[ru]= Переключатель раскладки на Qt4
+-Comment[sr]=Кјут4-Икс11 пребацивач распореда тастатуре
+-Comment[sr@ijekavian]=Кјут4-Икс11 пребацивач распореда тастатуре
+-Comment[sr@ijekavianlatin]=Qt4-X11 prebacivač rasporeda tastature
+-Comment[sr@latin]=Qt4-X11 prebacivač rasporeda tastature
++Comment=Qt5-X11 Keyboard  switcher
++Comment[ru]= Переключатель раскладки на Qt5
++Comment[sr]=Кјут5-Икс11 пребацивач распореда тастатуре
++Comment[sr@ijekavian]=Кјут5-Икс11 пребацивач распореда тастатуре
++Comment[sr@ijekavianlatin]=Qt5-X11 prebacivač rasporeda tastature
++Comment[sr@latin]=Qt5-X11 prebacivač rasporeda tastature
+ GenericName=Keyboard  switcher
+ GenericName[ru]=Переключатель раскладки
+ GenericName[sr]=Распоред тастатуре
diff --git a/x11-misc/qxkb/qxkb-0.5.1_pre20150305.ebuild b/x11-misc/qxkb/qxkb-0.5.1_pre20150305.ebuild
deleted file mode 100644
index f800ec6daf1b..000000000000
--- a/x11-misc/qxkb/qxkb-0.5.1_pre20150305.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils vcs-snapshot
-
-DESCRIPTION="Qt-based keyboard layout switcher"
-HOMEPAGE="https://github.com/disels/qxkb"
-SRC_URI="https://github.com/disels/qxkb/archive/d7474a06055108c833bbb55b6cdef47e0edfb17d.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11
-	x11-libs/libxkbfile"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	x11-apps/setxkbmap"
-
-src_prepare() {
-	sed -i -e 's:../language:${CMAKE_SOURCE_DIR}/language:' \
-		CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
diff --git a/x11-misc/qxkb/qxkb-0.5.1_pre20190821.ebuild b/x11-misc/qxkb/qxkb-0.5.1_pre20190821.ebuild
new file mode 100644
index 000000000000..740ed9271fbc
--- /dev/null
+++ b/x11-misc/qxkb/qxkb-0.5.1_pre20190821.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT=ee9a1eee9dc810b33b931601203051d841bc3e7a
+inherit cmake
+
+DESCRIPTION="Qt-based keyboard layout switcher"
+HOMEPAGE="https://github.com/disels/qxkb"
+SRC_URI="https://github.com/disels/qxkb/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	x11-libs/libxkbfile
+"
+RDEPEND="${DEPEND}
+	x11-apps/setxkbmap
+"