* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde5-functions.eclass
@ 2014-10-28 16:45 Michael Palimaka (kensington)
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka (kensington) @ 2014-10-28 16:45 UTC (permalink / raw
To: gentoo-commits
kensington 14/10/28 16:45:38
Modified: ChangeLog kde5-functions.eclass
Log:
Fix handling of frameworks version dependencies within kde-frameworks.
Revision Changes Path
1.1395 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1395&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1395&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1394&r2=1.1395
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1394
retrieving revision 1.1395
diff -u -r1.1394 -r1.1395
--- ChangeLog 27 Oct 2014 19:48:35 -0000 1.1394
+++ ChangeLog 28 Oct 2014 16:45:38 -0000 1.1395
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1394 2014/10/27 19:48:35 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1395 2014/10/28 16:45:38 kensington Exp $
+
+ 28 Oct 2014; Michael Palimaka <kensington@gentoo.org> kde5-functions.eclass:
+ Fix handling of frameworks version dependencies within kde-frameworks.
27 Oct 2014; Hans de Graaff <graaff@gentoo.org> ruby-ng-gnome2.eclass:
Enable verbose compilation output for the ruby gnome packages.
1.2 eclass/kde5-functions.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?r1=1.1&r2=1.2
Index: kde5-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde5-functions.eclass,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde5-functions.eclass 15 Oct 2014 12:48:57 -0000 1.1
+++ kde5-functions.eclass 28 Oct 2014 16:45:38 -0000 1.2
@@ -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/kde5-functions.eclass,v 1.1 2014/10/15 12:48:57 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde5-functions.eclass,v 1.2 2014/10/28 16:45:38 kensington Exp $
# @ECLASS: kde5-functions.eclass
# @MAINTAINER:
@@ -118,7 +118,7 @@
if [[ -n ${3} ]]; then
version=${3}
elif [[ ${CATEGORY} = kde-frameworks ]]; then
- version=${PV}
+ version=$(get_version_component_range 1-2)
elif [[ ${CATEGORY} = kde-base ]]; then
case $(get_kde_version) in
5.1) version=5.3.0 ;;
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde5-functions.eclass
@ 2014-12-17 13:26 Manuel Rueger (mrueg)
0 siblings, 0 replies; 5+ messages in thread
From: Manuel Rueger (mrueg) @ 2014-12-17 13:26 UTC (permalink / raw
To: gentoo-commits
mrueg 14/12/17 13:26:28
Modified: ChangeLog kde5-functions.eclass
Log:
Sync eclass with kde overlay.
Revision Changes Path
1.1465 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1465&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1465&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1464&r2=1.1465
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1464
retrieving revision 1.1465
diff -u -r1.1464 -r1.1465
--- ChangeLog 16 Dec 2014 00:04:31 -0000 1.1464
+++ ChangeLog 17 Dec 2014 13:26:28 -0000 1.1465
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1464 2014/12/16 00:04:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1465 2014/12/17 13:26:28 mrueg Exp $
+
+ 17 Dec 2014; Manuel Rüger <mrueg@gentoo.org> kde5-functions.eclass:
+ Sync eclass with kde overlay.
16 Dec 2014; Pacho Ramos <pacho@gentoo.org> gnome2.eclass:
Deprecate USE_EINSTALL (#482082)
1.3 eclass/kde5-functions.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?r1=1.2&r2=1.3
Index: kde5-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde5-functions.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde5-functions.eclass 28 Oct 2014 16:45:38 -0000 1.2
+++ kde5-functions.eclass 17 Dec 2014 13:26:28 -0000 1.3
@@ -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/kde5-functions.eclass,v 1.2 2014/10/28 16:45:38 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde5-functions.eclass,v 1.3 2014/12/17 13:26:28 mrueg Exp $
# @ECLASS: kde5-functions.eclass
# @MAINTAINER:
@@ -79,7 +79,7 @@
# @FUNCTION: _add_kdecategory_dep
# @INTERNAL
# @DESCRIPTION:
-# Implementation of add_kdebase_dep and add_frameworks_dep.
+# Implementation of add_kdeplasma_dep and add_frameworks_dep.
_add_kdecategory_dep() {
debug-print-function ${FUNCNAME} "$@"
@@ -87,6 +87,7 @@
local package=${2}
local use=${3}
local version=${4}
+ local slot=
if [[ -n ${use} ]] ; then
local use="[${use}]"
@@ -97,7 +98,11 @@
local version="-${version}"
fi
- echo " ${operator}${category}/${package}${version}:5${use}"
+ if [[ ${SLOT} = 4 || ${SLOT} = 5 ]] && ! has kde5-meta-pkg ${INHERITED} ; then
+ slot=":${SLOT}"
+ fi
+
+ echo " ${operator}${category}/${package}${version}${slot}${use}"
}
# @FUNCTION: add_frameworks_dep
@@ -131,7 +136,31 @@
_add_kdecategory_dep kde-frameworks "${1}" "${2}" "${version}"
}
-# @FUNCTION: add_kdebase_dep
+# @FUNCTION: add_kdeapps_dep
+# @USAGE: <package> [USE flags] [minimum version]
+# @DESCRIPTION:
+# 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_kdeapps_dep() {
+ debug-print-function ${FUNCNAME} "$@"
+
+ local version
+
+ if [[ -n ${3} ]]; then
+ version=${3}
+ elif [[ ${CATEGORY} = kde-apps ]]; then
+ version=${PV}
+ fi
+
+ _add_kdecategory_dep kde-apps "${1}" "${2}" "${version}"
+}
+
+# @FUNCTION: add_kdeplasma_dep
# @USAGE: <package> [USE flags] [minimum version]
# @DESCRIPTION:
# Create proper dependency for kde-base/ dependencies.
@@ -141,18 +170,18 @@
# 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_kdeplasma_dep() {
debug-print-function ${FUNCNAME} "$@"
local version
if [[ -n ${3} ]]; then
version=${3}
- elif [[ ${CATEGORY} = kde-base ]]; then
+ elif [[ ${CATEGORY} = kde-plasma ]]; then
version=${PV}
fi
- _add_kdecategory_dep kde-base "${1}" "${2}" "${version}"
+ _add_kdecategory_dep kde-plasma "${1}" "${2}" "${version}"
}
# @FUNCTION: get_kde_version
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde5-functions.eclass
@ 2015-01-09 18:26 Manuel Rueger (mrueg)
0 siblings, 0 replies; 5+ messages in thread
From: Manuel Rueger (mrueg) @ 2015-01-09 18:26 UTC (permalink / raw
To: gentoo-commits
mrueg 15/01/09 18:26:26
Modified: ChangeLog kde5-functions.eclass
Log:
Sync kde5-functions.eclass with overlay.
Revision Changes Path
1.1503 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1503&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1503&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1502&r2=1.1503
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1502
retrieving revision 1.1503
diff -u -r1.1502 -r1.1503
--- ChangeLog 8 Jan 2015 23:26:56 -0000 1.1502
+++ ChangeLog 9 Jan 2015 18:26:26 -0000 1.1503
@@ -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.1502 2015/01/08 23:26:56 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1503 2015/01/09 18:26:26 mrueg Exp $
+
+ 09 Jan 2015; Manuel Rüger <mrueg@gentoo.org> kde5-functions.eclass:
+ Sync kde5-functions.eclass with overlay.
08 Jan 2015; Lars Wendler <polynomial-c@gentoo.org> autotools.eclass:
Bump latest unstable automake version to 1.15.
1.4 eclass/kde5-functions.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?r1=1.3&r2=1.4
Index: kde5-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde5-functions.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kde5-functions.eclass 17 Dec 2014 13:26:28 -0000 1.3
+++ kde5-functions.eclass 9 Jan 2015 18:26:26 -0000 1.4
@@ -1,6 +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/kde5-functions.eclass,v 1.3 2014/12/17 13:26:28 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde5-functions.eclass,v 1.4 2015/01/09 18:26:26 mrueg Exp $
# @ECLASS: kde5-functions.eclass
# @MAINTAINER:
@@ -26,7 +26,7 @@
# @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
# @DESCRIPTION:
# Minimal Frameworks version to require for the package.
-: ${FRAMEWORKS_MINIMAL:=5.3.0}
+: ${FRAMEWORKS_MINIMAL:=5.6.0}
# @ECLASS-VARIABLE: KDEBASE
# @DESCRIPTION:
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde5-functions.eclass
@ 2015-05-09 10:24 Manuel Rueger (mrueg)
0 siblings, 0 replies; 5+ messages in thread
From: Manuel Rueger (mrueg) @ 2015-05-09 10:24 UTC (permalink / raw
To: gentoo-commits
mrueg 15/05/09 10:24:46
Modified: ChangeLog kde5-functions.eclass
Log:
Sync kde5-functions.eclass with overlay.
Revision Changes Path
1.1605 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1605&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1605&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1604&r2=1.1605
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1604
retrieving revision 1.1605
diff -u -r1.1604 -r1.1605
--- ChangeLog 9 May 2015 10:22:36 -0000 1.1604
+++ ChangeLog 9 May 2015 10:24:46 -0000 1.1605
@@ -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.1604 2015/05/09 10:22:36 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1605 2015/05/09 10:24:46 mrueg Exp $
+
+ 09 May 2015; Manuel Rüger <mrueg@gentoo.org> kde5-functions.eclass:
+ Sync with overlay.
09 May 2015; Manuel Rüger <mrueg@gentoo.org> kde5.eclass:
Sync with overlay.
1.7 eclass/kde5-functions.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?r1=1.6&r2=1.7
Index: kde5-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde5-functions.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kde5-functions.eclass 11 Apr 2015 17:11:22 -0000 1.6
+++ kde5-functions.eclass 9 May 2015 10:24:46 -0000 1.7
@@ -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-functions.eclass,v 1.6 2015/04/11 17:11:22 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde5-functions.eclass,v 1.7 2015/05/09 10:24:46 mrueg Exp $
# @ECLASS: kde5-functions.eclass
# @MAINTAINER:
@@ -210,11 +210,30 @@
fi
}
-# @FUNCTION: punt_bogus_deps
+# @FUNCTION: punt_bogus_dep
+# @USAGE: <prefix> <dependency>
# @DESCRIPTION:
-# Remove hard-coded upstream dependencies that are not correct.
-punt_bogus_deps() {
- sed -e "/find_package(Qt5 /s/ Test//" -i CMakeLists.txt || die
+# Removes a specified dependency from a find_package call with multiple components.
+punt_bogus_dep() {
+ local prefix=${1}
+ local dep=${2}
+
+ pcregrep -Mn "(?s)find_package\(\s*${prefix}.[^)]*?${dep}.*?\)" CMakeLists.txt > "${T}/bogus${dep}"
+
+ # pcregrep returns non-zero on no matches/error
+ if [[ $? != 0 ]] ; then
+ return
+ fi
+
+ local length=$(wc -l "${T}/bogus${dep}" | cut -d " " -f 1)
+ local first=$(head -n 1 "${T}/bogus${dep}" | cut -d ":" -f 1)
+ local last=$(( ${length} + ${first} - 1))
+
+ sed -e "${first},${last}s/${dep}//" -i CMakeLists.txt || die
+
+ if [[ ${length} = 1 ]] ; then
+ sed -e "/find_package(\s*${prefix}\s*REQUIRED\s*COMPONENTS\s*)/d" -i CMakeLists.txt || die
+ fi
}
fi
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde5-functions.eclass
@ 2015-06-08 12:27 Manuel Rueger (mrueg)
0 siblings, 0 replies; 5+ messages in thread
From: Manuel Rueger (mrueg) @ 2015-06-08 12:27 UTC (permalink / raw
To: gentoo-commits
mrueg 15/06/08 12:27:32
Modified: ChangeLog kde5-functions.eclass
Log:
Sync with kde overlay. Raise minimal Plasma version and minimal KDE Frameworks version.
Revision Changes Path
1.1644 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1644&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1644&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1643&r2=1.1644
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1643
retrieving revision 1.1644
diff -u -r1.1643 -r1.1644
--- ChangeLog 7 Jun 2015 19:22:36 -0000 1.1643
+++ ChangeLog 8 Jun 2015 12:27:32 -0000 1.1644
@@ -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.1643 2015/06/07 19:22:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1644 2015/06/08 12:27:32 mrueg Exp $
+
+ 08 Jun 2015; Manuel Rüger <mrueg@gentoo.org> kde5-functions.eclass:
+ Sync with kde overlay. Raise minimal Plasma version and minimal KDE
+ Frameworks version.
07 Jun 2015; Pacho Ramos <pacho@gentoo.org> apache-2.eclass:
mod_macro is now provided by apache itself (#477702)
1.8 eclass/kde5-functions.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?r1=1.7&r2=1.8
Index: kde5-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde5-functions.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kde5-functions.eclass 9 May 2015 10:24:46 -0000 1.7
+++ kde5-functions.eclass 8 Jun 2015 12:27:32 -0000 1.8
@@ -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-functions.eclass,v 1.7 2015/05/09 10:24:46 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde5-functions.eclass,v 1.8 2015/06/08 12:27:32 mrueg Exp $
# @ECLASS: kde5-functions.eclass
# @MAINTAINER:
@@ -26,12 +26,12 @@
# @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
# @DESCRIPTION:
# Minimal Frameworks version to require for the package.
-: ${FRAMEWORKS_MINIMAL:=5.8.0}
+: ${FRAMEWORKS_MINIMAL:=5.10.0}
# @ECLASS-VARIABLE: PLASMA_MINIMAL
# @DESCRIPTION:
# Minimal Plasma version to require for the package.
-: ${PLASMA_MINIMAL:=5.2.0}
+: ${PLASMA_MINIMAL:=5.3.0}
# @ECLASS-VARIABLE: KDE_APPS_MINIMAL
# @DESCRIPTION:
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-06-08 12:27 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-17 13:26 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde5-functions.eclass Manuel Rueger (mrueg)
-- strict thread matches above, loose matches on Subject: below --
2015-06-08 12:27 Manuel Rueger (mrueg)
2015-05-09 10:24 Manuel Rueger (mrueg)
2015-01-09 18:26 Manuel Rueger (mrueg)
2014-10-28 16:45 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