gentoo resync : 30.05.2020

3 files changed, 10 insertions, 56 deletions

diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
index 8c1b01b319db..75807e848a73 100644
--- a/app-misc/solaar/Manifest
+++ b/app-misc/solaar/Manifest
@@ -1,8 +1,6 @@
 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.2rc2.tar.gz 1212725 BLAKE2B e43dcd013e4251e7450079cafa34e171d10e0144e2b736148a90052e4b2dfed76d6b2c0048a848bb2449febff312d3c058ad03e32f0bdede04cb418adf9d030a SHA512 33a63bc8405a4d48d4dc834d22c0376119a6f611067cd14eaa815503e120a2d877a4f73362aa53bc857aef9626d82413619b1e9a748b9b8bbed0828146c64342
+DIST solaar-1.0.2.tar.gz 1540722 BLAKE2B 66c6f7c347f5eba538d3d48ff1c1137c1c71bf84dfb1a306a94e3cb24810378864066644a82d27eaaee2d80d30bcd30bb71ebe80fdb12363e9b194df9054946d SHA512 5f97b51e7853386311c5b9ff968a72529d55837f7262786e86085e130d219ac22095c20c984e340f619a15b8242f90e66a6c678c5e0c507c261d0430b74eacd6
 EBUILD solaar-1.0.1-r1.ebuild 1120 BLAKE2B 8a22d0162004e2661426dea055b69bda82f0848aa9aaf5f3a2de1ec0b4af32d01b0fa5108730f4fed66717ec590bd5712fc7666a04610f8a5fc96291d30ed412 SHA512 a8413ffcd2d4a8348c047fff7b26f1bc3c200c2c6f2648b08195a513acac878fe27e3569f9a970ee38510dbcaba46ede35fec7e55771dc01b20522a99b3efa25
-EBUILD solaar-1.0.2_rc1.ebuild 1146 BLAKE2B 38f7354bde1165b0a6d4e468042c1a0838576b4903b732191f229a80bb444408254ad5e3cf94ac4fa553dffae5a98e9c58ae0d34bde462ec9c1f09d348f04dcb SHA512 a561708aa11f7a564c2e8d330a6d66bd101362ad65a0e2dab752dc2d3d572e4fd5bf348e7b58104a7ed34a377790ad34efab54d3b9cb1d957f7835730399a1ec
-EBUILD solaar-1.0.2_rc2.ebuild 1204 BLAKE2B bc659b130937dd68ce927acde0e75c223a63d88c2f8118fbb87be3d0ddc27330634ced6d87ace2c9b6bd55ac498bb48927ff2c3dd86c956d4f9f768c44974a72 SHA512 e171ce0f46b1273e7a98a35c7f07127edbe0c854dc7d7f1a90b9c43c234718cedc25a0688bc5429097d05555920125fcdb58102c7f8f5c5df47c9253d7a197f0
+EBUILD solaar-1.0.2.ebuild 1427 BLAKE2B 9730b21134fae5a9e5422a75a59d048e48acb737c5cbb2bea2ae0b2155f9d087debdbbaf4f20a61ecccef4d69eed75e27873bccca62df31e606e8a9c779cd965 SHA512 4895d4655540ed37c33329078df9a0dbc4387633ef7ea800f0d54854a87e793ac2e51c7808945d1751904a76e5584ab2fd9f3c1c563409d6d64bd2f27799308f
 EBUILD solaar-9999.ebuild 1284 BLAKE2B 516fe9ad4b43027e0e7c8cbe2eb93cc4beaec67cd973e82ef71d11fa34d188c12eea5e568ae8a469bd31b7211d3ba2e8407d8f6fa38acace4ad9032588e968a6 SHA512 0f59c7ea6fd2c63d65e68d712f0e78dfd741942bdb36e8b00a32b7e8c1486ed2fb93504429e80552544b37461baf3e3b79d84c476bd7f3f78563709de7570433
 MISC metadata.xml 301 BLAKE2B e1a95f23856b0daa09eba917e05537d4e423ca5d36ef0af029c240cff5186125868c54bf70981005b9b26bc57d5d6118972836ef4ecc1dc73131b46da9106724 SHA512 8af96a19368452eb3396e6d33ed62f4702d82d99995cf09cd55da5d55154e43422f3da527ca2101ee352392af2be5e5a521d254b99682184d68ade9da1196acb
diff --git a/app-misc/solaar/solaar-1.0.2_rc2.ebuild b/app-misc/solaar/solaar-1.0.2.ebuild
index 5a5a4947822e..f9fa3d13bee0 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 d4a89545dd84..000000000000
--- 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
-}