5 files changed, 11 insertions, 246 deletions
diff --git a/media-libs/libcanberra/ChangeLog b/media-libs/libcanberra/ChangeLog
index 2298c78a051b..2627444cc709 100644
--- a/media-libs/libcanberra/ChangeLog
+++ b/media-libs/libcanberra/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/libcanberra
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.29 2009/09/13 18:25:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.30 2009/11/04 22:39:49 eva Exp $
+
+*libcanberra-0.22 (04 Nov 2009)
+
+  04 Nov 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -libcanberra-0.11-r5.ebuild,
+  -files/libcanberra-0.11-dont-crash-without-display.patch,
+  -libcanberra-0.14.ebuild, -libcanberra-0.15-r1.ebuild,
+  +libcanberra-0.22.ebuild:
+  Version bump. Updates to gtk+ support. Clean up old revisions.
 
 *libcanberra-0.17 (13 Sep 2009)
 
diff --git a/media-libs/libcanberra/files/libcanberra-0.11-dont-crash-without-display.patch b/media-libs/libcanberra/files/libcanberra-0.11-dont-crash-without-display.patch
deleted file mode 100644
index 856a9181f63f..000000000000
--- a/media-libs/libcanberra/files/libcanberra-0.11-dont-crash-without-display.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From: Lennart Poettering <lennart@poettering.net>
-Date: Mon, 23 Mar 2009 20:55:36 +0000 (+0100)
-Subject: don't crash if there is no default display on initialization. Fixes #20693
-X-Git-Url: http://git.0pointer.de/?p=libcanberra.git;a=commitdiff_plain;h=ac5ac9e486aa33f7be0cd9ddd315c03780676795
-
-don't crash if there is no default display on initialization. Fixes #20693
----
-
-diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c
-index b9d8ae0..302eeb4 100644
---- a/src/canberra-gtk-module.c
-+++ b/src/canberra-gtk-module.c
-@@ -647,11 +647,15 @@ static gboolean idle_cb(void *userdata) {
-     return FALSE;
- }
- 
-+static void connect_settings(void);
-+
- static gboolean emission_hook_cb(GSignalInvocationHint *hint, guint n_param_values, const GValue *param_values, gpointer data) {
-     static SoundEventData *d = NULL;
-     GdkEvent *e;
-     GObject *object;
- 
-+    connect_settings();
-+
-     if (disabled)
-         return TRUE;
- 
-@@ -719,15 +723,15 @@ static void enable_input_feedback_sounds_changed(GtkSettings *s, GParamSpec *arg
-     read_enable_input_feedback_sounds(s);
- }
- 
--G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
-+static void connect_settings(void) {
-     GtkSettings *s;
-+    static gboolean connected = FALSE;
- 
--    /* This is the same quark libgnomeui uses! */
--    disable_sound_quark = g_quark_from_string("gnome_disable_sound_events");
--    was_hidden_quark = g_quark_from_string("canberra_was_hidden");
-+    if (connected)
-+        return;
- 
--    /* Hook up the gtk setting */
--    s = gtk_settings_get_default();
-+    if (!(s = gtk_settings_get_default()))
-+        return;
- 
-     if (g_object_class_find_property(G_OBJECT_GET_CLASS(s), "gtk-enable-input-feedback-sounds")) {
-         g_signal_connect(G_OBJECT(s), "notify::gtk-enable-input-feedback-sounds", G_CALLBACK(enable_input_feedback_sounds_changed), NULL);
-@@ -735,6 +739,18 @@ G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
-     } else
-         g_debug("This Gtk+ version doesn't have the GtkSettings::gtk-enable-input-feedback-sounds property.");
- 
-+    connected = TRUE;
-+}
-+
-+G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
-+
-+    /* This is the same quark libgnomeui uses! */
-+    disable_sound_quark = g_quark_from_string("gnome_disable_sound_events");
-+    was_hidden_quark = g_quark_from_string("canberra_was_hidden");
-+
-+    /* Hook up the gtk setting */
-+    connect_settings();
-+
-     install_hook(GTK_TYPE_WINDOW, "show", &signal_id_widget_show);
-     install_hook(GTK_TYPE_WINDOW, "hide", &signal_id_widget_hide);
-     install_hook(GTK_TYPE_DIALOG, "response", &signal_id_dialog_response);
-@@ -749,7 +765,6 @@ G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
-     install_hook(GTK_TYPE_ICON_VIEW, "selection-changed", &signal_id_icon_view_selection_changed);
- }
- 
--
- G_MODULE_EXPORT gchar* g_module_check_init(GModule *module);
- 
- G_MODULE_EXPORT gchar* g_module_check_init(GModule *module) {
diff --git a/media-libs/libcanberra/libcanberra-0.11-r5.ebuild b/media-libs/libcanberra/libcanberra-0.11-r5.ebuild
deleted file mode 100644
index 035abeef93fd..000000000000
--- a/media-libs/libcanberra/libcanberra-0.11-r5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.11-r5.ebuild,v 1.1 2009/03/28 18:25:12 ulm Exp $
-
-EAPI="1"
-
-inherit eutils gnome2-utils
-
-DESCRIPTION="Portable Sound Event Library"
-HOMEPAGE="http://0pointer.de/lennart/projects/libcanberra/"
-SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa doc gstreamer +gtk oss pulseaudio"
-
-RDEPEND="media-libs/libvorbis
-	sys-devel/libtool
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
-	gstreamer? ( >=media-libs/gstreamer-0.10.15 )
-	gtk? ( dev-libs/glib:2
-		>=x11-libs/gtk+-2.13.4:2
-		>=gnome-base/gconf-2 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.17
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-dont-crash-without-display.patch"	#259891
-}
-
-src_compile() {
-	econf --disable-static \
-		$(use_enable alsa) \
-		$(use_enable gstreamer) \
-		$(use_enable gtk) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable doc gtk-doc) \
-		--disable-tdb \
-		--disable-lynx
-	# tdb support would need a split-out from samba before we can use it
-
-	emake || die "emake failed."
-}
-
-src_install() {
-	# we must delay gconf schema installation due to sandbox
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-
-	emake DESTDIR="${D}" install || die "emake install failed."
-
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-	rm "${D}/usr/share/doc/${PN}/README"
-	# If the rmdir errors, you probably need to add a file to dodoc
-	# and remove the package installed above
-	rmdir "${D}/usr/share/doc/${PN}"
-	dodoc README
-}
-
-pkg_preinst() {
-	gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-}
-
-#pkg_prerm() {
-#	gnome2_gconf_uninstall
-#}
diff --git a/media-libs/libcanberra/libcanberra-0.14.ebuild b/media-libs/libcanberra/libcanberra-0.14.ebuild
deleted file mode 100644
index 463b6122ac82..000000000000
--- a/media-libs/libcanberra/libcanberra-0.14.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.14.ebuild,v 1.5 2009/07/21 06:17:23 mrpouet Exp $
-
-EAPI="1"
-
-inherit eutils gnome2-utils autotools
-
-DESCRIPTION="Portable Sound Event Library"
-HOMEPAGE="http://0pointer.de/lennart/projects/libcanberra/"
-SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa doc gstreamer +gtk oss pulseaudio"
-
-RDEPEND="media-libs/libvorbis
-	sys-devel/libtool
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
-	gstreamer? ( >=media-libs/gstreamer-0.10.15 )
-	gtk? ( dev-libs/glib:2
-		>=x11-libs/gtk+-2.13.4:2
-		>=gnome-base/gconf-2 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.17
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix bug 277739, replace LT_PREREQ and LT_INIT by AC_LIBTOOL*
-	# macros (equivalent for earlier version), preserve backward
-	# compatibility with libtool-1
-	epatch "${FILESDIR}/${P}-backward-compatibility-libtool.patch"
-
-	# Fix bug 278354, Backport AM_GCONF_SOURCE_2 macro to m4/ dir
-	# in case where gconf isn't installed on the system
-	# (eautoconf could fail)
-	epatch "${FILESDIR}/${P}-am-gconf-source-2-m4.patch"
-
-	rm lt*    || die "clean-up ltmain.sh failed"
-	rm m4/lt* || die "clean-up lt scripts failed"
-	rm m4/libtool* || die "clean-up libtool script failed"
-
-	eautoreconf
-}
-
-src_compile() {
-	econf --disable-static \
-		$(use_enable alsa) \
-		$(use_enable gstreamer) \
-		$(use_enable gtk) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable doc gtk-doc) \
-		--disable-tdb \
-		--disable-lynx
-	# tdb support would need a split-out from samba before we can use it
-
-	emake || die "emake failed."
-}
-
-src_install() {
-	# we must delay gconf schema installation due to sandbox
-	#export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-
-	emake DESTDIR="${D}" install || die "emake install failed."
-
-	#unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-	rm "${D}/usr/share/doc/${PN}/README"
-	# If the rmdir errors, you probably need to add a file to dodoc
-	# and remove the package installed above
-	rmdir "${D}/usr/share/doc/${PN}"
-	dodoc README
-}
-
-pkg_preinst() {
-	gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-}
-
-#pkg_prerm() {
-#	gnome2_gconf_uninstall
-#}
diff --git a/media-libs/libcanberra/libcanberra-0.15-r1.ebuild b/media-libs/libcanberra/libcanberra-0.22.ebuild
index 09a939ef54c3..ab644bde112e 100644
--- a/media-libs/libcanberra/libcanberra-0.15-r1.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.15-r1.ebuild,v 1.1 2009/08/24 13:27:31 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.22.ebuild,v 1.1 2009/11/04 22:39:49 eva Exp $
 
 EAPI="1"