diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-12-05 13:48:34 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-12-05 13:48:34 +0000 |
| commit | 4240c499b4b352533d4441ee713b71fed8cf5448 (patch) | |
| tree | 7c5115f0558f1e71a5ac5c3fa3d6174fdd4ca2e4 /app-office | |
| parent | New snapshot to fix bug #444986. (diff) | |
| download | gentoo-2-4240c499b4b352533d4441ee713b71fed8cf5448.tar.gz gentoo-2-4240c499b4b352533d4441ee713b71fed8cf5448.tar.bz2 gentoo-2-4240c499b4b352533d4441ee713b71fed8cf5448.zip | |
Require new 1.0 gstreamer and disable 0.10.
(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-4.0.9999.ebuild | 10 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999-r2.ebuild | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index d626be78f63d..83a17aa2c941 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.411 2012/12/04 17:34:45 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.412 2012/12/05 13:48:34 scarabeus Exp $ + + 05 Dec 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.9999.ebuild, + libreoffice-9999-r2.ebuild: + Require new 1.0 gstreamer and disable 0.10. *libreoffice-3.6.4.3 (04 Dec 2012) *libreoffice-4.0.9999 (04 Dec 2012) diff --git a/app-office/libreoffice/libreoffice-4.0.9999.ebuild b/app-office/libreoffice/libreoffice-4.0.9999.ebuild index 52d71dcbe59f..cb00f951cffe 100644 --- a/app-office/libreoffice/libreoffice-4.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-4.0.9999.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-4.0.9999.ebuild,v 1.1 2012/12/04 17:34:45 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.2 2012/12/05 13:48:34 scarabeus Exp $ EAPI=4 @@ -137,8 +137,8 @@ COMMON_DEPEND=" ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( - >=media-libs/gstreamer-0.10:0.10 - >=media-libs/gst-plugins-base-0.10:0.10 + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) @@ -414,7 +414,6 @@ src_configure() { # --enable-release-build: build the libreoffice as release # --disable-fetch-external: prevent dowloading during compile phase # --disable-gnome-vfs: old gnome virtual fs support - # --disable-gstreamer: support for 1.0 api, we use gstreamer-0.10 for now # --disable-kdeab: kde3 adressbook # --disable-kde: kde3 support # --disable-mozilla: mozilla internal is for contact integration, never @@ -449,7 +448,7 @@ src_configure() { --disable-epm \ --disable-fetch-external \ --disable-gnome-vfs \ - --disable-gstreamer \ + --disable-gstreamer-0-10 \ --disable-ext-report-builder \ --disable-kdeab \ --disable-kde \ @@ -488,7 +487,6 @@ src_configure() { $(use_enable gnome gconf) \ $(use_enable gnome gio) \ $(use_enable gnome lockdown) \ - $(use_enable gstreamer gstreamer-0-10) \ $(use_enable gtk) \ $(use_enable gtk3) \ $(use_enable kde kde4) \ diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild index fb7be7a3a2b9..5d39e9c2fdaa 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.137 2012/11/30 20:53:25 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.138 2012/12/05 13:48:34 scarabeus Exp $ EAPI=4 @@ -137,8 +137,8 @@ COMMON_DEPEND=" ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( - >=media-libs/gstreamer-0.10:0.10 - >=media-libs/gst-plugins-base-0.10:0.10 + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) @@ -414,7 +414,6 @@ src_configure() { # --enable-release-build: build the libreoffice as release # --disable-fetch-external: prevent dowloading during compile phase # --disable-gnome-vfs: old gnome virtual fs support - # --disable-gstreamer: support for 1.0 api, we use gstreamer-0.10 for now # --disable-kdeab: kde3 adressbook # --disable-kde: kde3 support # --disable-mozilla: mozilla internal is for contact integration, never @@ -449,7 +448,7 @@ src_configure() { --disable-epm \ --disable-fetch-external \ --disable-gnome-vfs \ - --disable-gstreamer \ + --disable-gstreamer-0-10 \ --disable-ext-report-builder \ --disable-kdeab \ --disable-kde \ @@ -488,7 +487,6 @@ src_configure() { $(use_enable gnome gconf) \ $(use_enable gnome gio) \ $(use_enable gnome lockdown) \ - $(use_enable gstreamer gstreamer-0-10) \ $(use_enable gtk) \ $(use_enable gtk3) \ $(use_enable kde kde4) \ |