From 586819755b4dbfdffdc8a725ab7c0f86095b8489 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 15 Sep 2018 17:37:09 +0100
Subject: gentoo resync : 15.09.2018

---
 eclass/Manifest.gz           | Bin 37779 -> 37774 bytes
 eclass/autotools.eclass      |  11 ++++++++++-
 eclass/kde5-functions.eclass |  10 +++++++---
 eclass/libtool.eclass        |   9 +++++++--
 4 files changed, 24 insertions(+), 6 deletions(-)

(limited to 'eclass')

diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index d15fcba28929..6cfa43da49ad 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 2bc70f7b3c00..9143aa454d0d 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -4,6 +4,7 @@
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
 # base-system@gentoo.org
+# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7
 # @BLURB: Regenerates auto* build scripts
 # @DESCRIPTION:
 # This eclass is for safely handling autotooled software packages that need to
@@ -25,6 +26,11 @@ fi
 if [[ -z ${_AUTOTOOLS_ECLASS} ]]; then
 _AUTOTOOLS_ECLASS=1
 
+case ${EAPI:-0} in
+	0|1|2|3|4|5|6|7) ;;
+	*) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
+esac
+
 inherit libtool
 
 # @ECLASS-VARIABLE: WANT_AUTOCONF
@@ -118,7 +124,10 @@ RDEPEND=""
 # their own DEPEND string.
 : ${AUTOTOOLS_AUTO_DEPEND:=yes}
 if [[ ${AUTOTOOLS_AUTO_DEPEND} != "no" ]] ; then
-	DEPEND=${AUTOTOOLS_DEPEND}
+	case ${EAPI:-0} in
+		0|1|2|3|4|5|6) DEPEND=${AUTOTOOLS_DEPEND} ;;
+		7) BDEPEND=${AUTOTOOLS_DEPEND} ;;
+	esac
 fi
 __AUTOTOOLS_AUTO_DEPEND=${AUTOTOOLS_AUTO_DEPEND} # See top of eclass
 
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 7631be4de391..8994bf8d9732 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -37,15 +37,19 @@ case ${CATEGORY} in
 		[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
 		;;
 	kde-plasma)
-		[[ ${PV} = 5.13* ]] && : ${QT_MINIMAL:=5.11.1}
 		if [[ ${PV} = 5.12.5* ]]; then
 			: ${FRAMEWORKS_MINIMAL:=5.43.0}
 			: ${QT_MINIMAL:=5.9.1}
 		fi
-		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.12* ]]; then
+		[[ ${PV} = 5.12* ]] && : ${QT_MINIMAL:=5.9.4}
+		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.??.49* ]]; then
 			: ${FRAMEWORKS_MINIMAL:=9999}
-			: ${QT_MINIMAL:=5.11.1}
 		fi
+		: ${QT_MINIMAL:=5.11.1}
+		;;
+	kde-apps)
+		[[ ${PV} = 18.04.3 ]] && : ${FRAMEWORKS_MINIMAL:=5.46.0}
+		: ${FRAMEWORKS_MINIMAL:=5.49.0}
 		;;
 esac
 
diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass
index 2e0f608d342f..4565c8a8f6f8 100644
--- a/eclass/libtool.eclass
+++ b/eclass/libtool.eclass
@@ -1,9 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: libtool.eclass
 # @MAINTAINER:
 # base-system@gentoo.org
+# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7
 # @BLURB: quickly update bundled libtool code
 # @DESCRIPTION:
 # This eclass patches ltmain.sh distributed with libtoolized packages with the
@@ -16,7 +17,11 @@
 if [[ -z ${_LIBTOOL_ECLASS} ]]; then
 _LIBTOOL_ECLASS=1
 
-DEPEND=">=app-portage/elt-patches-20170422"
+case ${EAPI:-0} in
+	0|1|2|3|4|5|6) DEPEND=">=app-portage/elt-patches-20170815" ;;
+	7) BDEPEND=">=app-portage/elt-patches-20170815" ;;
+	*) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
+esac
 
 inherit toolchain-funcs
 
-- 
cgit v1.2.3