summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2012-06-22 20:48:51 +0000
committerSebastian Pipping <sping@gentoo.org>2012-06-22 20:48:51 +0000
commit05cf785b2ab1a208ef576152163affd250c16ae1 (patch)
tree749747043f6cc91d2d7446c9181d7f836b25e8ef /www-client
parentStable for amd64, wrt bug #419473 (diff)
downloadgentoo-2-05cf785b2ab1a208ef576152163affd250c16ae1.tar.gz
gentoo-2-05cf785b2ab1a208ef576152163affd250c16ae1.tar.bz2
gentoo-2-05cf785b2ab1a208ef576152163affd250c16ae1.zip
www-client/httrack: Fix compilation (bug #421499)
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/httrack/ChangeLog7
-rw-r--r--www-client/httrack/files/httrack-3.45.4-install-once.patch32
-rw-r--r--www-client/httrack/files/httrack-3.45.4-parallel.patch68
-rw-r--r--www-client/httrack/httrack-3.45.4.ebuild11
4 files changed, 115 insertions, 3 deletions
diff --git a/www-client/httrack/ChangeLog b/www-client/httrack/ChangeLog
index c4f006408b2e..90fbe14558b3 100644
--- a/www-client/httrack/ChangeLog
+++ b/www-client/httrack/ChangeLog
@@ -1,6 +1,11 @@
# 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.37 2012/05/02 20:09:37 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/httrack/ChangeLog,v 1.38 2012/06/22 20:48:51 sping Exp $
+
+ 22 Jun 2012; Sebastian Pipping <sping@gentoo.org> httrack-3.45.4.ebuild,
+ +files/httrack-3.45.4-install-once.patch,
+ +files/httrack-3.45.4-parallel.patch:
+ Fix parallel make issue (bug #421499) and installing two files twice
*httrack-3.45.4 (02 May 2012)
diff --git a/www-client/httrack/files/httrack-3.45.4-install-once.patch b/www-client/httrack/files/httrack-3.45.4-install-once.patch
new file mode 100644
index 000000000000..0590db59a9e2
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.45.4-install-once.patch
@@ -0,0 +1,32 @@
+From 1022a4f21ef2c4c7dc671261aa24e33d8e1223e0 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Fri, 22 Jun 2012 22:38:21 +0200
+Subject: [PATCH] Make sure that files example.{c,h} are matched once
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Otherwise "make install" dies with this error:
+
+/usr/bin/install: will not overwrite just-created ‘[..]/example.c’ with ‘example.c’
+/usr/bin/install: will not overwrite just-created ‘[..]/example.h’ with ‘example.h’
+make[2]: *** [install-exemplesDATA] Error 1
+---
+ libtest/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libtest/Makefile.am b/libtest/Makefile.am
+index 7e90ba0..4be2158 100644
+--- a/libtest/Makefile.am
++++ b/libtest/Makefile.am
+@@ -1,6 +1,6 @@
+
+ exemplesdir = $(datadir)/httrack/libtest
+-exemples_DATA = example.* *.c *.h *.txt
++exemples_DATA = *.c *.h *.txt
+ EXTRA_DIST = $(exemples_DATA)
+
+ INCLUDES = \
+--
+1.7.10.2
+
diff --git a/www-client/httrack/files/httrack-3.45.4-parallel.patch b/www-client/httrack/files/httrack-3.45.4-parallel.patch
new file mode 100644
index 000000000000..72424639c41e
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.45.4-parallel.patch
@@ -0,0 +1,68 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -25,8 +25,8 @@ INCLUDES = \
+
+ bin_PROGRAMS = proxytrack httrack htsserver
+
+-httrack_LDADD = $(THREADS_LIBS) -lhttrack
+-htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++httrack_LDADD = $(THREADS_LIBS) libhttrack.la
++htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) libhttrack.la
+ proxytrack_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS)
+ proxytrack_CFLAGS = $(AM_CFLAGS) -DNO_MALLOCT
+
+@@ -69,7 +69,7 @@ libhttrack_la_LIBADD = $(THREADS_LIBS) $(ZLIB_LIBS) $(DL_LIBS) $(SOCKET_LIBS)
+ libhttrack_la_LDFLAGS = -version-info $(VERSION_INFO)
+
+ libhtsjava_la_SOURCES = htsjava.c htsjava.h
+-libhtsjava_la_LIBADD = $(THREADS_LIBS) $(DL_LIBS) -lhttrack
++libhtsjava_la_LIBADD = $(THREADS_LIBS) $(DL_LIBS) libhttrack.la
+ libhtsjava_la_LDFLAGS = -version-info $(VERSION_INFO)
+
+ EXTRA_DIST = httrack.h webhttrack \
+--- a/libtest/Makefile.am 2012-06-19 21:41:25.913281858 +0200
++++ b/libtest/Makefile.am 2012-06-19 21:42:25.864532364 +0200
+@@ -18,33 +18,33 @@
+
+ # 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.45.4.ebuild b/www-client/httrack/httrack-3.45.4.ebuild
index cb3a60b181b7..267e17ed54c1 100644
--- a/www-client/httrack/httrack-3.45.4.ebuild
+++ b/www-client/httrack/httrack-3.45.4.ebuild
@@ -1,9 +1,11 @@
# 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.45.4.ebuild,v 1.1 2012/05/02 20:09:37 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/httrack/httrack-3.45.4.ebuild,v 1.2 2012/06/22 20:48:51 sping Exp $
EAPI="4"
-inherit eutils
+
+AT_M4DIR='m4'
+inherit autotools eutils
DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
HOMEPAGE="http://www.httrack.com/"
@@ -25,6 +27,11 @@ src_prepare() {
sed -i \
"/^HelpHtml.*dir/s:${PN}:${PF}:" \
"${S}"/html/Makefile.in || die
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=421499
+ epatch "${FILESDIR}"/${P}-parallel.patch
+ epatch "${FILESDIR}"/${P}-install-once.patch
+ eautoreconf
}
src_configure() {