Bump to 3.2.1 from the gnome overlay. Drop old. Move to EAPI4. Drop alpha, arm, ia64...

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index c86c032f8f9b19b7f1ef93aff6a48d49d9794b2d..eba1c9e52976d2317dfeee9d66745f6c57dc22ee 100644 (file)
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-video/totem
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.325 2011/10/05 17:54:16 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.326 2011/11/03 06:18:47 tetromino Exp $
+
+*totem-3.2.1 (03 Nov 2011)
+
+  03 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/totem-2.90.0-smclient-target-detection.patch, -totem-3.0.1.ebuild,
+  +totem-3.2.1.ebuild, metadata.xml:
+  Bump to 3.2.1 from the gnome overlay. Drop old. Move to EAPI4. Drop alpha,
+  arm, ia64. ppc, ppc64, sparc keywords due to libpeas, mx, clutter-{gst,gtk}
+  dependencies. Notable changes: video is now rendered using clutter; the grilo
+  plugin (auto-activated if built) replaces several plugins in older versions;
+  pygobject-3 compatibility.
 
   05 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> totem-2.32.0-r2.ebuild:
   ppc/ppc64 stable wrt #369909

diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index cef06158da5a58339c79cbd9f84e34425459994a..fd6a6a80f2844c2d1d82cdd98225fe037eaf0aa9 100644 (file)
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,23 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX totem-2.30.2-mp2t-support.patch 522 RMD160 098ad431572647b1f84fa53d79e599dd68db479f SHA1 c1f437b3dd864589b2a8d45aa5b58087ad164edb SHA256 fd75446210f92e4abfb0d80018f1e5aad7fc0d4ad586c222b9984e0207dde963
 AUX totem-2.32.0-smclient-target-detection.patch 1546 RMD160 d26dad41d63e3ce2c819fa0be5844b2797d7fdbd SHA1 103b3182229b54e5b11ab6e941af110ee2761483 SHA256 c2c454e1a1776cc7c07ba4ee069105f6010e92478e9598af23956fac0fb13e63
-AUX totem-2.90.0-smclient-target-detection.patch 1347 RMD160 d8036450e777d4ed8602f6e274b60db21b85d47a SHA1 2329108629cb3736f5a521b58a97458872b5c9ca SHA256 4a40366c2a7e7ce7e9e88279f18757c7e5ccff8d18ced75bf5efb6dee3930a3e
 DIST totem-2.32.0-patches.tar.bz2 13355 RMD160 9974653c46247d37d14f441c8d6f458e2e8fbd2f SHA1 1c575377a610ca672b670107c822970f90edc356 SHA256 fdf1d04e5c2325ba5b982a4fb59b9c70bbdf018418dfc7d0fa8bd28929335a30
 DIST totem-2.32.0.tar.bz2 3278758 RMD160 5312aa67e3ff611be0626fd72da66e1c26d6eb4d SHA1 46589181aee29e021d686a4804bbbb04149a61dc SHA256 982d6aaeca3e4844694fc0a2540d792bea753e24b55cf33203188b32b5914f47
-DIST totem-3.0.1.tar.bz2 3730880 RMD160 6151124c9667812563a54b75151874ad7180f28a SHA1 34aa2e3bff071562f7603e1a72cb6da65ce0ba8b SHA256 013b6cfedac6ff264aa27de7346597d0b8da7f4ed1f91b2c966a13d3fdff679a
+DIST totem-3.2.1.tar.xz 3132760 RMD160 d4283ba926f57cd253ae305cd6f67b161e9ae8c8 SHA1 36370da6475652526facd8511a8be0d615058060 SHA256 e3af3281bde6666af4c7f9594b090087657b06c98e96212b11531269e2ee40a4
 EBUILD totem-2.32.0-r2.ebuild 5904 RMD160 6eb0c383c51f398b07be1da0104ce9928ebda471 SHA1 4a2e07cccfbefe0fe141a21851422092112a2a51 SHA256 8f962bfe8b57cfd48bbcbace9816b9b22004124836aa0ccd1fd26aaf988b6f84
 EBUILD totem-2.32.0.ebuild 5437 RMD160 b6632cc8b3126fd92c3e99f6b78f732a3b3c5efe SHA1 0c3119d4109c23277369fb29c0135bfd13dfcb37 SHA256 cf297857d04a4244027f7190212a6ea06f469f3eb117abb577093347e6cffb51
