[gentoo-commits] repo/gentoo:master commit in: app-misc/solaar/

[Robin H. Johnson]

commit:     6a1f6fd561751cb8b9b6a08f914df91c245de751
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri May 22 04:42:08 2020 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri May 22 04:42:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a1f6fd5

app-misc/solaar: bump to 1.0.2 final version

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 app-misc/solaar/Manifest                           |  1 +
 ...solaar-1.0.2_rc2.ebuild => solaar-1.0.2.ebuild} | 11 +++--
 app-misc/solaar/solaar-1.0.2_rc1.ebuild            | 49 --------------------
 app-misc/solaar/solaar-1.0.2_rc3.ebuild            | 53 ----------------------
 4 files changed, 9 insertions(+), 105 deletions(-)

diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
index f54ebd2ef11..34f28dd67a4 100644
--- a/app-misc/solaar/Manifest
+++ b/app-misc/solaar/Manifest
@@ -1,4 +1,5 @@
 DIST solaar-1.0.1.tar.gz 1195660 BLAKE2B e6cd89b5735e125dd438255a8961b1d5d38feb515c5097efec0403d99b9db6e29c439c13e279fcffe69cb314bf2650a7a11770830fdf1e971ade27ce8331aed2 SHA512 e0b2bbfd97d9650d94f1a4b47e4e70f09c75f684e7e1d3e67d2cf6dd197109084e941b98333e173fb205d5c9464dd07e17390d9c2d5b46393fee2efdb20429ac
 DIST solaar-1.0.2-rc1.tar.gz 1219777 BLAKE2B aa6780aa4748de97c69c03263e731a47068844e7f4275f87eadd3251e8dcf14b82fdd5ba0eae13492634b7d252340a01b9492cc8948f78fb86c15b4bc4698789 SHA512 1aa5a066c8b735e6525da4da738e9632107867e3d70d67fe7e643debdc9dc7969b033d618ff2c3f538095a9995a7e90d068f9d0f41e858361327c75718dbdb12
+DIST solaar-1.0.2.tar.gz 1540722 BLAKE2B 66c6f7c347f5eba538d3d48ff1c1137c1c71bf84dfb1a306a94e3cb24810378864066644a82d27eaaee2d80d30bcd30bb71ebe80fdb12363e9b194df9054946d SHA512 5f97b51e7853386311c5b9ff968a72529d55837f7262786e86085e130d219ac22095c20c984e340f619a15b8242f90e66a6c678c5e0c507c261d0430b74eacd6
 DIST solaar-1.0.2rc2.tar.gz 1212725 BLAKE2B e43dcd013e4251e7450079cafa34e171d10e0144e2b736148a90052e4b2dfed76d6b2c0048a848bb2449febff312d3c058ad03e32f0bdede04cb418adf9d030a SHA512 33a63bc8405a4d48d4dc834d22c0376119a6f611067cd14eaa815503e120a2d877a4f73362aa53bc857aef9626d82413619b1e9a748b9b8bbed0828146c64342
 DIST solaar-1.0.2rc3.tar.gz 1212831 BLAKE2B 5559a0e3a75252914080da7d87739bd8ea867eb09e2a80e31c4057626060c841a60501ac4fcf0f58489e67bed71067c25594ca2250fa961607ba25211350eeab SHA512 fde0533cc5278a831f309e76d449f33b987621d45025879ab1fc9f908073f661e10d6ef030d8455bbc5ca0e82e25f4bb7de1a54327c4b1ecaada08796f46f2e4

diff --git a/app-misc/solaar/solaar-1.0.2_rc2.ebuild b/app-misc/solaar/solaar-1.0.2.ebuild
similarity index 75%
rename from app-misc/solaar/solaar-1.0.2_rc2.ebuild
rename to app-misc/solaar/solaar-1.0.2.ebuild
index 5a5a4947822..f9fa3d13bee 100644
--- a/app-misc/solaar/solaar-1.0.2_rc2.ebuild
+++ b/app-misc/solaar/solaar-1.0.2.ebuild
@@ -8,20 +8,23 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit linux-info udev xdg distutils-r1
 
-DESCRIPTION="A Linux device manager for Logitech's Unifying Receiver peripherals"
+DESCRIPTION="Linux Device Manager for Logitech Unifying Receivers and Paired Devices"
 HOMEPAGE="https://pwr-solaar.github.io/Solaar/"
 SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV/_rc/rc}.tar.gz -> ${P/_rc/rc}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc"
+IUSE="doc appindicator libnotify"
 
 RDEPEND="
 	acct-group/plugdev
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	>=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]"
+	x11-libs/gtk+:3[introspection]
+	appindicator? ( dev-libs/libappindicator:3 )
+	libnotify? ( x11-libs/libnotify )"
+# libappindicator & libnotify are entirely optional and detected at runtime
 
 S="${WORKDIR}"/Solaar-${PV/_rc/rc}
 
@@ -49,5 +52,7 @@ python_install_all() {
 	dodoc docs/devices.md
 	if use doc; then
 		dodoc -r docs/*
+	else
+		newdoc docs/index.md README.md
 	fi
 }

diff --git a/app-misc/solaar/solaar-1.0.2_rc1.ebuild b/app-misc/solaar/solaar-1.0.2_rc1.ebuild
deleted file mode 100644
index d4a89545dd8..00000000000
--- a/app-misc/solaar/solaar-1.0.2_rc1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit linux-info udev xdg distutils-r1
-
-DESCRIPTION="A Linux device manager for Logitech's Unifying Receiver peripherals"
-HOMEPAGE="https://pwr-solaar.github.io/Solaar/"
-SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV/_rc/-rc}.tar.gz -> ${P/_rc/-rc}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc"
-
-RDEPEND="
-	acct-group/plugdev
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]"
-
-S="${WORKDIR}"/Solaar-${PV/_rc/-rc}
-
-CONFIG_CHECK="~HID_LOGITECH_DJ ~HIDRAW"
-
-python_prepare_all() {
-	# don't autostart (bug #494608)
-	sed -i '/yield autostart_path/d' 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
-
-	udev_dorules rules.d/*.rules
-
-	dodoc docs/devices.md
-	if use doc; then
-		dodoc -r docs/*
-	fi
-}

diff --git a/app-misc/solaar/solaar-1.0.2_rc3.ebuild b/app-misc/solaar/solaar-1.0.2_rc3.ebuild
deleted file mode 100644
index 5a5a4947822..00000000000
--- a/app-misc/solaar/solaar-1.0.2_rc3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit linux-info udev xdg distutils-r1
-
-DESCRIPTION="A Linux device manager for Logitech's Unifying Receiver peripherals"
-HOMEPAGE="https://pwr-solaar.github.io/Solaar/"
-SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV/_rc/rc}.tar.gz -> ${P/_rc/rc}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc"
-
-RDEPEND="
-	acct-group/plugdev
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]"
-
-S="${WORKDIR}"/Solaar-${PV/_rc/rc}
-
-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
-	if use doc; then
-		dodoc -r docs/*
-	fi
-}