Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-nds/tac_plus/files/, net-nds/tac_plus/
Date: Tue, 30 Mar 2021 21:45:59
Message-Id: 1617140742.10e80accf8f641cf77cd11546ae8333da3ad80ec.sam@gentoo
1 commit: 10e80accf8f641cf77cd11546ae8333da3ad80ec
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 30 21:25:13 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 30 21:45:42 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10e80acc
7
8 net-nds/tac_plus: port to EAPI 7, drop base.eclass
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 .../files/tac_plus-4.0.4.19-deansification.patch | 5 ++--
13 .../files/tac_plus-4.0.4.19-parallelmake.patch | 6 ++---
14 .../files/tac_plus-4.0.4.27a-deansification.patch | 5 ++--
15 .../files/tac_plus-4.0.4.27a-parallelmake.patch | 5 ++--
16 net-nds/tac_plus/files/tac_plus.conf | 3 +--
17 net-nds/tac_plus/files/tac_plus.conf2 | 2 +-
18 net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild | 28 ++++++++++++----------
19 net-nds/tac_plus/tac_plus-4.0.4.27a.ebuild | 25 +++++++++++--------
20 8 files changed, 41 insertions(+), 38 deletions(-)
21
22 diff --git a/net-nds/tac_plus/files/tac_plus-4.0.4.19-deansification.patch b/net-nds/tac_plus/files/tac_plus-4.0.4.19-deansification.patch
23 index 4dbc3370726..4a1f579c62e 100644
24 --- a/net-nds/tac_plus/files/tac_plus-4.0.4.19-deansification.patch
25 +++ b/net-nds/tac_plus/files/tac_plus-4.0.4.19-deansification.patch
26 @@ -1,6 +1,5 @@
27 -diff -uNr tacacs+-F4.0.4.19.ORIG/configure.in tacacs+-F4.0.4.19/configure.in
28 ---- tacacs+-F4.0.4.19.ORIG/configure.in 2013-02-28 21:26:31.724310410 +0000
29 -+++ tacacs+-F4.0.4.19/configure.in 2013-02-28 21:26:41.936309960 +0000
30 +--- a/configure.in
31 ++++ b/configure.in
32 @@ -126,7 +126,6 @@
33
34 # compiler specifics
35
36 diff --git a/net-nds/tac_plus/files/tac_plus-4.0.4.19-parallelmake.patch b/net-nds/tac_plus/files/tac_plus-4.0.4.19-parallelmake.patch
37 index 556f75806fb..a8ca67e7362 100644
38 --- a/net-nds/tac_plus/files/tac_plus-4.0.4.19-parallelmake.patch
39 +++ b/net-nds/tac_plus/files/tac_plus-4.0.4.19-parallelmake.patch
40 @@ -1,7 +1,5 @@
41 -Index: tacacs+-F4.0.4.19/Makefile.am
42 -===================================================================
43 ---- tacacs+-F4.0.4.19.orig/Makefile.am
44 -+++ tacacs+-F4.0.4.19/Makefile.am
45 +--- a/Makefile.am
46 ++++ b/Makefile.am
47 @@ -16,7 +16,7 @@ if TACSKEY
48 tac_plus_SOURCES += skey_fn.c
49 endif
50
51 diff --git a/net-nds/tac_plus/files/tac_plus-4.0.4.27a-deansification.patch b/net-nds/tac_plus/files/tac_plus-4.0.4.27a-deansification.patch
52 index ee1bcb23183..4a1f579c62e 100644
53 --- a/net-nds/tac_plus/files/tac_plus-4.0.4.27a-deansification.patch
54 +++ b/net-nds/tac_plus/files/tac_plus-4.0.4.27a-deansification.patch
55 @@ -1,6 +1,5 @@
56 -diff -uNr tacacs+-F4.0.4.27a.ORIG/configure.in tacacs+-F4.0.4.27a/configure.in
57 ---- tacacs+-F4.0.4.27a.ORIG/configure.in 2015-03-25 11:13:06.976024203 +0000
58 -+++ tacacs+-F4.0.4.27a/configure.in 2015-03-25 11:13:36.816025689 +0000
59 +--- a/configure.in
60 ++++ b/configure.in
61 @@ -126,7 +126,6 @@
62
63 # compiler specifics
64
65 diff --git a/net-nds/tac_plus/files/tac_plus-4.0.4.27a-parallelmake.patch b/net-nds/tac_plus/files/tac_plus-4.0.4.27a-parallelmake.patch
66 index c75a05b0cd1..d77c4714e38 100644
67 --- a/net-nds/tac_plus/files/tac_plus-4.0.4.27a-parallelmake.patch
68 +++ b/net-nds/tac_plus/files/tac_plus-4.0.4.27a-parallelmake.patch
69 @@ -1,6 +1,5 @@
70 -diff -uNr tacacs+-F4.0.4.27a.ORIG/Makefile.am tacacs+-F4.0.4.27a/Makefile.am
71 ---- tacacs+-F4.0.4.27a.ORIG/Makefile.am 2015-03-25 11:10:26.821016226 +0000
72 -+++ tacacs+-F4.0.4.27a/Makefile.am 2015-03-25 11:11:04.954018126 +0000
73 +--- a/Makefile.am
74 ++++ b/Makefile.am
75 @@ -19,7 +19,7 @@
76 tac_plus_SOURCES += aceclnt_fn.c
77 endif
78
79 diff --git a/net-nds/tac_plus/files/tac_plus.conf b/net-nds/tac_plus/files/tac_plus.conf
80 index 83403e0bc1c..dfdf2186a81 100644
81 --- a/net-nds/tac_plus/files/tac_plus.conf
82 +++ b/net-nds/tac_plus/files/tac_plus.conf
83 @@ -6,7 +6,6 @@
84 #key = kEy4U
85
86 #user = youruser {
87 -# login = des ndkKAzNoc37VA
88 +# login = des ndkKAzNoc37VA
89 # enable = des ndkKAzNoc37VA
90 #}
91 -
92
93 diff --git a/net-nds/tac_plus/files/tac_plus.conf2 b/net-nds/tac_plus/files/tac_plus.conf2
94 index 617e3442028..406fff33b80 100644
95 --- a/net-nds/tac_plus/files/tac_plus.conf2
96 +++ b/net-nds/tac_plus/files/tac_plus.conf2
97 @@ -6,7 +6,7 @@
98 #key = kEy4U
99
100 #user = youruser {
101 -# login = des ndkKAzNoc37VA
102 +# login = des ndkKAzNoc37VA
103 # enable = des ndkKAzNoc37VA
104 #}
105
106
107 diff --git a/net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild
108 index f94caec0a18..5d770f4652e 100644
109 --- a/net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild
110 +++ b/net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild
111 @@ -1,36 +1,37 @@
112 -# Copyright 1999-2013 Gentoo Foundation
113 +# Copyright 1999-2021 Gentoo Authors
114 # Distributed under the terms of the GNU General Public License v2
115
116 -EAPI=5
117 +EAPI=7
118
119 -inherit autotools base libtool
120 +inherit autotools
121
122 MY_P="tacacs+-F${PV}"
123 -S="${WORKDIR}/${MY_P}"
124 -
125 DESCRIPTION="An updated version of Cisco's TACACS+ server"
126 HOMEPAGE="http://www.shrubbery.net/tac_plus/"
127 SRC_URI="ftp://ftp.shrubbery.net/pub/tac_plus/${MY_P}.tar.gz"
128 +S="${WORKDIR}/${MY_P}"
129
130 LICENSE="HPND RSA GPL-2" # GPL-2 only for init script
131 SLOT="0"
132 KEYWORDS="amd64 ppc x86"
133 IUSE="debug finger maxsess tcpd skey static-libs"
134
135 -DEPEND="skey? ( >=sys-auth/skey-1.1.5-r1 )
136 +DEPEND="
137 + sys-libs/pam
138 + skey? ( >=sys-auth/skey-1.1.5-r1 )
139 tcpd? ( sys-apps/tcp-wrappers )
140 - sys-libs/pam"
141 +"
142 RDEPEND="${DEPEND}"
143
144 PATCHES=(
145 -"${FILESDIR}/${P}-parallelmake.patch"
146 -"${FILESDIR}/${P}-deansification.patch"
147 + "${FILESDIR}"/${P}-parallelmake.patch
148 + "${FILESDIR}"/${P}-deansification.patch
149 )
150
151 src_prepare() {
152 - base_src_prepare
153 + default
154 +
155 AT_M4DIR="." eautoreconf
156 - elibtoolize
157 }
158
159 src_configure() {
160 @@ -46,7 +47,10 @@ src_configure() {
161 src_install() {
162 emake DESTDIR="${D}" install
163
164 - use static-libs || find "${D}" -name '*.la' -delete || die "Unable to remove spurious libtool archive"
165 + if use static-libs ; then
166 + find "${D}" -name '*.la' -delete || die "Unable to remove spurious libtool archive"
167 + fi
168 +
169 dodoc CHANGES FAQ
170
171 newinitd "${FILESDIR}/tac_plus.init2" tac_plus
172
173 diff --git a/net-nds/tac_plus/tac_plus-4.0.4.27a.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.27a.ebuild
174 index 710eeb83ce8..ca11e1018e3 100644
175 --- a/net-nds/tac_plus/tac_plus-4.0.4.27a.ebuild
176 +++ b/net-nds/tac_plus/tac_plus-4.0.4.27a.ebuild
177 @@ -1,25 +1,26 @@
178 -# Copyright 1999-2015 Gentoo Foundation
179 +# Copyright 1999-2021 Gentoo Authors
180 # Distributed under the terms of the GNU General Public License v2
181
182 -EAPI=5
183 +EAPI=7
184
185 -inherit autotools base libtool
186 +inherit autotools
187
188 MY_P="tacacs+-F${PV}"
189 -S="${WORKDIR}/${MY_P}"
190 -
191 DESCRIPTION="An updated version of Cisco's TACACS+ server"
192 HOMEPAGE="http://www.shrubbery.net/tac_plus/"
193 SRC_URI="ftp://ftp.shrubbery.net/pub/tac_plus/${MY_P}.tar.gz"
194 +S="${WORKDIR}/${MY_P}"
195
196 LICENSE="HPND RSA GPL-2" # GPL-2 only for init script
197 SLOT="0"
198 KEYWORDS="~amd64 ~ppc ~x86"
199 IUSE="debug finger maxsess tcpd skey static-libs"
200
201 -DEPEND="skey? ( >=sys-auth/skey-1.1.5-r1 )
202 +DEPEND="
203 + sys-libs/pam
204 + skey? ( >=sys-auth/skey-1.1.5-r1 )
205 tcpd? ( sys-apps/tcp-wrappers )
206 - sys-libs/pam"
207 +"
208 RDEPEND="${DEPEND}"
209
210 PATCHES=(
211 @@ -28,10 +29,11 @@ PATCHES=(
212 )
213
214 src_prepare() {
215 - base_src_prepare
216 + default
217 +
218 mv configure.in configure.ac || die "Unable to quiet autoconf deprecation warning"
219 AT_M4DIR="." eautoreconf
220 - elibtoolize
221 +
222 }
223
224 src_configure() {
225 @@ -47,7 +49,10 @@ src_configure() {
226 src_install() {
227 emake DESTDIR="${D}" install
228
229 - use static-libs || find "${D}" -name '*.la' -delete || die "Unable to remove spurious libtool archive"
230 + if use static-libs ; then
231 + find "${ED}" -name '*.la' -delete || die "Unable to remove spurious libtool archive"
232 + fi
233 +
234 dodoc CHANGES FAQ
235
236 newinitd "${FILESDIR}/tac_plus.init2" tac_plus
Report Message
Find on MARC Find on Google Groups