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 B8B15138334 for ; Sat, 21 Sep 2019 15:00:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0EDFBE085A; Sat, 21 Sep 2019 15:00:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 DBCC9E085A for ; Sat, 21 Sep 2019 15:00:23 +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 6D19534B469 for ; Sat, 21 Sep 2019 15:00:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F2BEC218 for ; Sat, 21 Sep 2019 15:00:18 +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: <1569077992.3149f62310b75dc4057567f0a6fc21e4f304fc3e.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.15.2.ebuild net-dns/bind/bind-9.15.3.ebuild X-VCS-Directories: net-dns/bind/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: 3149f62310b75dc4057567f0a6fc21e4f304fc3e X-VCS-Branch: master Date: Sat, 21 Sep 2019 15:00:18 +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: 990a363f-29fd-41db-914b-b836fac04dbf X-Archives-Hash: 950feaebe8e24152422507b894816d87 commit: 3149f62310b75dc4057567f0a6fc21e4f304fc3e Author: Mikle Kolyada gentoo org> AuthorDate: Sat Sep 21 14:59:52 2019 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Sat Sep 21 14:59:52 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3149f623 net-dns/bind: make repoman happy about relpaths Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> net-dns/bind/bind-9.15.2.ebuild | 24 ++++++++++++------------ net-dns/bind/bind-9.15.3.ebuild | 20 ++++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/net-dns/bind/bind-9.15.2.ebuild b/net-dns/bind/bind-9.15.2.ebuild index c8135616094..72177642171 100644 --- a/net-dns/bind/bind-9.15.2.ebuild +++ b/net-dns/bind/bind-9.15.2.ebuild @@ -190,7 +190,7 @@ src_install() { dodoc contrib/scripts/{nanny.pl,named-bootconf.sh} # some handy-dandy dynamic dns examples - pushd "${ED%/}"/usr/share/doc/${PF} 1>/dev/null || die + pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die popd 1>/dev/null || die fi @@ -219,14 +219,14 @@ src_install() { 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 - rm -f "${ED%/}"/usr/share/man/man8/dnssec-"${tool}".8* || die + rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die + rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die done # bug 405251, library archives aren't properly handled by --enable/disable-static @@ -243,16 +243,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 diff --git a/net-dns/bind/bind-9.15.3.ebuild b/net-dns/bind/bind-9.15.3.ebuild index c8135616094..bfdb5db3d25 100644 --- a/net-dns/bind/bind-9.15.3.ebuild +++ b/net-dns/bind/bind-9.15.3.ebuild @@ -190,7 +190,7 @@ src_install() { dodoc contrib/scripts/{nanny.pl,named-bootconf.sh} # some handy-dandy dynamic dns examples - pushd "${ED%/}"/usr/share/doc/${PF} 1>/dev/null || die + pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die popd 1>/dev/null || die fi @@ -219,14 +219,14 @@ src_install() { 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 - rm -f "${ED%/}"/usr/share/man/man8/dnssec-"${tool}".8* || die + rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die + rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die done # bug 405251, library archives aren't properly handled by --enable/disable-static @@ -250,9 +250,9 @@ src_install() { # 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