Version bump, use standard doc path, and fix w3mimgdisplay path (bug #461716 by Khayyam).

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

4 files changed, 59 insertions, 3 deletions

diff --git a/app-misc/ranger/ChangeLog b/app-misc/ranger/ChangeLog
index 79a95a63b5b4..28a341874a51 100644
--- a/app-misc/ranger/ChangeLog
+++ b/app-misc/ranger/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/ranger
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ranger/ChangeLog,v 1.25 2013/03/02 06:42:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ranger/ChangeLog,v 1.26 2013/05/30 08:24:27 radhermit Exp $
+
+*ranger-1.6.1 (30 May 2013)
+
+  30 May 2013; Tim Harder <radhermit@gentoo.org> +ranger-1.6.1.ebuild,
+  ranger-9999.ebuild, +files/ranger-1.6.1-w3mimgdisplay.patch:
+  Version bump, use standard doc path, and fix w3mimgdisplay path (bug #461716
+  by Khayyam).
 
   02 Mar 2013; Tim Harder <radhermit@gentoo.org> -ranger-1.5.4.ebuild,
   -ranger-1.5.5.ebuild:
diff --git a/app-misc/ranger/files/ranger-1.6.1-w3mimgdisplay.patch b/app-misc/ranger/files/ranger-1.6.1-w3mimgdisplay.patch
new file mode 100644
index 000000000000..3e11c33a697e
--- /dev/null
+++ b/app-misc/ranger/files/ranger-1.6.1-w3mimgdisplay.patch
@@ -0,0 +1,11 @@
+--- ranger-1.6.1/ranger/ext/img_display.py
++++ ranger-1.6.1/ranger/ext/img_display.py
+@@ -13,7 +13,7 @@
+ import termios, fcntl, struct, sys, os
+ from subprocess import Popen, PIPE
+ 
+-W3MIMGDISPLAY_PATH = '/usr/lib/w3m/w3mimgdisplay'
++W3MIMGDISPLAY_PATH = '/usr/libexec/w3m/w3mimgdisplay'
+ W3MIMGDISPLAY_OPTIONS = []
+ 
+ class ImgDisplayUnsupportedException(Exception):
diff --git a/app-misc/ranger/ranger-1.6.1.ebuild b/app-misc/ranger/ranger-1.6.1.ebuild
new file mode 100644
index 000000000000..db22b7c3ade0
--- /dev/null
+++ b/app-misc/ranger/ranger-1.6.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ranger/ranger-1.6.1.ebuild,v 1.1 2013/05/30 08:24:27 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.savannah.nongnu.org/ranger.git"
+	inherit git-2
+else
+	SRC_URI="http://nongnu.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A vim-inspired file manager for the console"
+HOMEPAGE="http://ranger.nongnu.org/"
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="virtual/pager"
+
+PATCHES=( "${FILESDIR}"/${P}-w3mimgdisplay.patch )
+
+src_prepare() {
+	sed -i "s|share/doc/ranger|share/doc/${PF}|" setup.py doc/ranger.1 || die
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Ranger has many optional dependencies to support enhanced file previews."
+		elog "See the README or homepage for more details."
+	fi
+}
diff --git a/app-misc/ranger/ranger-9999.ebuild b/app-misc/ranger/ranger-9999.ebuild
index 345261546a35..e95ea1e29d4d 100644
--- a/app-misc/ranger/ranger-9999.ebuild
+++ b/app-misc/ranger/ranger-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ranger/ranger-9999.ebuild,v 1.4 2013/03/02 06:41:49 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ranger/ranger-9999.ebuild,v 1.5 2013/05/30 08:24:27 radhermit Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
@@ -24,7 +24,7 @@ SLOT="0"
 RDEPEND="virtual/pager"
 
 pkg_postinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		elog "Ranger has many optional dependencies to support enhanced file previews."
 		elog "See the README or homepage for more details."
 	fi