From 401101f9c8077911929d3f2b60a37098460a5d89 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 24 Mar 2022 23:59:54 +0000 Subject: gentoo resync : 25.03.2022 --- sys-power/Manifest.gz | Bin 5070 -> 5067 bytes sys-power/upower/Manifest | 3 + ...eson-Don-t-search-for-gtk-doc-if-disabled.patch | 60 +++++++++++++ sys-power/upower/upower-0.99.17.ebuild | 96 +++++++++++++++++++++ 4 files changed, 159 insertions(+) create mode 100644 sys-power/upower/files/upower-0.99.17-meson-Don-t-search-for-gtk-doc-if-disabled.patch create mode 100644 sys-power/upower/upower-0.99.17.ebuild (limited to 'sys-power') diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz index b819edfa671e..8fcb0eda42fd 100644 Binary files a/sys-power/Manifest.gz and b/sys-power/Manifest.gz differ diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest index 3bf70b1bed32..9045f5260c8f 100644 --- a/sys-power/upower/Manifest +++ b/sys-power/upower/Manifest @@ -1,4 +1,7 @@ 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 EBUILD upower-0.99.12-r1.ebuild 2705 BLAKE2B 4da66afcf8ad299b2cbe201d9f54b514bd912fdadd2c616e061d89d571834c2e71fa5a32258268ecfcf02984c4727edafb122f470f9140bb260c734c14513bd8 SHA512 f5961f9aba9d120646c643641a49fcf8e670543bbeee3670f36b06e41a3a675baaa6b426274ba9801ca446f67d7f39588955a877c225c2b98cf1144b1b21b366 +EBUILD upower-0.99.17.ebuild 2407 BLAKE2B 4d4c2e21f3d4c5940ec21168aeaac8b7070e77b12812eb025b06f3c2560236c7ab9e0d30be5cc22bc473f3807640bb7505a725c701fe547862bf289800d45226 SHA512 fb018e0737cdde22bfc84a5ddd4383f2b190061063749d225febcbd7530a6a37fce3ca65d848ba16d6aa505553d4a4be2ad98d0f79c5f118c37a30b2bd95a5b1 MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed diff --git a/sys-power/upower/files/upower-0.99.17-meson-Don-t-search-for-gtk-doc-if-disabled.patch b/sys-power/upower/files/upower-0.99.17-meson-Don-t-search-for-gtk-doc-if-disabled.patch new file mode 100644 index 000000000000..ead41d2e64c8 --- /dev/null +++ b/sys-power/upower/files/upower-0.99.17-meson-Don-t-search-for-gtk-doc-if-disabled.patch @@ -0,0 +1,60 @@ +https://gitlab.freedesktop.org/upower/upower/-/merge_requests/123 + +From 1003d5c2a69e6c28dcf68adf10181b5180b5defa Mon Sep 17 00:00:00 2001 +From: Matt Turner +Date: Sun, 20 Mar 2022 15:32:55 -0700 +Subject: [PATCH] meson: Don't search for gtk-doc if disabled + +--- + doc/meson.build | 38 ++++++++++++++++++++------------------ + 1 file changed, 20 insertions(+), 18 deletions(-) + +diff --git a/doc/meson.build b/doc/meson.build +index dc93a16..5fc253c 100644 +--- a/doc/meson.build ++++ b/doc/meson.build +@@ -27,21 +27,23 @@ version_xml = configure_file( + input: 'version.xml.in', + configuration: cdata) + +-gnome.gtkdoc('UPower', +- main_xml: 'upower-docs.xml', +- src_dir: meson.source_root() / 'libupower-glib', +- dependencies: [ libupower_glib_dep ], +- scan_args: ['--rebuild-types', '--rebuild-sections'], +- content_files: [ +- version_xml, +- ifaces_refs, +- 'man/UPower.xml', +- 'man/upowerd.xml', +- 'man/upower.xml', +- '../COPYING', +- ], +- ignore_headers: [ +- 'config.h', +- ], +- install: get_option('gtk-doc') +-) ++if get_option('gtk-doc') ++ gnome.gtkdoc('UPower', ++ main_xml: 'upower-docs.xml', ++ src_dir: meson.source_root() / 'libupower-glib', ++ dependencies: [ libupower_glib_dep ], ++ scan_args: ['--rebuild-types', '--rebuild-sections'], ++ content_files: [ ++ version_xml, ++ ifaces_refs, ++ 'man/UPower.xml', ++ 'man/upowerd.xml', ++ 'man/upower.xml', ++ '../COPYING', ++ ], ++ ignore_headers: [ ++ 'config.h', ++ ], ++ install: true ++ ) ++endif +-- +2.34.1 + diff --git a/sys-power/upower/upower-0.99.17.ebuild b/sys-power/upower/upower-0.99.17.ebuild new file mode 100644 index 000000000000..6dba8fb1854a --- /dev/null +++ b/sys-power/upower/upower-0.99.17.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson 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" + +DEPEND=" + >=dev-libs/glib-2.56: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 + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + doc? ( dev-util/gtk-doc ) +" + +S="${WORKDIR}/${PN}-v${PV}" + +QA_MULTILIB_PATHS="usr/lib/${PN}/.*" + +PATCHES=( + "${FILESDIR}"/${P}-meson-Don-t-search-for-gtk-doc-if-disabled.patch +) + +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() { + 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 +} -- cgit v1.2.3