From: Mathy Vanvoorden Date: Tue, 11 Oct 2016 18:48:52 +0000 (+0200) Subject: dev-python/mimeparse: use the actual ABI version X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d2c7db0327fe04e7691904995de924265493c165;p=gentoo.git 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 --- diff --git a/dev-python/mimeparse/mimeparse-0.1.4-r2.ebuild b/dev-python/mimeparse/mimeparse-0.1.4-r2.ebuild index bdd49163c848..e4d7e74bd768 100644 --- a/dev-python/mimeparse/mimeparse-0.1.4-r2.ebuild +++ b/dev-python/mimeparse/mimeparse-0.1.4-r2.ebuild @@ -2,18 +2,19 @@ # 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 +MY_PN="python-${PN}" +MY_P="${MY_PN}-${PV}" + DESCRIPTION="Basic functions for handling mime-types in python" HOMEPAGE=" https://code.google.com/p/mimeparse https://github.com/dbtsai/python-mimeparse" -MY_PN="python-${PN}" -MY_P="${MY_PN}-${PV}" SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="MIT" @@ -23,23 +24,20 @@ IUSE="" S="${WORKDIR}/${MY_P}" +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' - cp "${D%/}${PYTHON_SITEDIR}/python_mimeparse-${PV}-py${pyver}.egg-info" \ - "${D%/}${PYTHON_SITEDIR}/mimeparse-${PV}-py${pyver}.egg-info" || die + ln -sf python_mimeparse-${PV}-py${pyver}.egg-info \ + "${D%/}${PYTHON_SITEDIR}/mimeparse-${PV}-py${pyver}.egg-info" || die "Could not create mimeparse link" }