Version bump with a few bugfixes. No longer uses gconf, meaning that gnome-settings-daemon-2.x will no longer automatically load the canberra gtk modules. Install devhelp docs in /usr/share/gtk-doc where devhelp expects to find them.

Package-Manager: portage-2.2.0_alpha112/cvs/Linux x86_64

3 files changed, 95 insertions, 7 deletions

diff --git a/media-libs/libcanberra/ChangeLog b/media-libs/libcanberra/ChangeLog
index 1c12f2f8da8b..105a3e69e7a7 100644
--- a/media-libs/libcanberra/ChangeLog
+++ b/media-libs/libcanberra/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/libcanberra
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.82 2012/06/02 12:21:29 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.83 2012/06/25 05:07:50 tetromino Exp $
+
+*libcanberra-0.29 (25 Jun 2012)
+
+  25 Jun 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +libcanberra-0.29.ebuild:
+  Version bump with a few bugfixes. No longer uses gconf, meaning that
+  gnome-settings-daemon-2.x will no longer automatically load the canberra gtk
+  modules. Install devhelp docs in /usr/share/gtk-doc where devhelp expects to
+  find them.
 
   02 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
   libcanberra-0.28-r5.ebuild:
diff --git a/media-libs/libcanberra/Manifest b/media-libs/libcanberra/Manifest
index e3a0d9a9d77f..9010edfffa99 100644
--- a/media-libs/libcanberra/Manifest
+++ b/media-libs/libcanberra/Manifest
@@ -1,17 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX gconf-2.m4 1579 RMD160 48aa5e5e77d4c024efb70b643403bec8969fe815 SHA1 5e3c4701f63b1b4614f48d94d03440af7155f119 SHA256 2c9a981afe5bba4486c8e0ddb66433aef4af953168bd254f6a5ba1c6692f80f8
 AUX libcanberra-0.28-underlinking.patch 1485 RMD160 e0d7899a300ad7e97db39634a21f860f1c615e65 SHA1 d5e8b47d785732f964c9d56bd52def4ad13e1d50 SHA256 3798873e8895602159b0df11f45e806c28056a7f3c3820a0664ed1e6cf25a8a4
 AUX libcanberra-0.28-workaround-hang.patch 849 RMD160 e941604819356cbfab245b9fafecf62dfdcd96a2 SHA1 ab674ad48e2d915dd335303130bd0053fcf53bce SHA256 ffcac176507075d76ca360302b53a45228df785f689e95302b48200a20e4dda4
 DIST libcanberra-0.28.tar.gz 487276 RMD160 a351f048376d4c66bc0c1612188e8ffbfcec136b SHA1 2a41dae039df1fea98cfb71bd7ca34e57b6e8091 SHA256 eb1f8b2cabad7f07b6e44d606a91d73e1efca4b46daf92bd553e7222bc68868c
+DIST libcanberra-0.29.tar.xz 315728 RMD160 a1fe15a7ce0a63ab3e5cc312a34ffe575775c0c1 SHA1 74052db5d1369a52c00aa11cd2310111380345c1 SHA256 127a5ef07805856d63758e5180ebfb241d1f80094fd301c287591a15b8cfcd72
 EBUILD libcanberra-0.28-r5.ebuild 2681 RMD160 6f68bb22283b4312f0811416257d1224b02b850a SHA1 a3a2a7ea7df8cb09581f2f0243ad06dc369bde8a SHA256 47bd5076b0ce1b07321a1d474284cd561b7b153f2d7e78056a8463163f14b08c
-MISC ChangeLog 13348 RMD160 787d33c59ef7cc6c3240b20fdf83ac7a0b91726a SHA1 09dc2a68e7a877e10eed45302445572f7c5b84e4 SHA256 69f003b3d9c615804593d5a67628f663cb660bf54ba3a5cc73d642604c95a49c
+EBUILD libcanberra-0.29.ebuild 2300 RMD160 d941bcc6c98baf1dc7c9bce42e4aded29cec4159 SHA1 bfe7484e821a4a12fd0dedfd1b47e59ab7cfcf42 SHA256 90dc574338b5442ecc5bfc7bb6948c3aba669724362fd5b78751ae4902f9165b
+MISC ChangeLog 13712 RMD160 4fa45f884984942bf21521d7c8b1e8cdebf1c963 SHA1 21ee6f68530cb79a5ca3c83196ae931795fc78fd SHA256 a19a0cadac4bd58b0477f3e63375c461560c49690492a1ba9d3ff9a538fc2f55
 MISC metadata.xml 1542 RMD160 9870e70050f5f19e19be5c965b03d65b71faae4e SHA1 1d401136554c5142a95eaef76ca236ef828d7550 SHA256 937a49bfb06b48512919df4237fabf66d40794144843790337f884961bdcf1c9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAk/KBVYACgkQl5yvQNBFVTWTNwCgjIdAhQlJDtvmZREJW5oM4pek
-pQMAoIVNf2p7RhediD4PaO+LNUfIex+s
-=s6op
+iQEcBAEBAgAGBQJP5/IrAAoJEJ0WA1zPCt1hcYAIALXedvM2CvOzR0rH+SCB2e03
+MaVBaSFqq3M0mGYSn1YoTNmtmpR7mh61iZFKwf8J8NgqhDJM2yKOMaOrtrY3w7Xb
+qW+zy/VO3Tefl8k2JEeL2D2hShQDvGi+YdWY8qnh2zao1AxeMtXPzhCtzJNSQ9lT
+voZU1t7CGJfT6vSCpsRFhExmaz2pRxpKLG2UIhpwyFzzZ8z70+U4cn2Lh0dU+ixL
+zII5kM3Q7isHgxjWRl/lF8htdPp8LVl5XPxIV8FTKLGB6dEzJ3pViZThxlN9Fj9P
+Lc8XoLLJ17jlArWr/YuXKSg2VfRH/cLQ5W8HtNVc3/nf/ONoxn5zZTWAYnOe2u4=
+=110t
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libcanberra/libcanberra-0.29.ebuild b/media-libs/libcanberra/libcanberra-0.29.ebuild
new file mode 100644
index 000000000000..020eb404baf3
--- /dev/null
+++ b/media-libs/libcanberra/libcanberra-0.29.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.29.ebuild,v 1.1 2012/06/25 05:07:50 tetromino Exp $
+
+EAPI="4"
+
+inherit 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.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="alsa gnome 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 )
+	gtk3? ( x11-libs/gtk+:3 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
+	tdb? ( sys-libs/tdb )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome? ( gnome-base/gsettings-desktop-schemas )
+	sound? ( x11-themes/sound-theme-freedesktop )" # Required for index.theme wrt #323379
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+REQUIRED_USE="udev? ( alsa )"
+
+src_prepare() {
+	# https://bugs.freedesktop.org/show_bug.cgi?id=31454
+	epatch "${FILESDIR}"/${PN}-0.28-underlinking.patch
+
+	eautoreconf
+}
+
+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
+}
+
+src_install() {
+	# Disable parallel installation until bug #253862 is solved
+	emake -j1 DESTDIR="${D}" install
+
+	# Remove useless .la files:
+	# libcanberra uses lt_dlopenext instead of ld_dlopen to load the modules,
+	# which means that it will first try appending ".la" to the given filename
+	# prefix; if that fails, it will append the module extension for the
+	# current system and try that (".so" on Linux, ".bundle" on Darwin, ".dll"
+	# on Windows, etc.).  Only if both fail will it return an error.
+	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+}