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
commit5d603dc20f263d3ced378c8c0a340cf1dba5b3d1 (patch)
treeb79c2f9913cbbe249d4a1abcc6bc99a72ca47ee4 /app-office
parentFixed empty swig patch, thanks matts88 (diff)
downloadhistorical-5d603dc20f263d3ced378c8c0a340cf1dba5b3d1.tar.gz
historical-5d603dc20f263d3ced378c8c0a340cf1dba5b3d1.tar.bz2
historical-5d603dc20f263d3ced378c8c0a340cf1dba5b3d1.zip
Fix wrong command in desktop files, bug #370345 and a problem with offlinehelp installation, bug
Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64
Diffstat (limited to 'app-office')
-rw-r--r--app-office/libreoffice-bin/ChangeLog9
-rw-r--r--app-office/libreoffice-bin/Manifest4
-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
3 files changed, 13 insertions, 5 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/Manifest b/app-office/libreoffice-bin/Manifest
index 9ffa22556a73..6a8d9654d7db 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1154,6 +1154,6 @@ DIST LibO_3.4.0_Linux_x86_langpack-rpm_zh-TW.tar.gz 1764530 RMD160 214041f3d2419
DIST LibO_3.4.0_Linux_x86_langpack-rpm_zu.tar.gz 1719174 RMD160 8386de0600a8d87e1047afbdd158b49cfa14526a SHA1 70ad5a516cba83f6eb3568c6f582d4526651a250 SHA256 ec5c65ff3afa42d5306bb3e9b5e0d5c47d15e1e3f71c99ea0dd8d07410e01c77
EBUILD libreoffice-bin-3.3.1.ebuild 6884 RMD160 e927bb00ca4e5233ef1629592924f45c6ee532b3 SHA1 8b3aca14834df512b17a28c3a5e02c657b99e4a0 SHA256 e2560b146d5bf09cc6715511db05f911d1f5c3b4af95405ad7f526c0cd66d951
EBUILD libreoffice-bin-3.3.2.ebuild 6891 RMD160 c02f162213f57c0838838da4d79180c4acfe70a5 SHA1 1001da343d6ab56cbdc79cd2409377c39185cfab SHA256 06e8b2a6d6af9336f275afd12a9c69c4290632be01fbba61d3082432fc0634cb
-EBUILD libreoffice-bin-3.4.0.ebuild 7236 RMD160 ea42d5dd2e481c7ec5d39df8448d04d472802c15 SHA1 c56206d10e41350abbef23330f4686df8732c0e3 SHA256 e00b7a345929772d386985713309928329da6efc01b8388229668eb384afb900
-MISC ChangeLog 4042 RMD160 ef6626dd09fbccc8b35d260da70898c4a7e30823 SHA1 8ef0fe4e7dff1f167d9596390dca98fbd16754db SHA256 5c1da95ad6b569e7142ad4f6e150265b864fca07ad92f6852d708c4aea90199b
+EBUILD libreoffice-bin-3.4.0-r1.ebuild 7298 RMD160 ba638e71914fae622dc35b5abb5d9f29bb082dad SHA1 66de7c5bc90f3157aefd4764c1cfbab2a66f8085 SHA256 9f8511ea8a9f7d28a2669d927e6cd6c78b9fe66dab12e12cc5859d2e8eca818e
+MISC ChangeLog 4313 RMD160 0a52961ccff20f624f4d50fd9119f89eeb29b869 SHA1 ddb8800b2c8385e852f6af9b84f369cad7aa835b SHA256 241f90034f879ec23354757831587f48a6d6b58ff443acafefcee28bdf06b7ef
MISC metadata.xml 470 RMD160 252033a0fe2dea9ea521587808f2403870f961c0 SHA1 8dd15d8cb9fa113656a5f77de79d9fbee5fe58ed SHA256 d455809468711d16b0a1401b67b676876f5f7b6cc59affbc63c0a889a4ba103e
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