From 4210ee8d625283e3c1fed808b17de9e6d1ca76ad Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Wed, 20 Oct 2010 21:43:44 +0000 Subject: Clean up old revisions. (Portage version: 2.2_rc89/cvs/Linux x86_64) --- gnome-extra/gnome-media/ChangeLog | 10 +- .../gnome-media-2.26.0-automagic-canberra.patch | 145 ---------- ...media-2.26.0-connection-failed-pulseaudio.patch | 321 --------------------- ...ome-media-2.26.0-missing-cddbslave-cflags.patch | 22 -- .../gnome-media/gnome-media-2.24.0.1-r1.ebuild | 66 ----- .../gnome-media/gnome-media-2.26.0-r1.ebuild | 94 ------ gnome-extra/gnome-media/gnome-media-2.28.5.ebuild | 75 ----- 7 files changed, 9 insertions(+), 724 deletions(-) delete mode 100644 gnome-extra/gnome-media/files/gnome-media-2.26.0-automagic-canberra.patch delete mode 100644 gnome-extra/gnome-media/files/gnome-media-2.26.0-connection-failed-pulseaudio.patch delete mode 100644 gnome-extra/gnome-media/files/gnome-media-2.26.0-missing-cddbslave-cflags.patch delete mode 100644 gnome-extra/gnome-media/gnome-media-2.24.0.1-r1.ebuild delete mode 100644 gnome-extra/gnome-media/gnome-media-2.26.0-r1.ebuild delete mode 100644 gnome-extra/gnome-media/gnome-media-2.28.5.ebuild (limited to 'gnome-extra') diff --git a/gnome-extra/gnome-media/ChangeLog b/gnome-extra/gnome-media/ChangeLog index bf60f3d44a96..da087866aedb 100644 --- a/gnome-extra/gnome-media/ChangeLog +++ b/gnome-extra/gnome-media/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for gnome-extra/gnome-media # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.228 2010/10/17 18:56:04 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.229 2010/10/20 21:43:44 eva Exp $ + + 20 Oct 2010; Gilles Dartiguelongue + -gnome-media-2.24.0.1-r1.ebuild, -gnome-media-2.26.0-r1.ebuild, + -files/gnome-media-2.26.0-automagic-canberra.patch, + -files/gnome-media-2.26.0-connection-failed-pulseaudio.patch, + -files/gnome-media-2.26.0-missing-cddbslave-cflags.patch, + -gnome-media-2.28.5.ebuild: + Clean up old revisions. *gnome-media-2.32.0 (17 Oct 2010) diff --git a/gnome-extra/gnome-media/files/gnome-media-2.26.0-automagic-canberra.patch b/gnome-extra/gnome-media/files/gnome-media-2.26.0-automagic-canberra.patch deleted file mode 100644 index 891f1223ebd8..000000000000 --- a/gnome-extra/gnome-media/files/gnome-media-2.26.0-automagic-canberra.patch +++ /dev/null @@ -1,145 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 229ab88..c2c5031 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -63,7 +63,7 @@ GLIB_REQUIRED_VERSION=2.18.2 - GTK_REQUIRED_VERSION=2.10.0 - LIBGLADE_REQUIRED_VERSION=1.99.2 - GCONF_REQUIRED_VERSION=2.6.1 --PA_REQUIRED_VERSION=0.9.12 # FIXME remove extra checks below when we have PA 0.9.15 -+PA_REQUIRED_VERSION=0.9.12 - CANBERRA_REQUIRED_VERSION=0.4 - - PKG_CHECK_MODULES(MEDIA, [ -@@ -86,23 +86,32 @@ dnl======================================================================= - dnl Check for libcanberra - dnl======================================================================= - --PKG_CHECK_MODULES(SOUND_THEME, -- gobject-2.0 >= $GLIB_REQUIRED_VERSION -- gtk+-2.0 >= $GTK_REQUIRED_VERSION -- gio-2.0 -- gconf-2.0 >= $GCONF_REQUIRED_VERSION -- libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION -- libxml-2.0, -- have_soundtheme=yes, -- have_soundtheme=no) -- --if test "x$have_soundtheme" = "xyes" ; then -- AC_DEFINE(HAVE_SOUND_THEME, [], [Define if we can build sound theme]) -+AC_ARG_ENABLE([canberra], -+ AC_HELP_STRING([--disable-canberra], [Disable canberra support @<:@default=yes@:>@]), -+ [enable_canberra="$enableval"], [enable_canberra="yes"]) -+ -+have_soundtheme="no" -+if test "x$enable_canberra" = "xyes"; then -+ -+ PKG_CHECK_MODULES(SOUND_THEME, -+ gobject-2.0 >= $GLIB_REQUIRED_VERSION -+ gtk+-2.0 >= $GTK_REQUIRED_VERSION -+ gio-2.0 -+ gconf-2.0 >= $GCONF_REQUIRED_VERSION -+ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION -+ libxml-2.0, -+ have_soundtheme=yes, -+ have_soundtheme=no) -+ -+ if test "x$have_soundtheme" = "xyes" ; then -+ AC_DEFINE(HAVE_SOUND_THEME, [], [Define if we can build sound theme]) -+ fi -+ -+ AC_SUBST(HAVE_SOUND_THEME) -+ AC_SUBST(SOUNDTHEME_CFLAGS) -+ AC_SUBST(SOUNDTHEME_LIBS) - fi - AM_CONDITIONAL(HAVE_SOUND_THEME, test x$have_soundtheme = xyes) --AC_SUBST(HAVE_SOUND_THEME) --AC_SUBST(SOUNDTHEME_CFLAGS) --AC_SUBST(SOUNDTHEME_LIBS) - - dnl======================================================================= - dnl Check for the new volume control modules -@@ -761,6 +770,7 @@ echo " - GStreamer properties: $have_gstprops - GStreamer profiles: $have_profiles - Sound recorder: $have_grecord$grecord_reason -+ Sound Theme $have_soundtheme - - *Deprecated*: - -diff --git a/gnome-volume-control/src/Makefile.am b/gnome-volume-control/src/Makefile.am -index f55e714..40c3936 100644 ---- a/gnome-volume-control/src/Makefile.am -+++ b/gnome-volume-control/src/Makefile.am -@@ -7,7 +7,6 @@ bin_PROGRAMS = \ - - AM_CPPFLAGS = \ - $(WARN_CFLAGS) \ -- -I$(top_srcdir)/sound-theme \ - $(VOLUME_CONTROL_CFLAGS) \ - $(PULSEAUDIO_CFLAGS) \ - -DLOCALE_DIR=\""$(datadir)/locale"\" \ -@@ -16,6 +15,10 @@ AM_CPPFLAGS = \ - -DICON_DATA_DIR="\"$(pkgdatadir)/icons\"" \ - $(NULL) - -+if HAVE_SOUND_THEME -+AM_CPPFLAGS += -I$(top_srcdir)/sound-theme -+endif -+ - gnome_volume_control_applet_LDADD = \ - $(VOLUME_CONTROL_LIBS) \ - $(PULSEAUDIO_LIBS) \ -@@ -52,9 +55,13 @@ gnome_volume_control_applet_SOURCES = \ - gnome_volume_control_LDADD = \ - $(VOLUME_CONTROL_LIBS) \ - $(PULSEAUDIO_LIBS) \ -- $(top_builddir)/sound-theme/libsoundtheme.la \ - $(NULL) - -+if HAVE_SOUND_THEME -+gnome_volume_control_LDADD += \ -+ $(top_builddir)/sound-theme/libsoundtheme.la -+endif -+ - gnome_volume_control_SOURCES = \ - gvc-mixer-stream.h \ - gvc-mixer-stream.c \ -diff --git a/gnome-volume-control/src/gvc-mixer-dialog.c b/gnome-volume-control/src/gvc-mixer-dialog.c -index 573a6c1..95906d2 100644 ---- a/gnome-volume-control/src/gvc-mixer-dialog.c -+++ b/gnome-volume-control/src/gvc-mixer-dialog.c -@@ -37,7 +37,9 @@ - #include "gvc-mixer-source.h" - #include "gvc-mixer-source-output.h" - #include "gvc-mixer-dialog.h" -+#ifdef HAVE_SOUND_THEME - #include "gvc-sound-theme-chooser.h" -+#endif /* HAVE_SOUND_THEME */ - #include "gvc-level-bar.h" - - #define SCALE_SIZE 128 -@@ -63,7 +65,9 @@ struct GvcMixerDialogPrivate - GtkWidget *output_settings_box; - GtkWidget *output_balance_bar; - GtkWidget *input_treeview; -+#ifdef HAVE_SOUND_THEME - GtkWidget *sound_theme_chooser; -+#endif - GtkWidget *click_feedback_button; - GtkWidget *audible_bell_button; - GtkSizeGroup *size_group; -@@ -1049,11 +1053,12 @@ gvc_mixer_dialog_constructor (GType type, - gtk_box_pack_start (GTK_BOX (self->priv->sound_effects_box), - self->priv->effects_bar, FALSE, FALSE, 12); - -+#ifdef HAVE_SOUND_THEME - self->priv->sound_theme_chooser = gvc_sound_theme_chooser_new (); - gtk_box_pack_start (GTK_BOX (self->priv->sound_effects_box), - self->priv->sound_theme_chooser, - TRUE, TRUE, 6); -- -+#endif - /* Input page */ - self->priv->input_box = gtk_vbox_new (FALSE, 12); - gtk_container_set_border_width (GTK_CONTAINER (self->priv->input_box), 12); diff --git a/gnome-extra/gnome-media/files/gnome-media-2.26.0-connection-failed-pulseaudio.patch b/gnome-extra/gnome-media/files/gnome-media-2.26.0-connection-failed-pulseaudio.patch deleted file mode 100644 index f49d2c4b6732..000000000000 --- a/gnome-extra/gnome-media/files/gnome-media-2.26.0-connection-failed-pulseaudio.patch +++ /dev/null @@ -1,321 +0,0 @@ -This is taken from upstreams's git repository and is half the fix for bug 274819 -The other half is to be applied to gnome-settings-daemon (which handles the -keybindings) - ---- -From 445e8ff0b2675fe7907b700ebd4c5e9b4251ab73 Mon Sep 17 00:00:00 2001 -From: Marc-André Lureau -Date: Sun, 14 Jun 2009 20:25:14 +0000 -Subject: Bug 564311 – "Connection failed" when PA drops off - ---- -diff --git a/gnome-volume-control/src/dialog-main.c b/gnome-volume-control/src/dialog-main.c -index dddc281..dd24472 100644 ---- a/gnome-volume-control/src/dialog-main.c -+++ b/gnome-volume-control/src/dialog-main.c -@@ -85,6 +85,9 @@ on_control_ready (GvcMixerControl *control, - warning_dialog = NULL; - } - -+ if (dialog) -+ return; -+ - dialog = GTK_WIDGET (gvc_mixer_dialog_new (control)); - g_signal_connect (dialog, - "response", -@@ -115,7 +118,7 @@ warning_dialog_answered (GtkDialog *d, - static gboolean - dialog_popup_timeout (gpointer data) - { -- warning_dialog = gtk_message_dialog_new (NULL, -+ warning_dialog = gtk_message_dialog_new (GTK_WINDOW(dialog), - 0, - GTK_MESSAGE_INFO, - GTK_BUTTONS_CANCEL, -@@ -130,6 +133,18 @@ dialog_popup_timeout (gpointer data) - return FALSE; - } - -+static void -+on_control_connecting (GvcMixerControl *control, -+ UniqueApp *app) -+{ -+ if (popup_id != 0) -+ return; -+ -+ popup_id = g_timeout_add_seconds (DIALOG_POPUP_TIMEOUT, -+ dialog_popup_timeout, -+ NULL); -+} -+ - int - main (int argc, char **argv) - { -@@ -177,15 +192,15 @@ main (int argc, char **argv) - - control = gvc_mixer_control_new (); - g_signal_connect (control, -+ "connecting", -+ G_CALLBACK (on_control_connecting), -+ app); -+ g_signal_connect (control, - "ready", - G_CALLBACK (on_control_ready), - app); - gvc_mixer_control_open (control); - -- popup_id = g_timeout_add_seconds (DIALOG_POPUP_TIMEOUT, -- dialog_popup_timeout, -- NULL); -- - gtk_main (); - - if (control != NULL) { -diff --git a/gnome-volume-control/src/gvc-applet.c b/gnome-volume-control/src/gvc-applet.c -index e11818b..82e3765 100644 ---- a/gnome-volume-control/src/gvc-applet.c -+++ b/gnome-volume-control/src/gvc-applet.c -@@ -167,6 +167,13 @@ on_control_ready (GvcMixerControl *control, - } - - static void -+on_control_connecting (GvcMixerControl *control, -+ GvcApplet *applet) -+{ -+ g_debug ("Connecting.."); -+} -+ -+static void - on_control_default_sink_changed (GvcMixerControl *control, - guint id, - GvcApplet *applet) -@@ -216,6 +223,10 @@ gvc_applet_constructor (GType type, - G_CALLBACK (on_control_ready), - self); - g_signal_connect (self->priv->control, -+ "connecting", -+ G_CALLBACK (on_control_connecting), -+ self); -+ g_signal_connect (self->priv->control, - "default-sink-changed", - G_CALLBACK (on_control_default_sink_changed), - self); -diff --git a/gnome-volume-control/src/gvc-mixer-control.c b/gnome-volume-control/src/gvc-mixer-control.c -index b642467..92b0286 100644 ---- a/gnome-volume-control/src/gvc-mixer-control.c -+++ b/gnome-volume-control/src/gvc-mixer-control.c -@@ -48,6 +48,7 @@ struct GvcMixerControlPrivate - pa_mainloop_api *pa_api; - pa_context *pa_context; - int n_outstanding; -+ guint reconnect_id; - - gboolean default_sink_is_set; - guint default_sink_id; -@@ -70,6 +71,7 @@ struct GvcMixerControlPrivate - }; - - enum { -+ CONNECTING, - READY, - STREAM_ADDED, - STREAM_REMOVED, -@@ -381,12 +383,14 @@ _set_default_source (GvcMixerControl *control, - { - guint new_id; - -- new_id = 0; -- -- if (stream != NULL) { -- new_id = gvc_mixer_stream_get_id (stream); -+ if (stream == NULL) { -+ control->priv->default_source_id = 0; -+ control->priv->default_source_is_set = FALSE; -+ return; - } - -+ new_id = gvc_mixer_stream_get_id (stream); -+ - if (control->priv->default_source_id != new_id) { - control->priv->default_source_id = new_id; - control->priv->default_source_is_set = TRUE; -@@ -403,12 +407,14 @@ _set_default_sink (GvcMixerControl *control, - { - guint new_id; - -- new_id = 0; -- -- if (stream != NULL) { -- new_id = gvc_mixer_stream_get_id (stream); -+ if (stream == NULL) { -+ control->priv->default_sink_id = 0; -+ control->priv->default_sink_is_set = FALSE; -+ return; - } - -+ new_id = gvc_mixer_stream_get_id (stream); -+ - if (control->priv->default_sink_id != new_id) { - control->priv->default_sink_id = new_id; - control->priv->default_sink_is_set = TRUE; -@@ -1451,6 +1457,78 @@ gvc_mixer_control_ready (GvcMixerControl *control) - } - - static void -+gvc_mixer_new_pa_context (GvcMixerControl *self) -+{ -+ pa_proplist *proplist; -+ -+ g_return_if_fail (self); -+ g_return_if_fail (!self->priv->pa_context); -+ -+ /* FIXME: read these from an object property */ -+ proplist = pa_proplist_new (); -+ pa_proplist_sets (proplist, -+ PA_PROP_APPLICATION_NAME, -+ _("GNOME Volume Control")); -+ pa_proplist_sets (proplist, -+ PA_PROP_APPLICATION_ID, -+ "org.gnome.VolumeControl"); -+ pa_proplist_sets (proplist, -+ PA_PROP_APPLICATION_ICON_NAME, -+ "multimedia-volume-control"); -+ pa_proplist_sets (proplist, -+ PA_PROP_APPLICATION_VERSION, -+ PACKAGE_VERSION); -+ -+ self->priv->pa_context = pa_context_new_with_proplist (self->priv->pa_api, NULL, proplist); -+ -+ pa_proplist_free (proplist); -+ g_assert (self->priv->pa_context); -+} -+ -+static void -+remove_all_streams (GvcMixerControl *control, GHashTable *hash_table) -+{ -+ GHashTableIter iter; -+ gpointer key, value; -+ -+ g_hash_table_iter_init (&iter, hash_table); -+ while (g_hash_table_iter_next (&iter, &key, &value)) { -+ remove_stream (control, value); -+ g_hash_table_iter_remove (&iter); -+ } -+} -+ -+static gboolean -+idle_reconnect (gpointer data) -+{ -+ GvcMixerControl *control = GVC_MIXER_CONTROL (data); -+ GHashTableIter iter; -+ gpointer key, value; -+ -+ g_return_val_if_fail (control, FALSE); -+ -+ if (control->priv->pa_context) { -+ pa_context_unref (control->priv->pa_context); -+ control->priv->pa_context = NULL; -+ gvc_mixer_new_pa_context (control); -+ } -+ -+ remove_all_streams (control, control->priv->sinks); -+ remove_all_streams (control, control->priv->sources); -+ remove_all_streams (control, control->priv->sink_inputs); -+ remove_all_streams (control, control->priv->source_outputs); -+ -+ g_hash_table_iter_init (&iter, control->priv->clients); -+ while (g_hash_table_iter_next (&iter, &key, &value)) -+ g_hash_table_iter_remove (&iter); -+ -+ gvc_mixer_control_open (control); /* cannot fail */ -+ -+ control->priv->reconnect_id = 0; -+ return FALSE; -+} -+ -+static void - _pa_context_state_cb (pa_context *context, - void *userdata) - { -@@ -1468,7 +1546,9 @@ _pa_context_state_cb (pa_context *context, - break; - - case PA_CONTEXT_FAILED: -- g_warning ("Connection failed"); -+ g_warning ("Connection failed, reconnecting..."); -+ if (control->priv->reconnect_id == 0) -+ control->priv->reconnect_id = g_idle_add (idle_reconnect, control); - break; - - case PA_CONTEXT_TERMINATED: -@@ -1491,7 +1571,8 @@ gvc_mixer_control_open (GvcMixerControl *control) - _pa_context_state_cb, - control); - -- res = pa_context_connect (control->priv->pa_context, NULL, (pa_context_flags_t) 0, NULL); -+ g_signal_emit (G_OBJECT (control), signals[CONNECTING], 0); -+ res = pa_context_connect (control->priv->pa_context, NULL, (pa_context_flags_t) PA_CONTEXT_NOFAIL, NULL); - if (res < 0) { - g_warning ("Failed to connect context: %s", - pa_strerror (pa_context_errno (control->priv->pa_context))); -@@ -1570,30 +1651,12 @@ gvc_mixer_control_constructor (GType type, - { - GObject *object; - GvcMixerControl *self; -- pa_proplist *proplist; - - object = G_OBJECT_CLASS (gvc_mixer_control_parent_class)->constructor (type, n_construct_properties, construct_params); - - self = GVC_MIXER_CONTROL (object); - -- /* FIXME: read these from an object property */ -- proplist = pa_proplist_new (); -- pa_proplist_sets (proplist, -- PA_PROP_APPLICATION_NAME, -- _("GNOME Volume Control")); -- pa_proplist_sets (proplist, -- PA_PROP_APPLICATION_ID, -- "org.gnome.VolumeControl"); -- pa_proplist_sets (proplist, -- PA_PROP_APPLICATION_ICON_NAME, -- "multimedia-volume-control"); -- pa_proplist_sets (proplist, -- PA_PROP_APPLICATION_VERSION, -- PACKAGE_VERSION); -- -- self->priv->pa_context = pa_context_new_with_proplist (self->priv->pa_api, NULL, proplist); -- g_assert (self->priv->pa_context); -- pa_proplist_free (proplist); -+ gvc_mixer_new_pa_context (self); - - return object; - } -@@ -1607,6 +1670,14 @@ gvc_mixer_control_class_init (GvcMixerControlClass *klass) - object_class->dispose = gvc_mixer_control_dispose; - object_class->finalize = gvc_mixer_control_finalize; - -+ signals [CONNECTING] = -+ g_signal_new ("connecting", -+ G_TYPE_FROM_CLASS (klass), -+ G_SIGNAL_RUN_LAST, -+ G_STRUCT_OFFSET (GvcMixerControlClass, connecting), -+ NULL, NULL, -+ g_cclosure_marshal_VOID__VOID, -+ G_TYPE_NONE, 0); - signals [READY] = - g_signal_new ("ready", - G_TYPE_FROM_CLASS (klass), -diff --git a/gnome-volume-control/src/gvc-mixer-control.h b/gnome-volume-control/src/gvc-mixer-control.h -index 33e745a..3de9e62 100644 ---- a/gnome-volume-control/src/gvc-mixer-control.h -+++ b/gnome-volume-control/src/gvc-mixer-control.h -@@ -46,6 +46,7 @@ typedef struct - { - GObjectClass parent_class; - -+ void (*connecting) (GvcMixerControl *control); - void (*ready) (GvcMixerControl *control); - void (*stream_added) (GvcMixerControl *control, - guint id); --- -cgit v0.8.2 diff --git a/gnome-extra/gnome-media/files/gnome-media-2.26.0-missing-cddbslave-cflags.patch b/gnome-extra/gnome-media/files/gnome-media-2.26.0-missing-cddbslave-cflags.patch deleted file mode 100644 index 99067a0ea98f..000000000000 --- a/gnome-extra/gnome-media/files/gnome-media-2.26.0-missing-cddbslave-cflags.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ../gnome-media-2.26.0_orig/gnome-cd/access/Makefile.am 2008-09-07 20:54:07.000000000 +0200 -+++ gnome-cd/access/Makefile.am 2009-03-23 15:19:45.952339992 +0100 -@@ -3,7 +3,8 @@ - $(MEDIA_CFLAGS) \ - -I$(top_srcdir)/cddb-slave2 \ - $(GAILUTIL_CFLAGS) \ -- $(LIBXML2_CFLAGS) -+ $(LIBXML2_CFLAGS) \ -+ $(CDDBSLAVE_CFLAGS) - - noinst_LTLIBRARIES = libgnomecdaccess.la - ---- ../gnome-media-2.26.0_orig/gnome-cd/Makefile.am 2008-09-07 20:54:07.000000000 +0200 -+++ gnome-cd/Makefile.am 2009-03-23 15:20:23.923000140 +0100 -@@ -15,6 +15,7 @@ - $(GNOMECD_CFLAGS) \ - $(GAILUTIL_CFLAGS) \ - $(GST_CFLAGS) \ -+ $(CDDBSLAVE_CFLAGS) \ - -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - -DDATADIR=\""$(datadir)"\" \ - -DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" \ diff --git a/gnome-extra/gnome-media/gnome-media-2.24.0.1-r1.ebuild b/gnome-extra/gnome-media/gnome-media-2.24.0.1-r1.ebuild deleted file mode 100644 index eca72bcd5bcb..000000000000 --- a/gnome-extra/gnome-media/gnome-media-2.24.0.1-r1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.24.0.1-r1.ebuild,v 1.15 2010/07/12 09:58:48 pacho Exp $ - -EAPI="1" - -inherit eutils gnome2 - -DESCRIPTION="Multimedia related programs for the GNOME desktop" -HOMEPAGE="http://ronald.bitfreak.net/gnome-media.php" - -LICENSE="LGPL-2 GPL-2 FDL-1.1" -SLOT="2" -KEYWORDS="arm sh" -IUSE="esd ipv6" - -RDEPEND=">=dev-libs/glib-2.16.0:2 - >=gnome-base/libgnome-2.13.7 - >=gnome-base/libgnomeui-2.13.2 - esd? ( >=media-sound/esound-0.2.23 ) - >=gnome-base/libbonobo-2 - >=x11-libs/gtk+-2.10:2 - >=media-libs/gstreamer-0.10.3 - >=media-libs/gst-plugins-base-0.10.3 - >=media-libs/gst-plugins-good-0.10 - >=gnome-base/orbit-2 - >=gnome-base/libglade-2 - dev-libs/libxml2 - >=gnome-base/gconf-2 - >=media-plugins/gst-plugins-meta-0.10-r2:0.10 - >=media-plugins/gst-plugins-gconf-0.10.1" -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.9 - >=app-text/scrollkeeper-0.3.11 - >=app-text/gnome-doc-utils-0.3.2 - >=dev-util/intltool-0.35.0" - -DOCS="AUTHORS ChangeLog NEWS README" - -pkg_setup() { - G2CONF="${G2CONF} - $(use_enable esd esound) - $(use_enable esd vumeter) - $(use_enable ipv6) - --enable-gstmix - --enable-gstprops - --disable-cddbslave - --disable-gnomecd - --disable-esdtest - --disable-scrollkeeper - --disable-schemas-install" -} - -src_compile() { - addpredict "$(unset HOME; echo ~)/.gconf" - addpredict "$(unset HOME; echo ~)/.gconfd" - gnome2_src_compile -} - -pkg_postinst() { - gnome2_pkg_postinst - ewarn - ewarn "If you cannot play some music format, please check your" - ewarn "USE flags on media-plugins/gst-plugins-meta" - ewarn -} diff --git a/gnome-extra/gnome-media/gnome-media-2.26.0-r1.ebuild b/gnome-extra/gnome-media/gnome-media-2.26.0-r1.ebuild deleted file mode 100644 index 56813eef2e0f..000000000000 --- a/gnome-extra/gnome-media/gnome-media-2.26.0-r1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.26.0-r1.ebuild,v 1.11 2010/07/20 02:18:06 jer Exp $ - -EAPI="2" - -inherit autotools eutils gnome2 - -DESCRIPTION="Multimedia related programs for the GNOME desktop" -HOMEPAGE="http://ronald.bitfreak.net/gnome-media.php" - -LICENSE="LGPL-2 GPL-2 FDL-1.1" -SLOT="2" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="+sound esd ipv6 pulseaudio" - -RDEPEND=">=dev-libs/glib-2.18.2:2 - >=x11-libs/gtk+-2.15.1:2 - >=gnome-base/libglade-2 - >=gnome-base/gconf-2.6.1 - >=gnome-base/libgnomeui-2.13.2 - esd? ( >=media-sound/esound-0.2.23 ) - >=media-libs/gstreamer-0.10.3 - >=media-libs/gst-plugins-base-0.10.3 - >=media-libs/gst-plugins-good-0.10 - >=gnome-base/orbit-2 - >=dev-libs/libunique-1 - pulseaudio? ( >=media-sound/pulseaudio-0.9.15[glib] ) - sound? ( - >=media-libs/libcanberra-0.4[gtk] - x11-themes/sound-theme-freedesktop ) - dev-libs/libxml2 - >=media-plugins/gst-plugins-meta-0.10-r2:0.10 - >=media-plugins/gst-plugins-gconf-0.10.1" -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.9 - >=app-text/scrollkeeper-0.3.11 - >=app-text/gnome-doc-utils-0.3.2 - >=dev-util/intltool-0.35.0" - -DOCS="AUTHORS ChangeLog NEWS README" - -pkg_setup() { - G2CONF="${G2CONF} - --enable-gstprops - --disable-cddbslave - --disable-gnomecd - --disable-esdtest - --disable-static - --disable-scrollkeeper - --disable-schemas-install - $(use_enable esd esound) - $(use_enable esd vumeter) - $(use_enable ipv6) - $(use_enable pulseaudio) - $(use_enable !pulseaudio gstmix) - $(use_enable sound canberra)" -} - -src_prepare() { - gnome2_src_prepare - - # Make it libtool-1 compatible, bug 269548 - rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed" - - if use gnomecd; then - epatch "${FILESDIR}/${P}-missing-cddbslave-cflags.patch" - fi - - # Half-fix bug 274819 -- applet does not work when PA restarts (not needed with 2.28) - epatch "${FILESDIR}/${P}-connection-failed-pulseaudio.patch" - - # Fix automagic canberra support - epatch "${FILESDIR}/${P}-automagic-canberra.patch" - eautoreconf -} - -src_compile() { - addpredict "$(unset HOME; echo ~)/.gconf" - addpredict "$(unset HOME; echo ~)/.gconfd" - gnome2_src_compile -} - -pkg_postinst() { - gnome2_pkg_postinst - ewarn - ewarn "If you cannot play some music format, please check your" - ewarn "USE flags on media-plugins/gst-plugins-meta" - ewarn - if use pulseaudio; then - ewarn "You have enabled pulseaudio support, gstmixer will not be built" - ewarn "If you do not use pulseaudio, you do not want this" - fi -} diff --git a/gnome-extra/gnome-media/gnome-media-2.28.5.ebuild b/gnome-extra/gnome-media/gnome-media-2.28.5.ebuild deleted file mode 100644 index b13e224a0872..000000000000 --- a/gnome-extra/gnome-media/gnome-media-2.28.5.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.28.5.ebuild,v 1.6 2010/08/14 17:51:23 armin76 Exp $ - -EAPI="2" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="Multimedia related programs for the GNOME desktop" -HOMEPAGE="http://ronald.bitfreak.net/gnome-media.php" - -LICENSE="LGPL-2 GPL-2 FDL-1.1" -SLOT="2" -KEYWORDS="alpha amd64 ~arm ia64 ~ppc ~ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="pulseaudio" - -RDEPEND=">=dev-libs/glib-2.18.2:2 - >=x11-libs/gtk+-2.15.1:2 - >=gnome-base/libglade-2 - >=gnome-base/gconf-2.6.1 - >=media-libs/gstreamer-0.10.23 - >=media-libs/gst-plugins-base-0.10.23 - >=media-libs/gst-plugins-good-0.10 - >=dev-libs/libunique-1 - - pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) - >=media-libs/libcanberra-0.4[gtk] - dev-libs/libxml2 - >=media-plugins/gst-plugins-meta-0.10-r2:0.10 - >=media-plugins/gst-plugins-gconf-0.10.1" -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.9 - >=app-text/scrollkeeper-0.3.11 - >=app-text/gnome-doc-utils-0.3.2 - >=dev-util/intltool-0.35.0" - -DOCS="AUTHORS ChangeLog* NEWS MAINTAINERS README" - -pkg_setup() { - G2CONF="${G2CONF} - --disable-static - --disable-scrollkeeper - --disable-schemas-install - --enable-gstprops - --enable-grecord - --enable-profiles - $(use_enable pulseaudio) - $(use_enable !pulseaudio gstmix)" -} - -src_prepare() { - gnome2_src_prepare - - # FIXME: Do not run intltool check, it breaks in a weird way - sed '/^check: all/,+6 d' -i po/Makefile.in.in || die "sed failed" -} - -src_compile() { - addpredict "$(unset HOME; echo ~)/.gconf" - addpredict "$(unset HOME; echo ~)/.gconfd" - gnome2_src_compile -} - -pkg_postinst() { - gnome2_pkg_postinst - ewarn - ewarn "If you cannot play some music format, please check your" - ewarn "USE flags on media-plugins/gst-plugins-meta" - ewarn - if use pulseaudio; then - ewarn "You have enabled pulseaudio support, gstmixer will not be built" - ewarn "If you do not use pulseaudio, you do not want this" - fi -} -- cgit v1.2.3-65-gdbad