Fix compliation with perl 5.10.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 109 insertions, 1 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/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*
+}