summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2011-02-02 09:11:56 +0000
committerAndreas Proschofsky <suka@gentoo.org>2011-02-02 09:11:56 +0000
commita335a3c22bf2a1bbef263228222a29e0fedf9cdd (patch)
tree72970a147bd55cce8c81036c4b98c3d726641be7 /app-office
parentVersion bump mercurial to 1.7.5. (diff)
downloadhistorical-a335a3c22bf2a1bbef263228222a29e0fedf9cdd.tar.gz
historical-a335a3c22bf2a1bbef263228222a29e0fedf9cdd.tar.bz2
historical-a335a3c22bf2a1bbef263228222a29e0fedf9cdd.zip
Fix desktop files, closes bug #352955
Package-Manager: portage-2.1.9.35/cvs/Linux x86_64
Diffstat (limited to 'app-office')
-rw-r--r--app-office/libreoffice/ChangeLog6
-rw-r--r--app-office/libreoffice/Manifest4
-rw-r--r--app-office/libreoffice/libreoffice-3.3.0.ebuild5
3 files changed, 11 insertions, 4 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 59b652e105ce..aa9761a5ffc9 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.7 2011/01/25 22:22:07 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.8 2011/02/02 09:11:56 suka Exp $
+
+ 02 Feb 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.3.0.ebuild:
+ Fix desktop files, thanks to Sanders Sweers <Sander.Sweers@gmail.com>, see
+ bug #352955
25 Jan 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.3.0.ebuild:
Fix jpeg-dep and some ebuild cleanups
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index f8a50518070e..66161f6bc7f2 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -85,6 +85,6 @@ DIST libreoffice-testing-3.3.0.4.tar.bz2 50947353 RMD160 1ea2c0dc0a3bf4a0ddc9e5b
DIST libreoffice-ure-3.3.0.4.tar.bz2 6163547 RMD160 f52347c5224afd29869030b466e05e722f0bdd64 SHA1 723af233415c9ed7611973e9b89df6a8cfeac911 SHA256 301a3d57f9c46f991298529af606dcb79999717b4e1c5ac6907d1e315dcc1bca
DIST libreoffice-writer-3.3.0.4.tar.bz2 6775537 RMD160 aa4d0d35ed376bbf7903aa444c396973defbd709 SHA1 353cd9adad81428702bb7b8f22c0c9209799f036 SHA256 11e8656ca7e9761a8e2ea3d4526622be1fb1cdc4b2c7a72721e65e8444919bec
DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.3.0.ebuild 18071 RMD160 52bdfb0c7b2e0cf866c80e664371a5f25606706b SHA1 dbdb394fcaf9a19466fec2109494d800d5727451 SHA256 83302177b3384f0081269c362e8f2a730eb8953c94f235e69e66c1133f864d04
-MISC ChangeLog 1732 RMD160 e5540fe2501e6c9f1062b897db5428a1c7345dc3 SHA1 7557491f9c44cbb8f6e607066ca60d6f45d38227 SHA256 e25152f8965e9409cde33526bc202aef2e049f933ff915e18ada5c35f22cb3ca
+EBUILD libreoffice-3.3.0.ebuild 18202 RMD160 35c502b6f8fe19a4ef67211ed0d8c65eaceddef9 SHA1 dc3062dbbd8379c81a2658d7fd500fb645598452 SHA256 03bcf51d44eed0221d269c517d842b736b4f50344e14633dfe14992c2651c5c4
+MISC ChangeLog 1903 RMD160 f2422d89b6794ec2f5e28d6e3b5e5c5a207e7927 SHA1 b6e46d27e3adffac3cd1b6422ee3fa24006e552e SHA256 c12e8e5f7edd80f4602d7135524c0e37109a9e5842db1e7d9c3d83dcdb6f5897
MISC metadata.xml 693 RMD160 f538aa488c8ae05b34a37ea50c5fce9b9a85625e SHA1 85de4ea2ab18cfa53e8673430da6f2c15ce064b2 SHA256 ccbd40dc84f76608141535a48be034e0e24e96978d86ec4478a3efae4f4347b4
diff --git a/app-office/libreoffice/libreoffice-3.3.0.ebuild b/app-office/libreoffice/libreoffice-3.3.0.ebuild
index 982508d484ca..b933818d5c80 100644
--- a/app-office/libreoffice/libreoffice-3.3.0.ebuild
+++ b/app-office/libreoffice/libreoffice-3.3.0.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/libreoffice-3.3.0.ebuild,v 1.4 2011/01/25 22:22:07 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v 1.5 2011/02/02 09:11:56 suka Exp $
EAPI="3"
@@ -329,6 +329,9 @@ src_prepare() {
echo "--without-writer2latex" >> ${CONFFILE}
echo "--without-junit" >> ${CONFFILE}
+ #fix desktop files bug #352955
+ sed -i 's/Exec=oo/Exec=lo/g' "${S}"/desktop/*.desktop.in.in || die "Could not fix desktop files"
+
# needed for sun-templates patch
eautoreconf