Version bump (bug 420461 by haozida), EAPI-4, USE python, tests.

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

5 files changed, 102 insertions, 69 deletions

diff --git a/app-shells/autojump/ChangeLog b/app-shells/autojump/ChangeLog
index 3460709a319e..4780fd32e7d7 100644
--- a/app-shells/autojump/ChangeLog
+++ b/app-shells/autojump/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/autojump
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/autojump/ChangeLog,v 1.2 2010/12/22 23:47:00 xmw Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/autojump/ChangeLog,v 1.3 2012/06/11 06:54:34 xmw Exp $
+
+*autojump-20.9 (11 Jun 2012)
+
+  11 Jun 2012; Michael Weber <xmw@gentoo.org> +autojump-20.9.ebuild,
+  -autojump-13.ebuild, metadata.xml:
+  Version bump (bug 420461 by haozida), EAPI-4, USE python, tests.
 
 *autojump-14 (22 Dec 2010)
 
diff --git a/app-shells/autojump/Manifest b/app-shells/autojump/Manifest
index 133e3ab00b47..b74d8ead46c1 100644
--- a/app-shells/autojump/Manifest
+++ b/app-shells/autojump/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST autojump_v13.tar.gz 22723 RMD160 cbcc847672b29f7d59fd4e5785105595eeb29e1b SHA1 c8efd7057de7550287872769821ceba5f9e7c398 SHA256 020ef781b30f8cbe4f183f2ccadac720e3f747e82924aaa4b95da01d76cc2153
+DIST autojump-20.9.tar.gz 32146 RMD160 cad4650a97c38af3dc1d8b857413473de252f248 SHA1 d96ad28d11eee6a8c8e9b4f06948f38b1f15d965 SHA256 678182dcd2854f096e3e468dfb9006ffedb2a178ae927dbc822789eb8107f5aa
 DIST autojump_v14.tar.gz 23425 RMD160 374baa11bc379d42733e281d3fae56517219468e SHA1 a80f0d81e88c0a286def5aa8365db5c2c1b39f2e SHA256 8b60351667f12ae2cd8bb7fb20f2871542d3b27e42bf0fbf9428a5f6b2ba3543
-EBUILD autojump-13.ebuild 1177 RMD160 bbb7e518cdadc5854aaece609d3232ac9c9dd5a2 SHA1 82cd5543a4c2ad8171d14132d7bb266cfb48ae88 SHA256 b2ed42a382cf24ffa34f907e757206750593e5a153dcef2136134c3be9ffb399
 EBUILD autojump-14.ebuild 1096 RMD160 2f5378fabd272350d6154c113c713d7e720d96ba SHA1 505c528a544073a8e544d62a7cf8d794acf0a2b5 SHA256 d95ce46a996d30d624f8d6b7f6db0f8ba03eda0177f563bc752796f91a3ed83b
-MISC ChangeLog 563 RMD160 3a39af7d797103864f6cf0f31fc59f51e3d3eb3f SHA1 4414a533aa584494fad45d64d578eb861f6704aa SHA256 4da059d8440bfdb1d0fad4cdae8b3502590723be950df270a20734e2a4aafb14
-MISC metadata.xml 224 RMD160 2a7e22a99ec669c5b961c3d1738a0cda58264318 SHA1 f6fd81fac4df7d7995b1600848b265fceda692f8 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7
+EBUILD autojump-20.9.ebuild 1852 RMD160 b519b62dd5cca5bb50001aef094c209a93ef7b74 SHA1 41864d484ab160a7c72962beed14ac9e1ec55a97 SHA256 e34a2d8aaa0c660dbc821398346958c319c7e1424622a0419ab2a350299916ad
+MISC ChangeLog 767 RMD160 a984fbab865aea49fd105d6f9d6b5991d645ae42 SHA1 cfe3d2af03db9e624fb5b3a0447b0f393832b09a SHA256 5f7d04561e09f84e8e6e133462503c35ce7d91f67d1380449fdf54bdbb1330dd
+MISC metadata.xml 316 RMD160 aef36d1044ce28897f3d9296f253a788a5b4df2d SHA1 ce3b55eb57e260981737af1d5d9ffd2b3ccb24d2 SHA256 fb923acdedce47cb9d3d1e05f7216eb9a109f484331c668f08445f20ad1e2a29
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59AdEACgkQfXuS5UK5QB17kQQArh8r8s+YP0mA1ipEAwEEfA4F
-7xGh+s0b7qZnGP74vSw/ljgQQ3Zb0kUgphsztBbDkdUekofWoqQnqVQ9KxuD9c3m
-8f/+0HT8PHG6ia3AdRHCaQ1F/6P3j2BwniyxPgOtbWSB6A2/YoocqzwUm0Oo/PWD
-oQeozXbiSrAv4VICXGA=
-=K0jz
+iF4EAREIAAYFAk/VlhQACgkQknrdDGLu8JBLZAD7Bwz9aZ5cuFFnlp+01JGJyWJU
+6QxkgVmr6sm2dP7p6j8A/0i1vfIviNec4JprgF4iFKh3q54qKn5SKdj6R+GKUJtT
+=E9C0
 -----END PGP SIGNATURE-----
