Newer icon set, desktop file installation simplified

4 files changed, 33 insertions, 25 deletions

diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index e2af7a823f90..7c023b071566 100644
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/openoffice-ximian
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.23 2004/02/15 09:37:17 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.24 2004/02/22 13:30:33 suka Exp $
+
+  22 Feb 2004; <suka@gentoo.org> openoffice-ximian-1.1.50.ebuild:
+  Now uses newest icon package, .desktop file installation simplified
 
   15 Feb 2004; David Holm <dholm@gentoo.org> openoffice-ximian-1.1.50.ebuild:
   Added to ~ppc, closing bug #40801.
diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest
index 33ff191360df..f70d327d9dd6 100644
--- a/app-office/openoffice-ximian/Manifest
+++ b/app-office/openoffice-ximian/Manifest
@@ -1,30 +1,30 @@
-MD5 ffd85f651470c2f4c3000a91253b203c ChangeLog 6429
-MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
+MD5 b5fde4ef54d1fb597b0f67f6ac208817 openoffice-ximian-1.1.50.ebuild 14862
 MD5 9db58898583f97148b0694d8802b0302 openoffice-ximian-1.1.46.ebuild 18267
-MD5 beaffcf9edb1e4ed7787b8e42a0f71d1 openoffice-ximian-1.1.47.3.ebuild 18331
 MD5 36e51c4b7897132fbaa9fd50702a02b7 openoffice-ximian-1.1.49.2-r1.ebuild 16320
+MD5 8d2ed53e4bdc8b4c60692b45d383ad34 ChangeLog 6565
 MD5 470ef3ebe818b4cc6ab5c68bfe7269e2 openoffice-ximian-1.1.49.2.ebuild 15853
-MD5 569ab5adf9ae0c19c047f5321cef8728 openoffice-ximian-1.1.50.ebuild 14694
-MD5 0a7f30e95eac54db54a2be02603f2036 files/digest-openoffice-ximian-1.1.46 213
+MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
+MD5 beaffcf9edb1e4ed7787b8e42a0f71d1 openoffice-ximian-1.1.47.3.ebuild 18331
+MD5 f0de3fac5fcb75c45346444d17cca718 files/drawing.desktop 1653
 MD5 fb82903d8a93d90ebbc14639d4f97f98 files/digest-openoffice-ximian-1.1.47.3 215
 MD5 ccf9300fea0851b4f6332a0451efdd87 files/digest-openoffice-ximian-1.1.49.2 215
-MD5 ccf9300fea0851b4f6332a0451efdd87 files/digest-openoffice-ximian-1.1.49.2-r1 215
-MD5 4f9b79849d2a4852fed3b2678ac8e7bb files/digest-openoffice-ximian-1.1.50 213
-MD5 f0de3fac5fcb75c45346444d17cca718 files/drawing.desktop 1653
-MD5 61809b2d86430fb760a3545a0d27cbb6 files/presentation.desktop 1941
-MD5 4834c6f3d1bac4ab5567ba499c3a584e files/spreadsheet.desktop 1709
 MD5 4657a820e8c5914e37383fa3e014ab38 files/textdoc.desktop 1969
-MD5 7992a51f23c05fdc0b3c422c171f637a files/1.1.0/config.patch 502
-MD5 57dffa4a9df0ca77ebcca05122634d9e files/1.1.0/newstlportfix.patch 10867
-MD5 d09a22a31a3dbfee9ac0e0902d200f75 files/1.1.0/norecent.patch 316
-MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.0/nptl.patch 1285
+MD5 4834c6f3d1bac4ab5567ba499c3a584e files/spreadsheet.desktop 1709
+MD5 61809b2d86430fb760a3545a0d27cbb6 files/presentation.desktop 1941
+MD5 0a7f30e95eac54db54a2be02603f2036 files/digest-openoffice-ximian-1.1.46 213
+MD5 94411eb13f090dd4ac9711b62b15c190 files/digest-openoffice-ximian-1.1.50 213
+MD5 ccf9300fea0851b4f6332a0451efdd87 files/digest-openoffice-ximian-1.1.49.2-r1 215
+MD5 fb9a27908f3982a59eb2b1c4d29ea6f0 files/1.1.0/xoo-textdoc.desktop 2117
 MD5 9caea43966f68ba0f3d7c364c9a01b89 files/1.1.0/ooffice-wrapper-1.3 8964
