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-dialup/freeradius-client/files/, net-dialup/freeradius-client/
Date: Wed, 02 Sep 2020 20:41:16
Message-Id: 1599079206.97cf65fd933a09edc3bd7282c4d8f10ab27fb227.sam@gentoo
1 commit: 97cf65fd933a09edc3bd7282c4d8f10ab27fb227
2 Author: Alarig Le Lay <alarig <AT> swordarmor <DOT> fr>
3 AuthorDate: Mon Aug 31 19:27:17 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 2 20:40:06 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97cf65fd
7
8 net-dialup/freeradius-client: respect AR
9
10 Closes: https://bugs.gentoo.org/730388
11 Package-Manager: Portage-3.0.4, Repoman-2.3.23
12 Signed-off-by: Alarig Le Lay <alarig <AT> swordarmor.fr>
13 Closes: https://github.com/gentoo/gentoo/pull/17351
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 .../files/freeradius-client-1.1.7-ar-configure.in.patch | 10 ++++++++++
17 .../freeradius-client/freeradius-client-1.1.7-r1.ebuild | 14 ++++++--------
18 2 files changed, 16 insertions(+), 8 deletions(-)
19
20 diff --git a/net-dialup/freeradius-client/files/freeradius-client-1.1.7-ar-configure.in.patch b/net-dialup/freeradius-client/files/freeradius-client-1.1.7-ar-configure.in.patch
21 new file mode 100644
22 index 00000000000..07d477bcc90
23 --- /dev/null
24 +++ b/net-dialup/freeradius-client/files/freeradius-client-1.1.7-ar-configure.in.patch
25 @@ -0,0 +1,10 @@
26 +--- a/configure.in 2020-07-08 19:20:38.180447370 +0200
27 ++++ b/configure.in 2020-07-08 19:21:00.840479965 +0200
28 +@@ -33,6 +33,6 @@
29 +
30 + dnl Needed for normal compile
31 +-AC_PATH_PROG(AR, ar)
32 ++AM_PROG_AR
33 + AM_PROG_LIBTOOL
34 +
35 + dnl HAVE_SHADOW_PASSWORDS
36
37 diff --git a/net-dialup/freeradius-client/freeradius-client-1.1.7-r1.ebuild b/net-dialup/freeradius-client/freeradius-client-1.1.7-r1.ebuild
38 index 0b182155d46..564fb5f2205 100644
39 --- a/net-dialup/freeradius-client/freeradius-client-1.1.7-r1.ebuild
40 +++ b/net-dialup/freeradius-client/freeradius-client-1.1.7-r1.ebuild
41 @@ -3,7 +3,7 @@
42
43 EAPI=7
44
45 -inherit autotools toolchain-funcs
46 +inherit autotools
47
48 DESCRIPTION="FreeRADIUS Client framework"
49 HOMEPAGE="https://wiki.freeradius.org/project/Radiusclient"
50 @@ -23,27 +23,25 @@ DOCS=(
51 README.{radexample,rst}
52 )
53
54 +PATCHES=(
55 + "${FILESDIR}/${P}-ar-configure.in.patch"
56 +)
57 +
58 src_prepare() {
59 default
60 mv configure.in configure.ac || die \
61 "Renaming configure.in to configure.ac failed"
62 +
63 eautoreconf
64 }
65
66 src_configure() {
67 - tc-export AR
68 -
69 local myeconfargs=(
70 $(use_enable scp)
71 $(use_enable shadow)
72 --with-secure-path
73 )
74 econf "${myeconfargs[@]}"
75 -
76 - for MAKEFILE in $(find -name Makefile) libtool; do
77 - sed -i "s|/usr/bin/ar|${AR}|" "${MAKEFILE}" || \
78 - die "Patching ${MAKEFILE} for ${AR} failed"
79 - done
80 }
81
82 src_install() {