From: "Tomas Chvatal (scarabeus)" <scarabeus@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r1.ebuild ChangeLog
Date: Sat, 17 Sep 2011 01:26:38 +0000 (UTC) [thread overview]
Message-ID: <20110917012638.9190F2004C@flycatcher.gentoo.org> (raw)
scarabeus 11/09/17 01:26:38
Modified: libreoffice-9999-r1.ebuild ChangeLog
Log:
Cleanup the build a bit to reflect the changes in the buildsystem.
(Portage version: 2.2.0_alpha58/cvs/Linux x86_64)
Revision Changes Path
1.10 app-office/libreoffice/libreoffice-9999-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?r1=1.9&r2=1.10
Index: libreoffice-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libreoffice-9999-r1.ebuild 16 Sep 2011 08:51:58 -0000 1.9
+++ libreoffice-9999-r1.ebuild 17 Sep 2011 01:26:38 -0000 1.10
@@ -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-9999-r1.ebuild,v 1.9 2011/09/16 08:51:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.10 2011/09/17 01:26:38 scarabeus Exp $
EAPI=3
@@ -49,7 +49,6 @@
# addons
# FIXME: actually review which one of these are used
-ADDONS_SRC+=" ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
ADDONS_SRC+=" ${ADDONS_URI}/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"
ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"
@@ -130,10 +129,11 @@
>=dev-libs/openssl-0.9.8g
dev-libs/redland[ssl]
>=dev-python/translate-toolkit-1.8.0
- media-libs/freetype:2
>=media-libs/fontconfig-2.3.0
- >=media-libs/vigra-1.7
+ media-libs/freetype:2
>=media-libs/libpng-1.4
+ media-libs/libvisio
+ >=media-libs/vigra-1.7
net-print/cups
sci-mathematics/lpsolve
>=sys-libs/db-4.8
@@ -339,6 +339,8 @@
base_src_prepare
eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
}
src_configure() {
@@ -362,26 +364,19 @@
--enable-ext-presenter-minimizer
"
- # hsqldb: requires just 1.8.0 not 1.8.1 which we don't ship at all
# dmake: not worth of splitting out
# cppunit: patched not to run anything, just main() { return 0; }
# workaround to upstream running the tests during build
# sane: just sane.h header that is used for scan in writer, not
# linked or anything else, worthless to depend on
internal_libs+="
- --without-system-hsqldb
--without-system-cppunit
--without-system-sane
"
- # When building without java some things needs to be done
- # as internal libraries.
- if ! use java; then
- internal_libs+="
- --without-junit
- "
- else
+ if use java; then
java_opts="
+ --without-system-hsqldb
--with-ant-home="${ANT_HOME}"
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
--with-java-target-version=$(java-pkg_get-target)
@@ -432,6 +427,9 @@
--with-system-jars \
--with-system-db \
--with-system-dicts \
+ --with-system-libvisio \
+ --with-system-libtextcat --with-external-libtextcat-data \
+ --with-system-translate-toolkit \
--enable-cairo-canvas \
--enable-largefile \
--enable-python=system \
1.134 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.134&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.134&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.133&r2=1.134
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- ChangeLog 16 Sep 2011 08:51:58 -0000 1.133
+++ ChangeLog 17 Sep 2011 01:26:38 -0000 1.134
@@ -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.133 2011/09/16 08:51:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.134 2011/09/17 01:26:38 scarabeus Exp $
+
+ 17 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ libreoffice-9999-r1.ebuild:
+ Cleanup the build a bit to reflect the changes in the buildsystem.
16 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
libreoffice-9999-r1.ebuild:
next reply other threads:[~2011-09-17 1:26 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-17 1:26 Tomas Chvatal (scarabeus) [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-11-11 14:54 [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r1.ebuild ChangeLog Tomas Chvatal (scarabeus)
2011-11-09 10:12 Tomas Chvatal (scarabeus)
2011-11-08 11:03 Tomas Chvatal (scarabeus)
2011-11-02 18:27 Tomas Chvatal (scarabeus)
2011-11-02 18:18 Tomas Chvatal (scarabeus)
2011-10-27 17:23 Tomas Chvatal (scarabeus)
2011-10-21 7:56 Tomas Chvatal (scarabeus)
2011-10-11 12:38 Tomas Chvatal (scarabeus)
2011-10-06 14:24 Tomas Chvatal (scarabeus)
2011-10-06 14:20 Tomas Chvatal (scarabeus)
2011-10-05 9:25 Tomas Chvatal (scarabeus)
2011-10-04 19:19 Tomas Chvatal (scarabeus)
2011-10-04 8:38 Tomas Chvatal (scarabeus)
2011-10-03 9:28 Tomas Chvatal (scarabeus)
2011-10-03 8:58 Tomas Chvatal (scarabeus)
2011-09-30 11:47 Tomas Chvatal (scarabeus)
2011-09-30 10:45 Tomas Chvatal (scarabeus)
2011-09-30 10:42 Tomas Chvatal (scarabeus)
2011-09-30 8:25 Tomas Chvatal (scarabeus)
2011-09-29 13:20 Tomas Chvatal (scarabeus)
2011-09-26 14:10 Tomas Chvatal (scarabeus)
2011-09-25 13:06 Tomas Chvatal (scarabeus)
2011-09-23 14:44 Tomas Chvatal (scarabeus)
2011-09-23 14:35 Tomas Chvatal (scarabeus)
2011-09-23 12:46 Tomas Chvatal (scarabeus)
2011-09-22 12:39 Tomas Chvatal (scarabeus)
2011-09-22 11:00 Tomas Chvatal (scarabeus)
2011-09-20 16:01 Tomas Chvatal (scarabeus)
2011-09-18 9:45 Tomas Chvatal (scarabeus)
2011-09-17 10:32 Tomas Chvatal (scarabeus)
2011-09-17 3:58 Tomas Chvatal (scarabeus)
2011-09-17 3:46 Tomas Chvatal (scarabeus)
2011-09-17 3:44 Tomas Chvatal (scarabeus)
2011-09-17 3:28 Tomas Chvatal (scarabeus)
2011-09-16 8:51 Tomas Chvatal (scarabeus)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110917012638.9190F2004C@flycatcher.gentoo.org \
--to=scarabeus@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox