diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-03-08 14:53:56 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-03-08 14:53:56 +0000 |
| commit | e7c9dd80aa234e43dec7ff3cff7cae4af0239ef7 (patch) | |
| tree | a6ec1ca40e51ac63f199e23480700fa0562d8f17 /app-office | |
| parent | Marking libebml-1.2.2 ppc64 for bug 400013 (diff) | |
| download | historical-e7c9dd80aa234e43dec7ff3cff7cae4af0239ef7.tar.gz historical-e7c9dd80aa234e43dec7ff3cff7cae4af0239ef7.tar.bz2 historical-e7c9dd80aa234e43dec7ff3cff7cae4af0239ef7.zip | |
Use internal vigra even on 3.4.
Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 5 | ||||
| -rw-r--r-- | app-office/libreoffice/Manifest | 24 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.4.5.2.ebuild | 5 |
3 files changed, 29 insertions, 5 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index aa774f9d7d8a..32f7459c3072 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.249 2012/03/07 11:15:44 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.250 2012/03/08 14:53:56 scarabeus Exp $ + + 08 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.4.5.2.ebuild: + Use internal vigra even on 3.4. 07 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.9999.ebuild: Always disable gtk3 on 3.5 series as it is highly experimental. diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 17faad40a110..d91abc71959b 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX enable-startup-notification.diff 6377 RMD160 6a5cc928ea3da3fb1428d0e0bbd2d4635c1da8ec SHA1 413f54a589f910e5e2401dec0025617028fdc361 SHA256 da334268ba47e5b25c72063ececbb0619f2033eab7bfafbd58e981c361b72f3a AUX env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1 AUX fix-ooo-collision.diff 1253 RMD160 6ad0355c7530d5fe490ea377ed10e047926f2ff7 SHA1 41a3a26973f95531cf76a673eb7b7bab5c50de91 SHA256 991f311611f812699c8d39df85d64d9041d6033ddd73d4aed10ba019406733e4 @@ -116,9 +119,26 @@ DIST libreoffice-ure-3.4.5.2.tar.bz2 6215972 RMD160 873fbcde60e680f743449ac30fdc DIST libreoffice-writer-3.4.3.2.tar.bz2 7295462 RMD160 ee24967297670205d42949d6addb59fee22ace29 SHA1 57a549b811c0b95898a9532968ce4a9f6fc33f16 SHA256 65fdcb132a84fae9f4ec0d84501f13ada3861fbd7646947ad0cea495b637be9a DIST libreoffice-writer-3.4.5.2.tar.bz2 7299202 RMD160 e0cc1509efa4f28350e82ce1de3b64322482c80b SHA1 277b886e63383cc37cead0deb6b1e02b40cfc9d0 SHA256 b0d34950f06de4fbf2b1ba40b1ddece0cb3d28bc23fca0edfd6daba54872fd4c EBUILD libreoffice-3.4.3.2-r1.ebuild 18554 RMD160 de3dd897454246b9cd210fc20c705e907733aff1 SHA1 187d063af4835b6598f5700a3f45d68bd47f8099 SHA256 dce97af4aa28d1142746509fd26df671fe38dd294decad20633e6691d83bf1fa -EBUILD libreoffice-3.4.5.2.ebuild 15097 RMD160 ba4eecc6f18fc08d867289d16bd4cb59a16bf23e SHA1 646b5900a841e2774a00b99562191ad3892b406a SHA256 33025c948828f0315ba5ce6d0dda0df19935403adc890fbe27e1282a77b59515 +EBUILD libreoffice-3.4.5.2.ebuild 15179 RMD160 10ba5494bdf149eab87c0cec140838044842e45e SHA1 4d74eca4ebf10bff87396ff59c3b342b7053d848 SHA256 c94720c170a1903c0a6a4d6e6300ea31fff2032f306e36147817f3d1d601ee8a EBUILD libreoffice-3.5.0.3.ebuild 14159 RMD160 984382f308eacdc8a0c2ff4c321036b12c8a21f2 SHA1 c74d553d2b1f270ec390856ba73e0a9aac90bf04 SHA256 8670f9d30bb6362fa02b561ad20f02475c976fa359fba94bec9d948e61158b89 EBUILD libreoffice-3.5.9999.ebuild 14412 RMD160 b15254decf6b58b2b0f3a51d9b6f70538d08cf1c SHA1 d359ee06bc9b66ecfe09cd9d7808bed59feb342d SHA256 fa0aaee1e9d4b03eeb81eb161707731ad4a884bc0afd4e207f091852fde9aa29 EBUILD libreoffice-9999-r2.ebuild 14198 RMD160 ee7bbb16e60d935912a3020499dd37b3e26b7c86 SHA1 b098a18c3bcde6fa3c964d75d0135db116499114 SHA256 08601ed7ce8fa12964781dbfc6ff36e94c67643f0c727e9e924781e103728949 -MISC ChangeLog 45181 RMD160 e1d7bd5011742edd7c7884b453c6c86c19daecbe SHA1 08073f62752af9f5722deb58e184908811dcca5a SHA256 c23c4bb30d9d895b3f9cb21d70509a2dcf0fcc2b068bb665f2318cea4fab75fc +MISC ChangeLog 45299 RMD160 b32fcc2bf264a370a6c8386801fc0f95c9ca99fc SHA1 3d50a2b9c3db671eddff9c315710dede57c6ff2f SHA256 75a78d71701fdcd16055563b4d183e4c053f6e36d58da05cadcfe8bb9e88251c MISC metadata.xml 1409 RMD160 9861b490a44757ecaebb14ac28eec292f347ac3f SHA1 268b78192669f12c513fd7b68fe588f140ea2e1b SHA256 862a214105b2f7b07a015d656794aac9b94a3f40b3f8cbf74a5299f990b82b2e +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iQIcBAEBAgAGBQJPWMhWAAoJEOSiRoyO7jvo4k8P/iHpHsdUvX7/MFar+VN93kXY +MuQkJ0p1MaUTmfAslaATnZtbHtN8Kjv2NDvur0llfzbrG7iT/MLgfHp3gZaL5ar8 +gNW7ASC3rWA123CEC/tUfjgA41QFi5FEls1YFC1JPQ6zrnEj0vOsi6UjdCaymeAN +qEEjvaSRTSYIhv9zFtMdcEoeBRiFKKoIaYwOf7g7/ry1Q4ggMx1Rz+3DbDmAXS1t +vU+YqeveRtxrgECs8wJzZ3r91oj+OZk+XCl36EgGpbGLls8NZl2l425QQVs65J3E +/rJLH+x6vJr/2vVu2gV5E0kE2vGw5z/9PFrn0MDcbwvkVESM7YnSTu45zFkdVWdB +HyGzEcCnj3Kb9X9r3RpebIYChCO+1nmbMXp0vHC6dyPn0XKNFggDZD1V2pfI60/g +YDx4u5TO9NwGdhy9Je37duufhK2n+HuIrrQrLs0zy4KW33Bpn8QYPmVhRPgZTFD6 +Ruk/qyJrN4GXrZDhX/trF173KoBFJwTJWS0rV/Iv6Bidr+xxfqZjdo+RMVZUIEmS +v9q48Ot6DY4K7UU+gxqmm77Dq52f6aOBGzV13LXWqBFq7sqVA/Z7db9PV3sSDpVh +84h95pif2Lf9OlRQKJbDBJ1iibGPhkHTT3fUYd4dPOiE6zfPgINo+8zToLzD5zcf +jKrG2WRB2DN4TfdGpZAm +=BLDb +-----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/libreoffice-3.4.5.2.ebuild b/app-office/libreoffice/libreoffice-3.4.5.2.ebuild index fb75c3cd25e4..02c4592a9e44 100644 --- a/app-office/libreoffice/libreoffice-3.4.5.2.ebuild +++ b/app-office/libreoffice/libreoffice-3.4.5.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild,v 1.9 2012/02/29 15:21:02 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild,v 1.10 2012/03/08 14:53:56 scarabeus Exp $ EAPI=4 @@ -52,6 +52,7 @@ unset DEV_URI # addons # FIXME: actually review which one of these are used +ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz" ADDONS_SRC+=" ${ADDONS_URI}/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz" ADDONS_SRC+=" ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip" ADDONS_SRC+=" ${ADDONS_URI}/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz" @@ -92,7 +93,6 @@ COMMON_DEPEND=" >=dev-libs/redland-1.0.14[ssl] media-libs/freetype:2 >=media-libs/fontconfig-2.8.0 - >=media-libs/vigra-1.7 >=media-libs/libpng-1.4 net-print/cups sci-mathematics/lpsolve @@ -344,6 +344,7 @@ src_configure() { --without-system-hsqldb --without-system-cppunit --without-system-sane-header + --without-system-vigra " # When building without java some things needs to be done |