commit: c21e98131e91cc4eb2bacfbb7778f81ae32ad160 Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Tue Apr 27 09:27:44 2021 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Tue Apr 27 09:27:44 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c21e9813
net-misc/oidc-agent: drop 3.3.5-r1 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> net-misc/oidc-agent/Manifest | 1 - .../files/oidc-agent-3.3.1_desktop-category.patch | 9 ---- .../files/oidc-agent-3.3.1_install-perms.patch | 58 -------------------- .../oidc-agent-3.3.5_makefile-toolchain-vars.patch | 48 ----------------- net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild | 63 ---------------------- 5 files changed, 179 deletions(-) diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest index 32122374ea2..f32866fb26c 100644 --- a/net-misc/oidc-agent/Manifest +++ b/net-misc/oidc-agent/Manifest @@ -1,2 +1 @@ -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 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 49bfcfdb70b..00000000000 --- 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 1992ee0ef31..00000000000 --- 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 b9d526a2122..00000000000 --- 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 38fd552ac87..00000000000 --- a/net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild +++ /dev/null @@ -1,63 +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" -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 -}