From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RG4BQ-00010Z-HQ for garchives@archives.gentoo.org; Tue, 18 Oct 2011 07:33:56 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 019F121C054; Tue, 18 Oct 2011 07:33:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AFA5E21C054 for ; Tue, 18 Oct 2011 07:33:48 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ADB561B4039 for ; Tue, 18 Oct 2011 07:33:47 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2230) id 823392004B; Tue, 18 Oct 2011 07:33:46 +0000 (UTC) From: "Tomas Chvatal (scarabeus)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, scarabeus@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r1.ebuild ChangeLog libreoffice-3.4.9999-r1.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: libreoffice-9999-r1.ebuild ChangeLog libreoffice-3.4.9999-r1.ebuild X-VCS-Directories: app-office/libreoffice X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal Content-Type: text/plain; charset=utf8 Message-Id: <20111018073346.823392004B@flycatcher.gentoo.org> Date: Tue, 18 Oct 2011 07:33:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: c4c186e2543e26cca852fcd8526c156d scarabeus 11/10/18 07:33:46 Modified: libreoffice-9999-r1.ebuild ChangeLog libreoffice-3.4.9999-r1.ebuild Log: Bump live versions to eapi4. =20 (Portage version: 2.2.0_alpha68/cvs/Linux x86_64) Revision Changes Path 1.44 app-office/libreoffice/libreoffice-9999-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/libreoffice-9999-r1.ebuild?rev=3D1.44&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/libreoffice-9999-r1.ebuild?rev=3D1.44&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/libreoffice-9999-r1.ebuild?r1=3D1.43&r2=3D1.44 Index: libreoffice-9999-r1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999= -r1.ebuild,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- libreoffice-9999-r1.ebuild 16 Oct 2011 18:01:45 -0000 1.43 +++ libreoffice-9999-r1.ebuild 18 Oct 2011 07:33:46 -0000 1.44 @@ -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-99= 99-r1.ebuild,v 1.43 2011/10/16 18:01:45 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-99= 99-r1.ebuild,v 1.44 2011/10/18 07:33:46 scarabeus Exp $ =20 -EAPI=3D3 +EAPI=3D4 =20 KDE_REQUIRED=3D"optional" KDE_SCM=3D"git" @@ -200,15 +200,20 @@ PATCHES=3D( ) =20 -# Uncoment me when updating to eapi4 -# REQUIRED_USE=3D" -# || ( gtk gnome kde ) -# gnome? ( gtk ) -# nsplugin? ( gtk ) -#" +REQUIRED_USE=3D" + || ( gtk gnome kde ) + gnome? ( gtk ) + nsplugin? ( gtk ) +" =20 S=3D"${WORKDIR}/${PN}-core-${PV}" =20 +pkg_pretend() { + CHECKREQS_MEMORY=3D"1G" + use debug && CHECKREQS_DISK_BUILD=3D"15G" || CHECKREQS_DISK_BUILD=3D"9G= " + check-reqs_pkg_setup +} + pkg_setup() { java-pkg-opt-2_pkg_setup kde4-base_pkg_setup @@ -461,7 +466,7 @@ make DESTDIR=3D"${D}" distro-pack-install -o build -o check || die =20 # 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/ =20 # symlink the plugin to system location @@ -471,7 +476,7 @@ =20 if use branding; then insinto /usr/$(get_libdir)/${PN}/program - newins "${WORKDIR}/branding-sofficerc" sofficerc || die + newins "${WORKDIR}/branding-sofficerc" sofficerc fi } =20 1.175 app-office/libreoffice/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/ChangeLog?rev=3D1.175&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/ChangeLog?rev=3D1.175&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/ChangeLog?r1=3D1.174&r2=3D1.175 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- ChangeLog 16 Oct 2011 18:01:45 -0000 1.174 +++ ChangeLog 18 Oct 2011 07:33:46 -0000 1.175 @@ -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=C3=A1=C5=A1 Chv=C3=A1tal + libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild: + Bump live versions to eapi4. =20 16 Oct 2011; Tom=C3=A1=C5=A1 Chv=C3=A1tal libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild: 1.15 app-office/libreoffice/libreoffice-3.4.9999-r1.ebuil= d file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/libreoffice-3.4.9999-r1.ebuild?rev=3D1.15&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/libreoffice-3.4.9999-r1.ebuild?rev=3D1.15&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/libreoffice-3.4.9999-r1.ebuild?r1=3D1.14&r2=3D1.15 Index: libreoffice-3.4.9999-r1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.= 9999-r1.ebuild,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libreoffice-3.4.9999-r1.ebuild 16 Oct 2011 18:01:45 -0000 1.14 +++ libreoffice-3.4.9999-r1.ebuild 18 Oct 2011 07:33:46 -0000 1.15 @@ -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 $ =20 -EAPI=3D3 +EAPI=3D4 =20 KDE_REQUIRED=3D"optional" KDE_SCM=3D"git" @@ -206,12 +206,11 @@ "${FILESDIR}/${PN}-java.patch" ) =20 -# Uncoment me when updating to eapi4 -# REQUIRED_USE=3D" -# || ( gtk gnome kde ) -# gnome? ( gtk ) -# nsplugin? ( gtk ) -#" +REQUIRED_USE=3D" + || ( gtk gnome kde ) + gnome? ( gtk ) + nsplugin? ( gtk ) +" =20 # Needs lots and lots of work and compiling RESTRICT=3D"test" @@ -505,7 +504,7 @@ make DESTDIR=3D"${D}" distro-pack-install || die =20 # 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/ =20 # symlink the plugin to system location @@ -515,7 +514,7 @@ =20 if use branding; then insinto /usr/$(get_libdir)/${PN}/program - newins "${WORKDIR}/branding-sofficerc" sofficerc || die + newins "${WORKDIR}/branding-sofficerc" sofficerc fi } =20