Fix #199532

Package-Manager: portage-2.1.3.19

4 files changed, 84 insertions, 9 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/Manifest b/dev-lang/wml/Manifest
index a4dc59d3050c..453a6e74ee89 100644
--- a/dev-lang/wml/Manifest
+++ b/dev-lang/wml/Manifest
@@ -18,10 +18,14 @@ EBUILD wml-2.0.11-r1.ebuild 1638 RMD160 33555233a5d62a798791b116e7b311fa65d13684
 MD5 3860587dff699de5fc04b56e22c5515e wml-2.0.11-r1.ebuild 1638
 RMD160 33555233a5d62a798791b116e7b311fa65d13684 wml-2.0.11-r1.ebuild 1638
 SHA256 4d0d5a08c72135aa17e211835c4b46a06abab2e52b8061e6bb54af1fce29be7f wml-2.0.11-r1.ebuild 1638
-MISC ChangeLog 4365 RMD160 712a4865252da415495020d5b7bf84b042b52a62 SHA1 bae2288163b25a3d48dccd376b81226e45a547f7 SHA256 f5080fd44a7a2a7820b6da1aa512eb2f4a0722d24d7d9edb43d78ae5c60216c4
-MD5 d7086da1bb6210ecc9416a32d1cef5b6 ChangeLog 4365
-RMD160 712a4865252da415495020d5b7bf84b042b52a62 ChangeLog 4365
-SHA256 f5080fd44a7a2a7820b6da1aa512eb2f4a0722d24d7d9edb43d78ae5c60216c4 ChangeLog 4365
+EBUILD wml-2.0.11-r2.ebuild 1754 RMD160 99a204a00952deb78b48883f8e25de6dceda43c3 SHA1 2097b0890d6ccf11006338ff97966508abae907a SHA256 7de71309023ef7dd3e450879a08b5d493483a12a256d81860b8a775c142fcf0e
+MD5 25a288d65857d19d9b1bbf50fecfb24f wml-2.0.11-r2.ebuild 1754
+RMD160 99a204a00952deb78b48883f8e25de6dceda43c3 wml-2.0.11-r2.ebuild 1754
+SHA256 7de71309023ef7dd3e450879a08b5d493483a12a256d81860b8a775c142fcf0e wml-2.0.11-r2.ebuild 1754
+MISC ChangeLog 4526 RMD160 9eeba495f3e70fcab12f0eda8309e2cddaaeacce SHA1 4b84f658bc0b49e2a20de2386f99b761eb48ab4f SHA256 64d3cc712410d6e1d46ec200f4ccc8b66a2e130fe9bb9dec50c2ce624710715c
+MD5 0ab29e1e12c11afe27b320bd7b63285f ChangeLog 4526
+RMD160 9eeba495f3e70fcab12f0eda8309e2cddaaeacce ChangeLog 4526
+SHA256 64d3cc712410d6e1d46ec200f4ccc8b66a2e130fe9bb9dec50c2ce624710715c ChangeLog 4526
 MISC metadata.xml 255 RMD160 2e04128b5183df88816f4d226448444d02439c3c SHA1 95202de91147c591bc326f12ec296131aa445e7b SHA256 4791ad0953ab9cd515144e1517b927fe1824859496dd7c84c32af20d5f99c20e
 MD5 546a6fed5e42248515406b71330d0065 metadata.xml 255
 RMD160 2e04128b5183df88816f4d226448444d02439c3c metadata.xml 255
@@ -29,10 +33,13 @@ SHA256 4791ad0953ab9cd515144e1517b927fe1824859496dd7c84c32af20d5f99c20e metadata
 MD5 ed23257c267480ff498e5f6edc4455b0 files/digest-wml-2.0.11-r1 235
 RMD160 37fec7cb61c1e4baebc0501b4341d8d71ef7ff22 files/digest-wml-2.0.11-r1 235
 SHA256 a8960fa6468de36d849a8680fb560aa2ba9527c49a134cb88fca4f679bcc48b6 files/digest-wml-2.0.11-r1 235
+MD5 ed23257c267480ff498e5f6edc4455b0 files/digest-wml-2.0.11-r2 235
+RMD160 37fec7cb61c1e4baebc0501b4341d8d71ef7ff22 files/digest-wml-2.0.11-r2 235
+SHA256 a8960fa6468de36d849a8680fb560aa2ba9527c49a134cb88fca4f679bcc48b6 files/digest-wml-2.0.11-r2 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGolp+0BM77Tkv120RAng5AKDBxakh+SogmGniA2vPlXFM4h/U3wCgmGrz
-OFZ7PvXnTTrJUoS4DrzxhnU=
-=P5A2
+iD8DBQFHbl9sQUozDL2JlH4RApeqAJ4zTc42JTwvVN9ajY8C4KEyHt6C1QCeLVlr
+3ohLAI1+LVMMy5G/o1qFYdM=
+=dQ0l
 -----END PGP SIGNATURE-----
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*
+}