Fix EPREFIX handling (thanks Leho Kraav, bug 465226), version bump.

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

5 files changed, 80 insertions, 24 deletions

diff --git a/app-shells/autojump/ChangeLog b/app-shells/autojump/ChangeLog
index e7836bd0747b..d3c300ac2344 100644
--- a/app-shells/autojump/ChangeLog
+++ b/app-shells/autojump/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-shells/autojump
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/autojump/ChangeLog,v 1.12 2013/05/04 11:14:20 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/autojump/ChangeLog,v 1.13 2013/08/06 22:02:54 xmw Exp $
+
+*autojump-21.5.8-r1 (06 Aug 2013)
+*autojump-21.6.9 (06 Aug 2013)
+
+  06 Aug 2013; Michael Weber <xmw@gentoo.org> +autojump-21.5.8-r1.ebuild,
+  +autojump-21.6.9.ebuild, -autojump-21.5.8.ebuild,
+  -files/autojump-21.5.8-eprefix.patch:
+  Fix EPREFIX handling (thanks Leho Kraav, bug 465226), version bump.
 
 *autojump-21.5.8 (04 May 2013)
 
diff --git a/app-shells/autojump/Manifest b/app-shells/autojump/Manifest
index 128f3c2ac3f9..dc90292aa763 100644
--- a/app-shells/autojump/Manifest
+++ b/app-shells/autojump/Manifest
@@ -2,17 +2,18 @@
 Hash: SHA256
 
 AUX autojump-21.3.0-supported-shells.patch 1055 SHA256 2a809db16b7403b414167a630e1343451b32530f120ba321cf4043fdbb9a6b35 SHA512 310e0737b8894d85ee74cbeb6b09830551d90621a047ab50be48610b9f496cbe961751d85b4ced8cc3156180309721a4a211abc1a59f1cb18713cef2191b22b7 WHIRLPOOL a2cd3a1c486879619fc0ca37dfbdb8faa0523af0c01b96a5ac6bdf9c7ee97acc224a7a4078fcae33814930ce532c9735ae977875ef8c7977ba29d768f451f831
-AUX autojump-21.5.8-eprefix.patch 528 SHA256 bba402017eac55f9a811f094bd741bde07e28054f16d768644a8883124bf4d61 SHA512 d94cac66017c3d1309ebe4420239ef10511227132b8c3413313edaadfe771d71aa0a737122cd3b7a1e2fc5610aea3f1f256aa272016ed15260505bb95c51892e WHIRLPOOL 2214cbc95b84033a5fbb14df9d45965025651b454f1ad6ae0575f2b1e2376e367c35876543d8efb5bd64087a808a3652a1a2f8ee7a485fce56366c90fb4ddc0f
 DIST autojump-21.3.0.tar.gz 51261 SHA256 217398c3135647f223356e055a1b84adb470385584d743baf7fe4d519fd78252 SHA512 b0b0292a08d01005f09581c58bff2bf9b4b860b53602c0777bab7ef5a5b301993fe2bfef154bedadc75407bcc41e8de4a6f01d5b70e2e1be6b4ae6a6162d5196 WHIRLPOOL a218cde9345077af5c365b3e8eaff994606a0c29f2c8f3c6772b043e68decdc915bd353efc20c61f6de974d59c617c8a9b292fc465823b818882ac68f438869c
 DIST autojump-21.5.8.tar.gz 52170 SHA256 4e18585aac319da1c900f0f022a4fe8ce3e21257d440c034d7abf29ed42d4e1e SHA512 a3857e0195cc77f19bd4eb46b4fc96cd5f7b1c01dac35c1f928dde19198519fa4848c0cf7f8342f87a1f71617cfcad62cc495a711541f32bec807347e9b6bd01 WHIRLPOOL b7686d0d1332d4cbeec6d88a35951bae0cc513843b9fd34ff407e88cf0fdb8f616acb9e48d40a91b63cf4beea085f8fd6a4215d5e0b38599e47af8212f2eb2e2
+DIST autojump-21.6.9.tar.gz 50172 SHA256 8918817688a4e5f1e87e4e559a1bb5cd3fe43cb11222bb5283fd0f44d395464b SHA512 90f2d5fa3e8e272073a8dd00e6023f74d6e9159f5c4d5345fb3e2fbb4829262e0de18d64975dbd7b85bbbfb83f5706f4463f7370806516385cae48595113afff WHIRLPOOL 89e4bb6380396c50a7509050e192ab3dcaeef4861191760a75464cbed0deeecb071544d255d88d8139323abbf38c84f6418821437debf273d1f99d76e63c67bd
 EBUILD autojump-21.3.0-r1.ebuild 1547 SHA256 4ca641caebc7af3b897704c2652425e591ecb07ed6a0cb311124abc24da8c587 SHA512 f538016f5d227c5ffd0f976884e5a369d0fd54e801b16e1d6cd16cd207398d5d338bfe44241d167221c4f44c07e5c2ae8a76ba787838ff24e37bf8faae09f641 WHIRLPOOL 0cb3a521f75e4d24742fbbcccf131f7755142a6278ac751c1adb1279c2d2e6b6c571ee84203ab5dc22b77f916fcb7e396174a4bd21ae6e7aaeb5f1a0e59d093c
-EBUILD autojump-21.5.8.ebuild 1397 SHA256 1cd71c371522969757a1417e8a28fe9b55046560ea94488f76bd456c7f5e6c1d SHA512 c22e10e73198f4216e1827e8d00886da311d783470932cfce3e0c87cbfe55e0e9d7d386adac98f54904616a0e1f52d15ccbfe21958f8a997e8cc38810aa7255f WHIRLPOOL b827e5e641766ea164dd552deb3b69b38a362e85914d15c7dcee7d8155a393cab852a678c9a1e825208fdd43ed5c822f72066ced89b470beee92fb27d4258272
-MISC ChangeLog 2269 SHA256 5b454f6237f4d5a67d1b4057702096efb009c30821d978bddbed62a31addca09 SHA512 e60a4050fc7f91f82a47f2fb3e4fb6414043400805034a0d63135b07b7214ea1b27ef4d8b35fdf785adb598cdd5b633ddbee9f0b82f39d55f8ff6ded32f9830c WHIRLPOOL 84de1c94ce805d31acf29780259d3789a6fb94cbd2c32abf9aabb99c09f628f310e4a86621c684fdc6006ead34d01479f14c209c72f72fe652ab75c18d2e3354
+EBUILD autojump-21.5.8-r1.ebuild 1433 SHA256 61c0dc7bd6676854f42d46fc8a2f529f83e973c8faa1c0b1a93b9c9bfdb38908 SHA512 731bb26b92ec0acef0a19e2c8f93c833ea87d1bf9fe31a465f6d65e7dc29d82ea4b85d3380fc0814ff9cf0e9b9c74f727d54a933311e72c886ecda46767e927b WHIRLPOOL 70ae34f02e9a77b321d9c3b274571e242f0d6baf3a3195d01e8762541573d68ccc28d22597d7e7e810f0643dae2a7c6acfd826d9c7be84bab6cbd05ba2515059
+EBUILD autojump-21.6.9.ebuild 1430 SHA256 e5a8ba41017f2a63994c9f9bf94535a3397e59cd95643082b1285651c0fcaf96 SHA512 a3d14dc3ef505d9fab622fa30039989e1933bfad945a1587f20843d2595dc41746dcbe0ad21fed095f772e3a7d457e91cad3a72d4e18bfbe583467d21195bc08 WHIRLPOOL 9d7a5b5d0d4429eaee893ff5be62eac86fc39413b51e6c46470fa4edabf5cc0c50e093616041b7fe149050590f4b7d0a8a10e4b1c48be19e82a328d22d243766
+MISC ChangeLog 2572 SHA256 2dd634695ff88e0999d2a34c7366a05c7ffe89f3ad2067e65a08f5843d4f28bb SHA512 e042ef3c932bf0f49533307a7de1fdd92f2e328553cb2f9b639de4e20495c35d1207b62776a9a2c6da273cfb2724a5e73f3f65bf1c2d6dbaa22137595cacdb6d WHIRLPOOL e34ee0d89a10bff40bb67f26dd35019fd15dc69bc3a03d1bbd9b7162bf66923c8a615af4d4db9b764822ec08fe11a4e13eed6b8079e15207b6542fb0e3f2978a
 MISC metadata.xml 316 SHA256 fb923acdedce47cb9d3d1e05f7216eb9a109f484331c668f08445f20ad1e2a29 SHA512 300d9416e057f8a34d612460f94ebf15567d58dcc8b2164433fd5246810f4d57f636c40452e768de48ee453d6ee866c00d9c81fd6e531be4fe9e364ed641e9d7 WHIRLPOOL 5fbe72012fa9693517dbbec772d8558cf15ba76c0f670337d9c3cf5d348afe01cfde6ad7ca96bccbd6271dcf93c4bb128ca85029d0ef2354a978dfc00ec7459b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlGE7Y8ACgkQknrdDGLu8JAJpwD7Bnh1Rsp+UxWFzSvWlgM80t0w
