Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Johannes Huber (johu)" <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde5-functions.eclass kde5.eclass
Date: Sat, 27 Jun 2015 22:02:33
Message-Id: 20150627220221.BA4C673F@oystercatcher.gentoo.org
1 johu 15/06/27 22:02:21
2
3 Modified: ChangeLog kde5-functions.eclass kde5.eclass
4 Log:
5 Sync kde5*eclass with kde overlay. Handle more whitespace variations by Michael Palimaka <kensington@g.o>. Fixes translation handling by Michael Palimaka <kensington@g.o> and Andreas Sturmlechner <andreas.sturmlechner@×××××.com>, bug #552664. Raises deps on KDE Frameworks and KDE Plasma Manuel Rüger <mrueg@g.o>.
6
7 Revision Changes Path
8 1.1691 eclass/ChangeLog
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1691&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1691&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1690&r2=1.1691
13
14 Index: ChangeLog
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
17 retrieving revision 1.1690
18 retrieving revision 1.1691
19 diff -u -r1.1690 -r1.1691
20 --- ChangeLog 27 Jun 2015 17:41:20 -0000 1.1690
21 +++ ChangeLog 27 Jun 2015 22:02:21 -0000 1.1691
22 @@ -1,6 +1,14 @@
23 # ChangeLog for eclass directory
24 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1690 2015/06/27 17:41:20 mpagano Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1691 2015/06/27 22:02:21 johu Exp $
27 +
28 + 27 Jun 2015; Johannes Huber <johu@g.o> kde5-functions.eclass,
29 + kde5.eclass:
30 + Sync kde5*eclass with kde overlay. Handle more whitespace variations by
31 + Michael Palimaka <kensington@g.o>. Fixes translation handling by
32 + Michael Palimaka <kensington@g.o> and Andreas Sturmlechner
33 + <andreas.sturmlechner@×××××.com>, bug #552664. Raises deps on KDE Frameworks
34 + and KDE Plasma Manuel Rüger <mrueg@g.o>.
35
36 27 Jun 2015; Mike Pagano <mpagano@g.o> kernel-2.eclass:
37 Fix conditional bug for UNIPATCH_DROP
38
39
40
41 1.9 eclass/kde5-functions.eclass
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?rev=1.9&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?rev=1.9&content-type=text/plain
45 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?r1=1.8&r2=1.9
46
47 Index: kde5-functions.eclass
48 ===================================================================
49 RCS file: /var/cvsroot/gentoo-x86/eclass/kde5-functions.eclass,v
50 retrieving revision 1.8
51 retrieving revision 1.9
52 diff -u -r1.8 -r1.9
53 --- kde5-functions.eclass 8 Jun 2015 12:27:32 -0000 1.8
54 +++ kde5-functions.eclass 27 Jun 2015 22:02:21 -0000 1.9
55 @@ -1,6 +1,6 @@
56 # Copyright 1999-2015 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde5-functions.eclass,v 1.8 2015/06/08 12:27:32 mrueg Exp $
59 +# $Header: /var/cvsroot/gentoo-x86/eclass/kde5-functions.eclass,v 1.9 2015/06/27 22:02:21 johu Exp $
60
61 # @ECLASS: kde5-functions.eclass
62 # @MAINTAINER:
63 @@ -26,12 +26,12 @@
64 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
65 # @DESCRIPTION:
66 # Minimal Frameworks version to require for the package.
67 -: ${FRAMEWORKS_MINIMAL:=5.10.0}
68 +: ${FRAMEWORKS_MINIMAL:=5.11.0}
69
70 # @ECLASS-VARIABLE: PLASMA_MINIMAL
71 # @DESCRIPTION:
72 # Minimal Plasma version to require for the package.
73 -: ${PLASMA_MINIMAL:=5.3.0}
74 +: ${PLASMA_MINIMAL:=5.3.1}
75
76 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
77 # @DESCRIPTION:
78 @@ -218,7 +218,7 @@
79 local prefix=${1}
80 local dep=${2}
81
82 - pcregrep -Mn "(?s)find_package\(\s*${prefix}.[^)]*?${dep}.*?\)" CMakeLists.txt > "${T}/bogus${dep}"
83 + pcregrep -Mn "(?s)find_package\s*\(\s*${prefix}.[^)]*?${dep}.*?\)" CMakeLists.txt > "${T}/bogus${dep}"
84
85 # pcregrep returns non-zero on no matches/error
86 if [[ $? != 0 ]] ; then
87 @@ -232,7 +232,7 @@
88 sed -e "${first},${last}s/${dep}//" -i CMakeLists.txt || die
89
90 if [[ ${length} = 1 ]] ; then
91 - sed -e "/find_package(\s*${prefix}\s*REQUIRED\s*COMPONENTS\s*)/d" -i CMakeLists.txt || die
92 + sed -e "/find_package\s*(\s*${prefix}\s*REQUIRED\s*COMPONENTS\s*)/d" -i CMakeLists.txt || die
93 fi
94 }
95
96
97
98
99 1.11 eclass/kde5.eclass
100
101 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5.eclass?rev=1.11&view=markup
102 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5.eclass?rev=1.11&content-type=text/plain
103 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5.eclass?r1=1.10&r2=1.11
104
105 Index: kde5.eclass
106 ===================================================================
107 RCS file: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v
108 retrieving revision 1.10
109 retrieving revision 1.11
110 diff -u -r1.10 -r1.11
111 --- kde5.eclass 31 May 2015 15:51:21 -0000 1.10
112 +++ kde5.eclass 27 Jun 2015 22:02:21 -0000 1.11
113 @@ -1,6 +1,6 @@
114 # Copyright 1999-2015 Gentoo Foundation
115 # Distributed under the terms of the GNU General Public License v2
116 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v 1.10 2015/05/31 15:51:21 mrueg Exp $
117 +# $Header: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v 1.11 2015/06/27 22:02:21 johu Exp $
118
119 # @ECLASS: kde5.eclass
120 # @MAINTAINER:
121 @@ -142,10 +142,7 @@
122 fi
123
124 if [[ ${KDE_BLOCK_SLOT4} = true && ${CATEGORY} = kde-apps ]]; then
125 - RDEPEND+="
126 - !kde-apps/${PN}:4
127 - !kde-base/${PN}
128 - "
129 + RDEPEND+=" !kde-apps/${PN}:4"
130 fi
131 ;;
132 esac
133 @@ -376,11 +373,20 @@
134 # enable only the requested translations
135 # when required
136 if [[ ${KDE_BUILD_TYPE} = release ]] ; then
137 - for lang in $(ls po 2> /dev/null) ; do
138 - if ! has ${lang} ${LINGUAS} ; then
139 - rm -rf po/${lang}
140 - fi
141 - done
142 + if [[ -d po ]] ; then
143 + pushd po > /dev/null
144 + for lang in $(ls) ; do
145 + if ! has ${lang} ${LINGUAS} ; then
146 + if [[ ${lang} != CMakeLists.txt ]] ; then
147 + rm -rf ${lang}
148 + fi
149 + if [[ -e CMakeLists.txt ]] ; then
150 + comment_add_subdirectory ${lang}
151 + fi
152 + fi
153 + done
154 + popd > /dev/null
155 + fi
156
157 if [[ ${KDE_HANDBOOK} = true ]] ; then
158 pushd doc > /dev/null
Report Message
Find on MARC Find on Google Groups