gentoo resync : 29.12.2022

4 files changed, 270 insertions, 0 deletions

diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 96537360d24f..bcd01e966b46 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,7 +1,12 @@
+AUX 0.99.18-meson-Allow-unittest-inspector-to-fail.patch 998 BLAKE2B ac9e7f5ebeb3afee70fe94738300b389d9531f7f21a091200169c6d32252c2302873ae5e1bf57680e50dc80bff896341793aa3fa4c9db6b3a801bad43d73eb73 SHA512 fc72d4f9e1913bf24d28ce7a5972172ae690baf995d0e7fd75d74f0289d5feb740a704d234745138bb78230a9bedd285b5032cb8bcd79978bf6b18b55fbacbbe
 AUX upower-0.99.12-fix-power_now-energy_rate-readings.patch 1636 BLAKE2B e61167d5a1f6b65cdb611f6cf7b9b5879de58d692176079041a785ca6ecf799b728b32a37e0e3ed7cb0ad06e03db2f16c3eac84d3879398f9be8d9f4fff22d72 SHA512 7aa880a8fd6887a0a9e7d118ef7fa2cde59f9d9b1f16dec17ac7ac013346f9e06f9ae55c343b7830b370f500da201cd2b107f8f586f90d4f7b5695fd33389565
 AUX upower-0.99.17-meson-Don-t-search-for-gtk-doc-if-disabled.patch 1656 BLAKE2B 6fe3a2bbd6d61a034b6787fc394b74c5d76e414e207e37ebd9921f2f681b8aab145a53dc072565b581e6cc5bdd9f9972d6036dfed5f70edad8a4db4996f4c4f3 SHA512 ee36f0fa1ac75ba01c7c6829d5b29f868a746243f33e5513795a090659cea8f2a7085967c0a7832a979adce490d169ed7c4a79860c228ec07f3e06f90dff0dc1
 DIST upower-0.99.12.tar.xz 423640 BLAKE2B 4c5c6357f0a2f8d721ebae9736912b1871a898c7ce65708626f9a9465cde87036ba6ab8050d97f5b9074d92e2700d8ed1e71b67f43cd6305eb4e89336f1b628f SHA512 9858a0e5f65271522cc5f36b0cd8722a5fb3effba37dbc5b22f08606701d4242ee54329d07460768004a24dc42705a84140ac6d9691afb7f09584b2e61fe3413
 DIST upower-v0.99.17.tar.bz2 139108 BLAKE2B de48a8058752f3e2bcefe83fe049ae9181517276f6d2930c402089291d935ecbdc6f7759d811467c537801c422f5d32a02366f3e3d57bea9e73e311b13df046a SHA512 fcb2f344e82f04af85eee3a4ef42a4d119f7b55fd4e1c6bc2633845135bf524957b54c849bf6501d89cfbd285a7e1fbeecb8e846aa108e2b36d1550347150c04
+DIST upower-v0.99.18.tar.bz2 141140 BLAKE2B 2e6acfaf58f6e0031326c269ad58bfcdac84a25f952ef3169e6ee85889696c5c83d10aaf67b8244a2378150fd591ddbd3101d21d1e7534e5d7f2f69ee070a174 SHA512 f33a2ca35209d69fa7ddf614c6a390973c998c6473448acb00ca86114f7bfc05beb8f904010ed7b5a440209fe503e759682459893fdc9690c4b79d516e7f9de1
+DIST upower-v0.99.19.tar.bz2 141661 BLAKE2B 4c117927d17f118cd06165160b407190ab86fff6bc194204038fd334dc879726c1f83fa23c89c2574cf8de6211ce6a884cc103f8292618818b1bc60e5ba8f1e8 SHA512 1462a64bc642bd6c5c235742f5a8fa9e3440846d90061889b568fc0a91f7b24d56d1f5a3d33bff8d6d35f78aa8bc8c15f9c4a51a2cb40f1ee3b2a822ad60ca33
 EBUILD upower-0.99.12-r1.ebuild 2705 BLAKE2B 4da66afcf8ad299b2cbe201d9f54b514bd912fdadd2c616e061d89d571834c2e71fa5a32258268ecfcf02984c4727edafb122f470f9140bb260c734c14513bd8 SHA512 f5961f9aba9d120646c643641a49fcf8e670543bbeee3670f36b06e41a3a675baaa6b426274ba9801ca446f67d7f39588955a877c225c2b98cf1144b1b21b366
 EBUILD upower-0.99.17.ebuild 2890 BLAKE2B 7cbb2e63443639c494b2e98d1ff64ac7c08d0c2775ca86382f53794196e8f02ac8598aa989c0e6f734f2889d8637f8586932fb5c5d12b757861bce8dec20f562 SHA512 738c340c727c4d57603c25bca273b1a06de64357d04f55089f0eb97369cedbe06804c67639f31a50ab76145774a5257fec4bff95c81d0c291019cc15206f1cff