-EBUILD totem-3.0.1.ebuild 5333 RMD160 ce45b6660d8489ab2cc41193a0b0eb33c58e66d0 SHA1 ef4b2f837e0a860e11c00269cb8881543fddc984 SHA256 5f6ecf1dd6131aaeb6be6b6636ecb624aab950502b15e3e1c8a9eaf8b5593ff0
-MISC ChangeLog 47832 RMD160 b6bdbfb3d396a22d86f7f7c4cc86dfb34dd577aa SHA1 1ec94282180dbe575e9d35d68fcee04c3327149c SHA256 3b8a23d893b58879c6e91b3379b53f141048572ef53f1d35bc8a20816ca82f9b
-MISC metadata.xml 1571 RMD160 75a1c6a006bee7310646a0c80ff50d4cab891d96 SHA1 ddeec80d1f7546993b9d99b11d0ee823b7330bce SHA256 15cd60f986d76ecd41dcab6cd6a2ab370566c6ba9f13308ba2c5e5eed81dc6f9
+EBUILD totem-3.2.1.ebuild 5085 RMD160 f862666ba0a976ba58cb02eae0c7ad631f08571b SHA1 a7291569d2b04c1045e68cdfa934fa2250fabb9c SHA256 6c980be63d2590a9b8c1f22f6d8b4a0da75e20958c09218094022f844a003a45
+MISC ChangeLog 48375 RMD160 f5abaf0d1170fc54d92239aed412d970e0f41579 SHA1 4745ddda7f7a508d96770474ee6f3f371ac76970 SHA256 63cb30feee011e7e23f6fc526887bb242e380be3d32ae348445d647b196af704
+MISC metadata.xml 1677 RMD160 59d7896204f7ec816dfb328963ee5b778183444a SHA1 83e27c979fe6052f731f0fcb279cdf1079f01a9d SHA256 1d1ade7ca3b0fca0d74ae45fa77521ac58481bac8cba3345d662ecc80fd2c3d1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk6Mmc4ACgkQIiMqcbOVdxQPVgP+IFdxfR279scPo5pWBMk81Z0g
-lvRtMtHUHcdjbHSn0t+6E0KWYb6Ne4U4Y1s39ky/GYn2OvgaupTGQnoKh4f7uq/d
-UIJu2vD5NW2p5eqzJm1215EExhZ//+Qt1bQuUUAUoMVBi4npaipBfdnXY0wpUYvO
-NxbyFtHNIBWxLya4Xrk=
-=YxGa
+iF4EAREIAAYFAk6yMk0ACgkQdjK8w9WeBnDkUQD/VIZpzNSYIflFCwRCbeUQPRsz
+b6oGdavVWAMIuBAjCcIA/0HWnSsC+KIu+rGK91Zz9+q/3nwkEvfn7WrT9U1wk2n3
+=f4P/
 -----END PGP SIGNATURE-----

diff --git a/media-video/totem/files/totem-2.90.0-smclient-target-detection.patch b/media-video/totem/files/totem-2.90.0-smclient-target-detection.patch
deleted file mode 100644 (file)
index ad6cc69..0000000
--- a/media-video/totem/files/totem-2.90.0-smclient-target-detection.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -pur totem-2.90.0.orig/configure.in totem-2.90.0/configure.in
---- totem-2.90.0.orig/configure.in     2010-06-19 14:22:16.000000000 -0400
-+++ totem-2.90.0/configure.in  2010-06-25 20:52:05.720211025 -0400
-@@ -153,18 +153,29 @@ GDK_TARGET="$($PKG_CONFIG --variable tar
- SMCLIENT_PKGS=
- AC_MSG_CHECKING([which smclient backend to use])
- AC_ARG_WITH([smclient],
--  [AS_HELP_STRING([--with-smclient],[which smclient backend to use (xsmp/win32/quartz)])],
-+  [AS_HELP_STRING([--with-smclient],[which smclient backend to use @<:@xsmp/win32/quartz/auto@:>@])],
-   [],
--  [case "$GDK_TARGET" in
--    x11) with_smclient=xsmp SMCLIENT_PKGS="sm ice" ;;
-+  [$with_smclient=auto])
-+
-+
-+if test "$with_smclient" != "no"; then
-+
-+  if test "$with_smclient" != "auto" -a "$with_smclient" != "yes"; then
-+    GDK_TARGET="$with_smclient"
-+  fi
-+
-+  case "$GDK_TARGET" in
-+    x11|xsmp) with_smclient=xsmp SMCLIENT_PKGS="sm ice" ;;
-     win32|quartz) with_smclient=$GDK_TARGET ;;
-     *) with_smclient=no ;;
--   esac])
--AC_MSG_RESULT([$with_smclient])
-+  esac
-+
-+  AC_MSG_RESULT([$with_smclient])
- 
--if test "$with_smclient" != "no"; then
-   PKG_CHECK_MODULES([SMCLIENT],[$SMCLIENT_PKGS])
-   AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled])
-+else
-+  AC_MSG_RESULT([$with_smclient])
- fi
- 
- AM_CONDITIONAL([WITH_SMCLIENT],[test "$with_smclient" != "no"])

