bump; support for py2.5 dropped by discretion, py[3.1-2] and pypy according to changes in this version bump ex tox.ini, patch setup.patch to exclude 'optional' plugin type adjuncts to pytest which substitutes nosetests to run tests, test phase upgraded, fixes Bug #474680

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

2 files changed, 46 insertions, 0 deletions

diff --git a/dev-python/pycountry/files/pycountry-0.15-setup.patch b/dev-python/pycountry/files/pycountry-0.15-setup.patch
new file mode 100644
index 000000000000..7817ff0d8c80
--- /dev/null
+++ b/dev-python/pycountry/files/pycountry-0.15-setup.patch
@@ -0,0 +1,13 @@
+https://bitbucket.org/techtonik/pycountry/issue/9/can-pytest-extras-be-removed-015
+diff -ur pycountry-0.15.orig/setup.py pycountry-0.15/setup.py
+--- setup.py	2013-06-22 15:04:54.000000000 +0800
++++ setup.py	2013-06-29 23:27:39.566578125 +0800
+@@ -24,7 +24,4 @@
+     include_package_data=True,
+     package_dir={'': 'src'},
+     install_requires=[
+-        'pytest',
+-        'pytest-capturelog',
+-        'pytest-codecheckers',
+-        'pytest-cov'])
++        'pytest'])
diff --git a/dev-python/pycountry/pycountry-0.15.ebuild b/dev-python/pycountry/pycountry-0.15.ebuild
new file mode 100644
index 000000000000..ad7e98ccbb3d
--- /dev/null
+++ b/dev-python/pycountry/pycountry-0.15.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycountry/pycountry-0.15.ebuild,v 1.1 2013/06/29 15:49:58 idella4 Exp $
+
+EAPI=5
+# pypy pennding actioning of bug filed upstream
+PYTHON_COMPAT=( python{2_6,2_7,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="ISO country, subdivision, language, currency and script definitions and their translations"
+HOMEPAGE="http://pypi.python.org/pypi/pycountry"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+DOCS=( HISTORY.txt TODO.txt )
+
+# https://bitbucket.org/techtonik/pycountry/issue/9/can-pytest-extras-be-removed-015
+PATCHES=( "${FILESDIR}"/${P}-setup.patch )
+
+python_test() {
+	# https://bitbucket.org/techtonik/pycountry/issue/8/test_locales-pycountry-015-pypy
+	pushd "${BUILD_DIR}"/lib > /dev/null
+	py.test ${PN}/tests/test_general.py || die
+}