gentoo auto-resync : 01:01:2023 - 20:22:32

12 files changed, 139 insertions, 70 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index ee8a74335421..24d3b5bb496d 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/gpaste/Manifest b/x11-misc/gpaste/Manifest
index 669d60179880..b03b27b17d24 100644
--- a/x11-misc/gpaste/Manifest
+++ b/x11-misc/gpaste/Manifest
@@ -1,3 +1,3 @@
 DIST gpaste-3.42.5.tar.gz 301630 BLAKE2B bb1151ab67a798322a2c23cdc12581bf7c660dd9d7769725afe30d34619dabc6550f2ad1b22ed00f350ed8ef07230ca1de9cbd777e816959849f71d59d8cdd82 SHA512 e9ef9403131aefc5c8b5452053feaad1061274e6b2b77efd9012da418d154017833789764d8e834fcd82164948111d21000909943bd102cc9932770af7e58ebb
-EBUILD gpaste-3.42.5.ebuild 1667 BLAKE2B b5c3698dc232f6ff68d020d7f9f7a16dc530461d42e685f559cca2fa33c2ee1085f760dc5047852cbc6197a09b26f8ba726223eecd274384ead5f593b2eb11db SHA512 24ba40c52b3637bf6cd178100197472ab81d99294a379c78908a60826f4c1020b86e30b7fb4f577ff5ad8f6ffa380017b772e2224733140039385081092dc5e8
+EBUILD gpaste-3.42.5.ebuild 1639 BLAKE2B d8f809c181acb716631c1f21b1cbddf5101d27be956879533172cc4719b32da395fdb4f1ec1a944f667f0d7a59a3503dd2605723a9e373b0807cf9c16b0ad30c SHA512 6bd9d2b1ba2537577f89ffea1d9820a113df1eb8a3a4b2e308c6ec535c4735f6549c889a47621946a99f3af11a68ac5b27502aee68f56fcbaf2e73fcf70bd874
 MISC metadata.xml 355 BLAKE2B d02f9ea7f3af332ca5308ef587a367411140103a8eaab03423161855888a6d1f9012dd8883d350c4e494cc30614fc7d069348b95995d7a94b9e8cbd948ec3993 SHA512 d1410f469786c4bf4e55c2cd8e833ad7aa8b06f7aed65da727d18b02ccaf4f7ef1abb704e35438c789b834c009da8316f1d8ede873be233f9656c7e44a068da6
diff --git a/x11-misc/gpaste/gpaste-3.42.5.ebuild b/x11-misc/gpaste/gpaste-3.42.5.ebuild
index ab7970b32e46..f435b161cbe4 100644
--- a/x11-misc/gpaste/gpaste-3.42.5.ebuild
+++ b/x11-misc/gpaste/gpaste-3.42.5.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-VALA_MIN_API_VERSION="0.42"
 VALA_USE_DEPEND="vapigen"
 
 inherit meson vala gnome2-utils
diff --git a/x11-misc/meteo/Manifest b/x11-misc/meteo/Manifest
index 86d95c5261c5..c1784e7d2f05 100644
--- a/x11-misc/meteo/Manifest
+++ b/x11-misc/meteo/Manifest
@@ -1,3 +1,3 @@
 DIST meteo-0.9.9.1.tar.gz 598205 BLAKE2B ac66e84a04f087cf75f9101da0c80e68c132e0e5064aec4cb2ea609e93f48a2ef3eb51266805b2547b4839c82496b470d4bb07e4fa0538e2ebc691a9491606d8 SHA512 d148393acc47dab1886a25600adb2a3e2ff5cb313c0004d50a54106c61f3cbd26ff95d526d13a77a1d33ede2622ff2ea9277a8fdc1899ebf34581a5a6b36c861
