app-office/libreoffice: add bashisms removal patch back

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x901AB08A

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 9bc47ae5f8cdd33212c99f5c301fcde798d1d045..7906a656488e7a04abeeb0ab8e3727c23be8eb34 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.622 2015/02/26 20:02:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.623 2015/02/28 11:48:35 remi Exp $
+
+  28 Feb 2015; Rémi Cardona <remi@gentoo.org> libreoffice-4.4.1.2.ebuild:
+  Add bashisms removal patch back, it's not in 4.4, but in the
+  'feature/priorities' branch in upstream git.
 
 *libreoffice-4.4.1.2 (26 Feb 2015)
 

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 260653b4aa0faea4cdbc1d28900c8d6e00787270..a26a92dca9e30d2fee357bfc2f9328f01b8d487b 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -48,28 +48,16 @@ EBUILD libreoffice-4.3.5.2.ebuild 19012 SHA256 9555ff6b93870326fcf36b91071f0d808
 EBUILD libreoffice-4.3.6.2.ebuild 19110 SHA256 e88b4fcb5ae3898c37453f955acab7f64ac4b926454cfe8c77ae361b1b1a612d SHA512 3143b3f20e46ec4d3e3348d6c7babb99e483cdd508ff726cd6ea3f5d93f7f7e01db3245b3ebfaaaa68251cbadfe316364e05917bef80971cd47c4e96e68a8bb8 WHIRLPOOL 27958b25234a189f88d498c0157a7572c3cb52045208bbc21aed59fe24e531b51dbbeb1ca9e237a1cdd1babb38994c96a2769be73b8abb0d1083ce26d0a9bed8
 EBUILD libreoffice-4.3.9999.ebuild 19112 SHA256 670748e90e0699ec363803b596f4074a35d36d3cac9457d82b7dfb0ed48cb6f2 SHA512 94445afedf3beccb477baea68bde0dd9231969d2305d2e2d0dd4f722f6b3b64983e6089dd222c1f32d01d0e1b1fbb0cf162296bedd2a7c7c16e77d5e9e4e002e WHIRLPOOL 8e380416e6e0d3947412ecb6325576128eb484a9c3741e6ea2e54886f53a50cf48e487e969e4fd0152677c04e8b86323468f1f0e1020739b54ea9f6ce941bfdb
 EBUILD libreoffice-4.4.0.3.ebuild 18871 SHA256 dcecf48d1d3c21ed71c096f56ec7132a48cf4e01441b587b4d9d79fbc71719b9 SHA512 dfe6392b3869e1b6f817f8bc5ea1eb4e0997c1536b196772fb1bd3ed395ab7d4e7b3ce25a53e875de5745410bebde5211d04e9c948ad3a896567d48fd91e1605 WHIRLPOOL feee50b4a470e608ec4292051be4c8fa6ee1f7638e86718e9cd12639e613b520f93353097697b7876f0bcd8fb972e6cf809dd10c9b8d3a4b42dd2bd1e9c8a947
-EBUILD libreoffice-4.4.1.2.ebuild 19052 SHA256 732edf57d7e844c3dcadcd7efb2dee49c1329ab94ec1411cf4b5b7657df9c50a SHA512 7b8237baa59aa1145f1eb6119a0978fa127b05dd3e8e1c98538f0ddf110c2afdf12cafa7bac7c8e1f5598925788df0b0f3c0cf0b71cdffc80da94274d28caea0 WHIRLPOOL 45e30c51cbab258d0eb0ffbfa542be43c9e11606a60f47175a57564ccdc062494b410e0a590c4dede2c77b1832a261474f1edc0bc7c42fcb4d4cada1052b268a
+EBUILD libreoffice-4.4.1.2.ebuild 19146 SHA256 c930acafd532a6aca53ced67107bae54acfeb356853b062d8ff06960af7c5100 SHA512 20f31deab8bad399c1e8c882739d5fa5cac200f52ec44b0eb317e1eb9d521dbaba38d33bcf83d6ea6a8a182a2fa248cefa1fdda641604df9541b579b38673e1a WHIRLPOOL 61cf003ecc04c07176f54a57edc9169d8ff7e5a7bd75917656ea0c7700aac080031b5f6abc3bb69bde0dcfbc1e23a794586a1cd276f30a08109efb7f381cd266
 EBUILD libreoffice-4.4.9999.ebuild 18961 SHA256 8e6f7209512349ba274c254a6dc2d84933ae79e9177866b057bdd10982f73215 SHA512 512cf5b6360fa84250fdfaf4300289e4fe7243a3a57b9b52304321c9d2ae9184a94d0e686f924e0f9f9fa4c43b82d909ef56e2661536d39c3467fea71f991aa9 WHIRLPOOL 279c7f7cdc3f1d83390a3be35c55dee0daddd6920ba1649337438f250ac95e34aae2eb86481da31c8d0d926569c8f28f4e5f65c49c9916ddd70aa9df820a62b9
 EBUILD libreoffice-9999.ebuild 18762 SHA256 c12f1b76d3ab0c47a49f97f13aa75adc11605cb6d9d497539cbe8a8aa481c98b SHA512 eb71457dad1aeb85793cc55ae6624029b73f6be9b72a33259235882ca4c6cc94c22b7a56eb686488161e5d30034a8b0b12f08ec08aec7f7278ffed901bd8e965 WHIRLPOOL 43a0efe9b2df158f770720c673e92403f2fd1a5f84fe15d69f2a49a4a35f2190c8d6b3808d20555556b017b5c654904dc82830730c940779010a928ca6cebde4
