Version bump.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

5 files changed, 64 insertions, 92 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/Manifest b/media-libs/libcanberra/Manifest
index b1649358beb5..82658ccbcdb1 100644
--- a/media-libs/libcanberra/Manifest
+++ b/media-libs/libcanberra/Manifest
@@ -1,10 +1,10 @@
 AUX libcanberra-0.14-am-gconf-source-2-m4.patch 2069 RMD160 92f29321e7c3b6bc131057e0f09f5ac1e240b6fa SHA1 296e5b150edfc256fbe92a0ef57105060881bcbf SHA256 648b40fcf5a146c60263be14f8295cae2f2e1c14b667ea08badff6e33d858245
 AUX libcanberra-0.14-backward-compatibility-libtool.patch 932 RMD160 32e5faad5b3355434388f629f393cad96e1ffe01 SHA1 e62707680ebd8c8168ed52a8fe5df397a4b5dd3e SHA256 60b0a068384047c34d2be124043b6c2b84ece2dfb3e1335980361546615f18a7
 DIST libcanberra-0.11.tar.gz 530273 RMD160 77a38ec12d0c9e5f2ee460fc2150298a81e595c7 SHA1 009b0c914970bf6f0fa19158483b6f7dfdf7021f SHA256 ea7c2731e31c77cdaa2a1319dff3bf9e4ee26a51e9ade8d2dec3147c28ce2e6d
-DIST libcanberra-0.17.tar.gz 458025 RMD160 e1428df89a171ac764ea7611137ab7b08001b93d SHA1 4ef92e2735bf28d28923c9fe16631a729b29f4bf SHA256 5f41fa3cc992721709d3761601dcd9d57e4ec26f113e115005feb7aab9920257
 DIST libcanberra-0.22.tar.gz 459404 RMD160 3cccf6b7955aa2926514d5f3e6f48849edea0c1f SHA1 b1c642b0e1322dcbf1a791d4d87dd92cdc002b12 SHA256 6a87737c3d045549a4a9c789cfc565a48185a586aa1a59243dea6421e9978581
+DIST libcanberra-0.23.tar.gz 460205 RMD160 5165384d4ebbe2a692ed3eadbe2bf2d68cf93e8c SHA1 20ba6a3c16b0d93baacfa411a49966fdbb578d0a SHA256 a7d0cf282a9fc8d1e41c082b72a2bf4cf86a6d599f0262484bac95bab57a0960
 EBUILD libcanberra-0.11.ebuild 1732 RMD160 4d2790467b94b5da9b6a5b4cad62f943a7397abd SHA1 130da73681b013e9a6c916b4cf9ba2474105eddd SHA256 76f10ee2d38e634647cd0abc688571f71b79da938c40c726693da057f0e7b894
-EBUILD libcanberra-0.17.ebuild 2336 RMD160 829556ea98ca3994842074931f8a1a39c6c70031 SHA1 1fe6077d0ddb84dde81804aa0c69666b25650c6f SHA256 a497d55f3329b3e973227c21fefc27599a81c040d11c8f3da186d5d3e9517f4c
 EBUILD libcanberra-0.22.ebuild 2381 RMD160 83f703583dc809c67e52ce26dcce1280303a377e SHA1 edbfb9f53165ad3468872d0b97edd8413df3e28f SHA256 512a6a9d5ae1a561e6c85efaa37dfd6dcefef0fbb4df15fecb28c2cf61903e54
-MISC ChangeLog 5526 RMD160 e4e5f34f83f82e83cd557029b26e01b2546f1b51 SHA1 df1e43daa5f353bb6fe1860b5863f708e18be969 SHA256 66450a17c989c53ce80ecd52ac97685504fa8ff95393f8ea2eded13d4fd7c5e0
-MISC metadata.xml 1022 RMD160 89b9e49f7b7947e3518d5f58200f968f81e979d0 SHA1 060fc19cc9434e073ca31ebe6326e975a52564cf SHA256 8f31b433f98332004cd0d74e9d706495de2ba9db4bdecb8dbf9c2dea54913a95
+EBUILD libcanberra-0.23.ebuild 1438 RMD160 151c73188de8f0843e7089ec3d4e0347d33875bb SHA1 244ce54f9bef555c6785c388c916834800f73acb SHA256 46e8cc74306edc07836d23d59dfdf4cfddfc0f8cb44c8b6b910fb0c9a93d5b14
+MISC ChangeLog 5658 RMD160 919928a186d4956772016b9ab1b49dda0dc0da56 SHA1 e18a7064ab19b25605090a645d3a905f050ca0ef SHA256 342d04b656cb0875f469295f8f045892e1d5ccde0114804186b058367600b402
+MISC metadata.xml 1100 RMD160 2b090276db79bfa2036a7d12e5d644410dbb3c24 SHA1 eb40123883d82bc3148b2af0d1c1b7c45a10fb88 SHA256 b719c63a7e7c777ae8afb2526f840e4cb24fcd357a41705f85253354fcf9032c
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>