1 |
mrueg 15/05/31 15:51:21 |
2 |
|
3 |
Modified: ChangeLog kde5.eclass |
4 |
Log: |
5 |
Sync verbosely with kde overlay. Drop fetch restriction for unpublished packages including the pkg_nofetch prompt. This did not work out as expected, see bug 549012. Add support for split localization packages via kde-apps/kde4-l10n. Add KDE_BLOCK_SLOT4 variable which makes it possible to adjust coinstallability of kf5 packages. |
6 |
|
7 |
Revision Changes Path |
8 |
1.1634 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1634&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1634&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1633&r2=1.1634 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.1633 |
18 |
retrieving revision 1.1634 |
19 |
diff -u -r1.1633 -r1.1634 |
20 |
--- ChangeLog 31 May 2015 13:56:53 -0000 1.1633 |
21 |
+++ ChangeLog 31 May 2015 15:51:21 -0000 1.1634 |
22 |
@@ -1,6 +1,13 @@ |
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.1633 2015/05/31 13:56:53 pesa Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1634 2015/05/31 15:51:21 mrueg Exp $ |
27 |
+ |
28 |
+ 31 May 2015; Manuel RĂ¼ger <mrueg@g.o> kde5.eclass: |
29 |
+ Sync verbosely with kde overlay. Drop fetch restriction for unpublished |
30 |
+ packages including the pkg_nofetch prompt. This did not work out as expected, |
31 |
+ see bug 549012. Add support for split localization packages via |
32 |
+ kde-apps/kde4-l10n. Add KDE_BLOCK_SLOT4 variable which makes it possible to |
33 |
+ adjust coinstallability of kf5 packages. |
34 |
|
35 |
31 May 2015; Davide Pesavento <pesa@g.o> qt4-build-multilib.eclass: |
36 |
Blacklist graphite-related flags that cause ICEs on qtwebkit (bug 550780). |
37 |
|
38 |
|
39 |
|
40 |
1.10 eclass/kde5.eclass |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5.eclass?rev=1.10&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5.eclass?rev=1.10&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5.eclass?r1=1.9&r2=1.10 |
45 |
|
46 |
Index: kde5.eclass |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v |
49 |
retrieving revision 1.9 |
50 |
retrieving revision 1.10 |
51 |
diff -u -r1.9 -r1.10 |
52 |
--- kde5.eclass 31 May 2015 10:11:35 -0000 1.9 |
53 |
+++ kde5.eclass 31 May 2015 15:51:21 -0000 1.10 |
54 |
@@ -1,6 +1,6 @@ |
55 |
# Copyright 1999-2015 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v 1.9 2015/05/31 10:11:35 perfinion Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v 1.10 2015/05/31 15:51:21 mrueg Exp $ |
59 |
|
60 |
# @ECLASS: kde5.eclass |
61 |
# @MAINTAINER: |
62 |
@@ -28,7 +28,7 @@ |
63 |
esac |
64 |
fi |
65 |
|
66 |
-EXPORT_FUNCTIONS pkg_pretend pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm |
67 |
+EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm |
68 |
|
69 |
# @ECLASS-VARIABLE: QT_MINIMAL |
70 |
# @DESCRIPTION: |
71 |
@@ -41,6 +41,12 @@ |
72 |
# For any other value, add a dependency on dev-qt/qtcore:5 and kde-frameworks/extra-cmake-modules:5. |
73 |
: ${KDE_AUTODEPS:=true} |
74 |
|
75 |
+# @ECLASS-VARIABLE: KDE_BLOCK_SLOT4 |
76 |
+# @DESCRIPTION: |
77 |
+# This variable is used when KDE_AUTODEPS is set. |
78 |
+# If set to "true", add RDEPEND block on kde-{base,apps}/${PN}:4 |
79 |
+: ${KDE_BLOCK_SLOT4:=true} |
80 |
+ |
81 |
# @ECLASS-VARIABLE: KDE_DEBUG |
82 |
# @DESCRIPTION: |
83 |
# If set to "false", unconditionally build with -DNDEBUG. |
84 |
@@ -95,14 +101,6 @@ |
85 |
# add a dependency on sec-policy/selinux-${KDE_SELINUX_MODULE} to (R)DEPEND. |
86 |
: ${KDE_SELINUX_MODULE:=none} |
87 |
|
88 |
-# @ECLASS-VARIABLE: KDE_RELEASE_DATE |
89 |
-# @DESCRIPTION: |
90 |
-# Used to display a fetch restriction for packages that have not been published yet. |
91 |
-# If set to "none", use internal schedule. |
92 |
-# Otherwise set it to a date formatted as YYMMDD. |
93 |
-# Internal schedule is adjusted in _get_release_date(). |
94 |
-: ${KDE_RELEASE_DATE:=none} |
95 |
- |
96 |
if [[ ${KDEBASE} = kdevelop ]]; then |
97 |
HOMEPAGE="http://www.kdevelop.org/" |
98 |
else |
99 |
@@ -138,12 +136,12 @@ |
100 |
|
101 |
if [[ ${CATEGORY} = kde-plasma ]]; then |
102 |
RDEPEND+=" |
103 |
- !kde-apps/kde-l10n[-minimal] |
104 |
+ !kde-apps/kde4-l10n[-minimal] |
105 |
!kde-base/kde-l10n:4[-minimal(-)] |
106 |
" |
107 |
fi |
108 |
|
109 |
- if [[ ${CATEGORY} == kde-apps ]]; then |
110 |
+ if [[ ${KDE_BLOCK_SLOT4} = true && ${CATEGORY} = kde-apps ]]; then |
111 |
RDEPEND+=" |
112 |
!kde-apps/${PN}:4 |
113 |
!kde-base/${PN} |
114 |
@@ -316,59 +314,9 @@ |
115 |
esac |
116 |
} |
117 |
|
118 |
- |
119 |
-_get_release_date() { |
120 |
- debug-print-function ${FUNCNAME} "$@" |
121 |
- case ${CATEGORY} in |
122 |
- kde-frameworks) |
123 |
- case ${PV} in |
124 |
- 5.10.0) echo "20150507" ;; |
125 |
- 5.11.0) echo "20150611" ;; |
126 |
- 5.12.0) echo "20150709" ;; |
127 |
- 5.13.0) echo "20150806" ;; |
128 |
- *) echo "none" ;; |
129 |
- esac |
130 |
- ;; |
131 |
- kde-plasma) |
132 |
- case ${PV} in |
133 |
- 5.3.0) echo "20150428" ;; |
134 |
- 5.3.1) echo "20150526" ;; |
135 |
- 5.3.2) echo "20150630" ;; |
136 |
- 5.3.95) echo "20150811" ;; |
137 |
- 5.4.0) echo "20150825" ;; |
138 |
- *) echo "none" ;; |
139 |
- esac |
140 |
- ;; |
141 |
- kde-apps) |
142 |
- case ${PV} in |
143 |
- 15.04.1) echo "20150512" ;; |
144 |
- 15.04.2) echo "20150602" ;; |
145 |
- 15.04.3) echo "20150630" ;; |
146 |
- 15.07.90) echo "20150805" ;; |
147 |
- 15.08.0) echo "20150819" ;; |
148 |
- *) echo "none" ;; |
149 |
- esac |
150 |
- ;; |
151 |
- *) echo "none" ;; |
152 |
- esac |
153 |
-} |
154 |
- |
155 |
-_check_fetch_restriction() { |
156 |
- debug-print-function ${FUNCNAME} "$@" |
157 |
- if [[ ${KDE_RELEASE_DATE} == "none" ]]; then |
158 |
- KDE_RELEASE_DATE=$(_get_release_date) |
159 |
- fi |
160 |
- if [[ ${KDE_RELEASE_DATE} != "none" ]]; then |
161 |
- if [[ $(date -u +"%Y%m%d") < ${KDE_RELEASE_DATE} ]]; then |
162 |
- RESTRICT+=" fetch" |
163 |
- fi |
164 |
- fi |
165 |
-} |
166 |
- |
167 |
case ${KDE_BUILD_TYPE} in |
168 |
live) _calculate_live_repo ;; |
169 |
- *) _calculate_src_uri |
170 |
- _check_fetch_restriction ;; |
171 |
+ *) _calculate_src_uri ;; |
172 |
esac |
173 |
|
174 |
debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}" |
175 |
@@ -389,17 +337,6 @@ |
176 |
_check_gcc_version |
177 |
} |
178 |
|
179 |
-# @FUNCTION: kde5_pkg_nofetch |
180 |
-# @DESCRIPTION: |
181 |
-# Display package publication status |
182 |
-kde5_pkg_nofetch() { |
183 |
- einfo "${CATEGORY}/${P} has not been released to the public yet" |
184 |
- einfo "and is only available to packagers right now." |
185 |
- einfo "" |
186 |
- einfo "Further information:" |
187 |
- einfo "https://techbase.kde.org/Schedules" |
188 |
-} |
189 |
- |
190 |
# @FUNCTION: kde5_src_unpack |
191 |
# @DESCRIPTION: |
192 |
# Function for unpacking KDE 5. |