diff options
| author |   Mathy Vanvoorden <mathy@vanvoorden.be> | 2016-10-11 20:37:09 +0200 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2016-10-12 09:36:58 +0200 |
| commit | 6828d951509f248aa3130ba16d48b72fab33e635 (patch) | |
| tree | 5af4a487b4d3ca00d75a4babb04b32a23c28d6a5 | |
| parent | dev-python/mimeparse: revision bump 1.5.2-r1 (diff) | |
| download | gentoo-6828d951509f248aa3130ba16d48b72fab33e635.tar.gz gentoo-6828d951509f248aa3130ba16d48b72fab33e635.tar.bz2 gentoo-6828d951509f248aa3130ba16d48b72fab33e635.zip | |
dev-python/mimeparse: use the actual ABI version
In src_install there was a bit of scripted logic to determine
the ABI used for link creation. This wasn't working with a
newer version of pypy3. Instead of the logic a small Python
script is implemented that should always get the correct
ABI version.
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=586008
Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2538
Signed-off-by: David Seifert <soap@gentoo.org>
| -rw-r--r-- | dev-python/mimeparse/mimeparse-1.5.2-r1.ebuild | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/dev-python/mimeparse/mimeparse-1.5.2-r1.ebuild b/dev-python/mimeparse/mimeparse-1.5.2-r1.ebuild index 0d1ed5a0049b..e4d7e74bd768 100644 --- a/dev-python/mimeparse/mimeparse-1.5.2-r1.ebuild +++ b/dev-python/mimeparse/mimeparse-1.5.2-r1.ebuild @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) +PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 ) inherit distutils-r1 @@ -28,22 +28,16 @@ RDEPEND="" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" python_test() { - "${PYTHON}" mimeparse_test.py || die "Tests fail with ${EPYTHON}" + "${EPYTHON}" mimeparse_test.py || die "Tests fail with ${EPYTHON}" } python_install() { distutils-r1_python_install - if [[ ${EPYTHON} == pypy ]]; then - local pyver=2.7 - elif [[ ${EPYTHON} == pypy3 ]]; then - local pyver=3.2 - else - local pyver=${EPYTHON#python} - fi + local pyver=$("${EPYTHON}" -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_version())") python_export PYTHON_SITEDIR # Previous versions were just called 'mimeparse' ln -sf python_mimeparse-${PV}-py${pyver}.egg-info \ - "${D%/}${PYTHON_SITEDIR}/mimeparse-${PV}-py${pyver}.egg-info" || die + "${D%/}${PYTHON_SITEDIR}/mimeparse-${PV}-py${pyver}.egg-info" || die "Could not create mimeparse link" } |