toolchain-glibc.eclass: Do not export any phases in EAPI=6. Well. Nearly.

diff --git a/eclass/toolchain-glibc.eclass b/eclass/toolchain-glibc.eclass
index 18c1e2f0a838adb59f90800877a5ff6d050d6dad..33f27ccf46eb94007e3ec052ffa25e11bde53f9d 100644 (file)
--- a/eclass/toolchain-glibc.eclass
+++ b/eclass/toolchain-glibc.eclass
@@ -19,9 +19,10 @@ case ${EAPI:-0} in
                src_install pkg_preinst pkg_postinst;;
        2|3) EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure \
                src_compile src_test src_install pkg_preinst pkg_postinst;;
-       4|5|6) EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare \
+       4|5) EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare \
                src_configure src_compile src_test src_install \
                pkg_preinst pkg_postinst;;
+       6) EXPORT_FUNCTIONS pkg_pretend;;
        *) die "Unsupported EAPI=${EAPI}";;
 esac
 
@@ -481,6 +482,12 @@ check_devpts() {
 }
 
 toolchain-glibc_pkg_pretend() {
+       if [[ ${EAPI:-0} == 6 ]]; then
+               eerror "We're moving code back to the ebuilds to get away from the ancient EAPI cruft."
+               eerror "From EAPI=6 on you'll have to define the phases in the glibc ebuilds."
+               die "Silly overlay authors..."
+       fi
+
        # For older EAPIs, this is run in pkg_preinst.
        if [[ ${EAPI:-0} != [0123] ]] ; then
                check_devpts