net-dns/resolvconf-symlink: Bump to EAPI=7

Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild b/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild
index f7ad0c4562645c1916dec8a66d4ecd26d87b3d63..dbf2b430fba0686a593581ba71ddf0b7668cf6c6 100644 (file)
--- a/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild
+++ b/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild
@@ -1,35 +1,34 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="Make /etc/resolv.conf a symlink to a runtime-writable location"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
+S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+symlink"
 
-S=${WORKDIR}
-
 pkg_preinst() {
        if use symlink; then
-               if [[ -f "${ROOT}"etc/resolv.conf && ! -L "${ROOT}"etc/resolv.conf ]]
+               if [[ -f ${EROOT}/etc/resolv.conf && ! -L ${EROOT}/etc/resolv.conf ]]
                then # migrate existing resolv.conf
-                       if [[ "$(head -n 1 "${ROOT}"etc/resolv.conf)" \
+                       if [[ "$(head -n 1 "${EROOT}"/etc/resolv.conf)" \
                                        != "# Generated by "* ]]; then
 
-                               eerror "${ROOT}etc/resolv.conf seems not to be autogenerated."
+                               eerror "${EROOT}/etc/resolv.conf seems not to be autogenerated."
                                eerror "Aborting build to avoid removing user data. If that file is supposed"
                                eerror "to be autogenerated, please remove it manually. Otherwise, please"
                                eerror "set USE=-symlink to avoid installing resolv.conf symlink."
 
-                               die "${ROOT}etc/resolv.conf not autogenerated"
+                               die "${EROOT}/etc/resolv.conf not autogenerated"
                        else
-                               ebegin "Moving ${ROOT}etc/resolv.conf to ${ROOT}var/run/"
-                               mv "${ROOT}"etc/resolv.conf "${ROOT}"var/run/
+                               ebegin "Moving ${EROOT}/etc/resolv.conf to ${EROOT}/var/run/"
+                               mv "${EROOT}"/etc/resolv.conf "${EROOT}"/var/run/
                                eend ${?} || die
                        fi
                fi
@@ -44,9 +43,10 @@ src_install() {
 
 pkg_postrm() {
        # Don't leave the user with no resolv.conf
-       if [[ ! -e "${ROOT}"etc/resolv.conf && -f "${ROOT}"var/run/resolv.conf ]]; then
-               ebegin "Moving ${ROOT}var/run/resolv.conf to ${ROOT}etc/"
-               mv "${ROOT}"var/run/resolv.conf "${ROOT}"etc/
+       if [[ ! -e ${EROOT}/etc/resolv.conf && -f ${EROOT}/var/run/resolv.conf ]]
+       then
+               ebegin "Moving ${EROOT}/var/run/resolv.conf to ${EROOT}/etc/"
+               mv "${EROOT}"/var/run/resolv.conf "${EROOT}"/etc/
                eend ${?} || die
        fi
 }