diff --git a/media-video/totem/metadata.xml b/media-video/totem/metadata.xml
index f1bcb5ec3075274b341c05ee18f5371f4b57cb0a..7969699980820336a1905518d822285a91cc4a0c 100644 (file)
--- a/media-video/totem/metadata.xml
+++ b/media-video/totem/metadata.xml
@@ -12,6 +12,8 @@ Totem is movie player for the GNOME desktop. It features a playlist, fullscreen
                user's bluetooth handset using <pkg>net-wireless/bluez</pkg></flag>
        <flag name="galago">Allow Totem to set your IM client to "away" when a movie
                is playing in fullscreen using <pkg>dev-libs/libgalago</pkg></flag>
+       <flag name="grilo">Use <pkg>media-libs/grilo</pkg> to browse media content
+               from various sources</flag>
        <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
                for introspection</flag>
        <flag name="iplayer">Enable BBC player support</flag>

diff --git a/media-video/totem/totem-3.0.1.ebuild b/media-video/totem/totem-3.2.1.ebuild
similarity index 68%
rename from media-video/totem/totem-3.0.1.ebuild
rename to media-video/totem/totem-3.2.1.ebuild
index a070ce6bed39c386a4c5bc7974a95f7f9dcf77b2..bdeb866e26793e3036555bd897802d756c2e5690 100644 (file)
--- a/media-video/totem/totem-3.0.1.ebuild
+++ b/media-video/totem/totem-3.2.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.0.1.ebuild,v 1.1 2011/08/16 22:34:06 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.2.1.ebuild,v 1.1 2011/11/03 06:18:47 tetromino Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes" # plugins are dlopened
 WANT_AUTOMAKE="1.11"
@@ -10,15 +10,15 @@ PYTHON_DEPEND="python? 2:2.4"
 PYTHON_USE_WITH="threads"
 PYTHON_USE_WITH_OPT="python"
 
-inherit autotools eutils gnome2 multilib python
+inherit gnome2 multilib python
 
 DESCRIPTION="Media player for GNOME"
 HOMEPAGE="http://projects.gnome.org/totem/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="bluetooth doc +introspection iplayer lirc nautilus nsplugin +python tracker +youtube vala zeroconf"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="bluetooth doc grilo +introspection iplayer lirc nautilus nsplugin +python +youtube vala" # zeroconf
 
 # TODO:
 # Cone (VLC) plugin needs someone with the right setup (remi ?)
@@ -31,13 +31,16 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
        >=x11-libs/gdk-pixbuf-2.23.0:2
        >=x11-libs/gtk+-2.99.3:3[introspection?]
        >=dev-libs/totem-pl-parser-2.32.4[introspection?]
-       >=dev-libs/libpeas-0.7.2[gtk]
+       >=dev-libs/libpeas-1.1.0[gtk]
        >=x11-themes/gnome-icon-theme-2.16
        x11-libs/cairo
        >=dev-libs/libxml2-2.6:2
-       >=dev-libs/dbus-glib-0.82
+       >=media-libs/clutter-1.6.8:1.0
+       >=media-libs/clutter-gst-1.3.9:1.0
+       >=media-libs/clutter-gtk-1.0.2:1.0
        >=media-libs/gstreamer-0.10.30:0.10
        >=media-libs/gst-plugins-base-0.10.30:0.10
+       x11-libs/mx:1.0
 
        media-libs/gst-plugins-good:0.10
        media-plugins/gst-plugins-taglib:0.10
@@ -50,17 +53,19 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
        x11-libs/libSM
        x11-libs/libX11
        x11-libs/libXtst
-       >=x11-libs/libXrandr-1.1.1
        >=x11-libs/libXxf86vm-1.0.1
 
        bluetooth? ( net-wireless/bluez )
+       grilo? ( >=media-libs/grilo-0.1.16 )
        introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
        lirc? ( app-misc/lirc )
        nautilus? ( >=gnome-base/nautilus-2.91.3 )
-       nsplugin? ( >=x11-misc/shared-mime-info-0.22 )
+       nsplugin? (
+               >=dev-libs/dbus-glib-0.82
+               >=x11-misc/shared-mime-info-0.22 )
        python? (
                >=dev-libs/gobject-introspection-0.6.7
-               >=dev-python/pygobject-2.27.0[introspection]
+               >=dev-python/pygobject-2.90.3:3
                >=x11-libs/gtk+-2.91.7:3[introspection]
                dev-python/pyxdg
                dev-python/gst-python:0.10
@@ -69,20 +74,19 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
                        dev-python/httplib2
                        dev-python/feedparser
                        dev-python/beautifulsoup ) )
