gentoo resync : 30.05.2020

9 files changed, 3 insertions, 186 deletions

diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index 10da690ead8b..d30cdbdc4299 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/batti/Manifest b/app-laptop/batti/Manifest
deleted file mode 100644
index c95664c117e2..000000000000
--- a/app-laptop/batti/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX batti-0.3.8-upower-0.99.patch 1248 BLAKE2B e653700d3fd4fc07f1344809ae2f7ff7eee449b812d25fca502e573d320456a3a7b3bc018f710ec8fd9e32f480c6ccc0824eef58490a11a057b7e98bea06147e SHA512 172036b2d5f63c37d26a9542e9348b469c2df4e1380fa3ff4c13883e3a295963c569230b32a36eba14f70e37f87dfc2fcfe03e98406a335749f2d0234c5d30be
-AUX batti-0.3.8-upower-capital.patch 1409 BLAKE2B 30f3667c5927986b4dbd63d4beccc9b59506f51bfb1e8cefae5bb59adaae7994bd4a64b6939417b230859967b29ad525a27772979d4bf65d687d4887a9942b3e SHA512 6b0f0fafe7443338b9af69156476fdbe231054010ec1ac17dada5c9f68c23477f50bc32d450cf7b3af5c2d012d3264aff4a74630ea2543e500c1f5c95534f1b6
-DIST batti-0.3.8.tar.gz 59783 BLAKE2B cba35af1d8d3e5f2e44e27eb2727fc2115d89d5ff79bd54f263a25678c4a5d9d87da685905f85c3d47bdeeeba164bb0dce09082adb211acc51a02ec514e0122a SHA512 39e0085a13847359eb555eff80c3f3b166775558fba3c76ecb4315786e2ce4307d21dcac5fab38da4ee3cc2035356906eb1354ced56a1f007735029e0484a4de
-EBUILD batti-0.3.8-r4.ebuild 930 BLAKE2B 1dd6ac4847fe3b04efeda22bc1ab84337f48a1fdd5e94e6bcac99188d78b127875b68b47069f63937d7eae6c520eb5620368e90a3435f208e4c620c23a4cc76b SHA512 59e8aa542522a6f292d51afef9e4048353efc745023900d4c034317b3f2231d28f9e868fd98c31f61e0bb63c4013b9927586e91f46bebf9fc967d7f804a32d22
-MISC metadata.xml 323 BLAKE2B 9a3aaf09e7b171dcf71d85c4ebd4249059d76a51bdeb036cb919c73fbecfb7aeb884857529ca6c8ba66746369f2113d4077371b28159a81c1d6339d3ff75c4a3 SHA512 7b3c4c3895e87916db14eb4d611dea5be29d2d1846ee9ec47f56abba20b31091c834f3d5562a57b4fb828e2866f9c6e64ba9f57d25bcf7a2195bca2f7363c5aa
diff --git a/app-laptop/batti/batti-0.3.8-r4.ebuild b/app-laptop/batti/batti-0.3.8-r4.ebuild
deleted file mode 100644
index 2b1697948b2b..000000000000
--- a/app-laptop/batti/batti-0.3.8-r4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="A upower based battery monitor for the system tray, similar to batterymon"
-HOMEPAGE="https://code.google.com/p/batti-gtk/"
-SRC_URI="https://batti-gtk.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libnotify"
-
-RDEPEND="
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	sys-power/upower
-	x11-themes/hicolor-icon-theme
-	libnotify? ( x11-libs/libnotify )
-"
-DEPEND=""
-
-src_prepare() {
-	default
-	if has_version ">=sys-power/upower-0.99"; then
-		eapply "${FILESDIR}/${P}-upower-0.99.patch"
-		eapply "${FILESDIR}/${P}-upower-capital.patch"
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-laptop/batti/files/batti-0.3.8-upower-0.99.patch b/app-laptop/batti/files/batti-0.3.8-upower-0.99.patch
deleted file mode 100644
index 6f313a594c94..000000000000
--- a/app-laptop/batti/files/batti-0.3.8-upower-0.99.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Naur batti-0.3.8.orig/src/PowerBackend.py batti-0.3.8/src/PowerBackend.py
---- batti-0.3.8.orig/src/PowerBackend.py	2014-04-15 19:30:34.123260000 +0200
-+++ batti-0.3.8/src/PowerBackend.py	2014-04-15 19:32:11.859168509 +0200
-@@ -180,17 +180,6 @@
-         
-         properties = dbus.Interface(iface, 'org.freedesktop.DBus.Properties')
- 
--        if properties.Get(self.dbus_interface, 'CanSuspend'):
--            self.__can_suspend = True
--        else:
--            self.__can_suspend = False
--        
--        if properties.Get(self.dbus_interface, 'CanHibernate'):
--            self.__can_hibernate = True
--        else:
--            self.__can_hibernate = False
--    
--    
-     def __get_interface(self):
-         dkit_obj = self.__bus.get_object(self.dbus_service, self.dbus_object)
-         return dbus.Interface(dkit_obj, self.dbus_interface)
-@@ -201,12 +190,6 @@
-             self.__mc_action(widget, event, data)
-             
-          
--    def can_suspend(self):   
--        return self.__can_suspend and self.__get_interface().SuspendAllowed()
--
--    def can_hibernate(self):
--        return self.__can_hibernate and self.__get_interface().HibernateAllowed()
--
-     def suspend(self):
-         self.__get_interface().Suspend()
- 
diff --git a/app-laptop/batti/files/batti-0.3.8-upower-capital.patch b/app-laptop/batti/files/batti-0.3.8-upower-capital.patch
deleted file mode 100644
index e7f62761661c..000000000000
--- a/app-laptop/batti/files/batti-0.3.8-upower-capital.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1e0fe57a93ed3996bad295e20eeda81f6af483af Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Wed, 20 Jul 2016 20:14:32 +0200
-Subject: [PATCH] The type property (in recent UPower at least) needs to have a
- capital T - "Type"
-
----
- src/PowerBackend.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/PowerBackend.py b/src/PowerBackend.py
-index e020b98..56bcb61 100644
---- a/src/PowerBackend.py
-+++ b/src/PowerBackend.py
-@@ -165,7 +165,7 @@ def __init__(self):
-         self.__batteries = {}
-         for dev in devices:
-             (prop_iface, dev_iface) = self.__get_battery(dev)
--            type = prop_iface.Get(self.device_interface, 'type')
-+            type = prop_iface.Get(self.device_interface, 'Type')
-             if type == self.bat_type:
-                 power_bat = UPowerBattery(prop_iface, dev_iface)
-                 self.__batteries[dev] = power_bat
-@@ -228,7 +228,7 @@ def set_right_popup_menu_action(self, action):
-     def __device_added(self, udi):
-         (prop_iface, dev_iface) = self.__get_battery(udi)
-         try:
--            type = prop_iface.Get(self.device_interface, 'type')
-+            type = prop_iface.Get(self.device_interface, 'Type')
-             if type == self.bat_type:
-                 power_bat = UPowerBattery(prop_iface, dev_iface)
-                 power_bat.set_left_popup_menu_action(self.__mc_action)
diff --git a/app-laptop/batti/metadata.xml b/app-laptop/batti/metadata.xml
deleted file mode 100644
index c26d102ee702..000000000000
--- a/app-laptop/batti/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>naota@gentoo.org</email>
-		<name>Naohiro Aota</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">batti-gtk</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-laptop/i8kutils/Manifest b/app-laptop/i8kutils/Manifest
index 74436fbdda4d..4d5ba741294e 100644
--- a/app-laptop/i8kutils/Manifest
+++ b/app-laptop/i8kutils/Manifest
@@ -3,8 +3,6 @@ AUX i8k.init-r1 1216 BLAKE2B b8e2dbb0cb343b751deaacda9a7f57646c27fc501669980e20e
 AUX i8kmon.service 158 BLAKE2B e567398b719557fffc6b4a244e4528d6147e8406db59d4cca39d531e88a04be5e4154971f15ed9db24d7f8ebfef103ea78cdaa4aeae356823045f7012782cf39 SHA512 77cbed13d4c1982a491faafe7e45da7a4fc06ea94e6b126405211f54a4bb5b4c794d94f6ca56d6d16ad0e0e62d8311bf90e0e6c60c74147ea12963c530c69529
 AUX i8kutils-1.42-Makefile.patch 1296 BLAKE2B cbcc827c1c93ebb4a597c642ed14110c92de701b7b094228924442c75806ecf2e35b43a65c7a39f412e9d10d24ea97c726c76cd9653ea090a0215a795ac47905 SHA512 3dd548cff896d3b14df0e55059f842cf3e04c0a9057f2c16eea7fb160882ceab4dc91782012d2243a4a78f9271c2effdb09109ffe889c27149a65940b69785d9
 AUX i8kutils-gcc5.patch 1161 BLAKE2B 12705e687c801a2863f2b8908473b1268bb3af474004ec1b317d03cb9ffb100dc4c4b2b5afeaeea76d047037b5ba5586a8629a1bbf5313b99e76dd7728679e1b SHA512 c789ef70244c59041308c5ff692c2bec6cf4fa5e673deeea9ec59cd1b6036e60f6ca4036dea04eaaa1b8172e3388b2f5e02227311e032c9c552e04ac50276616
-DIST i8kutils_1.33.tar.gz 50378 BLAKE2B 648d5dca57a407b1239b5a8d51dbe44214140368eefa71d72ef31b0cac3c0e7af2cb0ce44eb7ee429f555ef6503025ffa7543d9d17d2c42db98b67865fac0a03 SHA512 a7b9277b8c9bc2642a65122dda31cfa7cc0c4fa780ba980364c0a4e0e4599502c6557871464ff256c5911370d98944826d0e29d4d3621605d5e8c1c8a23e5578
 DIST i8kutils_1.42.tar.xz 37544 BLAKE2B ca8ec63252f43b269ba2a5565fce275aaa6542ebe6f4824d12b194cb0ae8b09dbe354c743ad78af8bcb897e411f1739df464e6c5603d470842de4b59be753984 SHA512 148e8788c50cbaa22f1dd3b72867839f5bc2d91cda70aee74f7c9a3d8542386a44652c5eb8dd9eba0e30400fc6bb72855d3cc7f2dc4284c2529b9cba2eac485b
-EBUILD i8kutils-1.33-r1.ebuild 1063 BLAKE2B 6700e2387d61a8f8ed4bceb041ba21216914998d59dcfb6c43cb6b1976df812bb6ce72e9093263f7c9ad8d833040000fc38df490cb4e1dd0832046745653b33b SHA512 62664f2355a3e6603cb462e38d5e5503af27e746e16fcddffa9b60671039fce01edefe433f2af044b65580a4b6bfcbe974ecab53394428e39071bd1002d48d31
-EBUILD i8kutils-1.42.ebuild 1027 BLAKE2B 80ec3999adf84113e7be00c5ba56d4bc9ee12b926a6d04ec27038936ccd1c0ebd9aa95e1586b8688839137d94621f07c3e5d64df496de30888d0aed66867d358 SHA512 40edad83ee0c8f0b348a0a0117b2a1476a095b992744e9edba15cf85b0dd603be0f1848228b8b166652e0b3248a2bf72d3ab7535fdd73126f8d26c9a4bc40399
+EBUILD i8kutils-1.42.ebuild 1022 BLAKE2B 4248f6b20e56f8298a4fdfcfb28fb03e76c5d3da611a42dee4a0a1ad49678bcda1b547d6e4c3c0da47a1c1771b59cd7e7fdd3dc367e84e94f8560c3bcb1fd64b SHA512 a8d386ec9e17804dbf5dac188e7a6af2f943d40f6166972482a3fe970c42300a9cd137697b8b21018a23af8ce080db1c24f6b1b3b4011224559e1df749fedd1c
 MISC metadata.xml 243 BLAKE2B 2e1785e7cbaf39d19d0e5470b25bfd2ebbc8777cabddc9b3ad02c06ac703b2fb54c40ef390ded2d6c473dc25a1d3ee72158018ac2453dc1869715b84226be988 SHA512 5cb6b9a0368c5fede3f04e466fc27ac776052008066e0deaf1989bc231cd54fd01993375c4d798d788c335744cd1e5e01b496cc50b450d1bad9de6ddbb5a764e
diff --git a/app-laptop/i8kutils/i8kutils-1.33-r1.ebuild b/app-laptop/i8kutils/i8kutils-1.33-r1.ebuild
deleted file mode 100644
index cf870ed7fd3b..000000000000
--- a/app-laptop/i8kutils/i8kutils-1.33-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="Dell Inspiron and Latitude utilities"
-HOMEPAGE="http://packages.debian.org/sid/i8kutils"
-SRC_URI="mirror://debian/pool/main/i/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="examples tk"
-
-DEPEND="tk? ( dev-lang/tk )"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.i8kutils )
-
-src_prepare() {
-	sed \
-		-e '/^CC/d' \
-		-e '/^CFLAGS/d' \
-		-e 's: -g : $(LDFLAGS) :g' \
-		-i Makefile || die
-
-	tc-export CC
-}
-
-src_install() {
-	dobin i8kbuttons i8kctl
-	doman i8kbuttons.1 i8kctl.1
-	dosym /usr/bin/i8kctl /usr/bin/i8kfan
-
-	use examples && dodoc -r examples
-
-	newinitd "${FILESDIR}"/i8k.init-r1 i8k
-	newconfd "${FILESDIR}"/i8k.conf i8k
-
-	if use tk; then
-		dobin i8kmon
-		doman i8kmon.1
-		dodoc i8kmon.conf
-		systemd_dounit "${FILESDIR}"/i8kmon.service
-	else
-		cat >> "${ED}"/etc/conf.d/i8k <<- EOF
-		# i8kmon disabled because the package was installed without USE=tk
-		NOMON=1
-		EOF
-	fi
-
-}
diff --git a/app-laptop/i8kutils/i8kutils-1.42.ebuild b/app-laptop/i8kutils/i8kutils-1.42.ebuild
index a02cb3a89a8a..a18ef111995f 100644
--- a/app-laptop/i8kutils/i8kutils-1.42.ebuild
+++ b/app-laptop/i8kutils/i8kutils-1.42.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/i8kutils/trunk/${PV}/+download/${P/-/_}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="tk"
 
 DEPEND="tk? ( dev-lang/tk:0 )"