gentoo resync : 29.12.2022

3 files changed, 85 insertions, 4 deletions

diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
index 64212fec3acf..405539a3c15f 100644
--- a/app-misc/solaar/Manifest
+++ b/app-misc/solaar/Manifest
@@ -2,9 +2,11 @@ DIST solaar-1.0.5.tar.gz 920452 BLAKE2B 44aa0f9abd63629a5a4e737c14e468922c4aa501
 DIST solaar-1.0.7.tar.gz 1265664 BLAKE2B 6bb221d603dc74bf21ac44ca6611d817889285c8711c565b7393b875a934bf9125fc366569c1f677d657463484f2ec5fa077703f311ef2aec74e9f6813a5f1d7 SHA512 24b6b861f90d5747f150afb38b32041885b61cbf7df7794d780b311aef50d334347d5c5c722a0a7d5de3f91b96228e90e2a61dc108054452f46750a04340df83
 DIST solaar-1.1.1.tar.gz 1418025 BLAKE2B c6fd053002727a372bf9672fc22c0acc123f814003c14172f7d13e59b82ab42ecee9b71a09289b2d234874850e0921debaa069506a07d8957f52a2e9953a47f4 SHA512 c4da0c5521724c00afbc54ee9d10a4709246bb6f57635637b77e5944293b285a055b7df623e7e2a810a0764021813929e0f4fa7f21d4afc39abd516416a2bf25
 DIST solaar-1.1.2rc2.tar.gz 1462081 BLAKE2B b5bcf37f75631d39ac726b564bfd7f329f80e9931461fceb5ce7442113df50db82679dabfd08150a87ebe9a9de68aeb111138a005e450c3e025c57e5f1219312 SHA512 65320d7193124d1444ecddf5a162e925f373c7c06d0e582af29b1c9d82ea16a32a69accd53f53568b228474691eacd5c0f16bce1bccef1e9a1846151e86dc203
+DIST solaar-1.1.3.tar.gz 1478166 BLAKE2B 79bfe8a88cecfefc9795d65027f18df5d39c3d43df3e20d3b167bd41365a721ed670e5a60c883b10a2a4cf34d476536003f71d20882e4f30dca590edc441ddeb SHA512 6175d72d8c13b23d0543728315a3d8b5ec506cbaafd821efda92398d640b127d8eb6742c4a22240dca08cdc1ba3ea00e824e2232e41b4fb88ad938dc0df270b8
 EBUILD solaar-1.0.5-r2.ebuild 1776 BLAKE2B 3413685b7eae0f5030f11f6944b36750f53eb2eaf4432c0e505390a3c695141006df4b4a8ddb66a8dae63940e42cf55f63cb0c5662ef4ea2dbdf9f556de2a5f9 SHA512 b153a3897b8e3bb0f442c7f08530c3e676631197c9367b0f6a8575287a83be285796e28854101ef9012910d8b27ab09809f3fae2d890a3f5302e9eaaf8ce4663
 EBUILD solaar-1.0.7.ebuild 1778 BLAKE2B 5b0e5eff7da81d9047095e9f349ceb44a268873f4d971accf763355bc45567aa96d479e867da73d9d2b31291b71d7c70f670d025b3d8007c7d9d293686d55dfa SHA512 59e307e1f0b714e1cdb98a0835fb13a500faceb34ef28bde9da88a15b3056c851a672cdcf19a093f8f17380f5b74bba71134fd215bc87fefb16881560552c6f3
 EBUILD solaar-1.1.1.ebuild 1790 BLAKE2B da70652eab86d1c7d379fb4f465be4dbad75e09d80a82037a7352f21081fa4f77af74ce5ae0067f66cddc2373ffad35628c6a80c7b501918f050901e6bb0381e SHA512 8755bd1a0a06cf23d0d2d7ff2a8986c61521218cece1f839350819adda47567cd46d9a6f5ef480a1cd65eb7ae6669256f060b78c7d06dd55e6f923d9d9714356
 EBUILD solaar-1.1.2_rc2-r1.ebuild 1835 BLAKE2B 4b696545efd662c766eebaa6e157d9f667e028ddf4af82bb35ab0099f853ba71a2be7b79d536026a65970a52628c0313cfa128730f35ee7a246929ced5149010 SHA512 cf99c242f872c427855557094aa69a0a277ab076e0b8a588dd0a7a6dbad475e82d7b34213981a5a880bf672693cc8c337e7d4417d3d6a8b5136305ddfb177caf
