gentoo resync : 08.10.2021

4 files changed, 61 insertions, 4 deletions

diff --git a/net-wireless/qdmr/Manifest b/net-wireless/qdmr/Manifest
index 01c3d5d24662..1275f0e2de13 100644
--- a/net-wireless/qdmr/Manifest
+++ b/net-wireless/qdmr/Manifest
@@ -1,4 +1,6 @@
 DIST qdmr-0.8.1.tar.gz 3870631 BLAKE2B 3be78a398a41cb105abac07b2a3c3ddaf0a5e51b5af855860c5ea06a407447d71ae89d4f3be5d46ba8fd50c38baec42663977373c643813f4db193ab034cfb88 SHA512 068eaad49393dca4384146b5254342d57921fd2e3f972057dd0f6abc1f8ce1412ae544ab09f50ce0ffa50f48f7fb2145fc36e82c2c8f9cf534fedb60e947130d
-EBUILD qdmr-0.8.1.ebuild 1260 BLAKE2B ea10e5ff44058bf706f3d97707b6a8435313c03776c817641f2160b9e4161dbeb2a4daeef5484653c15273f2f80faef73d1b7c8ddf947e9685cb4856cbd3a9fd SHA512 af845fa5ef65d9ffd79b77b54ef87e68702cdc01fc4fa5ce55adbf4c136b72752881f6b3cea06dc1ec6709a7c1e49be31ed7f773566b1303b59b2a5815c5bb58
-EBUILD qdmr-9999.ebuild 1260 BLAKE2B ea10e5ff44058bf706f3d97707b6a8435313c03776c817641f2160b9e4161dbeb2a4daeef5484653c15273f2f80faef73d1b7c8ddf947e9685cb4856cbd3a9fd SHA512 af845fa5ef65d9ffd79b77b54ef87e68702cdc01fc4fa5ce55adbf4c136b72752881f6b3cea06dc1ec6709a7c1e49be31ed7f773566b1303b59b2a5815c5bb58
+DIST qdmr-0.9.0_alpha2.tar.gz 5560663 BLAKE2B dfbc09001990ed7b464ea7f58e8528d9c5c3ec890cdb8d0859a7f79f3cf2567b9c6fbaa81cf0fc7474320e200f1de98807c2f5232261261fd3f9950723ab6e70 SHA512 51c31ea3985d9e22437f5e4543633f4b0c866e0875152c65fc3dba429a650c013bd3b81425d373768a4e26783ccffd7339430087c1f0a3a756b041c0bd87ed6f
+EBUILD qdmr-0.8.1.ebuild 1258 BLAKE2B 39b8677ddda9f3917bc9cd113960dd4fa7358eecfe7196e5bb3267d32d85cba420de00dcf75d78e9cb6527d523fdd1f9a924f44159f7369ecb900c789d15d6b4 SHA512 8486f6f701abf48abfdcf1ed30d95b4bde8be46fab6f31313394ffe4a5ee99fea7da8f4d20a174954d2038fd369b0837f6677c53a8453ef3e137cd1dd415009a
+EBUILD qdmr-0.9.0_alpha2.ebuild 1333 BLAKE2B ca4c64386d6deb373b18ad7b13c73c28a34af22e0205d5a0bafca86f9e81db144d1808e2136147076cee62a34f0d04cb3b7176b3a04e8bb811d5321a00a3c04a SHA512 d75c019dcb65af2bc49ea8d380a646749e2d36e942549d5b852af2fcaff1512158efd2767f1addd351d1ebbcfb643222e26b09920ff049354ef0a7eee0ae31db
+EBUILD qdmr-9999.ebuild 1333 BLAKE2B ca4c64386d6deb373b18ad7b13c73c28a34af22e0205d5a0bafca86f9e81db144d1808e2136147076cee62a34f0d04cb3b7176b3a04e8bb811d5321a00a3c04a SHA512 d75c019dcb65af2bc49ea8d380a646749e2d36e942549d5b852af2fcaff1512158efd2767f1addd351d1ebbcfb643222e26b09920ff049354ef0a7eee0ae31db
 MISC metadata.xml 319 BLAKE2B 1ce9d4701527c9ba9f8d990413aa07b22bea984360611162da0baa235a71fffcd16fe13cd5ce6c8f4192e9533e0886358f40890756d9220cae5a6d6af7e903fb SHA512 b59a65526d21586cc142876a59fea232d8d8e34cc9faf85a05b17b45ea3e98383e3e4be92d639e489ec5c62c74c53253a4de26adf4151b877135c754cb08de70
diff --git a/net-wireless/qdmr/qdmr-0.8.1.ebuild b/net-wireless/qdmr/qdmr-0.8.1.ebuild
index 21f42f59eb72..c17d694d921a 100644
--- a/net-wireless/qdmr/qdmr-0.8.1.ebuild
+++ b/net-wireless/qdmr/qdmr-0.8.1.ebuild
@@ -12,7 +12,7 @@ if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/hmatuschek/qdmr.git"
 else
 	SRC_URI="https://github.com/hmatuschek/qdmr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/net-wireless/qdmr/qdmr-0.9.0_alpha2.ebuild b/net-wireless/qdmr/qdmr-0.9.0_alpha2.ebuild
new file mode 100644
index 000000000000..d80ff7599869
--- /dev/null
+++ b/net-wireless/qdmr/qdmr-0.9.0_alpha2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake udev linux-info
+
+DESCRIPTION="GUI application for configuring and programming cheap DMR radios"
+HOMEPAGE="https://dm3mat.darc.de/qdmr/"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hmatuschek/qdmr.git"
+else
+	MY_PV="${PV/_/-}"
+	SRC_URI="https://github.com/hmatuschek/qdmr/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	dev-cpp/yaml-cpp:=
+	dev-qt/designer:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtgui:5
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtpositioning:5
+	dev-qt/qtserialport:5
+	virtual/libusb:1
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+BDEPEND=""
+
+pkg_setup() {
+	CONFIG_CHECK="~USB_ACM"
+	WARNING_USB_ACM="Some radios require CONFIG_USB_ACM to work, you may need to enable this driver to talk to your radio"
+	CONFIG_CHECK="~USB_SERIAL"
+	WARNING_USB_SERIAL="Some radios require CONFIG_USB_SERIAL to work, you may need to enable this driver to talk to your radio"
+	check_extra_config
+}
+
+src_prepare() {
+	#no devil perms
+	sed -i 's#666#660#' dist/99-qdmr.rules
+	sed -i "s#/etc/udev/rules.d/#$(get_udevdir)/rules.d#" lib/CMakeLists.txt
+	cmake_src_prepare
+}
diff --git a/net-wireless/qdmr/qdmr-9999.ebuild b/net-wireless/qdmr/qdmr-9999.ebuild
index 21f42f59eb72..d80ff7599869 100644
--- a/net-wireless/qdmr/qdmr-9999.ebuild
+++ b/net-wireless/qdmr/qdmr-9999.ebuild
@@ -11,7 +11,9 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/hmatuschek/qdmr.git"
 else
-	SRC_URI="https://github.com/hmatuschek/qdmr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	MY_PV="${PV/_/-}"
+	SRC_URI="https://github.com/hmatuschek/qdmr/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -19,6 +21,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 
 RDEPEND="
+	dev-cpp/yaml-cpp:=
 	dev-qt/designer:5
 	dev-qt/qttest:5
 	dev-qt/qtwidgets:5