diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-10-18 07:33:46 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-10-18 07:33:46 +0000 |
| commit | 06eaed623c56018aa7682fbcb02886d6222b187a (patch) | |
| tree | 4ff658f0df77be606531a2302f48857bafb539d3 /app-office | |
| parent | Forgot on pkg_setup. (diff) | |
| download | gentoo-2-06eaed623c56018aa7682fbcb02886d6222b187a.tar.gz gentoo-2-06eaed623c56018aa7682fbcb02886d6222b187a.tar.bz2 gentoo-2-06eaed623c56018aa7682fbcb02886d6222b187a.zip | |
Bump live versions to eapi4.
(Portage version: 2.2.0_alpha68/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild | 19 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999-r1.ebuild | 25 |
3 files changed, 29 insertions, 21 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 21f745eb6bb7..24356fade47e 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.174 2011/10/16 18:01:45 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.175 2011/10/18 07:33:46 scarabeus Exp $ + + 18 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> + libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild: + Bump live versions to eapi4. 16 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild: diff --git a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild index d750bd6cea4f..3235ac180e79 100644 --- a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild +++ b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild @@ -1,8 +1,8 @@ # 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.14 2011/10/16 18:01:45 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.15 2011/10/18 07:33:46 scarabeus Exp $ -EAPI=3 +EAPI=4 KDE_REQUIRED="optional" KDE_SCM="git" @@ -206,12 +206,11 @@ PATCHES=( "${FILESDIR}/${PN}-java.patch" ) -# Uncoment me when updating to eapi4 -# REQUIRED_USE=" -# || ( gtk gnome kde ) -# gnome? ( gtk ) -# nsplugin? ( gtk ) -#" +REQUIRED_USE=" + || ( gtk gnome kde ) + gnome? ( gtk ) + nsplugin? ( gtk ) +" # Needs lots and lots of work and compiling RESTRICT="test" @@ -505,7 +504,7 @@ src_install() { make DESTDIR="${D}" distro-pack-install || die # Fix bash completion placement - newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} || die + newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} rm -rf "${ED}"/etc/ # symlink the plugin to system location @@ -515,7 +514,7 @@ src_install() { if use branding; then insinto /usr/$(get_libdir)/${PN}/program - newins "${WORKDIR}/branding-sofficerc" sofficerc || die + newins "${WORKDIR}/branding-sofficerc" sofficerc fi } diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild index fa6b0a5c0bf5..548f3915a468 100644 --- a/app-office/libreoffice/libreoffice-9999-r1.ebuild +++ b/app-office/libreoffice/libreoffice-9999-r1.ebuild @@ -1,8 +1,8 @@ # 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.43 2011/10/16 18:01:45 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.44 2011/10/18 07:33:46 scarabeus Exp $ -EAPI=3 +EAPI=4 KDE_REQUIRED="optional" KDE_SCM="git" @@ -200,15 +200,20 @@ DEPEND="${COMMON_DEPEND} PATCHES=( ) -# Uncoment me when updating to eapi4 -# REQUIRED_USE=" -# || ( gtk gnome kde ) -# gnome? ( gtk ) -# nsplugin? ( gtk ) -#" +REQUIRED_USE=" + || ( gtk gnome kde ) + gnome? ( gtk ) + nsplugin? ( gtk ) +" S="${WORKDIR}/${PN}-core-${PV}" +pkg_pretend() { + CHECKREQS_MEMORY="1G" + use debug && CHECKREQS_DISK_BUILD="15G" || CHECKREQS_DISK_BUILD="9G" + check-reqs_pkg_setup +} + pkg_setup() { java-pkg-opt-2_pkg_setup kde4-base_pkg_setup @@ -461,7 +466,7 @@ src_install() { make DESTDIR="${D}" distro-pack-install -o build -o check || die # Fix bash completion placement - newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} || die + newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} rm -rf "${ED}"/etc/ # symlink the plugin to system location @@ -471,7 +476,7 @@ src_install() { if use branding; then insinto /usr/$(get_libdir)/${PN}/program - newins "${WORKDIR}/branding-sofficerc" sofficerc || die + newins "${WORKDIR}/branding-sofficerc" sofficerc fi } |