www-client/httrack: 3.46.1

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

4 files changed, 119 insertions, 18 deletions

diff --git a/www-client/httrack/ChangeLog b/www-client/httrack/ChangeLog
index 0bf499136e05..96ee5bd527c2 100644
--- a/www-client/httrack/ChangeLog
+++ b/www-client/httrack/ChangeLog
@@ -1,6 +1,12 @@
 # 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.43 2012/08/26 10:10:25 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/httrack/ChangeLog,v 1.44 2012/09/29 19:23:44 sping Exp $
+
+*httrack-3.46.1 (29 Sep 2012)
+
+  29 Sep 2012; Sebastian Pipping <sping@gentoo.org> +httrack-3.46.1.ebuild,
+  +files/httrack-3.46.1-parallel.patch:
+  Bump to 3.46.1
 
   26 Aug 2012; Michael Weber <xmw@gentoo.org> httrack-3.45.4.ebuild:
   ppc stable (bug 425692).
diff --git a/www-client/httrack/Manifest b/www-client/httrack/Manifest
index ec83b2de088c..8e021f84f182 100644
--- a/www-client/httrack/Manifest
+++ b/www-client/httrack/Manifest
@@ -1,27 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+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 1345 SHA256 f19a4e80d88008bcf41fb1f50ef58fae774522f3ac19a4c9eff8dc17e3c4ff82 SHA512 451c8743b315b967a3dcb978b7c4a922c871d63bf60f03f843a806c7456cdb82b9e41cca3d917018e2673d16a9368b10f93b1e6ba9fa8620db8c9232bbbfeb71 WHIRLPOOL 709a4251911324c11e3c84b7f08af91279c4515931da157b503e0186be0bc63366bb3f9302e19fe3f69c85b4f55031b512395352dbc78f1d443e033ba0c1078b
-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
+AUX httrack-3.46.1-parallel.patch 3047 RMD160 e8d6fc9af80a7a2f9022bb8dbadec931a2484974 SHA1 cbb7e380653ef1c7d07eacf65fcd531d974ecc66 SHA256 ff4b579f652d2a5152e5192bbc9ce474cd25152ac2ddab86404519c289daeb7c
 DIST httrack-3.42-3.tar.gz 1664057 SHA256 a6a91f7dfc90d625c58d0043a17af3c27a99369a76203c4e964e850e81913e3d
 DIST httrack-3.44.5.tar.gz 1664721 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
