Sync kde5.eclass with overlay.

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 3a86f4a9c4965c828a0c78ff11ea395568ce2c46..2f5e33010027c352413a99b2c43a306a6e100052 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1603 2015/05/09 08:01:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1604 2015/05/09 10:22:36 mrueg Exp $
+
+  09 May 2015; Manuel Rüger <mrueg@gentoo.org> kde5.eclass:
+  Sync with overlay.
 
   09 May 2015; Ulrich Müller <ulm@gentoo.org>
   -tests/autotools:eaclocal_amflags.sh, +tests/autotools_eaclocal_amflags.sh,

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 4a06fd8dd20a968a741f740ab0a06cc22dba1eb1..c639fb717e7ae1ed97b0db1e0dd1bd8b116cba0f 100644 (file)
--- 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.6 2015/04/11 17:11:22 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v 1.7 2015/05/09 10:22:36 mrueg Exp $
 
 # @ECLASS: kde5.eclass
 # @MAINTAINER:
@@ -28,7 +28,7 @@ if [[ ${KDE_BUILD_TYPE} = live ]]; then
        esac
 fi
 
-EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm
+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
 
 # @ECLASS-VARIABLE: QT_MINIMAL
 # @DESCRIPTION:
@@ -81,13 +81,28 @@ else
        : ${KDE_TEST:=false}
 fi
 
+# @ECLASS-VARIABLE: KDE_PUNT_BOGUS_DEPS
+# @DESCRIPTION:
+# If set to "false", do nothing.
+# For any other value, do black magic to make hardcoded-but-optional dependencies
+# optional again. An upstream solution is preferable and this is a last resort.
+: ${KDE_PUNT_BOGUS_DEPS:=false}
+
 # @ECLASS-VARIABLE: KDE_SELINUX_MODULE
 # @DESCRIPTION:
 # If set to "none", do nothing.
 # For any other value, add selinux to IUSE, and depending on that useflag
-# add a dependency on sec-policy/selinux-${KDE_SELINUX_MODULE} to (R)DEPEND
+# 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
@@ -301,9 +316,59 @@ _calculate_live_repo() {
        esac
 }
 
+
+_get_release_date() {
+       debug-print-function ${FUNCNAME} "$@"
+       case ${CATEGORY} in
+               kde-frameworks)
+                       case ${PV} in
+                               5.10) echo "20150507" ;;
+                               5.11) echo "20150611" ;;
+                               5.12) echo "20150709" ;;
+                               5.13) 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-applications)
+                       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 +"%Y%m%d") <  ${KDE_RELEASE_DATE} ]]; then
+                       RESTRICT+=" fetch"
+               fi
+       fi
+}
+
 case ${KDE_BUILD_TYPE} in
        live) _calculate_live_repo ;;
-       *) _calculate_src_uri ;;
+       *) _calculate_src_uri
+          _check_fetch_restriction ;;
 esac
 
 debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}"
@@ -324,6 +389,17 @@ 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.
@@ -388,15 +464,25 @@ kde5_src_prepare() {
                comment_add_subdirectory tests
        fi
 
-       # only build unit tests when required
-       if ! use_if_iuse test ; then
-               comment_add_subdirectory autotests
-               comment_add_subdirectory tests
+       if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma || ${CATEGORY} = kde-apps ]] ; then
+               # only build unit tests when required
+               if ! use_if_iuse test ; then
+                       comment_add_subdirectory autotests
+                       comment_add_subdirectory tests
+               fi
        fi
 
-       if [[ ${CATEGORY} = kde-plasma ]]; then
-               punt_bogus_deps
-       fi
+       case ${KDE_PUNT_BOGUS_DEPS} in
+               false)  ;;
+               *)
+                       if ! use_if_iuse test ; then
+                               punt_bogus_dep Qt5 Test
+                       fi
+                       if ! use_if_iuse handbook ; then
+                               punt_bogus_dep KF5 DocTools
+                       fi
+                       ;;
+       esac
 
        cmake-utils_src_prepare
 }