Version bump (should fix bug #351813 by Michael Orlitzky and Xavier Roche), install docs in proper place (bug #241466 by flameeyes and Gef Lebster). Drop old.

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

4 files changed, 33 insertions, 51 deletions

diff --git a/www-client/httrack/ChangeLog b/www-client/httrack/ChangeLog
index 01ac35254abc..ec7ffe45ccbd 100644
--- a/www-client/httrack/ChangeLog
+++ b/www-client/httrack/ChangeLog
@@ -1,6 +1,14 @@
 # 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.33 2011/11/30 17:20:30 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/httrack/ChangeLog,v 1.34 2012/02/11 14:25:41 pacho Exp $
+
+*httrack-3.44.5 (11 Feb 2012)
+
+  11 Feb 2012; Pacho Ramos <pacho@gentoo.org> +httrack-3.44.5.ebuild,
+  -httrack-3.44.1-r1.ebuild, -httrack-3.44.1.ebuild:
+  Version bump (should fix bug #351813 by Michael Orlitzky and Xavier Roche),
+  install docs in proper place (bug #241466 by flameeyes and Gef Lebster). Drop
+  old.
 
   30 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> httrack-3.44.1-r1.ebuild:
   Raise sys-libs/zlib depend since httrack-3.44.1+zlib-1.2.5.1.patch is not
diff --git a/www-client/httrack/Manifest b/www-client/httrack/Manifest
index dba6f9164c1d..fafaeaa5019f 100644
--- a/www-client/httrack/Manifest
+++ b/www-client/httrack/Manifest
@@ -3,20 +3,15 @@ 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
+DIST httrack-3.44.5.tar.gz 1664721 RMD160 c358d01823fc0a0c9ba0e483518350806a828e90 SHA1 fc6d7427f5b1931f15cd13adfee226edb4c908b1 SHA256 172a873db42b83b6694ac53714743246aeaf0faed514b3a1b517ba1609b5e403
 EBUILD httrack-3.42.3.ebuild 751 RMD160 690d76e90e823a45c0bee5365c524c3f1ad033f7 SHA1 bf72ad6a0fcde239350aebed66e4dc1e0d665e5d SHA256 31fc5bdf1e5f4311485f10af43b5ef6ec52508c7748d06ac92f2828caa60f0f1
-EBUILD httrack-3.44.1-r1.ebuild 787 RMD160 4ae64a19ee8ef440272190fcaab774a21c753026 SHA1 9a8509eb1b7ff6aeca559548bbc31d5c24028a30 SHA256 215f555a42155ef10f95dc0a7a09160b9931a82c2b75bab4fe0dbea432fe1468
-EBUILD httrack-3.44.1.ebuild 710 RMD160 c9edb594bd2785e5cf5534ae920503dffce27b14 SHA1 19b4d979c1fe927efecdbe77fb7ddd39e8f4fe48 SHA256 a473a49889ed76c1cd7188bacd01ee79193776ce2ed7fc1e7b2d2f2fb118d463
-MISC ChangeLog 6650 RMD160 1d8a02049f42255f97d9cdee78068efa5c64b1a5 SHA1 746da5596ff1c8d727b1f8a0625bba2b9d24685a SHA256 aaf59368864ed92a13ac714a2f2656702f385e3bb3e50f8ebd3fe8666332237c
+EBUILD httrack-3.44.5.ebuild 983 RMD160 5fa069c440c5c4422caf92fd55c410b75b370bf3 SHA1 35576f6863848cbce7728ddcdd861025cdac103f SHA256 582da140f14de6bfcbd2061099ad50c69b7a13be65f87d6506f029852893ba45
+MISC ChangeLog 6966 RMD160 fed82af1ffec22896adc63a7727f82bd8466e3ff SHA1 42e068baeaeed80fbeab85a7ff957e8c56d36d2b SHA256 180693b859f7cdfba362e4866e8c749a43926467b2c6479aae819fc6e8db1113
 MISC metadata.xml 211 RMD160 f0c4ad6ccb0152d62a300bc77956ea3bf7c170a2 SHA1 6f46be7ecc51754f0679bc5a779c151e1b701016 SHA256 84ff2341253cdd21a6782e14ebc076a8bcae11428aacfe2454f4b32165504727
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO1mVEAAoJEEdUh39IaPFNqfUH/A+qIr/LTVVWOwhIGQGZHMlP
-LtQULCDIo4KXy/MFPb+TvLezYpp0ZUdFE62RElkZhtltuPAOalpTOuHrTu1tO129
-kObwajEvEtCin94SxWTuYfZnoG8LH628e+jgEKn8Am3PEJCd1GbN2RjjjN58HrpL
-0D27ghfaCOpTQIqFXHC+L8IjHqY+GXGUXtuIPO8VOe6IEbwhj9UcZI6npioAH/6l
-hyzR7176DrTikFexnoysKW0/ppChzB20uOJu6HUM4gpTn9z0rXIcrYGXU6HhnXlD
-Sit82W6zldSiL1SKJnAUzTD6uqwnwqeXbw3er0VOMNAT+gEotJOkwNMV5BMKRuc=
-=y6ic
+iEYEARECAAYFAk82emsACgkQCaWpQKGI+9QLQACfV50MIqvdNaMbVEoy17HNOm11
+BywAn0hMf1MnmJBfw6zxFDLY5Wqz0wHA
+=Puql
 -----END PGP SIGNATURE-----
diff --git a/www-client/httrack/httrack-3.44.1.ebuild b/www-client/httrack/httrack-3.44.1.ebuild
deleted file mode 100644
index a67f240a12dc..000000000000
--- a/www-client/httrack/httrack-3.44.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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.ebuild,v 1.1 2011/04/21 16:40:31 vanquirius Exp $
-
-inherit versionator
-
-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=""
-
-src_compile() {
-	econf || die
-	# won't compile in parallel
-	emake -j1 || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS README greetings.txt history.txt
-	dohtml httrack-doc.html
-}
diff --git a/www-client/httrack/httrack-3.44.1-r1.ebuild b/www-client/httrack/httrack-3.44.5.ebuild
index bc615d307fd8..6c99104b61ba 100644
--- a/www-client/httrack/httrack-3.44.1-r1.ebuild
+++ b/www-client/httrack/httrack-3.44.5.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.44.1-r1.ebuild,v 1.2 2011/11/30 17:20:30 ssuominen Exp $
-
-EAPI=4
+# $Header: /var/cvsroot/gentoo-x86/www-client/httrack/httrack-3.44.5.ebuild,v 1.1 2012/02/11 14:25:41 pacho Exp $
 
+EAPI="4"
 inherit eutils
 
 DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
@@ -18,17 +17,23 @@ 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}"/${P}+zlib-1.2.5.1.patch
+	epatch "${FILESDIR}"/${PN}-3.44.1+zlib-1.2.5.1.patch
+
+	sed -i \
+		"/^HelpHtml.*dir/s:${PN}:${PF}:" \
+		"${S}"/html/Makefile.in || die
 }
 
 src_configure() {
-	econf \
-		$(use_enable static-libs static)
+	econf $(use_enable static-libs static) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html
 }
 
-src_compile() {
-	emake -j1
+src_install() {
+	default
+	rm -rf "${ED}"/usr/share/doc/"${PN}" || die
 }
-
-DOCS=( AUTHORS README greetings.txt history.txt )