-EBUILD httrack-3.42.3.ebuild 742 SHA256 ef309e72668cfbfb5ef2597f3905a955e0c59951276029088ae2ac14e4869c71 SHA512 2a387a113287c5c5803faff43740e152d8412436758f90e5f790c15b25f2a23953d36ba56c5254a55153927d511f74ce7e6b146e62297d027e28f7cc259f2230 WHIRLPOOL b11f86801e16f53352e96efd6d1ab35b33b0592ae1fa6986cee4d2622cf3971d2e431a8e3111809b6bc307dcd193073ee023ad89ebb18efc1a0b136afd7b437b
-EBUILD httrack-3.44.5.ebuild 978 SHA256 7b21a6b6bfb9fe23d031d412f69d88384198b54b1750c807b372398c01b27c5b SHA512 7b17e49d18561e79f10756e3f326e8a8e13012b7d3646971947052af5d883015befa545a091c622a0322ac4bbdcb9fa251bd05b1edee92aa56df0f2a30d877ec WHIRLPOOL 4ad8737e0cf8f003ff00dfc84781e7cda7662fab3e754c391b56e4d84e08a41bacd51ec990107dd4da1d35d626d6ba55a88a10f2cb209a90cd1c59f4a126495f
-EBUILD httrack-3.45.2.ebuild 978 SHA256 7b5129543bdcc790b2fa056b0ef7a0e8e1b867739de1a08ef2fd8df26b76349f SHA512 9d3c59ecb16fd48bccb383da984221cf549c28d3a520097c8e3d76d1dc5c03de8af8237c4cb01b3056c4654f40a65a861b669fa1a0253e59f1d6f6a05c62afc8 WHIRLPOOL cb778356bd6668da9d6846c425d6ebb9a66c1efa519045ac9e10eec77536a2f67f9e1508e4f8e5471a0aabe17934d4bfb60cfdc7c8b4f133e04db8a031f521a5
-EBUILD httrack-3.45.3.ebuild 978 SHA256 96fcbaf4c22bee32be9b977b45883fbfb7d1366c0bcb1ccdac22fb6868e58064 SHA512 e4643c45cd24b8852819f3500c2d4863e9e3d00f230d7228831e42640006d3385fb1b36259ec453340eea8a038568c4e9d84adf49e6da3b7e96876a04e63f286 WHIRLPOOL 2f18bd0a5e4946db2629f464dc72bb3488cc4499086d474093d5e0914108d20bd22e8312e56d3f723b4853cb957ce63f85296289a4cc53b215e01af7de124298
-EBUILD httrack-3.45.4.ebuild 1155 SHA256 54feb16d108e6f18687f052f9e9677cc2c9e1dcb7e74fe54a668345a3b6e3416 SHA512 a8e17d60b4b514f3e2a19a6d863b287298fa7fa854f5345748f876d9ead4b503bb3d61be064fbfe8124206df5c04db93e4c4c242762273c852a89cffba5d3e9b WHIRLPOOL 2bffa44d6be87613aaf45d131cb0ef603dbd5f05ad66ab0203e0252b82cd12459203fe9315ca896527a3f136aeba72d6da443666b55e0f81bfcdf158cc78e76c
-MISC ChangeLog 8400 SHA256 1ccab6b03beda2158bbf92521035d350725a61d878109664650f72a156b53a29 SHA512 bd01c702a35c83517f3198dd43654efc368a727a068246af585ffd7e449e60d7280672781d832d437f0af291efda1c8f460c02a31096294908a56b3ba592a81d WHIRLPOOL 10977ffd3572636fa2f8622142f9907149bca95112aadf3cd7070341008e216b50e02c7648d8662503d0ac377e6e2b895ebfd0407d9e24b5a0e193efc87311e9
-MISC metadata.xml 199 SHA256 2cd25550d242fc076480f5ae5764291b6674f9b377f264a09e6bdcf9261d8955 SHA512 13986875fb9b4c62150aa59205dcebb918dbed290becd683ee341c416e0d66230900997d707a034dd8171b39d7cb3c4c752cc0f06beb0fd81d566652da268b53 WHIRLPOOL 0f53606fda0b1c53055749344e939e49ffcbb25c56c6019447395236810551ea433ff122200fd5e7847ad128cbadc40f4694d81af4652a64231f14d7f58ae9d3
+DIST httrack-3.45.4.tar.gz 1699651 RMD160 f889a0bee943d0902c777b4eb1f8ee2b5c051168 SHA1 07b11b176492a5c4ddc9c6cc04c44cf98acc23bb SHA256 715b1638acee2685d5a012c3848bf087a6e420dba3cde4305b897054f54affd4
+DIST httrack-3.46.1.tar.gz 1698018 RMD160 492d00b3bcb1f9a0f07dffba282258b8f35c39ad SHA1 be6328d2ff3cbabd21426b7acc54edcf1ebb76e0 SHA256 11c4b2d71789a7ebcb5fdb8b93893b80926c481d2df6b1986a29daa7206b3a2b
+EBUILD httrack-3.42.3.ebuild 742 RMD160 d898ddd61295e78e613d544f70a7f883f76642ab SHA1 cfbc97214f91fc4a3c757a1d1ebc77170cb0eb2a SHA256 ef309e72668cfbfb5ef2597f3905a955e0c59951276029088ae2ac14e4869c71
+EBUILD httrack-3.44.5.ebuild 978 RMD160 6d49d1d573705aba4fec6146835e6bd2588e850a SHA1 9eb6370571a0d0a59891323667698f6694856a11 SHA256 7b21a6b6bfb9fe23d031d412f69d88384198b54b1750c807b372398c01b27c5b
+EBUILD httrack-3.45.2.ebuild 978 RMD160 fc066cb20e6a063f2430790c06bbd3a8a9551099 SHA1 6a8d60a46286a4f25ee252db7cb4b33960cebbbf SHA256 7b5129543bdcc790b2fa056b0ef7a0e8e1b867739de1a08ef2fd8df26b76349f
+EBUILD httrack-3.45.3.ebuild 978 RMD160 6c6006766d629d4e3857de38eafa5737e22b7142 SHA1 e68f0ce1c29c617e3716c130a67c59a940fd8504 SHA256 96fcbaf4c22bee32be9b977b45883fbfb7d1366c0bcb1ccdac22fb6868e58064
+EBUILD httrack-3.45.4.ebuild 1155 RMD160 3ee0bde22779a53977ff12ba3bd52a9049388247 SHA1 8510d1290d0f493f76b83673da09794ca22933b4 SHA256 54feb16d108e6f18687f052f9e9677cc2c9e1dcb7e74fe54a668345a3b6e3416
+EBUILD httrack-3.46.1.ebuild 1129 RMD160 03bbdf2a95920c974fcfd9781ba60b4521f13f08 SHA1 65b0cef4ef4ebe4cab8e6f0448a87394418f6e8e SHA256 a7489c5e26077e30c1b11b5d3d5c3dde15d2ba4e5e5a1ce75063395c912ad908
+MISC ChangeLog 8567 RMD160 019f355f8caf07a3fe6ab01010155ac2e5498897 SHA1 c4c106fa99305c12a4464dba950f3e9ecc743dc2 SHA256 62fb6a95e4482bb429deb0ea4c760afbf2ee4720de79bb0af49a96cc43954d09
+MISC metadata.xml 199 RMD160 1886607beaa5e5c57c9b628223c2c0e8a5bc4bce SHA1 a3fd6b4e6e98cf330b2894b405dacc112389da90 SHA256 2cd25550d242fc076480f5ae5764291b6674f9b377f264a09e6bdcf9261d8955
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlA59hIACgkQknrdDGLu8JAw4gD/Tg0EHXn1yw8cWHfAxwq4fmp6
-2qRzbZmE+5adscqjuvUA/0aswuijs9mdQpzSJJx/SusTSeC7WHyNtPf2+WBdPV22
-=Klgp
+iEYEARECAAYFAlBnSsQACgkQsAvGakAaFgDnnwCbBLNQD1EWDxRw/p0cBuadXJFL
+UdoAnjmQ02tmt1u+GEpmN9RlgwTpMlF1
+=K/fE
 -----END PGP SIGNATURE-----
