| 1 |
commit: 627d2440902e45b27712a556d5b1eff43fdc67e1 |
| 2 |
Author: Matthew Dawson <matthew <AT> mjdsystems <DOT> ca> |
| 3 |
AuthorDate: Sun Dec 27 16:50:32 2015 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 30 14:13:07 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=627d2440 |
| 7 |
|
| 8 |
app-office/calligra: Bump version to 2.9.10 |
| 9 |
|
| 10 |
Also fix ebuild to handle revision version numbers >=10, and disables |
| 11 |
GHNS as it isn't supported by upstream. |
| 12 |
|
| 13 |
app-office/calligra/Manifest | 1 + |
| 14 |
.../calligra/{calligra-9999.ebuild => calligra-2.9.10.ebuild} | 6 +----- |
| 15 |
app-office/calligra/calligra-9999.ebuild | 6 +----- |
| 16 |
3 files changed, 3 insertions(+), 10 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest |
| 19 |
index a8a3842..37f49a0 100644 |
| 20 |
--- a/app-office/calligra/Manifest |
| 21 |
+++ b/app-office/calligra/Manifest |
| 22 |
@@ -1,4 +1,5 @@ |
| 23 |
DIST calligra-2.8.5.tar.xz 138928992 SHA256 92b8828ec64b46124b29a03bae13c143e3ed771adf3186fa938c765e5eac2fbd SHA512 09e32b7ce2415daae2ac3c1871fc1bc270210cbf5bc774f622922f8adb20e639db3dfb16c2974404b4395b30f8367a7ddd0016363a8b3e46fa24ff3fde1e4c14 WHIRLPOOL b4cc14353b7f9a457510a745b711283481f969e10ffee2847253b123ba2ea03f61d8abfdda2bcdb463c6bba8f2d8634e1536259f5be3d44778104bc8f28f79fe |
| 24 |
DIST calligra-2.8.7.tar.xz 138966248 SHA256 af6b8b74ea077e5bbfa398e3ae96866b9a3ccfbc10224e9f341e59643be80eb5 SHA512 e09fcbb6708d73db3b31027c4393a138fbf5c47d1b777dd4a3b94f6e668d67ac963cfadb320350c63f1b2d1173edc67dc2100704899176c196865fb4d2ce7442 WHIRLPOOL ce082f04cfb7947219e317ba9a4a6ce436a3aa0784f1cad6206f3febd072f177961111ccbb89227d3c8dede1eafc647409b26f1f4fb304b1d482db0fe8c758b9 |
| 25 |
+DIST calligra-2.9.10.tar.xz 194841508 SHA256 a9d16f0523e03141a3d2cd2e28e484a8aa0f0fead2352ac2c385688066a1d1ef SHA512 50b14b938ecbc70aed36d83e475225cbed8ecb72e0f407e4a1089472a43122c9278d768dad258d1b65534a0e42322295bab5c493d580d69730daf63e936a6df6 WHIRLPOOL 3679b2ec00f00844b640d38dafce6925abf8ef2c851c72d7ad0a4046d85a432367b20436bc6dbbd28527102d0e58df61e5683042508f15a134dc34c002162c29 |
| 26 |
DIST calligra-2.9.6.tar.xz 194239580 SHA256 78564137133e2f45065085df66ce2ab31478517c10163a06ba690a2d3a98a184 SHA512 d51b20c3d53a09ced3347b117de6827c5c29e31b198eff8bc136f0d6f604991371c6c4705d0ff3c6bcc64c017f0a14139d4b0529b02973909d80a25223e59f07 WHIRLPOOL 848884f830e0b8b2c6b8ed73d11222598295ca56ed4db826f4a9c3d3be42d5a65f5e50879a4fed68d6ae004962b799e23d6978a0943ff6b8900728b62dec43c0 |
| 27 |
DIST calligra-2.9.7.tar.xz 194348264 SHA256 7a641a1669739ff55809fd6f2c22d673843ac41f64e82f5ca6cb3e60c7c82781 SHA512 89b6b43113dfd7304c9d88c79fe8ecce9d1cf5e6a82a401df6d0c5bad28c450af6e4012e859ccb1595f638513f79bb00f15cbc9f8cad03801c5aa1440b1b8a1f WHIRLPOOL d15fcf5458b25ae30e98031c541c85cac1658a435c8fa432fc7d3de44ebda7fa56ffab61b642c196d639d1bc9737f386e76dc75d7d51baa2efc0ed79d51dd9fc |
| 28 |
|
| 29 |
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-2.9.10.ebuild |
| 30 |
similarity index 98% |
| 31 |
copy from app-office/calligra/calligra-9999.ebuild |
| 32 |
copy to app-office/calligra/calligra-2.9.10.ebuild |
| 33 |
index db56918..04f1143 100644 |
| 34 |
--- a/app-office/calligra/calligra-9999.ebuild |
| 35 |
+++ b/app-office/calligra/calligra-2.9.10.ebuild |
| 36 |
@@ -21,7 +21,7 @@ case ${PV} in |
| 37 |
2.[456789].[789]?) |
| 38 |
# beta or rc releases |
| 39 |
SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;; |
| 40 |
- 2.[456789].?) |
| 41 |
+ 2.[456789].?|2.[456789].??) |
| 42 |
# stable releases |
| 43 |
SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;; |
| 44 |
2.[456789].9999) |
| 45 |
@@ -62,7 +62,6 @@ REQUIRED_USE=" |
| 46 |
" |
| 47 |
|
| 48 |
RDEPEND=" |
| 49 |
- $(add_kdeapps_dep knewstuff) |
| 50 |
dev-lang/perl |
| 51 |
dev-libs/boost |
| 52 |
dev-qt/qtcore:4[exceptions] |
| 53 |
@@ -141,8 +140,6 @@ PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}" |
| 54 |
# bug 394273 |
| 55 |
RESTRICT=test |
| 56 |
|
| 57 |
-PATCHES=( "${FILESDIR}/${PN}-2.9.6-ghns-linking.patch" ) |
| 58 |
- |
| 59 |
pkg_pretend() { |
| 60 |
check-reqs_pkg_pretend |
| 61 |
} |
| 62 |
@@ -167,7 +164,6 @@ src_configure() { |
| 63 |
|
| 64 |
# first write out things we want to hard-enable |
| 65 |
mycmakeargs+=( |
| 66 |
- "-DGHNS=ON" |
| 67 |
"-DWITH_Iconv=ON" # available on all supported arches and many more |
| 68 |
) |
| 69 |
|
| 70 |
|
| 71 |
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild |
| 72 |
index db56918..04f1143 100644 |
| 73 |
--- a/app-office/calligra/calligra-9999.ebuild |
| 74 |
+++ b/app-office/calligra/calligra-9999.ebuild |
| 75 |
@@ -21,7 +21,7 @@ case ${PV} in |
| 76 |
2.[456789].[789]?) |
| 77 |
# beta or rc releases |
| 78 |
SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;; |
| 79 |
- 2.[456789].?) |
| 80 |
+ 2.[456789].?|2.[456789].??) |
| 81 |
# stable releases |
| 82 |
SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;; |
| 83 |
2.[456789].9999) |
| 84 |
@@ -62,7 +62,6 @@ REQUIRED_USE=" |
| 85 |
" |
| 86 |
|
| 87 |
RDEPEND=" |
| 88 |
- $(add_kdeapps_dep knewstuff) |
| 89 |
dev-lang/perl |
| 90 |
dev-libs/boost |
| 91 |
dev-qt/qtcore:4[exceptions] |
| 92 |
@@ -141,8 +140,6 @@ PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}" |
| 93 |
# bug 394273 |
| 94 |
RESTRICT=test |
| 95 |
|
| 96 |
-PATCHES=( "${FILESDIR}/${PN}-2.9.6-ghns-linking.patch" ) |
| 97 |
- |
| 98 |
pkg_pretend() { |
| 99 |
check-reqs_pkg_pretend |
| 100 |
} |
| 101 |
@@ -167,7 +164,6 @@ src_configure() { |
| 102 |
|
| 103 |
# first write out things we want to hard-enable |
| 104 |
mycmakeargs+=( |
| 105 |
- "-DGHNS=ON" |
| 106 |
"-DWITH_Iconv=ON" # available on all supported arches and many more |
| 107 |
) |
Archives