From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E74A7138CD0 for ; Sun, 31 May 2015 15:30:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C2CEE0937; Sun, 31 May 2015 15:30:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 31173E0937 for ; Sun, 31 May 2015 15:30:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D5EF9340BD0 for ; Sun, 31 May 2015 15:30:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5B5B9A04 for ; Sun, 31 May 2015 15:29:59 +0000 (UTC) From: "Manuel Rüger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Manuel Rüger" Message-ID: <1433086185.ebc61ef574b27ef630c21d69e02868ef53d9249b.mrueg@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mrueg X-VCS-Committer-Name: Manuel Rüger X-VCS-Revision: ebc61ef574b27ef630c21d69e02868ef53d9249b X-VCS-Branch: master Date: Sun, 31 May 2015 15:29:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0692428f-3647-4741-99b0-ca34c760de4c X-Archives-Hash: 4ac4371ec4b96f304dfd75128e02ca5b commit: ebc61ef574b27ef630c21d69e02868ef53d9249b Author: Manuel Rüger gentoo org> AuthorDate: Sun May 31 15:29:45 2015 +0000 Commit: Manuel Rüger gentoo org> CommitDate: Sun May 31 15:29:45 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ebc61ef5 [eclass] Drop fetch restriction for unpublished packages, as it did not work out as expected. eclass/kde5.eclass | 73 ++---------------------------------------------------- 1 file changed, 2 insertions(+), 71 deletions(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 51821a0..a462280 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -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: @@ -101,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 @@ -322,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}" @@ -395,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.