Fixup code to work with autoconf-2.62 and libtool-2.2 #212811 by Patrizio Bassi.

Package-Manager: portage-2.2_pre5

4 files changed, 98 insertions, 6 deletions

diff --git a/dev-lang/wml/ChangeLog b/dev-lang/wml/ChangeLog
index 853e312cf745..17c3d12b66b7 100644
--- a/dev-lang/wml/ChangeLog
+++ b/dev-lang/wml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/wml
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/ChangeLog,v 1.42 2008/03/10 14:21:12 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/ChangeLog,v 1.43 2008/04/20 11:25:50 vapier Exp $
+
+  20 Apr 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/wml-2.0.11-autotools.patch, wml-2.0.11-r3.ebuild:
+  Fixup code to work with autoconf-2.62 and libtool-2.2 #212811 by Patrizio
+  Bassi.
 
   10 Mar 2008; Steve Dibb <beandog@gentoo.org> wml-2.0.11-r3.ebuild:
   amd64 stable, bug 209927
diff --git a/dev-lang/wml/Manifest b/dev-lang/wml/Manifest
index e031f306f29e..f352c61ef0d3 100644
--- a/dev-lang/wml/Manifest
+++ b/dev-lang/wml/Manifest
@@ -1,10 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.0.9-fix-configure.in.patch 1411 RMD160 54aa0b173fd0dc1fdc5f7f652682cec078f78a25 SHA1 762954af3422b7f3a1ed100023d71bdf279e0252 SHA256 e59dee3fd10b2cc9603f15fbff1ccdf466d5c9fd919c09c058a0aaa3b7064286
+AUX wml-2.0.11-autotools.patch 2165 RMD160 a0fef6b4b252e4931fc95e401fc4cb35d5e47778 SHA1 64def981a94146016835a3d8babda35054508285 SHA256 5fc6f51ec3cec9aa76e28f0065708c47ca159b0c174b4d74e5999fb9ea1fa0dd
 AUX wml-2.0.11-tmpfile.patch 2367 RMD160 7141e7ffbabe0471d3cd508ca38b2755b646ed76 SHA1 d5bbef415b15ec4142ffd36a4b4b80b47078fff0 SHA256 335d4ae47ebd260743ee57b07509a56430b4ca221e1350f77ded2d6433787db0
 AUX wml-2.0.9-autotools-update.patch 2720 RMD160 b1b7c2304660506a02cf74fc147a40f8de8c8e8f SHA1 12491ac4b82a085f69b71b33f63582eaf90d08a6 SHA256 09cfc157fb4e4a06070375161b0cd38eeed7154701f729196ed2753ea5c0a9c6
 AUX wml-2.0.9-gcc41.patch 361 RMD160 7801e31d2e2d379c148902a697c46bec15cde831 SHA1 e2b904437a6a873d583def0600ac04257eef5d55 SHA256 7c983ec6d7f659eb1b152f03b98764df40d51b6b5d1ceb7fbee4a79b695c5e33
 DIST wml-2.0.11.tar.gz 3115230 RMD160 fead82a35d116447b860d7b1c506c6de187355e8 SHA1 14dd7c23461716171a66b65676bca6e19a593007 SHA256 8e11ef19ea67ff9c4b28ff0fcacf5098881ac0c5f09ddfe3abc29f1e12be5d4a
 EBUILD wml-2.0.11-r1.ebuild 1638 RMD160 33555233a5d62a798791b116e7b311fa65d13684 SHA1 40207572486bf6d702bfca0fc5ee635dd381d3f7 SHA256 4d0d5a08c72135aa17e211835c4b46a06abab2e52b8061e6bb54af1fce29be7f
 EBUILD wml-2.0.11-r2.ebuild 1754 RMD160 99a204a00952deb78b48883f8e25de6dceda43c3 SHA1 2097b0890d6ccf11006338ff97966508abae907a SHA256 7de71309023ef7dd3e450879a08b5d493483a12a256d81860b8a775c142fcf0e
-EBUILD wml-2.0.11-r3.ebuild 1797 RMD160 eabfc2c3dd255533467e1a90c9dd0727b806e7c2 SHA1 095512016d219976d0ab2fa37bceccba75f9c05a SHA256 50ab771eca4e59a8e0246d6c7bf80e35caeffb85bb362c78c06339b7a016139b
-MISC ChangeLog 5213 RMD160 e5bf1ca21a34f026ef59c9aadfcf4cf5559f7f07 SHA1 6e9e20481297d378e8108a95cd20b7c21ef63f95 SHA256 40b81cf4ecef0e45fb89700fd16f9538640f38436801e424c628b15da4acc144
+EBUILD wml-2.0.11-r3.ebuild 1855 RMD160 69381fa8f4fb2befa296295afd85073953b6677e SHA1 c951b2dce54d4d07065b291e1d2bc95ea86e9047 SHA256 162dfd25d0ba84c76d34c7a8acc65575c2d430fd3a0de99e0a06bf23527a3e77
+MISC ChangeLog 5407 RMD160 c93cfe7993401084df25b6e71179ee24ea38e43e SHA1 cb80f039413f8c95e3eee0906a91e3c73e02d04e SHA256 18f4d8dd861a0d2401d6d7e2fcd1a4f6a826aa66910a669ef9fd7686241fe0b2
 MISC metadata.xml 255 RMD160 2e04128b5183df88816f4d226448444d02439c3c SHA1 95202de91147c591bc326f12ec296131aa445e7b SHA256 4791ad0953ab9cd515144e1517b927fe1824859496dd7c84c32af20d5f99c20e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFICyhEj9hvisErhMIRArqVAJ45ct6uza27mWMV17oO3sXKY7IiBgCfZzWT
