summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikle Kolyada <zlogene@gentoo.org>2019-09-21 17:59:52 +0300
committerMikle Kolyada <zlogene@gentoo.org>2019-09-21 17:59:52 +0300
commit3149f62310b75dc4057567f0a6fc21e4f304fc3e (patch)
treea722d99826ab2df2bdf01fab84fcd0efa9baeac8
parentnet-dns/bind: Version bump (diff)
downloadgentoo-3149f62310b75dc4057567f0a6fc21e4f304fc3e.tar.gz
gentoo-3149f62310b75dc4057567f0a6fc21e4f304fc3e.tar.bz2
gentoo-3149f62310b75dc4057567f0a6fc21e4f304fc3e.zip
net-dns/bind: make repoman happy about relpaths
Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
-rw-r--r--net-dns/bind/bind-9.15.2.ebuild24
-rw-r--r--net-dns/bind/bind-9.15.3.ebuild20
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 c81356160941..721776421718 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 c81356160941..bfdb5db3d257 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