[gentoo-commits] proj/gnome:master commit in: media-libs/libcanberra/

[Gilles Dartiguelongue]

commit:     8a4f548e75f25560cdead94aeefec477d8ba2fc8
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 13:00:10 2011 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 13:00:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8a4f548e

media-libs/libcanberra: 0.26-r2 → 0.28

(Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key C6085806)

---
 ...erra-0.26-r2.ebuild => libcanberra-0.28.ebuild} |   31 ++++++++++---------
 media-libs/libcanberra/metadata.xml                |   21 +++++++++++++
 2 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/media-libs/libcanberra/libcanberra-0.26-r2.ebuild b/media-libs/libcanberra/libcanberra-0.28.ebuild
similarity index 74%
rename from media-libs/libcanberra/libcanberra-0.26-r2.ebuild
rename to media-libs/libcanberra/libcanberra-0.28.ebuild
index 0b4ebd9..985069e 100644
--- a/media-libs/libcanberra/libcanberra-0.26-r2.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.28.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.25.ebuild,v 1.1 2010/06/18 10:11:15 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 inherit gnome2-utils libtool
 
 DESCRIPTION="Portable Sound Event Library"
@@ -12,31 +12,31 @@ 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"
+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 )
+	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 )
+		gnome-base/gconf:2 )
 	gtk3? ( x11-libs/gtk+:3
-		>=gnome-base/gconf-2 )
+		gnome-base/gconf:2 )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
-	tdb? ( sys-libs/tdb )"
+	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() {
 	# Run elibtoolize for ~x86-fbsd.
 	use x86-fbsd && elibtoolize
-
-	# Comment out gtk_quit_add which was removed in gtk+:3
-	# Wrong solution, but this is what is used in jhbuild right now
-	# https://bugs.freedesktop.org//show_bug.cgi?id=32839
-	sed -e 's:\(gtk_quit_add\)://\1:' -i "${S}/src/canberra-gtk-module.c" || die
 }
 
 src_configure() {
@@ -50,18 +50,19 @@ src_configure() {
 		$(use_enable gtk) \
 		$(use_enable gtk3) \
 		$(use_enable tdb) \
+		$(use_enable udev) \
 		--disable-lynx \
 		--disable-gtk-doc \
-		--disable-gtk-doc-html \
-		--disable-gtk-doc-pdf \
 		--with-html-dir=/usr/share/doc/${PF}/html
 }
 
 # TODO: check which la files are really needed
 src_install() {
 	# Disable parallel installation until bug #253862 is solved
-	emake -j1 DESTDIR="${ED}" install || die
-	prepalldocs
+	emake -j1 DESTDIR="${D}" install || die
+
+	find "${ED}"/usr/$(get_libdir)/gtk-2.0 -name "*.la" -delete
+	find "${ED}"/usr/$(get_libdir)/gtk-3.0 -name "*.la" -delete
 }
 
 pkg_preinst() { gnome2_gconf_savelist; }

diff --git a/media-libs/libcanberra/metadata.xml b/media-libs/libcanberra/metadata.xml
new file mode 100644
index 0000000..b06644f
--- /dev/null
+++ b/media-libs/libcanberra/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<herd>sound</herd>
+<longdescription>A small and lightweight implementation of the XDG Sound Theme Specification (http://0pointer.de/public/sound-theme-spec.html).</longdescription>
+<use>
+  <flag name='alsa'>Enables ALSA sound driver.</flag>
+  <flag name='gstreamer'>Enables gstreamer sound driver. Not useful when alsa or pulseaudio is available.</flag>
+  <flag name='gtk'>Enables building of gtk+ helper library, gtk+ runtime sound effects and the canberra-gtk-play
+	utility. To enable the gtk+ sound effects add canberra-gtk-module to the colon separated list of modules
+	in the GTK_MODULES environment variable.</flag>
+  <flag name='gtk3'>Enables building of components for gtk+:3, see gtk USE flag description.</flag>
+  <flag name='pulseaudio'>Enables PulseAudio sound driver that should be able to support positional event sounds.
+	This is the preferred choice for best sound events experience and picked by default if compiled in and
+	possible to use at runtime.</flag>
+  <flag name='sound'>Install x11-themes/sound-theme-freedesktop to get sounds on Gnome and Xfce.</flag>
+  <flag name='tdb'>Enables Trivial Database support for caching purposes.</flag>
+  <flag name='udev'>Enable boot time sound support.</flag>
+</use>
+</pkgmetadata>