4 files changed, 124 insertions, 2 deletions
diff --git a/media-libs/libcanberra/ChangeLog b/media-libs/libcanberra/ChangeLog
index 92152bb64a47..0d5a84903cbc 100644
--- a/media-libs/libcanberra/ChangeLog
+++ b/media-libs/libcanberra/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-libs/libcanberra
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.70 2011/07/10 18:44:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.71 2011/07/21 17:26:29 pacho Exp $
+
+*libcanberra-0.28-r4 (21 Jul 2011)
+*libcanberra-0.28-r3 (21 Jul 2011)
+
+  21 Jul 2011; Pacho Ramos <pacho@gentoo.org> -libcanberra-0.28-r2.ebuild,
+  +libcanberra-0.28-r3.ebuild, +libcanberra-0.28-r4.ebuild,
+  +files/libcanberra-0.28-revert-gsettings.patch:
+  Revision bump to let latest version recover Gnome2 support, latest revision
+  will be used for Gnome3 compatibility and masked with the rest of gnome3
+  stuff present in the tree.
 
   10 Jul 2011; Pacho Ramos <pacho@gentoo.org> -libcanberra-0.28-r1.ebuild,
   libcanberra-0.28-r2.ebuild, +files/gconf-2.m4:
diff --git a/media-libs/libcanberra/files/libcanberra-0.28-revert-gsettings.patch b/media-libs/libcanberra/files/libcanberra-0.28-revert-gsettings.patch
new file mode 100644
index 000000000000..da68b2a02ba5
--- /dev/null
+++ b/media-libs/libcanberra/files/libcanberra-0.28-revert-gsettings.patch
@@ -0,0 +1,28 @@
+
+++ libcanberra-0.28/debian/patches/92_revert_gsettings_use.patch
+
+# Description: go back to use gconf keys since that's what our GNOME writes
+diff --git a/src/libcanberra-login-sound.desktop.in b/src/libcanberra-login-sound.desktop.in
+index aa0a3a3..210d2c1 100644
+--- a/src/libcanberra-login-sound.desktop.in
++++ b/src/libcanberra-login-sound.desktop.in
+@@ -4,6 +4,6 @@ Name=GNOME Login Sound
+ Comment=Plays a sound whenever you log in
+ Exec=@bindir@/canberra-gtk-play --id="desktop-login" --description="GNOME Login"
+ OnlyShowIn=GNOME;
+-AutostartCondition=GSettings org.gnome.desktop.sound event-sounds
++AutostartCondition=GNOME /desktop/gnome/sound/event_sounds
+ X-GNOME-Autostart-Phase=Application
+ X-GNOME-Provides=login-sound
+diff --git a/src/libcanberra-ready-sound.desktop.in b/src/libcanberra-ready-sound.desktop.in
+index bf3470b..4e6a606 100644
+--- a/src/libcanberra-ready-sound.desktop.in
++++ b/src/libcanberra-ready-sound.desktop.in
+@@ -4,6 +4,6 @@ Name=GNOME System Ready Sound
+ Comment=Plays a sound whenever your system is ready for login
+ Exec=@bindir@/canberra-gtk-play --id="system-ready" --description="GNOME System Ready"
+ OnlyShowIn=GNOME;
+-AutostartCondition=GSettings org.gnome.desktop.sound event-sounds
++AutostartCondition=GNOME /desktop/gnome/sound/event_sounds
+ X-GNOME-Autostart-Phase=Application
+ X-GNOME-Provides=login-sound
diff --git a/media-libs/libcanberra/libcanberra-0.28-r3.ebuild b/media-libs/libcanberra/libcanberra-0.28-r3.ebuild
new file mode 100644
index 000000000000..4b19aab8be60
--- /dev/null
+++ b/media-libs/libcanberra/libcanberra-0.28-r3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.28-r3.ebuild,v 1.1 2011/07/21 17:26:29 pacho Exp $
+
+EAPI="4"
+
+inherit gnome2-utils libtool systemd autotools eutils
+
+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 gstreamer +gtk +gtk3 oss pulseaudio +sound tdb udev"
+
+COMMON_DEPEND="media-libs/libvorbis
+	>=sys-devel/libtool-2.2.6b
+	alsa? (
+		media-libs/alsa-lib
+		udev? ( >=sys-fs/udev-160 ) )
+	gstreamer? ( >=media-libs/gstreamer-0.10.15 )
+	gtk? ( >=x11-libs/gtk+-2.20.0:2
+		gnome-base/gconf:2 )
+	gtk3? ( x11-libs/gtk+:3
+		gnome-base/gconf:2 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
+	tdb? ( sys-libs/tdb )
+"
+RDEPEND="${COMMON_DEPEND}
+	sound? ( x11-themes/sound-theme-freedesktop )" # Required for index.theme wrt #323379
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/pkgconfig-0.17"
+
+REQUIRED_USE="udev? ( alsa )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-underlinking.patch
+
+	# We need to revert this change to let it work ok with Gnome2
+	epatch "${FILESDIR}/${PN}-0.28-revert-gsettings.patch"
+
+	# gconf-2.m4 is needed for autoconf, bug #374561
+	if ! use gtk && ! use gtk3 ; then
+		cp "${FILESDIR}/gconf-2.m4" m4/ || die "Copying gconf-2.m4 failed!"
+	fi
+
+	eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-dependency-tracking \
+		$(use_enable alsa) \
+		$(use_enable oss) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable gstreamer) \
+		$(use_enable gtk) \
+		$(use_enable gtk3) \
+		$(use_enable tdb) \
+		$(use_enable udev) \
+		$(systemd_with_unitdir) \
+		--disable-lynx \
+		--disable-gtk-doc \
+		--with-html-dir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	# Disable parallel installation until bug #253862 is solved
+	emake -j1 DESTDIR="${D}" install || die
+
+	# Remove useless .la files
+	# la files in /usr/lib*/${P}/ are needed
+	if use gtk || use gtk3; then
+		rm -v "${ED}"/usr/$(get_libdir)/gtk-*/modules/*.la || die
+	fi
+	rm -v "${ED}"/usr/$(get_libdir)/*.la || die
+}
+
+pkg_preinst() { gnome2_gconf_savelist; }
+pkg_postinst() { gnome2_gconf_install; }
diff --git a/media-libs/libcanberra/libcanberra-0.28-r2.ebuild b/media-libs/libcanberra/libcanberra-0.28-r4.ebuild
index 3035a85bbe65..d3afa35d94a8 100644
--- a/media-libs/libcanberra/libcanberra-0.28-r2.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.28-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.28-r2.ebuild,v 1.3 2011/07/10 18:44:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.28-r4.ebuild,v 1.1 2011/07/21 17:26:29 pacho Exp $
 
 EAPI="4"