[gentoo-commits] gentoo-x86 commit in app-office/openoffice: ChangeLog openoffice-3.0.0.ebuild metadata.xml openoffice-3.0.0_rc4.ebuild

[Andreas Proschofsky (suka)]

suka        08/10/14 16:13:39

  Modified:             ChangeLog openoffice-3.0.0.ebuild metadata.xml
  Removed:              openoffice-3.0.0_rc4.ebuild
  Log:
  Add extension-support and templates integration, lots of cleanups, remove some useless dependencies
  (Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 i686)

Revision  Changes    Path
1.423                app-office/openoffice/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?rev=1.423&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?rev=1.423&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?r1=1.422&r2=1.423

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -r1.422 -r1.423
--- ChangeLog	13 Oct 2008 12:41:11 -0000	1.422
+++ ChangeLog	14 Oct 2008 16:13:39 -0000	1.423
@@ -1,6 +1,27 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.422 2008/10/13 12:41:11 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.423 2008/10/14 16:13:39 suka Exp $
+
+  14 Oct 2008; Andreas Proschofsky <suka@g.o>
+  -files/gentoo-3.0.0_rc4.diff, files/gentoo-3.0.0.diff,
+  -openoffice-3.0.0_rc4.ebuild, openoffice-3.0.0.ebuild:
+  Further cleanups to deps and config-flags
+
+  14 Oct 2008; Andreas Proschofsky <suka@g.o>
+  -files/gentoo-3.0.0_rc4.diff, files/gentoo-3.0.0.diff,
+  -openoffice-3.0.0_rc4.ebuild, openoffice-3.0.0.ebuild:
+  Bunch of smaller fixes and improvements:
+
+  *) Build PDF import, Presentation Console and Presentation Minimizer
+  extensions, inform about the need to install them manually
+
+  *) Add "templates" use-flag, installs Sun templates for OOo (if you build
+  for english or german)
+
+  *) Warn about build problems when having KDE 4.1.x with kdeprefix
+  installed, see bug #238539
+
+  *) Remove some no longer needed dependencies, clean up others
 
 *openoffice-3.0.0 (13 Oct 2008)
 



1.2                  app-office/openoffice/openoffice-3.0.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild?r1=1.1&r2=1.2

Index: openoffice-3.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice-3.0.0.ebuild	13 Oct 2008 12:41:11 -0000	1.1
+++ openoffice-3.0.0.ebuild	14 Oct 2008 16:13:39 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v 1.1 2008/10/13 12:41:11 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v 1.2 2008/10/14 16:13:39 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -8,7 +8,7 @@
 
 inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib
 
-IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam"
+IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam templates"
 
 MY_PV="3.0.0.3.4"
 PATCHLEVEL="OOO300"
@@ -78,14 +78,9 @@
 	eds? ( >=gnome-extra/evolution-data-server-1.2 )
 	gstreamer? ( >=media-libs/gstreamer-0.10
 			>=media-libs/gst-plugins-base-0.10 )
-	kde? ( =kde-base/kdelibs-3* )
+	kde? ( kde-base/kdelibs:3.5 )
 	java? ( >=dev-java/bsh-2.0_beta4
-		>=dev-java/xalan-2.7
-		>=dev-java/xalan-serializer-2.7
-		>=dev-java/xerces-2.7
-		=dev-java/xml-commons-external-1.3*
-		>=dev-db/hsqldb-1.8.0.9
-		=dev-java/rhino-1.5* )
+		>=dev-db/hsqldb-1.8.0.9 )
 	mono? ( >=dev-lang/mono-1.2.3.1 )
 	opengl? ( virtual/opengl
 		virtual/glu )
@@ -206,6 +201,14 @@
 		fi
 	fi
 
+	if use kde; then
+		ewarn " Please note that this version of OpenOffice.org will NOT build "
+		ewarn " if you have KDE 4.1.x installed without kdeprefix. "
+		ewarn " Until this is resolved, either disable the kde-use-flag or "
+		ewarn " rebuild KDE with USE='kdeprefix'. "
+		ewarn
+	fi
+
 	if use nsplugin; then
 		if pkg-config --exists libxul; then
 			BRWS="libxul"
