From: Tomas Chvatal Date: Tue, 4 Oct 2011 08:03:40 +0000 (+0000) Subject: Add useflag for cmis, enabled by default. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b462e7876c6633eb96d59a08ed424b940d4bc53a;p=gentoo.git Add useflag for cmis, enabled by default. Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64 --- diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index f40c874fe20c..be008194261d 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.161 2011/10/03 09:28:24 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.162 2011/10/04 08:03:40 scarabeus Exp $ + + 04 Oct 2011; Tomáš Chvátal + libreoffice-9999-r1.ebuild, metadata.xml: + Add useflag for cmis, enabled by default. 03 Oct 2011; Tomáš Chvátal libreoffice-9999-r1.ebuild: diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild index 143b581373ff..a7e8fd267d0e 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.33 2011/10/03 09:28:24 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.34 2011/10/04 08:03:40 scarabeus Exp $ EAPI=3 @@ -73,8 +73,9 @@ unset ADDONS_URI unset EXT_URI unset ADDONS_SRC -IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer gtk +jemalloc -kde ldap mysql nsplugin odk opengl pdfimport svg templates test +vba +webdav" +IUSE="binfilter +branding +cmis dbus debug eds gnome +graphite gstreamer gtk ++jemalloc kde ldap mysql nsplugin odk opengl pdfimport svg templates test +vba ++webdav" LICENSE="LGPL-3" SLOT="0" [[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" @@ -95,7 +96,6 @@ COMMON_DEPEND=" app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 - dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.18 @@ -117,6 +117,7 @@ COMMON_DEPEND=" x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender + cmis? ( dev-cpp/libcmis ) dbus? ( >=dev-libs/dbus-glib-0.94 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) @@ -367,7 +368,6 @@ src_configure() { --with-system-jars \ --with-system-db \ --with-system-dicts \ - --with-system-libcmis \ --with-system-libvisio \ --with-system-libexttextcat \ --with-system-translate-toolkit \ @@ -438,6 +438,7 @@ src_configure() { $(use_enable vba) \ $(use_enable vba activex-component) \ $(use_enable webdav neon) \ + $(use_with cmis) \ $(use_with java) \ $(use_with ldap openldap) \ $(use_with mysql system-mysql-cppconn) \ diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml index 2c094c39a565..c72a36d0d1a4 100644 --- a/app-office/libreoffice/metadata.xml +++ b/app-office/libreoffice/metadata.xml @@ -9,6 +9,7 @@ computer. It will however make a snappier openoffice than the binary version Enable support for legacy StarOffice 5.x and earlier file formats + Enable support for non-Roman fonts via media-gfx/graphite2 Use dev-libs/jemalloc for allocations Build the Office Development Kit