Please review, changes makes the vdr-plugin-2.eclass to be able handle EAPI 7 support. Its just 1 line for this, The rest is clean up, or better i should say, i removed the internal vdr_dev_check function and replaced it by the eqawarn function. I know, in the eclass is still EAPI 4,5 support, but we have a lot of ebuilds, untached thins years, they use the EAPI 4,5. This needs fixed at first in the tree, than we can safely remove the EAPI 4,5 support.
Thanks
--- vdr-plugin-2.eclass.old 2018-07-13 14:16:24.134895457 +0200
+++ vdr-plugin-2.eclass 2018-07-13 23:56:14.924419576 +0200
@@ -53,19 +53,6 @@
# PO_SUBDIR="bla foo/bla"
# @CODE
-# @ECLASS-VARIABLE: VDR_MAINTAINER_MODE
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Output from function vdr_dev_check if it is defined in ebuild or eclass,
-# helpfull for gentoo ebuild developer
-#
-# This will also install any debug files in /usr/share/vdr/maintainer-data
-#
-# This is intended to be set by user in make.conf. Ebuilds must not set
-# it.
-#
-# VDR_MAINTAINER_MODE=1
-
# @FUNCTION: fix_vdr_libsi_include
# @DESCRIPTION:
# Plugins failed on compile with wrong path of libsi includes,
@@ -91,7 +78,7 @@
# Applying your own local/user patches:
# This is done by using the
# (EAPI = 4,5) epatch_user() function of the eutils.eclass,
-# (EAPI = 6) eapply_user function integrated in EAPI = 6.
+# (EAPI = 6,7) eapply_user function integrated in EAPI = 6.
# Simply add your patches into one of these directories:
# /etc/portage/patches/<CATEGORY>/<PF|P|PN>/
# Quote: where the first of these three directories to exist will be
the one to
@@ -103,7 +90,7 @@
inherit flag-o-matic toolchain-funcs unpacker
case ${EAPI:-0} in
- 4|5|6)
+ 4|5|6|7)
;;
*) die "EAPI ${EAPI} unsupported."
;;
@@ -187,7 +174,7 @@
}
fix_vdr_libsi_include() {
- vdr_dev_check "Fixing include of libsi-headers"
+ eqawarn "Fixing include of libsi-headers"
local f
for f; do
sed -i "${f}" \
@@ -270,7 +257,7 @@
local GETTEXT_MISSING=$( grep xgettext Makefile )
if [[ -z ${GETTEXT_MISSING} ]]; then
- vdr_dev_check "Plugin isn't converted to gettext handling \n"
+ eqawarn "Plugin isn't converted to gettext handling!"
fi
}
@@ -319,26 +306,26 @@
if [[ -n ${I18N_OBJECT} ]]; then
if [[ "${KEEP_I18NOBJECT:-no}" = "yes" ]]; then
- vdr_dev_check "Forced to keep i18n.o"
+ eqawarn "Forced to keep i18n.o"
else
sed -i "s:i18n.o::g" Makefile
- vdr_dev_check "OBJECT i18n.o found"
- vdr_dev_check "removed per sed \n"
+ eqawarn "OBJECT i18n.o found"
+ eqawarn "removed per sed"
fi
else
- vdr_dev_check "OBJECT i18n.o not found in Makefile"
- vdr_dev_check "all fine or manual review needed? \n"
+ eqawarn "OBJECT i18n.o not found in MAKEFILE"
+ eqawarn "all fine or manual review needed?"
fi
local I18N_STRING=$( [[ -e i18n.h ]] && grep tI18nPhrase i18n.h )
if [[ -n ${I18N_STRING} ]]; then
sed -i
"s:^extern[[:space:]]*const[[:space:]]*tI18nPhrase://static const
tI18nPhrase:" i18n.h
- vdr_dev_check "obsolete tI18nPhrase found"
- vdr_dev_check "disabled per sed, please recheck \n"
+ eqawarn "obsolete tI18nPhrase found"
+ eqawarn "disabled per sed, please recheck \n"
else
- vdr_dev_check "obsolete tI18nPhrase not found, fine..."
- vdr_dev_check "please review, may be in subdir... \n"
+ eqawarn "obsolete tI18nPhrase not found, fine..."
+ eqawarn "please review, may be in subdir..."
fi
}
@@ -351,7 +338,7 @@
-e "s:^#include[[:space:]]*\"i18n.h\"://:"
done
- vdr_dev_check "removed i18n.h include in ${@}"
+ eqawarn "removed i18n.h include in ${@}"
}
vdr-plugin-2_print_enable_command() {
@@ -572,7 +559,7 @@
DESTDIR="${D}" \
|| die "emake install (makefile target) failed"
else
- vdr_dev_check "Plugin use still the old Makefile handling"
+ eqawarn "Plugin use still the old Makefile handling"
insinto "${VDR_PLUGIN_DIR}"
doins libvdr-*.so.*
fi
--
Joerg Bornkessel <hd_bru...@gentoo.org>
GnuPG Key: 0x93EB5F4DAA5832A1
Fingerprint: 0E0A A1EE 1DF4 41D7 A3F5 21C2 93EB 5F4D AA58 32A1
signature.asc
Description: OpenPGP digital signature