@@ -252,17 +255,8 @@
 		echo "--with-java-target-version=$(java-pkg_get-target)" >> ${CONFFILE}
 		echo "--with-system-beanshell" >> ${CONFFILE}
 		echo "--with-system-hsqldb" >> ${CONFFILE}
-		echo "--with-system-rhino" >> ${CONFFILE}
-		echo "--with-system-xalan" >> ${CONFFILE}
-		echo "--with-system-xerces" >> ${CONFFILE}
-		echo "--with-system-xml-apis" >> ${CONFFILE}
 		echo "--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" >> ${CONFFILE}
 		echo "--with-hsqldb-jar=$(java-pkg_getjar hsqldb hsqldb.jar)" >> ${CONFFILE}
-		echo "--with-rhino-jar=$(java-pkg_getjar rhino-1.5 js.jar)" >> ${CONFFILE}
-		echo "--with-serializer-jar=$(java-pkg_getjar xalan-serializer serializer.jar)" >> ${CONFFILE}
-		echo "--with-xalan-jar=$(java-pkg_getjar xalan xalan.jar)" >> ${CONFFILE}
-		echo "--with-xerces-jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)" >> ${CONFFILE}
-		echo "--with-xml-apis-jar=$(java-pkg_getjar xml-commons-external-1.3 xml-apis.jar)" >> ${CONFFILE}
 	fi
 
 	if use nsplugin ; then
@@ -285,9 +279,16 @@
 	echo "`use_enable opengl`" >> ${CONFFILE}
 	echo "`use_enable pam`" >> ${CONFFILE}
 	echo "`use_with ldap openldap`" >> ${CONFFILE}
+	echo "`use_with templates sun-templates`" >> ${CONFFILE}
 	echo "`use_enable debug crashdump`" >> ${CONFFILE}
 	echo "`use_enable debug strip-solver`" >> ${CONFFILE}
 
+	# Extension stuff
+	echo "--with-extension-integration" >> ${CONFFILE}
+	echo "--enable-minimizer" >> ${CONFFILE}
+	echo "--enable-pdfimport" >> ${CONFFILE}
+	echo "--enable-presenter-console" >> ${CONFFILE}
+
 	# Use splash screen without Sun logo
 	echo "--with-intro-bitmaps=\\\"${S}/build/${MST}/ooo_custom_images/nologo/introabout/intro.bmp\\\"" >> ${CONFFILE}
 
@@ -325,7 +326,6 @@
 	./configure \
 		--with-distro="Gentoo" \
 		--with-arch="${ARCH}" \
-		--host="${CHOST}" \
 		--with-srcdir="${DISTDIR}" \
 		--with-lang="${LINGUAS_OOO}" \
 		--with-num-cpus="${JOBS}" \
@@ -340,6 +340,7 @@
 		`use_with java` \
 		--disable-access \
 		--disable-post-install-scripts \
+		--enable-extensions \
 		--with-system-libwpd \
 		--mandir=/usr/share/man \
 		--libdir=/usr/$(get_libdir) \
@@ -382,4 +383,14 @@
 	elog " according to your language needs. "
 	elog
 
+	elog " Some aditional functionality can be installed via Extension Manager: "
+	elog " *) PDF Import "
+	elog " *) Presentation Console "
+	elog " *) Presentation Minimizer "
+	elog
+	elog " Please use the packages provided in "
+	elog " /usr/$(get_libdir)/openoffice/share/extension/install/ "
+	elog " instead of those from the SUN extension site. "
+	elog
+
 }



1.3                  app-office/openoffice/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/metadata.xml?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/metadata.xml?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/metadata.xml?r1=1.2&r2=1.3

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml	3 Aug 2008 12:06:39 -0000	1.2
+++ metadata.xml	14 Oct 2008 16:13:39 -0000	1.3
@@ -11,5 +11,6 @@
   <flag name='binfilter'>Enable support for legacy StarOffice 5.x and earlier
     file formats</flag>
   <flag name='odk'>Build the Office Development Kit</flag>
+  <flag name='templates'>Enable installation of Sun templates</flag>
 </use>
 </pkgmetadata>