Getting rid of the old mimetype stuff which causes broken behaviour for kde

Package-Manager: portage-2.0.52-r1

diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index fdc53fb967dca9fb7c2302f269b223308d849e29..3734b82d493c306582f9162484d191d434370fd2 100644 (file)
--- a/app-office/openoffice-bin/ChangeLog
+++ b/app-office/openoffice-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.94 2005/09/22 11:46:00 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.95 2005/09/24 07:24:37 suka Exp $
+
+  24 Sep 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-1.1.5.ebuild, openoffice-bin-1.9.130.ebuild:
+  Getting rid of the old mimetype stuff which causes broken behaviour for kde,
+  see bug #92767
 
   22 Sep 2005; Luis Medinas <metalgod@gentoo.org>
   openoffice-bin-1.1.5.ebuild:

diff --git a/app-office/openoffice-bin/openoffice-bin-1.1.5.ebuild b/app-office/openoffice-bin/openoffice-bin-1.1.5.ebuild
index b8d08f834d4d9df1c3e99503194b5b7cb93f50bb..32b62012da899ff68f89bf4194bba672140524b2 100644 (file)
--- a/app-office/openoffice-bin/openoffice-bin-1.1.5.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-1.1.5.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-bin/openoffice-bin-1.1.5.ebuild,v 1.3 2005/09/22 11:46:00 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1.5.ebuild,v 1.4 2005/09/24 07:24:37 suka Exp $
 
 # NOTE:  There are two big issues that should be addressed.
 #
@@ -8,7 +8,7 @@
 
 inherit eutils fdo-mime
 
-IUSE="java kde"
+IUSE="java"
 
 INSTDIR="/opt/OpenOffice.org"
 MY_P="OOo_${PV}_LinuxIntel_install"
@@ -116,8 +116,6 @@ src_install() {
        dodir /usr/share
        cp -pPR ${D}${INSTDIR}/share/kde/net/share/icons ${D}/usr/share
 
-       use kde && cp -pPR ${D}${INSTDIR}/share/kde/net/share/mimelnk ${D}/usr/share
-
        for x in ${D}${INSTDIR}/share/kde/net/*.desktop; do
                # We have to handle soffice and setup differently
                sed -i -e "s:${INSTDIR}/program/setup:/usr/bin/oosetup:g" ${x}

diff --git a/app-office/openoffice-bin/openoffice-bin-1.9.130.ebuild b/app-office/openoffice-bin/openoffice-bin-1.9.130.ebuild
index 8357bbef37ae34648de9d889dff6fef30bcf3c17..1ddfa01025208b53d772d64c6b51230ef0605a88 100644 (file)
--- a/app-office/openoffice-bin/openoffice-bin-1.9.130.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-1.9.130.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-bin/openoffice-bin-1.9.130.ebuild,v 1.2 2005/09/19 16:19:33 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.9.130.ebuild,v 1.3 2005/09/24 07:24:37 suka Exp $
 
 inherit eutils fdo-mime rpm versionator
 
@@ -11,7 +11,6 @@ SNV="$(get_version_component_range 3)"
 S="${WORKDIR}/SRC680_m${SNV}_native_packed-1_en-US.8955/RPMS"
 DESCRIPTION="OpenOffice productivity suite"
 
-
 LANGPACK="OOo_${PV}_LinuxIntel_langpack"
 LANGPACKPATH="http://oootranslation.services.openoffice.org/pub/OpenOffice.org/680m${SNV}/${LANGPACK}"
 LANGLOC="http://ftp.linux.cz/pub/localization/OpenOffice.org/devel/680/SRC680_m${SNV}/Build-1/OOo_SRC680_m${SNV}_native_LinuxIntel_langpacks_rpm"
@@ -109,8 +108,6 @@ src_install () {
        mv ${WORKDIR}/opt/openoffice.org${PV}/* ${D}${INSTDIR}
        mv ${WORKDIR}/usr/share/icons/* ${D}/usr/share/icons
 
-       use kde && dodir /usr/share/mimelnk/application && mv ${WORKDIR}/opt/kde3/share/mimelnk/application/* ${D}/usr/share/mimelnk/application
-
        #Menu entries
        cd ${D}${INSTDIR}/share/xdg/
 

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 02944682651d53433d65a713833a6985cd3a6fd7..c638765323d55280a446a1cff3102bd8c899c551 100644 (file)
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # 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.125 2005/09/24 05:41:22 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.126 2005/09/24 07:27:54 suka Exp $
+
+  24 Sep 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-1.1.5.ebuild:
+  Getting rid of the old mimetype stuff which causes broken behaviour for kde,
+  see bug #92767
 
   24 Sep 2005; Andreas Proschofsky <suka@gentoo.org>
   +files/1.1.5/build-new-xslt.diff, openoffice-1.1.5.ebuild:

diff --git a/app-office/openoffice/openoffice-1.1.5.ebuild b/app-office/openoffice/openoffice-1.1.5.ebuild
index 4113c69d5160b9f64a86b26169177091c188c167..61643d8853db037702e966462ee66ab8e93fa8d5 100644 (file)
--- a/app-office/openoffice/openoffice-1.1.5.ebuild
+++ b/app-office/openoffice/openoffice-1.1.5.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-1.1.5.ebuild,v 1.4 2005/09/24 05:41:22 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.5.ebuild,v 1.5 2005/09/24 07:27:54 suka Exp $
 
 # Notes:
 #
@@ -26,7 +26,7 @@
 
 inherit eutils fdo-mime flag-o-matic toolchain-funcs
 
-IUSE="curl hardened java kde nptl zlib"
+IUSE="curl hardened java nptl zlib"
 
 INSTDIR="/opt/OpenOffice.org"
 S="${WORKDIR}/OOo_${PV}"
@@ -515,8 +515,6 @@ src_install() {
        dodir /usr/share
        cp -pPR ${D}${INSTDIR}/share/kde/net/share/icons ${D}/usr/share
 
-       use kde && cp -pPR ${D}${INSTDIR}/share/kde/net/share/mimelnk ${D}/usr/share
-
        for x in ${D}${INSTDIR}/share/kde/net/*.desktop; do
                # We have to handle soffice and setup differently
                sed -i -e "s:${INSTDIR}/program/setup:/usr/bin/oosetup:g" ${x}