stdin

stdin.diff

diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 3c55a5c464a..d555a6d6085 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -53,9 +53,9 @@ inherit libtool
 # version.
 # If a newer slot is stable on any arch, and is NOT reflected in this list,
 # then circular dependencies may arise during emerge @system bootstraps.
-# 
+#
 # See bug 312315 and 465732 for further information and context.
-# 
+#
 # Do NOT change this variable in your ebuilds!
 # If you want to force a newer minor version, you can specify the correct
 # WANT value by using a colon:  <PV>:<WANT_AUTOMAKE>
@@ -118,7 +118,10 @@ RDEPEND=""
 # their own DEPEND string.
 : ${AUTOTOOLS_AUTO_DEPEND:=yes}
 if [[ ${AUTOTOOLS_AUTO_DEPEND} != "no" ]] ; then
-	DEPEND=${AUTOTOOLS_DEPEND}
+	case ${EAPI:-0} in
+		7*) BDEPEND=${AUTOTOOLS_DEPEND} ;;
+		*) DEPEND=${AUTOTOOLS_DEPEND} ;;
+	esac
 fi
 __AUTOTOOLS_AUTO_DEPEND=${AUTOTOOLS_AUTO_DEPEND} # See top of eclass
 
@@ -445,7 +448,8 @@ autotools_env_setup() {
 			# has_version respects ROOT, but in this case, we don't want it to,
 			# thus "ROOT=/" prefix;
 			# Break on first hit to respect _LATEST_AUTOMAKE order.
-			ROOT=/ has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="${pv}" && break
+			# ROOT=/
+			has_version -b "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="${pv}" && break
 		done
 		[[ ${WANT_AUTOMAKE} == "latest" ]] && \
 			die "Cannot find the latest automake! Tried ${_LATEST_AUTOMAKE[*]}"
diff --git a/eclass/cmake-multilib.eclass b/eclass/cmake-multilib.eclass
index 39f92ae7666..52e85c01cc9 100644
--- a/eclass/cmake-multilib.eclass
+++ b/eclass/cmake-multilib.eclass
@@ -20,7 +20,7 @@
 
 # EAPI=5 is required for meaningful MULTILIB_USEDEP.
 case ${EAPI:-0} in
-	5|6) ;;
+	5|6|7*) ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 3302f27608b..0c75687f2e2 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -105,7 +105,7 @@ _CMAKE_UTILS_ECLASS=1
 
 case ${EAPI} in
 	5) : ${CMAKE_WARN_UNUSED_CLI:=no} ;;
-	6) : ${CMAKE_WARN_UNUSED_CLI:=yes} ;;
+	6|7*) : ${CMAKE_WARN_UNUSED_CLI:=yes} ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
@@ -123,10 +123,10 @@ EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
 
 case ${CMAKE_MAKEFILE_GENERATOR} in
 	emake)
-		DEPEND="sys-devel/make"
+		BDEPEND="sys-devel/make"
 		;;
 	ninja)
-		DEPEND="dev-util/ninja"
+		BDEPEND="dev-util/ninja"
 		;;
 	*)
 		eerror "Unknown value for \${CMAKE_MAKEFILE_GENERATOR}"
@@ -135,7 +135,7 @@ case ${CMAKE_MAKEFILE_GENERATOR} in
 esac
 
 if [[ ${PN} != cmake ]]; then
-	DEPEND+=" >=dev-util/cmake-${CMAKE_MIN_VERSION}"
+	BDEPEND+=" >=dev-util/cmake-${CMAKE_MIN_VERSION}"
 fi
 
 # Internal functions used by cmake-utils_use_*
@@ -515,7 +515,8 @@ cmake-utils_src_configure() {
 		if $(version_is_at_least 3.4.0 $(get_version_component_range 1-3 ${PV})) ; then
 			includes="<INCLUDES>"
 		fi
-	elif ROOT=/ has_version \>=dev-util/cmake-3.4.0_rc1 ; then
+	# elif ROOT=/ has_version \>=dev-util/cmake-3.4.0_rc1 ; then
+	elif has_version -b \>=dev-util/cmake-3.4.0_rc1 ; then
 		includes="<INCLUDES>"
 	fi
 	cat > "${build_rules}" <<- _EOF_ || die
diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass
index 2e0f608d342..4a7a3ea0b78 100644
--- a/eclass/libtool.eclass
+++ b/eclass/libtool.eclass
@@ -16,7 +16,10 @@
 if [[ -z ${_LIBTOOL_ECLASS} ]]; then
 _LIBTOOL_ECLASS=1
 
-DEPEND=">=app-portage/elt-patches-20170422"
+case ${EAPI:-0} in
+	7*) BDEPEND=">=app-portage/elt-patches-20170422" ;;
+	*) DEPEND=">=app-portage/elt-patches-20170422" ;;
+esac
 
 inherit toolchain-funcs
 
diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index 0f89e4ec0b8..89acd510bf7 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -16,7 +16,7 @@ case "${EAPI:-0}" in
 	0|1|2|3)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	4|5|6)
+	4|5|6|7*)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass
index 6356350c43b..d0ea202ef80 100644
--- a/eclass/multilib-build.eclass
+++ b/eclass/multilib-build.eclass
@@ -20,7 +20,7 @@ if [[ ! ${_MULTILIB_BUILD} ]]; then
 
 # EAPI=4 is required for meaningful MULTILIB_USEDEP.
 case ${EAPI:-0} in
-	4|5|6) ;;
+	4|5|6|7*) ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
diff --git a/eclass/multilib-minimal.eclass b/eclass/multilib-minimal.eclass
index de46762ca61..51f916c81fa 100644
--- a/eclass/multilib-minimal.eclass
+++ b/eclass/multilib-minimal.eclass
@@ -24,7 +24,7 @@
 
 # EAPI=4 is required for meaningful MULTILIB_USEDEP.
 case ${EAPI:-0} in
-	4|5|6) ;;
+	4|5|6|7*) ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
diff --git a/eclass/ninja-utils.eclass b/eclass/ninja-utils.eclass
index 69216176ba6..47e5d0572e8 100644
--- a/eclass/ninja-utils.eclass
+++ b/eclass/ninja-utils.eclass
@@ -22,7 +22,7 @@ if [[ -z ${_NINJA_UTILS_ECLASS} ]]; then
 case ${EAPI:-0} in
 	0|1|3) die "EAPI=${EAPI:-0} is not supported (too old)";;
 	# copied from cmake-utils
-	2|4|5|6) ;;
+	2|4|5|6|7*) ;;
 	*) die "EAPI=${EAPI} is not yet supported" ;;
 esac
 
diff --git a/eclass/xdg-utils.eclass b/eclass/xdg-utils.eclass
index ac075185d8e..7dd17c933ee 100644
--- a/eclass/xdg-utils.eclass
+++ b/eclass/xdg-utils.eclass
@@ -15,7 +15,7 @@
 #  * XDG mime information database management
 
 case "${EAPI:-0}" in
-	0|1|2|3|4|5|6) ;;
+	0|1|2|3|4|5|6|7*) ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
index b0e5df3291c..1f880b1b905 100644
--- a/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7_pre1
 inherit autotools flag-o-matic ltprune toolchain-funcs multilib-minimal
 
 MY_P="SDL2-${PV}"
@@ -59,8 +59,9 @@ DEPEND="${RDEPEND}
 		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
 		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
 	)
-	virtual/pkgconfig"
-
+"
+	# virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/SDL2/SDL_config.h
 )
diff --git a/media-libs/openal/openal-1.18.2-r1.ebuild b/media-libs/openal/openal-1.18.2-r1.ebuild
index ffa1242cc0c..8d62793281a 100644
--- a/media-libs/openal/openal-1.18.2-r1.ebuild
+++ b/media-libs/openal/openal-1.18.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7_pre1
 
 inherit cmake-multilib