www-client/httrack: 3.46.1

(Portage version: 2.1.10.65/cvs/Linux x86_64)

3 files changed, 99 insertions, 1 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/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
+}