Fix tests.

Package-Manager: portage-2.1.2.2

4 files changed, 80 insertions, 5 deletions

diff --git a/dev-lang/wml/ChangeLog b/dev-lang/wml/ChangeLog
index 58afb5bb1e8d..fd7f7dbae39d 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.30 2007/03/06 17:59:25 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/ChangeLog,v 1.31 2007/04/07 10:16:38 graaff Exp $
+
+*wml-2.0.11-r1 (07 Apr 2007)
+
+  07 Apr 2007; Hans de Graaff <graaff@gentoo.org> +wml-2.0.11-r1.ebuild:
+  Add custom src_test as per discussion in #173623.
 
 *wml-2.0.11 (06 Mar 2007)
 
diff --git a/dev-lang/wml/Manifest b/dev-lang/wml/Manifest
index dc9f3846265e..2e88b7b4eea8 100644
--- a/dev-lang/wml/Manifest
+++ b/dev-lang/wml/Manifest
@@ -12,6 +12,10 @@ RMD160 7801e31d2e2d379c148902a697c46bec15cde831 files/wml-2.0.9-gcc41.patch 361
 SHA256 7c983ec6d7f659eb1b152f03b98764df40d51b6b5d1ceb7fbee4a79b695c5e33 files/wml-2.0.9-gcc41.patch 361
 DIST wml-2.0.11.tar.gz 3115230 RMD160 fead82a35d116447b860d7b1c506c6de187355e8 SHA1 14dd7c23461716171a66b65676bca6e19a593007 SHA256 8e11ef19ea67ff9c4b28ff0fcacf5098881ac0c5f09ddfe3abc29f1e12be5d4a
 DIST wml-2.0.9.tar.gz 2570742 RMD160 bf14a4c09bdd850c5bad5f48f712717a13b13412 SHA1 ce95ad9c55fd52e2028099d391858d88cffd5d9f SHA256 0d4b2fdf05c8a9597bcfbdcf34268d47f9c5846c62550b65eb5e7abfe89eaa89
+EBUILD wml-2.0.11-r1.ebuild 1644 RMD160 3508f9efe1ff867907fec816a3a3cbb60270c65b SHA1 8002ccbcc9c762ee4bf15ae716d144cb55d4df90 SHA256 4994031c47aa04be2f3af1b46a49e62f0a240b8afbe8d6d290f2b1f090fe04e8
+MD5 4d99a9b75fa2be445eadce9c669ba405 wml-2.0.11-r1.ebuild 1644
+RMD160 3508f9efe1ff867907fec816a3a3cbb60270c65b wml-2.0.11-r1.ebuild 1644
+SHA256 4994031c47aa04be2f3af1b46a49e62f0a240b8afbe8d6d290f2b1f090fe04e8 wml-2.0.11-r1.ebuild 1644
 EBUILD wml-2.0.11.ebuild 1472 RMD160 5f83422e1f3c3861503ecfaad64bdb8c6319e4fd SHA1 da00032ee19b2cf2b029eb2c9593ae6d4f845136 SHA256 aced750034c8b694ae99a77d4eb41039936f778cf2936a57450b2adaa8eee58b
 MD5 cef5772b544efb8531c1ca4b80c63591 wml-2.0.11.ebuild 1472
 RMD160 5f83422e1f3c3861503ecfaad64bdb8c6319e4fd wml-2.0.11.ebuild 1472
@@ -20,10 +24,10 @@ EBUILD wml-2.0.9-r1.ebuild 1145 RMD160 9253686d1474e27bb7fd8140875a7db924e82d1a
 MD5 433ec53fcf2ecf6daf803b7a03bc5bd6 wml-2.0.9-r1.ebuild 1145
 RMD160 9253686d1474e27bb7fd8140875a7db924e82d1a wml-2.0.9-r1.ebuild 1145
 SHA256 e41a737d2bdc8742572f7cbf6d82e3456319d6f1e61c25fcc029cb85a6c507b1 wml-2.0.9-r1.ebuild 1145
-MISC ChangeLog 3679 RMD160 5d73ad0ef04eaf2f34be23089c3bcdf15c969127 SHA1 b11239c78c5fae4e4d7ae0b37a13d8977483a86e SHA256 6ecad5e9ec39eef49ada8aa1c16d237b7d61917754a5baad308705a3987feabf
-MD5 d89cef3c2b6806993624146a4c86b96b ChangeLog 3679
-RMD160 5d73ad0ef04eaf2f34be23089c3bcdf15c969127 ChangeLog 3679
-SHA256 6ecad5e9ec39eef49ada8aa1c16d237b7d61917754a5baad308705a3987feabf ChangeLog 3679
+MISC ChangeLog 3835 RMD160 acfa6d8819a63196c8516b0267031cfc04b7f40f SHA1 09e0ce75673239f0d2f58e166a4b50ad6ea00ed7 SHA256 b5d4b8c1adf6588fea75d820549ef6e4dcfe71ea95de23d2e8a34ed333df84df
+MD5 1fcef20a3aa094877c263828b7649750 ChangeLog 3835
+RMD160 acfa6d8819a63196c8516b0267031cfc04b7f40f ChangeLog 3835
+SHA256 b5d4b8c1adf6588fea75d820549ef6e4dcfe71ea95de23d2e8a34ed333df84df ChangeLog 3835
 MISC metadata.xml 255 RMD160 2e04128b5183df88816f4d226448444d02439c3c SHA1 95202de91147c591bc326f12ec296131aa445e7b SHA256 4791ad0953ab9cd515144e1517b927fe1824859496dd7c84c32af20d5f99c20e
 MD5 546a6fed5e42248515406b71330d0065 metadata.xml 255
 RMD160 2e04128b5183df88816f4d226448444d02439c3c metadata.xml 255
@@ -31,6 +35,9 @@ SHA256 4791ad0953ab9cd515144e1517b927fe1824859496dd7c84c32af20d5f99c20e metadata
 MD5 ed23257c267480ff498e5f6edc4455b0 files/digest-wml-2.0.11 235
 RMD160 37fec7cb61c1e4baebc0501b4341d8d71ef7ff22 files/digest-wml-2.0.11 235
 SHA256 a8960fa6468de36d849a8680fb560aa2ba9527c49a134cb88fca4f679bcc48b6 files/digest-wml-2.0.11 235
+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 05d11cc9dacf02e3ef8da88a81f1f8ab files/digest-wml-2.0.9-r1 232
 RMD160 95d14387adb9832ac059a5ba8fc985a469f7cb74 files/digest-wml-2.0.9-r1 232
 SHA256 952daeb9da977a7a74b1e3547a434032f2cc13e39ca03004881c4fcf971995d4 files/digest-wml-2.0.9-r1 232
diff --git a/dev-lang/wml/files/digest-wml-2.0.11-r1 b/dev-lang/wml/files/digest-wml-2.0.11-r1
new file mode 100644
index 000000000000..2d458c0dafd5
--- /dev/null
+++ b/dev-lang/wml/files/digest-wml-2.0.11-r1
@@ -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-r1.ebuild b/dev-lang/wml/wml-2.0.11-r1.ebuild
new file mode 100644
index 000000000000..c63e6d836a36
--- /dev/null
+++ b/dev-lang/wml/wml-2.0.11-r1.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-r1.ebuild,v 1.1 2007/04/07 10:16:38 graaff Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit fixheadtails eutils autotools multilib
+
+DESCRIPTION="Website META Language"
+HOMEPAGE="http://www.engelschall.com/sw/wml/"
+SRC_URI="http://www.engelschall.com/sw/wml/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"
+
+	# Patch Makefile to avoid stripping binaries
+	sed -i -e "s/-m 755 -s/-m 755/" Makefile.in || die
+	sed -i -e "s/-m 755 -s/-m 755/" wml_backend/p3_eperl/Makefile.in || die
+
+	# 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*
+}