Add patch to fix building with recent zlib, thanks to Lars Wendler in bug #383805...

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

diff --git a/www-client/httrack/ChangeLog b/www-client/httrack/ChangeLog
index f586347b1dcc71e660c1680e0c6643219899cc60..fdd1015aae0af9d9b96da3620890220b2fb4c759 100644 (file)
--- a/www-client/httrack/ChangeLog
+++ b/www-client/httrack/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/httrack
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/httrack/ChangeLog,v 1.31 2011/11/22 18:21:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/httrack/ChangeLog,v 1.32 2011/11/30 11:23:20 flameeyes Exp $
+
+*httrack-3.44.1-r1 (30 Nov 2011)
+
+  30 Nov 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/httrack-3.44.1+zlib-1.2.5.1.patch, +httrack-3.44.1-r1.ebuild:
+  Add patch to fix building with recent zlib, thanks to Lars Wendler in bug
+  #383805. Bump to EAPI=4.
 
   22 Nov 2011; Pacho Ramos <pacho@gentoo.org> -httrack-3.43.7.ebuild,
   -httrack-3.43.9.ebuild, metadata.xml:

diff --git a/www-client/httrack/Manifest b/www-client/httrack/Manifest
index bdc99aa691c8bd63976694db4f96947be2190424..3c345e6bcf4677739c409eabc1e50844c0638d14 100644 (file)
--- a/www-client/httrack/Manifest
+++ b/www-client/httrack/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX httrack-3.44.1+zlib-1.2.5.1.patch 423 RMD160 ed1335fc9e7929df795a2d3654814797b60e6ad8 SHA1 9bd4ad25d4c3db54feffeb9a95086b1ae79a341b SHA256 34763f1f413ee92c2722d741d191706b9e179c6a66d2e4aabf7a5089cc5241f1
 DIST httrack-3.42-3.tar.gz 1664057 RMD160 1e8df088ff0a2978715161b8f77f871bef3787e8 SHA1 6d4fae72290f8fdd424878e99ba4261741af1a8d SHA256 a6a91f7dfc90d625c58d0043a17af3c27a99369a76203c4e964e850e81913e3d
 DIST httrack-3.44.1.tar.gz 1664216 RMD160 04644ba0300b92392a255965d1c7191fe4f186fc SHA1 5bdbc0b294b25929e52bc932e076c9e349a18fa9 SHA256 af95a730eff665d8275770951e8816bb29def5dc66d9faeaad91f93f686c9ddd
 EBUILD httrack-3.42.3.ebuild 751 RMD160 690d76e90e823a45c0bee5365c524c3f1ad033f7 SHA1 bf72ad6a0fcde239350aebed66e4dc1e0d665e5d SHA256 31fc5bdf1e5f4311485f10af43b5ef6ec52508c7748d06ac92f2828caa60f0f1
+EBUILD httrack-3.44.1-r1.ebuild 774 RMD160 f5cba85a1475c3c64521d843d752a9dc294c94e8 SHA1 00b2dba3772b5fc046e53c6f935171d4068aeb27 SHA256 d78268ef951f7d9b8d3aae3642a6ba691303f6384e713f6abd4e126846d35ccb
 EBUILD httrack-3.44.1.ebuild 710 RMD160 c9edb594bd2785e5cf5534ae920503dffce27b14 SHA1 19b4d979c1fe927efecdbe77fb7ddd39e8f4fe48 SHA256 a473a49889ed76c1cd7188bacd01ee79193776ce2ed7fc1e7b2d2f2fb118d463
-MISC ChangeLog 6200 RMD160 3c5b3c38ecae91fe70de3c696eb3089be597a67a SHA1 73fd94092398a4581535d43f8f31197504bf8840 SHA256 e0e6d054b51a4a180a4f94ff38e2ed34664d445124b7ac8bf30ece622a16ccae
+MISC ChangeLog 6469 RMD160 b79ed7983ab1e89424a013cb47a97314da56345b SHA1 2a3a8701e46e6cae19e73d8dc04ae0ccdbef0320 SHA256 30e93657078607f0cd98bcc8def05fcd03ab5257ef666a220f69e63ee08a0dd0
 MISC metadata.xml 211 RMD160 f0c4ad6ccb0152d62a300bc77956ea3bf7c170a2 SHA1 6f46be7ecc51754f0679bc5a779c151e1b701016 SHA256 84ff2341253cdd21a6782e14ebc076a8bcae11428aacfe2454f4b32165504727
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7L6EUACgkQCaWpQKGI+9Q5sgCbB+MnwGP18geUZQPPDQKSJppp
-jdcAnRUluXES/psnPykn70Pel8LQ0bqF
-=8HJY
+iEYEARECAAYFAk7WEisACgkQAiZjviIA2XiEngCfT4GIvJINsKV+6N7q6Gk6f3IA
+OR8Anij6HE7Ex8lgGyq+OqL8c8Zkeul8
+=0V5K
 -----END PGP SIGNATURE-----

diff --git a/www-client/httrack/files/httrack-3.44.1+zlib-1.2.5.1.patch b/www-client/httrack/files/httrack-3.44.1+zlib-1.2.5.1.patch
new file mode 100644 (file)
index 0000000..cadaa8c
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.44.1+zlib-1.2.5.1.patch
@@ -0,0 +1,21 @@
+--- httrack-3.44.1/src/minizip/ioapi.h
++++ httrack-3.44.1/src/minizip/ioapi.h
+@@ -9,6 +9,7 @@
+ #ifndef _ZLIBIOAPI_H
+ #define _ZLIBIOAPI_H
+ 
++#define OF(x) x
+ 
+ #define ZLIB_FILEFUNC_SEEK_CUR (1)
+ #define ZLIB_FILEFUNC_SEEK_END (2)
+--- httrack-3.44.1/src/minizip/zip.h
++++ httrack-3.44.1/src/minizip/zip.h
+@@ -42,6 +42,8 @@
+       ftp://ftp.pkware.com/probdesc.zip
+ */
+ 
++#define OF(x) x
++
+ #ifndef _zip_H
+ #define _zip_H
+ 

diff --git a/www-client/httrack/httrack-3.44.1-r1.ebuild b/www-client/httrack/httrack-3.44.1-r1.ebuild
new file mode 100644 (file)
index 0000000..e223506
--- /dev/null
+++ b/www-client/httrack/httrack-3.44.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/httrack/httrack-3.44.1-r1.ebuild,v 1.1 2011/11/30 11:23:20 flameeyes Exp $
+
+EAPI=4
+
+inherit 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-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+       epatch "${FILESDIR}"/${P}+zlib-1.2.5.1.patch
+}
+
+src_configure() {
+       econf \
+               $(use_enable static-libs static)
+}
+
+src_compile() {
+       emake -j1
+}
+
+DOCS=( AUTHORS README greetings.txt history.txt )