-EBUILD solaar-9999.ebuild 1778 BLAKE2B 5b0e5eff7da81d9047095e9f349ceb44a268873f4d971accf763355bc45567aa96d479e867da73d9d2b31291b71d7c70f670d025b3d8007c7d9d293686d55dfa SHA512 59e307e1f0b714e1cdb98a0835fb13a500faceb34ef28bde9da88a15b3056c851a672cdcf19a093f8f17380f5b74bba71134fd215bc87fefb16881560552c6f3
+EBUILD solaar-1.1.3.ebuild 1867 BLAKE2B 26e0372a4d2a9c02ea523e9e59d5e07c0477566e48663b01e0006942d6b629f73e53ce9eaca525b037ffbd4eb6ae9dde52bf5ab113b22da7ffc1a57ab4a01701 SHA512 5a2bf910588bcb9b1d5ee4bec5332ca6fba44cced1d8e56f7dee02cc355203e966f2e1c0729d52b50e4808876a13cfe8c3499b19533ce1ede37e57ef64082da3
+EBUILD solaar-9999.ebuild 1869 BLAKE2B 161c0b58571f4b05f857573085d0fb8d114271144b4d8a40531843cb7f3805a30d3c287c2ea43e8a5adf7fc18d4d792c86e6d1a65af41baca4412a2813c16d8d SHA512 add1c84dc38869c444abcd094c5d5a92088f871909dbc846f5711b75c8d9e7493535c25cc15e5ce027a74270fdd41d98c6a101b6c2799c06e5053051ad893ad8
 MISC metadata.xml 302 BLAKE2B 55938561021d105894875ec5158bd1a744c91039744ff789bffed4ab483eebe73450a9cd62cb4a97c984213fa2f1e8799f8b0d97bd6202e826e4609434086f5e SHA512 3bff70d27a9934d48f848cf0131e01415e13426ea705ef7721a9b59e29ff7bf32718d015de9e4a4f89f23405a8f372f038d2f0c3485cf9a7939a33ebda9d1681
diff --git a/app-misc/solaar/solaar-1.1.3.ebuild b/app-misc/solaar/solaar-1.1.3.ebuild
new file mode 100644
index 000000000000..43b1bbbd8532
--- /dev/null
+++ b/app-misc/solaar/solaar-1.1.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit linux-info udev xdg distutils-r1
+
+DESCRIPTION="Linux Device Manager for Logitech Unifying Receivers and Paired Devices"
+HOMEPAGE="https://pwr-solaar.github.io/Solaar/"
+if [[ ${PV} =~ 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/pwr-Solaar/Solaar"
+else
+	SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV/_rc/rc}.tar.gz -> ${P/_rc/rc}.tar.gz"
+	KEYWORDS="amd64 ~arm x86"
+	S="${WORKDIR}"/Solaar-${PV/_rc/rc}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc appindicator libnotify"
+
+RDEPEND="
+	acct-group/plugdev
+	$(python_gen_cond_dep '
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/python-evdev[${PYTHON_USEDEP}]
+		dev-python/python-xlib[${PYTHON_USEDEP}]
+		>=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+
+	')
+	x11-libs/gtk+:3[introspection]
+	appindicator? ( dev-libs/libappindicator:3[introspection] )
+	libnotify? ( x11-libs/libnotify[introspection] )"
+# libappindicator & libnotify are entirely optional and detected at runtime
+
+CONFIG_CHECK="~HID_LOGITECH_DJ ~HIDRAW"
+
+python_prepare_all() {
+	# don't autostart (bug #494608)
+	sed -i \
+		-e '/yield autostart_path/d' \
+		setup.py || die
+
+	sed -i -r \
+		-e '/yield.*udev.*rules.d/{s,/etc,/lib,g}' \
+		setup.py || die
+
+	# grant plugdev group rw access
+	sed -i 's/#MODE=/MODE=/' rules.d/42-logitech-unify-permissions.rules || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodoc docs/devices.md ChangeLog.md
+	if use doc; then
+		dodoc -r docs/*
+	else
+		newdoc docs/index.md README.md
+	fi
+	udev_dorules "${S}"/rules.d/42-logitech-unify-permissions.rules
+}
+
+pkg_postinst() {
+	udev_reload
+}
diff --git a/app-misc/solaar/solaar-9999.ebuild b/app-misc/solaar/solaar-9999.ebuild
index cad0500253bc..502ef240ea40 100644
--- a/app-misc/solaar/solaar-9999.ebuild
+++ b/app-misc/solaar/solaar-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit linux-info udev xdg distutils-r1
 
@@ -28,6 +28,7 @@ RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/python-evdev[${PYTHON_USEDEP}]
 		dev-python/python-xlib[${PYTHON_USEDEP}]
 		>=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -59,7 +60,7 @@ python_prepare_all() {
 python_install_all() {
 	distutils-r1_python_install_all
 
-	dodoc docs/devices.md
+	dodoc docs/devices.md ChangeLog.md
 	if use doc; then
 		dodoc -r docs/*
 	else
@@ -67,3 +68,7 @@ python_install_all() {
 	fi
 	udev_dorules "${S}"/rules.d/42-logitech-unify-permissions.rules
 }
+
+pkg_postinst() {
+	udev_reload
+}