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 1R4lZu-0001sW-8R for garchives@archives.gentoo.org; Sat, 17 Sep 2011 03:28:30 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 57C7621C04D; Sat, 17 Sep 2011 03:28:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A989721C04D for ; Sat, 17 Sep 2011 03:28:21 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E87631B4004 for ; Sat, 17 Sep 2011 03:28:20 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2230) id BC4FA20035; Sat, 17 Sep 2011 03:28:18 +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 X-VCS-Repository: gentoo-x86 X-VCS-Files: libreoffice-9999-r1.ebuild ChangeLog X-VCS-Directories: app-office/libreoffice X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal Content-Type: text/plain; charset=utf8 Message-Id: <20110917032818.BC4FA20035@flycatcher.gentoo.org> Date: Sat, 17 Sep 2011 03:28:18 +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: cd81d03cee5807d57c8c1240d111eedb scarabeus 11/09/17 03:28:18 Modified: libreoffice-9999-r1.ebuild ChangeLog Log: More smple cleanups. =20 (Portage version: 2.2.0_alpha58/cvs/Linux x86_64) Revision Changes Path 1.11 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.11&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/libreoffice-9999-r1.ebuild?rev=3D1.11&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/libreoffice-9999-r1.ebuild?r1=3D1.10&r2=3D1.11 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.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libreoffice-9999-r1.ebuild 17 Sep 2011 01:26:38 -0000 1.10 +++ libreoffice-9999-r1.ebuild 17 Sep 2011 03:28:18 -0000 1.11 @@ -1,6 +1,6 @@ # 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.10 2011/09/17 01:26:38 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-99= 99-r1.ebuild,v 1.11 2011/09/17 03:28:18 scarabeus Exp $ =20 EAPI=3D3 =20 @@ -49,7 +49,6 @@ =20 # addons # FIXME: actually review which one of these are used -ADDONS_SRC+=3D" ${ADDONS_URI}/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1= .12.1.tar.gz" ADDONS_SRC+=3D" ${ADDONS_URI}/1756c4fa6c616ae15973c104cd8cb256-Adobe-Cor= e35_AFMs-314.tar.gz" ADDONS_SRC+=3D" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1= .2.14.tar.gz" ADDONS_SRC+=3D" ${ADDONS_URI}/24be19595acad0a2cae931af77a0148a-LICENSE_s= ource-9.0.0.7-bj.html" @@ -64,7 +63,6 @@ ADDONS_SRC+=3D" ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.= 1.2.zip" ADDONS_SRC+=3D" ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.= 0.0.7-bj.zip" ADDONS_SRC+=3D" ${ADDONS_URI}/d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip" -ADDONS_SRC+=3D" ${ADDONS_URI}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC= -1.3.2.tar.gz" ADDONS_SRC+=3D" ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformul= a-1.1.7.zip" ADDONS_SRC+=3D" ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-= 1.1.6.zip" ADDONS_SRC+=3D" ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-libreposi= tory-1.1.6.zip" @@ -80,6 +78,9 @@ ADDONS_SRC+=3D" ${ADDONS_URI}/71474203939fafbe271e1263e61d083e-nss-3.12.= 8-with-nspr-4.8.6.tar.gz" ADDONS_SRC+=3D" http://download.go-oo.org/extern/185d60944ea767075d27247= c3162b3bc-unowinreg.dll" ADDONS_SRC+=3D" http://www.numbertext.org/linux/881af2b7dca9b8259abbca00= bbbc004d-LinLibertineG-20110101.zip" +# REALLY REQUIRED +ADDONS_SRC+=3D" ${ADDONS_URI}/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1= .12.1.tar.gz" +ADDONS_SRC+=3D" ${ADDONS_URI}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC= -1.3.2.tar.gz" SRC_URI+=3D" ${ADDONS_SRC}" =20 TDEPEND=3D"${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-= Pack-en-US_1.0.0.oxt" @@ -346,7 +347,6 @@ src_configure() { local java_opts local internal_libs - local extensions local themes=3D"crystal" local jbs=3D$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=3D\)\([[:digit:]]\+= \).*/\2/;T;p' <<< "${MAKEOPTS}") =20 @@ -357,13 +357,6 @@ use gnome && themes+=3D" tango" use kde && themes+=3D" oxygen" =20 - # list the extensions we are going to build by default - extensions=3D" - --enable-ext-pdfimport - --enable-ext-presenter-console - --enable-ext-presenter-minimizer - " - # dmake: not worth of splitting out # cppunit: patched not to run anything, just main() { return 0; } # workaround to upstream running the tests during build @@ -394,7 +387,7 @@ fi =20 if use branding; then - extensions+=3D" + internal_libs+=3D" --with-about-bitmap=3D"${WORKDIR}/branding-about.png" --with-intro-bitmap=3D"${WORKDIR}/branding-intro.png" " @@ -501,8 +494,7 @@ $(use_with nsplugin system-mozilla libxul) \ $(use_with templates sun-templates) \ ${internal_libs} \ - ${java_opts} \ - ${extensions} + ${java_opts} } =20 src_compile() { 1.135 app-office/libreoffice/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/ChangeLog?rev=3D1.135&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/ChangeLog?rev=3D1.135&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/ChangeLog?r1=3D1.134&r2=3D1.135 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.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- ChangeLog 17 Sep 2011 01:26:38 -0000 1.134 +++ ChangeLog 17 Sep 2011 03:28:18 -0000 1.135 @@ -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.= 134 2011/09/17 01:26:38 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.= 135 2011/09/17 03:28:18 scarabeus Exp $ + + 17 Sep 2011; Tom=C3=A1=C5=A1 Chv=C3=A1tal + libreoffice-9999-r1.ebuild: + More smple cleanups. =20 17 Sep 2011; Tom=C3=A1=C5=A1 Chv=C3=A1tal libreoffice-9999-r1.ebuild: