| 1 |
scarabeus 13/03/04 20:53:22 |
| 2 |
|
| 3 |
Modified: libreoffice-9999-r2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Few cleanups in live ebuild to match upstream no longer using dmake. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha165/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.160 app-office/libreoffice/libreoffice-9999-r2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.160&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.160&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.159&r2=1.160 |
| 15 |
|
| 16 |
Index: libreoffice-9999-r2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v |
| 19 |
retrieving revision 1.159 |
| 20 |
retrieving revision 1.160 |
| 21 |
diff -u -r1.159 -r1.160 |
| 22 |
--- libreoffice-9999-r2.ebuild 31 Jan 2013 15:36:23 -0000 1.159 |
| 23 |
+++ libreoffice-9999-r2.ebuild 4 Mar 2013 20:53:22 -0000 1.160 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.159 2013/01/31 15:36:23 scarabeus Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.160 2013/03/04 20:53:22 scarabeus Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
@@ -227,7 +227,6 @@ |
| 33 |
PATCHES=( |
| 34 |
# not upstreamable stuff |
| 35 |
"${FILESDIR}/${PN}-3.7-system-pyuno.patch" |
| 36 |
- "${FILESDIR}/${PN}-3.7-separate-checks.patch" |
| 37 |
) |
| 38 |
|
| 39 |
REQUIRED_USE=" |
| 40 |
@@ -313,8 +312,6 @@ |
| 41 |
|
| 42 |
src_prepare() { |
| 43 |
# optimization flags |
| 44 |
- export ARCH_FLAGS="${CXXFLAGS}" |
| 45 |
- export LINKFLAGSOPTIMIZE="${LDFLAGS}" |
| 46 |
export GMAKE_OPTIONS="${MAKEOPTS}" |
| 47 |
|
| 48 |
# patchset |
| 49 |
@@ -338,6 +335,13 @@ |
| 50 |
-e "s:%libdir%:$(get_libdir):g" \ |
| 51 |
-i pyuno/source/module/uno.py \ |
| 52 |
-i scripting/source/pyprov/officehelper.py || die |
| 53 |
+ # sed in the tests |
| 54 |
+ sed -i \ |
| 55 |
+ -e 's#all : build unitcheck#all : build#g' \ |
| 56 |
+ solenv/gbuild/Module.mk || die |
| 57 |
+ sed -i \ |
| 58 |
+ -e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \ |
| 59 |
+ Makefile.in || die |
| 60 |
} |
| 61 |
|
| 62 |
src_configure() { |
| 63 |
@@ -376,7 +380,6 @@ |
| 64 |
--without-system-hsqldb |
| 65 |
--with-ant-home="${ANT_HOME}" |
| 66 |
--with-jdk-home=$(java-config --jdk-home 2>/dev/null) |
| 67 |
- --with-java-target-version=$(java-pkg_get-target) |
| 68 |
--with-jvm-path="${EPREFIX}/usr/$(get_libdir)/" |
| 69 |
" |
| 70 |
|
| 71 |
@@ -420,7 +423,6 @@ |
| 72 |
# --disable-rpath: relative runtime path is not desired |
| 73 |
# --disable-systray: quickstarter does not actually work at all so do not |
| 74 |
# promote it |
| 75 |
- # --disable-zenity: disable build icon |
| 76 |
# --enable-extension-integration: enable any extension integration support |
| 77 |
# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs |
| 78 |
# --disable-ext-report-builder: too much java packages pulled in |
| 79 |
@@ -453,7 +455,6 @@ |
| 80 |
--disable-online-update \ |
| 81 |
--disable-rpath \ |
| 82 |
--disable-systray \ |
| 83 |
- --disable-zenity \ |
| 84 |
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \ |
| 85 |
--with-build-version="Gentoo official package" \ |
| 86 |
--enable-extension-integration \ |
| 87 |
|
| 88 |
|
| 89 |
|
| 90 |
1.443 app-office/libreoffice/ChangeLog |
| 91 |
|
| 92 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.443&view=markup |
| 93 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.443&content-type=text/plain |
| 94 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.442&r2=1.443 |
| 95 |
|
| 96 |
Index: ChangeLog |
| 97 |
=================================================================== |
| 98 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v |
| 99 |
retrieving revision 1.442 |
| 100 |
retrieving revision 1.443 |
| 101 |
diff -u -r1.442 -r1.443 |
| 102 |
--- ChangeLog 16 Feb 2013 13:18:10 -0000 1.442 |
| 103 |
+++ ChangeLog 4 Mar 2013 20:53:22 -0000 1.443 |
| 104 |
@@ -1,6 +1,9 @@ |
| 105 |
# ChangeLog for app-office/libreoffice |
| 106 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 107 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.442 2013/02/16 13:18:10 gienah Exp $ |
| 108 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.443 2013/03/04 20:53:22 scarabeus Exp $ |
| 109 |
+ |
| 110 |
+ 04 Mar 2013; Tomáš Chvátal <scarabeus@g.o> libreoffice-9999-r2.ebuild: |
| 111 |
+ Few cleanups in live ebuild to match upstream no longer using dmake. |
| 112 |
|
| 113 |
16 Feb 2013; Mark Wright <gienah@g.o> |
| 114 |
+files/libreoffice-3.6.4.3-boost-1.53.0.patch, |
Archives