From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [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 81808138334 for ; Sun, 27 Jan 2019 10:09:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 185C1E0F97; Sun, 27 Jan 2019 10:08:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 DB8F1E0F97 for ; Sun, 27 Jan 2019 10:08:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 4BA15335D01 for ; Sun, 27 Jan 2019 10:08:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B62D14FA for ; Sun, 27 Jan 2019 10:08:54 +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: <1548583729.db6acb30d693068acb6c725400702d1c51e63342.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/dhcp/dhcp-4.4.1.ebuild X-VCS-Directories: net-misc/dhcp/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: db6acb30d693068acb6c725400702d1c51e63342 X-VCS-Branch: master Date: Sun, 27 Jan 2019 10:08:54 +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: 21b21093-bb81-46f9-996b-ffb19d45c03d X-Archives-Hash: 71e2e3fa70da3f34b03590b3fa69cb64 commit: db6acb30d693068acb6c725400702d1c51e63342 Author: Lars Wendler gentoo org> AuthorDate: Sun Jan 27 10:07:11 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sun Jan 27 10:08:49 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db6acb30 net-misc/dhcp: Minor ebuild improvements. Package-Manager: Portage-2.3.58, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> net-misc/dhcp/dhcp-4.4.1.ebuild | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/net-misc/dhcp/dhcp-4.4.1.ebuild b/net-misc/dhcp/dhcp-4.4.1.ebuild index b092a122950..c3848a50d3e 100644 --- a/net-misc/dhcp/dhcp-4.4.1.ebuild +++ b/net-misc/dhcp/dhcp-4.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -170,7 +170,7 @@ src_configure() { cd bind/bind-*/ || die local el eval econf \ - $(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el}; fi; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \ + $(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \ --disable-symtable \ --without-make-clean } @@ -192,7 +192,7 @@ src_install() { if [[ -e client/dhclient ]] ; then # move the client to / dodir /sbin - mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die + mv "${ED%/}"/usr/sbin/dhclient "${ED%/}"/sbin/ || die exeinto /sbin if use kernel_linux ; then @@ -224,15 +224,15 @@ src_install() { systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf - sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560 + sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED%/}"/etc/init.d/* || die #442560 fi # the default config files aren't terribly useful #384087 local f - for f in "${ED}"/etc/dhcp/*.conf.example ; do + for f in "${ED%/}"/etc/dhcp/*.conf.example ; do mv "${f}" "${f%.example}" || die done - sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die + sed -i '/^[^#]/s:^:#:' "${ED%/}"/etc/dhcp/*.conf || die } pkg_preinst() { @@ -245,10 +245,10 @@ pkg_preinst() { for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do h=${f#*:} f="/etc/dhcp/${f%:*}.conf" - if [ -e "${EROOT}"${f} ] ; then + if [ -e "${EROOT%/}"${f} ] ; then case $(md5sum "${EROOT}"${f}) in ${h}*) ;; - *) cp -p "${EROOT}"${f} "${ED}"${f};; + *) cp -p "${EROOT%/}"${f} "${ED%/}"${f};; esac fi done