summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2013-05-21 08:08:43 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2013-05-21 08:08:43 +0000
commit3d661f23b61f41b84a1fbf8ec60f53090b443d38 (patch)
treed42000a62c66445d515dbc8cbb8d4b08eaee3582 /app-office
parentVersion bump to 0.8.1 drop older used only by live version. (diff)
downloadgentoo-2-3d661f23b61f41b84a1fbf8ec60f53090b443d38.tar.gz
gentoo-2-3d661f23b61f41b84a1fbf8ec60f53090b443d38.tar.bz2
gentoo-2-3d661f23b61f41b84a1fbf8ec60f53090b443d38.zip
Few obvious cleanups before branching, removed options/updated deps, etc.
(Portage version: 2.2.0_alpha174/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/libreoffice/ChangeLog5
-rw-r--r--app-office/libreoffice/libreoffice-9999-r2.ebuild9
2 files changed, 7 insertions, 7 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index c616617cde76..9812de2f2904 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.471 2013/05/19 15:18:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.472 2013/05/21 08:08:43 scarabeus Exp $
+
+ 21 May 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild:
+ Few obvious cleanups before branching, removed options/updated deps, etc.
19 May 2013; Andreas K. Huettel <dilfridge@gentoo.org>
files/generate_libreoffice_package.sh:
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 4d3f506d831d..0aed5fddb7d5 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.174 2013/05/09 20:31:12 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.175 2013/05/21 08:08:43 scarabeus Exp $
EAPI=5
@@ -202,7 +202,7 @@ DEPEND="${COMMON_DEPEND}
dev-util/cppunit
>=dev-util/gperf-3
dev-util/intltool
- >=dev-util/mdds-0.8.0:=
+ >=dev-util/mdds-0.8.1:=
virtual/pkgconfig
net-misc/npapi-sdk
>=sys-apps/findutils-4.4.2
@@ -351,7 +351,7 @@ src_prepare() {
if use branding; then
# hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+ mv -v "${WORKDIR}/branding-intro.1ng" "${S}/icon-themes/galaxy/brand/intro.png" || die
fi
}
@@ -414,7 +414,6 @@ src_configure() {
# system headers/libs/...: enforce using system packages
# --enable-cairo: ensure that cairo is always required
# --enable-graphite: disabling causes build breakages
- # --enable-harfbuzz: disabling uses ICU LE which is unmaintained and broken
# --enable-*-link: link to the library rather than just dlopen on runtime
# --enable-release-build: build the libreoffice as release
# --disable-fetch-external: prevent dowloading during compile phase
@@ -435,7 +434,6 @@ src_configure() {
--with-system-dicts \
--enable-cairo-canvas \
--enable-graphite \
- --enable-harfbuzz \
--enable-largefile \
--enable-mergelibs \
--enable-python=system \
@@ -466,7 +464,6 @@ src_configure() {
--with-lang="" \
--with-parallelism=${jbs} \
--with-system-ucpp \
- --with-unix-wrapper=libreoffice \
--with-vendor="Gentoo Foundation" \
--with-x \
--without-afms \