Fix #199532

(Portage version: 2.1.3.19)

3 files changed, 69 insertions, 1 deletions

diff --git a/dev-lang/wml/ChangeLog b/dev-lang/wml/ChangeLog
index 216eaf681f82..13bf1688e620 100644
--- a/dev-lang/wml/ChangeLog
+++ b/dev-lang/wml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/wml
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/ChangeLog,v 1.36 2007/07/21 19:11:59 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/ChangeLog,v 1.37 2007/12/23 13:14:16 graaff Exp $
+
+*wml-2.0.11-r2 (23 Dec 2007)
+
+  23 Dec 2007; Hans de Graaff <graaff@gentoo.org> +wml-2.0.11-r2.ebuild:
+  Fix installation with multilib-strict, fixing #199532.
 
   21 Jul 2007; Hans de Graaff <graaff@gentoo.org> -wml-2.0.9-r1.ebuild,
   -wml-2.0.11.ebuild:
diff --git a/dev-lang/wml/files/digest-wml-2.0.11-r2 b/dev-lang/wml/files/digest-wml-2.0.11-r2
new file mode 100644
index 000000000000..2d458c0dafd5
--- /dev/null
+++ b/dev-lang/wml/files/digest-wml-2.0.11-r2
@@ -0,0 +1,3 @@
+MD5 a26feebf4e59e9a6940f54c69dde05b5 wml-2.0.11.tar.gz 3115230
+RMD160 fead82a35d116447b860d7b1c506c6de187355e8 wml-2.0.11.tar.gz 3115230
+SHA256 8e11ef19ea67ff9c4b28ff0fcacf5098881ac0c5f09ddfe3abc29f1e12be5d4a wml-2.0.11.tar.gz 3115230
diff --git a/dev-lang/wml/wml-2.0.11-r2.ebuild b/dev-lang/wml/wml-2.0.11-r2.ebuild
new file mode 100644
index 000000000000..11f6b0f33c3b
--- /dev/null
+++ b/dev-lang/wml/wml-2.0.11-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2007 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-r2.ebuild,v 1.1 2007/12/23 13:14:16 graaff Exp $
+
+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=""
+
+DEPEND="dev-libs/libpcre
+	dev-lang/perl"
+
+src_unpack() {
+	unpack ${A}
+	ht_fix_all
+	cd "${S}"
+
+	epatch "${FILESDIR}/wml-2.0.9-gcc41.patch"
+	epatch "${FILESDIR}/wml-2.0.9-autotools-update.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_compile() {
+	econf --libdir=/usr/$(get_libdir) || die "./configure failed"
+	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*
+}