[gentoo-commits] repo/gentoo:master commit in: eclass/

[David Seifert]

commit:     cce64b79655fac9dbcf4111c89533fb13832fb23
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  8 15:31:42 2024 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Oct  8 15:31:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cce64b79

vdr-plugin-2.eclass: drop support for EAPI 6

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 eclass/vdr-plugin-2.eclass | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass
index dc70ca7c5761..a00426fdad39 100644
--- a/eclass/vdr-plugin-2.eclass
+++ b/eclass/vdr-plugin-2.eclass
@@ -60,14 +60,14 @@
 # PO_SUBDIR="bla foo/bla"
 # @CODE
 
+if [[ -z ${_VDR_PLUGIN_2_ECLASS} ]]; then
+_VDR_PLUGIN_2_ECLASS=1
+
 case ${EAPI} in
        7|8) ;;
        *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_VDR_PLUGIN_2_ECLASS} ]]; then
-_VDR_PLUGIN_2_ECLASS=1
-
 inherit flag-o-matic strip-linguas toolchain-funcs unpacker
 
 # Name of the plugin stripped from all vdrplugin-, vdr- and -cvs pre- and 
postfixes
@@ -112,14 +112,14 @@ vdr_create_plugindb_file() {
 #              EBUILD=${CATEGORY}/${PN}
 #              EBUILD_V=${PVR}
 #      EOT
-#      obsolet? fix me later...
+#      obsolete? fix me later...
        {
                echo "VDRPLUGIN_DB=1"
                echo "CREATOR=ECLASS"
                echo "EBUILD=${CATEGORY}/${PN}"
                echo "EBUILD_V=${PVR}"
                echo "PLUGINS=\"$@\""
-       } > "${D%/}/${DB_FILE}"
+       } > "${D}/${DB_FILE}" || die
 }
 
 # @FUNCTION: vdr_create_header_checksum_file
@@ -423,7 +423,7 @@ vdr-plugin-2_pkg_setup() {
        if [[ -n "${VDR_LOCAL_PATCHES_DIR}" ]]; then
                eerror "Using VDR_LOCAL_PATCHES_DIR is deprecated!"
                eerror "Please move all your patches into"
-               eerror "${EROOT%/}/etc/portage/patches/${CATEGORY}/${P}"
+               eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
                eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
                die
        fi
@@ -517,8 +517,7 @@ vdr-plugin-2_src_compile() {
                                LOCALEDIR="${TMP_LOCALE_DIR}" \
                                LOCDIR="${TMP_LOCALE_DIR}" \
                                LIBDIR="${S}" \
-                               TMPDIR="${T}" \
-                               || die "emake all failed"
+                               TMPDIR="${T}"
                        ;;
                esac
 
@@ -564,8 +563,7 @@ vdr-plugin-2_src_install() {
                emake install \
                ${BUILD_PARAMS} \
                TMPDIR="${T}" \
-               DESTDIR="${D%/}" \
-               || die "emake install (makefile target) failed"
+               DESTDIR="${D}"
        else
                einfo "Notice: Plugin use still the old Makefile handling"
                insinto "${VDR_PLUGIN_DIR}"
@@ -579,12 +577,12 @@ vdr-plugin-2_src_install() {
                local linguas
                for linguas in ${LINGUAS[*]}; do
                insinto "${LOCDIR}"
-               cp -r --parents ${linguas}* "${D%/}"/${LOCDIR} \
+               cp -r --parents ${linguas}* "${D}"/${LOCDIR} \
                        || die "could not copy linguas files"
                done
        fi
 
-       cd "${D%/}/usr/$(get_libdir)/vdr/plugins" \
+       cd "${D}/usr/$(get_libdir)/vdr/plugins" \
                || die "could not change to \$D/usr/libdir/vdr/plugins"
 
        # create list of all created plugin libs