bunch of fixes and new goodies, see the ChangeLog for more infos

Package-Manager: portage-2.0.51-r15

5 files changed, 73 insertions, 9 deletions

diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index 1318b17e9832..77cf6334d6ff 100644
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for app-office/openoffice-ximian
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.110 2005/02/03 17:09:27 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.111 2005/02/04 10:33:19 suka Exp $
+
+  04 Feb 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/1.1.4/gentoo-1.3.8.patch,
+  +files/1.1.4/gtk-printer-update-on-focus-change.diff,
+  openoffice-ximian-1.3.8.ebuild:
+  Bunch of fixes / news:
+  
+  *) Fix for cups printing problems, taken from upstream, closes bug #78289.
+  If this still doesn't work for you after rebuilding, please delete your
+  user-install (~/.xopenoffice and ~/.xversionrc), should work afterwards
+  
+  *) If USE="gnome" is set, support for Evolution data server is now also
+  built, this adds another dependency
+  
+  *) We are now using system-python and -nas if present, especially the first
+  one should reduce build time quite a bit
+  
+  *) Dependency fixes
 
   03 Feb 2005; Andreas Proschofsky <suka@gentoo.org>
   openoffice-ximian-1.3.7.ebuild:
diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest
index a827c20e50af..078d1fa9e645 100644
--- a/app-office/openoffice-ximian/Manifest
+++ b/app-office/openoffice-ximian/Manifest
@@ -1,8 +1,8 @@
 MD5 7bb244361a08b72dca07314792a1c00c openoffice-ximian-1.3.6.ebuild 16894
-MD5 c8aff6d8bdc2e2653c24c6c30da1aaff openoffice-ximian-1.3.8.ebuild 17379
+MD5 3e19f17ef955658cfb0023ff3d346f01 openoffice-ximian-1.3.8.ebuild 17787
 MD5 7d0e5a8b623a136c7948a25e1d287247 openoffice-ximian-1.3.5-r1.ebuild 16146
 MD5 4097df26e064748c02beb905be124834 openoffice-ximian-1.3.7.ebuild 17835
-MD5 ec869c3bf2e13621296d5bf3bf7b612a ChangeLog 27448
+MD5 42dec51bd8c4c844d25325633931aaa7 ChangeLog 28143
 MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
 MD5 b7a3ab0336f7e514b6641e5871c1bbbb files/digest-openoffice-ximian-1.3.5-r1 437
 MD5 2595967ac130a541e50bffc75e105041 files/digest-openoffice-ximian-1.3.6 502
@@ -39,8 +39,9 @@ MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.4/gcc-instlib.patch 393
 MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.4/gentoo-splash.diff 890
 MD5 24035033f41d743378e16582c2e51469 files/1.1.4/javafix.patch 1382
 MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.4/hardened-link.patch 576
+MD5 bb6a5b602fa199bed7d40f1507b9fb21 files/1.1.4/gtk-printer-update-on-focus-change.diff 993
 MD5 964398ef88829e5a2935d0c0f8389c9d files/1.1.4/xooffice-wrapper-1.3 6091
-MD5 6938dc2e28e840cebf4fdbde9d6e2d4b files/1.1.4/gentoo-1.3.8.patch 859
+MD5 38c7403bb1db3fe6fc1843c75b6d18fb files/1.1.4/gentoo-1.3.8.patch 865
 MD5 a560f9fd159502d802881206b45684f1 files/1.1.4/config-db-checkfix.patch 507
 MD5 3d3555a66a2d8a66613d4e4471701eb8 files/1.1.4/pthreadlink-fix.patch 1163
 MD5 3f008e2c5595512c7f6306b1a722612e files/1.1.4/nptl.patch 243
diff --git a/app-office/openoffice-ximian/files/1.1.4/gentoo-1.3.8.patch b/app-office/openoffice-ximian/files/1.1.4/gentoo-1.3.8.patch
index 37eed77e51b5..426e37e6678d 100644
--- a/app-office/openoffice-ximian/files/1.1.4/gentoo-1.3.8.patch
+++ b/app-office/openoffice-ximian/files/1.1.4/gentoo-1.3.8.patch
@@ -9,7 +9,7 @@
 -GentooKDE : Gentoo, KDECommon
 +GentooBase : LinuxCommon, FilePickers, GlobalDesktopFiles, NonArkCommon, Gcc34, NoRpath
 +Gentoo : GentooBase
-+GentooGNOME : GentooBase, GnomeVFS, NovellOnly, GentooOnly
++GentooGNOME : GentooBase, GnomeVFS, Evo2, NovellOnly, GentooOnly
 +GentooKDE : GentooBase, KDECommon
  
  # somewhat odder:
