desktop file install is now handled in package-ooo

Package-Manager: portage-2.0.53_rc6

4 files changed, 27 insertions, 10 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 874243cdfe92..9ad42872444b 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.147 2005/10/26 11:19:10 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.148 2005/10/26 20:32:42 suka Exp $
+
+  26 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/2.0.0/gentoo-2.0.0.diff, openoffice-2.0.0.ebuild:
+  Desktop files are now handled correctly in package-ooo, so no need anymore
+  for shuffling them around, this also removes the non-harmful error message
+  at the end of the build
 
   26 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.0.0.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index be4d8337a0d0..95d833fa21f9 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,4 +1,4 @@
-MD5 3d5a08854dab3981771f141a377e1605 ChangeLog 32459
+MD5 c1b9945d3ff933a2f1b27a38bf3cbe26 ChangeLog 32751
 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
 MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598
 MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766
@@ -33,11 +33,11 @@ MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.5/pthreadlink-fix.patch 1133
 MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.5/pyunolink-fix.patch 475
 MD5 dad70b7af2b749a7dde536de033f991b files/2.0.0/Filter.xcu 10709
 MD5 f419a0236d3a5c859af1eba4983ec986 files/2.0.0/build-beanshell-fix.diff 242
-MD5 195d60f5405f9f4ad4d7156c50f57ccb files/2.0.0/gentoo-2.0.0.diff 315
+MD5 cc64cbbd4664277f904c7728ac1ed404 files/2.0.0/gentoo-2.0.0.diff 944
 MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4-r1 325
 MD5 387adcb6e397b6e7f825c8384ce52389 files/digest-openoffice-1.1.5 322
 MD5 039f6964d10fd36776620f93b84705dd files/digest-openoffice-2.0.0 478
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 MD5 60a58fcd938c9d5a770a92f6b7eb9b5d openoffice-1.1.4-r1.ebuild 16561
 MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566
-MD5 f71dd3b292c8d81ecdcaf8a3b7b9fa68 openoffice-2.0.0.ebuild 7448
+MD5 189aff586add08cb8e5b97b40bdd95b1 openoffice-2.0.0.ebuild 7205
diff --git a/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff b/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff
index 495ac50f5f45..93653ada7315 100644
--- a/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff
+++ b/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff
@@ -10,3 +10,19 @@
  [ ArkOnly ]
  system-db-4.3-use-lpthread.diff
  # FIXME this is generally useful -- currently applied here only because
+--- bin/package-ooo 
++++ bin/package-ooo 
+@@ -124,11 +124,11 @@
+   	# Menu icons are currently made in debian/rules
+ 	;;
+   *)
+-	mkdir -p $OODESTDIR/opt/gnome/share/applications
++	mkdir -p $OODESTDIR/usr/share/applications
+ 	cd $TOOLSDIR/desktop
+ 	for source in *.desktop; do
+ 	    dest=`echo $source | sed "s|.desktop\$||"`
+-	    dest="$OODESTDIR/opt/gnome/share/applications/$dest$BINSUFFIX.desktop"
++	    dest="$OODESTDIR/usr/share/applications/$dest$BINSUFFIX.desktop"
+ 	    add_version=
+ 	    test "z$VENDORNAME" = "zNovell" -a "z$BINSUFFIX" != "z" && add_version=" ($VERSION)" || :
+ 	    sed -e "s|@BINSUFFIX@|$BINSUFFIX|g
diff --git a/app-office/openoffice/openoffice-2.0.0.ebuild b/app-office/openoffice/openoffice-2.0.0.ebuild
index c7ecf6384a2d..1aa7a3af1665 100644
--- a/app-office/openoffice/openoffice-2.0.0.ebuild
+++ b/app-office/openoffice/openoffice-2.0.0.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/openoffice-2.0.0.ebuild,v 1.11 2005/10/26 11:19:10 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.12 2005/10/26 20:32:42 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
@@ -208,11 +208,6 @@ src_install() {
 	cd ${PATCHDIR}
 	make DESTDIR=${D} install || die "Installation failed!"
 
-	#Correcting location of menu entries, this should really be handled in ooo-build / setup.in
-	mkdir ${D}/usr/share/applications
-	mv ${D}/opt/gnome/share/applications/* ${D}/usr/share/applications/
-	rmdir ${D}/opt/gnome/share/applications/ -p
-
 	# Install corrected Symbol Font
 	insinto /usr/share/fonts/TTF/
 	doins ${PATCHDIR}/fonts/*.ttf