diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-12-04 15:51:14 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-12-04 15:51:14 +0000 |
| commit | 04f50bb5f0525d8d86c8e5f506d8ade3c6a38eb4 (patch) | |
| tree | 879ec68e15ffece4c608e589c74cd811110ab70f /app-office | |
| parent | arm/ia64/s390/sh/sparc/x86 stable wrt #391725 (diff) | |
| download | gentoo-2-04f50bb5f0525d8d86c8e5f506d8ade3c6a38eb4.tar.gz gentoo-2-04f50bb5f0525d8d86c8e5f506d8ade3c6a38eb4.tar.bz2 gentoo-2-04f50bb5f0525d8d86c8e5f506d8ade3c6a38eb4.zip | |
Introduce gtk3 useflag so we can disable gtk3 by default.
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.5.0.0.ebuild | 12 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999-r2.ebuild | 12 | ||||
| -rw-r--r-- | app-office/libreoffice/metadata.xml | 1 |
4 files changed, 16 insertions, 15 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 258e3d8390b8..209f48bf4a22 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.209 2011/11/30 10:29:23 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.210 2011/12/04 15:51:14 scarabeus Exp $ + + 04 Dec 2011; Tomáš Chvátal <scarabeus@gentoo.org> + libreoffice-3.5.0.0.ebuild, libreoffice-9999-r2.ebuild, metadata.xml: + Introduce gtk3 useflag so we can disable gtk3 by default. 30 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.0.0.ebuild, libreoffice-9999-r2.ebuild: diff --git a/app-office/libreoffice/libreoffice-3.5.0.0.ebuild b/app-office/libreoffice/libreoffice-3.5.0.0.ebuild index 62d473596199..c2dcca4d094f 100644 --- a/app-office/libreoffice/libreoffice-3.5.0.0.ebuild +++ b/app-office/libreoffice/libreoffice-3.5.0.0.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.5.0.0.ebuild,v 1.2 2011/11/30 10:29:23 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.0.ebuild,v 1.3 2011/12/04 15:51:14 scarabeus Exp $ EAPI=4 @@ -69,7 +69,7 @@ unset ADDONS_URI unset EXT_URI unset ADDONS_SRC -IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk +IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk gtk3 +jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba +webdav +xmlsec" LICENSE="LGPL-3" @@ -117,10 +117,8 @@ COMMON_DEPEND=" gnome-base/gconf:2 gnome-base/orbit ) - gtk? ( - >=x11-libs/gtk+-2.24:2 - >=x11-libs/gtk+-3.2:3 - ) + gtk? ( >=x11-libs/gtk+-2.24:2 ) + gtk3? ( >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 @@ -434,7 +432,7 @@ src_configure() { $(use_enable graphite) \ $(use_enable gstreamer) \ $(use_enable gtk) \ - $(use_enable gtk gtk3) \ + $(use_enable gtk3) \ $(use_enable gtk systray) \ $(use_enable java ext-scripting-beanshell) \ $(use_enable kde kde4) \ diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild index 39d95f00f840..d607875aef03 100644 --- a/app-office/libreoffice/libreoffice-9999-r2.ebuild +++ b/app-office/libreoffice/libreoffice-9999-r2.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-r2.ebuild,v 1.10 2011/11/30 10:29:23 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.11 2011/12/04 15:51:14 scarabeus Exp $ EAPI=4 @@ -69,7 +69,7 @@ unset ADDONS_URI unset EXT_URI unset ADDONS_SRC -IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk +IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk gtk3 +jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba +webdav +xmlsec" LICENSE="LGPL-3" @@ -117,10 +117,8 @@ COMMON_DEPEND=" gnome-base/gconf:2 gnome-base/orbit ) - gtk? ( - >=x11-libs/gtk+-2.24:2 - >=x11-libs/gtk+-3.2:3 - ) + gtk? ( >=x11-libs/gtk+-2.24:2 ) + gtk3? ( >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 @@ -434,7 +432,7 @@ src_configure() { $(use_enable graphite) \ $(use_enable gstreamer) \ $(use_enable gtk) \ - $(use_enable gtk gtk3) \ + $(use_enable gtk3) \ $(use_enable gtk systray) \ $(use_enable java ext-scripting-beanshell) \ $(use_enable kde kde4) \ diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml index fec5e3c492a8..d9e38ea4eaf8 100644 --- a/app-office/libreoffice/metadata.xml +++ b/app-office/libreoffice/metadata.xml @@ -10,6 +10,7 @@ version</longdescription> <use> <flag name="binfilter">Enable support for legacy StarOffice 5.x and earlier file formats</flag> <flag name="graphite">Enable support for non-Roman fonts via <pkg>media-gfx/graphite2</pkg></flag> + <flag name="gtk3">Enable highly experimental gtk3 frontend</flag> <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</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> |