1 |
commit: 72b0331ed080bebd6dc76534540bb8f96c0f0461 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 27 19:22:25 2021 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 27 19:26:10 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72b0331e |
7 |
|
8 |
app-misc/solaar: Convert to PYTHON_SINGLE_TARGET |
9 |
|
10 |
... and fix libnotify/libappindicator dependencies and add Python 3.9 |
11 |
compatibility and sync from 1.0.3_rc1. Sigh. |
12 |
|
13 |
Closes: https://bugs.gentoo.org/732172 |
14 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
15 |
|
16 |
app-misc/solaar/solaar-9999.ebuild | 38 +++++++++++++++++++++++++------------- |
17 |
1 file changed, 25 insertions(+), 13 deletions(-) |
18 |
|
19 |
diff --git a/app-misc/solaar/solaar-9999.ebuild b/app-misc/solaar/solaar-9999.ebuild |
20 |
index 8b13996f6d3..0e6648c5ddf 100644 |
21 |
--- a/app-misc/solaar/solaar-9999.ebuild |
22 |
+++ b/app-misc/solaar/solaar-9999.ebuild |
23 |
@@ -1,39 +1,50 @@ |
24 |
-# Copyright 1999-2020 Gentoo Authors |
25 |
+# Copyright 1999-2021 Gentoo Authors |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
|
28 |
EAPI=7 |
29 |
|
30 |
-DISTUTILS_USE_SETUPTOOLS=no |
31 |
-PYTHON_COMPAT=( python3_{7,8} ) |
32 |
+DISTUTILS_SINGLE_IMPL=1 |
33 |
+PYTHON_COMPAT=( python3_{7..9} ) |
34 |
|
35 |
inherit linux-info udev xdg distutils-r1 |
36 |
|
37 |
-DESCRIPTION="A Linux device manager for Logitech's Unifying Receiver peripherals" |
38 |
+DESCRIPTION="Linux Device Manager for Logitech Unifying Receivers and Paired Devices" |
39 |
HOMEPAGE="https://pwr-solaar.github.io/Solaar/" |
40 |
if [[ ${PV} =~ 9999* ]]; then |
41 |
inherit git-r3 |
42 |
EGIT_REPO_URI="https://github.com/pwr-Solaar/Solaar" |
43 |
else |
44 |
- SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV}.tar.gz -> ${P}.tar.gz" |
45 |
+ SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV/_rc/rc}.tar.gz -> ${P/_rc/rc}.tar.gz" |
46 |
KEYWORDS="~amd64 ~arm ~x86" |
47 |
- S="${WORKDIR}"/Solaar-${PV} # hopefully upstream fixes this in future packaging |
48 |
+ S="${WORKDIR}"/Solaar-${PV/_rc/rc} |
49 |
fi |
50 |
|
51 |
LICENSE="GPL-2" |
52 |
SLOT="0" |
53 |
-IUSE="doc" |
54 |
+IUSE="doc appindicator libnotify" |
55 |
|
56 |
RDEPEND=" |
57 |
acct-group/plugdev |
58 |
- dev-python/pygobject:3[${PYTHON_USEDEP}] |
59 |
- >=dev-python/pyudev-0.13[${PYTHON_USEDEP}] |
60 |
- x11-libs/gtk+:3[introspection]" |
61 |
+ $(python_gen_cond_dep ' |
62 |
+ dev-python/pygobject:3[${PYTHON_USEDEP}] |
63 |
+ >=dev-python/pyudev-0.13[${PYTHON_USEDEP}] |
64 |
+ ') |
65 |
+ x11-libs/gtk+:3[introspection] |
66 |
+ appindicator? ( dev-libs/libappindicator:3[introspection] ) |
67 |
+ libnotify? ( x11-libs/libnotify[introspection] )" |
68 |
+# libappindicator & libnotify are entirely optional and detected at runtime |
69 |
|
70 |
CONFIG_CHECK="~HID_LOGITECH_DJ ~HIDRAW" |
71 |
|
72 |
python_prepare_all() { |
73 |
# don't autostart (bug #494608) |
74 |
- sed -i '/yield autostart_path/d' setup.py || die |
75 |
+ sed -i \ |
76 |
+ -e '/yield autostart_path/d' \ |
77 |
+ setup.py || die |
78 |
+ |
79 |
+ sed -i -r \ |
80 |
+ -e '/yield.*udev.*rules.d/{s,/etc,/lib,g}' \ |
81 |
+ setup.py || die |
82 |
|
83 |
# grant plugdev group rw access |
84 |
sed -i 's/#MODE=/MODE=/' rules.d/42-logitech-unify-permissions.rules || die |
85 |
@@ -44,10 +55,11 @@ python_prepare_all() { |
86 |
python_install_all() { |
87 |
distutils-r1_python_install_all |
88 |
|
89 |
- udev_dorules rules.d/*.rules |
90 |
- |
91 |
dodoc docs/devices.md |
92 |
if use doc; then |
93 |
dodoc -r docs/* |
94 |
+ else |
95 |
+ newdoc docs/index.md README.md |
96 |
fi |
97 |
+ udev_dorules "${S}"/rules.d/42-logitech-unify-permissions.rules |
98 |
} |