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 | d2f5df4db532864b4a6a7e21214af504dbdfa249 (patch) | |
| tree | 9ceae6b4c02c0795fd3d9ca9d5008443fe9e954e /app-office | |
| parent | old (diff) | |
| download | gentoo-2-d2f5df4db532864b4a6a7e21214af504dbdfa249.tar.gz gentoo-2-d2f5df4db532864b4a6a7e21214af504dbdfa249.tar.bz2 gentoo-2-d2f5df4db532864b4a6a7e21214af504dbdfa249.zip | |
Tiny touchups for branding as the about was redesigned, we need new images.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999-r2.ebuild | 10 |
2 files changed, 10 insertions, 6 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/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 |