summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Rüger <mrueg@gentoo.org>2015-05-09 15:33:21 +0000
committerManuel Rüger <mrueg@gentoo.org>2015-05-09 15:33:21 +0000
commit0f58ccf049e8d7e5f2b17c99b34ed00ee128070d (patch)
treecbb2d78b239ad26974716ebb0b661002cbc1a691
parentMark stable on amd64. Remove superfluous whitespace. (diff)
downloadgentoo-2-0f58ccf049e8d7e5f2b17c99b34ed00ee128070d.tar.gz
gentoo-2-0f58ccf049e8d7e5f2b17c99b34ed00ee128070d.tar.bz2
gentoo-2-0f58ccf049e8d7e5f2b17c99b34ed00ee128070d.zip
Sync kde5.eclass with overlay.
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/kde5.eclass14
2 files changed, 11 insertions, 8 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index e371dc3b102e..ab54cfc25a7f 100644
--- 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.1605 2015/05/09 10:24:46 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1606 2015/05/09 15:33:21 mrueg Exp $
+
+ 09 May 2015; Manuel Rüger <mrueg@gentoo.org> kde5.eclass:
+ Sync with overlay.
09 May 2015; Manuel Rüger <mrueg@gentoo.org> kde5-functions.eclass:
Sync with overlay.
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index c639fb717e7a..e84ac609fd88 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.7 2015/05/09 10:22:36 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v 1.8 2015/05/09 15:33:21 mrueg Exp $
# @ECLASS: kde5.eclass
# @MAINTAINER:
@@ -322,10 +322,10 @@ _get_release_date() {
case ${CATEGORY} in
kde-frameworks)
case ${PV} in
- 5.10) echo "20150507" ;;
- 5.11) echo "20150611" ;;
- 5.12) echo "20150709" ;;
- 5.13) echo "20150806" ;;
+ 5.10.0) echo "20150507" ;;
+ 5.11.0) echo "20150611" ;;
+ 5.12.0) echo "20150709" ;;
+ 5.13.0) echo "20150806" ;;
*) echo "none" ;;
esac
;;
@@ -339,7 +339,7 @@ _get_release_date() {
*) echo "none" ;;
esac
;;
- kde-applications)
+ kde-apps)
case ${PV} in
15.04.1) echo "20150512" ;;
15.04.2) echo "20150602" ;;
@@ -359,7 +359,7 @@ _check_fetch_restriction() {
KDE_RELEASE_DATE=$(_get_release_date)
fi
if [[ ${KDE_RELEASE_DATE} != "none" ]]; then
- if [[ $(date +"%Y%m%d") < ${KDE_RELEASE_DATE} ]]; then
+ if [[ $(date -u +"%Y%m%d") < ${KDE_RELEASE_DATE} ]]; then
RESTRICT+=" fetch"
fi
fi