gentoo auto-resync : 28:03:2023 - 09:49:10

7 files changed, 17 insertions, 181 deletions

diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 568fc289ce73..0027f1b30619 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,13 +1,8 @@
-AUX oidc-agent-4.3.1_install-perms.patch 1776 BLAKE2B ff7c68cf08fcf9a1d70b0c30295bd9a66d118589c0fbef7dac2ec1d64cdf863293bbf5061ba0ca3be765bfa76fc9109eb848c2d17f82036483aa1dacd0c6b2bb SHA512 acafaf1625f709d0cfcd682bf4322c2dea86dbd194d45d3799051289a92a8736692bee16ab538d1825363785bd5f5d834f2ef02159c48182d89787d559b80f22
-AUX oidc-agent-4.3.1_liblist-automagic.patch 427 BLAKE2B 05a0dd5f9671eb3535475bc77174e158e22646b48c8eb8509213e3a84795df76e4de628c06b80e3798983d8f1072f0a98c6961f86d1593c83c25b2be40437983 SHA512 b117c61055333efb5b845fd54c97aabefb6f3bce33edaf4ab27b94d39438d4907cb7f8a96384bc859593a3a3b784507019b204aa96145d69445bafeb3e0292a1
-AUX oidc-agent-4.3.1_prompt-user-ldflags.patch 254 BLAKE2B 3f734560136de87c8ffec760e5b1608c1e5d3326aba7a19e1907c13df72cec8835e0c818cf05c2bc53ed3e86627453701cf5d13163fbc1366f33d0876de54477 SHA512 38957ed8fb90c3f9cac0995ba125203b76476d427817163a6133b6fa1f312732c586b361a588b67f5fce961cc297918d3285570713be2d7afc7e9176680fd1ca
 AUX oidc-agent-4.4.0_deps-automagic.patch 471 BLAKE2B 83f909d57475a0895bb2305ec7ae1dbe4c54883331eb5e492084bb0816d074658f81ac9683cd375efb0ec51e419590374823e093c3eb5935061f8a2a36bf2184 SHA512 8a559f08bc0aacc4f8152429ca1dc186d88416061d4275780cd373cd92bd72a1ff1f6d667f497dd357eec5fce0caf32d0310644415a92368447c07dc59c6e5fa
 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
-DIST oidc-agent-4.3.1.tar.gz 2124200 BLAKE2B 4108f50688fd0d2043105972a7a7fbab58a74b6a36e0d0a739be5b42a29c3b6bedb29b2273038d49b77fc3245a51f8cf998a12fee5e39096dd5e35ec72660b05 SHA512 3b598f760b1932a07bb243ce7c978a99c209ffbe5594cbb9e084c430c11c089ff0f7be113f73b165bd5f6b382d0ab30dd230c4c9fab6e210a327af20715e6d60
 DIST oidc-agent-4.5.0.tar.gz 1823181 BLAKE2B d2023494689ec65837efcd67e325c690ec1b3a03f78dccce853d1c30e312a89d5d43476132830d10aa63ead7b5cfc91b99fcf78fdfa2d46c60e5a62030c77884 SHA512 23520dc5556ed54ad2dcf3a14a5183f04b1f8030aafd342cfb5f4e21683058da475335c7b29ae0727bd20405e42fad825614d1b7c86fca5a81e4bf3cae5f64c1
 DIST oidc-agent-4.5.1.tar.gz 1823853 BLAKE2B d73ce4405ead08ddc0433a5c3b660b08037eecbde5f1e0358cad8731d0787e63ffae4b1317ecfe824a951e07a82d600fa4180557d93d0ce5a382e8c8f39289d6 SHA512 9afffbfcb00c610b04f97c59d610799a4ce45b1c40a61e388c6ab8b550381725602e43d219ce475a9d0425c1bc07b49ca982379286e9f48ebae1e19ca4587779
-EBUILD oidc-agent-4.3.1.ebuild 2216 BLAKE2B ae16e593d7441e6fab5d5c974eaa3e7a2cf1717b8158010bda31e711b2202704978899809c86e12876ac78ea99987a6eec240f3f71cf1cea5fea92f1415bfba5 SHA512 28be275cb6621d9b22e532e7bc4d5af0f5704e89a8a324a453ebe926f6e96b52f90714c1d9f73d9c47b582dbf6218c8ffef6c4d0de78a019497e9ebcbf3c9a6f
-EBUILD oidc-agent-4.5.0-r1.ebuild 2320 BLAKE2B a30fd549c5f58edf58e6892e8494d01c22c6791f203a8ad53f366b276d260ba7b58a4dbffe77184b39823d5c081bcc26e8f62aad1752a7184448f637786c01e4 SHA512 d753f533fee140306eed6fa65570164d789e4cd58c6628168c139c6f8f4b1b95f4f3a0a665ca9e66b3a6aac4be1a7dcb816633b94bf62b9e45bb47ce96e2f49d
-EBUILD oidc-agent-4.5.1.ebuild 2320 BLAKE2B a30fd549c5f58edf58e6892e8494d01c22c6791f203a8ad53f366b276d260ba7b58a4dbffe77184b39823d5c081bcc26e8f62aad1752a7184448f637786c01e4 SHA512 d753f533fee140306eed6fa65570164d789e4cd58c6628168c139c6f8f4b1b95f4f3a0a665ca9e66b3a6aac4be1a7dcb816633b94bf62b9e45bb47ce96e2f49d
+EBUILD oidc-agent-4.5.0-r1.ebuild 2319 BLAKE2B 1a78db5eb6bd7af28d21420575573c28f5582f549916f69f89c667fc97ddf18cebb65266763afe6daf037ad869f27626c75cb33ec10dbb692a26900db40117eb SHA512 741469095bf4d43338014dadc8411c48f9f59b1a82d2731466467d3cd64d07cc156568016c90d6bb3664b0be11edf71a42fc84777ad83ba23b67605456caa823
+EBUILD oidc-agent-4.5.1.ebuild 2381 BLAKE2B 66ec885583194e0ec29dd95bb7118119fdb0d3a65cb169e0960e64886ad23c3d1a90af2890a64d7eb1397e47b10fb9e06d366877195952282dc9ba4a54004f7c SHA512 d2ee14e3c81c16ec1f85483a7dacb4fee2bacf598b0d030ce9392514d66ab58594bb3b0775bb3fa1a58a96edf6be42387486a7473d0020452f8c21700bd4b945
 MISC metadata.xml 780 BLAKE2B 8a2538e5b233383449dc76e49a4d68f950ad3982874e657664ee027fd71a12f18a9a86f38efd6452732305783cd175b761a7702d1a21b97200b1991d20624fd7 SHA512 a4ba3692ce9304b119ea331f83f702bba0956f0013bbe239bca376dea7ccf72a5bb639f06006cf2d65f8ea4b2817173ef26f1c086ab5482095eff34fea026d3f
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.3.1_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-4.3.1_install-perms.patch
deleted file mode 100644
index 940191322345..000000000000
--- a/net-misc/oidc-agent/files/oidc-agent-4.3.1_install-perms.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -644,19 +644,19 @@
- 
- ## Man pages
- $(MAN_PATH)/man1/$(AGENT).1: $(MANDIR)/$(AGENT).1 $(MAN_PATH)/man1
--	@install $< $@
-+	@install -m 644 $< $@
- $(MAN_PATH)/man1/$(GEN).1: $(MANDIR)/$(GEN).1 $(MAN_PATH)/man1
--	@install $< $@
-+	@install -m 644 $< $@
- $(MAN_PATH)/man1/$(ADD).1: $(MANDIR)/$(ADD).1 $(MAN_PATH)/man1
--	@install $< $@
-+	@install -m 644 $< $@
- $(MAN_PATH)/man1/$(CLIENT).1: $(MANDIR)/$(CLIENT).1 $(MAN_PATH)/man1
--	@install $< $@
-+	@install -m 644 $< $@
- $(MAN_PATH)/man1/$(AGENT_SERVICE).1: $(MANDIR)/$(AGENT_SERVICE).1 $(MAN_PATH)/man1
--	@install $< $@
-+	@install -m 644 $< $@
- $(MAN_PATH)/man1/$(KEYCHAIN).1: $(MANDIR)/$(KEYCHAIN).1 $(MAN_PATH)/man1
--	@install $< $@
-+	@install -m 644 $< $@
- $(PROMPT_MAN_PATH)/man1/$(PROMPT).1: $(MANDIR)/$(PROMPT).1 $(PROMPT_MAN_PATH)/man1
--	@install $< $@
-+	@install -m 644 $< $@
- 
- endif
- 
-@@ -673,16 +673,16 @@
- 	@ln -sf $(SHARED_LIB_NAME_SO) $@
- 
- $(INCLUDE_PATH)/oidc-agent/%.h: $(SRCDIR)/api/%.h $(INCLUDE_PATH)/oidc-agent
--	@install $< $@
-+	@install -m 644 $< $@
- 
- $(INCLUDE_PATH)/oidc-agent/ipc_values.h: $(SRCDIR)/defines/ipc_values.h $(INCLUDE_PATH)/oidc-agent
--	@install $< $@
-+	@install -m 644 $< $@
- 
- $(INCLUDE_PATH)/oidc-agent/oidc_error.h: $(SRCDIR)/utils/oidc_error.h $(INCLUDE_PATH)/oidc-agent
--	@install $< $@
-+	@install -m 644 $< $@
- 
- $(LIBDEV_PATH)/liboidc-agent.a: $(APILIB)/liboidc-agent.a $(LIBDEV_PATH)
--	@install $< $@
-+	@install -m 644 $< $@
- 
- endif
- 
-@@ -690,7 +690,7 @@
- 
- ## scheme handler
- $(DESKTOP_APPLICATION_PATH)/oidc-gen.desktop: $(CONFDIR)/scheme_handler/oidc-gen.desktop
--	@install -D $< $@
-+	@install -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-4.3.1_liblist-automagic.patch b/net-misc/oidc-agent/files/oidc-agent-4.3.1_liblist-automagic.patch
deleted file mode 100644
index ac9ec72c84c9..000000000000
--- a/net-misc/oidc-agent/files/oidc-agent-4.3.1_liblist-automagic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -80,7 +80,7 @@
- 
- # USE_CJSON_SO ?= $(shell /sbin/ldconfig -N -v $(sed 's/:/ /g' <<< $LD_LIBRARY_PATH) 2>/dev/null | grep -i libcjson >/dev/null && echo 1 || echo 0)
- USE_CJSON_SO ?= 0
--USE_LIST_SO ?= $(shell /sbin/ldconfig -N -v $(sed 's/:/ /g' <<< $LD_LIBRARY_PATH) 2>/dev/null | grep -i liblist >/dev/null && echo 1 || echo 0)
-+USE_LIST_SO ?= 0
- USE_ARGP_SO ?= 0
- 
- ifeq ($(USE_CJSON_SO),1)
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.3.1_prompt-user-ldflags.patch b/net-misc/oidc-agent/files/oidc-agent-4.3.1_prompt-user-ldflags.patch
deleted file mode 100644
index cd1b99ee72b5..000000000000
--- a/net-misc/oidc-agent/files/oidc-agent-4.3.1_prompt-user-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -154,7 +154,7 @@
- LINKER   := $(CC)
- LINKER_XX   := $(CXX)
- ifndef ANY_MSYS
--PROMPT_LFLAGS = $(CPPFLAGS) $(LSODIUM)
-+PROMPT_LFLAGS := $(CPPFLAGS) $(LDFLAGS) $(LSODIUM)
- endif
- ifdef MAC_OS
- LFLAGS   = $(LSODIUM) $(LARGP)
diff --git a/net-misc/oidc-agent/oidc-agent-4.3.1.ebuild b/net-misc/oidc-agent/oidc-agent-4.3.1.ebuild
deleted file mode 100644
index ae2c0102654a..000000000000
--- a/net-misc/oidc-agent/oidc-agent-4.3.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command line"
-HOMEPAGE="https://github.com/indigo-dc/oidc-agent"
-SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-IUSE="test"
-
-DEPEND="app-crypt/libsecret
-	dev-libs/libsodium:=
-	media-gfx/qrencode
-	net-libs/libmicrohttpd:=
-	net-libs/webkit-gtk:4=
-	sys-libs/libseccomp
-	elibc_musl? ( sys-libs/argp-standalone )"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( dev-libs/check )"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.1_install-perms.patch
-	"${FILESDIR}"/${PN}-4.3.1_liblist-automagic.patch
-	"${FILESDIR}"/${PN}-4.3.1_prompt-user-ldflags.patch
-)
-
-src_prepare() {
-	xdg_environment_reset
-	default
-	sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile"
-}
-
-src_compile() {
-	use elibc_musl && local -x USE_ARGP_SO=1
-	emake
-}
-
-src_install() {
-	emake \
-		PREFIX="${ED}" \
-		BIN_AFTER_INST_PATH="/usr" \
-		INCLUDE_PATH="${ED}"/usr/include \
-		LIB_PATH="${ED}"/usr/$(get_libdir) \
-		install
-
-	# This file is not compatible with Gentoo and in any case, we generally
-	# let the users load such agents themselves.
-	rm -f "${ED}"/etc/X11/Xsession.d/91${PN}
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog
-		elog "You should use oidc-gen to initially generate your account configuration"
-		elog "before it can be loaded into oidc-agent using oidc-add. For details, please"
-		elog "consult the man page of oidc-gen, or full documentation at"
-		elog "    https://indigo-dc.gitbooks.io/oidc-agent/"
-		elog
-	else
-		local new_major_ver old_ver
-		new_major_ver=$(ver_cut 1)
-		for old_ver in ${REPLACING_VERSIONS}; do
-			if [[ $(ver_cut 1 ${old_ver}) != ${new_major_ver} ]]; then
-				ewarn
-				ewarn "You are upgrading from a different major version. Please restart any running instances of ${PN}"
-				ewarn "to make sure they are compatible with the updated clients."
-				ewarn
-				break
-			fi
-		done
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild b/net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild
index 459b2148429c..3b4667ef6d70 100644
--- a/net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.5.0-r1.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 ~riscv"
+KEYWORDS="amd64 ~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-4.5.1.ebuild
index 459b2148429c..34e8613dbf7d 100644
--- a/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild
@@ -28,7 +28,6 @@ BDEPEND="test? ( dev-libs/check )"
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.4.0_deps-automagic.patch
 	"${FILESDIR}"/${PN}-4.4.0_install-perms.patch
 	"${FILESDIR}"/${PN}-4.5.0_webkit41.patch
 )
@@ -39,15 +38,24 @@ src_prepare() {
 	sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile"
 }
 
+oidc_emake() {
+	local mymakeargs=(
+		USE_CJSON_SO=1
+		USE_LIST_SO=0
+		USE_MUSTACHE_SO=0
+		USE_ARGP_SO=$(usex elibc_musl 1 0)
+	)
+
+	emake "${mymakeargs[@]}" $@
+}
+
 src_compile() {
-	local -x USE_CJSON_SO=1
-	use elibc_musl && local -x USE_ARGP_SO=1
-	emake -j1 create_obj_dir_structure create_picobj_dir_structure # Bug #880157
-	emake
+	oidc_emake -j1 create_obj_dir_structure create_picobj_dir_structure # Bug #880157
+	oidc_emake
 }
 
 src_install() {
-	emake \
+	oidc_emake \
 		PREFIX="${ED}" \
 		BIN_AFTER_INST_PATH="/usr" \
 		INCLUDE_PATH="${ED}"/usr/include \