From e7da5bc103d537a80fb8f70b220407b4e022fefb Mon Sep 17 00:00:00 2001 From: Patrick Lauer Date: Wed, 11 Feb 2015 03:06:44 +0000 Subject: [PATCH] Fix kde4-functions so that kde-base/ category doesn't get horribly broken --- eclass/ChangeLog | 5 ++++- eclass/kde4-functions.eclass | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 9f5f7c434944..2bd49a0acc73 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.1531 2015/02/11 02:53:18 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1532 2015/02/11 03:06:44 patrick Exp $ + + 11 Feb 2015; Patrick Lauer kde4-functions.eclass: + Fix kde4-functions so that kde-base/ category doesn't get horribly broken 10 Feb 2015; Johannes Huber php-pear-r1.eclass, php-pear-lib-r1.eclass: diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index e4405222e6eb..ddeb849f9446 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.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/kde4-functions.eclass,v 1.72 2015/02/10 20:41:56 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.73 2015/02/11 03:06:44 patrick Exp $ # @ECLASS: kde4-functions.eclass # @MAINTAINER: @@ -325,7 +325,7 @@ add_kdebase_dep() { ver=${3} elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then ver=${KDE_OVERRIDE_MINIMAL} - elif [[ ${KDEBASE} != kde-base ]]; then + elif [[ ${KDEBASE} != kde-apps ]]; then ver=${KDE_MINIMAL} # if building live version depend on the final release since there will # not be any more major development. this solves dep errors as not all -- 2.26.2