summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2005-09-24 07:27:54 +0000
committerAndreas Proschofsky <suka@gentoo.org>2005-09-24 07:27:54 +0000
commitfd48f121e617e145a08b1749e17a7842819af875 (patch)
tree0b50c11ecc2499c5510bd7d45557484f0d828205 /app-office/openoffice-bin
parentClean out old versions (diff)
downloadgentoo-2-fd48f121e617e145a08b1749e17a7842819af875.tar.gz
gentoo-2-fd48f121e617e145a08b1749e17a7842819af875.tar.bz2
gentoo-2-fd48f121e617e145a08b1749e17a7842819af875.zip
Getting rid of the old mimetype stuff which causes broken behaviour for kde
(Portage version: 2.0.52-r1)
Diffstat (limited to 'app-office/openoffice-bin')
-rw-r--r--app-office/openoffice-bin/ChangeLog7
-rw-r--r--app-office/openoffice-bin/openoffice-bin-1.1.5.ebuild6
-rw-r--r--app-office/openoffice-bin/openoffice-bin-1.9.130.ebuild5
3 files changed, 9 insertions, 9 deletions
diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index fdc53fb967dc..3734b82d493c 100644
--- 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 b8d08f834d4d..32b62012da89 100644
--- 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 8357bbef37ae..1ddfa0102520 100644
--- 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/