* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-3.5.9999.ebuild ChangeLog
@ 2012-02-28 9:30 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 9+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-02-28 9:30 UTC (permalink / raw
To: gentoo-commits
scarabeus 12/02/28 09:30:29
Modified: libreoffice-9999-r2.ebuild
libreoffice-3.5.9999.ebuild ChangeLog
Log:
Update the cups info.
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
Revision Changes Path
1.29 app-office/libreoffice/libreoffice-9999-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.28&r2=1.29
Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libreoffice-9999-r2.ebuild 27 Feb 2012 21:44:55 -0000 1.28
+++ libreoffice-9999-r2.ebuild 28 Feb 2012 09:30:29 -0000 1.29
@@ -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-9999-r2.ebuild,v 1.28 2012/02/27 21:44:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.29 2012/02/28 09:30:29 scarabeus Exp $
EAPI=4
@@ -499,7 +499,7 @@
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
use cups || \
- ewarn 'You will need net-print/cups to be able to print with libreoffice.'
+ ewarn 'You will need net-print/cups to be able to print and export to PDF with libreoffice.'
}
pkg_postrm() {
1.15 app-office/libreoffice/libreoffice-3.5.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?r1=1.14&r2=1.15
Index: libreoffice-3.5.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libreoffice-3.5.9999.ebuild 27 Feb 2012 21:29:20 -0000 1.14
+++ libreoffice-3.5.9999.ebuild 28 Feb 2012 09:30:29 -0000 1.15
@@ -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-3.5.9999.ebuild,v 1.14 2012/02/27 21:29:20 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.15 2012/02/28 09:30:29 scarabeus Exp $
EAPI=4
@@ -495,9 +495,8 @@
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
- if ! use cups ; then
- ewarn 'You will need net-print/cups to be able to print with libreoffice.'
- fi
+ use cups || \
+ ewarn 'You will need net-print/cups to be able to print and export to PDF with libreoffice.'
}
pkg_postrm() {
1.245 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.245&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.245&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.244&r2=1.245
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- ChangeLog 27 Feb 2012 21:56:30 -0000 1.244
+++ ChangeLog 28 Feb 2012 09:30:29 -0000 1.245
@@ -1,6 +1,10 @@
# 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.244 2012/02/27 21:56:30 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.245 2012/02/28 09:30:29 scarabeus Exp $
+
+ 28 Feb 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.9999.ebuild,
+ libreoffice-9999-r2.ebuild:
+ Update the cups info.
27 Feb 2012; Andreas K. Huettel <dilfridge@gentoo.org>
libreoffice-3.4.3.2-r1.ebuild, libreoffice-3.4.5.2.ebuild:
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-3.5.9999.ebuild ChangeLog
@ 2012-03-01 13:14 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 9+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-03-01 13:14 UTC (permalink / raw
To: gentoo-commits
scarabeus 12/03/01 13:14:47
Modified: libreoffice-9999-r2.ebuild
libreoffice-3.5.9999.ebuild ChangeLog
Log:
Try to make pyuno work with system python. (works here). Wrt bug#379227.
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
Revision Changes Path
1.32 app-office/libreoffice/libreoffice-9999-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.31&r2=1.32
Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- libreoffice-9999-r2.ebuild 29 Feb 2012 15:21:02 -0000 1.31
+++ libreoffice-9999-r2.ebuild 1 Mar 2012 13:14:47 -0000 1.32
@@ -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-9999-r2.ebuild,v 1.31 2012/02/29 15:21:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.32 2012/03/01 13:14:47 scarabeus Exp $
EAPI=4
@@ -194,6 +194,8 @@
"
PATCHES=(
+ # this can't be upstreamed :(
+ "${FILESDIR}/${PN}-system-pyuno.patch"
)
REQUIRED_USE="
@@ -300,6 +302,13 @@
eautoreconf
# hack in the autogen.sh
touch autogen.lastrun
+
+ # system pyuno mess
+ sed \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ -i pyuno/source/module/uno.py \
+ -i scripting/source/pyprov/officehelper.py || die
}
src_configure() {
1.18 app-office/libreoffice/libreoffice-3.5.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?r1=1.17&r2=1.18
Index: libreoffice-3.5.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libreoffice-3.5.9999.ebuild 29 Feb 2012 15:21:02 -0000 1.17
+++ libreoffice-3.5.9999.ebuild 1 Mar 2012 13:14:47 -0000 1.18
@@ -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-3.5.9999.ebuild,v 1.17 2012/02/29 15:21:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.18 2012/03/01 13:14:47 scarabeus Exp $
EAPI=4
@@ -155,8 +155,8 @@
"
# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
+# after everything upstream is under gbuild
+# as dmake execute tests right away
DEPEND="${COMMON_DEPEND}
>=dev-libs/boost-1.46
>=dev-libs/libxml2-2.7.8
@@ -191,6 +191,8 @@
"
PATCHES=(
+ # this can't be upstreamed :(
+ "${FILESDIR}/${PN}-system-pyuno.patch"
)
REQUIRED_USE="
@@ -220,7 +222,7 @@
pgslot=$(postgresql-config show)
if [[ ${pgslot//.} < 90 ]] ; then
eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
+ eerror " postgresql-config set 9.0"
die "PostgreSQL slot is not set to 9.0 or higher."
fi
fi
@@ -297,6 +299,13 @@
eautoreconf
# hack in the autogen.sh
touch autogen.lastrun
+ # system pyuno mess
+ sed \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ -i pyuno/source/module/uno.py \
+ -i scripting/source/pyprov/officehelper.py || die
+
}
src_configure() {
1.248 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.248&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.248&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.247&r2=1.248
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- ChangeLog 29 Feb 2012 15:21:02 -0000 1.247
+++ ChangeLog 1 Mar 2012 13:14:47 -0000 1.248
@@ -1,6 +1,11 @@
# 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.247 2012/02/29 15:21:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.248 2012/03/01 13:14:47 scarabeus Exp $
+
+ 01 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+ +files/libreoffice-system-pyuno.patch, libreoffice-3.5.9999.ebuild,
+ libreoffice-9999-r2.ebuild:
+ Try to make pyuno work with system python. (works here). Wrt bug#379227.
29 Feb 2012; Tomáš Chvátal <scarabeus@gentoo.org>
libreoffice-3.4.3.2-r1.ebuild, libreoffice-3.4.5.2.ebuild,
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-3.5.9999.ebuild ChangeLog
@ 2012-03-18 12:24 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 9+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-03-18 12:24 UTC (permalink / raw
To: gentoo-commits
scarabeus 12/03/18 12:24:42
Modified: libreoffice-9999-r2.ebuild
libreoffice-3.5.9999.ebuild ChangeLog
Log:
Disable crashdump as it is usefull on windows only anyway.
(Portage version: 2.2.0_alpha91/cvs/Linux x86_64)
Revision Changes Path
1.36 app-office/libreoffice/libreoffice-9999-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.35&r2=1.36
Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- libreoffice-9999-r2.ebuild 18 Mar 2012 12:12:14 -0000 1.35
+++ libreoffice-9999-r2.ebuild 18 Mar 2012 12:24:42 -0000 1.36
@@ -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-9999-r2.ebuild,v 1.35 2012/03/18 12:12:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.36 2012/03/18 12:24:42 scarabeus Exp $
EAPI=4
@@ -70,7 +70,7 @@
unset EXT_URI
unset ADDONS_SRC
-IUSE="binfilter +branding +cups dbus debug eds gnome +graphite gstreamer +gtk gtk3
+IUSE="binfilter +branding +cups dbus eds gnome +graphite gstreamer +gtk gtk3
jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba
+webdav +xmlsec"
LICENSE="LGPL-3"
@@ -215,7 +215,7 @@
if [[ ${MERGE_TYPE} != binary ]]; then
CHECKREQS_MEMORY="512M"
- use debug && CHECKREQS_DISK_BUILD="10G" || CHECKREQS_DISK_BUILD="6G"
+ CHECKREQS_DISK_BUILD="6G"
check-reqs_pkg_pretend
if [[ $(gcc-major-version) -lt 4 ]]; then
@@ -415,6 +415,7 @@
--disable-rpath \
--disable-strip-solver \
--disable-zenity \
+ --disable-crashdump \
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
--with-build-version="Gentoo official package" \
--enable-extension-integration \
@@ -440,7 +441,6 @@
--without-sun-templates \
$(use_enable binfilter) \
$(use_enable dbus) \
- $(use_enable debug crashdump) \
$(use_enable eds evolution2) \
$(use_enable gnome gconf) \
$(use_enable gnome gio) \
1.25 app-office/libreoffice/libreoffice-3.5.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?r1=1.24&r2=1.25
Index: libreoffice-3.5.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libreoffice-3.5.9999.ebuild 18 Mar 2012 12:12:14 -0000 1.24
+++ libreoffice-3.5.9999.ebuild 18 Mar 2012 12:24:42 -0000 1.25
@@ -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-3.5.9999.ebuild,v 1.24 2012/03/18 12:12:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.25 2012/03/18 12:24:42 scarabeus Exp $
EAPI=4
@@ -70,7 +70,7 @@
unset EXT_URI
unset ADDONS_SRC
-IUSE="binfilter +branding +cups dbus debug eds gnome +graphite gstreamer +gtk
+IUSE="binfilter +branding +cups dbus eds gnome +graphite gstreamer +gtk
jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba
+webdav +xmlsec"
LICENSE="LGPL-3"
@@ -210,7 +210,7 @@
if [[ ${MERGE_TYPE} != binary ]]; then
CHECKREQS_MEMORY="512M"
- use debug && CHECKREQS_DISK_BUILD="10G" || CHECKREQS_DISK_BUILD="6G"
+ CHECKREQS_DISK_BUILD="6G"
check-reqs_pkg_pretend
if [[ $(gcc-major-version) -lt 4 ]]; then
@@ -415,6 +415,7 @@
--disable-strip-solver \
--disable-ugly \
--disable-zenity \
+ --disable-crashdump \
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
--with-build-version="Gentoo official package" \
--enable-extension-integration \
@@ -440,7 +441,6 @@
--without-sun-templates \
$(use_enable binfilter) \
$(use_enable dbus) \
- $(use_enable debug crashdump) \
$(use_enable eds evolution2) \
$(use_enable gnome gconf) \
$(use_enable gnome gio) \
1.258 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.258&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.258&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.257&r2=1.258
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- ChangeLog 18 Mar 2012 12:12:14 -0000 1.257
+++ ChangeLog 18 Mar 2012 12:24:42 -0000 1.258
@@ -1,6 +1,10 @@
# 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.257 2012/03/18 12:12:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.258 2012/03/18 12:24:42 scarabeus Exp $
+
+ 18 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.9999.ebuild,
+ libreoffice-9999-r2.ebuild:
+ Disable crashdump as it is usefull on windows only anyway.
18 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.1.2.ebuild,
libreoffice-3.5.9999.ebuild, libreoffice-9999-r2.ebuild:
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-3.5.9999.ebuild ChangeLog
@ 2012-03-18 13:36 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 9+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-03-18 13:36 UTC (permalink / raw
To: gentoo-commits
scarabeus 12/03/18 13:36:49
Modified: libreoffice-9999-r2.ebuild
libreoffice-3.5.9999.ebuild ChangeLog
Log:
Once disable is enough. Thanks to iamnr3 on irc.
(Portage version: 2.2.0_alpha91/cvs/Linux x86_64)
Revision Changes Path
1.37 app-office/libreoffice/libreoffice-9999-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.36&r2=1.37
Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- libreoffice-9999-r2.ebuild 18 Mar 2012 12:24:42 -0000 1.36
+++ libreoffice-9999-r2.ebuild 18 Mar 2012 13:36:48 -0000 1.37
@@ -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-9999-r2.ebuild,v 1.36 2012/03/18 12:24:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.37 2012/03/18 13:36:48 scarabeus Exp $
EAPI=4
@@ -415,7 +415,6 @@
--disable-rpath \
--disable-strip-solver \
--disable-zenity \
- --disable-crashdump \
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
--with-build-version="Gentoo official package" \
--enable-extension-integration \
1.26 app-office/libreoffice/libreoffice-3.5.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?r1=1.25&r2=1.26
Index: libreoffice-3.5.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libreoffice-3.5.9999.ebuild 18 Mar 2012 12:24:42 -0000 1.25
+++ libreoffice-3.5.9999.ebuild 18 Mar 2012 13:36:48 -0000 1.26
@@ -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-3.5.9999.ebuild,v 1.25 2012/03/18 12:24:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.26 2012/03/18 13:36:48 scarabeus Exp $
EAPI=4
@@ -415,7 +415,6 @@
--disable-strip-solver \
--disable-ugly \
--disable-zenity \
- --disable-crashdump \
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
--with-build-version="Gentoo official package" \
--enable-extension-integration \
1.259 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.259&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.259&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.258&r2=1.259
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- ChangeLog 18 Mar 2012 12:24:42 -0000 1.258
+++ ChangeLog 18 Mar 2012 13:36:48 -0000 1.259
@@ -1,6 +1,10 @@
# 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.258 2012/03/18 12:24:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.259 2012/03/18 13:36:48 scarabeus Exp $
+
+ 18 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.9999.ebuild,
+ libreoffice-9999-r2.ebuild:
+ Once disable is enough. Thanks to iamnr3 on irc.
18 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.9999.ebuild,
libreoffice-9999-r2.ebuild:
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-3.5.9999.ebuild ChangeLog
@ 2012-03-27 16:08 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 9+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-03-27 16:08 UTC (permalink / raw
To: gentoo-commits
scarabeus 12/03/27 16:08:17
Modified: libreoffice-9999-r2.ebuild
libreoffice-3.5.9999.ebuild ChangeLog
Log:
Copy the themes every time, it is just few images in the end.
(Portage version: 2.2.0_alpha95/cvs/Linux x86_64)
Revision Changes Path
1.40 app-office/libreoffice/libreoffice-9999-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.39&r2=1.40
Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- libreoffice-9999-r2.ebuild 22 Mar 2012 15:07:05 -0000 1.39
+++ libreoffice-9999-r2.ebuild 27 Mar 2012 16:08:17 -0000 1.40
@@ -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-9999-r2.ebuild,v 1.39 2012/03/22 15:07:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.40 2012/03/27 16:08:17 scarabeus Exp $
EAPI=4
@@ -318,16 +318,11 @@
src_configure() {
local java_opts
local internal_libs
- local themes="default"
local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
# recheck that there is some value in jobs
[[ -z ${jbs} ]] && jbs="1"
- # expand themes we are going to build based on DE useflags
- use gnome && themes+=" tango"
- use kde && themes+=" oxygen"
-
# sane: just sane.h header that is used for scan in writer, not
# linked or anything else, worthless to depend on
# vigra: just uses templates from there
@@ -425,7 +420,6 @@
--with-lang="" \
--with-max-jobs=${jbs} \
--with-num-cpus=${jbs} \
- --with-theme="${themes}" \
--with-unix-wrapper=libreoffice \
--with-vendor="Gentoo Foundation" \
--with-x \
1.29 app-office/libreoffice/libreoffice-3.5.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?r1=1.28&r2=1.29
Index: libreoffice-3.5.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libreoffice-3.5.9999.ebuild 22 Mar 2012 15:07:05 -0000 1.28
+++ libreoffice-3.5.9999.ebuild 27 Mar 2012 16:08:17 -0000 1.29
@@ -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-3.5.9999.ebuild,v 1.28 2012/03/22 15:07:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.29 2012/03/27 16:08:17 scarabeus Exp $
EAPI=4
@@ -312,16 +312,11 @@
src_configure() {
local java_opts
local internal_libs
- local themes="default"
local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
# recheck that there is some value in jobs
[[ -z ${jbs} ]] && jbs="1"
- # expand themes we are going to build based on DE useflags
- use gnome && themes+=" tango"
- use kde && themes+=" oxygen"
-
# sane: just sane.h header that is used for scan in writer, not
# linked or anything else, worthless to depend on
# vigra: just uses templates from there
@@ -424,7 +419,6 @@
--with-lang="" \
--with-max-jobs=${jbs} \
--with-num-cpus=2 \
- --with-theme="${themes}" \
--with-unix-wrapper=libreoffice \
--with-vendor="Gentoo Foundation" \
--with-x \
1.263 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.263&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.263&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.262&r2=1.263
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- ChangeLog 22 Mar 2012 15:07:05 -0000 1.262
+++ ChangeLog 27 Mar 2012 16:08:17 -0000 1.263
@@ -1,6 +1,10 @@
# 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.262 2012/03/22 15:07:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.263 2012/03/27 16:08:17 scarabeus Exp $
+
+ 27 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.9999.ebuild,
+ libreoffice-9999-r2.ebuild:
+ Copy the themes every time, it is just few images in the end.
22 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org>
libreoffice-3.4.3.2-r1.ebuild, libreoffice-3.4.5.2.ebuild,
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-3.5.9999.ebuild ChangeLog
@ 2012-03-28 11:58 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 9+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-03-28 11:58 UTC (permalink / raw
To: gentoo-commits
scarabeus 12/03/28 11:58:26
Modified: libreoffice-9999-r2.ebuild
libreoffice-3.5.9999.ebuild ChangeLog
Log:
Curl actually is rdepend.
(Portage version: 2.2.0_alpha96/cvs/Linux x86_64)
Revision Changes Path
1.42 app-office/libreoffice/libreoffice-9999-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.41&r2=1.42
Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- libreoffice-9999-r2.ebuild 28 Mar 2012 08:30:48 -0000 1.41
+++ libreoffice-9999-r2.ebuild 28 Mar 2012 11:58:26 -0000 1.42
@@ -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-9999-r2.ebuild,v 1.41 2012/03/28 08:30:48 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.42 2012/03/28 11:58:26 scarabeus Exp $
EAPI=4
@@ -109,6 +109,7 @@
>=media-libs/libpng-1.4
media-libs/libcdr
media-libs/libvisio
+ >=net-misc/curl-7.21.4
sci-mathematics/lpsolve
>=sys-libs/db-4.8
virtual/jpeg
@@ -175,7 +176,6 @@
dev-util/mdds
>=dev-util/pkgconfig-0.26
media-libs/sampleicc
- >=net-misc/curl-7.21.4
net-misc/npapi-sdk
net-print/cups
>=sys-apps/findutils-4.4.2
1.31 app-office/libreoffice/libreoffice-3.5.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?r1=1.30&r2=1.31
Index: libreoffice-3.5.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- libreoffice-3.5.9999.ebuild 28 Mar 2012 08:30:48 -0000 1.30
+++ libreoffice-3.5.9999.ebuild 28 Mar 2012 11:58:26 -0000 1.31
@@ -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-3.5.9999.ebuild,v 1.30 2012/03/28 08:30:48 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.31 2012/03/28 11:58:26 scarabeus Exp $
EAPI=4
@@ -104,6 +104,7 @@
media-libs/freetype:2
>=media-libs/libpng-1.4
media-libs/libvisio
+ >=net-misc/curl-7.21.4
sci-mathematics/lpsolve
>=sys-libs/db-4.8
virtual/jpeg
@@ -168,7 +169,6 @@
dev-util/mdds
>=dev-util/pkgconfig-0.26
media-libs/sampleicc
- >=net-misc/curl-7.21.4
net-misc/npapi-sdk
net-print/cups
>=sys-apps/findutils-4.4.2
1.265 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.265&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.265&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.264&r2=1.265
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- ChangeLog 28 Mar 2012 08:30:48 -0000 1.264
+++ ChangeLog 28 Mar 2012 11:58:26 -0000 1.265
@@ -1,6 +1,10 @@
# 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.264 2012/03/28 08:30:48 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.265 2012/03/28 11:58:26 scarabeus Exp $
+
+ 28 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.9999.ebuild,
+ libreoffice-9999-r2.ebuild:
+ Curl actually is rdepend.
28 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.9999.ebuild,
libreoffice-9999-r2.ebuild, metadata.xml:
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-3.5.9999.ebuild ChangeLog
@ 2012-05-05 14:31 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 9+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-05-05 14:31 UTC (permalink / raw
To: gentoo-commits
scarabeus 12/05/05 14:31:15
Modified: libreoffice-9999-r2.ebuild
libreoffice-3.5.9999.ebuild ChangeLog
Log:
Distribute help images wrt offlinehelp. Thanks to geki and his work on this.
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Revision Changes Path
1.64 app-office/libreoffice/libreoffice-9999-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.64&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.64&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.63&r2=1.64
Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- libreoffice-9999-r2.ebuild 5 May 2012 10:30:08 -0000 1.63
+++ libreoffice-9999-r2.ebuild 5 May 2012 14:31:15 -0000 1.64
@@ -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-9999-r2.ebuild,v 1.63 2012/05/05 10:30:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.64 2012/05/05 14:31:15 scarabeus Exp $
EAPI=4
@@ -37,7 +37,8 @@
# Split modules following git/tarballs
# Core MUST be first!
-MODULES="core binfilter"
+# Help is used for the image generator
+MODULES="core binfilter help"
# Only release has the tarballs
if [[ ${PV} != *9999* ]]; then
for i in ${DEV_URI}; do
@@ -486,6 +487,22 @@
}
src_compile() {
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ source "${S}/config_host.mk" 2&> /dev/null
+
+ local path="${SOLARVER}/${INPATH}/res/img"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=icon-themes/galaxy/res/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
# this is not a proper make script
make build || die
}
@@ -517,7 +534,7 @@
# It is broken because we send --without-help
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/main_transform.xsl
+ doins xmlhelp/util/*.xsl
}
pkg_preinst() {
1.41 app-office/libreoffice/libreoffice-3.5.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.41&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.41&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?r1=1.40&r2=1.41
Index: libreoffice-3.5.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- libreoffice-3.5.9999.ebuild 3 May 2012 20:00:40 -0000 1.40
+++ libreoffice-3.5.9999.ebuild 5 May 2012 14:31:15 -0000 1.41
@@ -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-3.5.9999.ebuild,v 1.40 2012/05/03 20:00:40 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.41 2012/05/05 14:31:15 scarabeus Exp $
EAPI=4
@@ -37,7 +37,7 @@
# Split modules following git/tarballs
# Core MUST be first!
-MODULES="core binfilter"
+MODULES="core binfilter help"
# Only release has the tarballs
if [[ ${PV} != *9999* ]]; then
for i in ${DEV_URI}; do
@@ -156,8 +156,8 @@
"
# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
+# after everything upstream is under gbuild
+# as dmake execute tests right away
DEPEND="${COMMON_DEPEND}
>=dev-libs/boost-1.46
>=dev-libs/libxml2-2.7.8
@@ -323,10 +323,10 @@
[[ -z ${jbs} ]] && jbs="1"
# sane: just sane.h header that is used for scan in writer, not
- # linked or anything else, worthless to depend on
+ # linked or anything else, worthless to depend on
# vigra: just uses templates from there
- # it is serious pain in the ass for packaging
- # should be replaced by boost::gil if someone interested
+ # it is serious pain in the ass for packaging
+ # should be replaced by boost::gil if someone interested
internal_libs+="
--without-system-sane
--without-system-vigra
@@ -468,7 +468,23 @@
}
src_compile() {
- # this is not a proper make script and the jobs are passed during configure
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ source "${S}/Env.host.sh" 2&> /dev/null
+
+ local path="${SOLARVER}/${INPATH}/res/img"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=default_images/res/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=default_images/res/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ # not a proper make script
make build || die
}
@@ -498,7 +514,7 @@
# It is broken because we send --without-help
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/main_transform.xsl
+ doins xmlhelp/util/*.xsl
}
pkg_preinst() {
1.303 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.303&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.303&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.302&r2=1.303
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -r1.302 -r1.303
--- ChangeLog 5 May 2012 10:30:08 -0000 1.302
+++ ChangeLog 5 May 2012 14:31:15 -0000 1.303
@@ -1,6 +1,10 @@
# 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.302 2012/05/05 10:30:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.303 2012/05/05 14:31:15 scarabeus Exp $
+
+ 05 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.9999.ebuild,
+ libreoffice-9999-r2.ebuild:
+ Distribute help images wrt offlinehelp. Thanks to geki and his work on this.
05 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild:
Require beanshel/rhino only when building the specified extensions.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-3.5.9999.ebuild ChangeLog
@ 2012-05-23 8:45 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 9+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-05-23 8:45 UTC (permalink / raw
To: gentoo-commits
scarabeus 12/05/23 08:45:10
Modified: libreoffice-9999-r2.ebuild
libreoffice-3.5.9999.ebuild ChangeLog
Log:
Fix whitespace.
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Revision Changes Path
1.74 app-office/libreoffice/libreoffice-9999-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.74&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.74&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.73&r2=1.74
Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- libreoffice-9999-r2.ebuild 13 May 2012 21:36:04 -0000 1.73
+++ libreoffice-9999-r2.ebuild 23 May 2012 08:45:10 -0000 1.74
@@ -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-9999-r2.ebuild,v 1.73 2012/05/13 21:36:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.74 2012/05/23 08:45:10 scarabeus Exp $
EAPI=4
@@ -254,7 +254,7 @@
if use postgres; then
pgslot=$(postgresql-config show)
if [[ ${pgslot//.} < 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
+ eerror "PostgreSQL slot must be set to 9.0 or higher."
eerror " postgresql-config set 9.0"
die "PostgreSQL slot is not set to 9.0 or higher."
fi
1.46 app-office/libreoffice/libreoffice-3.5.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.46&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.46&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?r1=1.45&r2=1.46
Index: libreoffice-3.5.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- libreoffice-3.5.9999.ebuild 13 May 2012 21:36:04 -0000 1.45
+++ libreoffice-3.5.9999.ebuild 23 May 2012 08:45:10 -0000 1.46
@@ -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-3.5.9999.ebuild,v 1.45 2012/05/13 21:36:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.46 2012/05/23 08:45:10 scarabeus Exp $
EAPI=4
@@ -227,7 +227,7 @@
if use postgres; then
pgslot=$(postgresql-config show)
if [[ ${pgslot//.} < 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
+ eerror "PostgreSQL slot must be set to 9.0 or higher."
eerror " postgresql-config set 9.0"
die "PostgreSQL slot is not set to 9.0 or higher."
fi
1.317 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.317&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.317&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.316&r2=1.317
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -r1.316 -r1.317
--- ChangeLog 23 May 2012 00:22:24 -0000 1.316
+++ ChangeLog 23 May 2012 08:45:10 -0000 1.317
@@ -1,6 +1,10 @@
# 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.316 2012/05/23 00:22:24 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.317 2012/05/23 08:45:10 scarabeus Exp $
+
+ 23 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.9999.ebuild,
+ libreoffice-9999-r2.ebuild:
+ Fix whitespace.
*libreoffice-3.5.4.2 (23 May 2012)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-3.5.9999.ebuild ChangeLog
@ 2012-05-31 14:20 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 9+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-05-31 14:20 UTC (permalink / raw
To: gentoo-commits
scarabeus 12/05/31 14:20:25
Modified: libreoffice-9999-r2.ebuild
libreoffice-3.5.9999.ebuild ChangeLog
Log:
Do not depend on orbit as we do not need that.
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
Revision Changes Path
1.75 app-office/libreoffice/libreoffice-9999-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.75&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.75&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.74&r2=1.75
Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- libreoffice-9999-r2.ebuild 23 May 2012 08:45:10 -0000 1.74
+++ libreoffice-9999-r2.ebuild 31 May 2012 14:20:25 -0000 1.75
@@ -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-9999-r2.ebuild,v 1.74 2012/05/23 08:45:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.75 2012/05/31 14:20:25 scarabeus Exp $
EAPI=4
@@ -134,10 +134,7 @@
cups? ( net-print/cups )
dbus? ( >=dev-libs/dbus-glib-0.92 )
eds? ( gnome-extra/evolution-data-server )
- gnome? (
- gnome-base/gconf:2
- gnome-base/orbit
- )
+ gnome? ( gnome-base/gconf:2 )
gtk? (
x11-libs/gdk-pixbuf[X]
>=x11-libs/gtk+-2.24:2
1.48 app-office/libreoffice/libreoffice-3.5.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?r1=1.47&r2=1.48
Index: libreoffice-3.5.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- libreoffice-3.5.9999.ebuild 29 May 2012 09:02:19 -0000 1.47
+++ libreoffice-3.5.9999.ebuild 31 May 2012 14:20:25 -0000 1.48
@@ -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-3.5.9999.ebuild,v 1.47 2012/05/29 09:02:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.48 2012/05/31 14:20:25 scarabeus Exp $
EAPI=4
@@ -114,10 +114,7 @@
x11-libs/libXrender
dbus? ( >=dev-libs/dbus-glib-0.92 )
eds? ( gnome-extra/evolution-data-server )
- gnome? (
- gnome-base/gconf:2
- gnome-base/orbit
- )
+ gnome? ( gnome-base/gconf:2 )
gtk? ( >=x11-libs/gtk+-2.24:2 )
graphite? ( media-gfx/graphite2 )
gstreamer? (
1.324 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.324&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.324&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.323&r2=1.324
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- ChangeLog 31 May 2012 11:45:48 -0000 1.323
+++ ChangeLog 31 May 2012 14:20:25 -0000 1.324
@@ -1,6 +1,10 @@
# 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.323 2012/05/31 11:45:48 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.324 2012/05/31 14:20:25 scarabeus Exp $
+
+ 31 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.9999.ebuild,
+ libreoffice-9999-r2.ebuild:
+ Do not depend on orbit as we do not need that.
31 May 2012; Andreas Schuerch <nativemad@gentoo.org>
libreoffice-3.5.4.2-r1.ebuild:
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-05-31 14:21 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-31 14:20 [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-3.5.9999.ebuild ChangeLog Tomas Chvatal (scarabeus)
-- strict thread matches above, loose matches on Subject: below --
2012-05-23 8:45 Tomas Chvatal (scarabeus)
2012-05-05 14:31 Tomas Chvatal (scarabeus)
2012-03-28 11:58 Tomas Chvatal (scarabeus)
2012-03-27 16:08 Tomas Chvatal (scarabeus)
2012-03-18 13:36 Tomas Chvatal (scarabeus)
2012-03-18 12:24 Tomas Chvatal (scarabeus)
2012-03-01 13:14 Tomas Chvatal (scarabeus)
2012-02-28 9:30 Tomas Chvatal (scarabeus)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox