Desktop binding fix

3 files changed, 31 insertions, 18 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 95992c2b7f73..5ff3385f17e2 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.55 2004/02/03 20:31:01 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.56 2004/02/05 10:34:16 pauldv Exp $
+
+  05 Feb 2004; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.0-r3.ebuild:
+  Change the installation database so that the desktop bindings will not get
+  installed for users. They are allready installed globally
 
   03 Feb 2004; suka <suka@gentoo.org> openoffice-1.1.0-r3.ebuild:
   This update further simplifies the ebuild and aims to fix the distcc problems.
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 29d2a7015965..00fdefdc5343 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,32 +1,32 @@
 MD5 fafaf6a6fc199ee0469c40d1607c37b4 openoffice-1.1.0-r2.ebuild 20288
 MD5 c0a6d36a7529f0a22bae30399b11bc5d openoffice-1.0.3-r1.ebuild 21888
-MD5 e949ac1677d806284fd2dd8d9908dec1 openoffice-1.1.0-r3.ebuild 15540
-MD5 655b55b410823714430742c19895f0f7 ChangeLog 13456
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
-MD5 b1ec8fd75e9b93ccf4a4f0c926de5199 files/digest-openoffice-1.0.3-r1 330
+MD5 efb6e1138e1fc88b3bbf8182bebd25f9 ChangeLog 13674
+MD5 fdc68b135794f0ddff6726fa7147e65a openoffice-1.1.0-r3.ebuild 15851
 MD5 9d1828c128b70f1612c0c31b69719a26 files/digest-openoffice-1.1.0-r2 195
 MD5 601e987d3fa97d8dfc4cdd052b0e9832 files/digest-openoffice-1.1.0-r3 128
+MD5 b1ec8fd75e9b93ccf4a4f0c926de5199 files/digest-openoffice-1.0.3-r1 330
+MD5 46080de39ef5acd7488ce1e76ac10cbe files/1.0.3/ooffice-wrapper-1.3 8362
+MD5 3834566292e23e2832f625e0b5accf85 files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3.patch 10485
+MD5 3fe10dea0d52c0779a9929b021d84e43 files/1.0.3/openoffice-1.0.1-compiler-flags.patch 954
+MD5 ce580b49f86ec9ab3ceba58268c886df files/1.0.3/openoffice-1.0.1-sparc.patch.bz2 15843
+MD5 bf8388f4d41ad2ed1a38a0aa2d8fe4ce files/1.0.3/openoffice-1.0.3-sparc-gentoo.patch 580
+MD5 edb031b5b0c87b33ff0cd9b5a6fc4a79 files/1.0.3/openoffice-1.0.1-use-freetype-2.1.3.patch 14774
+MD5 5d4663d4ee957ca7329fed3e72e9555c files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3-newgcc.patch 10481
 MD5 c6d765863f974f7f6f6b17d20ad95541 files/1.0.3/openoffice-1.0.1-fix-asm.patch 2207
+MD5 aae1ec77961ab6273026a12a6cf9804c files/1.0.3/openoffice-1.0.2-default-fonts.patch 15285
 MD5 e448fa25e672e8e100a5d68adb75dda3 files/1.0.3/freetype-2.1.3.patch 1367
+MD5 d1194605b25954eaa73f74d9d3982a9b files/1.0.3/openoffice-1.0.1-no-mozab.patch 2496
 MD5 271539dafab707398e9b806eef8f250a files/1.0.3/ooffice-wrapper-1.2 8220
-MD5 46080de39ef5acd7488ce1e76ac10cbe files/1.0.3/ooffice-wrapper-1.3 8362
 MD5 58a4bf52e74e8e287c29956229b94ff9 files/1.0.3/openoffice-1.0.1-xinteraction-fix.patch 1052
 MD5 d56f7c3ee055eb733a7d6a9d87ccc6d7 files/1.0.3/openoffice-1.0.1-fix-jdk-1.4.0.patch 2091
