gentoo auto-resync : 25:10:2023 - 02:45:51

6 files changed, 41 insertions, 72 deletions

diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 6292a6339277..6df7f5e3d00f 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,8 +1,9 @@
-AUX oidc-agent-4.4.0_install-perms.patch 1848 BLAKE2B 787e803e7e62ec6f6f00563a82e571707d4b2febc3fa3967870497b6515ff90247be00408451f0fe0d6805ca07d13cf797330865b22cf05e4b339303d7af6234 SHA512 b5be70a9bdee0bd0e4f9fa3c04a1e3763a34a6785b66b1ab9f336939522593046dd6b3e833c6152a2f764adf0e035ac52857aeb4fd42188006c06d4f261c0c24
 AUX oidc-agent-4.5.0_webkit41.patch 294 BLAKE2B 45613429ee2eafcd61547f8d8de7bc0e7a3663e65adf196bb995ac754ccde7619fea5ba599d33429dd40c5f439c0ad73a3337802661f71cbe1de40aac3a6ab2b SHA512 e0fee550af136941832f304cd749c263f688105b7361e83555f49d635eed13cf35f587f7a21dcc76804b40438f3f455e9ceaa3cb0ed07119e17d0e117d58d391
 AUX oidc-agent-4.5.2_install-perms.patch 962 BLAKE2B d31f252f539d8fbb11de0c5040b558bc0b8cba99dda7b5a192de5bfe1f63c1ae0e57b650617cbc34be35f6b3ed7a3c8b5eab93bdc7146c824f20030f93ac5ca3 SHA512 5331dbbd79f5ec2537e75eac0839f8c324078dcdad3394616b8817b337b16c3a8c0cbf45eb30ec6831ee93545dc99a902fec2eb27adf2f3d7a085290415e398c
-DIST oidc-agent-4.5.1.tar.gz 1823853 BLAKE2B d73ce4405ead08ddc0433a5c3b660b08037eecbde5f1e0358cad8731d0787e63ffae4b1317ecfe824a951e07a82d600fa4180557d93d0ce5a382e8c8f39289d6 SHA512 9afffbfcb00c610b04f97c59d610799a4ce45b1c40a61e388c6ab8b550381725602e43d219ce475a9d0425c1bc07b49ca982379286e9f48ebae1e19ca4587779
+AUX oidc-agent-5.0.1_install-perms.patch 211 BLAKE2B e88d0f15b3a8c96cd2350dc66e41914787fb4931d97fbed23fa3a83df1464f97105a6ea49bbea92c24971618d7022eda2a12f31101e1d8cbd97d58bdbca70b46 SHA512 24b34bba758d9ed802a77edba12a74f4b940c5a74d596280d5779c6f35b621d026dc75b3aeaae646dfd1771a88c5fabb45a958576bcaa3c5186e1ab6e251f9d4
+AUX oidc-agent-5.0.1_webkit41.patch 253 BLAKE2B af5fb8b4aae2282171d7c765b2b751d60f390ed7ccc3d798f16754f5f245fa81f364d3ba8bd7a62ad524ff403849c4c46b352b5d8b54d38b6bc35841e7fa397e SHA512 d4cba45908ac7e9b77a1d8fbff62eaaade34ed391cc7c3ee3f5b1d1da1c6976b0e8f73c890f89268554cdf3f55d31bc25a96954eddc0226fb56690c35eac3eee
 DIST oidc-agent-4.5.2.tar.gz 1766905 BLAKE2B 0558778a5162fbbbe29be9a476838d745abf4825e7274487637f368d521e03f6f165ec82129f37f135a6cf3d3d43bb9349574b88763a508bb683cdc8882230d2 SHA512 04c9ddb258c132781eaa875412f0a8d48d2127e5b78ba262eb0240dac05025db62f5d357e4b5c35a9009960b30d63ce96156c8dcf3b5eac4257c02d37578e676
