From 1e8fac87077ff08bea267a1af94e33eb5fc39e96 Mon Sep 17 00:00:00 2001
From: Marcin Deranek <marcin.deranek@booking.com>
Date: Thu, 20 Feb 2020 20:10:05 +0100
Subject: Synced ebuild

---
 app-misc/solaar/Manifest           |  2 +-
 app-misc/solaar/solaar-9999.ebuild | 37 ++++++++++++++-----------------------
 2 files changed, 15 insertions(+), 24 deletions(-)

(limited to 'app-misc')

diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
index 5927d28..b8b77a0 100644
--- a/app-misc/solaar/Manifest
+++ b/app-misc/solaar/Manifest
@@ -1 +1 @@
-EBUILD solaar-9999.ebuild 1498 BLAKE2B 7b344e3bbfe21333bd1c4053f3477a89f8884289571d2969a034ac9209a84b0534b9bebcaa3e82be20c5282357d1102c0b0778a5a51bfdeff4aca06bd899df7a SHA512 4614862b2527e9f8855ee3c9aaeb480089623e4ef1b099660b37adf332b53b1b8b348d0556c0f2dabd1eaa81dc5122c9fa5ca0873a4430a899aff3207055c82a
+EBUILD solaar-9999.ebuild 1276 BLAKE2B 19d95ce91ad782ccd956b6fa38508c14d6bbc35d4757eb64a06a3dc618b9da372f3170872f9af3f48b5d5a413dd8f6db282f150c037abd84b2a43de4178a07a6 SHA512 ff1bcda8363d52eb4adc342a305ba85b626320f3be5c47265d4c333242d06b7a8d55dfd4860e08cdda4941d4fce5f1b7c8b5b3cfaf619979f3885d65ecf68c27
diff --git a/app-misc/solaar/solaar-9999.ebuild b/app-misc/solaar/solaar-9999.ebuild
index 57031af..8ccec31 100644
--- a/app-misc/solaar/solaar-9999.ebuild
+++ b/app-misc/solaar/solaar-9999.ebuild
@@ -1,32 +1,36 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+EAPI=7
 
-inherit distutils-r1 udev user linux-info gnome2-utils
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit linux-info udev xdg distutils-r1
 
 if [[ ${PV} == *9999 ]] ; then
-    EGIT_REPO_URI="https://github.com/pwr/Solaar"
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/pwr-Solaar/Solaar"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/Solaar-${PV}"
-    inherit git-r3
 else
-    SRC_URI="https://github.com/pwr/Solaar/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 DESCRIPTION="A Linux device manager for Logitech's Unifying Receiver peripherals"
-HOMEPAGE="https://pwr.github.com/Solaar/"
+HOMEPAGE="https://pwr-solaar.github.io/Solaar/"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 IUSE="doc"
 
-RDEPEND=">=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
+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}
+S="${WORKDIR}"/Solaar-${PV}
 
 CONFIG_CHECK="~HID_LOGITECH_DJ ~HIDRAW"
 
@@ -50,16 +54,3 @@ python_install_all() {
 		dodoc -r docs/*
 	fi
 }
-
-pkg_postinst() {
-	enewgroup plugdev
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Users must be in the plugdev group to use this application."
-	fi
-
-	gnome2_icon_cache_update
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postrm() { gnome2_icon_cache_update; }
-- 
cgit v1.2.3