-MD5 5d4663d4ee957ca7329fed3e72e9555c files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3-newgcc.patch 10481
 MD5 67ce98390eb8da814deb778bc3b524f7 files/1.0.3/vcl.printcxx.OOO_STABLE_1_PORTS.100102.patch 612
-MD5 aae1ec77961ab6273026a12a6cf9804c files/1.0.3/openoffice-1.0.2-default-fonts.patch 15285
-MD5 3834566292e23e2832f625e0b5accf85 files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3.patch 10485
-MD5 d1194605b25954eaa73f74d9d3982a9b files/1.0.3/openoffice-1.0.1-no-mozab.patch 2496
-MD5 d61186f38b5e704b69af03ce33a9053d files/1.0.3/openoffice-errno.patch 291
-MD5 3fe10dea0d52c0779a9929b021d84e43 files/1.0.3/openoffice-1.0.1-compiler-flags.patch 954
-MD5 bf8388f4d41ad2ed1a38a0aa2d8fe4ce files/1.0.3/openoffice-1.0.3-sparc-gentoo.patch 580
-MD5 ce580b49f86ec9ab3ceba58268c886df files/1.0.3/openoffice-1.0.1-sparc.patch.bz2 15843
-MD5 edb031b5b0c87b33ff0cd9b5a6fc4a79 files/1.0.3/openoffice-1.0.1-use-freetype-2.1.3.patch 14774
 MD5 80d0277676c6b7e55b29a12b02eae325 files/1.0.3/openoffice-1.0.2-ft-antialias-advice.patch 596
-MD5 fa0af18a5e8a31bf68e0cdbb2f0e4981 files/1.1.0/fixed-gcc.patch 644
-MD5 ea579df37ecea73bc37977db44c7bba4 files/1.1.0/ooffice-wrapper-1.3 8972
-MD5 0b9b6204209b8be145648863dbffaa99 files/1.1.0/openoffice-1.1.0-sparc64-fix.patch 400
+MD5 d61186f38b5e704b69af03ce33a9053d files/1.0.3/openoffice-errno.patch 291
 MD5 7499a81bad1959834a0e6f995200e3e8 files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch 603
+MD5 ea579df37ecea73bc37977db44c7bba4 files/1.1.0/ooffice-wrapper-1.3 8972
 MD5 309ec50c6facc777068caebd51640c92 files/1.1.0/no-mozab.patch 2741
+MD5 0b9b6204209b8be145648863dbffaa99 files/1.1.0/openoffice-1.1.0-sparc64-fix.patch 400
 MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.0/nptl.patch 1285
+MD5 fa0af18a5e8a31bf68e0cdbb2f0e4981 files/1.1.0/fixed-gcc.patch 644
 MD5 93eb1ff95722454c0eb92a916dc4877d files/1.1.0/newstlportfix.patch 17655
diff --git a/app-office/openoffice/openoffice-1.1.0-r3.ebuild b/app-office/openoffice/openoffice-1.1.0-r3.ebuild
index 72269b6d9fa5..a1c5883c3c36 100644
--- a/app-office/openoffice/openoffice-1.1.0-r3.ebuild
+++ b/app-office/openoffice/openoffice-1.1.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.0-r3.ebuild,v 1.5 2004/02/03 20:31:01 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.0-r3.ebuild,v 1.6 2004/02/05 10:34:16 pauldv Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -494,6 +494,15 @@ src_install() {
 		done
 	fi
 
+	# Do not actually install the desktop bindings for users, we have
+	# installed them globally
+	for module in gid_Module_Optional_Gnome gid_Module_Optional_Kde gid_Module_Optional_Cde
+	do
+		perl -pi -e "/^Module $module/ .. /^End/ and s|(Installed.*)=.*|\1= NO;|" \
+		${D}${INSTDIR}/program/instdb.ins
+	done
+
+
 
 	# Remove unneeded stuff
 	rm -rf ${D}${INSTDIR}/share/cde