-MD5 7499a81bad1959834a0e6f995200e3e8 files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch 603
-MD5 0b9b6204209b8be145648863dbffaa99 files/1.1.0/openoffice-1.1.0-sparc64-fix.patch 400
 MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.0/ximian-openoffice.applications 980
-MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.0/ximian-openoffice.keys 6298
-MD5 f9bf9164b43f48d10312b335a86ff248 files/1.1.0/xoo-drawing.desktop 1727
+MD5 d09a22a31a3dbfee9ac0e0902d200f75 files/1.1.0/norecent.patch 316
 MD5 6667ab40f65e61a03abde8bf78a350a3 files/1.1.0/xoo-presentation.desktop 2046
+MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.0/ximian-openoffice.keys 6298
 MD5 0855b12848982a02ab95d6a981926a43 files/1.1.0/xoo-spreadsheet.desktop 1863
-MD5 fb9a27908f3982a59eb2b1c4d29ea6f0 files/1.1.0/xoo-textdoc.desktop 2117
+MD5 0b9b6204209b8be145648863dbffaa99 files/1.1.0/openoffice-1.1.0-sparc64-fix.patch 400
 MD5 9c99fdd340eb8e4c9f09c236eb1a899f files/1.1.0/xooffice-wrapper-1.3 9398
+MD5 7499a81bad1959834a0e6f995200e3e8 files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch 603
+MD5 7992a51f23c05fdc0b3c422c171f637a files/1.1.0/config.patch 502
+MD5 f9bf9164b43f48d10312b335a86ff248 files/1.1.0/xoo-drawing.desktop 1727
+MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.0/nptl.patch 1285
+MD5 57dffa4a9df0ca77ebcca05122634d9e files/1.1.0/newstlportfix.patch 10867
diff --git a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.50 b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.50
index 1a19015ac1e7..6f1a65b130be 100644
--- a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.50
+++ b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.50
@@ -1,3 +1,3 @@
 MD5 bec8b41089ebdad2831f3c456973ad4e OOo_1.1.0_source.tar.bz2 189164050
 MD5 3b5731e74e810265f6806a77e8dcd513 ooo-build-1.1.50.tar.gz 1250140
-MD5 6baa8cb0a8df8486eb8148abb0e7d237 ooo-icons-OOO_1_1-7.tar.gz 1497318
+MD5 61c9379fa718ee7f36ccd2d70f3649c8 ooo-icons-OOO_1_1-8.tar.gz 1344675
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.50.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.50.ebuild
index fe520a01f6b4..9310bb05a43f 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.50.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.50.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-ximian/openoffice-ximian-1.1.50.ebuild,v 1.7 2004/02/15 09:37:17 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.50.ebuild,v 1.8 2004/02/22 13:30:33 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -47,7 +47,7 @@ export WANT_GCC_3="yes"
 
 OO_VER=1.1.0
 PATCHLEVEL=OOO_1_1_0
-ICON_VER=OOO_1_1-7
+ICON_VER=OOO_1_1-8
 INSTDIR="/opt/Ximian-OpenOffice"
 PATCHDIR=${WORKDIR}/ooo-build-${PV}
 ICONDIR=${WORKDIR}/ooo-icons-${ICON_VER}
@@ -95,7 +95,8 @@ DEPEND="${RDEPEND}
 	>=sys-apps/findutils-4.1.20-r1
 	dev-libs/libxslt
 	net-ftp/curl
-	!dev-util/dmake"
+	!dev-util/dmake
+	dev-util/intltool"
 
 pkg_setup() {
 
@@ -454,8 +455,12 @@ src_install() {
 	einfo "Installing Menu shortcuts and mime info (need \"gnome\" or \"kde\" in USE)..."
 	if [ -n "`use gnome`" ]
 	then
+		for menu in drawing presentation spreadsheet textdoc; do
+			intltool-merge -d ../po ${menu}.desktop.in xoo-${menu}.desktop;
+		done
+		sed -i -e s/'=oo'/'=xoo'/g *.desktop
 		insinto /usr/share/applications
-		doins ${FILESDIR}/${OO_VER}/*.desktop
+		doins *.desktop
 		insinto /usr/share/application-registry
 		doins ${FILESDIR}/${OO_VER}/ximian-openoffice.applications
 		insinto /usr/share/mime-info