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 ) id 1SC5AO-00020F-Ld for garchives@archives.gentoo.org; Mon, 26 Mar 2012 08:20:40 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 57924E062C; Mon, 26 Mar 2012 08:20:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 16B91E060D for ; Mon, 26 Mar 2012 08:20:13 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 55DBD1B4071 for ; Mon, 26 Mar 2012 08:20:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B7D89E5432 for ; Mon, 26 Mar 2012 08:20:09 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <1332749979.4876bc6549c7bb8ee379c32b74310cd30ca95eca.nirbheek@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.3.92.ebuild media-video/totem/totem-9999.ebuild X-VCS-Directories: media-video/totem/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 4876bc6549c7bb8ee379c32b74310cd30ca95eca X-VCS-Branch: master Date: Mon, 26 Mar 2012 08:20:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 4da0732b-58a7-4c6c-beef-5a3d2f903618 X-Archives-Hash: 0f04d3e62a18a7c154ab25fafff6f05b commit: 4876bc6549c7bb8ee379c32b74310cd30ca95eca Author: Nirbheek Chauhan gentoo org> AuthorDate: Mon Mar 26 07:06:45 2012 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Mon Mar 26 08:19:39 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D4876bc65 Add media-video/totem-3.3.92 --- .../{totem-9999.ebuild =3D> totem-3.3.92.ebuild} | 53 ++++++++++--= ------- media-video/totem/totem-9999.ebuild | 53 ++++++++++----= ----- 2 files changed, 56 insertions(+), 50 deletions(-) diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/tote= m-3.3.92.ebuild similarity index 78% copy from media-video/totem/totem-9999.ebuild copy to media-video/totem/totem-3.3.92.ebuild index cb30a79..f30d37e 100644 --- a/media-video/totem/totem-9999.ebuild +++ b/media-video/totem/totem-3.3.92.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # 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 $ +# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.2.2.ebuild,= v 1.2 2012/02/20 08:18:35 tetromino Exp $ =20 EAPI=3D"4" GCONF_DEBUG=3D"yes" @@ -20,23 +20,23 @@ HOMEPAGE=3D"http://projects.gnome.org/totem/" =20 LICENSE=3D"GPL-2 LGPL-2" SLOT=3D"0" +IUSE=3D"doc grilo +introspection iplayer lirc nautilus nsplugin +python = test vala +zeitgeist zeroconf" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else - KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" + KEYWORDS=3D"~amd64 ~x86 ~x86-fbsd" fi -IUSE=3D"bluetooth doc grilo +introspection iplayer lirc nautilus nsplugi= n +python +youtube vala" # zeroconf =20 # TODO: # Cone (VLC) plugin needs someone with the right setup (remi ?) # coherence plugin broken upstream # # FIXME: Automagic tracker-0.9.0 -# XXX: Add Zeitgeist support when it gets added to GNOME 3 (3.2?) # Runtime dependency on gnome-session-2.91 RDEPEND=3D">=3Ddev-libs/glib-2.27.92:2 >=3Dx11-libs/gdk-pixbuf-2.23.0:2 - >=3Dx11-libs/gtk+-2.99.3:3[introspection?] + >=3Dx11-libs/gtk+-3.3.6:3[introspection?] >=3Ddev-libs/totem-pl-parser-2.32.4[introspection?] >=3Ddev-libs/libpeas-1.1.0[gtk] >=3Dx11-themes/gnome-icon-theme-2.16 @@ -61,8 +61,8 @@ RDEPEND=3D">=3Ddev-libs/glib-2.27.92:2 x11-libs/libX11 x11-libs/libXtst >=3Dx11-libs/libXxf86vm-1.0.1 + x11-themes/gnome-icon-theme-symbolic =20 - bluetooth? ( net-wireless/bluez ) grilo? ( >=3Dmedia-libs/grilo-0.1.16 ) introspection? ( >=3Ddev-libs/gobject-introspection-0.6.7 ) lirc? ( app-misc/lirc ) @@ -81,13 +81,9 @@ RDEPEND=3D">=3Ddev-libs/glib-2.27.92:2 dev-python/httplib2 dev-python/feedparser dev-python/beautifulsoup ) ) - vala? ( >=3Ddev-lang/vala-0.12.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.5.0 ) + vala? ( >=3Ddev-lang/vala-0.14.2-r1:0.14 ) + zeitgeist? ( dev-libs/libzeitgeist ) + zeroconf? ( >net-libs/libepc-0.4.0 )" # XXX: zeroconf requires unreleased version of libepc =20 DEPEND=3D"${RDEPEND} @@ -101,11 +97,16 @@ DEPEND=3D"${RDEPEND} app-text/docbook-xml-dtd:4.5 gnome-base/gnome-common dev-util/gtk-doc-am - doc? ( >=3Ddev-util/gtk-doc-1.14 )" + doc? ( >=3Ddev-util/gtk-doc-1.14 ) + test? ( python? ( dev-python/pylint ) )" # docbook-xml-dtd is needed for user doc =20 # see bug #359379 -REQUIRED_USE=3D"python? ( introspection )" +REQUIRED_USE=3D"python? ( introspection ) + zeitgeist? ( vala )" + +# XXX: pylint checks fail because of bad code +RESTRICT=3D"test" =20 pkg_setup() { DOCS=3D"AUTHORS ChangeLog NEWS README TODO" @@ -119,27 +120,31 @@ pkg_setup() { $(use_enable introspection) $(use_enable nautilus) $(use_enable nsplugin browser-plugins) + $(use_enable nsplugin vegas-plugin) $(use_enable python) $(use_enable python introspection) $(use_enable vala) - VALAC=3D$(type -P valac-0.12) + VALAC=3D$(type -P valac-0.14) BROWSER_PLUGIN_DIR=3D/usr/$(get_libdir)/nsbrowser/plugins" + + if ! use test; then + # pylint is checked unconditionally, but is only used for make check + G2CONF=3D"${G2CONF} PYLINT=3D$(type -P true)" + fi #--with-smclient=3Dauto needed to correctly link to libICE and libSM =20 # Disabled: 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" - use bluetooth && plugins=3D"${plugins},bemused" use grilo && plugins=3D"${plugins},grilo" use iplayer && plugins=3D"${plugins},iplayer" use lirc && plugins=3D"${plugins},lirc" use nautilus && plugins=3D"${plugins},save-file" use python && plugins=3D"${plugins},dbusservice,pythonconsole,opensubti= tles" use vala && plugins=3D"${plugins},rotation" - use youtube && plugins=3D"${plugins},youtube" - # XXX: zeroconf requires unreleased version of libepc - # use zeroconf && plugins=3D"${plugins},publish" + use zeitgeist && plugins=3D"${plugins},zeitgeist-dp" + use zeroconf && plugins=3D"${plugins},publish" =20 G2CONF=3D"${G2CONF} --with-plugins=3D${plugins}" =20 @@ -156,9 +161,7 @@ src_prepare() { # eautoreconf #fi =20 - # disable pyc compiling - mv py-compile py-compile.orig - ln -s $(type -P true) py-compile + use python && python_clean_py-compile_files =20 gnome2_src_prepare } @@ -178,5 +181,5 @@ pkg_postinst() { =20 pkg_postrm() { gnome2_pkg_postrm - python_mod_cleanup /usr/$(get_libdir)/totem/plugins + use python && python_mod_cleanup /usr/$(get_libdir)/totem/plugins } diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/tote= m-9999.ebuild index cb30a79..f30d37e 100644 --- a/media-video/totem/totem-9999.ebuild +++ b/media-video/totem/totem-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # 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 $ +# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.2.2.ebuild,= v 1.2 2012/02/20 08:18:35 tetromino Exp $ =20 EAPI=3D"4" GCONF_DEBUG=3D"yes" @@ -20,23 +20,23 @@ HOMEPAGE=3D"http://projects.gnome.org/totem/" =20 LICENSE=3D"GPL-2 LGPL-2" SLOT=3D"0" +IUSE=3D"doc grilo +introspection iplayer lirc nautilus nsplugin +python = test vala +zeitgeist zeroconf" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else - KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" + KEYWORDS=3D"~amd64 ~x86 ~x86-fbsd" fi -IUSE=3D"bluetooth doc grilo +introspection iplayer lirc nautilus nsplugi= n +python +youtube vala" # zeroconf =20 # TODO: # Cone (VLC) plugin needs someone with the right setup (remi ?) # coherence plugin broken upstream # # FIXME: Automagic tracker-0.9.0 -# XXX: Add Zeitgeist support when it gets added to GNOME 3 (3.2?) # Runtime dependency on gnome-session-2.91 RDEPEND=3D">=3Ddev-libs/glib-2.27.92:2 >=3Dx11-libs/gdk-pixbuf-2.23.0:2 - >=3Dx11-libs/gtk+-2.99.3:3[introspection?] + >=3Dx11-libs/gtk+-3.3.6:3[introspection?] >=3Ddev-libs/totem-pl-parser-2.32.4[introspection?] >=3Ddev-libs/libpeas-1.1.0[gtk] >=3Dx11-themes/gnome-icon-theme-2.16 @@ -61,8 +61,8 @@ RDEPEND=3D">=3Ddev-libs/glib-2.27.92:2 x11-libs/libX11 x11-libs/libXtst >=3Dx11-libs/libXxf86vm-1.0.1 + x11-themes/gnome-icon-theme-symbolic =20 - bluetooth? ( net-wireless/bluez ) grilo? ( >=3Dmedia-libs/grilo-0.1.16 ) introspection? ( >=3Ddev-libs/gobject-introspection-0.6.7 ) lirc? ( app-misc/lirc ) @@ -81,13 +81,9 @@ RDEPEND=3D">=3Ddev-libs/glib-2.27.92:2 dev-python/httplib2 dev-python/feedparser dev-python/beautifulsoup ) ) - vala? ( >=3Ddev-lang/vala-0.12.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.5.0 ) + vala? ( >=3Ddev-lang/vala-0.14.2-r1:0.14 ) + zeitgeist? ( dev-libs/libzeitgeist ) + zeroconf? ( >net-libs/libepc-0.4.0 )" # XXX: zeroconf requires unreleased version of libepc =20 DEPEND=3D"${RDEPEND} @@ -101,11 +97,16 @@ DEPEND=3D"${RDEPEND} app-text/docbook-xml-dtd:4.5 gnome-base/gnome-common dev-util/gtk-doc-am - doc? ( >=3Ddev-util/gtk-doc-1.14 )" + doc? ( >=3Ddev-util/gtk-doc-1.14 ) + test? ( python? ( dev-python/pylint ) )" # docbook-xml-dtd is needed for user doc =20 # see bug #359379 -REQUIRED_USE=3D"python? ( introspection )" +REQUIRED_USE=3D"python? ( introspection ) + zeitgeist? ( vala )" + +# XXX: pylint checks fail because of bad code +RESTRICT=3D"test" =20 pkg_setup() { DOCS=3D"AUTHORS ChangeLog NEWS README TODO" @@ -119,27 +120,31 @@ pkg_setup() { $(use_enable introspection) $(use_enable nautilus) $(use_enable nsplugin browser-plugins) + $(use_enable nsplugin vegas-plugin) $(use_enable python) $(use_enable python introspection) $(use_enable vala) - VALAC=3D$(type -P valac-0.12) + VALAC=3D$(type -P valac-0.14) BROWSER_PLUGIN_DIR=3D/usr/$(get_libdir)/nsbrowser/plugins" + + if ! use test; then + # pylint is checked unconditionally, but is only used for make check + G2CONF=3D"${G2CONF} PYLINT=3D$(type -P true)" + fi #--with-smclient=3Dauto needed to correctly link to libICE and libSM =20 # Disabled: 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" - use bluetooth && plugins=3D"${plugins},bemused" use grilo && plugins=3D"${plugins},grilo" use iplayer && plugins=3D"${plugins},iplayer" use lirc && plugins=3D"${plugins},lirc" use nautilus && plugins=3D"${plugins},save-file" use python && plugins=3D"${plugins},dbusservice,pythonconsole,opensubti= tles" use vala && plugins=3D"${plugins},rotation" - use youtube && plugins=3D"${plugins},youtube" - # XXX: zeroconf requires unreleased version of libepc - # use zeroconf && plugins=3D"${plugins},publish" + use zeitgeist && plugins=3D"${plugins},zeitgeist-dp" + use zeroconf && plugins=3D"${plugins},publish" =20 G2CONF=3D"${G2CONF} --with-plugins=3D${plugins}" =20 @@ -156,9 +161,7 @@ src_prepare() { # eautoreconf #fi =20 - # disable pyc compiling - mv py-compile py-compile.orig - ln -s $(type -P true) py-compile + use python && python_clean_py-compile_files =20 gnome2_src_prepare } @@ -178,5 +181,5 @@ pkg_postinst() { =20 pkg_postrm() { gnome2_pkg_postrm - python_mod_cleanup /usr/$(get_libdir)/totem/plugins + use python && python_mod_cleanup /usr/$(get_libdir)/totem/plugins }