-MISC ChangeLog 4235 SHA256 4e4bc586491ea320aca8a1247e988bb9fa865cacf2b1a683e4def6287c3fa4b7 SHA512 e6a1334fdf6724af130e12b406eca72bc9cdb07e9ce3523e4da5444bee5baf62ea87fcaf1f571903d5129650266119efc92e95e91fcdb37e002e51afc00b86d6 WHIRLPOOL f627cf1e8c9efef5ea49dd112c3646a01e5a71e112ca379c83dcb84118afb82af7b54b16c3cf7902cd34f0ed226931721b0e65be0efd8083a63d4bfe6b20de0d
+MISC ChangeLog 4416 SHA256 1be711cb8d16f967d61040f33f4b409886ac22187dc0bdb625397d0557ebda9b SHA512 731b486a19f0ac3e93301f7c860b700c9efa6cb36fdf1ea398b87b6a35bf1b1cf9bdaa8b224d3efe605a9c4a8bbb7fdbc6b1923e76fc200adc5ed9ac2f5aeca2 WHIRLPOOL 3ab7eb0adfeffc85dce3b6ae4659b5f8582b3fe9dcc2bad6bb8d7fe16c5b1b6ab1408588d70afdca71b6e771bf9ec4586f35cc4a0f0cac15a5cf60d15f52e655
 MISC ChangeLog-2014 109721 SHA256 db62affd74b541212d4043dbc88acf51fb8aa36602d6e5625cab9b0b823a54f7 SHA512 6481d8f26924300ca46f0cd216962167b6ce5d53028558b0128ed4f996a8cf5576182e9e511493e4b57f628189fc127dec9ce62110bc8d3d85c6d4e2a815bf26 WHIRLPOOL 76c87a30a9296f64675baeb5f77a8500b9b1ff25c6edd5a5d0b984dc3cb3b3aecee37938d882194d6be58ef34c8b1925c1d9b8b7a7b786a5d68539fba714e627
 MISC metadata.xml 1170 SHA256 94d12aad619c0489c65857246c536b65ae98f1cd7fd698fc0cc3a59972887c6e SHA512 3baf086b2cb75fd88d1044df055e443d46824041d9741172769707f25b7e284ce96dd16292454c1321e0078546dd694770c4111669a4ad394cea7c5e4b5e1a5f WHIRLPOOL 4c326355000a944206b8b85a8a40f7467fb6012d38b2934c8534003e4a4c20046363fd6fa07f189a5cf082887771e581a28cf2910d78a1158f11be37324f7c87
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJU73ukXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCMkRCMDNGRDg4MkUwQTczOTgwMkE3RUEx
-RjU1NzRDRUExQkE5Mjk1AAoJEB9VdM6hupKVMowQAIVFNIMAXMp0MoJPeHPum9ZX
-wmgzAZy/2F3oyj8YqjUad2se8n1MPLGkRXFZlvSKzXF0+JR5+IhfMjfQ/7pSrSkC
-VrURhrL1ACB/UCMEFN70UzXkaTn7TV/wBhQO+FlVQ56+VMXm8qHw+4sF37bJZAI/
-xHnH+CoZGW8vqPRhCOpMIvntVKQMce4cdYBZ1DAKYkupRDHmVQCUzaewWayjEDDZ
-AxdP6UClHBaYzrfgI0uYXaWKJo3co7t/w1lzJM79ChDSL1GSfOlYZpqNIjmGkY7T
-YqE6v+pcd1zlt4jHlaHc2WlTqm4jX8a+GeXiZgFpRDrZ+IPOY2uhqH0leEHE6xjk
-Nd+ojwUDqw5yoOuqaBNQr6rJmnQMdpB+xzB4V4BiShtHMU43bcyBcFQWETFNMxJd
-beMBhi52IAQN4iCoYssQte6mryEs1HVulAjK3UB52r1qblWsbOra7S96rQqCrpj3
-cn8JBQ2gyHCkA9PGXlLsl7CTNkJEzdXyRX0LScIBMOGoMJ8NVvD+jV9f4WGMWIxQ
-RvyC0exWLAbNEkdk8pFXzw/OouMqDfVxpZvNxHE+vmblTaCTRE3GSk3ayxIs4zVB
-R8KlUOiV8mgp+m6rsR68uAdaALfiso98vyPDAAl0R7vVhsdPAAs4P2/JOVhMm1eE
-48axp+WMAm6K6tWZEuDC
-=UaY/
+iEYEAREIAAYFAlTxqxUACgkQfUU/I5AasIphswCguf2BkaGjYMmTzByVqEeEWQxR
+g9cAnRpr9aEAqkyuxgAQITbmyz8n6IHL
+=5MSl
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-4.4.1.2.ebuild b/app-office/libreoffice/libreoffice-4.4.1.2.ebuild
index 6dfb77bb9a39cb3184526ff8904fc227ea1d0e49..4ee715423c116347f5fdd38b54684016dbfc58bb 100644 (file)
--- a/app-office/libreoffice/libreoffice-4.4.1.2.ebuild
+++ b/app-office/libreoffice/libreoffice-4.4.1.2.ebuild
@@ -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/app-office/libreoffice/libreoffice-4.4.1.2.ebuild,v 1.1 2015/02/26 20:02:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.1.2.ebuild,v 1.2 2015/02/28 11:48:35 remi Exp $
 
 EAPI=5
 
@@ -252,6 +252,9 @@ PATCHES=(
        "${FILESDIR}/${PN}-4.4.0.3-telepathy-build-fix.patch"
        "${FILESDIR}/${PN}-4.4.1.2-add-kde4-open-url-script.patch"
        "${FILESDIR}/${PN}-4.4.1.2-improve-KDE4FilePicker.patch"
+
+       # from feature/priorities branch
+       "${FILESDIR}/${PN}-4.3.5.2-remove-bashisms.patch" # bug 525454
 )
 
 REQUIRED_USE="