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.

(Portage version: 2.1.10.45/cvs/Linux x86_64)

3 files changed, 26 insertions, 39 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/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 )