-EBUILD oidc-agent-4.5.1.ebuild 2387 BLAKE2B 86c694fd8123c3760eeb324cab0e2da7bcd73f971bdf32e80a54bc29fc8ace046746c28e326c3c05023cf5cc5f36b6ccc70ea00a2cacf774c36a4ee00c61eae5 SHA512 0ce47243a71b87a01b232562989d24296e5e9a5880024ec4b4c3444c4df12deaeaf17e3a3168ce3d032917e424d4f7e39dd0ee3dd867f449fae5b8b72a5ad557
-EBUILD oidc-agent-4.5.2.ebuild 2388 BLAKE2B 3e6a853d7903edc2b9fcde58ee4676ca51900fa71e78e52032c5103afe28ce1d9fb4c0b5a0c69a1ffcd6dd5d655fcc94cf1fb56aadd5897a7a10f45c44bd647f SHA512 cb13d8bb868f2c9362bb2be3d50ec4637db97d16814a92c3bbce102fe22de337b97fade54b4297bba9bff08f4585df07ee5cba3710274f3dc2e6f8da18535751
+DIST oidc-agent-5.0.1.tar.gz 1802435 BLAKE2B 75bc66bb2c6cc89293c7ad155d35b7a7adb73ad7f8a5aadeb029b43a095e2a80f0fc4505737a0c53c60e6f601acbcab990ad4b572b659050fe36e5dd2e7c4092 SHA512 caffa9d7733690917472d2d48ca58092ab722c5f049750de37169dc0a76ccbe374ae3fb5e56b8c578465e84a2f40795eaa26018281b4f851f7a7c94571d2a124
+EBUILD oidc-agent-4.5.2.ebuild 2387 BLAKE2B ad75c9735389ccbcba1885b0ac75f3d5505af0c4080e660607613be15630ce8aca24caed63be250c23656333877b7b50b8af4c24341a3f80c10b6d12075f6c9d SHA512 cd56c2250a6a9e6afe114cf02ff069b6bb1f31564f9355467543e0f4ac9c71d175b23d70c8addff75e1b56903a606bdddb848b8178d0cc8375ff9f59cc5a4f2e
+EBUILD oidc-agent-5.0.1.ebuild 2633 BLAKE2B 1af502367611ba4e7dd0a28b6bc0aa81f121ce2fb79a0f1c095ca6f741fca85b91b52533d7211005095a4b2a02b83c0c8e28d9de0d8af666e1e9c9d52defc361 SHA512 8ad962df2843c0a4ccc0fcc93fa41a04c55343a94c619d2982f868fff7f8b61ef47079838aebb1b03078feead3de68f5c077372a56e2fc91cc580a7009438c37
 MISC metadata.xml 780 BLAKE2B 8a2538e5b233383449dc76e49a4d68f950ad3982874e657664ee027fd71a12f18a9a86f38efd6452732305783cd175b761a7702d1a21b97200b1991d20624fd7 SHA512 a4ba3692ce9304b119ea331f83f702bba0956f0013bbe239bca376dea7ccf72a5bb639f06006cf2d65f8ea4b2817173ef26f1c086ab5482095eff34fea026d3f
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.4.0_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-4.4.0_install-perms.patch
deleted file mode 100644
index aee7184dd4a0..000000000000
--- a/net-misc/oidc-agent/files/oidc-agent-4.4.0_install-perms.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -656,19 +656,19 @@
- 
- ## Man pages
- $(MAN_PATH)/man1/$(AGENT).1: $(MANDIR)/$(AGENT).1 $(MAN_PATH)/man1
--	@install -p $< $@
-+	@install -p -m 644 $< $@
- $(MAN_PATH)/man1/$(GEN).1: $(MANDIR)/$(GEN).1 $(MAN_PATH)/man1
--	@install -p $< $@
-+	@install -p -m 644 $< $@
- $(MAN_PATH)/man1/$(ADD).1: $(MANDIR)/$(ADD).1 $(MAN_PATH)/man1
--	@install -p $< $@
-+	@install -p -m 644 $< $@
- $(MAN_PATH)/man1/$(CLIENT).1: $(MANDIR)/$(CLIENT).1 $(MAN_PATH)/man1
--	@install -p $< $@
-+	@install -p -m 644 $< $@
- $(MAN_PATH)/man1/$(AGENT_SERVICE).1: $(MANDIR)/$(AGENT_SERVICE).1 $(MAN_PATH)/man1
--	@install -p $< $@
-+	@install -p -m 644 $< $@
- $(MAN_PATH)/man1/$(KEYCHAIN).1: $(MANDIR)/$(KEYCHAIN).1 $(MAN_PATH)/man1
--	@install -p $< $@
-+	@install -p -m 644 $< $@
- $(PROMPT_MAN_PATH)/man1/$(PROMPT).1: $(MANDIR)/$(PROMPT).1 $(PROMPT_MAN_PATH)/man1
--	@install -p $< $@
-+	@install -p -m 644 $< $@
- 
- endif
- 
-@@ -685,16 +685,16 @@
- 	@ln -sf $(SHARED_LIB_NAME_SO) $@
- 
- $(INCLUDE_PATH)/oidc-agent/%.h: $(SRCDIR)/api/%.h $(INCLUDE_PATH)/oidc-agent
--	@install -p $< $@
-+	@install -p -m 644 $< $@
- 
- $(INCLUDE_PATH)/oidc-agent/ipc_values.h: $(SRCDIR)/defines/ipc_values.h $(INCLUDE_PATH)/oidc-agent
--	@install -p $< $@
-+	@install -p -m 644 $< $@
- 
- $(INCLUDE_PATH)/oidc-agent/oidc_error.h: $(SRCDIR)/utils/oidc_error.h $(INCLUDE_PATH)/oidc-agent
--	@install -p $< $@
-+	@install -p -m 644 $< $@
- 
- $(LIBDEV_PATH)/liboidc-agent.a: $(APILIB)/liboidc-agent.a $(LIBDEV_PATH)
--	@install -p $< $@
-+	@install -p -m 644 $< $@
- 
- endif
- 
-@@ -702,7 +702,7 @@
- 
- ## scheme handler
- $(DESKTOP_APPLICATION_PATH)/oidc-gen.desktop: $(CONFDIR)/scheme_handler/oidc-gen.desktop
--	@install -p -D $< $@
-+	@install -p -m 644 -D $< $@
- 	@echo "Exec=x-terminal-emulator -e bash -c \"$(BIN_AFTER_INST_PATH)/bin/$(GEN) --codeExchange=%u; exec bash\"" >> $@
- 
- ## Xsession
diff --git a/net-misc/oidc-agent/files/oidc-agent-5.0.1_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-5.0.1_install-perms.patch
new file mode 100644
index 000000000000..6b19950e420e
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-5.0.1_install-perms.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -739,7 +739,7 @@
+ 	@install -p -m 644 $< $@
+ 
+ $(LIBDEV_PATH)/liboidc-agent.a: $(APILIB)/liboidc-agent.a $(LIBDEV_PATH)
+-	@install -p $< $@
++	@install -p -m 644 $< $@
+ 
+ endif
+ 
diff --git a/net-misc/oidc-agent/files/oidc-agent-5.0.1_webkit41.patch b/net-misc/oidc-agent/files/oidc-agent-5.0.1_webkit41.patch
new file mode 100644
index 000000000000..d950fc879fb8
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-5.0.1_webkit41.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -185,7 +185,7 @@
+ CPPFLAGS += -fPIC
+ ifndef MAC_OS
+ ifndef ANY_MSYS
+-WEBKITGTK ?= webkit2gtk-4.0
++WEBKITGTK ?= webkit2gtk-4.1
+ CPPFLAGS += $(shell pkg-config --cflags --libs gtk+-3.0 $(WEBKITGTK)) -lstdc++
+ endif
+ endif
diff --git a/net-misc/oidc-agent/oidc-agent-4.5.2.ebuild b/net-misc/oidc-agent/oidc-agent-4.5.2.ebuild
index d42def7c515c..10d657339258 100644
--- a/net-misc/oidc-agent/oidc-agent-4.5.2.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 IUSE="test"
 
 DEPEND="app-crypt/libsecret
