gentoo resync : 05.12.2021

4 files changed, 2 insertions, 93 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 365e90983660..cbef29dcbf13 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 037dcf25b3e7..1187346ad333 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,6 +1,4 @@
 AUX upower-0.99.12-fix-power_now-energy_rate-readings.patch 1636 BLAKE2B e61167d5a1f6b65cdb611f6cf7b9b5879de58d692176079041a785ca6ecf799b728b32a37e0e3ed7cb0ad06e03db2f16c3eac84d3879398f9be8d9f4fff22d72 SHA512 7aa880a8fd6887a0a9e7d118ef7fa2cde59f9d9b1f16dec17ac7ac013346f9e06f9ae55c343b7830b370f500da201cd2b107f8f586f90d4f7b5695fd33389565
-DIST upower-0.99.11.tar.xz 430128 BLAKE2B 77604d02a69de98e4c7b268d11d189aa42ace2d62b982fda9bc41131ce383ede32953ada31eae0bbfd1121600af5863924d48c636e60a28f505a6998dcac227c SHA512 67219a0beb98c97ac4512e4fe8ba83fc80a1035d1edb5367dda6911da50c672b047051f2f528e8703be29ab47547d92b6c71a7ef695226a1bdb5bc33e6d18803
 DIST upower-0.99.12.tar.xz 423640 BLAKE2B 4c5c6357f0a2f8d721ebae9736912b1871a898c7ce65708626f9a9465cde87036ba6ab8050d97f5b9074d92e2700d8ed1e71b67f43cd6305eb4e89336f1b628f SHA512 9858a0e5f65271522cc5f36b0cd8722a5fb3effba37dbc5b22f08606701d4242ee54329d07460768004a24dc42705a84140ac6d9691afb7f09584b2e61fe3413
-EBUILD upower-0.99.11.ebuild 2105 BLAKE2B c94253f904dba7fa27380996fa645218c34342d55e3b4a43cd38614d60176c3140ae4ac520d4c1ad05ada307f860a373bd8397915c7c644792c3a934b303bd68 SHA512 d778181809780a53677aa234ea64d5c4ba840b9f7ab465a1160d1efc1c4b26427032f1b09739333387406ed62a61cc9626e3e72da756869d0a1707fc8c45d45e
-EBUILD upower-0.99.12-r1.ebuild 2784 BLAKE2B 8603683c2e0f7af7b49680741ad20d051fbdeab0341a89d2ac97b8c2410d78f59b2260e9d07a4d73532b0f672d0e4e06d58a4254dff2f8d8b2ee965bd6bada7b SHA512 fad316a3f69506f5129751a5e635f0396849affa58237d21c67d3fa5650f7ce9ef67942b25aa02409edb281b313db508f79ed0eeec9a323037f3e61ae04fbb37
+EBUILD upower-0.99.12-r1.ebuild 2783 BLAKE2B a398cf39597c75c10fffbfd37caf4996b0a4ae0fa24e167b838e7a650ce31e1c179afb8c18012f31bf9d806ada9321c81ef0d868ce0b466eca52862b60da9187 SHA512 3b57a555ae26925ce0ac2a0dbc127b0e54e9ce2e3d29ee09953a2acf348631560a7e4cd0809b60be7c4469edfbfb034f9848183aab03ad1349f50a1468b28d9b
 MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
diff --git a/sys-power/upower/upower-0.99.11.ebuild b/sys-power/upower/upower-0.99.11.ebuild
deleted file mode 100644
index 244e6fd5c246..000000000000
--- a/sys-power/upower/upower-0.99.11.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd xdg-utils
-
-DESCRIPTION="D-Bus abstraction for enumerating power devices, querying history and statistics"
-HOMEPAGE="https://upower.freedesktop.org/"
-
-# No tarball released, use the same commit as Fedora
-#SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
-COMMIT="93cfe7c8d66ed486001c4f3f55399b7a"
-SRC_URI="https://gitlab.freedesktop.org/upower/upower/uploads/${COMMIT}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/3" # based on SONAME of libupower-glib.so
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-
-# gtk-doc files are not available as prebuilt in the tarball
-IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux"
-
-DEPEND="
-	>=dev-libs/glib-2.38:2
-	sys-apps/dbus:=
-	introspection? ( dev-libs/gobject-introspection:= )
-	kernel_linux? (
-		dev-libs/libgudev:=
-		virtual/libusb:1
-		virtual/udev
-		ios? (
-			>=app-pda/libimobiledevice-1:=
-			>=app-pda/libplist-1:=
-			)
-		)
-"
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-devicekit )
-"
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-"
-
-QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
-
-DOCS=( AUTHORS HACKING NEWS README )
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	sed -i -e '/DISABLE_DEPRECATED/d' configure || die
-}
-
-src_configure() {
-	local backend
-
-	if use kernel_linux ; then
-		backend=linux
-	elif use kernel_FreeBSD ; then
-		backend=freebsd
-	else
-		backend=dummy
-	fi
-
-	local myeconfargs=(
-		--disable-static
-		--disable-tests
-		--enable-man-pages
-		--libexecdir="${EPREFIX}"/usr/lib/${PN}
-		--localstatedir="${EPREFIX}"/var
-		--with-backend=${backend}
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-systemdutildir="$(systemd_get_utildir)"
-		$(use_enable doc gtk-doc)
-		$(use_enable introspection)
-		$(use_with ios idevice)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name '*.la' -delete || die
-	keepdir /var/lib/upower #383091
-}
diff --git a/sys-power/upower/upower-0.99.12-r1.ebuild b/sys-power/upower/upower-0.99.12-r1.ebuild
index 8066c698d0c4..9d8cd983c46b 100644
--- a/sys-power/upower/upower-0.99.12-r1.ebuild
+++ b/sys-power/upower/upower-0.99.12-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.freedesktop.org/upower/upower/uploads/${COMMIT}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0/3" # based on SONAME of libupower-glib.so
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 # gtk-doc files are not available as prebuilt in the tarball
 IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux"