From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E410E138334 for ; Thu, 27 Jun 2019 08:02:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B47EE0932; Thu, 27 Jun 2019 08:02:54 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F1C88E0932 for ; Thu, 27 Jun 2019 08:02:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CBC76346B3D for ; Thu, 27 Jun 2019 08:02:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 339E3617 for ; Thu, 27 Jun 2019 08:02:51 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1561622564.c707f4983bc06a00cddac85818d137b87ad4e82f.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcpcd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/dhcpcd/dhcpcd-9999.ebuild X-VCS-Directories: net-misc/dhcpcd/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: c707f4983bc06a00cddac85818d137b87ad4e82f X-VCS-Branch: master Date: Thu, 27 Jun 2019 08:02:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0103775e-d84c-43e2-bd5d-b67ed0b11e27 X-Archives-Hash: 34eafaf1a412e820e7803bf7346f0796 commit: c707f4983bc06a00cddac85818d137b87ad4e82f Author: Lars Wendler gentoo org> AuthorDate: Thu Jun 27 07:39:32 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Jun 27 08:02:44 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c707f498 net-misc/dhcpcd: Synced live ebuild Package-Manager: Portage-2.3.67, Repoman-2.3.16 Signed-off-by: Lars Wendler gentoo.org> net-misc/dhcpcd/dhcpcd-9999.ebuild | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild index 48ba26275d0..b74ad597f96 100644 --- a/net-misc/dhcpcd/dhcpcd-9999.ebuild +++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit systemd toolchain-funcs @@ -28,22 +28,18 @@ DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND}" src_configure() { - local dev hooks=() rundir - use udev || dev="--without-dev --without-udev" - hooks=( --with-hook=ntp.conf ) - use elibc_glibc && hooks+=( --with-hook=yp.conf ) - use kernel_linux && rundir="--rundir=${EPREFIX}/run" local myeconfargs=( - --prefix="${EPREFIX}" - --libexecdir="${EPREFIX}/lib/dhcpcd" --dbdir="${EPREFIX}/var/lib/dhcpcd" + --libexecdir="${EPREFIX}/lib/dhcpcd" --localstatedir="${EPREFIX}/var" - ${rundir} + --prefix="${EPREFIX}" + --with-hook=ntp.conf $(use_enable embedded) $(use_enable ipv6) - ${dev} + $(usex elibc_glibc '--with-hook=yp.conf' '') + $(usex kernel_linux '--rundir=${EPREFIX}/run' '') + $(usex udev '' '--without-dev --without-udev') CC="$(tc-getCC)" - ${hooks[@]} ) econf "${myeconfargs[@]}" } @@ -56,10 +52,10 @@ src_install() { } pkg_postinst() { - local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=() + local dbdir="${EROOT}"/var/lib/dhcpcd old_files=() - local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid - local old_duid="${EROOT%/}"/etc/dhcpcd.duid + local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid + local old_duid="${EROOT}"/etc/dhcpcd.duid local new_duid="${dbdir}"/duid if [[ -e "${old_old_duid}" ]] ; then # Upgrade the duid file to the new format if needed @@ -81,7 +77,7 @@ pkg_postinst() { fi old_files+=( "${old_duid}" ) fi - local old_secret="${EROOT%/}"/etc/dhcpcd.secret + local old_secret="${EROOT}"/etc/dhcpcd.secret local new_secret="${dbdir}"/secret if [[ -e "${old_secret}" ]] ; then if [[ ! -e "${new_secret}" ]] ; then @@ -112,7 +108,7 @@ pkg_postinst() { if [[ -n "${old_files[@]}" ]] ; then elog elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" - elog "${EROOT%/}/etc to ${dbdir}" + elog "${EROOT}/etc to ${dbdir}" elog "and copied leases in ${dbdir} to new files with the dhcpcd-" elog "prefix dropped." elog