Version bump.

(Portage version: 2.2_rc62/cvs/Linux x86_64)

4 files changed, 60 insertions, 88 deletions

diff --git a/media-libs/libcanberra/ChangeLog b/media-libs/libcanberra/ChangeLog
index f3e51224cdbb..ae4f1025d2f5 100644
--- a/media-libs/libcanberra/ChangeLog
+++ b/media-libs/libcanberra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libcanberra
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.32 2010/02/20 13:59:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.33 2010/02/20 20:14:30 ssuominen Exp $
+
+*libcanberra-0.23 (20 Feb 2010)
+
+  20 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +libcanberra-0.23.ebuild:
+  Version bump.
 
   20 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
   libcanberra-0.22.ebuild:
diff --git a/media-libs/libcanberra/libcanberra-0.17.ebuild b/media-libs/libcanberra/libcanberra-0.17.ebuild
deleted file mode 100644
index f59ec431580d..000000000000
--- a/media-libs/libcanberra/libcanberra-0.17.ebuild
+++ /dev/null
@@ -1,87 +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.17.ebuild,v 1.1 2009/09/13 18:25:37 flameeyes 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
-	dev-util/gtk-doc-am
-	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}/${PN}-0.14-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}/${PN}-0.14-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 \
-		--docdir=/usr/share/doc/${PF} \
-		$(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
-}
-
-pkg_preinst() {
-	gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-}
-
-#pkg_prerm() {
-#	gnome2_gconf_uninstall
-#}
diff --git a/media-libs/libcanberra/libcanberra-0.23.ebuild b/media-libs/libcanberra/libcanberra-0.23.ebuild
new file mode 100644
index 000000000000..d5f3eadf5f47
--- /dev/null
+++ b/media-libs/libcanberra/libcanberra-0.23.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.23.ebuild,v 1.1 2010/02/20 20:14:30 ssuominen Exp $
+
+EAPI=2
+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 gstreamer +gtk oss pulseaudio tdb"
+
+RDEPEND="media-libs/libvorbis
+	>=sys-devel/libtool-2.2.6b
+	alsa? ( media-libs/alsa-lib )
+	gstreamer? ( >=media-libs/gstreamer-0.10.15 )
+	gtk? ( >=x11-libs/gtk+-2.13.4:2
+		>=gnome-base/gconf-2 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
+	tdb? ( sys-libs/tdb )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.17"
+
+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 tdb) \
+		--disable-lynx \
+		--disable-gtk-doc \
+		--disable-gtk-doc-html \
+		--disable-gtk-doc-pdf \
+		--with-html-dir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	prepalldocs
+}
+
+pkg_preinst() { gnome2_gconf_savelist; }
+pkg_postinst() { gnome2_gconf_install; }
diff --git a/media-libs/libcanberra/metadata.xml b/media-libs/libcanberra/metadata.xml
index e4db4fbf6466..7f3f56948cc4 100644
--- a/media-libs/libcanberra/metadata.xml
+++ b/media-libs/libcanberra/metadata.xml
@@ -2,6 +2,7 @@
 <!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>
@@ -12,5 +13,6 @@
   <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='tdb'>Enables Trivial Database support</flag>
 </use>
 </pkgmetadata>