diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-01-13 14:56:43 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-01-13 14:56:43 +0000 |
| commit | ebabb82021e2e8c84bc8f07f13a5516f2d8266c0 (patch) | |
| tree | 57bc16edb8fa965b019084d5e1ee09e8ef8c3445 /app-office | |
| parent | Use the java-virtual for servlet-api. #398689 (diff) | |
| download | historical-ebabb82021e2e8c84bc8f07f13a5516f2d8266c0.tar.gz historical-ebabb82021e2e8c84bc8f07f13a5516f2d8266c0.tar.bz2 historical-ebabb82021e2e8c84bc8f07f13a5516f2d8266c0.zip | |
Enable mergelibs.
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/Manifest | 32 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.5.9999.ebuild | 5 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999-r2.ebuild | 5 |
4 files changed, 27 insertions, 21 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 94a01637b3ce..c343bc31638b 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # 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.227 2012/01/11 14:52:14 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.228 2012/01/13 14:56:43 scarabeus Exp $ + + 13 Jan 2012; Tomáš Chvátal <scarabeus@gentoo.org> + libreoffice-3.5.9999.ebuild, libreoffice-9999-r2.ebuild: + Enable mergelibs. 11 Jan 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.4.5.2.ebuild: diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index f7bd9385fd3c..88f74d554ecd 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -179,24 +179,24 @@ EBUILD libreoffice-3.3.4.ebuild 18266 RMD160 c0204063e1a6bd7621267fd4dc92d8b7334 EBUILD libreoffice-3.4.3.2-r1.ebuild 18514 RMD160 66fdf0ebbb2bbe6c507f97b0d2be87b8c72aa79c SHA1 814410fddd8101148b58924f2f20b899b1925c6a SHA256 89fef1d27d99fe7996dd4675120d5fb180a3bd6798abf51eb8da4d25f83013b9 EBUILD libreoffice-3.4.5.2.ebuild 14980 RMD160 919f4a07685e27a77374080ac3e291698824c75d SHA1 72ecd407f92f9f48f35f1770ebf759f472ff4f62 SHA256 662842f1f461b36ee763ad28b8ba2af941c2315ca074b9b847309eed00e9d929 EBUILD libreoffice-3.4.99.3.ebuild 13999 RMD160 1b055f76609c12f6c66a4ba8104239fca52f0ee4 SHA1 2e4f47e8b1e2c713a8d894d199c3aef1f3e7f344 SHA256 462c665b11b854b5a4acc0fa816467ec7bf1af5a6fd29cc3bb565fa19facde42 -EBUILD libreoffice-3.5.9999.ebuild 13999 RMD160 a97b9c96b1c0c0f076e945fb12b4f955ec539915 SHA1 c19643e5d0aaa5a9a0cb8feb47038a9202f5917b SHA256 3e428eb8d24f8d690239fb94472dfde6e1c6c63163a8e2a4f4c143ff6dd68e67 -EBUILD libreoffice-9999-r2.ebuild 14069 RMD160 46428f00afc92a57e77c3128753c4f8027ac0a98 SHA1 ad89353db2bf4de7553f0482b851051604b05923 SHA256 6fe85994f8c3a6d434a68163e418b50a335c0747b5c889acf6c992a46364ea48 -MISC ChangeLog 41359 RMD160 235057b7cb110a531ade91f17506d447145d1dbe SHA1 a8537e5ee820a3567942863095ff4562e6592848 SHA256 1e25f7259427ed3a77c9a2c7bd28142babf2baa905a981435b9fed2b28f8fa6a +EBUILD libreoffice-3.5.9999.ebuild 14022 RMD160 ecaa6cfbc477f96136e33c54a85daf12d7a91ffe SHA1 af99692ac3170957094efc32ea13e7ae95fdbe35 SHA256 47da9d4184f429f6dcf180a14e6c0dd38ba7306e4a9d9202e008ac3d089cf4a2 +EBUILD libreoffice-9999-r2.ebuild 14092 RMD160 64ae7411ce6c21d06a154b4c1f5ed472f151e9a5 SHA1 e60f4c7b5be48ea6e0d938816e572ba7020dfa50 SHA256 06f8cd4768b264010ae55939f7d1f720d358f3b01dd0dc7508c288689ebf18e8 +MISC ChangeLog 41494 RMD160 8510d47e07c6fb7882f4d649d2002be8b418d057 SHA1 9b8e591a2e9f46d47fab37efb935ce030c2d63e9 SHA256 21a45ac07b79799f57957d15cec3e7ebc9f98ae28742367e90fa9a142072aa4e MISC metadata.xml 1409 RMD160 9861b490a44757ecaebb14ac28eec292f347ac3f SHA1 268b78192669f12c513fd7b68fe588f140ea2e1b SHA256 862a214105b2f7b07a015d656794aac9b94a3f40b3f8cbf74a5299f990b82b2e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBAgAGBQJPDaItAAoJEOSiRoyO7jvokVwP/jqib6pshChXVrviHznhQJse -24mrXasDnjGgEeJ/MfGrwlx1BBLJIZxJLTYbzfTFZ0eS78kDK7ViVz1Hhu9chNFA -Vsx1k4Jo0/8sEq2p2S8JGa/aVUAsjgq2jou77RJQ0xC8KTarcCtfN5WxwotFF5hz -6KFEj8kIMzD69DsfTyZjRGepPeoswokvfKfnhSKJXRG17y74tI7mwBxF3UeXUUzu -J6sjcZp4D3vBZMUwHdmGg14DG6eXnG55kc5TcHO/MeL1T6KZuqflglYwrcAZbv/d -9vmu8saFALSkuPTac6rm72UOx6GWo+xiSVrADnmcXQQKGtd/Aed5nzYHvRnI7aSr -1N5EWg/oo0d6+CMic7ZWQPb9qjIcWBdIUXCRFFJEt7PIqE15MufE2rodHjnjD2cF -Ghz4PWKZ36ljlrVLsCqkLo1LZNBMCBDckieYeEo0qn/IPdLNcjrQfXdHocmZyzoQ -u+R5LHJMsRMHkcQibBLmeQRvKMHlLlyZeUASNWynOmsqBLKvgrT3qpn0WCd1vq+D -Pl6Txza7yBNbQnn01vwJiI/m1fbWAl9zGHDfsoYernVgQ0kcGCXlMSayNdgDpQ7g -n/0y104kiXSFKdJdAHX3EMO/jCvvn5uO32llrfe7JOLxs8GMdN1HNfEoII/sI3Ft -0TKcZm5xofhzTUh9F1YR -=UDFt +iQIcBAEBAgAGBQJPEEZnAAoJEOSiRoyO7jvoIqkP/iDjbFyo/DwqzPsi5g/a2FJE +372NmoQIE15GjTXynwcovRDlRyj31D/6KwHrXPZWMSK3Tu5Uw0m5WO9Ae3Ih4go3 +TucTwGal/T06rXpNSa8wzOqEYEtKhXY4S5QCHRK0jInORiUb+SB9/iNJ1FEm5uIX +IzAITzOsR477AfNA5P7L4Ivof0M4uRadkhx3ymPrtL3YiPid0s6dMnWzD1nkYOo0 +rDp9clxHhbsm6XZ9GpUHciAIPAQElre5YGs8T6D4Is7BleKgvq3KigTiyqNWcNsq +myIKaqufQghdGfE+jdATiSFQJoxQptxe7741tput/q06FuamI/HkmVbxGutkxEI7 +ifGhaVKA73/z4tGCEXb7vWKSOcYvbMMqgM2qveebTCE7bW72t7wSsBiMa7C5RWEE +kHk2/GD/abj5iDo1yLH2NCFCCxhQO8fOGpLkcoUhtq27oyd4mF3yUb0qwLpfTUmz +fOYSRXD2/fW/f/XytHeMNFfEAREFFAlIzlCTYdBnd5SdeERzkTSYmVFJFfiABBMZ +WpJefItTctn07d+JxIn2xFTy6DgxN4J1QfgJ9UWdNS1DdCidGyLt4HEiQX8+WSK/ +tQdIB3i6HUBWQwROw1Qvi/oaG0ao0V7y5md27hhw174sf24scp47293ZqvM/crag +X5LFIcaSqrsfMz08fzSx +=uwBK -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/libreoffice-3.5.9999.ebuild b/app-office/libreoffice/libreoffice-3.5.9999.ebuild index e03369d8bf7d..14fdea904170 100644 --- a/app-office/libreoffice/libreoffice-3.5.9999.ebuild +++ b/app-office/libreoffice/libreoffice-3.5.9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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.5.9999.ebuild,v 1.6 2011/12/15 13:01:55 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.7 2012/01/13 14:56:43 scarabeus Exp $ EAPI=4 @@ -382,6 +382,7 @@ src_configure() { --enable-randr-link \ --enable-release-build \ --enable-unix-qstart-libpng \ + --enable-mergelibs \ --disable-ccache \ --disable-crashdump \ --disable-dependency-tracking \ diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild index c034b1994e17..02711f169ac1 100644 --- a/app-office/libreoffice/libreoffice-9999-r2.ebuild +++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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-9999-r2.ebuild,v 1.19 2011/12/22 10:52:53 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.20 2012/01/13 14:56:43 scarabeus Exp $ EAPI=4 @@ -382,6 +382,7 @@ src_configure() { --with-system-libcdr \ --enable-cairo-canvas \ --enable-largefile \ + --enable-mergelibs \ --enable-python=system \ --enable-randr \ --enable-randr-link \ |