-EBUILD meteo-0.9.9.1-r1.ebuild 1149 BLAKE2B 0d2371c8fed2e64ea404f9b94b42ea9726a3da8d3d424601e5b1e0935fdf1025c6fc2f5d83e3e2a849cd57b1259fd4ff81b38485cfc859f2b9a95b9f486735d0 SHA512 0a39c5e5f656d33ed86590f61208ad9b0ee6a6b4b33162b9b750a9f4d4d007fad9d6908894405dd686fc53a5db33f79376c4bb375a3e770a8e77fcb95c7c387a
+EBUILD meteo-0.9.9.1-r2.ebuild 1162 BLAKE2B 6968d9932cd863f219164d6cb674aec14ac64620d6510a02baee08459e5bdc0100ce6e392e223e777c662dbdb2b1da441298da6e62898142dde72da9a8193928 SHA512 268b9d3302d31e46cc6845ef34b4127c1a76f44959554b3cc9f4afbd6edc69c3e2b0f830d5ffab82c19ff698c154422ef2c5a1ef35c420110914f0db8557757f
 MISC metadata.xml 240 BLAKE2B 1f4d972fe6e8f4096f8905fe5ec3f77b8689f3b0e01ac676ae4e55ce3aa66c18473cc82b5766131f155b9f4cd3fa6c541ab3bd32bfd233ff89722937105f968a SHA512 2e9f28bd0e525aa062cb098048dd176668b1ca2220e0018279ec4779eb80a2e8ad4f1ea73899aded97b7d27379e88d2f60cc80af4a6992880edf6e301b7e1090
diff --git a/x11-misc/meteo/meteo-0.9.9.1-r1.ebuild b/x11-misc/meteo/meteo-0.9.9.1-r2.ebuild
index b68fc55cee62..d3cc18f55cd5 100644
--- a/x11-misc/meteo/meteo-0.9.9.1-r1.ebuild
+++ b/x11-misc/meteo/meteo-0.9.9.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
 
+PYTHON_COMPAT=( python3_{8..11} )
 inherit gnome2-utils meson python-any-r1 vala xdg
 
 DESCRIPTION="Forecast application using OpenWeatherMap API"
@@ -13,9 +13,11 @@ SRC_URI="https://gitlab.com/bitseater/meteo/-/archive/${PV}/${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
+# One test needs network (#828052), the other simply checks desktop file
+# validation, that we also test with our QA tests
+RESTRICT="test"
 
 DEPEND="
-	$(vala_depend)
 	dev-libs/libayatana-appindicator:0
 	dev-libs/glib:2
 	dev-libs/json-glib
@@ -31,15 +33,12 @@ BDEPEND="${PYTHON_DEPS}
 	dev-libs/appstream-glib
 	dev-util/intltool
 	virtual/pkgconfig
+	$(vala_depend)
 "
 
