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 2931C138334 for ; Sun, 1 Sep 2019 11:18:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73B23E0959; Sun, 1 Sep 2019 11:18:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 5E557E0959 for ; Sun, 1 Sep 2019 11:18:50 +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 6561034A7CB for ; Sun, 1 Sep 2019 11:18:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 68E2473E for ; Sun, 1 Sep 2019 11:18:47 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1567336705.4a1fafb44748a101f4f37a746d92d357a7dc7ce1.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/bind/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dns/bind/bind-9.14.4.ebuild X-VCS-Directories: net-dns/bind/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: 4a1fafb44748a101f4f37a746d92d357a7dc7ce1 X-VCS-Branch: master Date: Sun, 1 Sep 2019 11:18:47 +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: 5d180b5d-c008-4136-9f6d-b8b0e3bde1de X-Archives-Hash: b0b7de345be1ba69050e18d9bdf400ac commit: 4a1fafb44748a101f4f37a746d92d357a7dc7ce1 Author: Mikle Kolyada gentoo org> AuthorDate: Sun Sep 1 11:18:25 2019 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Sun Sep 1 11:18:25 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a1fafb4 net-dns/bind: use relative paths for symlinks Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> net-dns/bind/bind-9.14.4.ebuild | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/net-dns/bind/bind-9.14.4.ebuild b/net-dns/bind/bind-9.14.4.ebuild index ad78400c4de..56b57d6e297 100644 --- a/net-dns/bind/bind-9.14.4.ebuild +++ b/net-dns/bind/bind-9.14.4.ebuild @@ -209,19 +209,19 @@ src_install() { if use gost; then sed -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' \ - -i "${ED%/}/etc/init.d/named" || die + -i "${ED}/etc/init.d/named" || die else sed -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/' \ - -i "${ED%/}/etc/init.d/named" || die + -i "${ED}/etc/init.d/named" || die fi newenvd "${FILESDIR}"/10bind.env 10bind # Let's get rid of those tools and their manpages since they're provided by bind-tools - rm -f "${ED%/}"/usr/share/man/man1/{dig,host,nslookup}.1* || die - rm -f "${ED%/}"/usr/share/man/man8/nsupdate.8* || die - rm -f "${ED%/}"/usr/bin/{dig,host,nslookup,nsupdate} || die - rm -f "${ED%/}"/usr/sbin/{dig,host,nslookup,nsupdate} || die + rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup}.1* || die + rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die + rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die + rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die for tool in dsfromkey importkey keyfromlabel keygen \ revoke settime signzone verify; do rm -f "${ED%/}"/usr/{,s}bin/dnssec-"${tool}" || die @@ -242,16 +242,16 @@ src_install() { } python_foreach_impl install_python_tools - python_replicate_script "${ED%/}/usr/sbin/dnssec-checkds" - python_replicate_script "${ED%/}/usr/sbin/dnssec-coverage" + python_replicate_script "${ED}/usr/sbin/dnssec-checkds" + python_replicate_script "${ED}/usr/sbin/dnssec-coverage" fi # bug 450406 dosym named.cache /var/bind/root.cache - dosym /var/bind/pri /etc/bind/pri - dosym /var/bind/sec /etc/bind/sec - dosym /var/bind/dyn /etc/bind/dyn + dosym "${ED}"/var/bind/pri /etc/bind/pri + dosym "${ED}"/var/bind/sec /etc/bind/sec + dosym "${ED}"/var/bind/dyn /etc/bind/dyn keepdir /var/bind/{pri,sec,dyn} dodir /var/log/named