diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-04-17 08:03:43 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-04-17 08:03:43 +0000 |
| commit | 00103bbed684553911d19482be1fad7a1251b008 (patch) | |
| tree | f3818749bec19ded1366d489165588432c5cc6d3 /app-office/libreoffice | |
| parent | old (diff) | |
| download | historical-00103bbed684553911d19482be1fad7a1251b008.tar.gz historical-00103bbed684553911d19482be1fad7a1251b008.tar.bz2 historical-00103bbed684553911d19482be1fad7a1251b008.zip | |
Tiny touchups for branding as the about was redesigned, we need new images.
Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64
Diffstat (limited to 'app-office/libreoffice')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/Manifest | 30 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999-r2.ebuild | 10 |
3 files changed, 25 insertions, 21 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 60259956dae2..d62a6d0cacd9 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.279 2012/04/06 10:57:26 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.280 2012/04/17 08:03:43 scarabeus Exp $ + + 17 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.2.2.ebuild, + libreoffice-9999-r2.ebuild: + Tiny touchups for branding as the about was redesigned, we need new images. 06 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.2.2.ebuild, libreoffice-3.5.9999.ebuild, libreoffice-9999-r2.ebuild: diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index c55de27679dd..06f90bd412df 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -117,23 +117,23 @@ EBUILD libreoffice-3.4.3.2-r1.ebuild 18554 RMD160 0b79b699e3d60974db7793b41c9f8d EBUILD libreoffice-3.4.5.2.ebuild 15232 RMD160 246fd5a3007a6de67ee6023c7bd6a89794692d6d SHA1 29546cda5ce47875b54c9b583261e0bc1b35e514 SHA256 24bff75483db00b80173eff9f60e4fe4117ee871183042a7f8bc2455a08e90cb EBUILD libreoffice-3.5.2.2.ebuild 14702 RMD160 3dd43d4a9d7ff12f5052bd4660b0b75c9a81b9d2 SHA1 6030f65c40b0257402284bfebf03b9f1a95b8747 SHA256 c9fab52908ebb1bd1e25badf1d81659d8ba31f0c8bef13edd488cfa9d4cffc79 EBUILD libreoffice-3.5.9999.ebuild 14568 RMD160 a7b53203aad4136eeb94a1f477f4d722c55c02fc SHA1 a69479ad49cf93d423437506dc298623d931a852 SHA256 30560b008ab8116835706d039e8834858f61e1f208d73a923e9c288ea35aa24f -EBUILD libreoffice-9999-r2.ebuild 14448 RMD160 b15b64dcbf94d4d844f5753d144534508b7710a4 SHA1 b3c3277bac56bcf72c29c42f674987ba11e521a9 SHA256 3ecf99f4d8215681ac1a3b23b64e7969b872e2bdac43469f215d47fb12f02080 -MISC ChangeLog 51353 RMD160 63ea30800dea6af8c3ffe957842c0c596a9b888a SHA1 35c409608866c70f2ea0e776f15c6cc89999a963 SHA256 620fbd24333c079369ab27ca704f2b4908e011f16687cf9e4243bb42404a24fc +EBUILD libreoffice-9999-r2.ebuild 14388 RMD160 aa8b4e7b2f7653c7901685df8cf611c2a574b967 SHA1 ef5c26caa8cafc238f2e8d487a982ef64187324e SHA256 a40e09a1d3f41fa1eeb3e041cde193da5b8a00309669c67fe37f133a6e10b16d +MISC ChangeLog 51545 RMD160 8f6354fa6f70ccd9a28280f5e066be597b7a04e2 SHA1 7989e6e7a72a387bb721a91ddbc01cd054325f39 SHA256 3cd16a09dc9539c5a2d0e8f38940c7a7ac1823bafb2801e1b356e110981e1723 MISC metadata.xml 1490 RMD160 0c1570336daac60ec87e2dc84a4f3897d5c3feda SHA1 5efa4d2ef0eb9bd9daa685202b97fdb6a18a7250 SHA256 6ab64c192679a514a95c3c594ca5d212ba60f02b1760352bcc1a6c22838a6c96 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBAgAGBQJPfsw3AAoJEOSiRoyO7jvokDEP/0vuLtG3rNlzDpU1YZZCIhRl -LDSdZc7PMAQPujIIAQ3SIfpnA7ES8hZzg/9AGRO/xgtaVpImfa4amwt0RQIUUYWP -rUy0xhW6PUEnW0jpnNRk8oHTyLN/dJvYGVn8rOwhVkhpuU06d9rF7FBCkVDKBE2b -rvmGVyByxwtCJEzKFk81wJa+UBv7VH08V3ZvD4P2mjwjaBVlfDxXHnwr9I3VhD6h -q9gcx48Wlvd/U8LiMSipsziH3wzuz+QwQLoAbTG+sfc019B5VM+ZVOmsADehvdGJ -KVJK4DG9LqgJ0O4dfGGecjFhb3LZ53ZP6XrUfTGn4eyM+igPaKHoaf9nGFK4WnAD -jVFtTd3Ve2lGIbzKbMm9gorqneSCvSygNgcdb30HokvixsVL/T4QHb/HtHidh/qf -xEw/PESWFMhwRaPBhdXMDaHezgwroFgvfRmPSf3hCnsPiDyv7Ve2cKhj3L43aGon -dHu5kYV1RkxeHszdPMVxwR0y0TTJ8DiwtyLTwTIVRo6xjAIxpw9Rq99QcT6YgR+Q -aNN2ccVI9fPWi6+LmXiglwTvG3nFG14QaKie8UcK4nau26hdTUTD7YmLJQF83ROn -BwD6yD72Xz8yNX8aclG1GZay7rp6KZ9ZN5pS2nZ9cWzhLfS9i5936AluRfEMpHu1 -HDMQe+wn7cmRd9qTMQm5 -=Y0rd +iQIcBAEBAgAGBQJPjSP0AAoJEOSiRoyO7jvoPZIP/1r813X/Y/E/QbU7Er7DtPjl +nG7ekPpdoS/Da7tWUfxLFaSVSXUa01pDfT5W0zQfHjt3UadQ5Y54B3bhicoY04Ck +aIR9G23QWaxDTBGACCyQeLzW8xCH4eVSnIoWn/vgJztNEU9Q50xexnsZV2lLQ/wF +qzzU2HNABFkHW+E9bi2L8LOah00FkPG2QyYn/jG7nrVrmDm4VXtPX1EQFwoE4zfO +wCkSuIZuekw17XRxYuxGhXQYQuin8V4GuulLhX8RW3pJcnxt+vvlcSRd5tMXyNBF +ObNgd5muh+i3p8wTbDefqBZvp/kvNgGtHD874+pdbsebCzOyPdT9ctRnN7OsOeKs +gIjvTvkvR6Q2vD3F8E0vI6gmbR17aW6smDJHUhEOpQ26HsxbpuCs/exmEWNKiH8S +nEXYVwFYQejC2yAxQVABVOVFzM4e0bXdpgX/w7BHeG0YrcPkfCziZKRoRYZvGCTV +9o0OtZOHY8vjLdAn34qvAguG3yyDXVvRjYuGEFxBC5YPw27BO2SAXkg5AT7qeRC+ +HlR1k8WIaSkeqGUFXF1SN3kQYrmhhr4tBISI7SfdEorLgVlcAfYRu2kJeDptH1mC +KOd3/2DvGArHpsmAqo4EzsEHTfmiF4Gfn9AaZ+kTDW5u0KhTwU+z5SpylA1p2uLW +o+AnTJXkcm2mvRGTCl4E +=wlbP -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild index 158694d500e4..876eb6ba21c9 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.45 2012/04/06 10:57:26 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.46 2012/04/17 08:03:43 scarabeus Exp $ EAPI=4 @@ -211,12 +211,13 @@ REQUIRED_USE=" S="${WORKDIR}/${PN}-core-${PV}" +CHECKREQS_MEMORY="512M" +CHECKREQS_DISK_BUILD="6G" + pkg_pretend() { local pgslot if [[ ${MERGE_TYPE} != binary ]]; then - CHECKREQS_MEMORY="512M" - CHECKREQS_DISK_BUILD="6G" check-reqs_pkg_pretend if [[ $(gcc-major-version) -lt 4 ]]; then @@ -243,7 +244,7 @@ pkg_setup() { python_set_active_version 2 python_pkg_setup - [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_pretend + [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup } src_unpack() { @@ -351,7 +352,6 @@ src_configure() { if use branding; then internal_libs+=" - --with-about-bitmap="${WORKDIR}/branding-about.png" --with-intro-bitmap="${WORKDIR}/branding-intro.png" " fi |