Fix correctly bug #277739, remove template fix, replaced LT_* macros by AC_LIBTOOL* (equivalent for old version) for backward compatibility with < sys-devel/libtool-2.2

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

4 files changed, 56 insertions, 6 deletions

diff --git a/media-libs/libcanberra/ChangeLog b/media-libs/libcanberra/ChangeLog
index 1122dca92425..e59bc8b7f5da 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.22 2009/07/16 11:01:07 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.23 2009/07/17 10:52:03 mrpouet Exp $
+
+  17 Jul 2009; Romain Perier <mrpouet@gentoo.org> libcanberra-0.14.ebuild,
+  +files/libcanberra-0.14-backward-compatibility-libtool.patch:
+  Fix correctly bug #277739, remove template fix, replaced LT_* by
+  AC_LIBTOOL* macros (equivalent for old version) for backward compatibility 
+  with < sys-devel/libtool-2.2
 
   16 Jul 2009; Romain Perier <mrpouet@gentoo.org> libcanberra-0.14.ebuild:
   Fix bug #277739. Moved sys-devel/libtool to >=sys-devel/libtool-2.2 into
diff --git a/media-libs/libcanberra/Manifest b/media-libs/libcanberra/Manifest
index 1659dd594bb8..781f63d061f8 100644
--- a/media-libs/libcanberra/Manifest
+++ b/media-libs/libcanberra/Manifest
@@ -1,9 +1,10 @@
 AUX libcanberra-0.11-dont-crash-without-display.patch 2985 RMD160 44c4029f4103c3111a08f7762bbd8eef07aea55a SHA1 c28e51452ecb8d171f818d00e63caaa645cea586 SHA256 13d1251c96a69ef3271112096dc9e63e4e9c6f637705f1f8e701c6e24d2c2e74
+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.14.tar.gz 451899 RMD160 cf62ada63c314368717cd0173dfd9863f9f9ffa4 SHA1 be6a70f597cd7604db30e8c9578fcf415e96ead2 SHA256 879f9ab798ae287048518ebb55132bbab905bea4b830a90f27a04df6d08d2a5e
 EBUILD libcanberra-0.11-r1.ebuild 1816 RMD160 056249040d6554e4eca90104f0eee876cdb168ee SHA1 1aefa5b1c4a3ab8d7fe053a37513a7d333e8460e SHA256 dce68d49a8c488ce1e3ade0008959c75e8e5fc41d94be97271aed47c048adf71
 EBUILD libcanberra-0.11-r5.ebuild 1932 RMD160 2b2fbbed37b56f4ea2d6aaf909940b4f7be0de7c SHA1 4042a90d9073a4f31ec8dde40c0feed0da1a0d39 SHA256 e5c384cef1177a3b35633471d90df6874d7d59305768b046c5204eb850acfa62
 EBUILD libcanberra-0.11.ebuild 1732 RMD160 4d2790467b94b5da9b6a5b4cad62f943a7397abd SHA1 130da73681b013e9a6c916b4cf9ba2474105eddd SHA256 76f10ee2d38e634647cd0abc688571f71b79da938c40c726693da057f0e7b894
-EBUILD libcanberra-0.14.ebuild 1831 RMD160 1d9c5043bf3231b73644cc495bc04d23c51ce19f SHA1 88e95cd36d269d5d254a9a7c21a5f4c3f86a46b6 SHA256 576ec7f0cab41b456ffb4046535c493f27f0cc40ae6007a599c753b57563f35c
-MISC ChangeLog 3375 RMD160 41ae345fd871860e592ca0c49eeacdef00aa10ab SHA1 3cf564d6f4eb334a9ebe14825cfd83974da4704a SHA256 ab592b21a24fb910fd17737d089608a1c53e1f685459b774c6a178d7889eb319
+EBUILD libcanberra-0.14.ebuild 2127 RMD160 fdb6edb36b5daa4ae13f79690dca8ccab9a7de7f SHA1 ae4652d834715339b00830234f983656a7f8586b SHA256 594a20381cbe52bf9827447c8145ec9ed93a4cbc296498b4475ad2846bb17c80
+MISC ChangeLog 3691 RMD160 6bbdff9f0ddc9e45f8b17caa888bfc6a5730a22f SHA1 ad0675fa22f764dfcd4a2a0a318d5c32eaf7417c SHA256 c113d49f3676967d1bcc2f1a256c302189c1e24bf6d79b617ebb5e4fe96138a7
 MISC metadata.xml 1022 RMD160 89b9e49f7b7947e3518d5f58200f968f81e979d0 SHA1 060fc19cc9434e073ca31ebe6326e975a52564cf SHA256 8f31b433f98332004cd0d74e9d706495de2ba9db4bdecb8dbf9c2dea54913a95
