Version bump with gtk+3 fixes (but still disabled until ready for the tree), bump to EAPI3 and run elibtoolize only when required (as read on ChangeLog, only ~x86-fbsd needs it).

Package-Manager: portage-2.1.9.14/cvs/Linux x86_64

3 files changed, 82 insertions, 2 deletions

diff --git a/media-libs/libcanberra/ChangeLog b/media-libs/libcanberra/ChangeLog
index 9ce6b9d8d5d9..36e66e751e0a 100644
--- a/media-libs/libcanberra/ChangeLog
+++ b/media-libs/libcanberra/ChangeLog
@@ -1,6 +1,13 @@
 # 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.55 2010/10/07 20:22:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.56 2010/10/09 16:04:04 pacho Exp $
+
+*libcanberra-0.26 (09 Oct 2010)
+
+  09 Oct 2010; Pacho Ramos <pacho@gentoo.org> +libcanberra-0.26.ebuild:
+  Version bump with gtk+3 fixes (but still disabled until ready for the
+  tree), bump to EAPI3 and run elibtoolize only when required (as read on
+  ChangeLog, only ~x86-fbsd needs it).
 
   07 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
   libcanberra-0.25.ebuild:
diff --git a/media-libs/libcanberra/Manifest b/media-libs/libcanberra/Manifest
index b2d8b4cd8139..b7fc617a19d5 100644
--- a/media-libs/libcanberra/Manifest
+++ b/media-libs/libcanberra/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST libcanberra-0.23.tar.gz 460205 RMD160 5165384d4ebbe2a692ed3eadbe2bf2d68cf93e8c SHA1 20ba6a3c16b0d93baacfa411a49966fdbb578d0a SHA256 a7d0cf282a9fc8d1e41c082b72a2bf4cf86a6d599f0262484bac95bab57a0960
 DIST libcanberra-0.25.tar.gz 463014 RMD160 eb05114133638f5e27a237da6ea74f64de1b4d26 SHA1 cb86b88af99936134929e120b2a8d55466de1d0a SHA256 46329eda4c877206232d4c906e8f5f401518cec52859395cde3a9e39ea97553c
+DIST libcanberra-0.26.tar.gz 463209 RMD160 f58fc2cfa4b35f6a6b2577057b969977f7de3b5d SHA1 31a1cb8757e5da39b4cdc06e523d011578d7a3e3 SHA256 4b5d8d2c2835133620adbc53745dd107b6e58b9a2963059e8f457143fee00982
 EBUILD libcanberra-0.23.ebuild 1467 RMD160 a9201b4e4b760b020a40393e69ea77a3fb7e5f32 SHA1 2da0e481bf34438006f1d5025d1e74a1d567676c SHA256 7a6ffcb28df188ae06c381f0884c54ca79c64d749d79d0020045377b809b5e07
 EBUILD libcanberra-0.25.ebuild 1715 RMD160 ab2d6ecf92a6d0c4adb5d50eabe159e2bd4beda2 SHA1 12849f350917f9a5fd0428f4885834711929c4eb SHA256 057890e78ae227918f5fc7d4df06feb8513d7ce6adb2d09e6cbaf56936b244a4
-MISC ChangeLog 8972 RMD160 6184867e58911d6fccea999a6bd6fec266c60dba SHA1 af7941bf96f6dbd803ab4a493d10f68bd7326145 SHA256 ec86efab1655240d49cc9868fc1022d31e680a8514278d34ba400044635d95b5
+EBUILD libcanberra-0.26.ebuild 1768 RMD160 2d594cb33a51c0f4c7d340ed9b16615e5e45fe5b SHA1 88b01eccc0cccf15bfb460af2c48894ca7386ce9 SHA256 ced221354a40fbddf341f94d302c2ba301e2d75366a66b1637941f7bf049e8c2
+MISC ChangeLog 9259 RMD160 6671a13a9892117555596fcebf5cd39723b2fb80 SHA1 1d34e5b6c803c7a707d58f534a0fdd7b823af685 SHA256 86fd1e9d88ab16da0be70f7b865b1727a09b9dd4b0e48a30067705b1c1b1fcb7
 MISC metadata.xml 1204 RMD160 b52e5fa7fcd0ba682ce3bed90d8522460f281bd5 SHA1 7dcbf395ea94a13b07d0a58fe22374c60a3986d2 SHA256 9ea6a807c752539c860761c6948404cbd05e6f8cbff1224b915a5b7fffddc278
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkywkpUACgkQCaWpQKGI+9TIawCfTb7C1LobwKEpWX0FooifE29P
+vQsAn163Ve2w2G2kWM4w1/FzxQIgyDdV
+=q2PN
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libcanberra/libcanberra-0.26.ebuild b/media-libs/libcanberra/libcanberra-0.26.ebuild
new file mode 100644
index 000000000000..8db889da4a03
--- /dev/null
+++ b/media-libs/libcanberra/libcanberra-0.26.ebuild
@@ -0,0 +1,61 @@
+# 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.26.ebuild,v 1.1 2010/10/09 16:04:02 pacho Exp $
+
+EAPI="3"
+inherit gnome2-utils libtool
+
+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 +sound tdb"
+
+COMMON_DEPEND="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.20.0:2
+		>=gnome-base/gconf-2 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
+	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"
+
+src_prepare() {
+	# Run elibtoolize for ~x86-fbsd.
+	use x86-fbsd && elibtoolize
+}
+
+# --disable-gtk3 for now
+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 \
+		--disable-gtk3 \
+		--with-html-dir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	# Disable parallel installation until bug #253862 is solved
+	emake -j1 DESTDIR="${ED}" install || die
+	prepalldocs
+}
+
+pkg_preinst() { gnome2_gconf_savelist; }
+pkg_postinst() { gnome2_gconf_install; }