summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2013-11-15 14:15:24 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2013-11-15 14:15:24 +0000
commit30477eb8541072b55be6940fb9e595c7c47e37ae (patch)
treeb619dbc34c545371e78d9fdb4a10385289747beb /app-office/libreoffice
parentVersion bump to 0.9.1 release required for 4.2 only. (diff)
downloadgentoo-2-30477eb8541072b55be6940fb9e595c7c47e37ae.tar.gz
gentoo-2-30477eb8541072b55be6940fb9e595c7c47e37ae.tar.bz2
gentoo-2-30477eb8541072b55be6940fb9e595c7c47e37ae.zip
Fixup hickup about the helpfile generating (hopefully).
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'app-office/libreoffice')
-rw-r--r--app-office/libreoffice/ChangeLog5
-rw-r--r--app-office/libreoffice/libreoffice-9999-r2.ebuild9
2 files changed, 8 insertions, 6 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 730b6d91e0bb..cb8859a78544 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.522 2013/11/15 10:14:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.523 2013/11/15 14:15:24 scarabeus Exp $
+
+ 15 Nov 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild:
+ Fixup hickup about the helpfile generating (hopefully).
15 Nov 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.1.2.3.ebuild,
libreoffice-4.1.3.2.ebuild, libreoffice-4.1.9999.ebuild,
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 2b06999d7b5d..a7b6243b6765 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.201 2013/11/15 10:14:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.202 2013/11/15 14:15:24 scarabeus Exp $
EAPI=5
@@ -74,7 +74,7 @@ unset ADDONS_SRC
IUSE="bluetooth +branding +cups dbus debug eds firebird gnome gstreamer +gtk
gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba vlc +webdav"
-LO_EXTS="nlpsolver presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
# Unpackaged separate extensions:
# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
# hunart: only on ooo extensions -> fubared download path somewhere on sf
@@ -208,7 +208,7 @@ DEPEND="${COMMON_DEPEND}
dev-util/cppunit
>=dev-util/gperf-3
dev-util/intltool
- >=dev-util/mdds-0.9.0:=
+ >=dev-util/mdds-0.9.1:=
virtual/pkgconfig
net-misc/npapi-sdk
>=sys-apps/findutils-4.4.2
@@ -497,7 +497,6 @@ src_configure() {
$(use_enable opengl) \
$(use_enable postgres postgresql-sdbc) \
$(use_enable telepathy) \
- $(use_enable test linkoo) \
$(use_enable vba) \
$(use_enable vlc) \
$(use_enable webdav neon) \
@@ -517,7 +516,7 @@ src_compile() {
grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
source "${T}/config_host.mk" 2&> /dev/null
- local path="${SOLARVER}/${INPATH}/res/img"
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
mkdir -p "${path}" || die
echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""