diff --git a/media-libs/libcanberra/files/libcanberra-0.14-backward-compatibility-libtool.patch b/media-libs/libcanberra/files/libcanberra-0.14-backward-compatibility-libtool.patch
new file mode 100644
index 000000000000..54428f00f1dd
--- /dev/null
+++ b/media-libs/libcanberra/files/libcanberra-0.14-backward-compatibility-libtool.patch
@@ -0,0 +1,30 @@
+ configure.ac |    9 ++++++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e804538..1e96988 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -68,8 +68,11 @@ for flag in $DESIRED_FLAGS ; do
+ done
+ 
+ #### libtool stuff ####
+-LT_PREREQ(2.2)
+-LT_INIT([dlopen win32-dll disable-static])
++AC_LIBTOOL_DLOPEN
++AC_LIBTOOL_WIN32_DLL
++AC_DISABLE_STATIC
++AM_DISABLE_STATIC
++AC_PROG_LIBTOOL
+ 
+ dnl Unfortunately, even up to libtool 2.2.6a there is no way to know
+ dnl exactly which version of libltdl is present in the system, so we
+@@ -89,7 +92,7 @@ dnl can give the proper place to find libltdl through the standard
+ dnl variables like LDFLAGS and CPPFLAGS.
+ 
+ AC_CHECK_HEADER([ltdl.h],
+-    [AC_CHECK_LIB([ltdl], [lt_dladvise_init], [LIBLTDL=-lltdl], [LIBLTDL=])],
++    [AC_CHECK_LIB([ltdl], [lt_dlopen], [LIBLTDL=-lltdl], [LIBLTDL=])],
+     [LIBLTDL=])
+ 
+ AS_IF([test "x$LIBLTDL" = "x"],
diff --git a/media-libs/libcanberra/libcanberra-0.14.ebuild b/media-libs/libcanberra/libcanberra-0.14.ebuild
index 80fbb8cc8f58..3ea05c66b1a2 100644
--- a/media-libs/libcanberra/libcanberra-0.14.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.14.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.14.ebuild,v 1.2 2009/07/16 11:01:07 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.14.ebuild,v 1.3 2009/07/17 10:52:03 mrpouet Exp $
 
 EAPI="1"
 
-inherit eutils gnome2-utils
+inherit eutils gnome2-utils autotools
 
 DESCRIPTION="Portable Sound Event Library"
 HOMEPAGE="http://0pointer.de/lennart/projects/libcanberra/"
@@ -16,7 +16,7 @@ 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-2.2
+	sys-devel/libtool
 	alsa? ( media-libs/alsa-lib )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
 	gstreamer? ( >=media-libs/gstreamer-0.10.15 )
@@ -27,6 +27,19 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.17
 	doc? ( >=dev-util/gtk-doc-1.9 )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-backward-compatibility-libtool.patch"
+
+	rm "${S}/lt*"    || die "clean-up ltmain.sh failed"
+	rm "${S}/m4/lt*" || die "clean-up lt scripts failed"
+	rm "${S}/m4/libtool*" || die "clean-up libtool script failed"
+
+	eautoreconf
+}
+
 src_compile() {
 	econf --disable-static \
 		$(use_enable alsa) \