diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-10-28 10:11:27 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-10-28 10:11:27 +0000 |
| commit | 31b30753b8a057157dcc980d11420f012b73c31f (patch) | |
| tree | 93a5a2aeda3660ad533ce9ac997d6bf0f2bcf335 /app-office | |
| parent | Do not hardcode lib32, bug #429726 by SpanKY. (diff) | |
| download | historical-31b30753b8a057157dcc980d11420f012b73c31f.tar.gz historical-31b30753b8a057157dcc980d11420f012b73c31f.tar.bz2 historical-31b30753b8a057157dcc980d11420f012b73c31f.zip | |
Update the unpack code and wipe saxon.
Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 5 | ||||
| -rw-r--r-- | app-office/libreoffice/Manifest | 30 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999-r2.ebuild | 21 |
3 files changed, 30 insertions, 26 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 2a58dcaea76f..bd92f5b7a475 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.380 2012/10/25 10:40:55 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.381 2012/10/28 10:11:17 scarabeus Exp $ + + 28 Oct 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild: + Update the unpack code and wipe saxon. 25 Oct 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild: Fix the move to the submodules stuff. diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 0df9206efe3f..cff99cefe4d1 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -30,23 +30,23 @@ DIST libreoffice-help-3.6.2.2.tar.xz 1911136 SHA256 55ec6ef5eef4bbf2298c3b864f67 EBUILD libreoffice-3.5.6.2.ebuild 15672 SHA256 50964a32b3ccda096c43a01cf804b69f83807eef4ad3a791469250c25a40da6b SHA512 8ba424c19b59149b3f0b5635e99256a66d80dc6269eb14da1065ec126ef98a77c425c0d5424955cbb6ca1779d05f4be5a662838e65367e5a8c9dbbf4b90fe949 WHIRLPOOL 46172d9c9efa07f7254c9f5055da2e7f1c43c13574c5f706ea1610f89ff667091e0be40066ec0504f01135c1ab55d2635cf2618386e617de92a0bb9263f3c53d EBUILD libreoffice-3.6.2.2.ebuild 17397 SHA256 74f98b4a2a2319c68a229740e92841a7d7db61ca6d3dd9a2abc05cfb4fa4498d SHA512 e876ce82851e385af9955be302d879b9aac734d5ab93a6c7fb54d91be4f251767d571e9775b27ea58dacccafebb3f20914fa1ed7551100f9dc062c3f511e3779 WHIRLPOOL 447dc6e7ffcb63602875c4f38c2cfa1279591ad161d7a4ad7afd671e69a30d56f6ac1a03809763367264c12e5bd61bd430a0b210c7bde0d92b15a7f0c581cc19 EBUILD libreoffice-3.6.9999.ebuild 17399 SHA256 661edafbfd6a19d2899c5b194ebfc6c79537da33ea5b568399c8542d0d6b40b9 SHA512 7b355bcbf3f90c66588ba561512cddf9eae68794e7c227ea72051bb707dd5fd41872af4cce74a83c510681380e059353bf6c95afb602e3c4407f67c773c78d6c WHIRLPOOL bef7a8632396ab5ae065e11ff61f751daf0f0bc07bfb62571cacaeb55909d034ad67368621840447ff1ef813cebd8e8ed087e950757a1c8cd7ca0a968dec9cb7 -EBUILD libreoffice-9999-r2.ebuild 18098 SHA256 815587d314ca52dc14908850c4cae440d44760d043f22ac89aa0746be1121d49 SHA512 6e9bc745a04f7cdca7634ff50143ce252073efa86caec11c1aa95a0df6e5c5f81502508fc581f5307d520757f159c31c343fd87fd38de7af867d326b4b4e7d2f WHIRLPOOL 932500514ff17a641bea2d0f4a973e59d5088c0bdb42b5f49c2a74cd065c111806348b0d63141f061d0dfcabefb9caccb3400f3fca82551a865e6b30c08974a3 -MISC ChangeLog 69667 SHA256 859a4da7536d90ada8546772b3f64c04af8f6668dab8d7148f59a757d2b8696f SHA512 d7359fb15b3baa8f7fd02aaa11e43617c1ddb22a1964d649892b605703e3bbf11d26e8cf90193e00cb1fb8e19df4b56aed052d10f2fe0fc42390f4686977f247 WHIRLPOOL 4c73fe2adf12d98fe6a1e3ce240a2e607cdc2749ec9f47314bdb2c5078c93795e735300e5346358a08a4f5a2a14c01c37c200060be15739619a53c47f241e404 +EBUILD libreoffice-9999-r2.ebuild 18120 SHA256 aad2e54e82c22a9cc9b95a3cbde3340eac4ebee6bd1a4265ce98831ee9b7b962 SHA512 dc33738f49ac314165cecb881fa40b93d83ca3ea352d4c62eab7c6c0dcdff62264ecc977227eb75d07b3f380994a6c786f4249cf417ed66d2c8987fc5f010973 WHIRLPOOL da74ea4ed22b8589caba2a3883eeda32b0accfba25e347233277489c8b2487e3def43ce8fba7a6dd7016821bb72ac40d678050302eee7f1e168dcd7f18c4550f +MISC ChangeLog 69792 SHA256 08ffb1cb480d6235c4ee733ea659e051dbe75170a4350b3fcf5e970bf388924c SHA512 a25cf8fcc8953307b8aec85525cc5465fab69f65163fd6ff476d5ab48461fae11f59423552c2bb9c8c32016d5c95c6a712b5551499ce69cf6f266816eaefc445 WHIRLPOOL cf0e1ac55d709635c0d6bafd283f2cc8a7905c8db20f8d6177c839d8dc2222456168a3285412059a186a7e00ff1bfae81a97aff760a40e88f5efa9d3a902e5fd MISC metadata.xml 1645 SHA256 24887289646f2058654a7701555baf8afabcffa2223f5bece682d537a43fdcda SHA512 dbf85074a9bc3b984a6f8188dee88a19123d0b6fed5131a70592f31769c317b8eb5ea1095fb72a406dad9fe5214ac51e33203c162a6891a63b9cbedb0d1affc0 WHIRLPOOL 7cbfb1f8644f8cf36efc4ddd8bdb0f757483c7fce7da0e2d61922d0a5e9ab4dd968c5120064ec3307fd547544cdb9501a4bedabf905f7a7d201f972534b41172 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCAAGBQJQiRciAAoJEOSiRoyO7jvoLHMQAIY9Ne0x2nrWbs1pdKZdDNID -lUpmXtZSWrfh0GQPKNQzGTaucnLXH2JZTRbbWbi6UDrByaAGBZbJwos7UfPPfMX+ -jFuikz9a87bblq/7QMAXBQkt8v3IpdFRo8N2sqxAbkkBzyvGSdjxXvxXocal19Ef -c1K6ohKpR3hYPmjldk251I8ocGBDKbUMhi7JZZgU2fD9+ik9Ye/xK5/8dZ1XhmnN -DuVrk2fBQ3KL4HgpiUyx9n6IrxL/P5DtIsGMomsyd4iDn+9jZ2mKuyTV7322qsh6 -QT/GfeLRj3ZuWytULum7XRJNJei/FFdHmhAygOM3QPL/gtXGj9F9oUcdFqETl61J -+SYx5lRzyqozsNNjchGg3MKugbY4uQriq7RGzq1ZeFRzodJBSigURZG0GM7aE7Y3 -TRDN/31zfwkYaFUSdJVmUxD2GgGfC1QYIXJLfxt2nzCJaAGhFKdHP3PBto5LA0Ym -y2X6SVzAI7MU8oRVaRfyxUXNuQKHFMEpk+CQLOwORpn3z1wbkIgf57UBECEB3gQd -HwlGW5wMEZkrAduFnYjvYjtsyZufZgbxmBou3hp23n3YIE5xK2T8cO25MtwwORnP -lfDuZ6C3p1ZubObLglvo66lZfDPMjcNwvGKSSmBgOHuvu8pvUKgz9m1XZ8LOAv41 -AO7yEz4oHMnC0dNBGtAy -=2Myp +iQIcBAEBCAAGBQJQjQTMAAoJEOSiRoyO7jvociUP/1wuWJvC0kdiKIeBrzifiwtn +TMaHRjKcP5NpoCGzTUTVsLDVNpcR+Zyi2j0mvJ59SDTPpkCeDVQdtLZ69bNsozFo +XsfL5pt9+hkLlmGdfdcCB5ebH7B7IEfmPus2JQLXPr7UhCGOYCl5isqNUST0/eVD +TQO4b9dqMC93GpqecDwsimN7gcBPdt8YaPg41CRBdN/t2JzAkMCRrau0u76YJf6T +f2vt9diEn7d4hXySTUmmiiPLWZf2elbiG7frgBad/B23xREw12lAo9VBjOFVt9ee +y6UQwCnh+Gjfy1sulFHdlT7Ry1u//GQGc7L4DrBFvE4AFiPxVejzjzqnbWUEVUnk +UzB1MOW42t9bZKrElBnxtJ9LA8A3LsmpF/be4IrSAsZya6+uSa+MbZ9lSWYA1WtD +jbO8Pwmni1q+voUi+xv9O09/w0mX1Xi4cqiwB+BOGh9ISAk/mlyMsAMY6JpQvJQm +F7RMuMaUVZGC9pkwoVOBfX5KQqF+a3AaT72913e7nanFUuMkequE7XGJcp0JEBwQ +yxdgKB/+SdSuQt/1dPEjl6qg6x1+U2OkrWAqFw/FE9RVIEnlaPqShxmhjy7Zef73 +6iMOSCoSfO/T34DUL6FOmnROszedx4T6NlSuKl/VGtMfSY6CQN5ZKSJQaSJSG7x/ +Y8QTEYxmVv1w+QC7craz +=HplL -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild index 51c3cc02d12b..709b4f3e6a40 100644 --- a/app-office/libreoffice/libreoffice-9999-r2.ebuild +++ b/app-office/libreoffice/libreoffice-9999-r2.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-9999-r2.ebuild,v 1.119 2012/10/25 10:40:55 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.120 2012/10/28 10:11:17 scarabeus Exp $ EAPI=4 @@ -280,7 +280,7 @@ pkg_setup() { } src_unpack() { - local mod dest tmplfile tmplname mypv + local mod mod2 dest tmplfile tmplname mypv [[ -n ${PATCHSET} ]] && unpack ${PATCHSET} if use branding; then @@ -294,9 +294,11 @@ src_unpack() { fi unpack "${PN}-${mod}-${PV}.tar.xz" if [[ ${mod} != core ]]; then - [[ ${mod} == help ]] && mod="helpcontent2" - mkdir "${S}/${mod}/" || die - mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}" || die + mod2=${mod} + # mapping does not match on help + [[ ${mod} == help ]] && mod2="helpcontent2" + mkdir -p "${S}/${mod2}/" || die + mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" fi done @@ -313,10 +315,11 @@ src_unpack() { EGIT_NOUNPACK="true" git-2_src_unpack if [[ ${mod} != core ]]; then + mod2=${mod} # mapping does not match on help - [[ ${mod} == help ]] && mod="helpcontent2" - mkdir "${S}/${mod}/" || die - mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod}" || die + [[ ${mod} == help ]] && mod2="helpcontent2" + mkdir -p "${S}/${mod2}/" || die + mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" fi done @@ -384,10 +387,8 @@ src_configure() { if use java; then # hsqldb: system one is too new - # saxon: system one does not work properly java_opts=" --without-system-hsqldb - --without-system-saxon --with-ant-home="${ANT_HOME}" --with-jdk-home=$(java-config --jdk-home 2>/dev/null) --with-java-target-version=$(java-pkg_get-target) |