gentoo resync : 13.11.2021

5 files changed, 21 insertions, 91 deletions

diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 44a089417fbb..89bc1b321840 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,10 +1,9 @@
-AUX oidc-agent-4.0.2_install-perms.patch 1931 BLAKE2B 9061a41dc805f98c4813f967f2e0280ed519c143551c9232bd1a3786f6e4569407744d3821845b5245751fb6bd91462d45fa6f12dcae92fcac1abd6fb5bf2f51 SHA512 f924f3e3bbcb0e427036fb2c13e9272641b340d829d19389c072faef5da6381f1470858033c78bc356bbba75b622bc0283cc4e1fba3255f80788b2d09fab5106
 AUX oidc-agent-4.0.2_makefile-liblist-automagic.patch 448 BLAKE2B df7716192364c71619af14cdd88323a2b6ac7b382d76326aacafa0814dc141416fdda87fc3a11eae8c333e0ac4fcad4386d2e902e13a300a12bd5cbe25df11d7 SHA512 b1145a26fe837a06291067c62bb939b76993e10194a0fc155cfc892677e4f432e0744410dee23eaf14f3a04a9a0c5d8629abaa7c40e3e1abe28ccb2868a41ceb
-AUX oidc-agent-4.0.2_makefile-toolchain-vars.patch 1214 BLAKE2B 2e2c78973049160a9b6210d2180bb851c11a31ce90c8c1af5f05b0d86cd7cdce572c564c4117ec23f286c72a4d701b52ec815f6f30e68c58353fe5394bd210e6 SHA512 22c561c057be1de9ba1747a0234225954ec953f2bdecb0cc05149891e6fc43fede14808dbf59e9e27e5e5e8041d22b16ba4d46e366bd5b96a2b567b2d26a0f8d
 AUX oidc-agent-4.1.0_install-perms.patch 1911 BLAKE2B a74915c1ea19c4d8fcfc09b30c60259e361776c458d0f52885ba4399f0599a8094caced14f59cd024331a4d09efe9298061b914faf4e74a700975e2afb7890df SHA512 9390b4ee8a5baccd8de0f5b22c18ea6d2c0a3c83e70b3e3f44af87cf563ec332ce40c6f5cb4f0f7065cb6b17317442daa22de125139823b4b99428c0624fa08d
 AUX oidc-agent-4.1.0_makefile-toolchain-vars.patch 1439 BLAKE2B 9e3477c1eb3303cfbf66f99f8a3fb71966c78c2af2922219efe6684c2fc572fafd8c5d9e93c70cc05aabeed3a53d97a592f3e22d9a0aa6931ce436946fc194c7 SHA512 e96d88784bc55095308fc40da8c969da1068ec6c2ca62ed34fa455785c28f1e4373c49a8023f2ca77fa64cacdb27481972eae014e66315b30c9de2a76651749f
-DIST oidc-agent-4.0.2.tar.gz 802872 BLAKE2B bbee872f0b029f4289a4805d1a5f8fe2fe2b8c297a918cf7821aec6bf4dbe634882425c888cb0e784778b56754af1c8b5a34d5282f84090cccf6315897ccb461 SHA512 fef440cd4b72055d8175f9f33c735235bb87bfca38b53bc4e049b1644f74f6a683d312297efa04cbacfe55190c5d6b588fa37475e5a55acff540909865389037
+AUX oidc-agent-4.2.2_makefile-toolchain-vars.patch 1194 BLAKE2B dd0e28e3dbbd2aced6742afbfa1c7bfaa79111a0be4cfaf822184761173a6c6d209c1f6f9fdd4bb3fcf41a94df09b24dbee1bf0e949443ab0e7938d3002cf0ec SHA512 b7555d04afa850aa1579def5825f7e22a024358d8ce5850632f379d2e94a13a2de1c2eb79619c3d6e80b57292d95037103ead3e54c8825b6a349734c5e4e37c2
 DIST oidc-agent-4.1.1.tar.gz 801103 BLAKE2B dcb82a537787ae6ced577843c67acdd4e3fa315d017222067b2914837dfffccae27ddbdeeeaf4e8ca70c7e2744e03df5964d3ba318efd4460c73252bfd3f8e95 SHA512 e383e054623dc3b8fe73ec02df44faa05d4b69aaed47c7925f6f92d25cbc5301173fbc607b6198bc70f99e634e582fbae7c5570812086a8e5694d40ce6d2c2d1
-EBUILD oidc-agent-4.0.2-r1.ebuild 2134 BLAKE2B 3a654a6b6e3c8bafa04001580abef231ed3b71f4e15b7a918f771f8f93442e99b0f0a77fb6332da74b63def9db04d9c4d0ea8df91b56c1f22aa6499639710189 SHA512 b65d825c1d5fe74a7693d62a8d51c725f11b75f1c873ae9deac3d43802eb234c009ab985ea561a3bfeff01b4bcd4186a445a52895232e5823f721d65e739cdb3
-EBUILD oidc-agent-4.1.1-r1.ebuild 2137 BLAKE2B 749784644c7ab3a5665dcc2265bd98f5bfdbe32909b4ad66745cfaab154832697e29bea3538d4878130bb36865af100569f81288f42be41a1354e08b80ce118a SHA512 3298f8ab25b46039650d9ecc71ee3a5b0d8e0f17a41c6e156b9e484e8c03539754cd60c21c419c867f1116251169217e06f1d5d167ab817dc6951d2cda5ac007
+DIST oidc-agent-4.2.2.tar.gz 823169 BLAKE2B 5ce071c1ac6e65ab7de869e9963884e60142dc1c93e8eb3eb00c144527754199867238eb45ca2cba814dedf7e55b2aedf66f45e613697ebc3262598fca0312e5 SHA512 852eb5c6c071aafa58366e5e867f95908cac2fa0c3b6924e021cc81825b0bba0549e74742eff0ef5a9bbb16173e21c94ba7b618150a42b585968b4cd4663409e
+EBUILD oidc-agent-4.1.1-r1.ebuild 2052 BLAKE2B 1b40576b3e8869a7a6904192ab397786a3dfb3be1c14910fb8efacc0f7931dea599378602f4f776947d81c38cb188c792c74db741685d292eb4533dafd7907aa SHA512 e498dd833ef994e96f4f9fe41d42edb5334f3dae38d85a3929c5d2b6ef7d28bca15253be4029922a45849e51771b92f411f81f3fb2850e3f86bbed50be694d13
+EBUILD oidc-agent-4.2.2.ebuild 2073 BLAKE2B c6d1c5992bdb7aa47af2b5c7795f83a9976d5e335e7cad3a93d765bafa034660d23021f3f4c0071aba2dbbde22ebdb6a0ab07a5342bdfcbb6515ec887266062e SHA512 7b21b359b66da7d9badcc551b7a12bf507825d46f85a4e3a11343f510456192a3ccc4a69c48b0fcd9f0fe1eb75b98f0a43058ce5448608ced006f761ebb8d2a9
 MISC metadata.xml 780 BLAKE2B 8a2538e5b233383449dc76e49a4d68f950ad3982874e657664ee027fd71a12f18a9a86f38efd6452732305783cd175b761a7702d1a21b97200b1991d20624fd7 SHA512 a4ba3692ce9304b119ea331f83f702bba0956f0013bbe239bca376dea7ccf72a5bb639f06006cf2d65f8ea4b2817173ef26f1c086ab5482095eff34fea026d3f
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.0.2_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-4.0.2_install-perms.patch
deleted file mode 100644
index 6184f42d9335..000000000000
--- a/net-misc/oidc-agent/files/oidc-agent-4.0.2_install-perms.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -411,19 +411,19 @@
- 
- ## Man pages
- $(MAN_PATH)/man1/$(AGENT).1: $(MANDIR)/$(AGENT).1 $(MAN_PATH)/man1
--	@install $< $@
-+	@install -m 644 $< $@
- $(AGENTSERVER_MAN_PATH)/man1/$(AGENTSERVER).1: $(MANDIR)/$(AGENTSERVER).1 $(AGENTSERVER_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/$(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 $< $@
- 
- 
- ## Lib
-@@ -437,24 +437,24 @@
- 	@ln -sf $(SHARED_LIB_NAME_SO) $@
- 
- $(INCLUDE_PATH)/oidc-agent/api.h: $(SRCDIR)/$(CLIENT)/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 $< $@
- 
- $(INCLUDE_PATH)/oidc-agent/export_symbols.h: $(SRCDIR)/$(CLIENT)/export_symbols.h $(INCLUDE_PATH)/oidc-agent
--	@install $< $@
-+	@install -m 644 $< $@
- 
- 
- ## 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.0.2_makefile-toolchain-vars.patch b/net-misc/oidc-agent/files/oidc-agent-4.2.2_makefile-toolchain-vars.patch
index 533af1f2a6d4..2df3afce8e68 100644
--- a/net-misc/oidc-agent/files/oidc-agent-4.0.2_makefile-toolchain-vars.patch
+++ b/net-misc/oidc-agent/files/oidc-agent-4.2.2_makefile-toolchain-vars.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -74,9 +74,9 @@
+@@ -92,9 +92,9 @@
  endif
  
  # Compiler options
@@ -12,32 +12,32 @@
  ifndef MAC_OS
  ifndef NODPKG
  	CFLAGS   +=$(shell dpkg-buildflags --get CPPFLAGS)
-@@ -87,11 +87,11 @@
+@@ -106,11 +106,11 @@
  TEST_CFLAGS = $(CFLAGS) -I.
  
  # Linker options
 -LINKER   = gcc
 +LINKER   := $(CC)
  ifdef MAC_OS
- LFLAGS   = -lsodium -largp
+ LFLAGS   = $(LSODIUM) $(LARGP)
  else
--LFLAGS   = -lsodium -lseccomp -fno-common
-+LFLAGS   := $(LDFLAGS) -lsodium -lseccomp -fno-common
+-LFLAGS   = $(LSODIUM) $(LSECCOMP) -fno-common
++LFLAGS   := $(LDFLAGS) $(LSODIUM) $(LSECCOMP) -fno-common
  ifndef NODPKG
  LFLAGS +=$(shell dpkg-buildflags --get LDFLAGS)
  endif
-@@ -112,12 +112,12 @@
+@@ -130,12 +130,12 @@
  ifdef MAC_OS
- CLIENT_LFLAGS = -L$(APILIB) -largp -loidc-agent.$(LIBVERSION) -lsodium
+ CLIENT_LFLAGS = -L$(APILIB) $(LARGP) $(LAGENT) $(LSODIUM)
  else
--CLIENT_LFLAGS = -L$(APILIB) -l:$(SHARED_LIB_NAME_FULL) -lsodium -lseccomp
-+CLIENT_LFLAGS := $(LDFLAGS) -L$(APILIB) -l:$(SHARED_LIB_NAME_FULL) -lsodium -lseccomp
+-CLIENT_LFLAGS = -L$(APILIB) $(LAGENT) $(LSODIUM) $(LSECCOMP)
++CLIENT_LFLAGS := $(LDFLAGS) -L$(APILIB) $(LAGENT) $(LSODIUM) $(LSECCOMP)
  ifndef NODPKG
  	CLIENT_LFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
  endif
  endif
--LIB_LFLAGS = -lc -lsodium
-+LIB_LFLAGS := $(LDFLAGS) -lc -lsodium
+-LIB_LFLAGS = -lc $(LSODIUM)
++LIB_LFLAGS := $(LDFLAGS) -lc $(LSODIUM)
  ifndef MAC_OS
  ifndef NODPKG
- 	LIB_FLAGS += $(shell dpkg-buildflags --get LDFLAGS)
+ 	LIB_LFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
diff --git a/net-misc/oidc-agent/oidc-agent-4.1.1-r1.ebuild b/net-misc/oidc-agent/oidc-agent-4.1.1-r1.ebuild
index efb002fd48f8..a4b1287eadfa 100644
--- a/net-misc/oidc-agent/oidc-agent-4.1.1-r1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.1.1-r1.ebuild
@@ -34,11 +34,6 @@ src_prepare() {
 	sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile"
 }
 
-#src_compile() {
-	# As of 4.0.2 parallel building still doesn't work
-#	emake -j1
-#}
-
 src_install() {
 	emake \
 		PREFIX="${ED}" \
diff --git a/net-misc/oidc-agent/oidc-agent-4.0.2-r1.ebuild b/net-misc/oidc-agent/oidc-agent-4.2.2.ebuild
index 9e463b228212..53f713528866 100644
--- a/net-misc/oidc-agent/oidc-agent-4.0.2-r1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit xdg-utils
 
@@ -11,11 +11,12 @@ 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
 	dev-libs/libsodium:=
+	media-gfx/qrencode
 	net-libs/libmicrohttpd:=
 	sys-libs/libseccomp"
 RDEPEND="${DEPEND}"
@@ -24,9 +25,9 @@ BDEPEND="test? ( dev-libs/check )"
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.2_install-perms.patch
 	"${FILESDIR}"/${PN}-4.0.2_makefile-liblist-automagic.patch
-	"${FILESDIR}"/${PN}-4.0.2_makefile-toolchain-vars.patch
+	"${FILESDIR}"/${PN}-4.1.0_install-perms.patch
+	"${FILESDIR}"/${PN}-4.2.2_makefile-toolchain-vars.patch
 )
 
 src_prepare() {
@@ -34,11 +35,6 @@ src_prepare() {
 	sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile"
 }
 
-src_compile() {
-	# As of 4.0.2 parallel building still doesn't work
-	emake -j1
-}
-
 src_install() {
 	emake \
 		PREFIX="${ED}" \