public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.2.2.ebuild ChangeLog
@ 2011-07-24 12:30 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 17+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-07-24 12:30 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/07/24 12:30:38

  Modified:             libreoffice-3.4.2.2.ebuild ChangeLog
  Log:
  Silence repoman warnings.
  
  (Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  app-office/libreoffice/libreoffice-3.4.2.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?r1=1.1&r2=1.2

Index: libreoffice-3.4.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libreoffice-3.4.2.2.ebuild	24 Jul 2011 12:25:53 -0000	1.1
+++ libreoffice-3.4.2.2.ebuild	24 Jul 2011 12:30:38 -0000	1.2
@@ -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-3.4.2.2.ebuild,v 1.1 2011/07/24 12:25:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.2 2011/07/24 12:30:38 scarabeus Exp $
 
 EAPI=3
 
@@ -81,17 +81,6 @@
 ADDONS_SRC+=" http://www.numbertext.org/linux/881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip"
 SRC_URI+=" ${ADDONS_SRC}"
 
-# translations
-LANGUAGES="af ar as ast be bg bn bo br brx bs ca ca_XV cs cy da de dgo dz el
-en en_GB en_ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km
-kn kok ko ks ku lo lt lv mai mk ml mn mni mr my nb ne nl nn nr nso oc or
-pa_IN pl pt pt_BR ro ru rw sat sd sh sk sl sq sr ss st sv sw_TZ ta te tg
-th tn tr ts ug uk uz ve vi xh zh_CN zh_TW zu"
-for X in ${LANGUAGES} ; do
-	IUSE+=" linguas_${X}"
-done
-unset X
-
 # intersection of available linguas and app-dicts/myspell-* dictionaries
 SPELL_DIRS="af bg ca cs cy da de el en eo es et fr ga gl he hr hu it ku lt mk nb
 nl nn pl pt ru sk sl sv tn zu"
@@ -114,12 +103,23 @@
 unset EXT_URI
 unset ADDONS_SRC
 
-IUSE+=" binfilter cups custom-cflags dbus debug eds gnome gstreamer
+IUSE="binfilter cups custom-cflags dbus debug eds gnome gstreamer
 gtk kde ldap mysql nsplugin odk offlinehelp opengl pch python templates webdav"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
+# translations
+LANGUAGES="af ar as ast be bg bn bo br brx bs ca ca_XV cs cy da de dgo dz el
+en en_GB en_ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km
+kn kok ko ks ku lo lt lv mai mk ml mn mni mr my nb ne nl nn nr nso oc or
+pa_IN pl pt pt_BR ro ru rw sat sd sh sk sl sq sr ss st sv sw_TZ ta te tg
+th tn tr ts ug uk uz ve vi xh zh_CN zh_TW zu"
+for X in ${LANGUAGES} ; do
+	IUSE+=" linguas_${X}"
+done
+unset X
+
 COMMON_DEPEND="
 	app-arch/zip
 	app-arch/unzip
@@ -371,10 +371,10 @@
 		"
 	else
 		java_opts="
-			--with-ant-home=${ANT_HOME}
+			--with-ant-home="${ANT_HOME}"
 			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
 			--with-java-target-version=$(java-pkg_get-target)
-			--with-jvm-path=${EPREFIX}/usr/$(get_libdir)/
+			--with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
 			--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)
 			--with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar)
 			--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)



1.42                 app-office/libreoffice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.41&r2=1.42

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ChangeLog	24 Jul 2011 12:25:53 -0000	1.41
+++ ChangeLog	24 Jul 2011 12:30:38 -0000	1.42
@@ -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.41 2011/07/24 12:25:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.42 2011/07/24 12:30:38 scarabeus Exp $
+
+  24 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.2.ebuild:
+  Silence repoman warnings.
 
 *libreoffice-3.4.2.2 (24 Jul 2011)
 






^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.2.2.ebuild ChangeLog
@ 2011-07-24 16:27 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 17+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-07-24 16:27 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/07/24 16:27:25

  Modified:             libreoffice-3.4.2.2.ebuild ChangeLog
  Log:
  Enable junit only when building with tests and java enabled.
  
  (Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  app-office/libreoffice/libreoffice-3.4.2.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?r1=1.2&r2=1.3

Index: libreoffice-3.4.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libreoffice-3.4.2.2.ebuild	24 Jul 2011 12:30:38 -0000	1.2
+++ libreoffice-3.4.2.2.ebuild	24 Jul 2011 16:27:25 -0000	1.3
@@ -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-3.4.2.2.ebuild,v 1.2 2011/07/24 12:30:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.3 2011/07/24 16:27:25 scarabeus Exp $
 
 EAPI=3
 
@@ -32,35 +32,28 @@
 
 # addons
 # FIXME: actually review which one of these are used
-ADDONS_SRC+=" ${ADDONS_URI}/09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
 ADDONS_SRC+=" ${ADDONS_URI}/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html"
-ADDONS_SRC+=" ${ADDONS_URI}/284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
 ADDONS_SRC+=" ${ADDONS_URI}/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip"
 ADDONS_SRC+=" ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt"
 ADDONS_SRC+=" ${ADDONS_URI}/4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
 ADDONS_SRC+=" ${ADDONS_URI}/8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar"
 ADDONS_SRC+=" ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"
 ADDONS_SRC+=" ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip"
 ADDONS_SRC+=" ${ADDONS_URI}/c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt"
-ADDONS_SRC+=" ${ADDONS_URI}/fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"
 ADDONS_SRC+=" ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"
 ADDONS_SRC+=" ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"
@@ -212,7 +205,7 @@
 	java? (
 		=virtual/jdk-1.6*
 		>=dev-java/ant-core-1.7
-		dev-java/junit:4
+		test? ( dev-java/junit:4 )
 	)
 "
 
@@ -368,6 +361,7 @@
 			--without-system-beanshell
 			--without-system-lucene
 			--without-system-saxon
+			--without-junit
 		"
 	else
 		java_opts="
@@ -379,7 +373,7 @@
 			--with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar)
 			--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)
 			--with-saxon-jar=$(java-pkg_getjar saxon saxon8.jar)
