1 |
commit: f2a0e2fddefa685fb80d57992e1de093984b250c |
2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 24 13:47:03 2022 +0000 |
4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 24 13:47:03 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2a0e2fd |
7 |
|
8 |
net-misc/oidc-agent: drop 4.2.4 |
9 |
|
10 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
11 |
|
12 |
net-misc/oidc-agent/Manifest | 1 - |
13 |
.../oidc-agent-4.2.4_makefile-toolchain-vars.patch | 43 ------------ |
14 |
net-misc/oidc-agent/oidc-agent-4.2.4.ebuild | 78 ---------------------- |
15 |
3 files changed, 122 deletions(-) |
16 |
|
17 |
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest |
18 |
index ae0127b7b1d4..19d96f9eb2f8 100644 |
19 |
--- a/net-misc/oidc-agent/Manifest |
20 |
+++ b/net-misc/oidc-agent/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST oidc-agent-4.2.4.tar.gz 823459 BLAKE2B 71c2fd983031641c5ed39ba3f1771bf283ab56eae6bba426da5308a7c9fcf2ce48103220375b9881e255eeddf05d50d58e2dee047b0b4436451c8d39b0cd55e6 SHA512 6f4f79823869197a0b74cd757b72e1d060ed9f1d9be477f815989b723a86285b200bd72b95f07a4698e754b9ad7aae48cee72603e1a6eaab71590cc63c2bae3d |
23 |
DIST oidc-agent-4.2.6.tar.gz 824079 BLAKE2B f7cf810254eae00acc1b4c036fe58dda1c62b3db4d7d02a5782269485200a6a4c1d650a6cfac5f6a0e5764a1b2e19d4885eb7744c84724f927aa6d9f18f5bb55 SHA512 6f23cb13c917ce389eea3bb55e802834ff7c1bf1c421264fdcce27eb5a20b11a498d8d76c002eb92bbf3618942803ddb9937f59d19ff1aff6fe9ca07df40d0bb |
24 |
|
25 |
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.2.4_makefile-toolchain-vars.patch b/net-misc/oidc-agent/files/oidc-agent-4.2.4_makefile-toolchain-vars.patch |
26 |
deleted file mode 100644 |
27 |
index 7d4bc3b30744..000000000000 |
28 |
--- a/net-misc/oidc-agent/files/oidc-agent-4.2.4_makefile-toolchain-vars.patch |
29 |
+++ /dev/null |
30 |
@@ -1,43 +0,0 @@ |
31 |
---- a/Makefile |
32 |
-+++ b/Makefile |
33 |
-@@ -92,9 +92,9 @@ |
34 |
- endif |
35 |
- |
36 |
- # Compiler options |
37 |
--CC = gcc |
38 |
-+CC := $(CC) |
39 |
- # compiling flags here |
40 |
--CFLAGS = -g -std=c99 -I$(SRCDIR) -I$(LIBDIR) -Wall -Wextra -fno-common |
41 |
-+CFLAGS := $(CFLAGS) -g -std=c99 -I$(SRCDIR) -I$(LIBDIR) -Wall -Wextra -fno-common |
42 |
- ifndef MAC_OS |
43 |
- ifndef NODPKG |
44 |
- CFLAGS +=$(shell dpkg-buildflags --get CPPFLAGS) |
45 |
-@@ -106,11 +106,11 @@ |
46 |
- TEST_CFLAGS = $(CFLAGS) -I. |
47 |
- |
48 |
- # Linker options |
49 |
--LINKER = gcc |
50 |
-+LINKER := $(CC) |
51 |
- ifdef MAC_OS |
52 |
- LFLAGS = $(LSODIUM) $(LARGP) |
53 |
- else |
54 |
--LFLAGS = $(LSODIUM) $(LSECCOMP) -fno-common -Wl,-z,now |
55 |
-+LFLAGS := $(LDFLAGS) $(LSODIUM) $(LSECCOMP) -fno-common -Wl,-z,now |
56 |
- ifndef NODPKG |
57 |
- LFLAGS +=$(shell dpkg-buildflags --get LDFLAGS) |
58 |
- endif |
59 |
-@@ -130,12 +130,12 @@ |
60 |
- ifdef MAC_OS |
61 |
- CLIENT_LFLAGS = -L$(APILIB) $(LARGP) $(LAGENT) $(LSODIUM) |
62 |
- else |
63 |
--CLIENT_LFLAGS = -L$(APILIB) $(LAGENT) $(LSODIUM) $(LSECCOMP) |
64 |
-+CLIENT_LFLAGS := $(LDFLAGS) -L$(APILIB) $(LAGENT) $(LSODIUM) $(LSECCOMP) |
65 |
- ifndef NODPKG |
66 |
- CLIENT_LFLAGS += $(shell dpkg-buildflags --get LDFLAGS) |
67 |
- endif |
68 |
- endif |
69 |
--LIB_LFLAGS = -lc $(LSODIUM) |
70 |
-+LIB_LFLAGS := $(LDFLAGS) -lc $(LSODIUM) |
71 |
- ifndef MAC_OS |
72 |
- ifndef NODPKG |
73 |
- LIB_LFLAGS += $(shell dpkg-buildflags --get LDFLAGS) |
74 |
|
75 |
diff --git a/net-misc/oidc-agent/oidc-agent-4.2.4.ebuild b/net-misc/oidc-agent/oidc-agent-4.2.4.ebuild |
76 |
deleted file mode 100644 |
77 |
index a24c2290d64e..000000000000 |
78 |
--- a/net-misc/oidc-agent/oidc-agent-4.2.4.ebuild |
79 |
+++ /dev/null |
80 |
@@ -1,78 +0,0 @@ |
81 |
-# Copyright 1999-2022 Gentoo Authors |
82 |
-# Distributed under the terms of the GNU General Public License v2 |
83 |
- |
84 |
-EAPI=8 |
85 |
- |
86 |
-inherit xdg-utils |
87 |
- |
88 |
-DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command line" |
89 |
-HOMEPAGE="https://github.com/indigo-dc/oidc-agent" |
90 |
-SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
91 |
- |
92 |
-LICENSE="MIT" |
93 |
-SLOT="0" |
94 |
-KEYWORDS="amd64 ~riscv" |
95 |
-IUSE="test" |
96 |
- |
97 |
-DEPEND="app-crypt/libsecret |
98 |
- dev-libs/libsodium:= |
99 |
- media-gfx/qrencode |
100 |
- net-libs/libmicrohttpd:= |
101 |
- sys-libs/libseccomp" |
102 |
-RDEPEND="${DEPEND}" |
103 |
-BDEPEND="test? ( dev-libs/check )" |
104 |
- |
105 |
-RESTRICT="!test? ( test )" |
106 |
- |
107 |
-PATCHES=( |
108 |
- "${FILESDIR}"/${PN}-4.0.2_makefile-liblist-automagic.patch |
109 |
- "${FILESDIR}"/${PN}-4.1.0_install-perms.patch |
110 |
- "${FILESDIR}"/${PN}-4.2.4_makefile-toolchain-vars.patch |
111 |
-) |
112 |
- |
113 |
-src_prepare() { |
114 |
- default |
115 |
- sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile" |
116 |
-} |
117 |
- |
118 |
-src_install() { |
119 |
- emake \ |
120 |
- PREFIX="${ED}" \ |
121 |
- BIN_AFTER_INST_PATH="/usr" \ |
122 |
- INCLUDE_PATH="${ED}"/usr/include \ |
123 |
- LIB_PATH="${ED}"/usr/$(get_libdir) \ |
124 |
- install |
125 |
- |
126 |
- # This file is not compatible with Gentoo and in any case, we generally |
127 |
- # let the users load such agents themselves. |
128 |
- rm -f "${ED}"/etc/X11/Xsession.d/91${PN} |
129 |
-} |
130 |
- |
131 |
-pkg_postinst() { |
132 |
- xdg_desktop_database_update |
133 |
- |
134 |
- if [[ -z "${REPLACING_VERSIONS}" ]]; then |
135 |
- elog |
136 |
- elog "You should use oidc-gen to initially generate your account configuration" |
137 |
- elog "before it can be loaded into oidc-agent using oidc-add. For details, please" |
138 |
- elog "consult the man page of oidc-gen, or full documentation at" |
139 |
- elog " https://indigo-dc.gitbooks.io/oidc-agent/" |
140 |
- elog |
141 |
- else |
142 |
- local new_major_ver old_ver |
143 |
- new_major_ver=$(ver_cut 1) |
144 |
- for old_ver in ${REPLACING_VERSIONS}; do |
145 |
- if [[ $(ver_cut 1 ${old_ver}) != ${new_major_ver} ]]; then |
146 |
- ewarn |
147 |
- ewarn "You are upgrading from a different major version. Please restart any running instances of ${PN}" |
148 |
- ewarn "to make sure they are compatible with the updated clients." |
149 |
- ewarn |
150 |
- break |
151 |
- fi |
152 |
- done |
153 |
- fi |
154 |
-} |
155 |
- |
156 |
-pkg_postrm() { |
157 |
- xdg_desktop_database_update |
158 |
-} |