* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde4-functions.eclass
@ 2013-07-03 9:22 Michael Palimaka (kensington)
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka (kensington) @ 2013-07-03 9:22 UTC (permalink / raw
To: gentoo-commits
kensington 13/07/03 09:22:39
Modified: ChangeLog kde4-functions.eclass
Log:
Deprecate EAPI 3.
Revision Changes Path
1.870 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.870&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.870&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.869&r2=1.870
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.869
retrieving revision 1.870
diff -u -r1.869 -r1.870
--- ChangeLog 2 Jul 2013 14:36:20 -0000 1.869
+++ ChangeLog 3 Jul 2013 09:22:39 -0000 1.870
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.869 2013/07/02 14:36:20 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.870 2013/07/03 09:22:39 kensington Exp $
+
+ 03 Jul 2013; Michael Palimaka <kensington@gentoo.org> kde4-functions.eclass:
+ Deprecate EAPI 3.
02 Jul 2013; Michael Palimaka <kensington@gentoo.org> cmake-utils.eclass:
Correct src_prepare description.
1.65 eclass/kde4-functions.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.65&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.65&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.64&r2=1.65
Index: kde4-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- kde4-functions.eclass 7 Apr 2013 17:33:18 -0000 1.64
+++ kde4-functions.eclass 3 Jul 2013 09:22:39 -0000 1.65
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.64 2013/04/07 17:33:18 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.65 2013/07/03 09:22:39 kensington Exp $
inherit versionator
@@ -17,9 +17,16 @@
# @ECLASS-VARIABLE: EAPI
# @DESCRIPTION:
-# Currently kde4 eclasses support EAPI 3 and 4.
+# Currently kde4 eclasses support EAPI 4 and 5.
case ${EAPI:-0} in
- 3|4|5) : ;;
+ 3)
+ eqawarn "${CATEGORY}/${PF}: EAPI 3 support is now deprecated."
+ eqawarn "If you are the package maintainer, please"
+ eqawarn "update this package to a newer EAPI."
+ eqawarn "Support for EAPI 3 for kde-*.eclass will be dropped"
+ eqawarn "at the beginning August."
+ ;;
+ 4|5) : ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde4-functions.eclass
@ 2014-07-17 13:02 Michael Palimaka (kensington)
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka (kensington) @ 2014-07-17 13:02 UTC (permalink / raw
To: gentoo-commits
kensington 14/07/17 13:02:11
Modified: ChangeLog kde4-functions.eclass
Log:
Fix missing handbooks when the default handbook language is en_US instead of the usual en.
Revision Changes Path
1.1322 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1322&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1322&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1321&r2=1.1322
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1321
retrieving revision 1.1322
diff -u -r1.1321 -r1.1322
--- ChangeLog 16 Jul 2014 17:18:32 -0000 1.1321
+++ ChangeLog 17 Jul 2014 13:02:11 -0000 1.1322
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1321 2014/07/16 17:18:32 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1322 2014/07/17 13:02:11 kensington Exp $
+
+ 17 Jul 2014; Michael Palimaka <kensington@gentoo.org> kde4-functions.eclass:
+ Fix missing handbooks when the default handbook language is en_US instead of
+ the usual en.
16 Jul 2014; Johannes Huber <johu@gentoo.org> kde4-base.eclass:
Add kde-workspace 4.11.11 SRC_URI, remove obsolete.
1.71 eclass/kde4-functions.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.71&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.71&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.70&r2=1.71
Index: kde4-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- kde4-functions.eclass 11 Jul 2014 08:21:58 -0000 1.70
+++ kde4-functions.eclass 17 Jul 2014 13:02:11 -0000 1.71
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.70 2014/07/11 08:21:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.71 2014/07/17 13:02:11 kensington Exp $
inherit versionator
@@ -216,6 +216,14 @@
# Disable subdirectories recursively
comment_all_add_subdirectory "${handbookdir}"
+
+ # In certain packages, the default handbook is en_US instead of the usual en. Since there is no en_US 'translation',
+ # it makes no sense to add to KDE_LINGUAS which causes this type of handbook to not be installed.
+ if [[ -d "${handbookdir}/en_US" && ! -d "${handbookdir}/en" ]]; then
+ mv "${handbookdir}/en_US" "${handbookdir}/en" || die
+ sed -e "s/en_US/en/" -i "${handbookdir}/CMakeLists.txt"
+ fi
+
# Add requested translations
local lingua
for lingua in en ${KDE_LINGUAS}; do
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde4-functions.eclass
@ 2015-02-10 20:41 Johannes Huber (johu)
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber (johu) @ 2015-02-10 20:41 UTC (permalink / raw
To: gentoo-commits
johu 15/02/10 20:41:56
Modified: ChangeLog kde4-functions.eclass
Log:
Support for kde-apps category, remove function moved to cmake-utils. Some minor improvements.
Revision Changes Path
1.1529 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1529&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1529&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1528&r2=1.1529
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1528
retrieving revision 1.1529
diff -u -r1.1528 -r1.1529
--- ChangeLog 10 Feb 2015 18:14:23 -0000 1.1528
+++ ChangeLog 10 Feb 2015 20:41:56 -0000 1.1529
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1528 2015/02/10 18:14:23 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1529 2015/02/10 20:41:56 johu Exp $
+
+ 10 Feb 2015; Johannes Huber <johu@gentoo.org> kde4-functions.eclass:
+ Support for kde-apps category, remove function moved to cmake-utils. Some
+ minor improvements.
10 Feb 2015; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass:
Always build NDB with mysql-cluster for libndbclient
1.72 eclass/kde4-functions.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.72&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.72&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.71&r2=1.72
Index: kde4-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- kde4-functions.eclass 17 Jul 2014 13:02:11 -0000 1.71
+++ kde4-functions.eclass 10 Feb 2015 20:41:56 -0000 1.72
@@ -1,8 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.71 2014/07/17 13:02:11 kensington Exp $
-
-inherit versionator
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.72 2015/02/10 20:41:56 johu Exp $
# @ECLASS: kde4-functions.eclass
# @MAINTAINER:
@@ -15,12 +13,14 @@
if [[ -z ${_KDE4_FUNCTIONS_ECLASS} ]]; then
_KDE4_FUNCTIONS_ECLASS=1
+inherit versionator
+
# @ECLASS-VARIABLE: EAPI
# @DESCRIPTION:
# Currently kde4 eclasses support EAPI 4 and 5.
-case ${EAPI:-0} in
+case ${EAPI} in
4|5) : ;;
- *) die "EAPI=${EAPI} is not supported" ;;
+ *) die "EAPI=${EAPI:-0} is not supported" ;;
esac
# @ECLASS-VARIABLE: KDE_OVERRIDE_MINIMAL
@@ -36,14 +36,15 @@
# @DESCRIPTION:
# This gets set to a non-zero value when a package is considered a kde or
# kdevelop ebuild.
-if [[ ${CATEGORY} = kde-base ]]; then
+if [[ ${CATEGORY} = kde-base || ${CATEGORY} = kde-apps ]]; then
debug-print "${ECLASS}: KDEBASE ebuild recognized"
KDEBASE=kde-base
elif [[ ${KMNAME-${PN}} = kdevelop ]]; then
- debug-print "${ECLASS}: KDEVELOP ebuild recognized"
KDEBASE=kdevelop
fi
+debug-print "${ECLASS}: ${KDEBASE} ebuild recognized"
+
# determine the build type
if [[ ${PV} = *9999* ]]; then
KDE_BUILD_TYPE="live"
@@ -121,21 +122,6 @@
done
}
-# @FUNCTION: comment_add_subdirectory
-# @USAGE: subdirectory
-# @DESCRIPTION:
-# Comment out an add_subdirectory call in CMakeLists.txt in the current directory
-comment_add_subdirectory() {
- if [[ -z ${1} ]]; then
- die "comment_add_subdirectory must be passed the directory name to comment"
- fi
-
- if [[ -a "CMakeLists.txt" ]]; then
- sed -e "/add_subdirectory[[:space:]]*([[:space:]]*${1}[[:space:]]*)/s/^/#DONOTCOMPILE /" \
- -i CMakeLists.txt || die "failed to comment add_subdirectory(${1})"
- fi
-}
-
# @FUNCTION: comment_all_add_subdirectory
# @USAGE: [list of directory names]
# @DESCRIPTION:
@@ -286,16 +272,16 @@
eend $?
}
-# @FUNCTION: add_kdebase_dep
+# @FUNCTION: add_kdeapps_dep
# @DESCRIPTION:
-# Create proper dependency for kde-base/ dependencies.
+# Create proper dependency for kde-apps/ dependencies.
# This takes 1 to 3 arguments. The first being the package name, the optional
# second is additional USE flags to append, and the optional third is the
# version to use instead of the automatic version (use sparingly).
# The output of this should be added directly to DEPEND/RDEPEND, and may be
# wrapped in a USE conditional (but not an || conditional without an extra set
# of parentheses).
-add_kdebase_dep() {
+add_kdeapps_dep() {
debug-print-function ${FUNCNAME} "$@"
local ver
@@ -316,6 +302,45 @@
[[ -z ${1} ]] && die "Missing parameter"
+ #FIXME
+ # Drop aqua= from kf5 packages
+ echo " >=kde-apps/${1}-${ver}:4[aqua=${2:+,${2}}]"
+}
+
+# @FUNCTION: add_kdebase_dep
+# @DESCRIPTION:
+# Create proper dependency for kde-base/ dependencies.
+# This takes 1 to 3 arguments. The first being the package name, the optional
+# second is additional USE flags to append, and the optional third is the
+# version to use instead of the automatic version (use sparingly).
+# The output of this should be added directly to DEPEND/RDEPEND, and may be
+# wrapped in a USE conditional (but not an || conditional without an extra set
+# of parentheses).
+add_kdebase_dep() {
+ debug-print-function ${FUNCNAME} "$@"
+
+ local ver
+
+ if [[ -n ${3} ]]; then
+ ver=${3}
+ elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then
+ ver=${KDE_OVERRIDE_MINIMAL}
+ elif [[ ${KDEBASE} != kde-base ]]; 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
+ # packages have kde-base live versions now
+
+ # depend on the last sane released version where the normal >=${PV} dep
+ # is not possible
+ elif [[ ${CATEGORY} == kde-apps || ${PV} > 4.14.3 || ${PV} == *9999 ]]; then
+ ver=4.14.3
+ else
+ ver=${PV}
+ fi
+
+ [[ -z ${1} ]] && die "Missing parameter"
+
echo " >=kde-base/${1}-${ver}:4[aqua=${2:+,${2}}]"
}
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde4-functions.eclass
@ 2015-02-11 3:06 Patrick Lauer (patrick)
0 siblings, 0 replies; 6+ messages in thread
From: Patrick Lauer (patrick) @ 2015-02-11 3:06 UTC (permalink / raw
To: gentoo-commits
patrick 15/02/11 03:06:44
Modified: ChangeLog kde4-functions.eclass
Log:
Fix kde4-functions so that kde-base/ category doesn't get horribly broken
Revision Changes Path
1.1532 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1532&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1532&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1531&r2=1.1532
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1531
retrieving revision 1.1532
diff -u -r1.1531 -r1.1532
--- ChangeLog 11 Feb 2015 02:53:18 -0000 1.1531
+++ ChangeLog 11 Feb 2015 03:06:44 -0000 1.1532
@@ -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 <patrick@gentoo.org> kde4-functions.eclass:
+ Fix kde4-functions so that kde-base/ category doesn't get horribly broken
10 Feb 2015; Johannes Huber <johu@gentoo.org> php-pear-r1.eclass,
php-pear-lib-r1.eclass:
1.73 eclass/kde4-functions.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.73&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.73&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.72&r2=1.73
Index: kde4-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- kde4-functions.eclass 10 Feb 2015 20:41:56 -0000 1.72
+++ kde4-functions.eclass 11 Feb 2015 03:06:44 -0000 1.73
@@ -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 @@
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde4-functions.eclass
@ 2015-02-11 3:25 Patrick Lauer (patrick)
0 siblings, 0 replies; 6+ messages in thread
From: Patrick Lauer (patrick) @ 2015-02-11 3:25 UTC (permalink / raw
To: gentoo-commits
patrick 15/02/11 03:25:52
Modified: ChangeLog kde4-functions.eclass
Log:
Better fix to kde4-functions so that kde-base/ category doesn't get horribly broken
Revision Changes Path
1.1533 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1533&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1533&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1532&r2=1.1533
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1532
retrieving revision 1.1533
diff -u -r1.1532 -r1.1533
--- ChangeLog 11 Feb 2015 03:06:44 -0000 1.1532
+++ ChangeLog 11 Feb 2015 03:25:52 -0000 1.1533
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1532 2015/02/11 03:06:44 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1533 2015/02/11 03:25:52 patrick Exp $
+
+ 11 Feb 2015; Patrick Lauer <patrick@gentoo.org> kde4-functions.eclass:
+ Better fix to kde4-functions so that kde-base/ category doesn't get horribly
+ broken
11 Feb 2015; Patrick Lauer <patrick@gentoo.org> kde4-functions.eclass:
Fix kde4-functions so that kde-base/ category doesn't get horribly broken
1.74 eclass/kde4-functions.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.74&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.74&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.73&r2=1.74
Index: kde4-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- kde4-functions.eclass 11 Feb 2015 03:06:44 -0000 1.73
+++ kde4-functions.eclass 11 Feb 2015 03:25:52 -0000 1.74
@@ -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.73 2015/02/11 03:06:44 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.74 2015/02/11 03:25:52 patrick Exp $
# @ECLASS: kde4-functions.eclass
# @MAINTAINER:
@@ -325,7 +325,7 @@
ver=${3}
elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then
ver=${KDE_OVERRIDE_MINIMAL}
- elif [[ ${KDEBASE} != kde-apps ]]; then
+ elif [[ -n ${KDE_MINIMAL} ]]; 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde4-functions.eclass
@ 2015-02-11 4:29 Patrick Lauer (patrick)
0 siblings, 0 replies; 6+ messages in thread
From: Patrick Lauer (patrick) @ 2015-02-11 4:29 UTC (permalink / raw
To: gentoo-commits
patrick 15/02/11 04:29:06
Modified: ChangeLog kde4-functions.eclass
Log:
Fix kde4-functions more better: comparison breaks because 4.4 > 4.14
Revision Changes Path
1.1534 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1534&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1534&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1533&r2=1.1534
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1533
retrieving revision 1.1534
diff -u -r1.1533 -r1.1534
--- ChangeLog 11 Feb 2015 03:25:52 -0000 1.1533
+++ ChangeLog 11 Feb 2015 04:29:06 -0000 1.1534
@@ -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.1533 2015/02/11 03:25:52 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1534 2015/02/11 04:29:06 patrick Exp $
+
+ 11 Feb 2015; Patrick Lauer <patrick@gentoo.org> kde4-functions.eclass:
+ Fix kde4-functions more better: comparison breaks because 4.4 > 4.14
11 Feb 2015; Patrick Lauer <patrick@gentoo.org> kde4-functions.eclass:
Better fix to kde4-functions so that kde-base/ category doesn't get horribly
1.75 eclass/kde4-functions.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.75&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.75&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.74&r2=1.75
Index: kde4-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- kde4-functions.eclass 11 Feb 2015 03:25:52 -0000 1.74
+++ kde4-functions.eclass 11 Feb 2015 04:29:06 -0000 1.75
@@ -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.74 2015/02/11 03:25:52 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.75 2015/02/11 04:29:06 patrick Exp $
# @ECLASS: kde4-functions.eclass
# @MAINTAINER:
@@ -333,7 +333,7 @@
# depend on the last sane released version where the normal >=${PV} dep
# is not possible
- elif [[ ${CATEGORY} == kde-apps || ${PV} > 4.14.3 || ${PV} == *9999 ]]; then
+ elif [[ ${CATEGORY} == kde-apps || ${PV} == *9999 ]]; then
ver=4.14.3
else
ver=${PV}
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-02-11 4:29 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-11 4:29 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde4-functions.eclass Patrick Lauer (patrick)
-- strict thread matches above, loose matches on Subject: below --
2015-02-11 3:25 Patrick Lauer (patrick)
2015-02-11 3:06 Patrick Lauer (patrick)
2015-02-10 20:41 Johannes Huber (johu)
2014-07-17 13:02 Michael Palimaka (kensington)
2013-07-03 9:22 Michael Palimaka (kensington)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox