| 1 |
commit: c707f4983bc06a00cddac85818d137b87ad4e82f |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 27 07:39:32 2019 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 27 08:02:44 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c707f498 |
| 7 |
|
| 8 |
net-misc/dhcpcd: Synced live ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.67, Repoman-2.3.16 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
|
| 13 |
net-misc/dhcpcd/dhcpcd-9999.ebuild | 28 ++++++++++++---------------- |
| 14 |
1 file changed, 12 insertions(+), 16 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild |
| 17 |
index 48ba26275d0..b74ad597f96 100644 |
| 18 |
--- a/net-misc/dhcpcd/dhcpcd-9999.ebuild |
| 19 |
+++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild |
| 20 |
@@ -1,7 +1,7 @@ |
| 21 |
# Copyright 1999-2019 Gentoo Authors |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
-EAPI=6 |
| 25 |
+EAPI=7 |
| 26 |
|
| 27 |
inherit systemd toolchain-funcs |
| 28 |
|
| 29 |
@@ -28,22 +28,18 @@ DEPEND="${COMMON_DEPEND}" |
| 30 |
RDEPEND="${COMMON_DEPEND}" |
| 31 |
|
| 32 |
src_configure() { |
| 33 |
- local dev hooks=() rundir |
| 34 |
- use udev || dev="--without-dev --without-udev" |
| 35 |
- hooks=( --with-hook=ntp.conf ) |
| 36 |
- use elibc_glibc && hooks+=( --with-hook=yp.conf ) |
| 37 |
- use kernel_linux && rundir="--rundir=${EPREFIX}/run" |
| 38 |
local myeconfargs=( |
| 39 |
- --prefix="${EPREFIX}" |
| 40 |
- --libexecdir="${EPREFIX}/lib/dhcpcd" |
| 41 |
--dbdir="${EPREFIX}/var/lib/dhcpcd" |
| 42 |
+ --libexecdir="${EPREFIX}/lib/dhcpcd" |
| 43 |
--localstatedir="${EPREFIX}/var" |
| 44 |
- ${rundir} |
| 45 |
+ --prefix="${EPREFIX}" |
| 46 |
+ --with-hook=ntp.conf |
| 47 |
$(use_enable embedded) |
| 48 |
$(use_enable ipv6) |
| 49 |
- ${dev} |
| 50 |
+ $(usex elibc_glibc '--with-hook=yp.conf' '') |
| 51 |
+ $(usex kernel_linux '--rundir=${EPREFIX}/run' '') |
| 52 |
+ $(usex udev '' '--without-dev --without-udev') |
| 53 |
CC="$(tc-getCC)" |
| 54 |
- ${hooks[@]} |
| 55 |
) |
| 56 |
econf "${myeconfargs[@]}" |
| 57 |
} |
| 58 |
@@ -56,10 +52,10 @@ src_install() { |
| 59 |
} |
| 60 |
|
| 61 |
pkg_postinst() { |
| 62 |
- local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=() |
| 63 |
+ local dbdir="${EROOT}"/var/lib/dhcpcd old_files=() |
| 64 |
|
| 65 |
- local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid |
| 66 |
- local old_duid="${EROOT%/}"/etc/dhcpcd.duid |
| 67 |
+ local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid |
| 68 |
+ local old_duid="${EROOT}"/etc/dhcpcd.duid |
| 69 |
local new_duid="${dbdir}"/duid |
| 70 |
if [[ -e "${old_old_duid}" ]] ; then |
| 71 |
# Upgrade the duid file to the new format if needed |
| 72 |
@@ -81,7 +77,7 @@ pkg_postinst() { |
| 73 |
fi |
| 74 |
old_files+=( "${old_duid}" ) |
| 75 |
fi |
| 76 |
- local old_secret="${EROOT%/}"/etc/dhcpcd.secret |
| 77 |
+ local old_secret="${EROOT}"/etc/dhcpcd.secret |
| 78 |
local new_secret="${dbdir}"/secret |
| 79 |
if [[ -e "${old_secret}" ]] ; then |
| 80 |
if [[ ! -e "${new_secret}" ]] ; then |
| 81 |
@@ -112,7 +108,7 @@ pkg_postinst() { |
| 82 |
if [[ -n "${old_files[@]}" ]] ; then |
| 83 |
elog |
| 84 |
elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" |
| 85 |
- elog "${EROOT%/}/etc to ${dbdir}" |
| 86 |
+ elog "${EROOT}/etc to ${dbdir}" |
| 87 |
elog "and copied leases in ${dbdir} to new files with the dhcpcd-" |
| 88 |
elog "prefix dropped." |
| 89 |
elog |
Archives