diff --git a/app-office/openoffice-ximian/files/1.1.4/gtk-printer-update-on-focus-change.diff b/app-office/openoffice-ximian/files/1.1.4/gtk-printer-update-on-focus-change.diff
new file mode 100644
index 000000000000..af2f916f4814
--- /dev/null
+++ b/app-office/openoffice-ximian/files/1.1.4/gtk-printer-update-on-focus-change.diff
@@ -0,0 +1,27 @@
+===================================================================
+RCS file: /opt/sourcecast/data/ccvs/repository/gsl/vcl/unx/gtk/window/gtkframe.cxx,v
+retrieving revision 1.19.2.4
+retrieving revision 1.19.2.5
+diff -u -r1.19.2.4 -r1.19.2.5
+--- vcl/unx/gtk/window/gtkframe.cxx	2005/01/28 16:22:25	1.19.2.4
++++ vcl/unx/gtk/window/gtkframe.cxx	2005/02/02 10:07:05	1.19.2.5
+@@ -66,6 +66,7 @@
+ #include <keycodes.hxx>
+ #include <wmadaptor.hxx>
+ #include <salbmp.h>
++#include <salprn.h>
+ #include <floatwin.hxx>
+ #include <svapp.hxx>
+ 
+@@ -1668,6 +1669,11 @@
+             gtk_im_context_focus_out( pThis->m_pIMContext );
+         }
+     }
++
++    // ask for changed printers like generic implementation
++    if( pEvent->in )
++        if( static_cast< X11SalInstance* >(GetSalData()->pInstance_)->isPrinterInit() )
++            vcl_sal::PrinterUpdate::update();
+ 
+     // FIXME: find out who the hell steals the focus from our frame
+     // if we are plugged and a float opens; why does the same not
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.8.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.8.ebuild
index 88032340567a..d0dbb0b79596 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.3.8.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.8.ebuild,v 1.6 2005/02/01 18:19:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.8.ebuild,v 1.7 2005/02/04 10:33:19 suka Exp $
 
 # Notes:
 #
@@ -26,7 +26,7 @@
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
-IUSE="curl gnome hardened java kde nptl zlib"
+IUSE="curl gnome hardened java kde nas nptl python zlib"
 
 OO_VER="1.1.4"
 PATCHLEVEL="OOO_1_1_4"
@@ -56,11 +56,11 @@ KEYWORDS="~x86 ~ppc"
 RDEPEND="!app-office/openoffice-ximian-bin
 	virtual/x11
 	virtual/libc
-	virtual/lpr
 	>=dev-lang/perl-5.0
 	gnome? ( >=x11-libs/gtk+-2.0
 		>=gnome-base/gnome-vfs-2.0
-		>=dev-libs/libxml2-2.0 )
+		>=dev-libs/libxml2-2.0
+		>=gnome-extra/evolution-data-server-1.0 )
 	kde? ( kde-base/kdelibs )
 	>=media-libs/libart_lgpl-2.3.13
 	>=x11-libs/startup-notification-0.5
@@ -74,17 +74,20 @@ RDEPEND="!app-office/openoffice-ximian-bin
 	app-arch/unzip
 	dev-libs/expat
 	java? ( >=virtual/jre-1.4.1 )
+	python? ( virtual/python )
 	ppc? ( >=sys-devel/gcc-3.2.1 )
 	linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
 	linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 )
 	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
 
 DEPEND="${RDEPEND}
+	virtual/lpr
 	>=sys-apps/findutils-4.1.20-r1
 	app-shells/tcsh
 	dev-util/pkgconfig
 	dev-util/intltool
 	curl? ( net-misc/curl )
+	nas? ( media-libs/nas )
 	zlib? ( sys-libs/zlib )
 	sys-libs/pam
 	!dev-util/dmake
@@ -305,6 +308,9 @@ src_unpack() {
 		epatch ${FILESDIR}/${OO_VER}/pyunolink-fix.patch
 	fi
 
+	#Fix for printer problems
+	use gnome && epatch ${FILESDIR}/${OO_VER}/gtk-printer-update-on-focus-change.diff
+
 	einfo "Installing / Scaling Icons"
 	${PATCHDIR}/bin/scale-icons ${S} || die
 	cp -af ${ICONDIR}/* ${S} || die
@@ -362,6 +368,18 @@ src_compile() {
 		MYCONF="${MYCONF} --with-system-zlib"
 	fi
 
+	#See if we use system-python
+	if use python
+	then
+		MYCONF="${MYCONF} --with-python=/usr/bin/python"
+	fi
+
+	#See if we use system-nas
+	if use nas
+	then
+		MYCONF="${MYCONF} --with-system-nas"
+	fi
+
 	use kde && set-kdedir 3
 
 	# Do NOT compile with a external STLport, as gcc-2.95.3 users will