gentoo resync : 28.04.2021

6 files changed, 3 insertions, 186 deletions

diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 51fb34c6d1ff..ce6cf4d353a1 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,11 +1,6 @@
-AUX oidc-agent-3.3.1_desktop-category.patch 270 BLAKE2B ab841626749f19ecfb6f27d79224a2954633e623f306d66698d6f2d9a53047a29411c12bf572d76e273315a8d99b0f2b664604e6b0aa60efe43f74ff68261d60 SHA512 249d1a50da20e4bc37eb1c8d894bd87dc7f165b85af340ee862c72a926db521819796540fe95bb58c8494c2c8bc13ffd1c8a864ec455b81f878e9cc079872cdb
-AUX oidc-agent-3.3.1_install-perms.patch 1773 BLAKE2B 8fad809127230af52849da4d496cb71a26efbd8529c67c631eeb153472c60f83a96d46e12bd263d3582c8a5c4f4bbd9841a37b3d5e750f7b24c5a205d8b6aa63 SHA512 94631b5c13d9d41dd9377740e4559f65175e6f6438d2cd108a7d3e445005443791b18cd2926e2e925a4774e6d51d1288f665461c12cc390ee60300c192972d3b
-AUX oidc-agent-3.3.5_makefile-toolchain-vars.patch 1342 BLAKE2B 4d2db2bc1711bcc99b4c7c98677836f80a9fabfb824e33c4affa70eda95188e22f32fc787bbd487d5a4462fce2333119ea5d6208c56acf638c5782f2d1b509f2 SHA512 4775a28c5e29b431238b712b7baa98501be3a3b5c46fcdcfae008665374539cd5192f0af81feeb1c5822d7d46378dd66d0650a0f2cf091d4801493a6a34ac2b4
 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
-DIST oidc-agent-3.3.5.tar.gz 766803 BLAKE2B 4998820283d38e3cee76ab7c308075b74da735f6b2c05ed562c5d61006c5ba85f1c44d7e2c0bfb5e4ee60017835ecf331f8b82a45aa5d0105b7933eeec1025a0 SHA512 c58d9e61a99bf870ce4be0e4fde3faa90b8197d0714626412d162c2e09cca18df734a062b792f7fc92323b50677c64df4aeda5ee42a5ea4e44731ad0e15c8030
 DIST oidc-agent-4.0.2.tar.gz 802872 BLAKE2B bbee872f0b029f4289a4805d1a5f8fe2fe2b8c297a918cf7821aec6bf4dbe634882425c888cb0e784778b56754af1c8b5a34d5282f84090cccf6315897ccb461 SHA512 fef440cd4b72055d8175f9f33c735235bb87bfca38b53bc4e049b1644f74f6a683d312297efa04cbacfe55190c5d6b588fa37475e5a55acff540909865389037
-EBUILD oidc-agent-3.3.5-r1.ebuild 1547 BLAKE2B 1baf0c63e4d2e54cd6c8ac1e311e81e3c04af5b27eb8fa9314ec1dba507f567b0407f07d7d3517487943f0de080f240cc84d05ae1a811cffee38f4c241df3372 SHA512 51a4f0bd8f8263bc1589cd56bdda73eb7f2232c309127dbcdc934aaf1a2c74b78c161b94ada715f91f66c2369e02f91a36ca2b37a73fec29f2f8441ec9def9a1
-EBUILD oidc-agent-4.0.2.ebuild 2137 BLAKE2B 2ee40466f628bb06d914923badd5e7d8995ea12e56276be89fbaebcd694838ca01467d0b29cca6a737aafbbf4ac8c6f2407f8b8bfaedad8134d0c551fd6fe7db SHA512 86be93a4c41c0007ecf56f9f70015e6a461e3fa106277fdf0c9c5f792881c0bf75fcb4871719323e5b5852fb2eb76312e97be58dfc4907814c4d53eb1f6f4c92
+EBUILD oidc-agent-4.0.2.ebuild 2123 BLAKE2B b6e3857511ef297bfc0b677df0b6ab343bd57c6c55ead807129e59930888f93074872359da9cbe46ce40b163ad36c50000b2df67e315aa19a815ea69abe277db SHA512 af0a22e5cca7196203c74a6edca8167ecd4b60011b52cf075a27f8bb90a91424b85613799a6401d5410e2bed8b3f5a42e122d3b97851892392ef717667af8600
 MISC metadata.xml 779 BLAKE2B ef7a040559363a8012380b3f8568f963a612078c2d5e5129f54db724d414d6c7864e79e480eba5574fd36847caa13a09a7ac7013f5ceb406d83e3be5ebdb47e9 SHA512 f9465b4e88418ec276071683b5abbe8f7601e54daf0cb74da2d24d142e2307b1bb994ee4191eee48ed1b3fef724ad49b548cef12cc4c77088c2f2d07e1b8a776
diff --git a/net-misc/oidc-agent/files/oidc-agent-3.3.1_desktop-category.patch b/net-misc/oidc-agent/files/oidc-agent-3.3.1_desktop-category.patch
deleted file mode 100644
index 49bfcfdb70b3..000000000000
--- a/net-misc/oidc-agent/files/oidc-agent-3.3.1_desktop-category.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/config/scheme_handler/oidc-gen.desktop
-+++ b/config/scheme_handler/oidc-gen.desktop
-@@ -5,5 +5,5 @@
- Icon=utilities-terminal
- Terminal=true
- Type=Application
--Categories=Application;Network;
-+Categories=Network;
- MimeType=x-scheme-handler/edu.kit.data.oidc-agent;
diff --git a/net-misc/oidc-agent/files/oidc-agent-3.3.1_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-3.3.1_install-perms.patch
deleted file mode 100644
index 1992ee0ef31f..000000000000
--- a/net-misc/oidc-agent/files/oidc-agent-3.3.1_install-perms.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -316,7 +316,7 @@
- 
- ## Bash completion
- $(BASH_COMPLETION_PATH)/$(AGENT): $(CONFDIR)/bash-completion/oidc-agent $(BASH_COMPLETION_PATH)
--	@install -m 744 $< $@
-+	@install -m 644 $< $@
- 
- $(BASH_COMPLETION_PATH)/$(GEN): $(BASH_COMPLETION_PATH)
- 	@ln -s $(AGENT) $@
-@@ -332,15 +332,15 @@
- 
- ## 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/$(KEYCHAIN).1: $(MANDIR)/$(KEYCHAIN).1 $(MAN_PATH)/man1
--	@install $< $@
-+	@install -m 644 $< $@
- 
- 
- ## Lib
-@@ -354,20 +354,20 @@
- 	@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 $< $@
- 
- ## 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-3.3.5_makefile-toolchain-vars.patch b/net-misc/oidc-agent/files/oidc-agent-3.3.5_makefile-toolchain-vars.patch
deleted file mode 100644
index b9d526a2122e..000000000000
--- a/net-misc/oidc-agent/files/oidc-agent-3.3.5_makefile-toolchain-vars.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-1. Support user-provided values of CC, CFLAGS and LDFLAGS
-2. Do not force the use of a static version of libsodium
-
---- a/Makefile
-+++ b/Makefile
-@@ -54,20 +54,20 @@
- 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
- 	CFLAGS += $(shell pkg-config --cflags libsecret-1)
- endif
- TEST_CFLAGS = $(CFLAGS) -I.
- 
- # Linker options
--LINKER   = gcc
-+LINKER   := $(CC)
- ifdef MAC_OS
- LFLAGS   = -lsodium -largp
- else
--LFLAGS   = -l:libsodium.a -lseccomp -fno-common
-+LFLAGS   := $(LDFLAGS) -lsodium -lseccomp -fno-common
- endif
- ifdef HAS_CJSON
- 	LFLAGS += -lcjson
-@@ -81,7 +81,7 @@
- ifdef MAC_OS
- CLIENT_LFLAGS = -L$(APILIB) -largp -loidc-agent.$(LIBVERSION)
- else
--CLIENT_LFLAGS = -L$(APILIB) -l:$(SHARED_LIB_NAME_FULL) -lseccomp
-+CLIENT_LFLAGS = $(LDFLAGS) -L$(APILIB) -l:$(SHARED_LIB_NAME_FULL) -lseccomp
- endif
- ifdef HAS_CJSON
- 	CLIENT_LFLAGS += -lcjson
-@@ -478,7 +478,7 @@
- ifdef MAC_OS
- 	@gcc -dynamiclib -fpic -Wl, -o $@ $(PIC_OBJECTS) -lc
- else
--	@gcc -shared -fpic -Wl,-soname,$(SONAME) -o $@ $(PIC_OBJECTS) -lc
-+	@$(LINKER) -shared -fpic -Wl,-soname,$(SONAME) $(LDFLAGS) -o $@ $(PIC_OBJECTS) -lc
- endif
- 
- .PHONY: shared_lib
diff --git a/net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild b/net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild
deleted file mode 100644
index 1a5486a56b56..000000000000
--- a/net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic 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"
-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}-3.3.1_desktop-category.patch
-	"${FILESDIR}"/${PN}-3.3.1_install-perms.patch
-	"${FILESDIR}"/${PN}-3.3.5_makefile-toolchain-vars.patch
-)
-
-src_compile() {
-	# Parallel building doesn't work
-	emake -j1
-}
-
-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
-
-	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
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild b/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild
index 88d48a54d23d..31efe94451d4 100644
--- a/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic xdg-utils
+inherit 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"
+KEYWORDS="amd64"
 IUSE="test"
 
 DEPEND="app-crypt/libsecret