-/9B9FskcBrb0DCQUPNYA+QHpurykmM6bj8AuIxfmBR+dNC9QoUtZ9wrdXEr9Lw4M
-=5Z+U
+iF4EAREIAAYFAlIBcpMACgkQknrdDGLu8JCR3QD/S+AlqoTjIxdukG+vAzgyJrjU
+00nQnEYw+hIiUwnIMG0A/1nnQHbXFr87anDMDdBfhunK939xxN+UN6vgZYwsatj2
+=Q52V
 -----END PGP SIGNATURE-----
diff --git a/app-shells/autojump/autojump-21.5.8-r1.ebuild b/app-shells/autojump/autojump-21.5.8-r1.ebuild
new file mode 100644
index 000000000000..1549b7a028bb
--- /dev/null
+++ b/app-shells/autojump/autojump-21.5.8-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/autojump/autojump-21.5.8-r1.ebuild,v 1.1 2013/08/06 22:02:54 xmw Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+
+inherit python-r1 python-utils-r1 vcs-snapshot
+
+DESCRIPTION="change directory command that learns"
+HOMEPAGE="http://github.com/joelthelion/autojump"
+SRC_URI="https://github.com/joelthelion/${PN}/archive/release-v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bash-completion python test zsh-completion"
+
+RDEPEND="bash-completion? ( >=app-shells/bash-4 )
+	python? ( ${PYTHON_DEPS} )
+	zsh-completion? ( app-shells/zsh app-shells/zsh-completion )"
+DEPEND="test? ( ${PYTHON_DEPS} )"
+
+src_prepare() {
+	sed -e "s: \(/etc/profile.d\): \"${EPREFIX}\1\":" \
+		-i bin/autojump.sh || die
+}
+
+src_compile() {
+	true
+}
+
+src_install() {
+	dobin bin/autojump
+
+	insinto /etc/profile.d
+	doins bin/${PN}.sh
+
+	if use bash-completion ; then
+		doins bin/${PN}.bash
+	fi
+
+	if use zsh-completion ; then
+		doins bin/${PN}.zsh
+		insinto /usr/share/zsh/site-functions
+		doins bin/_j
+	fi
+
+	if use python ; then
+		python_foreach_impl python_domodule tools/autojump_ipython.py
+
+		einfo "This tool provides \"j\" for ipython, please add"
+		einfo "\"import autojump_ipython\" to your ipy_user_conf.py."
+	fi
+
+	doman docs/${PN}.1
+	dodoc README.md
+}
diff --git a/app-shells/autojump/autojump-21.5.8.ebuild b/app-shells/autojump/autojump-21.6.9.ebuild
index 0048e8169f90..0b6560c55c01 100644
--- a/app-shells/autojump/autojump-21.5.8.ebuild
+++ b/app-shells/autojump/autojump-21.6.9.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/autojump/autojump-21.5.8.ebuild,v 1.1 2013/05/04 11:14:20 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/autojump/autojump-21.6.9.ebuild,v 1.1 2013/08/06 22:02:54 xmw Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
 
-inherit eutils python-r1 python-utils-r1 vcs-snapshot
+inherit python-r1 python-utils-r1 vcs-snapshot
 
 DESCRIPTION="change directory command that learns"
 HOMEPAGE="http://github.com/joelthelion/autojump"
@@ -23,7 +23,8 @@ RDEPEND="bash-completion? ( >=app-shells/bash-4 )
 DEPEND="test? ( ${PYTHON_DEPS} )"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-eprefix.patch
+	sed -e "s: \(/etc/profile.d\): \"${EPREFIX}\1\":" \
+		-i bin/autojump.sh || die
 }
 
 src_compile() {
diff --git a/app-shells/autojump/files/autojump-21.5.8-eprefix.patch b/app-shells/autojump/files/autojump-21.5.8-eprefix.patch
deleted file mode 100644
index 3daec004b32c..000000000000
--- a/app-shells/autojump/files/autojump-21.5.8-eprefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- autojump-21.5.8/bin/autojump.sh
-+++ autojump-21.5.8/bin/autojump.sh
-@@ -11,8 +11,8 @@
- 	source ~/.autojump/etc/profile.d/autojump.${shell}
- 
- # check global install
--elif [ -s /etc/profile.d/autojump.${shell} ]; then
--	source /etc/profile.d/autojump.${shell}
-+elif [ -s "${EPREFIX}"/etc/profile.d/autojump.${shell} ]; then
-+	source "${EPREFIX}"/etc/profile.d/autojump.${shell}
- 
- # check custom install locations (modified by Homebrew or using --destdir option)
- #custom#	elif [ -s destdir_install/autojump.${shell} ]; then