From: Pacho Ramos Date: Fri, 11 Jun 2010 12:23:10 +0000 (+0000) Subject: Drop bluez-libs depend. Remove old testing. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0a67a90bcfba6053a9ea6e91254e86bc541014d3;p=gentoo.git Drop bluez-libs depend. Remove old testing. Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog index e732d13afa47..dfcd4efe873c 100644 --- a/media-video/totem/ChangeLog +++ b/media-video/totem/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/totem # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.286 2010/06/04 20:19:04 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.287 2010/06/11 12:23:09 pacho Exp $ + + 11 Jun 2010; Pacho Ramos totem-2.26.3-r1.ebuild, + totem-2.26.5-r1.ebuild, totem-2.28.5-r3.ebuild, -totem-2.28.5-r4.ebuild, + totem-2.28.6.ebuild, metadata.xml: + Drop bluez-libs depend. Remove old testing. 04 Jun 2010; Markus Meier totem-2.28.5-r3.ebuild: x86 stable, bug #314899 diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest index 53e961f6d861..fc8e6ffecd8f 100644 --- a/media-video/totem/Manifest +++ b/media-video/totem/Manifest @@ -10,17 +10,16 @@ DIST totem-2.26.5.tar.bz2 3198042 RMD160 174e91dad2f51c908e4b777e93003c6888fd282 DIST totem-2.28.5-patches.tar.bz2 11640 RMD160 aad39ff2ae08afef567150c9f1500083de9972c6 SHA1 e59c0f614a24741e7b0095cee7a5e5563b4db3c4 SHA256 e2fb840164b2be1bbcf18d97e52e5606cf280306373305b58d128e899367eaf0 DIST totem-2.28.5.tar.bz2 3083946 RMD160 20fa09187a82380d7b7d19c2fb5e8a5a4475307e SHA1 1653528d66a1f11da4bc8f66746828c4a31343d6 SHA256 c788bb314addbeeb2b27a2af0f7448752db22dcfaf8b0a4e704463ba9a9dc063 DIST totem-2.28.6.tar.bz2 3086945 RMD160 cae977bf11f512855ab4abbeb055edc149035eb9 SHA1 94037b3b55c241ae7471a746ed9713f714211088 SHA256 224608c9340f7b3839641327feaa41c4941970f085d5cbec5020d968555d06cb -EBUILD totem-2.26.3-r1.ebuild 4558 RMD160 4d6f26f35fa40d84ae7234d44e0a014a6f8d11ee SHA1 fe7300f85e265e551f98df6e3fa797309162d136 SHA256 8e4d6577d60da54ec636a4b0771a8c5b5e076b0a9cda07786689c1530d000854 -EBUILD totem-2.26.5-r1.ebuild 4696 RMD160 7d77d3ad4fe8f6668b50483d9900164ed86e710c SHA1 235f5b97e0b74d0e6fc905767a97d19c8160d193 SHA256 620e905f88d77881e5bbc643862031cbfddd05140d548d7ea72ed6f7d07dde2c -EBUILD totem-2.28.5-r3.ebuild 4892 RMD160 594bc06a620492b74c17192a1fce5da9e5e400f0 SHA1 df466e0181c9fb2b7ad9b191d23286d04a495f8c SHA256 cd52fd12695bc380a7621f03b19fa1b38f22e55918df51adf1d0538cd371d137 -EBUILD totem-2.28.5-r4.ebuild 5009 RMD160 86ddfc5292f627d9be81a9425c91e01e046a11e1 SHA1 6bfd9db7724eca09003ba7cfbc58d77e6b1e955d SHA256 bad172a093a93cafbbc96ecfec4262cb184e1740eb17c4be6d66b9b43ebec2fa -EBUILD totem-2.28.6.ebuild 4911 RMD160 c968f4ec75e8611c5ef1069f6e2d105f4a0cfef1 SHA1 acd1e9f195a3db4785a15228d879726711f458a9 SHA256 3fecd602419e7c84936d57547dc2611932318f0fbd5bd5cd5fdbddc320c1897c -MISC ChangeLog 41161 RMD160 19fd51fdb902ee19ad0b5b35b439b31f58a56a02 SHA1 05d089ba95560192d86b22564f13968dc671c8b2 SHA256 521838385b4b59d62a20d72719e0870187aa50474a0cbeccd7d6735d00ab1b83 -MISC metadata.xml 1481 RMD160 10623ca424a3144b43dbbb7c113854ceb5035940 SHA1 190bf0601c8f7a7cec4475aca682e3e061958996 SHA256 977a7285e472da55cc584e3d5b064f54f73addf7ff8b67ab345912e810d57600 +EBUILD totem-2.26.3-r1.ebuild 4526 RMD160 adc07f7fb932fdb1c6e1d9c46ad145c2004c8fe0 SHA1 b9b3bda2050aa01d4a8abfcfc4b95f6c9ca467c6 SHA256 c52ab14961cf2a49d3cae179f539cf176c4038534ceab4ee0c329e438cde64c1 +EBUILD totem-2.26.5-r1.ebuild 4659 RMD160 87790d120a5f81a24a34c8e6f80cc4f2d6e6a380 SHA1 0dca91ebc9ad6468226becfe761714ead196f3b4 SHA256 5d8ac56ae2f28bdce99d265eb811f0ff8ffa203d48ade009ece961552775b4a0 +EBUILD totem-2.28.5-r3.ebuild 4856 RMD160 2908f0ee033f190db6668b9b2ce433090b4adf98 SHA1 2a27a4b6c440afd92637c3b5566bb4ae9ab869cd SHA256 84f1ac6a9d42f8cf1caa8598ce0a71fdf1fa6f004ba1285f747e6cf6947b6c50 +EBUILD totem-2.28.6.ebuild 4874 RMD160 2301c05a4540d02339480a5a33cab0a0e267f795 SHA1 229897430c405f86dde04639ec4f11fa903864a3 SHA256 507b98f41a3c48e41703f5a967b0cad1fe38afb6cee50c53112f1a38e7630465 +MISC ChangeLog 41389 RMD160 60acb527346d0ec6a76c9a6e1d0cf213fe6b2566 SHA1 0ee8b734fb028256d42286c749f2a2a5a2322a9b SHA256 9312d6672398328a1a3c6e5e73aa5617945fc623c21e7d700a7d62468b080cf6 +MISC metadata.xml 1476 RMD160 fbee6439fe2b0f2af87ab4c727213c7c24a768a5 SHA1 941eb1253660067ddd9d5bd3d2282f131d652a48 SHA256 46516740003dded53eb5a259a4068cb7e50044f2727c42a5a9f22bc0f6f6b1f1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkwJX1YACgkQkKaRLQcq0GI5EACfZboHw8lHf9ixoonBIhliWsph -H1UAnA4MdQqSrjbs2EBxYwwJTKHlCl/s -=RDn3 +iEYEARECAAYFAkwSKrkACgkQCaWpQKGI+9RbKQCfVmXWT5UIcsy9f8F+7Hg7nHQ0 +PiMAniG4/fOptdudEkO2ngrgEM/H7mn+ +=/JzT -----END PGP SIGNATURE----- diff --git a/media-video/totem/metadata.xml b/media-video/totem/metadata.xml index c6720e3f32e4..b1663d40c043 100644 --- a/media-video/totem/metadata.xml +++ b/media-video/totem/metadata.xml @@ -9,7 +9,7 @@ Totem is movie player for the GNOME desktop. It features a playlist, fullscreen Enable support for user-presence detection via the - user's bluetooth handset using net-wireless/bluez-libs + user's bluetooth handset using net-wireless/bluez Allow Totem to set your IM client to "away" when a movie is playing in fullscreen using dev-libs/libgalago Enable support for controlling Totem with a remote control diff --git a/media-video/totem/totem-2.26.3-r1.ebuild b/media-video/totem/totem-2.26.3-r1.ebuild index e19e0bd2914d..d63e09f2a475 100644 --- a/media-video/totem/totem-2.26.3-r1.ebuild +++ b/media-video/totem/totem-2.26.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.26.3-r1.ebuild,v 1.9 2010/05/20 22:25:03 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.26.3-r1.ebuild,v 1.10 2010/06/11 12:23:09 pacho Exp $ EAPI="2" @@ -47,9 +47,7 @@ RDEPEND=">=dev-libs/glib-2.15 >=x11-libs/libXrandr-1.1.1 >=x11-libs/libXxf86vm-1.0.1 - bluetooth? ( || ( - net-wireless/bluez - net-wireless/bluez-libs ) ) + bluetooth? ( net-wireless/bluez ) galago? ( >=dev-libs/libgalago-0.5.2 ) lirc? ( app-misc/lirc ) nautilus? ( >=gnome-base/nautilus-2.10 ) diff --git a/media-video/totem/totem-2.26.5-r1.ebuild b/media-video/totem/totem-2.26.5-r1.ebuild index d831928153ac..28bdfa9c6ab9 100644 --- a/media-video/totem/totem-2.26.5-r1.ebuild +++ b/media-video/totem/totem-2.26.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.26.5-r1.ebuild,v 1.7 2010/04/05 15:08:35 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.26.5-r1.ebuild,v 1.8 2010/06/11 12:23:09 pacho Exp $ EAPI="2" @@ -47,9 +47,7 @@ RDEPEND=">=dev-libs/glib-2.15 >=x11-libs/libXrandr-1.1.1 >=x11-libs/libXxf86vm-1.0.1 - bluetooth? ( || ( - net-wireless/bluez - net-wireless/bluez-libs ) ) + bluetooth? ( net-wireless/bluez ) galago? ( >=dev-libs/libgalago-0.5.2 ) lirc? ( app-misc/lirc ) nautilus? ( >=gnome-base/nautilus-2.10 ) diff --git a/media-video/totem/totem-2.28.5-r3.ebuild b/media-video/totem/totem-2.28.5-r3.ebuild index b801c1085181..2c3bdd6ae5dd 100644 --- a/media-video/totem/totem-2.28.5-r3.ebuild +++ b/media-video/totem/totem-2.28.5-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.28.5-r3.ebuild,v 1.3 2010/06/04 20:19:04 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.28.5-r3.ebuild,v 1.4 2010/06/11 12:23:09 pacho Exp $ EAPI="2" @@ -52,9 +52,7 @@ RDEPEND=">=dev-libs/glib-2.15 >=x11-libs/libXrandr-1.1.1 >=x11-libs/libXxf86vm-1.0.1 - bluetooth? ( || ( - net-wireless/bluez - net-wireless/bluez-libs ) ) + bluetooth? ( net-wireless/bluez ) galago? ( >=dev-libs/libgalago-0.5.2 ) iplayer? ( dev-python/pygobject diff --git a/media-video/totem/totem-2.28.5-r4.ebuild b/media-video/totem/totem-2.28.5-r4.ebuild deleted file mode 100644 index 60fe11b01ae6..000000000000 --- a/media-video/totem/totem-2.28.5-r4.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.28.5-r4.ebuild,v 1.1 2010/05/02 13:40:11 pacho Exp $ - -EAPI="2" - -inherit autotools eutils gnome2 multilib python - -DESCRIPTION="Media player for GNOME" -HOMEPAGE="http://gnome.org/projects/totem/" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-fbsd" - -SRC_URI="${SRC_URI} - mirror://gentoo/${P}-patches.tar.bz2" - -# FIXME: Enable for now python USE flag per bug #316409 -# this change should only be noticed by people not following current -# current linux profiles default -IUSE="bluetooth debug doc galago iplayer lirc nautilus nsplugin +python tracker +youtube" #zeroconf - -# TODO: -# Cone (VLC) plugin needs someone with the right setup (remi ?) -# check gmyth requirement ? -> waiting for updates in tree -# coherence plugin not enabled until we have deps in tree -RDEPEND=">=dev-libs/glib-2.15 - >=x11-libs/gtk+-2.16.0 - >=gnome-base/gconf-2.0 - >=dev-libs/totem-pl-parser-2.27.0 - >=x11-themes/gnome-icon-theme-2.16 - x11-libs/cairo - app-text/iso-codes - >=dev-libs/libxml2-2.6 - >=dev-libs/dbus-glib-0.71 - >=media-libs/gstreamer-0.10.25 - >=media-libs/gst-plugins-good-0.10 - >=media-libs/gst-plugins-base-0.10.25 - >=media-plugins/gst-plugins-gconf-0.10 - - >=media-plugins/gst-plugins-taglib-0.10 - >=media-plugins/gst-plugins-gio-0.10 - >=media-plugins/gst-plugins-pango-0.10 - >=media-plugins/gst-plugins-x-0.10 - >=media-plugins/gst-plugins-meta-0.10-r2 - - dev-libs/libunique - 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 - net-wireless/bluez-libs ) ) - galago? ( >=dev-libs/libgalago-0.5.2 ) - iplayer? ( - dev-python/pygobject - dev-python/pygtk - dev-python/httplib2 - dev-python/feedparser - dev-python/beautifulsoup ) - lirc? ( app-misc/lirc ) - nautilus? ( >=gnome-base/nautilus-2.10 ) - python? ( - dev-lang/python[threads] - >=dev-python/pygtk-2.12 - dev-python/pyxdg - dev-python/gst-python - dev-python/dbus-python - dev-python/gconf-python ) - tracker? ( - >=app-misc/tracker-0.6 - =dev-libs/libgdata-0.4.0 - media-plugins/gst-plugins-soup )" -# FIXME: freezes totem -# zeroconf? ( >=net-libs/libepc-0.3 ) -DEPEND="${RDEPEND} - x11-proto/xproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - app-text/scrollkeeper - gnome-base/gnome-common - app-text/gnome-doc-utils - >=dev-util/intltool-0.40 - >=dev-util/pkgconfig-0.20 - dev-util/gtk-doc-am - doc? ( >=dev-util/gtk-doc-1.11 ) - app-text/docbook-xml-dtd:4.5" -# docbook-xml-dtd is needed for user doc - -DOCS="AUTHORS ChangeLog NEWS README TODO" - -pkg_setup() { - G2CONF="${G2CONF} - --disable-scrollkeeper - --disable-schemas-install - --disable-static - --disable-vala - --with-dbus - --with-smclient - --enable-easy-codec-installation - $(use_enable nsplugin browser-plugins)" - - # Plugin configuration - G2CONF="${G2CONF} - BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins - PLUGINDIR=/usr/$(get_libdir)/totem/plugins" - - local plugins="properties,thumbnail,screensaver,ontop,gromit,media-player-keys,skipto,brasero-disc-recorder,screenshot" - use bluetooth && plugins="${plugins},bemused" - use galago && plugins="${plugins},galago" - use iplayer && plugins="${plugins},iplayer" - use lirc && plugins="${plugins},lirc" - use python && plugins="${plugins},opensubtitles,jamendo,pythonconsole,dbus-service" - use tracker && plugins="${plugins},tracker" - use youtube && plugins="${plugins},youtube" - #use zeroconf && plugins="${plugins},publish" - - G2CONF="${G2CONF} --with-plugins=${plugins}" - - G2CONF="${G2CONF} - $(use_enable debug) - $(use_enable nautilus) - $(use_enable python)" -} - -src_prepare() { - gnome2_src_prepare - - # Fix broken smclient option passing - epatch "${FILESDIR}/${PN}-2.26.1-smclient-target-detection.patch" - - # Apply upstream patches committed to gnome-2.28 branch - epatch "${WORKDIR}"/${P}-patches/*.patch - - intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf - - # disable pyc compiling - mv py-compile py-compile.orig - ln -s $(type -P true) py-compile -} - -src_configure() { - # FIXME: why does it need write access here, probably need to set up a fake - # home in /var/tmp like other pkgs do - - addpredict "$(unset HOME; echo ~)/.gconf" - addpredict "$(unset HOME; echo ~)/.gconfd" - addpredict "$(unset HOME; echo ~)/.gnome2" - - gnome2_src_configure -} - -src_install() { - gnome2_src_install - # Installed for plugins, but they're dlopen()-ed - # firefox, totem as well as nautilus - find "${D}" -name "*.la" -delete || die "remove of la files failed" -} - -pkg_postinst() { - gnome2_pkg_postinst - if use python; then - python_need_rebuild - python_mod_optimize /usr/$(get_libdir)/totem/plugins - fi - - ewarn - ewarn "If totem doesn't play some video format, please check your" - ewarn "USE flags on media-plugins/gst-plugins-meta" - ewarn -} - -pkg_postrm() { - gnome2_pkg_postrm - python_mod_cleanup /usr/$(get_libdir)/totem/plugins -} diff --git a/media-video/totem/totem-2.28.6.ebuild b/media-video/totem/totem-2.28.6.ebuild index 4f6675e0a2ac..ac36ab0c6d01 100644 --- a/media-video/totem/totem-2.28.6.ebuild +++ b/media-video/totem/totem-2.28.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.28.6.ebuild,v 1.4 2010/05/22 16:18:00 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.28.6.ebuild,v 1.5 2010/06/11 12:23:09 pacho Exp $ EAPI="2" @@ -49,9 +49,7 @@ RDEPEND=">=dev-libs/glib-2.15 >=x11-libs/libXrandr-1.1.1 >=x11-libs/libXxf86vm-1.0.1 - bluetooth? ( || ( - net-wireless/bluez - net-wireless/bluez-libs ) ) + bluetooth? ( net-wireless/bluez ) galago? ( >=dev-libs/libgalago-0.5.2 ) iplayer? ( dev-python/pygobject