Version bump, remove old.

(Portage version: 2.1.11.33/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

4 files changed, 64 insertions, 55 deletions

diff --git a/dev-vcs/hgview/ChangeLog b/dev-vcs/hgview/ChangeLog
index 986e7387bf41..a56eba81afe6 100644
--- a/dev-vcs/hgview/ChangeLog
+++ b/dev-vcs/hgview/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/hgview
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hgview/ChangeLog,v 1.8 2012/08/27 03:16:08 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hgview/ChangeLog,v 1.9 2012/12/05 09:53:20 kensington Exp $
+
+*hgview-1.7.0 (05 Dec 2012)
+
+  05 Dec 2012; Michael Palimaka <kensington@gentoo.org> +hgview-1.7.0.ebuild,
+  -files/hgview.rc, -hgview-1.5.0.ebuild:
+  Version bump, remove old.
 
   27 Aug 2012; Davide Pesavento <pesa@gentoo.org> hgview-1.6.2-r1.ebuild:
   Clarify comment, thanks to Arfrever on IRC.
diff --git a/dev-vcs/hgview/files/hgview.rc b/dev-vcs/hgview/files/hgview.rc
deleted file mode 100644
index 018a62b7b7c9..000000000000
--- a/dev-vcs/hgview/files/hgview.rc
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file is intended to be installed in a system's hgrc.d directory
-# It enables the hgview's mercurial plugin, making the 'hg qv' command
-# available.  This file presumes hgext/hgview.py has been installed in
-# the hgext path
-
-[extensions]
-hgext.hgview =
diff --git a/dev-vcs/hgview/hgview-1.5.0.ebuild b/dev-vcs/hgview/hgview-1.5.0.ebuild
deleted file mode 100644
index 9a68d4ea84c2..000000000000
--- a/dev-vcs/hgview/hgview-1.5.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hgview/hgview-1.5.0.ebuild,v 1.1 2012/02/10 22:57:03 hwoarang Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
-
-inherit distutils
-
-DESCRIPTION="PyQt4-based Mercurial log navigator"
-HOMEPAGE="http://www.logilab.org/project/hgview http://pypi.python.org/pypi/hgview"
-SRC_URI="http://ftp.logilab.org/pub/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="dev-python/docutils
-	dev-python/egenix-mx-base
-	dev-python/PyQt4[X]
-	dev-python/qscintilla-python
-	dev-vcs/mercurial
-	doc? ( app-text/asciidoc )"
-RDEPEND="${DEPEND}"
-
-PYTHON_MODNAME="hgext/hgview.py hgviewlib"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# Fix mercurial extension install path.
-	if ! use doc; then
-		sed -e '/make -C doc/d' -i setup.py || die "sed failed"
-		sed -e '/share\/man\/man1/,+1 d' -i hgviewlib/__pkginfo__.py || die "sed failed"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	# Install the mercurial extension config.
-	insinto /etc/mercurial/hgrc.d || die "insinto failed"
-	doins "${FILESDIR}/hgview.rc" || die "doins failed"
-}
diff --git a/dev-vcs/hgview/hgview-1.7.0.ebuild b/dev-vcs/hgview/hgview-1.7.0.ebuild
new file mode 100644
index 000000000000..2208a350aa6c
--- /dev/null
+++ b/dev-vcs/hgview/hgview-1.7.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hgview/hgview-1.7.0.ebuild,v 1.1 2012/12/05 09:53:20 kensington Exp $
+
+EAPI=5
+
+PYTHON_DEPEND="2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 3.* *-jython *-pypy-*"
+
+inherit distutils
+
+DESCRIPTION="PyQt4-based Mercurial log navigator"
+HOMEPAGE="http://www.logilab.org/project/hgview"
+SRC_URI="http://ftp.logilab.org/pub/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-python/docutils
+	dev-python/PyQt4[X]
+	dev-python/qscintilla-python
+	dev-vcs/mercurial"
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+	)"
+
+# If this flag is not set, arguments are passed to the "build" command
+# only for distutils_src_compile(), but not for distutils_src_install()
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+PYTHON_MODNAME="hgext/hgview.py hgviewlib"
+
+src_prepare() {
+	# https://www.logilab.org/ticket/103668
+	sed -i \
+		-e 's:MANDIR=$(PREFIX)/man:MANDIR=$(PREFIX)/share/man:' \
+		-e 's:$(INSTALL) $$i:$(INSTALL) -m 644 $$i:' \
+		doc/Makefile || die
+
+	distutils_src_prepare
+}
+
+src_compile() {
+	distutils_src_compile $(use doc || echo --no-doc)
+}
+
+src_install() {
+	distutils_src_install $(use doc || echo --no-doc)
+
+	# Install Mercurial extension config file
+	insinto /etc/mercurial/hgrc.d
+	doins hgext/hgview.rc
+}