Version bump. bug fixes. Clean up old revision.

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

2 files changed, 34 insertions, 11 deletions

diff --git a/media-libs/libcanberra/ChangeLog b/media-libs/libcanberra/ChangeLog
index 882fa310087a..4945a7cb75ce 100644
--- a/media-libs/libcanberra/ChangeLog
+++ b/media-libs/libcanberra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libcanberra
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.25 2009/07/21 06:17:23 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.26 2009/08/23 22:12:51 eva Exp $
+
+*libcanberra-0.15 (23 Aug 2009)
+
+  23 Aug 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -libcanberra-0.11-r1.ebuild, +libcanberra-0.15.ebuild:
+  Version bump. bug fixes. Clean up old revision.
 
   21 Jul 2009; Romain Perier <mrpouet@gentoo.org> libcanberra-0.14.ebuild,
   +files/libcanberra-0.14-am-gconf-source-2-m4.patch:
diff --git a/media-libs/libcanberra/libcanberra-0.11-r1.ebuild b/media-libs/libcanberra/libcanberra-0.15.ebuild
index 0ad70a11d2e2..3f6a87b9353f 100644
--- a/media-libs/libcanberra/libcanberra-0.11-r1.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.15.ebuild
@@ -1,10 +1,10 @@
 # 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.11-r1.ebuild,v 1.1 2009/03/11 02:24:33 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.15.ebuild,v 1.1 2009/08/23 22:12:51 eva Exp $
 
 EAPI="1"
 
-inherit gnome2-utils
+inherit eutils gnome2-utils autotools
 
 DESCRIPTION="Portable Sound Event Library"
 HOMEPAGE="http://0pointer.de/lennart/projects/libcanberra/"
@@ -25,10 +25,33 @@ RDEPEND="media-libs/libvorbis
 		>=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) \
@@ -44,17 +67,11 @@ src_compile() {
 
 src_install() {
 	# we must delay gconf schema installation due to sandbox
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+	#export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
 
 	emake DESTDIR="${D}" install || die "emake install failed."
 
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-	rm "${D}/usr/share/doc/${PN}/README"
-	# If the rmdir errors, you probably need to add a file to dodoc
-	# and remove the package installed above
-	rmdir "${D}/usr/share/doc/${PN}"
-	dodoc README
+	#unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 }
 
 pkg_preinst() {