-       tracker? ( >=app-misc/tracker-0.9.34 )
-       vala? ( >=dev-lang/vala-0.11.1:0.12 )
+       vala? ( >=dev-lang/vala-0.12.1:0.12 )
        youtube? (
                >=dev-libs/libgdata-0.7.0
                net-libs/libsoup:2.4
                media-plugins/gst-plugins-soup:0.10
-               >=dev-libs/totem-pl-parser-2.32.4[quvi] )
-       zeroconf? ( >=net-libs/libepc-0.3 )"
+               >=dev-libs/totem-pl-parser-2.32.4[quvi] )"
+#      zeroconf? ( >=net-libs/libepc-0.5.0 )
+# XXX: zeroconf requires unreleased version of libepc
 
 DEPEND="${RDEPEND}
        sys-devel/gettext
        x11-proto/xproto
        x11-proto/xextproto
-       x11-proto/xf86vidmodeproto
        app-text/scrollkeeper
        >=app-text/gnome-doc-utils-0.20.3
        >=dev-util/intltool-0.40
@@ -93,23 +97,17 @@ DEPEND="${RDEPEND}
        doc? ( >=dev-util/gtk-doc-1.14 )"
 # docbook-xml-dtd is needed for user doc
 
-pkg_setup() {
-       # To remove when python eclass supports EAPI=4
-       # see bug #359379
-       if use python && ! use introspection; then
-               eerror "USE=python requires USE=introspection"
-               die "USE=python requires USE=introspection"
-       fi
+# see bug #359379
+REQUIRED_USE="python? ( introspection )"
 
+pkg_setup() {
        DOCS="AUTHORS ChangeLog NEWS README TODO"
        G2CONF="${G2CONF}
-               --disable-maintainer-mode
                --disable-run-in-source-tree
                --disable-schemas-compile
                --disable-scrollkeeper
                --disable-static
-               --with-dbus
-               --with-smclient
+               --with-smclient=auto
                --enable-easy-codec-installation
                $(use_enable introspection)
                $(use_enable nautilus)
@@ -119,39 +117,37 @@ pkg_setup() {
                $(use_enable vala)
                VALAC=$(type -P valac-0.12)
                BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
+       #--with-smclient=auto needed to correctly link to libICE and libSM
 
-       # Disabled: coherence_upnp, sample-python, sample-vala, zeitgeist-dp
+       # Disabled: sample-python, sample-vala, zeitgeist-dp
        local plugins="brasero-disc-recorder,chapters,im-status,gromit"
        plugins="${plugins},media-player-keys,ontop,properties,screensaver"
-       plugins="${plugins},screenshot,sidebar-test,skipto,thumbnail"
+       plugins="${plugins},screenshot,sidebar-test,skipto"
        use bluetooth && plugins="${plugins},bemused"
+       use grilo && plugins="${plugins},grilo"
        use iplayer && plugins="${plugins},iplayer"
        use lirc && plugins="${plugins},lirc"
        use nautilus && plugins="${plugins},save-file"
-       use python && plugins="${plugins},dbus-service,jamendo,pythonconsole,opensubtitles"
-       use tracker && plugins="${plugins},tracker"
+       use python && plugins="${plugins},dbusservice,pythonconsole,opensubtitles"
+       use vala && plugins="${plugins},rotation"
        use youtube && plugins="${plugins},youtube"
-       use zeroconf && plugins="${plugins},publish"
+       # XXX: zeroconf requires unreleased version of libepc
+       # use zeroconf && plugins="${plugins},publish"
 
        G2CONF="${G2CONF} --with-plugins=${plugins}"
 
        python_set_active_version 2
+       python_pkg_setup
 }
 
 src_prepare() {
        # AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
        mkdir -p m4
 
-       # Don't check for gconf sinks, causes access violations that we can't fix.
-       # See bug 358755
-       sed -ri -e 's/gconf[a-z]+sink //g' configure* || die "gconf sed failed"
-
-       # Fix broken smclient option passing
-       # FIXME: File a bug for this
-       epatch "${FILESDIR}/${PN}-2.90.0-smclient-target-detection.patch"
-
-       intltoolize --force --copy --automake || die "intltoolize failed"
-       eautoreconf
+       #if [[ ${PV} != 9999 ]]; then
+       #       intltoolize --force --copy --automake || die "intltoolize failed"
+       #       eautoreconf
+       #fi
 
        # disable pyc compiling
        mv py-compile py-compile.orig