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 1SQgjE-0005X6-Uw for garchives@archives.gentoo.org; Sat, 05 May 2012 15:17:03 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2576EE08AC; Sat, 5 May 2012 15:16:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D6949E08AC for ; Sat, 5 May 2012 15:16:53 +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 2531D1B4051 for ; Sat, 5 May 2012 15:16:53 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2230) id D76032004B; Sat, 5 May 2012 15:16:51 +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-r2.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: libreoffice-9999-r2.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: <20120505151651.D76032004B@flycatcher.gentoo.org> Date: Sat, 5 May 2012 15:16:51 +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: 27162ee9-6918-4c60-9924-113d6c8c14b0 X-Archives-Hash: bb975b73c8ad3ba943cd861b8a402284 scarabeus 12/05/05 15:16:51 Modified: libreoffice-9999-r2.ebuild ChangeLog Log: First attempt for wiki-publisher building. =20 (Portage version: 2.2.0_alpha101/cvs/Linux x86_64) Revision Changes Path 1.65 app-office/libreoffice/libreoffice-9999-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/libreoffice-9999-r2.ebuild?rev=3D1.65&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/libreoffice-9999-r2.ebuild?rev=3D1.65&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/libreoffice-9999-r2.ebuild?r1=3D1.64&r2=3D1.65 Index: libreoffice-9999-r2.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= -r2.ebuild,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- libreoffice-9999-r2.ebuild 5 May 2012 14:31:15 -0000 1.64 +++ libreoffice-9999-r2.ebuild 5 May 2012 15:16:51 -0000 1.65 @@ -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-99= 99-r2.ebuild,v 1.64 2012/05/05 14:31:15 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-99= 99-r2.ebuild,v 1.65 2012/05/05 15:16:51 scarabeus Exp $ =20 EAPI=3D4 =20 @@ -75,13 +75,12 @@ jemalloc kde mysql +nsplugin odk opengl postgres svg test +vba +webdav +xmlsec" =20 -LO_EXTS=3D"nlpsolver pdfimport presenter-console presenter-minimizer scr= ipting-beanshell scripting-javascript" +LO_EXTS=3D"nlpsolver pdfimport presenter-console presenter-minimizer scr= ipting-beanshell scripting-javascript wiki-publisher" # Unneeded extension (just can be separate package: # google-docs ; barcode ; diagram ; hunart ; numbertext ; oooblogger ; t= ypo ; # validator ; watch-window ; ct2n (requres two patches from lo tree -> r= epack) # Extensions that need extra work: # report-builder: missing java packages -# wiki-publisher: missing java packages for lo_xt in ${LO_EXTS}; do IUSE+=3D" libreoffice_extensions_${lo_xt}" done @@ -150,6 +149,13 @@ jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_pdfimport? ( >=3Dapp-text/poppler-0.16[xpdf-head= ers,cxx] ) libreoffice_extensions_scripting-beanshell? ( >=3Ddev-java/bsh-2.0_beta= 4 ) + libreoffice_extensions_wiki-publisher? ( + dev-java/commons-codec:0 + dev-java/commons-httpclient:3 + dev-java/commons-lang:2.1 + dev-java/commons-logging:0 + dev-java/tomcat-servlet-api:3.0 + ) mysql? ( >=3Ddev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) postgres? ( >=3Ddev-db/postgresql-base-8.4.0 ) @@ -223,6 +229,7 @@ libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) + libreoffice_extensions_wiki-publisher? ( java ) " =20 S=3D"${WORKDIR}/${PN}-core-${PV}" @@ -371,6 +378,15 @@ use libreoffice_extensions_scripting-beanshell && \ java_opts+=3D" --with-beanshell-jar=3D$(java-pkg_getjar bsh bsh.jar)" =20 + if use libreoffice_extensions_wiki-publisher; then + java_opts+=3D" + --with-commons-codec-jar=3D$(java-pkg_getjar commons-codec commons-c= odec.jar) + --with-commons-httpclient-jar=3D$(java-pkg_getjar commons-httpclient= -3 commons-httpclient.jar) + --with-commons-lang-jar=3D$(java-pkg_getjar commons-lang-2.1 commons= -lang.jar) + --with-servlet-api-jar=3D$(java-pkg_getjar tomcat-servlet-api-3.0 se= rvlet-api.jar) + " + fi + if use test; then java_opts+=3D" --with-junit=3D$(java-pkg_getjar junit-4 junit.jar)" else 1.304 app-office/libreoffice/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/ChangeLog?rev=3D1.304&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/ChangeLog?rev=3D1.304&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/ChangeLog?r1=3D1.303&r2=3D1.304 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.303 retrieving revision 1.304 diff -u -r1.303 -r1.304 --- ChangeLog 5 May 2012 14:31:15 -0000 1.303 +++ ChangeLog 5 May 2012 15:16:51 -0000 1.304 @@ -1,6 +1,9 @@ # 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.= 303 2012/05/05 14:31:15 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.= 304 2012/05/05 15:16:51 scarabeus Exp $ + + 05 May 2012; Tom=C3=A1=C5=A1 Chv=C3=A1tal libre= office-9999-r2.ebuild: + First attempt for wiki-publisher building. =20 05 May 2012; Tom=C3=A1=C5=A1 Chv=C3=A1tal libre= office-3.5.9999.ebuild, libreoffice-9999-r2.ebuild: