From: Tomas Chvatal Date: Sun, 16 Oct 2011 18:01:45 +0000 (+0000) Subject: Make the live build with +odk again. Fixes bug #387005. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b71f4982e1cd94d1768af25e907f85bfca729030;p=gentoo.git Make the live build with +odk again. Fixes bug #387005. Package-Manager: portage-2.2.0_alpha67/cvs/Linux x86_64 --- diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index a02c6fd7c636..21f745eb6bb7 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # 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.173 2011/10/16 14:12:14 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.174 2011/10/16 18:01:45 scarabeus Exp $ + + 16 Oct 2011; Tomáš Chvátal + libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild: + Make the live build with +odk again. Fixes bug #387005. 16 Oct 2011; Tomáš Chvátal libreoffice-3.4.3.2-r1.ebuild, libreoffice-3.4.9999-r1.ebuild, diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 08904f7bbc76..17cc1c79310b 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -152,24 +152,24 @@ DIST libreoffice-writer-3.4.3.2.tar.bz2 7295462 RMD160 ee24967297670205d42949d6a DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c EBUILD libreoffice-3.3.4.ebuild 18143 RMD160 567f3a8d7b2267220770f600b893d13028db6f26 SHA1 f525de7d3ea068f38ae62a6887d0e0aadf651592 SHA256 4e7131a8fa14b4224068a21473093a16447086d0d9e390ad74faaffc72ec8ff1 EBUILD libreoffice-3.4.3.2-r1.ebuild 18446 RMD160 ea7208dc6ed726a698cdd68c96be0417eed323fa SHA1 b82fc9f6ee1215215fdc80f40c76307c9792b459 SHA256 629940b89965508ad7de68acd9a770b10c4d53e8d11b8bd769a7777aded1ef3a -EBUILD libreoffice-3.4.9999-r1.ebuild 16230 RMD160 12da92baf8fdf3250d943a00b62d045982e0d5eb SHA1 5ef3307cb00a6aa7fa090ee8b2341e701b0d56a9 SHA256 9b0c44ce4df7313afd3cf4838113db7e1017ec41a0747f318e5ed3fd3d7508eb -EBUILD libreoffice-9999-r1.ebuild 14386 RMD160 a468ed81072f639a094d5ce034c22df90ac5ad44 SHA1 19aba4018ece2ff819299975a6d5a7b245fd9d49 SHA256 448124014b089065e9f1c33baee43414d082e9da7500b691bf84dbfcba47ff69 -MISC ChangeLog 31755 RMD160 bf626e695ad4e85c935fb986b334199bc1ab9c83 SHA1 c7cd9f93f41874730955c932f0d5c5cee4f89fb4 SHA256 6cccf09357de8cf1527a037d2c4a14e45f30fb306e03bc75bb7dbb90f0410797 +EBUILD libreoffice-3.4.9999-r1.ebuild 16325 RMD160 7bd319c1afab431c5842176819a040376f117c7b SHA1 3bd898594ab0fd323ae25d152e181a59fce40297 SHA256 71970e10a5a65de5a1dfa9a0f5149576438d754719afb2935612904b4677d5c4 +EBUILD libreoffice-9999-r1.ebuild 14490 RMD160 fc54cf41bd12c082f8ca4bf0df8e1db20610f9a1 SHA1 d5ec9cc752859bc70aa5510c7370e3fde7eb66de SHA256 1c4f842eb568f6fe476386db5344321c86a28711269065d9d0e17c37090b3fdd +MISC ChangeLog 31931 RMD160 e1100cd5a1e2517cf91dc9d466235c9d155dbc0f SHA1 c3f01bf016c47de6eb49d6c75634799f5ec975e2 SHA256 6d80966d98b324fa91acc1a0a91c5fdac770aefdc8650a0ebea7bbf7d6f98f6e MISC metadata.xml 1192 RMD160 f723ac57dc7424dea71c29a052e2aae915c908dd SHA1 87181bf865c0bd53b4215ec36063a1f422e5eca5 SHA256 e3515fe7fcec3baa6e0b2dfb769c91f459ab6c34cf29a6b68498e17c3c7400a3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJOmuXlAAoJEOSiRoyO7jvog14P/2OebEuQ55W28u/GLUu1YnIh -IH64OV6pSI6qZ/d7Rtk9Ddok2oI0zySYm+Oq6uZY50waDL+eVaesogQ5VFG2ETtY -Ua/sU8ItzU6Sg/AyXvn/ZKuIijjVSsiEAeRNL+bk8XpexznaqNRs09Fzk2tmOPrM -9t8nPKORIxb+JqhPZA9DlIsxMCW1FgrVO1yRvNoZuKydKeGoVqWy8WF5jBtc7Zz9 -DCN2k50Rnx2gw15p9zJB7f8ar1UzYt82lBLbiEuamVVBFvVRlbcarXCXi2GI2pdp -FtS+Pal9aPVyGX/Mxyh5yawDavi4FA6swGJUtSATwZ0KSDcGJW2cf/DbNP0Fep/Z -vm1kZ+YhWl7eyg8WH0pBS3R9zKuKxby7YWXC427J4dbotrTe5jLuAB+oammKVm8u -GIz/SEthAnHy4AuKmsfLpu0O8CK9iW1Y4v28chrVqo0OPigykPjs4QJCOAHtIxiv -fWCACBm9G7cRjm0BUilbHpXEDfeDiNhW8tHCl5DEyKy2eTuRrqtE8x+Sn/xvgucw -gj9BIzr5CfDR85HovjLoxsRiMhkexgSEP4H81PBdO5+zc5/2qqMl6VkyJTa+qFLF -KxS4nd/4sJTifoi68+EclxvRBUkNXNeXrTXMYJj8bFMAnmIamF6xalXnLoyUcENN -bWQ8hRy40l1AvD46o4oS -=NJTi +iQIcBAEBAgAGBQJOmxuwAAoJEOSiRoyO7jvoMsgP/1Q4lAEXsiTG7NL/ZkhrqYcx +tmgQvKB1maTl8hNKuAdKdMqZGI4LadyZ1g1w9aPbFNOH4+gydjXC3+bCYWDUa2It +iKAXrkWfGQlr2/drCd6sShO0j6PGsDi0QsyU4lIpoQYvaRONWyq528EvK9IYMhRQ +0hszqMqoIlUZWkT+vJlNdgR1WZvVSHGOD8V1naeY5dYUvuWkmEycLMm00PCbtWzO +6zeK+8JF8Ziffs+pPOzvHMmTY8yE5j2oOTB50AxHMYiNVdcCV4uarpIzSdED/63q +H5Wtq2bjs53/aI4oSNYDm9F1giFZHpOX25JQ6mXUo90upb0fs6EZvcYmtrxYWDmQ +fFJMvjM0P72Qvq9LhRNLRZ7yyNMoFX8yO+HezvyiFeWIYrNbf0MBjclTZmfdiCTC +72P1lvlxg5vBWOZ0sIViouEY31LdPGNbpXyZYd3qO0Ntqn/4RenNdW2wmpj171v1 +xFBAoShFAkFwRLklW0Wdl8Lu/gPKmtlp7rUNTPYrgsQY1XbFoE+AL5bk7fVXu814 +St2bNh3B5K8t/8B/GtwiQ539nw5L+sBagU/LPm6t3fjK/c4ObCmR7K/Fw/6Exi+P +PV1hRCAuyvo9bZrgeVd3FFzeooeW+o3yeyRxJxcydcYk+JhH+s+EBrEOIpaGRFsD +/ccj9fflLkJ0ADbWvhlw +=jEig -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild index 934353cecde0..d750bd6cea4f 100644 --- a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild +++ b/app-office/libreoffice/libreoffice-3.4.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-3.4.9999-r1.ebuild,v 1.13 2011/10/16 14:12:14 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.14 2011/10/16 18:01:45 scarabeus Exp $ EAPI=3 @@ -58,6 +58,7 @@ ADDONS_SRC+=" ${ADDONS_URI}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar ADDONS_SRC+=" ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip" ADDONS_SRC+=" ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip" ADDONS_SRC+=" http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2" +ADDONS_SRC+=" http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll" SRC_URI+=" ${ADDONS_SRC}" TDEPEND="${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt" diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild index 2175f013478f..fa6b0a5c0bf5 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.42 2011/10/16 14:12:14 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.43 2011/10/16 18:01:45 scarabeus Exp $ EAPI=3 @@ -59,6 +59,7 @@ ADDONS_SRC+=" nsplugin? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1 ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" ADDONS_SRC+=" java? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" ADDONS_SRC+=" java? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" +ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" SRC_URI+=" ${ADDONS_SRC}" TDEPEND="${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt"