www-client/httrack: Fix regression on /usr/share/httrack/html (bug #425692)

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

3 files changed, 30 insertions, 33 deletions

diff --git a/www-client/httrack/ChangeLog b/www-client/httrack/ChangeLog
index 9d2245ea1e93..90956667b749 100644
--- a/www-client/httrack/ChangeLog
+++ b/www-client/httrack/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/httrack
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/httrack/ChangeLog,v 1.40 2012/07/10 19:58:41 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/httrack/ChangeLog,v 1.41 2012/07/14 20:34:37 sping Exp $
+
+  14 Jul 2012; Sebastian Pipping <sping@gentoo.org>
+  files/httrack-3.45.4-htmldir.patch:
+  Fix regression on /usr/share/httrack/html reported by ago (bug #425692)
 
   10 Jul 2012; Johannes Huber <johu@gentoo.org> httrack-3.45.4.ebuild:
   Stable for x86, wrt bug #425692
diff --git a/www-client/httrack/Manifest b/www-client/httrack/Manifest
index d6376cca4e82..f44549210fa1 100644
--- a/www-client/httrack/Manifest
+++ b/www-client/httrack/Manifest
@@ -1,31 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
-AUX httrack-3.44.1+zlib-1.2.5.1.patch 423 SHA256 34763f1f413ee92c2722d741d191706b9e179c6a66d2e4aabf7a5089cc5241f1 SHA512 8a025d8efc5c6b87d3864228de831ae1916e97186435cd2aabfb1f229d7498b749052a50656a57ebdda11de1a8d9f606aca50d3e4a6fbcbaf2f18c109bbef9b1 WHIRLPOOL d873446ea471f2c72c92450f6c3332920d6d000840056dcb520fff26013bba1f59a4dc98dceae14ebbf4872b9c847e9a3356aa8ff7d906cb5bb5fd840fd69543
-AUX httrack-3.45.4-cflags.patch 425 SHA256 cb6f8cf18f7a24f8464396585f8d0138a423be648528e0cb371641536e91c823 SHA512 c6a7c02bfdf082311112e616206348159d91f5c074eb2491360d779522157c96ba59c9ace23866c78c9e607e8b69ac1f8d5d3399f7d729756b289cb7f58f3420 WHIRLPOOL 133860a07a8eba0c9c9c3cb7239eb8be2e8353888a836e12726d9a3ac6b0f26b1e3684d913fd567c3d33a4144ebd8311e3f9238fe2292ddeaa5700f16665342c
-AUX httrack-3.45.4-htmldir.patch 1472 SHA256 98a064cc375aabf3e1a22a99faa875dd01bca739a72880e616d5aa0c1ad8c3c6 SHA512 a57ba026e13167bea32db30a520c42696f0a87b8e4ce5f919d8b25e14a1e49114fc9f063b86ba8c513fad6182a51b713eed2a61d298080676f442ec81614fb36 WHIRLPOOL ca196bc29e52e10d8005ce0962f06afb0ec17945446720b4b8e8147833db41ff394c90cf22d48b875eae410dc55dade5ffecb08871ab312b47100e6d2d320c56
-AUX httrack-3.45.4-install-once.patch 1006 SHA256 4c504ff7081ccbbf293ba36df9ad2a3040c0f1de9d7076b92c3ab4474bdaba60 SHA512 8bd01f7013f7e56179e563feedeb039343bda9fd993c4db60d43ad9df6f41ea8871fc7c149272d44ec899bd2f04901674c96b006ff6f2c9df83575b3d0091c0e WHIRLPOOL e3965ebf71b8c7df66eafb1bcadfa0f80cb46c67c43aef6cd63bd5ef1dae071f72f43cd254891fa692d3280cae4363a9ddd53839d3c6f80c97cae197fb713dcc
-AUX httrack-3.45.4-parallel.patch 3868 SHA256 d41441b4b69ae10565a285d1d78335a5f0eb98c589caa64521f10c74377a436a SHA512 9538a7a5a50a5deb50edfbe49654a62c6b99cef1ee0a631a182072fa1d552c658409e3e5149639cec16f418526401c9220250f64a2479f0279a4e2f388082419 WHIRLPOOL 8b72b4bc3b9ccf9d54a5bcc1dbad65aaa7dd7e25b2a9deebfdb0eb90fd0a0e1ba4ac4ab47a82c1ba80de83d595506dd5eefee132066ff436a9bd0c21eeeb94cc
+AUX httrack-3.44.1+zlib-1.2.5.1.patch 423 RMD160 ed1335fc9e7929df795a2d3654814797b60e6ad8 SHA1 9bd4ad25d4c3db54feffeb9a95086b1ae79a341b SHA256 34763f1f413ee92c2722d741d191706b9e179c6a66d2e4aabf7a5089cc5241f1
+AUX httrack-3.45.4-cflags.patch 425 RMD160 faae99f3e830ab0ea7c663951d929d42119ffc53 SHA1 e1cae30913690ee0b5fa9890bd66c36a009de671 SHA256 cb6f8cf18f7a24f8464396585f8d0138a423be648528e0cb371641536e91c823
+AUX httrack-3.45.4-htmldir.patch 1345 RMD160 8b8eabb0396230ac8e0bd92aafb27d14691cf25c SHA1 ced4d653d4dc619c7dd1c18cc2033e6ff6010c1e SHA256 f19a4e80d88008bcf41fb1f50ef58fae774522f3ac19a4c9eff8dc17e3c4ff82
+AUX httrack-3.45.4-install-once.patch 1006 RMD160 4bbe947e125bdb783ccc28978b95f4027c1bd4c5 SHA1 0d94394916ac82dc6cccc9f73e7adbc883af6a05 SHA256 4c504ff7081ccbbf293ba36df9ad2a3040c0f1de9d7076b92c3ab4474bdaba60
+AUX httrack-3.45.4-parallel.patch 3868 RMD160 c8a165d27645d21b4225f7a7f8cb70e87fe2038c SHA1 0d126bdb35fa5fdc1e7454a25d60e0176a19ca56 SHA256 d41441b4b69ae10565a285d1d78335a5f0eb98c589caa64521f10c74377a436a
 DIST httrack-3.42-3.tar.gz 1664057 SHA256 a6a91f7dfc90d625c58d0043a17af3c27a99369a76203c4e964e850e81913e3d
-DIST httrack-3.44.5.tar.gz 1664721 SHA256 172a873db42b83b6694ac53714743246aeaf0faed514b3a1b517ba1609b5e403
+DIST httrack-3.44.5.tar.gz 1664721 RMD160 c358d01823fc0a0c9ba0e483518350806a828e90 SHA1 fc6d7427f5b1931f15cd13adfee226edb4c908b1 SHA256 172a873db42b83b6694ac53714743246aeaf0faed514b3a1b517ba1609b5e403
 DIST httrack-3.45.2.tar.gz 1671568 SHA256 45883d8f974848e96f8090f2b2c91a7fc23c4a95a5f6247a0b9821d6b7913abe
 DIST httrack-3.45.3.tar.gz 1671106 SHA256 8b5e8267f485b237fcf23f6c3939ef8a6eab10356eab7310dcf8234eacb2db8b
-DIST httrack-3.45.4.tar.gz 1699651 SHA256 715b1638acee2685d5a012c3848bf087a6e420dba3cde4305b897054f54affd4 SHA512 39494adb30d04fd891ea0006d5f776501a03d2dda5c9d8470ee8b680550de753125546d196576b7fa9a9918358cf0c554facee60db3765c2de6e80cc0d9daf7b WHIRLPOOL 58de8ffa48a7ef3826ca880f8073f3b404c540237f13013a316bb5b0de3eaf18c50dc10dded3b968172f18f914f88c962e4f23b41d055ce0c23025b4191533c7
-EBUILD httrack-3.42.3.ebuild 751 SHA256 31fc5bdf1e5f4311485f10af43b5ef6ec52508c7748d06ac92f2828caa60f0f1 SHA512 c496d99a4927f6cf854d4fd5fa790f70fe348b2791e278b7eff4098e07fbbda8de0d254517ffd3566e057dfe85db372fc4876e68d3e05c604061963f81d45649 WHIRLPOOL 0d99b963815fd693b258f611d7667770a49a27d1abf504a4c1654a73f762dcce34c581edb28734f94f075a5c59b69d928b44ff5d1d56ffa1e4c8eaa46dc17c05
-EBUILD httrack-3.44.5.ebuild 983 SHA256 582da140f14de6bfcbd2061099ad50c69b7a13be65f87d6506f029852893ba45 SHA512 7126c37f9ae75ea6b0467d2db7d41e80e2b05d724380ae081d7a1cef6e614ba9b4594f0d8b6f8b7fced28b24b280a41f0c3bb2be4dcdb85c21b03404ed24ad70 WHIRLPOOL 67043ee6d7056f643cefd00182f90660e5a38ed8dbbafa700f2b4e259d3d223661842ee350194a5332bf9dc8bd9f6753459ceba446ff621924cb8b193c8fa0d7
-EBUILD httrack-3.45.2.ebuild 983 SHA256 42623729d308eae31133fc85dfce819951542c8350b1091e2b91fba1762b1ccf SHA512 1f64a7f314db551b7d2ebb46ce73082d6f209aad6eee275d2a920c2d7ce2c5220612d0a5b38d1f5786cb4f8896c54c3917bef54ecf8b596093dd9543fb44c7ac WHIRLPOOL f4656f67c79361dc4281c2f2781ea6fb08c6885e5259e1ed1de449f7dbf4541120e9713c93655652890781b4b8f3487ace099cba6034be09ad7b2c023d98388a
-EBUILD httrack-3.45.3.ebuild 983 SHA256 5db527c5b7e159b18967e21ce168edf311226b92f36773e56ff8cf0e5fe04308 SHA512 579545272b502b8b973027baae443f350665efb92f865135d39804932d2541de5e307d80400bc7f7f0360575dc0992512e5d019085562e77945457e03d0e4297 WHIRLPOOL 499cb61dab0c4c53b3cd37494aee4b659155d2fc64ff739a884cde76019ba04d853370c45ff173811eedf4ffe8fe799570c34d0df334f4475197f3dd2a67e94c
-EBUILD httrack-3.45.4.ebuild 1164 SHA256 b32e12cfb065cd633cc49f8aaabd5dbe2d04803fded3304985243ca4ad79118e SHA512 89a133f0b40d7facf85d644c66920bd9727e68d0588eb5793515087c745344b62863300840a49f308fdda28a59a50abd9b649339a33da7dea4faf61febd3f42d WHIRLPOOL 14fb2dd1874f49863807c10453a0467841d62c7687131b08e834bad28b9f844850e50d9255bec07ca257b22159d378a614e0f868d5b336a91ac564a0e264d456
-MISC ChangeLog 7948 SHA256 8ddc514b296d146e13b187d5b5e96c201b6d89d93a1b1e88094d75f5259ef84f SHA512 7c26ac605e3c1350685b5dac582baba3e442c2fc906b5e0fb700906eba8d6af2cfcb0145e7234e3664aae8a6d5bd5c496db6a0870e1b36bbdff3c2d51cd0451e WHIRLPOOL 013b6463ae7b92894c2e6fc6d15c6ef6ea1e7af4e297e79dfd54eb904ac20c2ac19f0ca37178ade654a947f013b9f4afe1320aa5d5c33fa63b64dab4458cb6d2
-MISC metadata.xml 199 SHA256 2cd25550d242fc076480f5ae5764291b6674f9b377f264a09e6bdcf9261d8955 SHA512 13986875fb9b4c62150aa59205dcebb918dbed290becd683ee341c416e0d66230900997d707a034dd8171b39d7cb3c4c752cc0f06beb0fd81d566652da268b53 WHIRLPOOL 0f53606fda0b1c53055749344e939e49ffcbb25c56c6019447395236810551ea433ff122200fd5e7847ad128cbadc40f4694d81af4652a64231f14d7f58ae9d3
+DIST httrack-3.45.4.tar.gz 1699651 RMD160 f889a0bee943d0902c777b4eb1f8ee2b5c051168 SHA1 07b11b176492a5c4ddc9c6cc04c44cf98acc23bb SHA256 715b1638acee2685d5a012c3848bf087a6e420dba3cde4305b897054f54affd4
+EBUILD httrack-3.42.3.ebuild 751 RMD160 690d76e90e823a45c0bee5365c524c3f1ad033f7 SHA1 bf72ad6a0fcde239350aebed66e4dc1e0d665e5d SHA256 31fc5bdf1e5f4311485f10af43b5ef6ec52508c7748d06ac92f2828caa60f0f1
+EBUILD httrack-3.44.5.ebuild 983 RMD160 5fa069c440c5c4422caf92fd55c410b75b370bf3 SHA1 35576f6863848cbce7728ddcdd861025cdac103f SHA256 582da140f14de6bfcbd2061099ad50c69b7a13be65f87d6506f029852893ba45
+EBUILD httrack-3.45.2.ebuild 983 RMD160 206341a13b49625535eb940ee8b874f326781ccb SHA1 6cc2f136e5656995154ce0fd60b1a8b7495603d5 SHA256 42623729d308eae31133fc85dfce819951542c8350b1091e2b91fba1762b1ccf
+EBUILD httrack-3.45.3.ebuild 983 RMD160 39a0d89ceb9735957e427cd47560b9148a339884 SHA1 ea2026e060dd9580a283182f4b0fea7be9bc10b9 SHA256 5db527c5b7e159b18967e21ce168edf311226b92f36773e56ff8cf0e5fe04308
+EBUILD httrack-3.45.4.ebuild 1164 RMD160 cc0c73199a9b6538ac2c17036e686ab3b10f4865 SHA1 d60cfce058ac2e51b7fd2f0a4cb0eec1499f298d SHA256 b32e12cfb065cd633cc49f8aaabd5dbe2d04803fded3304985243ca4ad79118e
+MISC ChangeLog 8114 RMD160 633439cccf5970f469fc670853923516af8ec3bf SHA1 e3b0aa7901691531311100fe54e8b4ca056c79a2 SHA256 50bdc04ea986b3bc7835d45480c0b20a8de1d2d1e9e9ece9a9fba2bd5e11328a
+MISC metadata.xml 199 RMD160 1886607beaa5e5c57c9b628223c2c0e8a5bc4bce SHA1 a3fd6b4e6e98cf330b2894b405dacc112389da90 SHA256 2cd25550d242fc076480f5ae5764291b6674f9b377f264a09e6bdcf9261d8955
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJP/Il/AAoJEO+t9ga+3I3aReEH/281I9ZVZO4/aoC8J0azwFo8
-Hba1147Rbue0K3Mqobp4bSh6ZMg2LQQqMcBCtdGMRsl+ZTlWJRgFlpP9uiGxfTd6
-d4lVxLUET8nDWa4KwVqUP6w2q7GWxYXlPr0/XztaISXPW/FSFGqyhAiVRgCKAEZI
-LizgFkMNsCMDfvfbN4n7fgbpBEAGaA7N4hPVGYiq7MxbrP+MP1WdcJDHU2q+SxPL
-p9/dU4cvE7P2tf0j9ZK/wvGq++iPpvO1Gda+Kw37eSXGw0oLORAdkmuYMhVyOiV/
-ZuJlJFvA2byax1aIDdLksq6ORrjkqBaV3sbRgzQ7G1x85AIQWl85eXBwveHv8vk=
-=SxgR
+iEYEARECAAYFAlAB18sACgkQsAvGakAaFgAq3QCdF6ySNrDXm628drvntTxWd09L
+8z8AniJINwEcPT9GF2FW2udgP28Q7Tc3
+=8Es/
 -----END PGP SIGNATURE-----
diff --git a/www-client/httrack/files/httrack-3.45.4-htmldir.patch b/www-client/httrack/files/httrack-3.45.4-htmldir.patch
index fa9808f60955..d13fe14ddc61 100644
--- a/www-client/httrack/files/httrack-3.45.4-htmldir.patch
+++ b/www-client/httrack/files/httrack-3.45.4-htmldir.patch
@@ -23,16 +23,13 @@
  WebPixmapdir = $(datadir)/pixmaps
  WebGPixmapdir = $(datadir)/httrack/icons
  VFolderEntrydir = $(prefix)/share/applications
-@@ -32,12 +32,3 @@
- 	$(HelpHtmldiv_DATA) $(WebHtml_DATA) $(WebHtmlimages_DATA) $(WebHtmlsfx_DATA) \
- 	$(WebPixmap_DATA) $(WebGPixmap_DATA) $(VFolderEntry_DATA) \
- 	httrack.css
--
--install-data-hook:
--	if test ! -L $(DESTDIR)$(prefix)/share/httrack/html ; then \
--		( cd $(DESTDIR)$(prefix)/share/httrack \
+@@ -36,8 +36,6 @@
+ install-data-hook:
+ 	if test ! -L $(DESTDIR)$(prefix)/share/httrack/html ; then \
+ 		( cd $(DESTDIR)$(prefix)/share/httrack \
 -			&& mv -f ../doc/httrack/html html \
 -			&& cd ../doc/httrack/ \
 -			&& $(LN_S) ../../httrack/html html \
--		) \
--	fi
++			&& $(LN_S) $(htmldir) html \
+ 		) \
+ 	fi