+EBUILD upower-0.99.18.ebuild 2894 BLAKE2B 4e1d7b4aa402aee936ad2bf9b8ea57b6e2e1984418d1fdd2deecb34665ae0fbcf553915bc30ee9a0560ff54ab5dbd23793544c6aa155bf15c1e87927fe379e25 SHA512 9c6c534afa3878febf6d4c29442e71f587e40653fb48a1336358402a22c4129b621a01282a7faf96a7b5a69e1b42b2d6d5da35eab6885116f972f350388fadee
+EBUILD upower-0.99.19.ebuild 2853 BLAKE2B 63464a80f4cb8303e7928c66719a96e830e85076b3d5ec62b4014b362f338655dc428327e9cc830e84a62a1886754e50a09f13874d96ab862af8baece37ef699 SHA512 15c86382c895ca74cb82bc396a92494e2658e873d995fdc267dfb7b7b9183c874801b41f1814b73070c63e18e3cce7dd5f636206fe2c593bb947f092110e4ba0
 MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
diff --git a/sys-power/upower/files/0.99.18-meson-Allow-unittest-inspector-to-fail.patch b/sys-power/upower/files/0.99.18-meson-Allow-unittest-inspector-to-fail.patch
new file mode 100644
index 000000000000..feafa87e9705
--- /dev/null
+++ b/sys-power/upower/files/0.99.18-meson-Allow-unittest-inspector-to-fail.patch
@@ -0,0 +1,31 @@
+Bug: https://bugs.gentoo.org/848525
+
+From aa646fa0ca3e164b09949c546796ec50433b748d Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <bberg@redhat.com>
+Date: Tue, 17 May 2022 16:02:49 +0200
+Subject: [PATCH] meson: Allow unittest inspector to fail
+
+It is only used to make the test output nicer, and it is completely fine
+to fail.
+
+Closes: #187
+---
+ src/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index b49d5f0..2e1edd1 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -124,7 +124,7 @@ if os_backend == 'linux' and gobject_introspection.found()
+ 
+     python3 = find_program('python3')
+     unittest_inspector = find_program('linux/unittest_inspector.py')
+-    r = run_command(unittest_inspector, files('linux/integration-test.py'), check: true)
++    r = run_command(unittest_inspector, files('linux/integration-test.py'), check: false)
+     unit_tests = r.stdout().strip().split('\n')
+ 
+     foreach ut: unit_tests
+-- 
+2.35.1
+
diff --git a/sys-power/upower/upower-0.99.18.ebuild b/sys-power/upower/upower-0.99.18.ebuild
new file mode 100644
index 000000000000..760dcd025ded
--- /dev/null
+++ b/sys-power/upower/upower-0.99.18.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit meson python-any-r1 systemd udev xdg-utils
+
+DESCRIPTION="D-Bus abstraction for enumerating power devices, querying history and statistics"
+HOMEPAGE="https://upower.freedesktop.org/"
+SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+
+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 selinux test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.58:2
+	sys-apps/dbus:=
+	introspection? ( dev-libs/gobject-introspection:= )
+	kernel_linux? (
+		>=dev-libs/libgudev-236:=
+		virtual/udev
+		ios? (
+			>=app-pda/libimobiledevice-1:=
+			>=app-pda/libplist-2:=
+		)
+	)
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-devicekit )
+"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/python-dbusmock[${PYTHON_USEDEP}]
+		')
+		dev-util/umockdev
+	)
+"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-meson-Allow-unittest-inspector-to-fail.patch
+)
+
+python_check_deps() {
+	python_has_version -b "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+}
+
+src_configure() {
+	local backend
+
+	if use kernel_linux ; then
+		backend=linux
+	else
+		backend=dummy
+	fi
+
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+
+		-Dman=true
+		$(meson_use doc gtk-doc)
+		$(meson_feature introspection)
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
+		-Dos_backend="${backend}"
+		$(meson_feature ios idevice)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	keepdir /var/lib/upower #383091
+}
+
+pkg_postinst() {
+	udev_reload
+
+	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 0.99.12; then
+		elog "Support for Logitech Unifying Receiver battery state readout was"
+		elog "removed in version 0.99.12, these devices have been directly"
+		elog "supported by the Linux kernel since version >=3.2."
+		elog
+		elog "Support for CSR devices battery state was removed from udev rules"
+		elog "in version 0.99.12. This concerns the following Logitech products"
+		elog "from the mid 2000s:"
+		elog "Mouse/Dual/Keyboard+Mouse Receiver, Freedom Optical, Elite Duo,"
+		elog "MX700/MX1000, Optical TrackMan, Click! Mouse, Presenter."
+	fi
+}
diff --git a/sys-power/upower/upower-0.99.19.ebuild b/sys-power/upower/upower-0.99.19.ebuild
new file mode 100644
index 000000000000..5554b4d5e0a6
--- /dev/null
+++ b/sys-power/upower/upower-0.99.19.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit meson python-any-r1 systemd udev xdg-utils
+
+DESCRIPTION="D-Bus abstraction for enumerating power devices, querying history and statistics"
+HOMEPAGE="https://upower.freedesktop.org/"
+SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/3" # based on SONAME of libupower-glib.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# gtk-doc files are not available as prebuilt in the tarball
+IUSE="doc +introspection ios selinux test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.58:2
+	sys-apps/dbus:=
+	introspection? ( dev-libs/gobject-introspection:= )
+	kernel_linux? (
+		>=dev-libs/libgudev-236:=
+		virtual/udev
+		ios? (
+			>=app-pda/libimobiledevice-1:=
+			>=app-pda/libplist-2:=
+		)
+	)
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-devicekit )
+"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/python-dbusmock[${PYTHON_USEDEP}]
+		')
+		dev-util/umockdev
+	)
+"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
+
+python_check_deps() {
+	python_has_version -b "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+}
+
+src_configure() {
+	local backend
+
+	if use kernel_linux ; then
+		backend=linux
+	else
+		backend=dummy
+	fi
+
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+
+		-Dman=true
+		$(meson_use doc gtk-doc)
+		$(meson_feature introspection)
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
+		-Dos_backend="${backend}"
+		$(meson_feature ios idevice)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	keepdir /var/lib/upower #383091
+}
+
+pkg_postinst() {
+	udev_reload
+
+	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 0.99.12; then
+		elog "Support for Logitech Unifying Receiver battery state readout was"
+		elog "removed in version 0.99.12, these devices have been directly"
+		elog "supported by the Linux kernel since version >=3.2."
+		elog
+		elog "Support for CSR devices battery state was removed from udev rules"
+		elog "in version 0.99.12. This concerns the following Logitech products"
+		elog "from the mid 2000s:"
+		elog "Mouse/Dual/Keyboard+Mouse Receiver, Freedom Optical, Elite Duo,"
+		elog "MX700/MX1000, Optical TrackMan, Click! Mouse, Presenter."
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}