Sync verbosely with kde overlay. Drop fetch restriction for unpublished packages including the pkg_nofetch prompt. This did not work out as expected, see bug 549012. Add support for split localization packages via kde-apps/kde4-l10n. Add KDE_BLOCK_SLOT4 variable which makes it possible to adjust coinstallability of kf5 packages.

2 files changed, 19 insertions, 75 deletions

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 598223dae6e8..ba85691652fe 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1633 2015/05/31 13:56:53 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1634 2015/05/31 15:51:21 mrueg Exp $
+
+  31 May 2015; Manuel Rüger <mrueg@gentoo.org> kde5.eclass:
+  Sync verbosely with kde overlay. Drop fetch restriction for unpublished
+  packages including the pkg_nofetch prompt. This did not work out as expected,
+  see bug 549012. Add support for split localization packages via
+  kde-apps/kde4-l10n. Add KDE_BLOCK_SLOT4 variable which makes it possible to
+  adjust coinstallability of kf5 packages.
 
   31 May 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
   Blacklist graphite-related flags that cause ICEs on qtwebkit (bug 550780).
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index b7ccd3a78221..51dcae4e4b6d 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v 1.9 2015/05/31 10:11:35 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v 1.10 2015/05/31 15:51:21 mrueg Exp $
 
 # @ECLASS: kde5.eclass
 # @MAINTAINER:
@@ -28,7 +28,7 @@ if [[ ${KDE_BUILD_TYPE} = live ]]; then
 	esac
 fi
 
-EXPORT_FUNCTIONS pkg_pretend pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm
+EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm
 
 # @ECLASS-VARIABLE: QT_MINIMAL
 # @DESCRIPTION:
@@ -41,6 +41,12 @@ EXPORT_FUNCTIONS pkg_pretend pkg_setup pkg_nofetch src_unpack src_prepare src_co
 # For any other value, add a dependency on dev-qt/qtcore:5 and kde-frameworks/extra-cmake-modules:5.
 : ${KDE_AUTODEPS:=true}
 
+# @ECLASS-VARIABLE: KDE_BLOCK_SLOT4
+# @DESCRIPTION:
+# This variable is used when KDE_AUTODEPS is set.
+# If set to "true", add RDEPEND block on kde-{base,apps}/${PN}:4
+: ${KDE_BLOCK_SLOT4:=true}
+
 # @ECLASS-VARIABLE: KDE_DEBUG
 # @DESCRIPTION:
 # If set to "false", unconditionally build with -DNDEBUG.
@@ -95,14 +101,6 @@ fi
 # add a dependency on sec-policy/selinux-${KDE_SELINUX_MODULE} to (R)DEPEND.
 : ${KDE_SELINUX_MODULE:=none}
 
-# @ECLASS-VARIABLE: KDE_RELEASE_DATE
-# @DESCRIPTION:
-# Used to display a fetch restriction for packages that have not been published yet.
-# If set to "none", use internal schedule.
-# Otherwise set it to a date formatted as YYMMDD.
-# Internal schedule is adjusted in _get_release_date().
-: ${KDE_RELEASE_DATE:=none}
-
 if [[ ${KDEBASE} = kdevelop ]]; then
 	HOMEPAGE="http://www.kdevelop.org/"
 else
@@ -138,12 +136,12 @@ case ${KDE_AUTODEPS} in
 
 		if [[ ${CATEGORY} = kde-plasma ]]; then
 			RDEPEND+="
-				!kde-apps/kde-l10n[-minimal]
+				!kde-apps/kde4-l10n[-minimal]
 				!kde-base/kde-l10n:4[-minimal(-)]
 			"
 		fi
 
-		if [[ ${CATEGORY} == kde-apps ]]; then
+		if [[ ${KDE_BLOCK_SLOT4} = true && ${CATEGORY} = kde-apps ]]; then
 			RDEPEND+="
 				!kde-apps/${PN}:4
 				!kde-base/${PN}
@@ -316,59 +314,9 @@ _calculate_live_repo() {
 	esac
 }
 
-
-_get_release_date() {
-	debug-print-function ${FUNCNAME} "$@"
-	case ${CATEGORY} in
-		kde-frameworks)
-			case ${PV} in
-				5.10.0) echo "20150507" ;;
-				5.11.0) echo "20150611" ;;
-				5.12.0) echo "20150709" ;;
-				5.13.0) echo "20150806" ;;
-				*) echo "none" ;;
-			esac
-			;;
-		kde-plasma)
-			case ${PV} in
-				5.3.0) echo "20150428" ;;
-				5.3.1) echo "20150526" ;;
-				5.3.2) echo "20150630" ;;
-				5.3.95) echo "20150811" ;;
-				5.4.0) echo "20150825" ;;
-				*) echo "none" ;;
-			esac
-			;;
-		kde-apps)
-			case ${PV} in
-				15.04.1) echo "20150512" ;;
-				15.04.2) echo "20150602" ;;
-				15.04.3) echo "20150630" ;;
-				15.07.90) echo "20150805" ;;
-				15.08.0) echo "20150819" ;;
-				*) echo "none" ;;
-			esac
-			;;
-		*) echo "none" ;;
-	esac
-}
-
-_check_fetch_restriction() {
-	debug-print-function ${FUNCNAME} "$@"
-	if [[ ${KDE_RELEASE_DATE} == "none" ]]; then
-		KDE_RELEASE_DATE=$(_get_release_date)
-	fi
-	if [[ ${KDE_RELEASE_DATE} != "none" ]]; then
-		if [[ $(date -u +"%Y%m%d") <  ${KDE_RELEASE_DATE} ]]; then
-			RESTRICT+=" fetch"
-		fi
-	fi
-}
-
 case ${KDE_BUILD_TYPE} in
 	live) _calculate_live_repo ;;
-	*) _calculate_src_uri
-	   _check_fetch_restriction ;;
+	*) _calculate_src_uri ;;
 esac
 
 debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}"
@@ -389,17 +337,6 @@ kde5_pkg_setup() {
 	_check_gcc_version
 }
 
-# @FUNCTION: kde5_pkg_nofetch
-# @DESCRIPTION:
-# Display package publication status
-kde5_pkg_nofetch() {
-		einfo "${CATEGORY}/${P} has not been released to the public yet"
-		einfo "and is only available to packagers right now."
-		einfo ""
-		einfo "Further information:"
-		einfo "https://techbase.kde.org/Schedules"
-}
-
 # @FUNCTION: kde5_src_unpack
 # @DESCRIPTION:
 # Function for unpacking KDE 5.