From 8b8bdf412e3b50183836ebb1e39e6fdc611e502f Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Fri, 30 Sep 2011 10:42:49 +0000 Subject: [PATCH] Remove neon patch to see if it will build, we will fix it upstream if it still fails. Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64 --- app-office/libreoffice/ChangeLog | 7 ++++- app-office/libreoffice/Manifest | 30 +++++++++---------- .../libreoffice/libreoffice-9999-r1.ebuild | 3 +- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 46ff82b990b9..afd778c14966 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.155 2011/09/30 10:09:16 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.156 2011/09/30 10:42:49 scarabeus Exp $ + + 30 Sep 2011; Tomáš Chvátal + libreoffice-9999-r1.ebuild: + Remove neon patch to see if it will build, we will fix it upstream if it + still fails. 30 Sep 2011; Tomáš Chvátal +files/libreoffice-poppler-0.18.0-2.patch, diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index a5c439b7221d..044782f7003c 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -175,23 +175,23 @@ EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 9ac5d82927f327bff9ef1f37304f13239c0 EBUILD libreoffice-3.3.4.ebuild 18146 RMD160 1c71a223f37c402ab01d95b71dfa5af2c69f61af SHA1 18c1211e8eaf8c587f52ee303dc264c941e7c045 SHA256 d602a3efffc23cb848b1fdc667a0d7b1c9dde2502dfae0fb537fecb9ee744cc2 EBUILD libreoffice-3.4.3.2-r1.ebuild 18436 RMD160 b191fa9979d6dbdaa1bcd28e2c6d2f9032bbc1e3 SHA1 8257e6ccadccce2be69f4b505434b6797acb069a SHA256 db88c53de529b6375dc88e0d80a20fb9e60c6662141ef0a6671cfb266c4b67c7 EBUILD libreoffice-3.4.9999-r1.ebuild 16078 RMD160 e296524c64209e00a4fbdeefd022eaef87b4eabd SHA1 6f82a057952733af6a7762b9a0cd61b46212ec90 SHA256 44246714d937e8cedf3e78109fa69484099d07bbcab6f1c76e3125d00087fa3f -EBUILD libreoffice-9999-r1.ebuild 14140 RMD160 2cf3c484fbe1db40b586287b063a5d41ba99b357 SHA1 74963ad6963c4d6c4d0595c06796178b77cb5acd SHA256 e6c5d0c9c8559ad17c47f0fccc03ad935366ed20f4e4a57693279a4bce6ec9aa -MISC ChangeLog 29391 RMD160 a13ab8a25333dab105f1b7a7178f03e62920f4ce SHA1 2cd2cc8c7d3c110a4d66b311169ee62fb0f03cca SHA256 cd244bbb5422e4b935f4b32458cd9dafde3ba5ba0703bda7b66e49eab0228311 +EBUILD libreoffice-9999-r1.ebuild 14083 RMD160 f2fa6d4b8814b5b5dcfbf5b9ba73ba7d323a9a64 SHA1 b76d6342d397e1636199906228fdc1a554141dda SHA256 4385e75eb46e56879986d783df84a2b354cf04e0c11892dc50623a36ad1755af +MISC ChangeLog 29567 RMD160 5cfdad0ced8dd6a7b983c15e2d50b4d5fff01e6a SHA1 7c126b2ba17a5a94ead653718f3c78f3e049f00b SHA256 6083a752cacebbc52dc2b0fc6f4f438e5457e5858b3f0c4bfcfe6f0b1ba68fc9 MISC metadata.xml 1192 RMD160 f723ac57dc7424dea71c29a052e2aae915c908dd SHA1 87181bf865c0bd53b4215ec36063a1f422e5eca5 SHA256 e3515fe7fcec3baa6e0b2dfb769c91f459ab6c34cf29a6b68498e17c3c7400a3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJOhZV2AAoJEOSiRoyO7jvor6IP/2HXj+JdTrofFzjY4sjmCSyU -niD2uAxHjwuw7d5VhvhBdfeavCw1V5ePzg584Qy0eT4dtV6WktbfDe2R/oRNwiT9 -iuT5F/ReHjjNPfb8K6d7BfdXdYldmIAwqR8SjI13bH6z+3dJ4+y6gXAHGkUwEeco -678YtDceujBIjIiTvjpG/+B+Al5H7Zpn4xQQIyvBemYEfd2RKI4lQLIKAIUI9k9K -+6lMkiVbw4V0r6Iflt8OC+6JP+bcfXUjcal/M3N7p6A6DIVsFOrYyQubjnPPugYR -Jv7no9D7CnJcKJ7JscHIMk0fux2RF3nabQ5v6i0RHwDHzL8ywmCQfnP0tf2Wu6X5 -WBzR4kfId0OGo7iRTpD2KMv2ibep+RoPxQ6UXTz3GuOLiFoENaQKDi2cGRluEuTV -k8GMhHr9PPXe33BjWL8b4cdCpkF3yJRtdKHlAOYepppTnQgZB9B65mLbBm31G688 -iTlw9J+9iwrakyecrOyolMwUKWdmM4IrdZMyAUO40OHLgmipPYlQdw4CPe0SqKip -BF2TQoeSnpeA25ifahG053htyZFw4ZTdAPVVhHVzcYOqp6hSBHjB2AyXSOiKK9Nj -L+fb19kyEMoCgp5rMdXuvEC3rdvSqwZZz0GBKnyuQEA/KPtSe0FhJdBB5wW0ccW5 -pq697Qa1rFRKh95/V09D -=G4JX +iQIcBAEBAgAGBQJOhZz7AAoJEOSiRoyO7jvoBYwQAK2Rk88VNHWZ9UypDvBe7xbm +3v8iQK2VB6gDS/fCivLBVpKcEWwQGpsOlswEGStxakONaaHZyoKIADHAllzlHNsY +0CWBwlLDtGnquUiAVWz0E4VocIBChdaMVdc02XspWT+uDZx1+AmH7AOPFi4k6DyF +ctp+p0rhnspxDEc5kCe6xn/cI91kgUrVOrcolv8BtcBjCL2xZGwc+ZcAjvdTp1Wb +XQ7T+xCfI31HVzshVyfJX/Fu87P1Qy066Iq+3DnakyNkEOYURsX4ZHO5yu8uFP5L +j3stVPcVuW7I2BLJRAy6ErIgOj/oA9wuNSmbOJTO8SMg6/vK+0mo1gy1vrRUnGgQ +QFOCH6163ZTej4gNDeGfYUqGHbzorcI1yODduL/lTP0wazwow1pi/aEqQXFHY5lZ +K6MQLVcKd0YZpx/fN7ADGQqfKi4uNWQwBaXFNIE3ifN5lE4O6nQREyEAZgBHQADi +fCvdic4i4HvkQaouZGe7uxePslE5HJJffbqkPzeaD+Cq8x5sTZQ569ElFO52dYUx +dINjDbUritqR//Hd6CFFqk+5P9Zq1QNmdmlf1F0BmUiYxzbbwHd+PtOPEyyTU+bj +QVebfl0J+AacYtIXCCsdSEpEtNqHB44LePunytmFHQlUyrPJwUDWJu41jayL2WXU +351hKCFO1BePXBjonv9s +=rwL5 -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild index 81f26c4756e2..fcf70e8f2c42 100644 --- a/app-office/libreoffice/libreoffice-9999-r1.ebuild +++ b/app-office/libreoffice/libreoffice-9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.28 2011/09/30 08:25:53 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.29 2011/09/30 10:42:49 scarabeus Exp $ EAPI=3 @@ -190,7 +190,6 @@ DEPEND="${COMMON_DEPEND} " PATCHES=( - "${FILESDIR}/${PN}-3.3.1-neon_remove_SSPI_support.diff" ) # Uncoment me when updating to eapi4 -- 2.26.2