diff --git a/app-shells/autojump/autojump-13.ebuild b/app-shells/autojump/autojump-13.ebuild
deleted file mode 100644
index cc4d46dafcbb..000000000000
--- a/app-shells/autojump/autojump-13.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/autojump/autojump-13.ebuild,v 1.1 2010/10/26 22:15:00 xmw Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-
-inherit python
-
-DESCRIPTION="change directory command that learns"
-HOMEPAGE="http://github.com/joelthelion/autojump"
-MY_P=${PN}_v${PV}
-SRC_URI="http://github.com/downloads/joelthelion/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion gtk zsh-completion"
-
-RDEPEND="gtk? ( dev-python/pygtk:2 )
-	bash-completion? ( >=app-shells/bash-4 )
-	zsh-completion? ( app-shells/zsh app-shells/zsh-completion )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-}
-
-src_install() {
-	dobin autojump || die
-
-	if use gtk ; then
-		dobin jumpapplet || die
-		insinto /usr/share/${PN}
-		doins icon.png || die
-	fi
-
-	insinto /etc/profile.d
-	doins ${PN}.sh || die
-
-	if use bash-completion ; then
-		doins ${PN}.bash || die
-	fi
-
-	if use zsh-completion ; then
-		doins ${PN}.zsh || die
-		insinto /usr/share/zsh/site-functions
-		doins _j || die
-	fi
-
-	doman ${PN}.1 || die
-	dodoc README.rst || die
-}
diff --git a/app-shells/autojump/autojump-20.9.ebuild b/app-shells/autojump/autojump-20.9.ebuild
new file mode 100644
index 000000000000..b6b7346fad5e
--- /dev/null
+++ b/app-shells/autojump/autojump-20.9.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/autojump/autojump-20.9.ebuild,v 1.1 2012/06/11 06:54:34 xmw Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="python? *"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit python
+
+DESCRIPTION="change directory command that learns"
+HOMEPAGE="http://github.com/joelthelion/autojump"
+SRC_URI="https://github.com/joelthelion/${PN}/tarball/release-v${PV/./-} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bash-completion gtk python test zsh-completion"
+
+RDEPEND="gtk? ( dev-python/pygtk:2 )
+	bash-completion? ( >=app-shells/bash-4 )
+	zsh-completion? ( app-shells/zsh app-shells/zsh-completion )"
+DEPEND="test? ( dev-lang/python )"
+
+src_unpack() {
+	default
+	mv *-${PN}-* ${P} || die
+}
+
+src_prepare() {
+	#https://github.com/joelthelion/autojump/issues/129
+	sed -e '/def test_db_load_migrate/,/autojump.CONFIG_DIR = ORIG_CONFIG_DIR/d' \
+		-i tests/runtests.py || die
+}
+
+src_test() {
+	#https://github.com/joelthelion/autojump/issues/130
+	mkdir -p "${HOME}"/.local/share/autojump || die
+
+	${PYTHON} ./tests/runtests.py
+}
+
+src_compile() { :; }
+
+src_install() {
+	dobin bin/autojump
+
+	if use gtk ; then
+		dobin bin/jumpapplet
+		insinto /usr/share/${PN}
+		doins bin/icon.png
+	fi
+
+	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
+		install_python() {
+			insinto "$(python_get_sitedir)"
+			doins tools/autojump_ipython.py
+		}
+		python_execute_function -q install_python
+
+		einfo "This tool provides \"j\" for ipython, please add"
+		einfo "\"imporrt autojump_ipython\" to your ipy_user_conf.py."
+	fi
+
+	doman docs/${PN}.1
+	dodoc README.md
+}
diff --git a/app-shells/autojump/metadata.xml b/app-shells/autojump/metadata.xml
index 59acc2cc580e..2d0c96cef6cd 100644
--- a/app-shells/autojump/metadata.xml
+++ b/app-shells/autojump/metadata.xml
@@ -2,8 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
+	<email>xmw@gentoo.org</email>
+	<name>Michael Weber</name>
 </maintainer>
+<upstream>
+	<bugs-to>https://github.com/joelthelion/autojump/issues</bugs-to>
+</upstream>
 </pkgmetadata>