From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-334982-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1Q8z15-0000Tl-I6
for garchives@archives.gentoo.org; Sun, 10 Apr 2011 18:05:43 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 898F81C0C8;
Sun, 10 Apr 2011 18:04:50 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 4A1F41C0C2
for <gentoo-commits@lists.gentoo.org>; Sun, 10 Apr 2011 18:04:50 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id EFA7D1B40A2
for <gentoo-commits@lists.gentoo.org>; Sun, 10 Apr 2011 18:04:49 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 588858006D
for <gentoo-commits@lists.gentoo.org>; Sun, 10 Apr 2011 18:04:49 +0000 (UTC)
From: "Gilles Dartiguelongue" <eva@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" <eva@gentoo.org>
Message-ID: <a2e3524adb07350efc9fbd24127c385a0194993f.eva@gentoo>
Subject: [gentoo-commits] proj/gnome:master commit in: media-video/totem/
X-VCS-Repository: proj/gnome
X-VCS-Files: media-video/totem/totem-3.0.0.ebuild media-video/totem/totem-9999.ebuild
X-VCS-Directories: media-video/totem/
X-VCS-Committer: eva
X-VCS-Committer-Name: Gilles Dartiguelongue
X-VCS-Revision: a2e3524adb07350efc9fbd24127c385a0194993f
Date: Sun, 10 Apr 2011 18:04:49 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: 2a65d20db7c3c9aad6e97f3e59c40375
commit: a2e3524adb07350efc9fbd24127c385a0194993f
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 9 15:43:58 2011 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 18:03:27 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D=
commit;h=3Da2e3524a
media-video/totem: QAed
* Sync with gentoo-x86 changes
(Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --forc=
e, signed Manifest commit with key C6085806)
---
media-video/totem/totem-3.0.0.ebuild | 54 ++++++++++++++++------------=
-----
media-video/totem/totem-9999.ebuild | 54 ++++++++++++++++------------=
-----
2 files changed, 52 insertions(+), 56 deletions(-)
diff --git a/media-video/totem/totem-3.0.0.ebuild b/media-video/totem/tot=
em-3.0.0.ebuild
index 3907ae8..cc352c8 100644
--- a/media-video/totem/totem-3.0.0.ebuild
+++ b/media-video/totem/totem-3.0.0.ebuild
@@ -2,33 +2,33 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.30.0-r1.ebu=
ild,v 1.1 2010/06/13 20:36:55 pacho Exp $
=20
-EAPI=3D"2"
+EAPI=3D"3"
+GCONF_DEBUG=3D"yes"
GNOME2_LA_PUNT=3D"yes" # plugins are dlopened
WANT_AUTOMAKE=3D"1.11"
PYTHON_DEPEND=3D"python? 2:2.4"
PYTHON_USE_WITH=3D"threads"
PYTHON_USE_WITH_OPT=3D"python"
+
inherit autotools eutils gnome2 multilib python
if [[ ${PV} =3D 9999 ]]; then
inherit gnome2-live
fi
=20
DESCRIPTION=3D"Media player for GNOME"
-HOMEPAGE=3D"http://gnome.org/projects/totem/"
+HOMEPAGE=3D"http://projects.gnome.org/totem/"
=20
LICENSE=3D"GPL-2 LGPL-2"
SLOT=3D"0"
-IUSE=3D"bluetooth debug doc lirc +introspection iplayer nautilus nsplugi=
n
-+python tracker +youtube vala zeroconf"
if [[ ${PV} =3D 9999 ]]; then
KEYWORDS=3D""
else
KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
+IUSE=3D"bluetooth doc +introspection iplayer lirc nautilus nsplugin +pyt=
hon tracker +youtube vala zeroconf"
=20
# TODO:
# Cone (VLC) plugin needs someone with the right setup (remi ?)
-# check gmyth requirement ? -> waiting for updates in tree
# coherence plugin broken upstream
#
# FIXME: Automagic tracker-0.9.0
@@ -53,37 +53,36 @@ RDEPEND=3D">=3Ddev-libs/glib-2.27.92:2
media-plugins/gst-plugins-x:0.10
media-plugins/gst-plugins-meta:0.10
=20
+ x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
x11-libs/libXtst
>=3Dx11-libs/libXrandr-1.1.1
>=3Dx11-libs/libXxf86vm-1.0.1
=20
+ bluetooth? ( net-wireless/bluez )
introspection? ( >=3Ddev-libs/gobject-introspection-0.6.7 )
- nsplugin? ( >=3Dx11-misc/shared-mime-info-0.22 )
-
- bluetooth? ( || (
- net-wireless/bluez
- net-wireless/bluez-libs ) )
lirc? ( app-misc/lirc )
nautilus? ( >=3Dgnome-base/nautilus-2.91.3 )
- tracker? ( >=3Dapp-misc/tracker-0.9.34 )
- youtube? (
- >=3Ddev-libs/libgdata-0.7.0
- net-libs/libsoup:2.4
- media-plugins/gst-plugins-soup )
-
+ nsplugin? ( >=3Dx11-misc/shared-mime-info-0.22 )
python? (
+ >=3Ddev-libs/gobject-introspection-0.6.7
>=3Ddev-python/pygobject-2.27.0[introspection]
>=3Dx11-libs/gtk+-2.91.7:3[introspection]
dev-python/pyxdg
- dev-python/gst-python
+ dev-python/gst-python:0.10
dev-python/dbus-python
iplayer? (
dev-python/httplib2
dev-python/feedparser
dev-python/beautifulsoup ) )
+ tracker? ( >=3Dapp-misc/tracker-0.9.34 )
vala? ( >=3Ddev-lang/vala-0.11.1:0.12 )
+ youtube? (
+ >=3Ddev-libs/libgdata-0.7.0
+ net-libs/libsoup:2.4
+ media-plugins/gst-plugins-soup:0.10
+ >=3Ddev-libs/totem-pl-parser-2.32.4[quvi] )
zeroconf? ( >=3Dnet-libs/libepc-0.3 )"
=20
DEPEND=3D"${RDEPEND}
@@ -92,20 +91,17 @@ DEPEND=3D"${RDEPEND}
x11-proto/xextproto
x11-proto/xf86vidmodeproto
app-text/scrollkeeper
- gnome-base/gnome-common
>=3Dapp-text/gnome-doc-utils-0.20.3
>=3Ddev-util/intltool-0.40
>=3Ddev-util/pkgconfig-0.20
+ app-text/docbook-xml-dtd:4.5
+ gnome-base/gnome-common
dev-util/gtk-doc-am
- doc? ( >=3Ddev-util/gtk-doc-1.14 )
- app-text/docbook-xml-dtd:4.5"
+ doc? ( >=3Ddev-util/gtk-doc-1.14 )"
# docbook-xml-dtd is needed for user doc
=20
-DOCS=3D"AUTHORS ChangeLog NEWS README TODO"
-
pkg_setup() {
- python_set_active_version 2
-
+ DOCS=3D"AUTHORS ChangeLog NEWS README TODO"
G2CONF=3D"${G2CONF}
--disable-maintainer-mode
--disable-run-in-source-tree
@@ -113,9 +109,8 @@ pkg_setup() {
--disable-scrollkeeper
--disable-static
--with-dbus
- --with-smclient=3Dxsmp
+ --with-smclient
--enable-easy-codec-installation
- $(use_enable debug)
$(use_enable introspection)
$(use_enable nautilus)
$(use_enable nsplugin browser-plugins)
@@ -125,7 +120,7 @@ pkg_setup() {
VALAC=3D$(type -P valac-0.12)
BROWSER_PLUGIN_DIR=3D/usr/$(get_libdir)/nsbrowser/plugins"
=20
- # Disabled: coherence_upnp, sample-python, zeitgeist-dp
+ # Disabled: coherence_upnp, sample-python, sample-vala, zeitgeist-dp
local plugins=3D"brasero-disc-recorder,chapters,im-status,gromit"
plugins=3D"${plugins},media-player-keys,ontop,properties,screensaver"
plugins=3D"${plugins},screenshot,sidebar-test,skipto,thumbnail"
@@ -139,12 +134,13 @@ pkg_setup() {
use zeroconf && plugins=3D"${plugins},publish"
=20
G2CONF=3D"${G2CONF} --with-plugins=3D${plugins}"
+
+ python_set_active_version 2
}
=20
src_prepare() {
# AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fail=
s
mkdir -p m4
- gnome2_src_prepare
=20
# Fix broken smclient option passing
# FIXME: File a bug for this
@@ -158,6 +154,8 @@ src_prepare() {
# disable pyc compiling
mv py-compile py-compile.orig
ln -s $(type -P true) py-compile
+
+ gnome2_src_prepare
}
=20
pkg_postinst() {
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/tote=
m-9999.ebuild
index 3907ae8..cc352c8 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -2,33 +2,33 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.30.0-r1.ebu=
ild,v 1.1 2010/06/13 20:36:55 pacho Exp $
=20
-EAPI=3D"2"
+EAPI=3D"3"
+GCONF_DEBUG=3D"yes"
GNOME2_LA_PUNT=3D"yes" # plugins are dlopened
WANT_AUTOMAKE=3D"1.11"
PYTHON_DEPEND=3D"python? 2:2.4"
PYTHON_USE_WITH=3D"threads"
PYTHON_USE_WITH_OPT=3D"python"
+
inherit autotools eutils gnome2 multilib python
if [[ ${PV} =3D 9999 ]]; then
inherit gnome2-live
fi
=20
DESCRIPTION=3D"Media player for GNOME"
-HOMEPAGE=3D"http://gnome.org/projects/totem/"
+HOMEPAGE=3D"http://projects.gnome.org/totem/"
=20
LICENSE=3D"GPL-2 LGPL-2"
SLOT=3D"0"
-IUSE=3D"bluetooth debug doc lirc +introspection iplayer nautilus nsplugi=
n
-+python tracker +youtube vala zeroconf"
if [[ ${PV} =3D 9999 ]]; then
KEYWORDS=3D""
else
KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
+IUSE=3D"bluetooth doc +introspection iplayer lirc nautilus nsplugin +pyt=
hon tracker +youtube vala zeroconf"
=20
# TODO:
# Cone (VLC) plugin needs someone with the right setup (remi ?)
-# check gmyth requirement ? -> waiting for updates in tree
# coherence plugin broken upstream
#
# FIXME: Automagic tracker-0.9.0
@@ -53,37 +53,36 @@ RDEPEND=3D">=3Ddev-libs/glib-2.27.92:2
media-plugins/gst-plugins-x:0.10
media-plugins/gst-plugins-meta:0.10
=20
+ x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
x11-libs/libXtst
>=3Dx11-libs/libXrandr-1.1.1
>=3Dx11-libs/libXxf86vm-1.0.1
=20
+ bluetooth? ( net-wireless/bluez )
introspection? ( >=3Ddev-libs/gobject-introspection-0.6.7 )
- nsplugin? ( >=3Dx11-misc/shared-mime-info-0.22 )
-
- bluetooth? ( || (
- net-wireless/bluez
- net-wireless/bluez-libs ) )
lirc? ( app-misc/lirc )
nautilus? ( >=3Dgnome-base/nautilus-2.91.3 )
- tracker? ( >=3Dapp-misc/tracker-0.9.34 )
- youtube? (
- >=3Ddev-libs/libgdata-0.7.0
- net-libs/libsoup:2.4
- media-plugins/gst-plugins-soup )
-
+ nsplugin? ( >=3Dx11-misc/shared-mime-info-0.22 )
python? (
+ >=3Ddev-libs/gobject-introspection-0.6.7
>=3Ddev-python/pygobject-2.27.0[introspection]
>=3Dx11-libs/gtk+-2.91.7:3[introspection]
dev-python/pyxdg
- dev-python/gst-python
+ dev-python/gst-python:0.10
dev-python/dbus-python
iplayer? (
dev-python/httplib2
dev-python/feedparser
dev-python/beautifulsoup ) )
+ tracker? ( >=3Dapp-misc/tracker-0.9.34 )
vala? ( >=3Ddev-lang/vala-0.11.1:0.12 )
+ youtube? (
+ >=3Ddev-libs/libgdata-0.7.0
+ net-libs/libsoup:2.4
+ media-plugins/gst-plugins-soup:0.10
+ >=3Ddev-libs/totem-pl-parser-2.32.4[quvi] )
zeroconf? ( >=3Dnet-libs/libepc-0.3 )"
=20
DEPEND=3D"${RDEPEND}
@@ -92,20 +91,17 @@ DEPEND=3D"${RDEPEND}
x11-proto/xextproto
x11-proto/xf86vidmodeproto
app-text/scrollkeeper
- gnome-base/gnome-common
>=3Dapp-text/gnome-doc-utils-0.20.3
>=3Ddev-util/intltool-0.40
>=3Ddev-util/pkgconfig-0.20
+ app-text/docbook-xml-dtd:4.5
+ gnome-base/gnome-common
dev-util/gtk-doc-am
- doc? ( >=3Ddev-util/gtk-doc-1.14 )
- app-text/docbook-xml-dtd:4.5"
+ doc? ( >=3Ddev-util/gtk-doc-1.14 )"
# docbook-xml-dtd is needed for user doc
=20
-DOCS=3D"AUTHORS ChangeLog NEWS README TODO"
-
pkg_setup() {
- python_set_active_version 2
-
+ DOCS=3D"AUTHORS ChangeLog NEWS README TODO"
G2CONF=3D"${G2CONF}
--disable-maintainer-mode
--disable-run-in-source-tree
@@ -113,9 +109,8 @@ pkg_setup() {
--disable-scrollkeeper
--disable-static
--with-dbus
- --with-smclient=3Dxsmp
+ --with-smclient
--enable-easy-codec-installation
- $(use_enable debug)
$(use_enable introspection)
$(use_enable nautilus)
$(use_enable nsplugin browser-plugins)
@@ -125,7 +120,7 @@ pkg_setup() {
VALAC=3D$(type -P valac-0.12)
BROWSER_PLUGIN_DIR=3D/usr/$(get_libdir)/nsbrowser/plugins"
=20
- # Disabled: coherence_upnp, sample-python, zeitgeist-dp
+ # Disabled: coherence_upnp, sample-python, sample-vala, zeitgeist-dp
local plugins=3D"brasero-disc-recorder,chapters,im-status,gromit"
plugins=3D"${plugins},media-player-keys,ontop,properties,screensaver"
plugins=3D"${plugins},screenshot,sidebar-test,skipto,thumbnail"
@@ -139,12 +134,13 @@ pkg_setup() {
use zeroconf && plugins=3D"${plugins},publish"
=20
G2CONF=3D"${G2CONF} --with-plugins=3D${plugins}"
+
+ python_set_active_version 2
}
=20
src_prepare() {
# AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fail=
s
mkdir -p m4
- gnome2_src_prepare
=20
# Fix broken smclient option passing
# FIXME: File a bug for this
@@ -158,6 +154,8 @@ src_prepare() {
# disable pyc compiling
mv py-compile py-compile.orig
ln -s $(type -P true) py-compile
+
+ gnome2_src_prepare
}
=20
pkg_postinst() {