diff --git a/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild b/net-misc/oidc-agent/oidc-agent-5.0.1.ebuild
index 22da2bbb4431..9a69211000e7 100644
--- a/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-5.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit xdg-utils
+inherit tmpfiles xdg-utils
 
 DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command line"
 HOMEPAGE="https://github.com/indigo-dc/oidc-agent"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 IUSE="test"
 
 DEPEND="app-crypt/libsecret
@@ -28,8 +28,8 @@ BDEPEND="test? ( dev-libs/check )"
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.4.0_install-perms.patch
-	"${FILESDIR}"/${PN}-4.5.0_webkit41.patch
+	"${FILESDIR}"/${PN}-5.0.1_install-perms.patch
+	"${FILESDIR}"/${PN}-5.0.1_webkit41.patch
 )
 
 src_prepare() {
@@ -68,6 +68,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
 	xdg_desktop_database_update
 
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
@@ -78,12 +80,15 @@ pkg_postinst() {
 		elog "    https://indigo-dc.gitbooks.io/oidc-agent/"
 		elog
 	else
-		local new_major_ver old_ver
-		new_major_ver=$(ver_cut 1)
+		local old_ver
 		for old_ver in ${REPLACING_VERSIONS}; do
-			if [[ $(ver_cut 1 ${old_ver}) != ${new_major_ver} ]]; then
+			if [[ $(ver_cut 1 ${old_ver}) != 5 ]]; then
+				ewarn "${PN} 5 is a major release with quite some usability improvements but unfortunately also some breaking changes."
+				ewarn "Please consult"
+				ewarn "    https://indigo-dc.gitbook.io/oidc-agent/oidc-agent5"
+				ewarn "for instructions on how to upgrade your configuration to this version"
 				ewarn
-				ewarn "You are upgrading from a different major version. Please restart any running instances of ${PN}"
+				ewarn "Furthermore, please restart any running instances of ${PN}"
 				ewarn "to make sure they are compatible with the updated clients."
 				ewarn
 				break