Remove pulse dep from 0.11 and add 0.11-r1 with pulse dep that can go stable when pulse does. Mark 0.11 stable on amd64

(Portage version: 2.1.6.7/cvs/Linux x86_64)

3 files changed, 82 insertions, 6 deletions

diff --git a/media-libs/libcanberra/ChangeLog b/media-libs/libcanberra/ChangeLog
index f9d41a9b35e7..65d3bfeefb68 100644
--- a/media-libs/libcanberra/ChangeLog
+++ b/media-libs/libcanberra/ChangeLog
@@ -1,6 +1,13 @@
 # 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.13 2009/03/06 15:41:28 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.14 2009/03/11 02:24:33 dang Exp $
+
+*libcanberra-0.11-r1 (11 Mar 2009)
+
+  11 Mar 2009; Daniel Gryniewicz <dang@gentoo.org> libcanberra-0.11.ebuild,
+  +libcanberra-0.11-r1.ebuild:
+  Remove pulse dep from 0.11 and add 0.11-r1 with pulse dep that can go
+  stable when pulse does. Mark 0.11 stable on amd64
 
   06 Mar 2009; Brent Baude <ranger@gentoo.org> libcanberra-0.11.ebuild:
   Marking libcanberra-0.11 ppc stable for bug 260063
diff --git a/media-libs/libcanberra/libcanberra-0.11-r1.ebuild b/media-libs/libcanberra/libcanberra-0.11-r1.ebuild
new file mode 100644
index 000000000000..0ad70a11d2e2
--- /dev/null
+++ b/media-libs/libcanberra/libcanberra-0.11-r1.ebuild
@@ -0,0 +1,70 @@
+# 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-r1.ebuild,v 1.1 2009/03/11 02:24:33 dang Exp $
+
+EAPI="1"
+
+inherit 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_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.11.ebuild b/media-libs/libcanberra/libcanberra-0.11.ebuild
index 4125b545a927..a5e9064903e7 100644
--- a/media-libs/libcanberra/libcanberra-0.11.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.11.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.11.ebuild,v 1.4 2009/03/06 15:41:28 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.11.ebuild,v 1.5 2009/03/11 02:24:33 dang Exp $
 
 EAPI="1"
 
@@ -12,13 +12,12 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa doc gstreamer +gtk oss"
 
 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
@@ -33,8 +32,8 @@ src_compile() {
 		$(use_enable gstreamer) \
 		$(use_enable gtk) \
 		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
 		$(use_enable doc gtk-doc) \
+		--disable-pulse \
 		--disable-tdb \
 		--disable-lynx
 	# tdb support would need a split-out from samba before we can use it