Fix compliation with perl 5.10.

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

4 files changed, 115 insertions, 5 deletions

diff --git a/dev-lang/wml/ChangeLog b/dev-lang/wml/ChangeLog
index 26aa1fa1fbe3..539fcd26edbd 100644
--- a/dev-lang/wml/ChangeLog
+++ b/dev-lang/wml/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/wml
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/ChangeLog,v 1.45 2009/05/30 06:05:01 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/ChangeLog,v 1.46 2009/10/18 11:41:51 graaff Exp $
+
+*wml-2.0.11-r4 (18 Oct 2009)
+
+  18 Oct 2009; Hans de Graaff <graaff@gentoo.org> +wml-2.0.11-r4.ebuild,
+  +files/wml-2.0.11-perl510.patch:
+  Fix compilation with perl 5.10, thanks to Arttu Valo in #281268 for
+  providing and testing the patch. Also fix a configure warning and convert
+  to EAPI to make the different phases in the ebuild more clearly separated.
 
   30 May 2009; Hans de Graaff <graaff@gentoo.org> -wml-2.0.11-r1.ebuild,
   -wml-2.0.11-r2.ebuild:
diff --git a/dev-lang/wml/Manifest b/dev-lang/wml/Manifest
index 1952f35f7f60..fac0d759e46a 100644
--- a/dev-lang/wml/Manifest
+++ b/dev-lang/wml/Manifest
@@ -3,17 +3,19 @@ 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-perl510.patch 1259 RMD160 39109c8f7f8b21253213b5f2362aebe5ec9cbe84 SHA1 dd84074cef036ed6a92863948ddd24e6ed4df051 SHA256 f3aeee0ee8aa1e0024a75c5a496003023554ae9e65f05ac910f4d5c1aa83460e
 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-r3.ebuild 1882 RMD160 027c9c807062d1fd047ffb75c97124ecd9c774ac SHA1 594dcdc3d5fbe385782104a5405ee1db64a642dc SHA256 306ada73da2eb95ac3f01d482a81347f7d5edb65cba900cae950b5bd3bc79567
-MISC ChangeLog 5696 RMD160 25849f6adf6bfbbb6ba8db8d74e1b1f633e7633d SHA1 b4fad230c2df012bd5bc7f0853954df180b92df4 SHA256 f532585db3b4aeecf9d3b4b2a741c14b9e108769eb1dd6c585f625b014e7d2fb
+EBUILD wml-2.0.11-r4.ebuild 1922 RMD160 ebe6840fd3145459f68e230efd91b0f1c21b486c SHA1 749d16632fff8906f3ef0e8ea641e45893ae2a31 SHA256 1b2a7a5d8da853bd7b990b55e6e75041c1bdd75dd64417ee83effef7700acb42
+MISC ChangeLog 6058 RMD160 1d784355844e5c51cf0bec166ab849b237d8534c SHA1 e6980e3127896d7eb649dd5e510ae5a40f0ec020 SHA256 0beb163f291dc11b0b97a6a576b00303852beca67edd0f18a49c2853864dd0c4
 MISC metadata.xml 255 RMD160 2e04128b5183df88816f4d226448444d02439c3c SHA1 95202de91147c591bc326f12ec296131aa445e7b SHA256 4791ad0953ab9cd515144e1517b927fe1824859496dd7c84c32af20d5f99c20e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkogzJsACgkQqj4ysMWt/vvcCgCgpUeEonUUF3uK8FhmS2/lShhB
