www-client/httrack: Fix QA issues (bug #425712)

(Portage version: 2.1.10.65/cvs/Linux x86_64)

4 files changed, 60 insertions, 7 deletions

diff --git a/www-client/httrack/ChangeLog b/www-client/httrack/ChangeLog
index 90fbe14558b3..79545d050b1e 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.38 2012/06/22 20:48:51 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/httrack/ChangeLog,v 1.39 2012/07/10 18:30:30 sping Exp $
+
+  10 Jul 2012; Sebastian Pipping <sping@gentoo.org> httrack-3.45.4.ebuild,
+  +files/httrack-3.45.4-cflags.patch, +files/httrack-3.45.4-htmldir.patch:
+  Fix QA issues (bug #425712)
 
   22 Jun 2012; Sebastian Pipping <sping@gentoo.org> httrack-3.45.4.ebuild,
   +files/httrack-3.45.4-install-once.patch,
diff --git a/www-client/httrack/files/httrack-3.45.4-cflags.patch b/www-client/httrack/files/httrack-3.45.4-cflags.patch
new file mode 100644
index 000000000000..a84c499f9d88
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.45.4-cflags.patch
@@ -0,0 +1,12 @@
+--- /configure.in	2012-07-10 20:19:09.958552772 +0200
++++ /configure.in	2012-07-10 20:19:39.011189564 +0200
+@@ -13,8 +13,7 @@
+ AC_PROG_LN_S
+ 
+ ### Default CFLAGS
+-DEFAULT_CFLAGS=""
+-DEFAULT_CFLAGS="-O -g3 -Wall -Wcast-align -Wstrict-prototypes \
++DEFAULT_CFLAGS="-Wall -Wcast-align -Wstrict-prototypes \
+ -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith \
+ -Wnested-externs -D_REENTRANT"
+ AC_SUBST(DEFAULT_CFLAGS)
diff --git a/www-client/httrack/files/httrack-3.45.4-htmldir.patch b/www-client/httrack/files/httrack-3.45.4-htmldir.patch
new file mode 100644
index 000000000000..fa9808f60955
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.45.4-htmldir.patch
@@ -0,0 +1,38 @@
+--- html/Makefile.am	2012-07-10 19:54:41.844906721 +0200
++++ html/Makefile.am	2012-07-10 19:54:47.885831199 +0200
+@@ -1,13 +1,13 @@
+ 
+-HelpHtmlrootdir = $(datadir)/doc/httrack
+-HelpHtmldir = $(datadir)/doc/httrack/html
+-HelpHtmlimgdir = $(datadir)/doc/httrack/html/img
+-HelpHtmldivdir = $(datadir)/doc/httrack/html/div
+-HelpHtmlimagesdir = $(datadir)/doc/httrack/html/images
+-HelpHtmlTxtdir = $(datadir)/doc/httrack/html
+-WebHtmldir = $(datadir)/doc/httrack/html/server
+-WebHtmlimagesdir = $(datadir)/doc/httrack/html/server/images
+-WebHtmlsfxdir = $(datadir)/doc/httrack/html/server/sfx
++HelpHtmlrootdir = $(docdir)
++HelpHtmldir = $(htmldir)
++HelpHtmlimgdir = $(HelpHtmldir)/img
++HelpHtmldivdir = $(HelpHtmldir)/div
++HelpHtmlimagesdir = $(HelpHtmldir)/images
++HelpHtmlTxtdir = $(HelpHtmldir)
++WebHtmldir = $(HelpHtmldir)/server
++WebHtmlimagesdir = $(HelpHtmldir)/server/images
++WebHtmlsfxdir = $(HelpHtmldir)/server/sfx
+ 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 \
+-			&& mv -f ../doc/httrack/html html \
+-			&& cd ../doc/httrack/ \
+-			&& $(LN_S) ../../httrack/html html \
+-		) \
+-	fi
diff --git a/www-client/httrack/httrack-3.45.4.ebuild b/www-client/httrack/httrack-3.45.4.ebuild
index 267e17ed54c1..b6bb849ad756 100644
--- a/www-client/httrack/httrack-3.45.4.ebuild
+++ b/www-client/httrack/httrack-3.45.4.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2012/06/22 20:48:51 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/httrack/httrack-3.45.4.ebuild,v 1.3 2012/07/10 18:30:30 sping Exp $
 
 EAPI="4"
 
@@ -24,13 +24,12 @@ DOCS=( AUTHORS README greetings.txt history.txt )
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.44.1+zlib-1.2.5.1.patch
 
-	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
+
+	epatch "${FILESDIR}"/${P}-htmldir.patch
+	epatch "${FILESDIR}"/${P}-cflags.patch
 	eautoreconf
 }
 
@@ -42,5 +41,5 @@ src_configure() {
 
 src_install() {
 	default
-	rm -rf "${ED}"/usr/share/doc/"${PN}" || die
+	find "${ED}" -type f -name '*.la' -delete || die
 }