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

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

5 files changed, 67 insertions, 12 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/Manifest b/www-client/httrack/Manifest
index a85ad7200c6b..9e4bbc557bdb 100644
--- a/www-client/httrack/Manifest
+++ b/www-client/httrack/Manifest
@@ -2,6 +2,8 @@
 Hash: SHA1
 
 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 1472 RMD160 a39965e0093d2e625a3b976a355adf08e37da810 SHA1 09f4f9dbdf83ca7773786d9c72621d46e9c442be SHA256 98a064cc375aabf3e1a22a99faa875dd01bca739a72880e616d5aa0c1ad8c3c6
 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
 DIST httrack-3.42-3.tar.gz 1664057 RMD160 1e8df088ff0a2978715161b8f77f871bef3787e8 SHA1 6d4fae72290f8fdd424878e99ba4261741af1a8d SHA256 a6a91f7dfc90d625c58d0043a17af3c27a99369a76203c4e964e850e81913e3d
@@ -13,13 +15,13 @@ EBUILD httrack-3.42.3.ebuild 751 RMD160 690d76e90e823a45c0bee5365c524c3f1ad033f7
 EBUILD httrack-3.44.5.ebuild 983 RMD160 5fa069c440c5c4422caf92fd55c410b75b370bf3 SHA1 35576f6863848cbce7728ddcdd861025cdac103f SHA256 582da140f14de6bfcbd2061099ad50c69b7a13be65f87d6506f029852893ba45
 EBUILD httrack-3.45.2.ebuild 983 RMD160 206341a13b49625535eb940ee8b874f326781ccb SHA1 6cc2f136e5656995154ce0fd60b1a8b7495603d5 SHA256 42623729d308eae31133fc85dfce819951542c8350b1091e2b91fba1762b1ccf
 EBUILD httrack-3.45.3.ebuild 983 RMD160 39a0d89ceb9735957e427cd47560b9148a339884 SHA1 ea2026e060dd9580a283182f4b0fea7be9bc10b9 SHA256 5db527c5b7e159b18967e21ce168edf311226b92f36773e56ff8cf0e5fe04308
-EBUILD httrack-3.45.4.ebuild 1160 RMD160 f24df0c2a7d8ba78a205552e89e1fcbe1d79fda8 SHA1 b20bc2be110f9b7be076d0d84ebfc35a352b1734 SHA256 f2315385dda12aef03cfc805fa300241bb1ea8cec165fa9c02c2875e99d56fe1
-MISC ChangeLog 7662 RMD160 27030ef1fd93dfd218f6a381518145654bf39210 SHA1 cc7e1040281644504bc4739437cfe47e1e5c8087 SHA256 97fc9fa165fba33aca402d42a9e63c1a45f1051f9ab798a0b070230b963c86a3
+EBUILD httrack-3.45.4.ebuild 1166 RMD160 66e4cb579428c9ce4449c680feed55fe754ca734 SHA1 bc4964f62afe2577da766ff59e4efd0be5f52547 SHA256 34fb1a61d6661fa4bd803cc3c1e13f043e24ffab36bb04a7de60c548c0635e37
+MISC ChangeLog 7843 RMD160 4e6e8ca19342d59ebce1cdd823008afdec87b707 SHA1 b6bc161a9f7508995ef4cbf68c6f38b6a4b3a244 SHA256 aaa168c68a4da69e1cc2f90fba79a05fb39592e1017a02a8a0b7034312786aa7
 MISC metadata.xml 199 RMD160 1886607beaa5e5c57c9b628223c2c0e8a5bc4bce SHA1 a3fd6b4e6e98cf330b2894b405dacc112389da90 SHA256 2cd25550d242fc076480f5ae5764291b6674f9b377f264a09e6bdcf9261d8955
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/k2h4ACgkQsAvGakAaFgC19wCgukdhOvI6KGcrN7YVxa1qV4Al
-MEAAn38aKc+y2oxOJ7OJAylX7S1Dl0OL
-=OMDk
+iEYEARECAAYFAk/8dLQACgkQsAvGakAaFgDPZQCbBiO+AmBTDaxGkm6wOW0ygkSK
+JH0AoK/AF4mLr7nu4fDKaeeLvdd2z5/o
+=XOky
 -----END PGP SIGNATURE-----
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
 }