-# One test needs network (#828052), the other simply checks desktop file
-# validation, that we also test with our QA tests
-RESTRICT="test"
-
-src_prepare() {
-	default
+src_configure() {
 	vala_setup
+	meson_src_configure
 }
 
 src_install() {
diff --git a/x11-misc/redshift/Manifest b/x11-misc/redshift/Manifest
index 7e024c8c95e7..89758ceac408 100644
--- a/x11-misc/redshift/Manifest
+++ b/x11-misc/redshift/Manifest
@@ -1,6 +1,8 @@
+AUX redshift-1.12-apparmor.patch 1195 BLAKE2B 1601e4c8ba980e6f54497e28b8e7d33d6c592487a5bf951821b8236e035cd4840315398c77d1c6873060b123f49d8bb1ff42b5a5b026091332f28961d4c5b076 SHA512 12e3deee53ee2804527f95b888a09c324959b1f11ccc76bf52a04b36626e6fea508ccda3ab16add636a30245b90f1de5c4df1c0524a7ca6350bfa0bdb61264e0
 DIST redshift-1.12.tar.gz 659019 BLAKE2B 09339a57fee192e3428ba4387cbea498f2f9f97eb75a418588cdda3289cfa7b7fada4cb299e983e9e6d2ffe3822c8235082e67bdfa542716b6dee9fc853a8dc1 SHA512 6763f6964b577fc146191af1c67a283a60df5bbdd3a74bfc94f66d5f9f3bef8835a479c6ec8a648b650b83a0e245928884a0f628606ace8c3f58d8319d35036f
 DIST redshift-1.12.tar.xz 486072 BLAKE2B b7ce74ae134a8f6954ff978e99670f24c447b23ab5e8d69a62109806bfe38c5e1b41e5f65cd6b182298aaf3e0b9187a2c70ea3148fd4ccba8b9c17697024944d SHA512 225e222e5f2c55be4571094ccaf02a92e162dfc35fd0fe504084e21e358b888a72f9992f9f9edaf1d496eb673af74a0d825ae5cf6ef7f0f1ab51d32419722c32
 EBUILD redshift-1.12-r6.ebuild 2068 BLAKE2B b41852d9f1f2c7ecf9aefefb639a6015f59359cda19a8de920cce72def7df0d2911c81acd48978b5ae48108aad4e08af203a5cc912c39bbc3cb471855d5d7872 SHA512 6018aa1673c9cb12c0e99892b0f1f1c04eb12b22172ac83d187620f6fe8dcc558f42d3292a35bccbe799ab1669d27b0a9b3cd394e8b7942d27f5a6932e7882bc
 EBUILD redshift-1.12-r7.ebuild 2014 BLAKE2B 987936793e565ed9aa9f71eb24542de87444850bc6bad85e03cd93daab8d9b3d076bd468af9c03a0dadb1ce74c09695740dea852b9825817c0f0f6fdede7eca0 SHA512 9eba19783a6d44341fab0be3670dfe957d19bcf435d5d3c66995bfecf57e0431fe08b2ae4aec9f37006d65e416ebab0b514c92b399c8db34724a3577994ad9ee
 EBUILD redshift-1.12-r8.ebuild 2043 BLAKE2B 0161da5fe70528e32ccd3666cfabf4fd662c80b0965e730ebe62cf2ac5c97b3b055b7b50416b82b617b3dc2c1efbdfdafdf5521664dc0242cce9f25c0a6928c7 SHA512 f32cb1b2961ebbf512b244acff50970733c5402e696da5baabdf1f0cb62e51e779ce59378136bbf48a4c68dcec5af0e1aac23d114eff7217371dca06c28405dd
+EBUILD redshift-1.12-r9.ebuild 2091 BLAKE2B dfcdca9494517f4d5057fba1e4532a5f489a1bb67ba0ec92507678abffda7df007d9b089ae9fbf777e0d79a2094b98d4b767465ca7cf2ca75def72025f897c9c SHA512 5d20fab2572d1ebc2b222d7306482d4e9a577e676db254733f468412dc56dadbf0cbd9e40f6709bd03ecb1435b458a33a7410e90ccfd9949faf9b21dbcdd742a
 MISC metadata.xml 522 BLAKE2B db9be8da0b96a5f7d742baadda739df011a5f055a944d41b67b3ba3137b7e92acead9b0afd72410a4c4f203fedf300f49a052c809577351b3b107f447dbf4c6b SHA512 c5732a20ce965daea3c663ba00d2fd9ea484cade35c22011a9e4f051ce202a0da560c428c8775b5eefaa726c92f6f31014cc47780b4ba329db81c1dd7defbbbc
diff --git a/x11-misc/redshift/files/redshift-1.12-apparmor.patch b/x11-misc/redshift/files/redshift-1.12-apparmor.patch
new file mode 100644
index 000000000000..cb939994bf52
--- /dev/null
+++ b/x11-misc/redshift/files/redshift-1.12-apparmor.patch
@@ -0,0 +1,35 @@
+From c740a3a733a59782c26f2f90a073befec2e2324d Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Tue, 27 Dec 2022 01:27:35 +0100
+Subject: [PATCH] Fix AppArmor profile
+
+Inspired by:
+- https://github.com/jonls/redshift/pull/864
+- https://gitlab.com/chinstrap/gammastep/-/blob/9db19f5ccfad20ab7b501daedcfd5ef137860dd2/data/apparmor/usr.bin.redshift.in
+---
+ data/apparmor/usr.bin.redshift.in | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/data/apparmor/usr.bin.redshift.in b/data/apparmor/usr.bin.redshift.in
+index d6696db..9b71f0d 100644
+--- a/data/apparmor/usr.bin.redshift.in
++++ b/data/apparmor/usr.bin.redshift.in
+@@ -35,8 +35,13 @@
+   # Allow but log any other dbus activity
+   audit dbus bus=system,
+ 
+-  owner @{HOME}/.config/redshift.conf r,
++  owner @{HOME}/.config/{,redshift/}redshift.conf r,
++  owner @{HOME}/.config/redshift/hooks/ r,
++  owner @{HOME}/.config/redshift/hooks/* Ux,
++
++  # Required by getpwuid() call in config-ini.c.
++  /etc/passwd* r,
+ 
+   # Site-specific additions and overrides. See local/README for details.
+-  #include <local/usr.bin.redshift>
++  #include if exists <local/usr.bin.redshift>
+ }
+-- 
+2.39.0
+
diff --git a/x11-misc/redshift/redshift-1.12-r9.ebuild b/x11-misc/redshift/redshift-1.12-r9.ebuild
new file mode 100644
index 000000000000..fd9f01b778a0
--- /dev/null
+++ b/x11-misc/redshift/redshift-1.12-r9.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit flag-o-matic systemd xdg-utils python-r1
+
+DESCRIPTION="A screen color temperature adjusting software"
+HOMEPAGE="http://jonls.dk/redshift/"
+SRC_URI="https://github.com/jonls/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="appindicator geoclue gtk nls"
+
+COMMON_DEPEND=">=x11-libs/libX11-1.4
+	x11-libs/libXxf86vm
+	x11-libs/libxcb
+	x11-libs/libdrm
+	appindicator? ( dev-libs/libappindicator:3[introspection] )
+	geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 )
+	gtk? ( ${PYTHON_DEPS} )"
+RDEPEND="${COMMON_DEPEND}
+	gtk? ( dev-python/pygobject[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+		dev-python/pyxdg[${PYTHON_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.50
+	nls? ( sys-devel/gettext )
+"
+REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-apparmor.patch
+)
+
+src_configure() {
+	use gtk && python_setup
+
+	# Fix compile for Clang (bug #732438)
+	append-cflags -fPIE
+
+	econf \
+		$(use_enable nls) \
+		--enable-drm \
+		--enable-randr \
+		--enable-vidmode \
+		--disable-wingdi \
+		\
+		--disable-corelocation \
+		$(use_enable geoclue geoclue2) \
+		\
+		$(use_enable gtk gui) \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
+		--enable-apparmor \
+		--disable-quartz \
+		--disable-ubuntu
+}
+
+_impl_specific_src_install() {
+	emake DESTDIR="${D}" \
+		PYTHON="${PYTHON}" \
+		pythondir="$(python_get_sitedir)" \
+		-C src/redshift-gtk install
+}
+
+src_install() {
+	emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install
+
+	if use gtk; then
+		python_foreach_impl _impl_specific_src_install
+		python_replicate_script "${D}"/usr/bin/redshift-gtk
+		dosym redshift-gtk /usr/bin/gtk-redshift
+
+		python_foreach_impl python_optimize
+
+		# https://bugs.gentoo.org/784281
+		mv "${D}"/usr/share/{appdata,metainfo}/ || die
+	fi
+}
+
+pkg_postinst() {
+	use gtk && xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && xdg_icon_cache_update
+}
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index f81b51af8022..a7054fdb2e2c 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -1,6 +1,3 @@
-AUX rofi-0.15.12-Werror.patch 437 BLAKE2B 6f230755bb2bcf5c91c354d4d2afec1c9e78a39eb80a871f8c0e21268302dc7baf5bfa13c9d1fe0c832ce008649764896c9ddab6dff1cd66c2c6d933e08e227a SHA512 b26d190bdaccca3cf761599a6e3f938a8f9106c9ee395c5f0bf3e58f5c151674621e66ad61891ec4e764424e42f315caa352761923d5c3b45ca326850e369ad9
-AUX rofi-1.5.0-gtk-settings-test.patch 322 BLAKE2B 652e0c20262bc18abadc8e540d4b9374fe412a97ff6b82b545ec4f050e087b8982b4e16ebf9553c71e5b6c145e8a3b8b469b1b107def04f443c01c57efe9e947 SHA512 75431eac4c6eac56716a6e2ec0ca4f5fd88aa38761b758b58c5f8c3f3fd6eb4a111af9c74b2d7c14fc3e66cbc7f361b2b3bc8658cfb31fb827e01cf19a58df67
-AUX rofi-1.6.1-autoconf-2.70.patch 916 BLAKE2B 21aba99a26a32e5b563e46d9d2ce6b2dafc2d107cfc78ed2702b7ec03e5928557f4c5bae12c8dd5ffd5b2b0a076858e201cf547ea7695842efc9bbc5446a0d97 SHA512 7f7cacd287137524f356e649e80fbfa077deef8cd864991d5d4631cfb8c9b883b33a9cc09ce50709a83a33dd7744d41a11f0f2ca3c48d188463b310425f17e88
 DIST rofi-1.7.3.tar.xz 755776 BLAKE2B af746e72ce5d09f3815960eb533bf58160c56141a116d1d950db498445e07696d0af2abe36a661ce67178f2040bfba7a39ac6c8eacdfc4db9f75e5f74daf47f5 SHA512 bba9ee25c7ff2168370ad1fd21a2286706f9db1efccdab84c55abd3bfa822ed10d23128388c69c964e81b2c51e1a95b3a3c7ca503a4564d0bdb3a993d8a9553d
 DIST rofi-1.7.5.tar.xz 772952 BLAKE2B 54511f4f793f3ba0b58294daa1d2974228904a637d13d729b0b7d974c0ebf8d0d98514705212bd42500fe90b0685a3515dc67793baa95baefe6dfc0ecdee83c7 SHA512 84cbb8ccef14fdb5d68062b17245fbcb0e9bab46534eb6c7ce532750b86fb33ce6e43ed24cf3c65e553d15b23a201c9168d97d257da4dddeddb0a7c44dd59cc0
 EBUILD rofi-1.7.3-r1.ebuild 1623 BLAKE2B f8c36a58d93ffaa76ccd38af0e7afb3664a02a8227e9b29416909d8f4f5534ad311100d525e7154d8093e77949bb89b542a5eff7a63e06e83bf7b0ae9e70d8be SHA512 ba7577a12e86a948b430419adfe0ae157e891a2c4e982a52ad9c6a45da5f8dfa50532cea39daf827a9c1598f4d45b5560326fcb4c0a50945fe7d0004240ce47a
diff --git a/x11-misc/rofi/files/rofi-0.15.12-Werror.patch b/x11-misc/rofi/files/rofi-0.15.12-Werror.patch
deleted file mode 100644
index 89755ee4d0c5..000000000000
--- a/x11-misc/rofi/files/rofi-0.15.12-Werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -7,7 +7,7 @@
- dnl Setup automake to be silent and in foreign mode.
- dnl We want xz distribution
- dnl ---------------------------------------------------------------------
--AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects dist-xz])
-+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects dist-xz])
- AM_SILENT_RULES([yes])
- 
- dnl ---------------------------------------------------------------------
diff --git a/x11-misc/rofi/files/rofi-1.5.0-gtk-settings-test.patch b/x11-misc/rofi/files/rofi-1.5.0-gtk-settings-test.patch
deleted file mode 100644
index 82aa264ac29e..000000000000
--- a/x11-misc/rofi/files/rofi-1.5.0-gtk-settings-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/subprojects/libnkutils/libnkutils-common.mk
-+++ b/subprojects/libnkutils/libnkutils-common.mk
-@@ -130,8 +130,8 @@
- 	%D%/src/gtk-settings.c \
- 	%D%/src/nkutils-gtk-settings.h
- 
--_libnkutils_tests += \
--	%D%/tests/gtk-settings.test
-+#_libnkutils_tests += \
-+#	%D%/tests/gtk-settings.test
- endif
- 
- if NK_ENABLE_XDG_DE
diff --git a/x11-misc/rofi/files/rofi-1.6.1-autoconf-2.70.patch b/x11-misc/rofi/files/rofi-1.6.1-autoconf-2.70.patch
deleted file mode 100644
index d2ac9510d3cb..000000000000
--- a/x11-misc/rofi/files/rofi-1.6.1-autoconf-2.70.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7e426c597539c1b6f33c34300b84d2074f94c9b6 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 4 Jan 2021 22:27:37 +0100
-Subject: [PATCH] configure.ac: Remove argument from AC_PROG_LEX
-
-autoconf-2.70 only accepts "yywrap" and "noyywrap" as arguments to
-AC_PROG_LEX. Calling it with no arguments will trigger the old behavior
-from autoconf-2.69.
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index e0968b65..03dc1d2f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -7,7 +7,7 @@ AH_BOTTOM([#include "gitconfig.h"])
- dnl ---------------------------------------------------------------------
- dnl Lex & Bison language parser.
- dnl ---------------------------------------------------------------------
--AC_PROG_LEX([flex])
-+AC_PROG_LEX
- AC_PROG_YACC
- 
- 
--- 
-2.30.0
-