www-client/httrack: Enable tests with Automake 1.12 (bug #472232)

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0x401A1600

3 files changed, 11 insertions, 9 deletions

diff --git a/www-client/httrack/ChangeLog b/www-client/httrack/ChangeLog
index cd661c9b64b8..4e179510e54d 100644
--- a/www-client/httrack/ChangeLog
+++ b/www-client/httrack/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-client/httrack
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/httrack/ChangeLog,v 1.55 2013/06/03 19:51:52 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/httrack/ChangeLog,v 1.56 2013/06/03 22:46:26 sping Exp $
+
+  03 Jun 2013; Sebastian Pipping <sping@gentoo.org> httrack-3.47.17.ebuild:
+  Make tests work through WANT_AUTOMAKE=1.12 (bug #472232)
 
   03 Jun 2013; Sebastian Pipping <sping@gentoo.org> -httrack-3.42.3.ebuild,
   -httrack-3.44.5.ebuild, -httrack-3.45.2.ebuild, -httrack-3.45.3.ebuild,
diff --git a/www-client/httrack/Manifest b/www-client/httrack/Manifest
index 8deee8af58bd..2e7b16c11d10 100644
--- a/www-client/httrack/Manifest
+++ b/www-client/httrack/Manifest
@@ -15,13 +15,13 @@ DIST httrack-3.47.15.tar.gz 1753362 SHA256 08e2583e760bcf81b6ae3281999473dc24c50
 DIST httrack-3.47.17.tar.gz 1760194 SHA256 3c5114c8efcf61d283ac28e36cf832f45dc01332b20a1da84c95c0ddda56e2de SHA512 57c52b43d40cfb3924fab7306218943adf9ad912c7b287a7ecf1f6499fb47cf7d28b091467fc92c1ef97ef350ac40e97baa86a8d635d8573bbdf4e9ae8fd19e7 WHIRLPOOL 794ddcb38e3c28377a980558fb703d23bae066af188990c4aa1223312803b0b30275e3e6f05da098be94f05794a7605500870544eaf9723601c9e55af218cc1e
 EBUILD httrack-3.45.4.ebuild 1154 SHA256 7f1ca0922f781c7f8c917b5c2e9438836b64b110a63a25d90c13faeea2e13ad6 SHA512 d01aa2ced78082cfa7ed5f68b2ca94bba064b21a68e909396a35f78115af716ecde8782964441b826dac93a7408c31c706e1c9c0eda97d3ed33a77b1799e4366 WHIRLPOOL fbd6eb23167c24fce9efc9703ebb773e04462268dc617f3502f01bbbb10b8aed289a6d88b67aa47778463b14944a15bb8cfdeb3ad961f469c79c41127f345bb9
 EBUILD httrack-3.47.15.ebuild 1054 SHA256 ffdae9229bf6ea10e7bc9cd454f2e3d6e23bdf1ff4bfee8a33d1983cb63b4b4d SHA512 aa0730576afca39140b368031e6372f567c73bd3e6d362fd4dbcded2c1182098ce005267c8f6afe00fa503b39c6e8982a73d1790fe2b8586763a01692ab64000 WHIRLPOOL d4c46d17d93906def7274c2eb0ee4e0c6888c10af6fccec50d4d78da43493aebb2f69d529c38b297265bc0d566ede9d0f7f63924c8875c95933a815854a83b3f
-EBUILD httrack-3.47.17.ebuild 1071 SHA256 36f207b93d50bdfb1c25c38b2e58d4d2d1dddd78983a82d845525620bb8561cf SHA512 b15758abb9741e0d12d2494a5dde6845399a690d8d64959613a9bddf305c5ac25baa2b0fd7eeb7e329ac42fdc06accabc37e9714dee520dba3e31a16c43f2cd7 WHIRLPOOL 9534aeddf1e6733ec28542005019836c791cf947ae8c4d16bb67ab20864cd4519bb43d7cc85c5ce07efddd99a1563efd958a5491b3b4796a5c3410195fb2c15e
-MISC ChangeLog 10275 SHA256 d2b0ad9b87dfff30b437493b48076cd1fbe01aa6b920c54875e21d44bbe6022c SHA512 cf57da571a785d50011f6247b674155544f3d60eac2025d7e1ce4ad25c5c7891e28f6a62927bf268006e091aa02316c5d1c1955bb15d38cd9da1608a62b77a39 WHIRLPOOL ef36826e083f83da88e5a9ec41b5dca9f9b02a308dfa116b2fa1f30daf8d6c4bd9c4d5c2b94c6b8604d6b0f5360d62897021c99a406654fb51a19588ee0a3e4c
+EBUILD httrack-3.47.17.ebuild 1099 SHA256 ad647db81664786ca80b674410070fbbaf0ab3a75844fd6aea14266c51277ace SHA512 c31bf43d7cb7f0fa2afb1d1ab0cde477067f5f97a10cdc55460c0b4f9c52647bfa77dd40731f43ca84ac9aa0813707989f18543e2715ffda490f18cf88e4c100 WHIRLPOOL 804f039da62f75acfc4234c37dd8841961dec87d1476a09cb95b6b831d49b794e3e95bb224ecf8f73e00f888087c0e7f5f8056ce53c256d848b48a4618f62e05
+MISC ChangeLog 10411 SHA256 f5feea5efa22bf5db4ce4c99acd442ccc72fe29c069c73594b1f590d468c625a SHA512 e36edebf1c10503d2553b752dece0b3e75f8e7b0cf6f133c0ad257454cea23391ac7c80bdb9fcb0ccf0a2d276833b7fd2f11f20abf47630959caae845aec767e WHIRLPOOL bc17121c08f37e04ba590c92aaac3e01cc78dcca6620d5dffb4a8d17e86caa52bef8cd4ab7b5031a6305d51d552ff2792ff46d418a684ea70144f2530a45d563
 MISC metadata.xml 199 SHA256 2cd25550d242fc076480f5ae5764291b6674f9b377f264a09e6bdcf9261d8955 SHA512 13986875fb9b4c62150aa59205dcebb918dbed290becd683ee341c416e0d66230900997d707a034dd8171b39d7cb3c4c752cc0f06beb0fd81d566652da268b53 WHIRLPOOL 0f53606fda0b1c53055749344e939e49ffcbb25c56c6019447395236810551ea433ff122200fd5e7847ad128cbadc40f4694d81af4652a64231f14d7f58ae9d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGs8/gACgkQsAvGakAaFgByIgCfZSZvhEkL1pWOv23n6icMyTVY
-TA8AniAJefO2SQV90Q6/x7wkQoRYTqjs
-=wJ3q
+iEYEAREIAAYFAlGtHOcACgkQsAvGakAaFgBVzgCgnf8C1dl9IMp73RgJ+kSsxj6O
+n20An3Rpo3ZUL39YFuFWT7Il/sW2IPkh
+=504x
 -----END PGP SIGNATURE-----
diff --git a/www-client/httrack/httrack-3.47.17.ebuild b/www-client/httrack/httrack-3.47.17.ebuild
index 4f076f632f94..d35c71364fc6 100644
--- a/www-client/httrack/httrack-3.47.17.ebuild
+++ b/www-client/httrack/httrack-3.47.17.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/httrack/httrack-3.47.17.ebuild,v 1.2 2013/06/03 19:48:26 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/httrack/httrack-3.47.17.ebuild,v 1.3 2013/06/03 22:46:26 sping Exp $
 
 EAPI="4"
 
 AT_M4DIR='m4'
+WANT_AUTOMAKE=1.12  # or "make check" breaks
 inherit autotools eutils
 
 DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
@@ -22,8 +23,6 @@ DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS README greetings.txt history.txt )
 
-RESTRICT="test"
-
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.44.1+zlib-1.2.5.1.patch
 	epatch "${FILESDIR}"/${PN}-3.45.4-htmldir.patch