diff --git a/www-client/httrack/files/httrack-3.46.1-parallel.patch b/www-client/httrack/files/httrack-3.46.1-parallel.patch
new file mode 100644
index 000000000000..97623299bae9
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.46.1-parallel.patch
@@ -0,0 +1,48 @@
+diff --git a/libtest/Makefile.am b/libtest/Makefile.am
+index d7c8309..4be2158 100644
+--- a/libtest/Makefile.am
++++ b/libtest/Makefile.am
+@@ -18,33 +18,33 @@ AM_LDFLAGS = -L../src
+ 
+ # Examples
+ libbaselinks_la_SOURCES =  callbacks-example-baselinks.c
+-libbaselinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libbaselinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libbaselinks_la_LDFLAGS = -version-info 1:0:0
+ libchangecontent_la_SOURCES =  callbacks-example-changecontent.c
+-libchangecontent_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libchangecontent_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libchangecontent_la_LDFLAGS = -version-info 1:0:0
+ libcontentfilter_la_SOURCES =  callbacks-example-contentfilter.c
+-libcontentfilter_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libcontentfilter_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libcontentfilter_la_LDFLAGS = -version-info 1:0:0
+ libdisplayheader_la_SOURCES =  callbacks-example-displayheader.c
+-libdisplayheader_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libdisplayheader_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libdisplayheader_la_LDFLAGS = -version-info 1:0:0
+ libfilename2_la_SOURCES =  callbacks-example-filename2.c
+-libfilename2_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libfilename2_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libfilename2_la_LDFLAGS = -version-info 1:0:0
+ libfilename_la_SOURCES =  callbacks-example-filename.c
+-libfilename_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libfilename_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libfilename_la_LDFLAGS = -version-info 1:0:0
+ libfilenameiisbug_la_SOURCES =  callbacks-example-filenameiisbug.c
+-libfilenameiisbug_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libfilenameiisbug_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libfilenameiisbug_la_LDFLAGS = -version-info 1:0:0
+ liblistlinks_la_SOURCES =  callbacks-example-listlinks.c
+-liblistlinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++liblistlinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ liblistlinks_la_LDFLAGS = -version-info 1:0:0
+ liblog_la_SOURCES =  callbacks-example-log.c
+-liblog_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++liblog_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ liblog_la_LDFLAGS = -version-info 1:0:0
+ libsimple_la_SOURCES =  callbacks-example-simple.c
+-libsimple_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libsimple_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libsimple_la_LDFLAGS = -version-info 1:0:0
+ pkglib_LTLIBRARIES = libbaselinks.la libchangecontent.la libcontentfilter.la libdisplayheader.la libfilename2.la libfilename.la libfilenameiisbug.la liblistlinks.la liblog.la libsimple.la
diff --git a/www-client/httrack/httrack-3.46.1.ebuild b/www-client/httrack/httrack-3.46.1.ebuild
new file mode 100644
index 000000000000..c7c2f14d39c8
--- /dev/null
+++ b/www-client/httrack/httrack-3.46.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/httrack/httrack-3.46.1.ebuild,v 1.1 2012/09/29 19:23:44 sping Exp $
+
+EAPI="4"
+
+AT_M4DIR='m4'
+inherit autotools eutils
+
+DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
+HOMEPAGE="http://www.httrack.com/"
+SRC_URI="http://download.httrack.com/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND=">=sys-libs/zlib-1.2.5.1-r1"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS README greetings.txt history.txt )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.44.1+zlib-1.2.5.1.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=421499
+	epatch "${FILESDIR}"/${P}-parallel.patch
+
+	epatch "${FILESDIR}"/${PN}-3.45.4-htmldir.patch
+	epatch "${FILESDIR}"/${PN}-3.45.4-cflags.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}