-			--with-junit=$(java-pkg_getjar junit-4 junit.jar)
+			$(use_with test junit $(java-pkg_getjar junit-4 junit.jar))
 		"
 	fi
 
@@ -476,7 +470,6 @@
 		$(use_enable python ext-scripting-python) \
 		$(use_enable webdav neon) \
 		$(use_with java) \
-		$(use_with java junit) \
 		$(use_with ldap openldap) \
 		$(use_with mysql system-mysql-cppconn) \
 		$(use_with nsplugin system-mozilla libxul) \



1.43                 app-office/libreoffice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.42&r2=1.43

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ChangeLog	24 Jul 2011 12:30:38 -0000	1.42
+++ ChangeLog	24 Jul 2011 16:27:25 -0000	1.43
@@ -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.42 2011/07/24 12:30:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.43 2011/07/24 16:27:25 scarabeus Exp $
+
+  24 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.2.ebuild:
+  Enable junit only when building with tests and java enabled.
 
   24 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.2.ebuild:






^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.2.2.ebuild ChangeLog
@ 2011-07-24 16:40 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 17+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-07-24 16:40 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/07/24 16:40:34

  Modified:             libreoffice-3.4.2.2.ebuild ChangeLog
  Log:
  Add missing inherits.
  
  (Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

Revision  Changes    Path
1.4                  app-office/libreoffice/libreoffice-3.4.2.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?r1=1.3&r2=1.4

Index: libreoffice-3.4.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libreoffice-3.4.2.2.ebuild	24 Jul 2011 16:27:25 -0000	1.3
+++ libreoffice-3.4.2.2.ebuild	24 Jul 2011 16:40:34 -0000	1.4
@@ -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-3.4.2.2.ebuild,v 1.3 2011/07/24 16:27:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.4 2011/07/24 16:40:34 scarabeus Exp $
 
 EAPI=3
 
@@ -10,7 +10,7 @@
 PYTHON_DEPEND="2"
 PYTHON_USE_WITH="threads,xml"
 
-inherit base autotools check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python toolchain-funcs
+inherit base autotools check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic
 
 DESCRIPTION="LibreOffice, a full office productivity suite."
 HOMEPAGE="http://www.libreoffice.org"



1.44                 app-office/libreoffice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.43&r2=1.44

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ChangeLog	24 Jul 2011 16:27:25 -0000	1.43
+++ ChangeLog	24 Jul 2011 16:40:34 -0000	1.44
@@ -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.43 2011/07/24 16:27:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.44 2011/07/24 16:40:34 scarabeus Exp $
+
+  24 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.2.ebuild:
+  Add missing inherits.
 
   24 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.2.ebuild:






^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.2.2.ebuild ChangeLog
@ 2011-07-24 21:32 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 17+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-07-24 21:32 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/07/24 21:32:43

  Modified:             libreoffice-3.4.2.2.ebuild ChangeLog
  Log:
  Quick&Dirty hack to fix svx build crash i observed on my desktop (definitely not a solution for upstream).
  
  (Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

Revision  Changes    Path
1.5                  app-office/libreoffice/libreoffice-3.4.2.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?r1=1.4&r2=1.5

Index: libreoffice-3.4.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libreoffice-3.4.2.2.ebuild	24 Jul 2011 16:40:34 -0000	1.4
+++ libreoffice-3.4.2.2.ebuild	24 Jul 2011 21:32:42 -0000	1.5
@@ -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-3.4.2.2.ebuild,v 1.4 2011/07/24 16:40:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.5 2011/07/24 21:32:42 scarabeus Exp $
 
 EAPI=3
 
@@ -214,6 +214,7 @@
 	"${FILESDIR}/${PN}-libdb5-fix-check.diff"
 	"${FILESDIR}/${PN}-3.4.1-salfix.diff"
 	"${FILESDIR}/sdext-presenter.diff"
+	"${FILESDIR}/${PN}-svx.patch"
 )
 
 # Uncoment me when updating to eapi4



1.45                 app-office/libreoffice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.44&r2=1.45

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ChangeLog	24 Jul 2011 16:40:34 -0000	1.44
+++ ChangeLog	24 Jul 2011 21:32:42 -0000	1.45
@@ -1,6 +1,11 @@
 # 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.44 2011/07/24 16:40:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.45 2011/07/24 21:32:42 scarabeus Exp $
+
+  24 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.2.ebuild, +files/libreoffice-svx.patch:
+  Quick&Dirty hack to fix svx build crash i observed on my desktop (definitely
+  not a solution for upstream).
 
   24 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.2.ebuild:






^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.2.2.ebuild ChangeLog
@ 2011-07-25  7:26 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 17+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-07-25  7:26 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/07/25 07:26:43

  Modified:             libreoffice-3.4.2.2.ebuild ChangeLog
  Log:
  Split out junit check so it does not die without test enabled. Fixes bug #376293.
  
  (Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

Revision  Changes    Path
1.6                  app-office/libreoffice/libreoffice-3.4.2.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?r1=1.5&r2=1.6

Index: libreoffice-3.4.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libreoffice-3.4.2.2.ebuild	24 Jul 2011 21:32:42 -0000	1.5
+++ libreoffice-3.4.2.2.ebuild	25 Jul 2011 07:26:43 -0000	1.6
@@ -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-3.4.2.2.ebuild,v 1.5 2011/07/24 21:32:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.6 2011/07/25 07:26:43 scarabeus Exp $
 
 EAPI=3
 
@@ -374,8 +374,12 @@
 			--with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar)
 			--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)
 			--with-saxon-jar=$(java-pkg_getjar saxon saxon8.jar)
-			$(use_with test junit $(java-pkg_getjar junit-4 junit.jar))
 		"
+		if use test; then
+			java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)"
+		else
+			java_opts+=" --without-junit"
+		fi
 	fi
 
 	# TODO: create gentoo branding on the about/intro screens



1.46                 app-office/libreoffice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.46&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.46&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.45&r2=1.46

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ChangeLog	24 Jul 2011 21:32:42 -0000	1.45
+++ ChangeLog	25 Jul 2011 07:26:43 -0000	1.46
@@ -1,6 +1,11 @@
 # 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.45 2011/07/24 21:32:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.46 2011/07/25 07:26:43 scarabeus Exp $
+
+  25 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.2.ebuild:
+  Split out junit check so it does not die without test enabled. Fixes bug
+  #376293.
 
   24 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.2.ebuild, +files/libreoffice-svx.patch:






^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.2.2.ebuild ChangeLog
@ 2011-07-25 10:42 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 17+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-07-25 10:42 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/07/25 10:42:13

  Modified:             libreoffice-3.4.2.2.ebuild ChangeLog
  Log:
  Add build fixes for crash in solenv and vbahelper fix for gcc-4.6.
  
  (Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

Revision  Changes    Path
1.7                  app-office/libreoffice/libreoffice-3.4.2.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?r1=1.6&r2=1.7

Index: libreoffice-3.4.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libreoffice-3.4.2.2.ebuild	25 Jul 2011 07:26:43 -0000	1.6
+++ libreoffice-3.4.2.2.ebuild	25 Jul 2011 10:42:13 -0000	1.7
@@ -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-3.4.2.2.ebuild,v 1.6 2011/07/25 07:26:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.7 2011/07/25 10:42:13 scarabeus Exp $
 
 EAPI=3
 
@@ -215,6 +215,8 @@
 	"${FILESDIR}/${PN}-3.4.1-salfix.diff"
 	"${FILESDIR}/sdext-presenter.diff"
 	"${FILESDIR}/${PN}-svx.patch"
+	"${FILESDIR}/${PN}-vbaobj-visibility-fix.patch"
+	"${FILESDIR}/${PN}-solenv-build-crash.patch"
 )
 
 # Uncoment me when updating to eapi4



1.47                 app-office/libreoffice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.47&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.47&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.46&r2=1.47

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ChangeLog	25 Jul 2011 07:26:43 -0000	1.46
+++ ChangeLog	25 Jul 2011 10:42:13 -0000	1.47
@@ -1,6 +1,11 @@
 # 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.46 2011/07/25 07:26:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.47 2011/07/25 10:42:13 scarabeus Exp $
+
+  25 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.2.ebuild, +files/libreoffice-solenv-build-crash.patch,
+  +files/libreoffice-vbaobj-visibility-fix.patch:
+  Add build fixes for crash in solenv and vbahelper fix for gcc-4.6.
 
   25 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.2.ebuild:






^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.2.2.ebuild ChangeLog
@ 2011-07-25 11:19 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 17+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-07-25 11:19 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/07/25 11:19:44

  Modified:             libreoffice-3.4.2.2.ebuild ChangeLog
  Log:
  Upgrade jobs parsing per bug 375761. Thx to Drake Wyrm for the sed.
  
  (Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

Revision  Changes    Path
1.8                  app-office/libreoffice/libreoffice-3.4.2.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?r1=1.7&r2=1.8

Index: libreoffice-3.4.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libreoffice-3.4.2.2.ebuild	25 Jul 2011 10:42:13 -0000	1.7
+++ libreoffice-3.4.2.2.ebuild	25 Jul 2011 11:19:44 -0000	1.8
@@ -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-3.4.2.2.ebuild,v 1.7 2011/07/25 10:42:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.8 2011/07/25 11:19:44 scarabeus Exp $
 
 EAPI=3
 
@@ -337,7 +337,7 @@
 	local internal_libs
 	local extensions
 	local themes="default"
-	local jobs=$(echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/")
+	local jobs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
 
 	# expand themes we are going to build based on DE useflags
 	use gnome && themes+=" tango"



1.48                 app-office/libreoffice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.47&r2=1.48

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ChangeLog	25 Jul 2011 10:42:13 -0000	1.47
+++ ChangeLog	25 Jul 2011 11:19:44 -0000	1.48
@@ -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.47 2011/07/25 10:42:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.48 2011/07/25 11:19:44 scarabeus Exp $
+
+  25 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.2.ebuild:
+  Upgrade jobs parsing per bug 375761. Thx to Drake Wyrm for the sed.
 
   25 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.2.ebuild, +files/libreoffice-solenv-build-crash.patch,






^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.2.2.ebuild ChangeLog
@ 2011-07-25 14:54 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 17+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-07-25 14:54 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/07/25 14:54:33

  Modified:             libreoffice-3.4.2.2.ebuild ChangeLog
  Log:
  Do not pre-strip the binaries, check for proper reqs, update install phase to use distro-pack-install (smaller yay).
  
  (Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

Revision  Changes    Path
1.9                  app-office/libreoffice/libreoffice-3.4.2.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?r1=1.8&r2=1.9

Index: libreoffice-3.4.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libreoffice-3.4.2.2.ebuild	25 Jul 2011 11:19:44 -0000	1.8
+++ libreoffice-3.4.2.2.ebuild	25 Jul 2011 14:54:33 -0000	1.9
@@ -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-3.4.2.2.ebuild,v 1.8 2011/07/25 11:19:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.9 2011/07/25 14:54:33 scarabeus Exp $
 
 EAPI=3
 
@@ -271,8 +271,8 @@
 	ewarn "If you encounter errors try yourself to disable parallel build."
 
 	# Check if we have enough RAM and free diskspace to build this beast
-	CHECKREQS_MEMORY="512"
-	use debug && CHECKREQS_DISK_BUILD="12288" || CHECKREQS_DISK_BUILD="7144"
+	CHECKREQS_MEMORY="1024"
+	use debug && CHECKREQS_DISK_BUILD="15360" || CHECKREQS_DISK_BUILD="9216"
 	check_reqs
 }
 
@@ -457,7 +457,6 @@
 		$(use_enable cups) \
 		$(use_enable dbus) \
 		$(use_enable debug crashdump) \
-		$(use_enable !debug strip-solver) \
 		$(use_enable eds evolution2) \
 		$(use_enable gnome gconf) \
 		$(use_enable gnome gio) \
@@ -491,52 +490,8 @@
 }
 
 src_install() {
-	local SIZE desk app
-
-	export PYTHONPATH=""
-
-	emake DESTDIR="${D}" install || die
-
-	# Fix the permissions for security reasons
-	use prefix || chown -RP root:0 "${ED}"
-
-	# Desktop files
-	pushd "${ED}"/usr/$(get_libdir)/${PN}/share/xdg/ > /dev/null
-	for i in *; do
-		mv ${i}.desktop ${PN}-${i}.desktop
-	done
-	popd > /dev/null
-	sed -i \
-		-e s/libreoffice3.4/${PN}/g \
-		-e s/libreoffice34/${PN}/g \
-		"${ED}"/usr/$(get_libdir)/${PN}/share/xdg/*.desktop || die111
-	use java || rm "${ED}"/usr/$(get_libdir)/${PN}/share/xdg/javafilter.desktop
-	domenu "${ED}"/usr/$(get_libdir)/${PN}/share/xdg/*.desktop
-
-	# install icons
-	insinto /usr/share/icons/
-	doins -r "${S}"/sysui/desktop/icons/hicolor
-
-	# app icon names are too generic, have to make them unique
-	for SIZE in 16 32 48 128 ; do
-		cd "${ED}"/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps
-		for app in base calc draw impress main math startcenter writer ; do
-			mv ${app}.png ${PN}-${app}.png || die
-		done
-	done
-
-	# install mime package
-	dodir /usr/share/mime/packages
-	cp sysui/*.pro/misc/${PN}/openoffice.org.xml \
-		"${ED}"/usr/share/mime/packages/${PN}.xml
-
-	# Install wrapper script
-	sed -i -e s/LIBDIR/$(get_libdir)/g "${T}/wrapper.in" || die
-	newbin "${T}/wrapper.in" ${PN} || die
-
-	# Cleanup after playing
-	rm "${ED}"/gid_Module_*
-
+	# This is not Makefile so no buildserver
+	make DESTDIR="${D}" distro-pack-install || die
 }
 
 pkg_preinst() {



1.50                 app-office/libreoffice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.49&r2=1.50

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ChangeLog	25 Jul 2011 12:12:34 -0000	1.49
+++ ChangeLog	25 Jul 2011 14:54:33 -0000	1.50
@@ -1,6 +1,11 @@
 # 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.49 2011/07/25 12:12:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.50 2011/07/25 14:54:33 scarabeus Exp $
+
+  25 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.2.ebuild:
+  Do not pre-strip the binaries, check for proper reqs, update install phase to
+  use distro-pack-install (smaller yay).
 
   25 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   files/libreoffice-solenv-build-crash.patch:






^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.2.2.ebuild ChangeLog
@ 2011-07-25 17:21 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 17+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-07-25 17:21 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/07/25 17:21:29

  Modified:             libreoffice-3.4.2.2.ebuild ChangeLog
  Log:
  Disable pch (precompiled headers) support as it creates just build crashes.
  
  (Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

Revision  Changes    Path
1.11                 app-office/libreoffice/libreoffice-3.4.2.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?r1=1.10&r2=1.11

Index: libreoffice-3.4.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libreoffice-3.4.2.2.ebuild	25 Jul 2011 15:42:31 -0000	1.10
+++ libreoffice-3.4.2.2.ebuild	25 Jul 2011 17:21:29 -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-3.4.2.2.ebuild,v 1.10 2011/07/25 15:42:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.11 2011/07/25 17:21:29 scarabeus Exp $
 
 EAPI=3
 
@@ -400,6 +400,7 @@
 	# --disable-gnome-vfs: old gnome virtual fs support
 	# --disable-kdeab: kde3 adressbook
 	# --disable-kde: kde3 support
+	# --disable-pch: precompiled headers cause build crashes
 	# --disable-rpath: relative runtime path is not desired
 	# --disable-static-gtk: ensure that gtk is linked dynamically
 	# --disable-zenity: disable build icon
@@ -431,6 +432,7 @@
 		--disable-kdeab \
 		--disable-kde \
 		--disable-online-update \
+		--disable-pch \
 		--disable-rpath \
 		--disable-static-gtk \
 		--disable-zenity \
@@ -471,7 +473,6 @@
 		$(use_enable nsplugin mozilla) \
 		$(use_enable odk) \
 		$(use_enable opengl) \
-		$(use_enable pch) \
 		$(use_enable python) \
 		$(use_enable python ext-scripting-python) \
 		$(use_enable webdav neon) \



1.51                 app-office/libreoffice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.51&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.51&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.50&r2=1.51

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ChangeLog	25 Jul 2011 14:54:33 -0000	1.50
+++ ChangeLog	25 Jul 2011 17:21:29 -0000	1.51
@@ -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.50 2011/07/25 14:54:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.51 2011/07/25 17:21:29 scarabeus Exp $
+
+  25 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.2.ebuild:
+  Disable pch (precompiled headers) support as it creates just build crashes.
 
   25 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.2.ebuild:






^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.2.2.ebuild ChangeLog
@ 2011-07-26 13:05 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 17+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-07-26 13:05 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/07/26 13:05:05

  Modified:             libreoffice-3.4.2.2.ebuild ChangeLog
  Log:
  Fix as-needed linking on the quickstarter. Patches backported from upstream trunk. Fixes gentoo bug #376469.
  
  (Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

Revision  Changes    Path
1.13                 app-office/libreoffice/libreoffice-3.4.2.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?r1=1.12&r2=1.13

Index: libreoffice-3.4.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libreoffice-3.4.2.2.ebuild	25 Jul 2011 18:15:43 -0000	1.12
+++ libreoffice-3.4.2.2.ebuild	26 Jul 2011 13:05:05 -0000	1.13
@@ -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-3.4.2.2.ebuild,v 1.12 2011/07/25 18:15:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.13 2011/07/26 13:05:05 scarabeus Exp $
 
 EAPI=3
 
@@ -217,6 +217,8 @@
 	"${FILESDIR}/${PN}-svx.patch"
 	"${FILESDIR}/${PN}-vbaobj-visibility-fix.patch"
 	"${FILESDIR}/${PN}-solenv-build-crash.patch"
+	"${FILESDIR}/${PN}-as-needed-gtk.patch"
+	"${FILESDIR}/${PN}-as-needed-gtk-2.patch"
 )
 
 # Uncoment me when updating to eapi4



1.53                 app-office/libreoffice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.53&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.53&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.52&r2=1.53

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- ChangeLog	25 Jul 2011 18:15:43 -0000	1.52
+++ ChangeLog	26 Jul 2011 13:05:05 -0000	1.53
@@ -1,6 +1,12 @@
 # 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.52 2011/07/25 18:15:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.53 2011/07/26 13:05:05 scarabeus Exp $
+
+  26 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/libreoffice-as-needed-gtk-2.patch, libreoffice-3.4.2.2.ebuild,
+  +files/libreoffice-as-needed-gtk.patch:
+  Fix as-needed linking on the quickstarter. Patches backported from upstream
+  trunk. Fixes gentoo bug #376469.
 
   25 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.2.ebuild, -files/libreoffice-unfigured-options.txt,






^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.2.2.ebuild ChangeLog
@ 2011-07-26 13:11 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 17+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-07-26 13:11 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/07/26 13:11:14

  Modified:             libreoffice-3.4.2.2.ebuild ChangeLog
  Log:
  Set default theme to crystal, set jobs to 1 if the sed does not find any value, and rename the variable to not collide with bash jobs command.
  
  (Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

Revision  Changes    Path
1.14                 app-office/libreoffice/libreoffice-3.4.2.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?r1=1.13&r2=1.14

Index: libreoffice-3.4.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libreoffice-3.4.2.2.ebuild	26 Jul 2011 13:05:05 -0000	1.13
+++ libreoffice-3.4.2.2.ebuild	26 Jul 2011 13:11:14 -0000	1.14
@@ -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-3.4.2.2.ebuild,v 1.13 2011/07/26 13:05:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.14 2011/07/26 13:11:14 scarabeus Exp $
 
 EAPI=3
 
@@ -338,8 +338,11 @@
 	local java_opts
 	local internal_libs
 	local extensions
-	local themes="default"
-	local jobs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
+	local themes="crystal"
+	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"
@@ -446,8 +449,8 @@
 		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
 		--with-external-tar="${DISTDIR}" \
 		--with-lang="${LINGUAS_OOO}" \
-		--with-max-jobs=${jobs} \
-		--with-num-cpus=${jobs} \
+		--with-max-jobs=${jbs} \
+		--with-num-cpus=${jbs} \
 		--with-theme="${themes}" \
 		--with-unix-wrapper=libreoffice \
 		--with-vendor="Gentoo Foundation" \



1.54                 app-office/libreoffice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.54&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.54&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.53&r2=1.54

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ChangeLog	26 Jul 2011 13:05:05 -0000	1.53
+++ ChangeLog	26 Jul 2011 13:11:14 -0000	1.54
@@ -1,6 +1,11 @@
 # 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.53 2011/07/26 13:05:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.54 2011/07/26 13:11:14 scarabeus Exp $
+
+  26 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.2.ebuild:
+  Set default theme to crystal, set jobs to 1 if the sed does not find any
+  value, and rename the variable to not collide with bash jobs command.
 
   26 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   +files/libreoffice-as-needed-gtk-2.patch, libreoffice-3.4.2.2.ebuild,






^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.2.2.ebuild ChangeLog
@ 2011-07-26 16:20 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 17+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-07-26 16:20 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/07/26 16:20:59

  Modified:             libreoffice-3.4.2.2.ebuild ChangeLog
  Log:
  Fix the gtk patch, add patch for sandbox violation during install, enforce not-stripping of solver, portage handle it himself.
  
  (Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

Revision  Changes    Path
1.15                 app-office/libreoffice/libreoffice-3.4.2.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?r1=1.14&r2=1.15

Index: libreoffice-3.4.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libreoffice-3.4.2.2.ebuild	26 Jul 2011 13:11:14 -0000	1.14
+++ libreoffice-3.4.2.2.ebuild	26 Jul 2011 16:20:59 -0000	1.15
@@ -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-3.4.2.2.ebuild,v 1.14 2011/07/26 13:11:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.15 2011/07/26 16:20:59 scarabeus Exp $
 
 EAPI=3
 
@@ -218,7 +218,7 @@
 	"${FILESDIR}/${PN}-vbaobj-visibility-fix.patch"
 	"${FILESDIR}/${PN}-solenv-build-crash.patch"
 	"${FILESDIR}/${PN}-as-needed-gtk.patch"
-	"${FILESDIR}/${PN}-as-needed-gtk-2.patch"
+	"${FILESDIR}/${PN}-fix-sandbox-install.patch"
 )
 
 # Uncoment me when updating to eapi4
@@ -440,6 +440,7 @@
 		--disable-pch \
 		--disable-rpath \
 		--disable-static-gtk \
+		--disable-strip-solver \
 		--disable-zenity \
 		--with-alloc=system \
 		--with-build-version="Gentoo official package" \



1.55                 app-office/libreoffice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.55&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.55&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.54&r2=1.55

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ChangeLog	26 Jul 2011 13:11:14 -0000	1.54
+++ ChangeLog	26 Jul 2011 16:20:59 -0000	1.55
@@ -1,6 +1,13 @@
 # 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.54 2011/07/26 13:11:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.55 2011/07/26 16:20:59 scarabeus Exp $
+
+  26 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/libreoffice-as-needed-gtk-2.patch, libreoffice-3.4.2.2.ebuild,
+  +files/libreoffice-fix-sandbox-install.patch,
+  files/libreoffice-as-needed-gtk.patch:
+  Fix the gtk patch, add patch for sandbox violation during install, enforce
+  not-stripping of solver, portage handle it himself.
 
   26 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.2.ebuild:






^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.2.2.ebuild ChangeLog
@ 2011-07-26 18:20 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 17+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-07-26 18:20 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/07/26 18:20:01

  Modified:             libreoffice-3.4.2.2.ebuild ChangeLog
  Log:
  Introduce branding useflag, yay gentoo screen and about, Thanx to Ian Whyman for this.
  
  (Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

Revision  Changes    Path
1.16                 app-office/libreoffice/libreoffice-3.4.2.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?r1=1.15&r2=1.16

Index: libreoffice-3.4.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libreoffice-3.4.2.2.ebuild	26 Jul 2011 16:20:59 -0000	1.15
+++ libreoffice-3.4.2.2.ebuild	26 Jul 2011 18:20:01 -0000	1.16
@@ -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-3.4.2.2.ebuild,v 1.15 2011/07/26 16:20:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.16 2011/07/26 18:20:01 scarabeus Exp $
 
 EAPI=3
 
@@ -10,14 +10,15 @@
 PYTHON_DEPEND="2"
 PYTHON_USE_WITH="threads,xml"
 
+DEV_URI="http://download.documentfoundation.org/libreoffice/src"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
 inherit base autotools check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic
 
 DESCRIPTION="LibreOffice, a full office productivity suite."
 HOMEPAGE="http://www.libreoffice.org"
-DEV_URI="http://download.documentfoundation.org/libreoffice/src"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-SRC_URI="odk? ( java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )"
+SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${PN}-branding-gentoo-0.1.tar.xz )"
 
 # Shiny split sources with so many packages...
 MODULES="artwork base calc components extensions extras filters help
@@ -96,8 +97,9 @@
 unset EXT_URI
 unset ADDONS_SRC
 
-IUSE="binfilter cups custom-cflags dbus debug eds gnome gstreamer gtk kde ldap
-mysql nsplugin odk offlinehelp opengl python templates test +vba webdav"
+IUSE="binfilter +branding cups custom-cflags dbus debug eds gnome gstreamer gtk
+kde ldap mysql nsplugin odk offlinehelp opengl python templates test +vba
+webdav"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
@@ -281,6 +283,10 @@
 src_unpack() {
 	local mod dest tmplfile tmplname
 
+	if use branding; then
+		unpack "${PN}-branding-gentoo-0.1.tar.xz"
+	fi
+
 	#first the bootstrap files
 	unpack "${PN}-bootstrap-${PV}.tar.bz2"
 
@@ -355,9 +361,8 @@
 		--enable-ext-presenter-minimizer
 	"
 
-	# Things that do not have gentoo packages
 	# hsqldb: requires just 1.8.0 not 1.8.1 which we don't ship at all
-	# we should use in-system dmake: so far fails
+	# dmake: not worth of splitting out
 	internal_libs+="
 		--without-system-hsqldb
 	"
@@ -389,9 +394,12 @@
 		fi
 	fi
 
-	# TODO: create gentoo branding on the about/intro screens
-	# --with-about-bitmap="${FILESDIR}/gentoo-about.png"
-	# --with-intro-bitmap="${FILESDIR}/gentoo-intro.png"
+	if use branding; then
+		extensions+="
+			--with-about-bitmap="${WORKDIR}/branding-about.png"
+			--with-intro-bitmap="${WORKDIR}/branding-intro.png"
+		"
+	fi
 
 	# system headers/libs/...: enforce using system packages
 	#   only expections are mozilla and odbc/sane/xrender-header(s).
@@ -491,7 +499,8 @@
 		$(use_with offlinehelp helppack-integration) \
 		$(use_with templates sun-templates) \
 		${internal_libs} \
-		${java_opts}
+		${java_opts} \
+		${extensions}
 }
 
 src_compile() {
@@ -501,6 +510,11 @@
 src_install() {
 	# This is not Makefile so no buildserver
 	make DESTDIR="${D}" distro-pack-install || die
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc || die
+	fi
 }
 
 pkg_preinst() {



1.57                 app-office/libreoffice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.57&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.57&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.56&r2=1.57

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- ChangeLog	26 Jul 2011 17:05:34 -0000	1.56
+++ ChangeLog	26 Jul 2011 18:20:01 -0000	1.57
@@ -1,6 +1,11 @@
 # 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.56 2011/07/26 17:05:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.57 2011/07/26 18:20:01 scarabeus Exp $
+
+  26 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.2.ebuild:
+  Introduce branding useflag, yay gentoo screen and about, Thanx to Ian Whyman
+  for this.
 
   26 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   files/libreoffice-fix-sandbox-install.patch:






^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.2.2.ebuild ChangeLog
@ 2011-07-26 20:39 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 17+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-07-26 20:39 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/07/26 20:39:13

  Modified:             libreoffice-3.4.2.2.ebuild ChangeLog
  Log:
  Aparently it looks like translate-toolkit require solenv to not fail in parallel build. Fixes bug #376387.
  
  (Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

Revision  Changes    Path
1.18                 app-office/libreoffice/libreoffice-3.4.2.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?r1=1.17&r2=1.18

Index: libreoffice-3.4.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libreoffice-3.4.2.2.ebuild	26 Jul 2011 19:06:15 -0000	1.17
+++ libreoffice-3.4.2.2.ebuild	26 Jul 2011 20:39:13 -0000	1.18
@@ -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-3.4.2.2.ebuild,v 1.17 2011/07/26 19:06:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.18 2011/07/26 20:39:13 scarabeus Exp $
 
 EAPI=3
 
@@ -221,6 +221,7 @@
 	"${FILESDIR}/${PN}-solenv-build-crash.patch"
 	"${FILESDIR}/${PN}-as-needed-gtk.patch"
 	"${FILESDIR}/${PN}-fix-sandbox-install.patch"
+	"${FILESDIR}/${PN}-translate-toolkit-parallel-solenv.patch"
 )
 
 # Uncoment me when updating to eapi4



1.59                 app-office/libreoffice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.59&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.59&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.58&r2=1.59

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- ChangeLog	26 Jul 2011 19:06:15 -0000	1.58
+++ ChangeLog	26 Jul 2011 20:39:13 -0000	1.59
@@ -1,6 +1,12 @@
 # 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.58 2011/07/26 19:06:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.59 2011/07/26 20:39:13 scarabeus Exp $
+
+  26 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.2.ebuild,
+  +files/libreoffice-translate-toolkit-parallel-solenv.patch:
+  Aparently it looks like translate-toolkit require solenv to not fail in
+  parallel build. Fixes bug #376387.
 
   26 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.2.ebuild, metadata.xml:






^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.2.2.ebuild ChangeLog
@ 2011-07-26 20:47 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 17+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-07-26 20:47 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/07/26 20:47:57

  Modified:             libreoffice-3.4.2.2.ebuild ChangeLog
  Log:
  Force proper variable usage. Just saw this in gekis overlay so adding to main tree too.
  
  (Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

Revision  Changes    Path
1.19                 app-office/libreoffice/libreoffice-3.4.2.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?r1=1.18&r2=1.19

Index: libreoffice-3.4.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libreoffice-3.4.2.2.ebuild	26 Jul 2011 20:39:13 -0000	1.18
+++ libreoffice-3.4.2.2.ebuild	26 Jul 2011 20:47:56 -0000	1.19
@@ -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-3.4.2.2.ebuild,v 1.18 2011/07/26 20:39:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.19 2011/07/26 20:47:56 scarabeus Exp $
 
 EAPI=3
 
@@ -222,6 +222,7 @@
 	"${FILESDIR}/${PN}-as-needed-gtk.patch"
 	"${FILESDIR}/${PN}-fix-sandbox-install.patch"
 	"${FILESDIR}/${PN}-translate-toolkit-parallel-solenv.patch"
+	"${FILESDIR}/${PN}-gbuild-use-cxxflags.patch"
 )
 
 # Uncoment me when updating to eapi4



1.60                 app-office/libreoffice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.60&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.60&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.59&r2=1.60

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ChangeLog	26 Jul 2011 20:39:13 -0000	1.59
+++ ChangeLog	26 Jul 2011 20:47:56 -0000	1.60
@@ -1,6 +1,11 @@
 # 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.59 2011/07/26 20:39:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.60 2011/07/26 20:47:56 scarabeus Exp $
+
+  26 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.2.ebuild, +files/libreoffice-gbuild-use-cxxflags.patch:
+  Force proper variable usage. Just saw this in gekis overlay so adding to main
+  tree too.
 
   26 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.2.ebuild,






^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.2.2.ebuild ChangeLog
@ 2011-07-26 21:11 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 17+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-07-26 21:11 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/07/26 21:11:11

  Modified:             libreoffice-3.4.2.2.ebuild ChangeLog
  Log:
  Printproto seriously should not be dependency. Fixes bug #321119.
  
  (Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

Revision  Changes    Path
1.20                 app-office/libreoffice/libreoffice-3.4.2.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?r1=1.19&r2=1.20

Index: libreoffice-3.4.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libreoffice-3.4.2.2.ebuild	26 Jul 2011 20:47:56 -0000	1.19
+++ libreoffice-3.4.2.2.ebuild	26 Jul 2011 21:11:11 -0000	1.20
@@ -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-3.4.2.2.ebuild,v 1.19 2011/07/26 20:47:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.20 2011/07/26 21:11:11 scarabeus Exp $
 
 EAPI=3
 
@@ -199,7 +199,6 @@
 	sys-devel/flex
 	sys-libs/zlib
 	x11-libs/libXtst
-	x11-proto/printproto
 	x11-proto/randrproto
 	x11-proto/xextproto
 	x11-proto/xineramaproto



1.61                 app-office/libreoffice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.61&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.61&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.60&r2=1.61

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ChangeLog	26 Jul 2011 20:47:56 -0000	1.60
+++ ChangeLog	26 Jul 2011 21:11:11 -0000	1.61
@@ -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.60 2011/07/26 20:47:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.61 2011/07/26 21:11:11 scarabeus Exp $
+
+  26 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.2.ebuild:
+  Printproto seriously should not be dependency. Fixes bug #321119.
 
   26 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.2.ebuild, +files/libreoffice-gbuild-use-cxxflags.patch:






^ permalink raw reply	[flat|nested] 17+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.2.2.ebuild ChangeLog
@ 2011-07-26 22:36 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 17+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-07-26 22:36 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/07/26 22:36:46

  Modified:             libreoffice-3.4.2.2.ebuild ChangeLog
  Log:
  Enhance REQUIRED_USE comment as nsplugins needs gtk too, so we are ready in eapi4 future.
  
  (Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

Revision  Changes    Path
1.21                 app-office/libreoffice/libreoffice-3.4.2.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild?r1=1.20&r2=1.21

Index: libreoffice-3.4.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libreoffice-3.4.2.2.ebuild	26 Jul 2011 21:11:11 -0000	1.20
+++ libreoffice-3.4.2.2.ebuild	26 Jul 2011 22:36:46 -0000	1.21
@@ -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-3.4.2.2.ebuild,v 1.20 2011/07/26 21:11:11 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.21 2011/07/26 22:36:46 scarabeus Exp $
 
 EAPI=3
 
@@ -228,6 +228,7 @@
 # REQUIRED_USE="
 #	|| ( gtk gnome kde )
 #	gnome? ( gtk )
+#	nsplugin? ( gtk )
 #"
 
 S="${WORKDIR}/${PN}-bootstrap-${PV}"



1.62                 app-office/libreoffice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.62&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.62&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.61&r2=1.62

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ChangeLog	26 Jul 2011 21:11:11 -0000	1.61
+++ ChangeLog	26 Jul 2011 22:36:46 -0000	1.62
@@ -1,6 +1,11 @@
 # 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.61 2011/07/26 21:11:11 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.62 2011/07/26 22:36:46 scarabeus Exp $
+
+  26 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.2.ebuild:
+  Enhance REQUIRED_USE comment as nsplugins needs gtk too, so we are ready in
+  eapi4 future.
 
   26 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.2.ebuild:






^ permalink raw reply	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2011-07-26 23:02 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-26 18:20 [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-3.4.2.2.ebuild ChangeLog Tomas Chvatal (scarabeus)
  -- strict thread matches above, loose matches on Subject: below --
2011-07-26 22:36 Tomas Chvatal (scarabeus)
2011-07-26 21:11 Tomas Chvatal (scarabeus)
2011-07-26 20:47 Tomas Chvatal (scarabeus)
2011-07-26 20:39 Tomas Chvatal (scarabeus)
2011-07-26 16:20 Tomas Chvatal (scarabeus)
2011-07-26 13:11 Tomas Chvatal (scarabeus)
2011-07-26 13:05 Tomas Chvatal (scarabeus)
2011-07-25 17:21 Tomas Chvatal (scarabeus)
2011-07-25 14:54 Tomas Chvatal (scarabeus)
2011-07-25 11:19 Tomas Chvatal (scarabeus)
2011-07-25 10:42 Tomas Chvatal (scarabeus)
2011-07-25  7:26 Tomas Chvatal (scarabeus)
2011-07-24 21:32 Tomas Chvatal (scarabeus)
2011-07-24 16:40 Tomas Chvatal (scarabeus)
2011-07-24 16:27 Tomas Chvatal (scarabeus)
2011-07-24 12: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