gentoo resync : 24.03.2019

6 files changed, 25 insertions, 35 deletions

diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 74e3e11a738f..ff06622dd364 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass
index f889a92aa361..84e657657952 100644
--- a/eclass/ant-tasks.eclass
+++ b/eclass/ant-tasks.eclass
@@ -12,10 +12,10 @@
 # dev-java/ant-* packages easily.
 
 case "${EAPI:-0}" in
-	0|1|2|3|4)
+	0|1|2|3|4|5)
 		die "ant-tasks.eclass: EAPI ${EAPI} is too old."
 		;;
-	5|6|7)
+	6|7)
 		;;
 	*)
 		die "ant-tasks.eclass: EAPI ${EAPI} is not supported yet."
@@ -27,7 +27,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} == [56] ]] && inherit eapi7-ver
+[[ ${EAPI:-0} -eq 6 ]] && inherit eapi7-ver
 
 EXPORT_FUNCTIONS src_unpack src_compile src_install
 
@@ -68,16 +68,9 @@ ANT_TASK_PV="${PV}"
 
 # default for final releases
 MY_PV=${PV}
-case ${PV} in
-1.9.2)
-	UPSTREAM_PREFIX="https://archive.apache.org/dist/ant/source"
-	GENTOO_PREFIX="https://dev.gentoo.org/~tomwij/files/dist"
-	;;
-*)
-	UPSTREAM_PREFIX="mirror://apache/ant/source"
-	GENTOO_PREFIX="https://dev.gentoo.org/~fordfrog/distfiles"
-	;;
-esac
+
+UPSTREAM_PREFIX="mirror://apache/ant/source"
+GENTOO_PREFIX="https://dev.gentoo.org/~fordfrog/distfiles"
 
 # source/workdir name
 MY_P="apache-ant-${MY_PV}"
@@ -123,10 +116,6 @@ ant-tasks_src_unpack() {
 
 				# replace build.xml with our modified for split building
 				if [ -e "${WORKDIR}"/${PV}-build.patch ] ; then
-					if [ ${EAPI:-0} -eq 5 ]; then
-						die "ant-tasks.eclass: build.xml patching not supported for EAPI 5 ebuilds"
-					fi
-
 					eapply "${WORKDIR}"/${PV}-build.patch
 				else
 					mv -f "${WORKDIR}"/build.xml .
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 71686d1a0331..0e9d7c2f2f45 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -41,13 +41,11 @@ case ${CATEGORY} in
 		[[ ${PV} = 5.14.5 ]] && : ${FRAMEWORKS_MINIMAL:=5.52.0}
 		if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.??.49* ]]; then
 			: ${FRAMEWORKS_MINIMAL:=9999}
+			: ${QT_MINIMAL:=5.12.1}
 		fi
 		;;
 	kde-apps)
-		if [[ ${PV} = 18.08.3* ]]; then
-			: ${QT_MINIMAL:=5.9.4}
-			: ${FRAMEWORKS_MINIMAL:=5.52.0}
-		fi
+		[[ ${PV} = 19.04* ]] && : ${FRAMEWORKS_MINIMAL:=5.56.0}
 		;;
 esac
 
@@ -64,12 +62,12 @@ esac
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
 # Minimum version of Plasma to require. This affects add_plasma_dep.
-: ${PLASMA_MINIMAL:=5.12.5}
+: ${PLASMA_MINIMAL:=5.14.5}
 
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
 # @DESCRIPTION:
 # Minimum version of KDE Applications to require. This affects add_kdeapps_dep.
-: ${KDE_APPS_MINIMAL:=18.08.3}
+: ${KDE_APPS_MINIMAL:=18.12.3}
 
 # @ECLASS-VARIABLE: KDE_GCC_MINIMAL
 # @DEFAULT_UNSET
diff --git a/eclass/kde5-meta-pkg.eclass b/eclass/kde5-meta-pkg.eclass
index feea480d9e17..bea85315eec0 100644
--- a/eclass/kde5-meta-pkg.eclass
+++ b/eclass/kde5-meta-pkg.eclass
@@ -1,6 +1,7 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# @DEAD
 # @ECLASS: kde5-meta-pkg.eclass
 # @MAINTAINER:
 # kde@gentoo.org
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index eaa81039183d..d7b5eb7f15e4 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -162,9 +162,9 @@ KDE_UNRELEASED=( )
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="https://www.kdevelop.org/"
 elif [[ ${KMNAME} = kdepim ]]; then
-	HOMEPAGE="https://www.kde.org/applications/office/kontact/"
+	HOMEPAGE="https://kde.org/applications/office/kontact/"
 else
-	HOMEPAGE="https://www.kde.org/"
+	HOMEPAGE="https://kde.org/"
 fi
 
 LICENSE="GPL-2"
@@ -205,11 +205,6 @@ case ${KDE_AUTODEPS} in
 		if [[ ${PN} != breeze-icons && ${PN} != oxygen-icons ]]; then
 			RDEPEND+=" || ( $(add_frameworks_dep breeze-icons) kde-frameworks/oxygen-icons:* )"
 		fi
-
-		if [[ ${CATEGORY} = kde-apps && ${PV} = 18.08.3 ]]; then
-			[[ ${KDE_BLOCK_SLOT4} = true ]] && RDEPEND+=" !kde-apps/${PN}:4"
-			RDEPEND+=" !kde-apps/kde-l10n"
-		fi
 		;;
 esac
 
@@ -414,6 +409,10 @@ _calculate_live_repo() {
 		EGIT_BRANCH="Plasma/$(ver_cut 1-2)"
 	fi
 
+	if [[ ${PV} != 9999 && ${PN} = kdevelop* ]]; then
+		EGIT_BRANCH="$(ver_cut 1-2)"
+	fi
+
 	EGIT_REPO_URI="${EGIT_MIRROR}/${_kmname}"
 }
 
@@ -702,8 +701,11 @@ kde5_src_install() {
 	# cmake can't find the tags and qthelp viewers can't find the docs
 	local p=$(best_version dev-qt/qtcore:5)
 	local pv=$(echo ${p/%-r[0-9]*/} | rev | cut -d - -f 1 | rev)
-	if [[ -d ${ED%/}/usr/share/doc/qt-${pv} ]]; then
-		docompress -x /usr/share/doc/qt-${pv}
+	if [[ ${pv} = 5.11* ]]; then
+		#todo: clean up trailing slash check when EAPI <7 is removed
+		if [[ -d ${ED%/}/usr/share/doc/qt-${pv} ]]; then
+			docompress -x /usr/share/doc/qt-${pv}
+		fi
 	fi
 
 	if [[ ${EAPI} = 6 ]]; then
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index e3cf82b4b58f..f8f51ecb694a 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -44,7 +44,7 @@ _PYTHON_ALL_IMPLS=(
 	jython2_7
 	pypy pypy3
 	python2_7
-	python3_4 python3_5 python3_6 python3_7
+	python3_5 python3_6 python3_7
 )
 readonly _PYTHON_ALL_IMPLS
 
@@ -80,10 +80,10 @@ _python_impl_supported() {
 	# keep in sync with _PYTHON_ALL_IMPLS!
 	# (not using that list because inline patterns shall be faster)
 	case "${impl}" in
-		python2_7|python3_[4567]|jython2_7)
+		python2_7|python3_[567]|jython2_7)
 			return 0
 			;;
-		pypy1_[89]|pypy2_0|python2_[56]|python3_[123])
+		pypy1_[89]|pypy2_0|python2_[56]|python3_[1234])
 			return 1
 			;;
 		pypy|pypy3)