[gentoo-commits] repo/gentoo:master commit in: dev-python/babelfish/

["Ian Delaney" <idella4@gentoo.org>]

commit:     b8c237439db49d7d95deed40905b0b1d56a76a50
Author:     Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Wed May 11 04:28:19 2016 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Thu May 12 11:39:36 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8c23743

dev-python/babelfish: revbump to 0.5.5-r1

Bump EAPI to 6, fix deps.
Update 9999 ebuild accordingly.

Package-Manager: portage-2.2.28

Signed-off-by: Ian Delaney <idella4 <AT> gentoo.org>

 ...elfish-9999.ebuild => babelfish-0.5.5-r1.ebuild} | 19 ++++++-------------
 dev-python/babelfish/babelfish-9999.ebuild          | 21 +++++++--------------
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/dev-python/babelfish/babelfish-9999.ebuild b/dev-python/babelfish/babelfish-0.5.5-r1.ebuild
similarity index 59%
copy from dev-python/babelfish/babelfish-9999.ebuild
copy to dev-python/babelfish/babelfish-0.5.5-r1.ebuild
index cbf34c9..9425901 100644
--- a/dev-python/babelfish/babelfish-9999.ebuild
+++ b/dev-python/babelfish/babelfish-0.5.5-r1.ebuild
@@ -2,30 +2,23 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+EAPI=6
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/Diaoul/babelfish.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
 
 inherit distutils-r1
 
 DESCRIPTION="Python library to work with countries and languages"
 HOMEPAGE="https://github.com/Diaoul/babelfish https://pypi.python.org/pypi/babelfish"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
 
 python_test() {
 	esetup.py test

diff --git a/dev-python/babelfish/babelfish-9999.ebuild b/dev-python/babelfish/babelfish-9999.ebuild
index cbf34c9..e754bb9 100644
--- a/dev-python/babelfish/babelfish-9999.ebuild
+++ b/dev-python/babelfish/babelfish-9999.ebuild
@@ -2,30 +2,23 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+EAPI=6
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/Diaoul/babelfish.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
 
-inherit distutils-r1
+inherit distutils-r1 git-r3
 
 DESCRIPTION="Python library to work with countries and languages"
 HOMEPAGE="https://github.com/Diaoul/babelfish https://pypi.python.org/pypi/babelfish"
+EGIT_REPO_URI="git://github.com/Diaoul/${PN}.git"
 
 LICENSE="BSD"
 SLOT="0"
+KEYWORDS=""
 IUSE=""
 
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
 
 python_test() {
 	esetup.py test