| 1 |
scarabeus 12/06/01 17:22:15 |
| 2 |
|
| 3 |
Modified: calligra-2.4.1.ebuild calligra-2.4.90.ebuild |
| 4 |
calligra-2.4.2.ebuild calligra-2.4.49.9999.ebuild |
| 5 |
calligra-9999.ebuild ChangeLog |
| 6 |
Log: |
| 7 |
Depend on calligra-l10n. Fixes bug#417987. |
| 8 |
|
| 9 |
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.6 app-office/calligra/calligra-2.4.1.ebuild |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-2.4.1.ebuild?rev=1.6&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-2.4.1.ebuild?rev=1.6&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-2.4.1.ebuild?r1=1.5&r2=1.6 |
| 17 |
|
| 18 |
Index: calligra-2.4.1.ebuild |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.1.ebuild,v |
| 21 |
retrieving revision 1.5 |
| 22 |
retrieving revision 1.6 |
| 23 |
diff -u -r1.5 -r1.6 |
| 24 |
--- calligra-2.4.1.ebuild 27 May 2012 22:44:56 -0000 1.5 |
| 25 |
+++ calligra-2.4.1.ebuild 1 Jun 2012 17:22:15 -0000 1.6 |
| 26 |
@@ -1,6 +1,6 @@ |
| 27 |
# Copyright 1999-2012 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.1.ebuild,v 1.5 2012/05/27 22:44:56 dilfridge Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.1.ebuild,v 1.6 2012/06/01 17:22:15 scarabeus Exp $ |
| 31 |
|
| 32 |
# note: files that need to be checked for dependencies etc: |
| 33 |
# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt |
| 34 |
@@ -18,7 +18,7 @@ |
| 35 |
KDE_HANDBOOK=optional |
| 36 |
|
| 37 |
KDE_LINGUAS_LIVE_OVERRIDE=true |
| 38 |
-inherit kde4-base |
| 39 |
+inherit kde4-base versionator |
| 40 |
|
| 41 |
DESCRIPTION="KDE Office Suite" |
| 42 |
HOMEPAGE="http://www.calligra.org/" |
| 43 |
@@ -116,6 +116,7 @@ |
| 44 |
) |
| 45 |
" |
| 46 |
DEPEND="${RDEPEND}" |
| 47 |
+PDEPEND=">=app-office/calligra-$(get_version_component_range 1-2)" |
| 48 |
|
| 49 |
RESTRICT=test |
| 50 |
# bug 394273 |
| 51 |
|
| 52 |
|
| 53 |
|
| 54 |
1.4 app-office/calligra/calligra-2.4.90.ebuild |
| 55 |
|
| 56 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-2.4.90.ebuild?rev=1.4&view=markup |
| 57 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-2.4.90.ebuild?rev=1.4&content-type=text/plain |
| 58 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-2.4.90.ebuild?r1=1.3&r2=1.4 |
| 59 |
|
| 60 |
Index: calligra-2.4.90.ebuild |
| 61 |
=================================================================== |
| 62 |
RCS file: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.90.ebuild,v |
| 63 |
retrieving revision 1.3 |
| 64 |
retrieving revision 1.4 |
| 65 |
diff -u -r1.3 -r1.4 |
| 66 |
--- calligra-2.4.90.ebuild 28 May 2012 00:12:22 -0000 1.3 |
| 67 |
+++ calligra-2.4.90.ebuild 1 Jun 2012 17:22:15 -0000 1.4 |
| 68 |
@@ -1,6 +1,6 @@ |
| 69 |
# Copyright 1999-2012 Gentoo Foundation |
| 70 |
# Distributed under the terms of the GNU General Public License v2 |
| 71 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.90.ebuild,v 1.3 2012/05/28 00:12:22 mr_bones_ Exp $ |
| 72 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.90.ebuild,v 1.4 2012/06/01 17:22:15 scarabeus Exp $ |
| 73 |
|
| 74 |
# note: files that need to be checked for dependencies etc: |
| 75 |
# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt |
| 76 |
@@ -16,7 +16,7 @@ |
| 77 |
KDE_HANDBOOK=optional |
| 78 |
|
| 79 |
KDE_LINGUAS_LIVE_OVERRIDE=true |
| 80 |
-inherit kde4-base |
| 81 |
+inherit kde4-base versionator |
| 82 |
|
| 83 |
DESCRIPTION="KDE Office Suite" |
| 84 |
HOMEPAGE="http://www.calligra.org/" |
| 85 |
@@ -130,6 +130,7 @@ |
| 86 |
) |
| 87 |
" |
| 88 |
DEPEND="${RDEPEND}" |
| 89 |
+PDEPEND=">=app-office/calligra-$(get_version_component_range 1-2)" |
| 90 |
|
| 91 |
RESTRICT=test |
| 92 |
# bug 394273 |
| 93 |
|
| 94 |
|
| 95 |
|
| 96 |
1.3 app-office/calligra/calligra-2.4.2.ebuild |
| 97 |
|
| 98 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-2.4.2.ebuild?rev=1.3&view=markup |
| 99 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-2.4.2.ebuild?rev=1.3&content-type=text/plain |
| 100 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-2.4.2.ebuild?r1=1.2&r2=1.3 |
| 101 |
|
| 102 |
Index: calligra-2.4.2.ebuild |
| 103 |
=================================================================== |
| 104 |
RCS file: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.2.ebuild,v |
| 105 |
retrieving revision 1.2 |
| 106 |
retrieving revision 1.3 |
| 107 |
diff -u -r1.2 -r1.3 |
| 108 |
--- calligra-2.4.2.ebuild 27 May 2012 22:44:56 -0000 1.2 |
| 109 |
+++ calligra-2.4.2.ebuild 1 Jun 2012 17:22:15 -0000 1.3 |
| 110 |
@@ -1,6 +1,6 @@ |
| 111 |
# Copyright 1999-2012 Gentoo Foundation |
| 112 |
# Distributed under the terms of the GNU General Public License v2 |
| 113 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.2.ebuild,v 1.2 2012/05/27 22:44:56 dilfridge Exp $ |
| 114 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.2.ebuild,v 1.3 2012/06/01 17:22:15 scarabeus Exp $ |
| 115 |
|
| 116 |
# note: files that need to be checked for dependencies etc: |
| 117 |
# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt |
| 118 |
@@ -18,7 +18,7 @@ |
| 119 |
KDE_HANDBOOK=optional |
| 120 |
|
| 121 |
KDE_LINGUAS_LIVE_OVERRIDE=true |
| 122 |
-inherit kde4-base |
| 123 |
+inherit kde4-base versionator |
| 124 |
|
| 125 |
DESCRIPTION="KDE Office Suite" |
| 126 |
HOMEPAGE="http://www.calligra.org/" |
| 127 |
@@ -116,6 +116,7 @@ |
| 128 |
) |
| 129 |
" |
| 130 |
DEPEND="${RDEPEND}" |
| 131 |
+PDEPEND=">=app-office/calligra-$(get_version_component_range 1-2)" |
| 132 |
|
| 133 |
RESTRICT=test |
| 134 |
# bug 394273 |
| 135 |
|
| 136 |
|
| 137 |
|
| 138 |
1.3 app-office/calligra/calligra-2.4.49.9999.ebuild |
| 139 |
|
| 140 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-2.4.49.9999.ebuild?rev=1.3&view=markup |
| 141 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-2.4.49.9999.ebuild?rev=1.3&content-type=text/plain |
| 142 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-2.4.49.9999.ebuild?r1=1.2&r2=1.3 |
| 143 |
|
| 144 |
Index: calligra-2.4.49.9999.ebuild |
| 145 |
=================================================================== |
| 146 |
RCS file: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.49.9999.ebuild,v |
| 147 |
retrieving revision 1.2 |
| 148 |
retrieving revision 1.3 |
| 149 |
diff -u -r1.2 -r1.3 |
| 150 |
--- calligra-2.4.49.9999.ebuild 27 May 2012 22:44:56 -0000 1.2 |
| 151 |
+++ calligra-2.4.49.9999.ebuild 1 Jun 2012 17:22:15 -0000 1.3 |
| 152 |
@@ -1,6 +1,6 @@ |
| 153 |
# Copyright 1999-2012 Gentoo Foundation |
| 154 |
# Distributed under the terms of the GNU General Public License v2 |
| 155 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.49.9999.ebuild,v 1.2 2012/05/27 22:44:56 dilfridge Exp $ |
| 156 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.49.9999.ebuild,v 1.3 2012/06/01 17:22:15 scarabeus Exp $ |
| 157 |
|
| 158 |
# note: files that need to be checked for dependencies etc: |
| 159 |
# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt |
| 160 |
@@ -18,7 +18,7 @@ |
| 161 |
KDE_HANDBOOK=optional |
| 162 |
|
| 163 |
KDE_LINGUAS_LIVE_OVERRIDE=true |
| 164 |
-inherit kde4-base |
| 165 |
+inherit kde4-base versionator |
| 166 |
|
| 167 |
DESCRIPTION="KDE Office Suite" |
| 168 |
HOMEPAGE="http://www.calligra.org/" |
| 169 |
@@ -116,6 +116,7 @@ |
| 170 |
) |
| 171 |
" |
| 172 |
DEPEND="${RDEPEND}" |
| 173 |
+PDEPEND=">=app-office/calligra-$(get_version_component_range 1-2)" |
| 174 |
|
| 175 |
RESTRICT=test |
| 176 |
# bug 394273 |
| 177 |
|
| 178 |
|
| 179 |
|
| 180 |
1.22 app-office/calligra/calligra-9999.ebuild |
| 181 |
|
| 182 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-9999.ebuild?rev=1.22&view=markup |
| 183 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-9999.ebuild?rev=1.22&content-type=text/plain |
| 184 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/calligra-9999.ebuild?r1=1.21&r2=1.22 |
| 185 |
|
| 186 |
Index: calligra-9999.ebuild |
| 187 |
=================================================================== |
| 188 |
RCS file: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v |
| 189 |
retrieving revision 1.21 |
| 190 |
retrieving revision 1.22 |
| 191 |
diff -u -r1.21 -r1.22 |
| 192 |
--- calligra-9999.ebuild 28 May 2012 00:12:22 -0000 1.21 |
| 193 |
+++ calligra-9999.ebuild 1 Jun 2012 17:22:15 -0000 1.22 |
| 194 |
@@ -1,6 +1,6 @@ |
| 195 |
# Copyright 1999-2012 Gentoo Foundation |
| 196 |
# Distributed under the terms of the GNU General Public License v2 |
| 197 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.21 2012/05/28 00:12:22 mr_bones_ Exp $ |
| 198 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.22 2012/06/01 17:22:15 scarabeus Exp $ |
| 199 |
|
| 200 |
# note: files that need to be checked for dependencies etc: |
| 201 |
# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt |
| 202 |
@@ -16,7 +16,7 @@ |
| 203 |
KDE_HANDBOOK=optional |
| 204 |
|
| 205 |
KDE_LINGUAS_LIVE_OVERRIDE=true |
| 206 |
-inherit kde4-base |
| 207 |
+inherit kde4-base versionator |
| 208 |
|
| 209 |
DESCRIPTION="KDE Office Suite" |
| 210 |
HOMEPAGE="http://www.calligra.org/" |
| 211 |
@@ -131,6 +131,9 @@ |
| 212 |
" |
| 213 |
DEPEND="${RDEPEND}" |
| 214 |
|
| 215 |
+[[ ${PV} == 9999 ]] && LANGVERSION="2.4" || LANGVERSION="$(get_version_component_range 1-2)" |
| 216 |
+PDEPEND=">=app-office/calligra-${LANGVERSION}" |
| 217 |
+ |
| 218 |
RESTRICT=test |
| 219 |
# bug 394273 |
| 220 |
|
| 221 |
|
| 222 |
|
| 223 |
|
| 224 |
1.47 app-office/calligra/ChangeLog |
| 225 |
|
| 226 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/ChangeLog?rev=1.47&view=markup |
| 227 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/ChangeLog?rev=1.47&content-type=text/plain |
| 228 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/ChangeLog?r1=1.46&r2=1.47 |
| 229 |
|
| 230 |
Index: ChangeLog |
| 231 |
=================================================================== |
| 232 |
RCS file: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v |
| 233 |
retrieving revision 1.46 |
| 234 |
retrieving revision 1.47 |
| 235 |
diff -u -r1.46 -r1.47 |
| 236 |
--- ChangeLog 27 May 2012 22:44:56 -0000 1.46 |
| 237 |
+++ ChangeLog 1 Jun 2012 17:22:15 -0000 1.47 |
| 238 |
@@ -1,6 +1,11 @@ |
| 239 |
# ChangeLog for app-office/calligra |
| 240 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 241 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.46 2012/05/27 22:44:56 dilfridge Exp $ |
| 242 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.47 2012/06/01 17:22:15 scarabeus Exp $ |
| 243 |
+ |
| 244 |
+ 01 Jun 2012; Tomáš Chvátal <scarabeus@g.o> calligra-2.4.1.ebuild, |
| 245 |
+ calligra-2.4.2.ebuild, calligra-2.4.49.9999.ebuild, calligra-2.4.90.ebuild, |
| 246 |
+ calligra-9999.ebuild: |
| 247 |
+ Depend on calligra-l10n. Fixes bug#417987. |
| 248 |
|
| 249 |
27 May 2012; Andreas K. Huettel <dilfridge@g.o> calligra-2.4.1.ebuild, |
| 250 |
calligra-2.4.2.ebuild, calligra-2.4.49.9999.ebuild, calligra-2.4.90.ebuild, |
Archives