+CuM41OjpVcMh4kypwV0bsW8=
+=we0I
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/wml/files/wml-2.0.11-autotools.patch b/dev-lang/wml/files/wml-2.0.11-autotools.patch
new file mode 100644
index 000000000000..fc9d34b8da8a
--- /dev/null
+++ b/dev-lang/wml/files/wml-2.0.11-autotools.patch
@@ -0,0 +1,74 @@
+--- wml_backend/p4_gm4/configure.in
++++ wml_backend/p4_gm4/configure.in
+@@ -2,7 +2,7 @@
+ # Copyright (C) 1991, 1993, 1994 Free Software Foundation, Inc.
+ # Process this file with autoconf to produce a configure script.
+ 
+-undefine([changeword])
++m4_ifdef([changeword],[m4_undef([changeword])])
+ 
+ AC_INIT(src/m4.c)
+ AC_CONFIG_HEADER(config.h)
+@@ -21,9 +21,7 @@
+ AC_PROG_MAKE_SET
+ AC_PROG_RANLIB
+ 
+-AC_AIX
+-AC_ISC_POSIX
+-AC_MINIX
++AC_USE_SYSTEM_EXTENSIONS
+ fp_C_PROTOTYPES
+ AC_C_CONST
+ AC_EXEEXT
+--- wml_backend/p2_mp4h/src/Makefile.am
++++ wml_backend/p2_mp4h/src/Makefile.am
+@@ -8,7 +8,7 @@
+ EXTRA_DIST = readme.tmpl
+ 
+ if LOADABLE_MODULES
+-MODULE_C = module.c ltdl.c
++MODULE_C = module.c
+ endif
+ 
+ mp4h_SOURCES = builtin.c debug.c devel.c freeze.c input.c \
+@@ -16,7 +16,7 @@
+ if LOADABLE_MODULES
+ mp4h_LDFLAGS = -export-dynamic
+ endif
+-mp4h_LDADD   = -lm $(top_builddir)/lib/libmp4h.a -lpcre @INTLLIBS@
++mp4h_LDADD   = -lm $(top_builddir)/lib/libmp4h.a -lpcre @INTLLIBS@ -lltdl
+ 
+ include_HEADERS = mp4h.h
+ noinst_HEADERS  = builtin.h ltdl.h
+--- wml_backend/p2_mp4h/modules/intl/Makefile.am
++++ wml_backend/p2_mp4h/modules/intl/Makefile.am
+@@ -13,7 +13,7 @@
+ man3ext   = 3
+ 
+ INCLUDES  = -I$(top_srcdir)/lib  -I$(top_srcdir)/src @INTLINCL@
+-LDFLAGS   = -no-undefined -module -avoid-version -rpath $(mp4mdir) @DLLDFLAGS@
++AM_LDFLAGS   = -no-undefined -module -avoid-version -rpath $(mp4mdir) @DLLDFLAGS@
+ 
+ if DO_MODULE_INTL_GETTEXT
+ mp4m_LTLIBRARIES   = gettext.la
+--- wml_backend/p2_mp4h/modules/system/Makefile.am
++++ wml_backend/p2_mp4h/modules/system/Makefile.am
+@@ -13,7 +13,7 @@
+ man3ext   = 3
+ 
+ INCLUDES  = -I$(top_srcdir)/lib  -I$(top_srcdir)/src @INTLINCL@
+-LDFLAGS   = -no-undefined -module -avoid-version -rpath $(mp4mdir) @DLLDFLAGS@
++AM_LDFLAGS   = -no-undefined -module -avoid-version -rpath $(mp4mdir) @DLLDFLAGS@
+ 
+ if DO_MODULE_SYSTEM
+ mp4m_LTLIBRARIES = sh.la exec.la
+--- wml_backend/p3_eperl/Makefile.in
++++ wml_backend/p3_eperl/Makefile.in
+@@ -215,7 +215,6 @@
+ 
+ eperl$(EXEEXT): $(OBJS)
+ 	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS) $(dmalloc)
+-	@[ "x$(debug)" = xon ] || strip $@
+ 
+ eperl_main.o: eperl_main.c
+ 	$(CC) $(CFLAGS) -c eperl_main.c
diff --git a/dev-lang/wml/wml-2.0.11-r3.ebuild b/dev-lang/wml/wml-2.0.11-r3.ebuild
index 85922c199675..b9cbdec11e14 100644
--- a/dev-lang/wml/wml-2.0.11-r3.ebuild
+++ b/dev-lang/wml/wml-2.0.11-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/wml-2.0.11-r3.ebuild,v 1.5 2008/03/10 14:21:12 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/wml-2.0.11-r3.ebuild,v 1.6 2008/04/20 11:25:50 vapier Exp $
 
 inherit fixheadtails eutils autotools multilib
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="amd64 ia64 ppc ~s390 sparc x86"
 IUSE=""
 
-DEPEND="dev-libs/libpcre
+RDEPEND="dev-libs/libpcre
+	sys-devel/libtool
 	dev-lang/perl"
 
 src_unpack() {
@@ -24,6 +25,7 @@ src_unpack() {
 	epatch "${FILESDIR}/wml-2.0.9-gcc41.patch"
 	epatch "${FILESDIR}/wml-2.0.9-autotools-update.patch"
 	epatch "${FILESDIR}/wml-2.0.11-tmpfile.patch"
+	epatch "${FILESDIR}"/${P}-autotools.patch
 
 	einfo "Patching Makefile.in files to fix various problems"
 	# Patch Makefile to avoid stripping binaries
@@ -45,7 +47,7 @@ src_unpack() {
 }
 
 src_compile() {
-	econf --libdir=/usr/$(get_libdir) || die "./configure failed"
+	econf --without-included-ltdl || die "./configure failed"
 	emake || die "emake failed"
 }