summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-office')
-rw-r--r--app-office/libreoffice/ChangeLog6
-rw-r--r--app-office/libreoffice/Manifest32
-rw-r--r--app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild4
-rw-r--r--app-office/libreoffice/libreoffice-9999-r1.ebuild4
4 files changed, 25 insertions, 21 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index d21ee1ce634d..ec45de857008 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.131 2011/09/08 16:31:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.132 2011/09/08 16:50:54 scarabeus Exp $
+
+ 08 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild:
+ Add missing die
08 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index e0ad85933ece..23d83ebf2177 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -172,25 +172,25 @@ DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712
EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 9ac5d82927f327bff9ef1f37304f13239c009f77 SHA1 572dee87269784bd1864e96e1eca820bfee2d513 SHA256 5452357751a154c65c126e4b3bdea17fd1c2d221734d5859d39808cae91d3599
EBUILD libreoffice-3.3.4.ebuild 18146 RMD160 1c71a223f37c402ab01d95b71dfa5af2c69f61af SHA1 18c1211e8eaf8c587f52ee303dc264c941e7c045 SHA256 d602a3efffc23cb848b1fdc667a0d7b1c9dde2502dfae0fb537fecb9ee744cc2
EBUILD libreoffice-3.4.3.2-r1.ebuild 18350 RMD160 54bbfb6be956667016eefe1dad15737cc44e1deb SHA1 59dafcc4461a5c8571f814b41843950420b54fdc SHA256 8f883984653e50045ec2404ce4286950bafd82cf31e97347edc38a61e1fe2b4d
-EBUILD libreoffice-3.4.9999-r1.ebuild 18349 RMD160 20bed67d768fce33b18b7d2f2aee20aaeeefefa6 SHA1 fff6d1bbd4d83304c4b04e96e02794e24b66a95d SHA256 5b8a1db59f305fcdaaa6eb5736e13396d080b5a8bd9d21465bd81e3e8dcdcbd3
-EBUILD libreoffice-9999-r1.ebuild 17657 RMD160 1b4b1f317892cd804c58c8c939ea554262559891 SHA1 93508d06e46c165e952a03f13986e9d3b6a7d49f SHA256 e486ef7b8a428d1ef67c9f5f1fb96eda632e51e1d3913e283f26a4bfe568ca83
-MISC ChangeLog 25968 RMD160 aa1fc321f000070c117cce121245ae45862b48a8 SHA1 7d3627b0422d1b29c3dc4e353a36014193f927df SHA256 b931bc5a653b11bb90c8ad4d54ebabcae52f3eef8589b82d16c723130f36b643
+EBUILD libreoffice-3.4.9999-r1.ebuild 18356 RMD160 51b1cb846c7900663975354fd6f1d7cf0f22a177 SHA1 c7c39420e80a0644d8260db8be7a6df4ac5f6870 SHA256 028fb7cbf31d0e5189d226d7fe6d78a5fed657cddbadb84d3801ba5665f1ea5f
+EBUILD libreoffice-9999-r1.ebuild 17664 RMD160 d419938099ef7fa4a22604636a48823f75918da3 SHA1 eaf4f4819c23caa520c872d801683077d41deea4 SHA256 dbf620d853d8203e01ab80f3201caa43bb72851dac0d26d14c8fda49d86b0e5f
+MISC ChangeLog 26104 RMD160 342695eaa3768a8474df9b2c4183ded9c53f5510 SHA1 56c5317ae6ae5c2bdb2ed53832570c1f668e9e90 SHA256 2d8704b15b08fb0a7886fb07d22efc9dcc61ec18bffa5935bc9fcf7e01173521
MISC libreoffice-3.4.9999-r1.ebuild.orig 18351 RMD160 d9c2102826919b44bf5a559502f245ac6a731b89 SHA1 f15fb2546e57bddd540947677b20ed0f105188b3 SHA256 aab9e1396604e9d3d10bbafa673e86e62c4fe8aac53f5cf9f100299ec0573df2
MISC metadata.xml 980 RMD160 5201a4943c69632cf94cfaf309fba261ea5146ec SHA1 069a007c495275783c7a025f44e4f1ab59edb715 SHA256 191a40132b182e7dc3f504055341014664f42d74caa27ee8dda2b5edbbdac6c2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQIcBAEBAgAGBQJOaO3lAAoJEOSiRoyO7jvovz0P/2bRH5KAp6yVKFwgfzA4bQhK
-Wle3gFW7+5anDb0AbV6csxtqDF71CW6HwIA56U1ekIN1ZeUQaiF8KEMfW9Uq5bBf
-+ExH4NjEhGUcw6aerozjNxZXKg9l6rxTKH3UdNlsEvVGHD2ebJqkNHkNjZiG1vlS
-fpYSqOdMQp6/oKhAi4df4jsUZraXu09JVc3SM5JWzAamBAwz6TWJ903lPphWQOFJ
-sA9SEB40EB1H/AgPtNBHOLRA+zUwbPQeCvkpPcIihqz/MaQmv9oHFf1vvXdFF+fr
-2VjpWqFJFc0kS1cTu0ZT25wTMKDo7OOwZGkjh+2bOfxIis0rMmgpP2ectCrJEI0p
-uTwEKxOD6XWAWGa9FijDOtI3KAoMv9vlqXyZhoxFfY97RpiFM0TatjU4xUAdXAeY
-OIxJ96ks9UdDCBR+FgjtVeYYtw3XrmgLurBBxF8fQTWei8f3XG+M5jXmLSsqWCBF
-XEElxo4pRqcNt5ezdLu6+1nqoE1PytCxgUZezNcoZSyu6l085UpFkHm71A8MKUFv
-I+I10uRF1U4Wpd9erMQArihejIPejx70OoELq76gUAmVgNjGhnxQKg331T1A0elf
-zZvnqMw2li3c6mIxz1+6IA0LRAly1uOq1h2jalvqN6F7PHJEI4nvIeySVdYwOzIs
-oXTHGgAwBw1d5Zk3vWvs
-=AZdG
+iQIcBAEBAgAGBQJOaPJ4AAoJEOSiRoyO7jvo+mEP/RDPLYviPd5fsoXQOT7EBsfu
+6UAM+ByEI4yRUxd52/3GYnF5IWaP2Qlta9MemyUGT+fhnqUUTl3GSzUpwZYv9UEc
+CJUjVHuITkuydQtFlvtluekAcKz6ahPjSwNayPPDL1m3zcu0MKIxoxw81zsAyBBe
+l3yDHI4N3lWE0j2B/OW70GVEhkoITxMNFQylMMhqgckOzjNEYwlxhpI0e7nAJGta
+o9VisgJUNb+93oXNOWwTOR6Zwl7ei+V5XAFY2E+PgSOc6Zqa2tybwY8M84FwEiCq
+Vqwr9GCekNsW5DHAWbKD3X+vzwh1WdQHswfekT8a9c6NiVZ/Fg8Y3GOUp17szsML
+0qKxnrjR+1l0eCm27Hsbn2XQaWJv2qKI+QVuHVAZf0liU9bbyB+HK7tRaL/q3vuh
+vz1vSgH8kMfzhObAB40tvhKjMnO2r4WZo//h1YSXNbVcWrSllfCrl3SD+hktM77x
+JCjLwh4VZLSBOXZV9zEroBnDLOdxKLO7DjskXs9NxN7byZ5VtXGeZJH3Nlip+lMm
+OHaV9CAVosRCT0SGWRf83GfBe2EPFc9cn7kQwrJdKsuxE1uTNs9jqXn4snBCMUSm
+XE2goc6GVzmCjFiOced5g05anNQrN7lDDyaN7JhVPRzQCSnxqvPUV8SS5+nd3Gnp
+RclTBShzfFLFLvlkGpkY
+=Ex8r
-----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
index 91c8e0353815..d3f160f2157c 100644
--- a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.9999-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/libreoffice-3.4.9999-r1.ebuild,v 1.8 2011/09/08 16:31:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.9 2011/09/08 16:50:54 scarabeus Exp $
EAPI=3
@@ -529,7 +529,7 @@ src_install() {
make DESTDIR="${D}" distro-pack-install || die
# Fix bash completion placement
- newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+ newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} || die
rm -rf "${ED}"/etc/
# symlink the plugin to system location
diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild
index 26b6a179158d..c4c1a7822f70 100644
--- a/app-office/libreoffice/libreoffice-9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-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/libreoffice-9999-r1.ebuild,v 1.7 2011/09/08 16:31:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.8 2011/09/08 16:50:54 scarabeus Exp $
EAPI=3
@@ -519,7 +519,7 @@ src_install() {
make DESTDIR="${D}" distro-pack-install || die
# Fix bash completion placement
- newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+ newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} || die
rm -rf "${ED}"/etc/
# symlink the plugin to system location