diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-09-20 07:36:56 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-09-20 07:36:56 +0000 |
| commit | 066be3e7796362f0f2e13d42f1ac69ca5a5432b2 (patch) | |
| tree | fc917147c1df6d478613a7578f81047aa1107bc3 /app-office | |
| parent | Remove renaming information from patches since patch-2.7 now interprets it, w... (diff) | |
| download | gentoo-2-066be3e7796362f0f2e13d42f1ac69ca5a5432b2.tar.gz gentoo-2-066be3e7796362f0f2e13d42f1ac69ca5a5432b2.tar.bz2 gentoo-2-066be3e7796362f0f2e13d42f1ac69ca5a5432b2.zip | |
Match useflags current options.
(Portage version: 2.2.0_alpha128/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999-r2.ebuild | 21 | ||||
| -rw-r--r-- | app-office/libreoffice/metadata.xml | 1 |
3 files changed, 17 insertions, 11 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index ff7569a7fc2f..cc572a2c660f 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.369 2012/09/17 13:17:52 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.370 2012/09/20 07:36:56 scarabeus Exp $ + + 20 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild, + metadata.xml: + Match useflags current options. 17 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.6.1.2.ebuild, libreoffice-3.6.9999.ebuild, libreoffice-9999-r2.ebuild: diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild index 019fb27ca553..67f55332eafa 100644 --- a/app-office/libreoffice/libreoffice-9999-r2.ebuild +++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.109 2012/09/17 13:17:52 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.110 2012/09/20 07:36:56 scarabeus Exp $ EAPI=4 @@ -72,8 +72,8 @@ unset ADDONS_URI unset EXT_URI unset ADDONS_SRC -IUSE="binfilter binfilterdebug +branding +cups dbus eds gnome gstreamer +gtk -gtk3 jemalloc kde mysql odk opengl postgres svg test +vba +webdav" +IUSE="binfilter bluetooth +branding +cups dbus eds gnome gstreamer +gtk +gtk3 jemalloc kde mysql odk opengl postgres svg telepathy test +vba +webdav" LO_EXTS="nlpsolver pdfimport presenter-console presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher" # Unpackaged separate extensions: @@ -132,6 +132,7 @@ COMMON_DEPEND=" x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender + bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) @@ -163,6 +164,10 @@ COMMON_DEPEND=" ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) svg? ( gnome-base/librsvg ) + telepathy? ( + dev-libs/glib:2 + >=net-libs/telepathy-glib-0.18.0 + ) webdav? ( net-libs/neon ) " @@ -223,6 +228,7 @@ PATCHES=( ) REQUIRED_USE=" + bluetooth? ( dbus ) gnome? ( gtk ) eds? ( gnome ) libreoffice_extensions_nlpsolver? ( java ) @@ -327,13 +333,6 @@ src_prepare() { base_src_prepare - # please no debug in binfilter, it blows up things insanely - if use binfilter && ! use binfilterdebug ; then - for name in $(find "${S}/binfilter" -name makefile.mk) ; do - sed -i -e '1i\CFLAGS+= -g0' $name || die - done - fi - AT_M4DIR="m4" eautoreconf # hack in the autogen.sh @@ -494,6 +493,7 @@ src_configure() { --with-helppack-integration \ --without-sun-templates \ $(use_enable binfilter) \ + $(use_enable bluetooth sdremote) \ $(use_enable cups) \ $(use_enable dbus) \ $(use_enable eds evolution2) \ @@ -509,6 +509,7 @@ src_configure() { $(use_enable opengl) \ $(use_enable postgres postgresql-sdbc) \ $(use_enable svg librsvg system) \ + $(use_enable telepathy) \ $(use_enable test linkoo) \ $(use_enable vba) \ $(use_enable webdav neon) \ diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml index f56aa2a82b48..d4c8e5c9dcbd 100644 --- a/app-office/libreoffice/metadata.xml +++ b/app-office/libreoffice/metadata.xml @@ -16,6 +16,7 @@ version</longdescription> <flag name="nlpsolver">Build extension for non-linear solving in calc</flag> <flag name="odk">Build the Office Development Kit</flag> <flag name="pdfimport">Build pdf-import extension using <pkg>app-text/poppler</pkg>. Note that you don't need this for pdf-export!</flag> + <flag name="telepathy">Enable document colaboration features using telepathy communication framework.</flag> <flag name="vba">Enable support for VBA compatibility and ActiveX embedding</flag> <flag name="webdav">Adds support for HTTP content adding via <pkg>net-libs/neon</pkg></flag> <flag name="xmlsec">Adds support for document signing using internal modified <pkg>dev-libs/xmlsec</pkg> and system <pkg>dev-libs/nss</pkg></flag> |