diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-10-25 10:41:08 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-10-25 10:41:08 +0000 |
| commit | 20d3f4c8ad248583dde77303c462140edbfc17b1 (patch) | |
| tree | 7444eec6afaeffe7191281f3235ae16ebf5f1dfa /app-office/libreoffice | |
| parent | Push to maintainer-needed@ (diff) | |
| download | historical-20d3f4c8ad248583dde77303c462140edbfc17b1.tar.gz historical-20d3f4c8ad248583dde77303c462140edbfc17b1.tar.bz2 historical-20d3f4c8ad248583dde77303c462140edbfc17b1.zip | |
Fix the move to the submodules stuff.
Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8
Diffstat (limited to 'app-office/libreoffice')
| -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 | 15 |
3 files changed, 29 insertions, 21 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 55b0f3ac884d..2a58dcaea76f 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.379 2012/10/25 10:17:42 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.380 2012/10/25 10:40:55 scarabeus Exp $ + + 25 Oct 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild: + Fix the move to the submodules stuff. 25 Oct 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild: Fix build as the help fiddled a bit. diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 95ff6c1c7077..0df9206efe3f 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 17856 SHA256 f4109521baa952b9a32a9ab70a0f1b05b3e5910c802d4bde867e5926508f4c9a SHA512 0cea652eb498da03171b41f1ebf1d3c0d656783548ac8f4dd39a36df42396d44af5661d48083383eec4737f7eefbbdb4bb4074771599f26e42b9d000590daacd WHIRLPOOL 968eab51eaaaa83be2922c41b82a7f916287ac2ff93c694d0ca5b252feabc8dcfe197037fb4c115bed5e74d2b6ea48a46ce9155c7e1c732a1cee2c7ea26d552c -MISC ChangeLog 69543 SHA256 e3410833f5342332025713028ce82450ac540ce96dd1d8b5a595fd9cad6c7612 SHA512 9c9d3b65982ebcdf58623e5c3a5a00e5cc9d2c1e9487fc5711660ae17f3f2e3ff3f28dd24a1d86e41d4df32e88dbccb8d8b9d8ec53d74f79ea1e68bd122ff408 WHIRLPOOL 99913de11947c2f2b359653036696574dce72d1704179fbdce4ebfbdf998b0c55631398941eb4434a3426669e2ce878b251feb486ddffadc8a75840e5468bdfa +EBUILD libreoffice-9999-r2.ebuild 18098 SHA256 815587d314ca52dc14908850c4cae440d44760d043f22ac89aa0746be1121d49 SHA512 6e9bc745a04f7cdca7634ff50143ce252073efa86caec11c1aa95a0df6e5c5f81502508fc581f5307d520757f159c31c343fd87fd38de7af867d326b4b4e7d2f WHIRLPOOL 932500514ff17a641bea2d0f4a973e59d5088c0bdb42b5f49c2a74cd065c111806348b0d63141f061d0dfcabefb9caccb3400f3fca82551a865e6b30c08974a3 +MISC ChangeLog 69667 SHA256 859a4da7536d90ada8546772b3f64c04af8f6668dab8d7148f59a757d2b8696f SHA512 d7359fb15b3baa8f7fd02aaa11e43617c1ddb22a1964d649892b605703e3bbf11d26e8cf90193e00cb1fb8e19df4b56aed052d10f2fe0fc42390f4686977f247 WHIRLPOOL 4c73fe2adf12d98fe6a1e3ce240a2e607cdc2749ec9f47314bdb2c5078c93795e735300e5346358a08a4f5a2a14c01c37c200060be15739619a53c47f241e404 MISC metadata.xml 1645 SHA256 24887289646f2058654a7701555baf8afabcffa2223f5bece682d537a43fdcda SHA512 dbf85074a9bc3b984a6f8188dee88a19123d0b6fed5131a70592f31769c317b8eb5ea1095fb72a406dad9fe5214ac51e33203c162a6891a63b9cbedb0d1affc0 WHIRLPOOL 7cbfb1f8644f8cf36efc4ddd8bdb0f757483c7fce7da0e2d61922d0a5e9ab4dd968c5120064ec3307fd547544cdb9501a4bedabf905f7a7d201f972534b41172 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCAAGBQJQiRHcAAoJEOSiRoyO7jvo0SYP/R+D5u5oynXP69JDbu0X+ZXk -GNolhPTQXGD/q8nYLUlDAs0hg1AWy9m8t7i17wEA9HDsA0QcCTZ086UsUdWVAZpC -2eb1AWAa8CwC7QgMlvjkSXsBUdqpftAo0dEjYstae8hbmPgV+6aqKU3C3MecO/RU -5qMMqSVjt8z1XE9bTgLNV9tyuT2V/vNCepmK05sE7ZSDGS56SN3QL2/fi/b/Sc+c -CBK/YICD8dDpLcN7S0qr0IWkRphzQMPNuVOBMF4mVmG7bIVLaQAsjkGMmWjpoS5M -KBEIUZiBdwO0PAQnZ2xKmsg3apnEbcoA4HYd8YfWPvKEsr1rDzYffGNA6R1k7sM0 -1L1QaEDrkKAz/57NULInwcAb+KQ6KwFGTn9kp9Ld67T/HCz9Tsvt4k68bfOIjUZT -EYJq1pqwNy55ZMhtfGUCfG5jL1gk6UOaCHksuvDpqpoipzMxrMCOkvDD8bgBzKHe -rSFjYyDTcNLpQxokvadamVF/QwuRTXMwbWd0BqSVXPwXgqoZ5w7Q1zit82+l4uCr -WJz+l+wkfjspsIEiQk7h7omqkRDzngXw4Cg1Jm+Ggbu7jWc/crYEzVdCIiMxdLBK -2PVYhck6nFhsPNrm62KVGYn6CLOBHaNBO3Jm8OpFpJ5vlQmoRTlpihhCEwRjHiPv -VO2tggpvzka/SoN6GJsT -=1qER +iQIcBAEBCAAGBQJQiRciAAoJEOSiRoyO7jvoLHMQAIY9Ne0x2nrWbs1pdKZdDNID +lUpmXtZSWrfh0GQPKNQzGTaucnLXH2JZTRbbWbi6UDrByaAGBZbJwos7UfPPfMX+ +jFuikz9a87bblq/7QMAXBQkt8v3IpdFRo8N2sqxAbkkBzyvGSdjxXvxXocal19Ef +c1K6ohKpR3hYPmjldk251I8ocGBDKbUMhi7JZZgU2fD9+ik9Ye/xK5/8dZ1XhmnN +DuVrk2fBQ3KL4HgpiUyx9n6IrxL/P5DtIsGMomsyd4iDn+9jZ2mKuyTV7322qsh6 +QT/GfeLRj3ZuWytULum7XRJNJei/FFdHmhAygOM3QPL/gtXGj9F9oUcdFqETl61J ++SYx5lRzyqozsNNjchGg3MKugbY4uQriq7RGzq1ZeFRzodJBSigURZG0GM7aE7Y3 +TRDN/31zfwkYaFUSdJVmUxD2GgGfC1QYIXJLfxt2nzCJaAGhFKdHP3PBto5LA0Ym +y2X6SVzAI7MU8oRVaRfyxUXNuQKHFMEpk+CQLOwORpn3z1wbkIgf57UBECEB3gQd +HwlGW5wMEZkrAduFnYjvYjtsyZufZgbxmBou3hp23n3YIE5xK2T8cO25MtwwORnP +lfDuZ6C3p1ZubObLglvo66lZfDPMjcNwvGKSSmBgOHuvu8pvUKgz9m1XZ8LOAv41 +AO7yEz4oHMnC0dNBGtAy +=2Myp -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild index 97be254896ff..51c3cc02d12b 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.118 2012/10/25 10:17:42 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.119 2012/10/25 10:40:55 scarabeus Exp $ EAPI=4 @@ -294,7 +294,9 @@ src_unpack() { fi unpack "${PN}-${mod}-${PV}.tar.xz" if [[ ${mod} != core ]]; then - mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}" + [[ ${mod} == help ]] && mod="helpcontent2" + mkdir "${S}/${mod}/" || die + mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}" || die rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" fi done @@ -311,7 +313,10 @@ src_unpack() { EGIT_NOUNPACK="true" git-2_src_unpack if [[ ${mod} != core ]]; then - mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}" + # mapping does not match on help + [[ ${mod} == help ]] && mod="helpcontent2" + mkdir "${S}/${mod}/" || die + mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod}" || die rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" fi done @@ -536,8 +541,8 @@ src_compile() { local path="${SOLARVER}/${INPATH}/res/img" mkdir -p "${path}" || die - echo "perl \"${S}/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\"" - perl "${S}/helpers/create_ilst.pl" \ + echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\"" + perl "${S}/helpcontent2/helpers/create_ilst.pl" \ -dir=icon-themes/galaxy/res/helpimg \ > "${path}/helpimg.ilst" [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug." |