gentoo resync : 16.01.2021

5 files changed, 5 insertions, 138 deletions

diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index b01f116ee8d8..c4293771e205 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,11 +1,8 @@
 AUX oidc-agent-4.0.2_makefile-liblist-automagic.patch 448 BLAKE2B df7716192364c71619af14cdd88323a2b6ac7b382d76326aacafa0814dc141416fdda87fc3a11eae8c333e0ac4fcad4386d2e902e13a300a12bd5cbe25df11d7 SHA512 b1145a26fe837a06291067c62bb939b76993e10194a0fc155cfc892677e4f432e0744410dee23eaf14f3a04a9a0c5d8629abaa7c40e3e1abe28ccb2868a41ceb
 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
 AUX oidc-agent-4.2.4_makefile-toolchain-vars.patch 1216 BLAKE2B 52a0b1141772b4c0be288909657a8215db635f9a95cadf542d36c421a6fd7a71a38996f691d94838f4f37d28fd49ac7921e4371c13a7d702d07ba75f67a7693f SHA512 1664e44399a7152b632376d6d44ae8ccf360145f705709af24011ca0e637e976393a49898b0666eebba9ccddc7525d38c464e16768c34e8972709739c567eb16
-DIST oidc-agent-4.1.1.tar.gz 801103 BLAKE2B dcb82a537787ae6ced577843c67acdd4e3fa315d017222067b2914837dfffccae27ddbdeeeaf4e8ca70c7e2744e03df5964d3ba318efd4460c73252bfd3f8e95 SHA512 e383e054623dc3b8fe73ec02df44faa05d4b69aaed47c7925f6f92d25cbc5301173fbc607b6198bc70f99e634e582fbae7c5570812086a8e5694d40ce6d2c2d1
 DIST oidc-agent-4.2.4.tar.gz 823459 BLAKE2B 71c2fd983031641c5ed39ba3f1771bf283ab56eae6bba426da5308a7c9fcf2ce48103220375b9881e255eeddf05d50d58e2dee047b0b4436451c8d39b0cd55e6 SHA512 6f4f79823869197a0b74cd757b72e1d060ed9f1d9be477f815989b723a86285b200bd72b95f07a4698e754b9ad7aae48cee72603e1a6eaab71590cc63c2bae3d
-DIST oidc-agent-4.2.5.tar.gz 823881 BLAKE2B 533917fdb739ef529c1ca4e06b30a64361710c958b2b6e7a23a6d9c1f1195263ec98f1211cda5dbe9d77f6df7ca0509d29c4e0d595825a908d605ea5ececa8be SHA512 983e59dc3b97b1800733c98fc7ba5e33405a84cb66be7006932c88cb3ccdbfbc9f12d274c1f61294b0fb7ec93fecd2165196f7cc9e056bda0c23a974479f6aa2
-EBUILD oidc-agent-4.1.1-r1.ebuild 2052 BLAKE2B 1b40576b3e8869a7a6904192ab397786a3dfb3be1c14910fb8efacc0f7931dea599378602f4f776947d81c38cb188c792c74db741685d292eb4533dafd7907aa SHA512 e498dd833ef994e96f4f9fe41d42edb5334f3dae38d85a3929c5d2b6ef7d28bca15253be4029922a45849e51771b92f411f81f3fb2850e3f86bbed50be694d13
-EBUILD oidc-agent-4.2.4.ebuild 2073 BLAKE2B a0fe26c99af5804e0f677b8f59e72ba6500aea62ec747b9cc37e2e28b4345a143af9e98b3db6c71b1e49bdb33c3a976be5138b0235ef5e895cc07edcc85722af SHA512 b8421a3a592487eec4ece9b51e11f94bd0e93a59f78e7ade0cbb75f0ce239d929d4d11a8e75835f0fa27ea2bb8b2a591f5120cce53b036ee0ec43076597b3781
-EBUILD oidc-agent-4.2.5.ebuild 2073 BLAKE2B f9ee4244e3d735893a35cf91b639346c75832e7a9e9796897e7200f5a71bd7bb97209f145c46930ebca2d83f6d56ea171eff4f5b3bac724d04115b0847ef9adf SHA512 91d47f30a9dc9b2934e1c070d0dcca9cf3f82a613f7b8f21c2f4c18467d874577db4da52a7f616ea792641d6740d5ed40dd0de8947d5422dc0a39f7a10fb6411
+DIST oidc-agent-4.2.6.tar.gz 824079 BLAKE2B f7cf810254eae00acc1b4c036fe58dda1c62b3db4d7d02a5782269485200a6a4c1d650a6cfac5f6a0e5764a1b2e19d4885eb7744c84724f927aa6d9f18f5bb55 SHA512 6f23cb13c917ce389eea3bb55e802834ff7c1bf1c421264fdcce27eb5a20b11a498d8d76c002eb92bbf3618942803ddb9937f59d19ff1aff6fe9ca07df40d0bb
+EBUILD oidc-agent-4.2.4.ebuild 2072 BLAKE2B b91b60f3c7111cbf82cb5151d9ad36ae0a2e2a16dfe1e03177b43a01b567d57624eabe1b8f73a4d710218d0b2b82ce7815fd2b790f18a47d2bd47d43c5988f2c SHA512 83f314dabcbd38324765ade248ee675adbe7f9609a45472af0a55ebae6bd84fafb46b27cc2332a4bf544e1d9289b99604cdd55af0f34ebdbb66b8c3c852dfbc1
+EBUILD oidc-agent-4.2.6.ebuild 2016 BLAKE2B 273087c56bb3719e2a0ed8a11b7cc0d5712245903afe5fe4ed35054ed7aecdf25806888c35568e92d974e3f06fd726d87dd6ad3d58495874f19691a638d44573 SHA512 8688ad81aa4077e0c1513e880f2e494c627934d88f3370698b469a601768582919aee279e5d372e445f466ed4bd691785944026d93fbb31d5638ce9f65c7fda5
 MISC metadata.xml 780 BLAKE2B 8a2538e5b233383449dc76e49a4d68f950ad3982874e657664ee027fd71a12f18a9a86f38efd6452732305783cd175b761a7702d1a21b97200b1991d20624fd7 SHA512 a4ba3692ce9304b119ea331f83f702bba0956f0013bbe239bca376dea7ccf72a5bb639f06006cf2d65f8ea4b2817173ef26f1c086ab5482095eff34fea026d3f
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.1.0_makefile-toolchain-vars.patch b/net-misc/oidc-agent/files/oidc-agent-4.1.0_makefile-toolchain-vars.patch
deleted file mode 100644
index 2f42a21afbd6..000000000000
--- a/net-misc/oidc-agent/files/oidc-agent-4.1.0_makefile-toolchain-vars.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -89,9 +89,9 @@
- endif
- 
- # Compiler options
--CC       = gcc
-+CC       := $(CC)
- # compiling flags here
--CFLAGS   = -g -std=c99 -I$(SRCDIR) -I$(LIBDIR)  -Wall -Wextra -fno-common
-+CFLAGS   := $(CFLAGS) -g -std=c99 -I$(SRCDIR) -I$(LIBDIR)  -Wall -Wextra -fno-common
- ifndef MAC_OS
- ifndef NODPKG
- 	CFLAGS   +=$(shell dpkg-buildflags --get CPPFLAGS)
-@@ -102,11 +102,11 @@
- TEST_CFLAGS = $(CFLAGS) -I.
- 
- # Linker options
--LINKER   = gcc
-+LINKER   := $(CC)
- ifdef MAC_OS
- LFLAGS   = $(LSODIUM) $(LARGP)
- else
--LFLAGS   = $(LSODIUM) $(LSECCOMP) -fno-common
-+LFLAGS   := $(LDFLAGS) $(LSODIUM) $(LSECCOMP) -fno-common
- ifndef NODPKG
- LFLAGS +=$(shell dpkg-buildflags --get LDFLAGS)
- endif
-@@ -117,7 +117,7 @@
- ifeq ($(USE_LIST_SO),1)
- 	LFLAGS += $(LLIST)
- endif
--AGENT_LFLAGS = $(LCURL) $(LMICROHTTPD) $(LFLAGS)
-+AGENT_LFLAGS := $(LDFLAGS) $(LCURL) $(LMICROHTTPD) $(LFLAGS)
- ifndef MAC_OS
- 	AGENT_LFLAGS += $(LSECRET) $(LGLIB)
- endif
-@@ -126,12 +126,12 @@
- ifdef MAC_OS
- CLIENT_LFLAGS = -L$(APILIB) $(LARGP) $(LAGENT) $(LSODIUM)
- else
--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)
- ifndef MAC_OS
- ifndef NODPKG
- 	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
deleted file mode 100644
index a4b1287eadfa..000000000000
--- a/net-misc/oidc-agent/oidc-agent-4.1.1-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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:=
-	net-libs/libmicrohttpd:=
-	sys-libs/libseccomp"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( dev-libs/check )"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.2_makefile-liblist-automagic.patch
-	"${FILESDIR}"/${PN}-4.1.0_install-perms.patch
-	"${FILESDIR}"/${PN}-4.1.0_makefile-toolchain-vars.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile"
-}
-
-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.2.4.ebuild b/net-misc/oidc-agent/oidc-agent-4.2.4.ebuild
index ff691320302b..a24c2290d64e 100644
--- a/net-misc/oidc-agent/oidc-agent-4.2.4.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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.2.5.ebuild b/net-misc/oidc-agent/oidc-agent-4.2.6.ebuild
index eb58ba92f64c..fc0c23c79b2e 100644
--- a/net-misc/oidc-agent/oidc-agent-4.2.5.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.2.6.ebuild
@@ -27,7 +27,6 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.0.2_makefile-liblist-automagic.patch
 	"${FILESDIR}"/${PN}-4.1.0_install-perms.patch
-	"${FILESDIR}"/${PN}-4.2.4_makefile-toolchain-vars.patch
 )
 
 src_prepare() {