-QrUAnR1o6OOLRhSqvGzcivWW2eo2A8Tg
-=ox6+
+iEYEARECAAYFAkra/woACgkQVYU2Ai8K93d5pgCgue933S+dzIWkEO0GMRC0JEgF
+KvUAn2AvAZHsyU0+9glist2yGZb02SDW
+=yV0C
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/wml/files/wml-2.0.11-perl510.patch b/dev-lang/wml/files/wml-2.0.11-perl510.patch
new file mode 100644
index 000000000000..9b29b31cbeec
--- /dev/null
+++ b/dev-lang/wml/files/wml-2.0.11-perl510.patch
@@ -0,0 +1,32 @@
+diff -ur wml-2.0.11.old/wml_backend/p3_eperl/configure wml-2.0.11/wml_backend/p3_eperl/configure
+--- wml-2.0.11.old/wml_backend/p3_eperl/configure	2009-09-22 03:02:03.000000000 +0300
++++ wml-2.0.11/wml_backend/p3_eperl/configure	2009-09-22 03:04:58.000000000 +0300
+@@ -1971,7 +1971,11 @@
+ #define HAVE_PERL_DYNALOADER 1
+ _ACEOF
+ 
+-        perl_dla=$perl_archlib/auto/DynaLoader/DynaLoader.a
++        if test -f $perl_archlib/auto/DynaLoader/DynaLoader.a; then
++            perl_dla=$perl_archlib/auto/DynaLoader/DynaLoader.a
++        else
++            perl_dla=
++        fi
+         ;;
+     * )
+         rc=no
+diff -ur wml-2.0.11.old/wml_backend/p3_eperl/configure.in wml-2.0.11/wml_backend/p3_eperl/configure.in
+--- wml-2.0.11.old/wml_backend/p3_eperl/configure.in	2009-09-22 03:02:03.000000000 +0300
++++ wml-2.0.11/wml_backend/p3_eperl/configure.in	2009-09-22 03:04:29.000000000 +0300
+@@ -159,7 +159,11 @@
+     define )
+         rc=yes
+         AC_DEFINE(HAVE_PERL_DYNALOADER)
+-        perl_dla=$perl_archlib/auto/DynaLoader/DynaLoader.a
++        if test -f $perl_archlib/auto/DynaLoader/DynaLoader.a; then
++            perl_dla=$perl_archlib/auto/DynaLoader/DynaLoader.a
++        else
++            perl_dla=
++        fi
+         ;;
+     * )
+         rc=no
diff --git a/dev-lang/wml/wml-2.0.11-r4.ebuild b/dev-lang/wml/wml-2.0.11-r4.ebuild
new file mode 100644
index 000000000000..5c26c795d913
--- /dev/null
+++ b/dev-lang/wml/wml-2.0.11-r4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2009 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-r4.ebuild,v 1.1 2009/10/18 11:41:51 graaff Exp $
+
+EAPI=2
+
+inherit fixheadtails eutils autotools multilib
+
+DESCRIPTION="Website META Language"
+HOMEPAGE="http://thewml.org/"
+SRC_URI="http://thewml.org/distrib/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~s390 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libpcre
+	sys-devel/libtool
+	dev-lang/perl"
+
+src_prepare() {
+	ht_fix_all
+	cd "${S}"
+
+	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}-perl510.patch"
+	epatch "${FILESDIR}"/${P}-autotools.patch
+
+	einfo "Patching Makefile.in files to fix various problems"
+	# Patch Makefile to avoid stripping binaries
+	for m in $(find "${S}" -name Makefile.in -print); do
+		sed -i -e "s/-m 755 -s/-m 755/" "${m}" || die "Could not run sed on ${m}"
+		sed -i -e "/^libdir.*/s::libdir = \$(prefix)/$(get_libdir)\$(libsubdir):" "${m}" || die "Could not run sed on ${m}"
+	done
+
+	# Patch Makefile to avoid a dependency on lynx just for documentation
+	sed -i -e "s/lynx -dump -nolist -width=72/cat/" wml_aux/tidy/Makefile.in || die
+
+	for d in $(find "${S}" \( -name configure.ac -o -name configure.in \) -exec dirname {} \;); do
+		pushd ${d} &>/dev/null
+		AT_NOELIBTOOLIZE="yes" eautoreconf
+		popd &>/dev/null
+	done
+
+	elibtoolize
+}
+
+src_configure() {
+	econf --libdir=/usr/$(get_libdir) || die "./configure failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+# The default src_test first checks if 'make test' is possible using the '-n'
+# option of make, but this messes up the tests completely.
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	einstall || die
+	dodoc ANNOUNCE BUGREPORT C* INSTALL MANIFEST README* SUPPORT VERSION*
+}