9 files changed, 20 insertions, 14 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 29648189f291..883d0f8d33df 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass
index 31683e682437..e008e6eaea81 100644
--- a/eclass/ant-tasks.eclass
+++ b/eclass/ant-tasks.eclass
@@ -16,8 +16,7 @@
 JAVA_ANT_DISABLE_ANT_CORE_DEP=true
 # rewriting build.xml for are the testcases has no reason atm
 JAVA_PKG_BSFIX_ALL=no
-inherit java-pkg-2 java-ant-2
-[[ ${EAPI:-0} == [0123456] ]] && inherit eapi7-ver
+inherit versionator java-pkg-2 java-ant-2
 
 EXPORT_FUNCTIONS src_unpack src_compile src_install
 
@@ -61,12 +60,12 @@ if [[ ${PV} == *beta2* ]]; then
 	MY_PV=${PV/_beta2/beta}
 	UPSTREAM_PREFIX="http://people.apache.org/dist/ant/v1.7.1beta2/src"
 	GENTOO_PREFIX="https://dev.gentoo.org/~caster/distfiles"
-	ANT_TASK_PV=$(ver_cut 1-3)
+	ANT_TASK_PV=$(get_version_component_range 1-3)
 elif [[ ${PV} == *_rc* ]]; then
 	MY_PV=${PV/_rc/RC}
 	UPSTREAM_PREFIX="https://dev.gentoo.org/~caster/distfiles"
 	GENTOO_PREFIX="https://dev.gentoo.org/~caster/distfiles"
-	ANT_TASK_PV=$(ver_cut 1-3)
+	ANT_TASK_PV=$(get_version_component_range 1-3)
 else
 	# default for final releases
 	MY_PV=${PV}
@@ -102,7 +101,7 @@ if [[ -z "${ANT_TASK_DISABLE_VM_DEPS}" ]]; then
 fi
 
 # we need direct blockers with old ant-tasks for file collisions - bug #252324
-if ver_test -ge 1.7.1; then
+if version_is_at_least 1.7.1 ; then
 	DEPEND+=" !dev-java/ant-tasks"
 fi
 
@@ -168,7 +167,7 @@ ant-tasks_src_install() {
 	java-pkg_register-ant-task --version "${ANT_TASK_PV}"
 
 	# create the compatibility symlink
-	if ver_test -ge 1.7.1_beta2; then
+	if version_is_at_least 1.7.1_beta2; then
 		dodir /usr/share/ant/lib
 		dosym /usr/share/${PN}/lib/${PN}.jar /usr/share/ant/lib/${PN}.jar
 	fi
diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass
index 9a66ec58ce50..4447f12532c2 100644
--- a/eclass/elisp.eclass
+++ b/eclass/elisp.eclass
@@ -137,14 +137,14 @@ elisp_src_prepare() {
 		fi
 		case ${EAPI:-0} in
 			0|1|2|3|4|5) epatch "${file}" ;;
-			*) eapply "${file}" ;;
+			6) eapply "${file}" ;;
 		esac
 	done
 
 	# apply any user patches
 	case ${EAPI:-0} in
 		0|1|2|3|4|5) epatch_user ;;
-		*) eapply_user ;;
+		6) eapply_user ;;
 	esac
 
 	if [[ -n ${ELISP_REMOVE} ]]; then
diff --git a/eclass/gnatbuild-r1.eclass b/eclass/gnatbuild-r1.eclass
index 236a9aa1ce16..cdc64a3fe7c6 100644
--- a/eclass/gnatbuild-r1.eclass
+++ b/eclass/gnatbuild-r1.eclass
@@ -313,6 +313,7 @@ should_we_eselect_gnat() {
 		echo
 		elog "eselect gnat set <profile>"
 		echo
+		ebeep
 		return 1
 	fi
 }
diff --git a/eclass/gnatbuild.eclass b/eclass/gnatbuild.eclass
index da72f554439d..5d485c9338ca 100644
--- a/eclass/gnatbuild.eclass
+++ b/eclass/gnatbuild.eclass
@@ -237,6 +237,7 @@ should_we_eselect_gnat() {
 		echo
 		elog "eselect gnat set <profile>"
 		echo
+		ebeep
 		return 1
 	fi
 }
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 94937b6630ba..6ffbd37f300e 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -749,6 +749,7 @@ unpack_2_6() {
 		touch .config
 		eerror "make defconfig failed."
 		eerror "assuming you dont have any headers installed yet and continuing"
+		epause 5
 	fi
 
 	make -s include/linux/version.h ${xmakeopts} 2>/dev/null \
@@ -1606,6 +1607,7 @@ kernel-2_pkg_setup() {
 			ewarn "Also be aware that bugreports about gcc-4 not working"
 			ewarn "with linux-2.4 based ebuilds will be closed as INVALID!"
 			echo
+			epause 10
 		fi
 	fi
 
diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index dd62b26855d2..035b722e2d6d 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: linux-info.eclass
@@ -914,6 +914,7 @@ linux-info_pkg_setup() {
 			ewarn "Also be aware that bugreports about gcc-4 not working"
 			ewarn "with linux-2.4 based ebuilds will be closed as INVALID!"
 			echo
+			epause 10
 		fi
 	fi
 
diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index f2202a04593d..576e9b428643 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -157,13 +157,12 @@ _meson_create_cross_file() {
 	# This may require adjustment based on CFLAGS
 	local cpu=${CHOST%%-*}
 
-	cat > "${T}/meson.${CHOST}.${ABI}" <<-EOF
+	cat > "${T}/meson.${CHOST}" <<-EOF
 	[binaries]
 	ar = $(_meson_env_array "$(tc-getAR)")
 	c = $(_meson_env_array "$(tc-getCC)")
 	cpp = $(_meson_env_array "$(tc-getCXX)")
 	fortran = $(_meson_env_array "$(tc-getFC)")
-	llvm-config = '$(tc-getPROG LLVM_CONFIG llvm-config)'
 	objc = $(_meson_env_array "$(tc-getPROG OBJC cc)")
 	objcpp = $(_meson_env_array "$(tc-getPROG OBJCXX c++)")
 	pkgconfig = '$(tc-getPKG_CONFIG)'
@@ -218,9 +217,9 @@ meson_src_configure() {
 		--wrap-mode nodownload
 		)
 
-	if tc-is-cross-compiler || [[ ${ABI} != ${DEFAULT_ABI-${ABI}} ]]; then
+	if tc-is-cross-compiler; then
 		_meson_create_cross_file || die "unable to write meson cross file"
-		mesonargs+=( --cross-file "${T}/meson.${CHOST}.${ABI}" )
+		mesonargs+=( --cross-file "${T}/meson.${CHOST}" )
 	fi
 
 	# https://bugs.gentoo.org/625396
diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass
index 8983af334ab8..c80674d3b13e 100644
--- a/eclass/webapp.eclass
+++ b/eclass/webapp.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: webapp.eclass
@@ -411,6 +411,9 @@ webapp_pkg_setup() {
 		ewarn "This ebuild may be overwriting important files."
 		ewarn
 		echo
+		if has "${EAPI:-0}" 0 1 2; then
+			ebeep 10
+		fi
 	elif [[ "$(echo ${my_output} | awk '{ print $1 }')" != "${PN}" ]]; then
 		echo
 		eerror "You already have ${my_output} installed in ${my_dir}"