summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2011-06-14 18:17:56 +0000
committerAndreas Proschofsky <suka@gentoo.org>2011-06-14 18:17:56 +0000
commit17f3257b6770f28726ab7b8a2b7815118fb4e665 (patch)
tree49256300f9749ddff477196d3592241eb54188e4 /app-office/libreoffice-bin
parentFixed empty swig patch, thanks matts88 (diff)
downloadgentoo-2-17f3257b6770f28726ab7b8a2b7815118fb4e665.tar.gz
gentoo-2-17f3257b6770f28726ab7b8a2b7815118fb4e665.tar.bz2
gentoo-2-17f3257b6770f28726ab7b8a2b7815118fb4e665.zip
Fix wrong command in desktop files, bug #370345 and a problem with offlinehelp installation, bug
(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)
Diffstat (limited to 'app-office/libreoffice-bin')
-rw-r--r--app-office/libreoffice-bin/ChangeLog9
-rw-r--r--app-office/libreoffice-bin/libreoffice-bin-3.4.0-r1.ebuild (renamed from app-office/libreoffice-bin/libreoffice-bin-3.4.0.ebuild)5
2 files changed, 11 insertions, 3 deletions
diff --git a/app-office/libreoffice-bin/ChangeLog b/app-office/libreoffice-bin/ChangeLog
index ae25cf688986..7c5ddfa7b800 100644
--- a/app-office/libreoffice-bin/ChangeLog
+++ b/app-office/libreoffice-bin/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-office/libreoffice-bin
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.24 2011/06/05 17:47:44 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.25 2011/06/14 18:17:56 suka Exp $
+
+*libreoffice-bin-3.4.0-r1 (14 Jun 2011)
+
+ 14 Jun 2011; Andreas Proschofsky <suka@gentoo.org>
+ -libreoffice-bin-3.4.0.ebuild, +libreoffice-bin-3.4.0-r1.ebuild:
+ Fix wrong command in desktop files, bug #370345 and a problem with
+ offlinehelp installation, bug #370179
*libreoffice-bin-3.4.0 (05 Jun 2011)
diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.4.0.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.4.0-r1.ebuild
index 80335e4d7bb7..8ef980038f4a 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-3.4.0.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-3.4.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.0.ebuild,v 1.1 2011/06/05 17:47:44 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.0-r1.ebuild,v 1.1 2011/06/14 18:17:56 suka Exp $
EAPI="3"
@@ -46,7 +46,7 @@ for X in ${LANGS} ; do
done
for Y in ${LANGS2} ; do
- [[ ${Y} != "en" ]] && SRC_URI="${SRC_URI} linguas_${X}? (
+ [[ ${Y} != "en" ]] && SRC_URI="${SRC_URI} linguas_${Y}? (
amd64? ( offlinehelp? ( "${FILEPATH}"/x86_64/LibO_${PV}_Linux_x86-64_helppack-rpm_${Y/_/-}.tar.gz ) )
x86? ( offlinehelp? ( "${FILEPATH}"/x86/LibO_${PV}_Linux_x86_helppack-rpm_${Y/_/-}.tar.gz ) ) )"
done
@@ -164,6 +164,7 @@ src_install () {
use java || { rm javafilter.desktop; continue; }
fi
mv ${desk}.desktop ${NM1}-${desk}.desktop
+ sed -i -e s/${NM2}/${NM}/g ${NM1}-${desk}.desktop || die
domenu ${NM1}-${desk}.desktop
done
insinto /usr/share