On Sat, Jul 25, 2015 at 10:12:48PM +0800, Jason Zaman wrote: > On Sat, Jul 25, 2015 at 12:37:42PM +0200, Michał Górny wrote: > > Fixes: https://bugs.gentoo.org/show_bug.cgi?id=555594 > > --- > > eclass/python-utils-r1.eclass | 7 +++++-- > > 1 file changed, 5 insertions(+), 2 deletions(-) > > > > diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass > > index c1c5ea6..69d3262 100644 > > --- a/eclass/python-utils-r1.eclass > > +++ b/eclass/python-utils-r1.eclass > > @@ -873,7 +873,10 @@ python_wrapper_setup() { > > #!/bin/sh > > exec "${PYTHON}-config" "\${@}" > > _EOF_ > > - chmod +x "${workdir}/bin/python-config" || die > > + cp "${workdir}/bin/python-config" \ > > + "${workdir}/bin/python${pyver}-config" || die > > + chmod +x "${workdir}/bin/python-config" \ > > + "${workdir}/bin/python${pyver}-config" || die > > This could alternatively be python as a symlink -> python3 which is the > wrapper, but I dont think having two wrappers vs symlink to a wrapper > makes any real difference. > > > > # Python 2.6+. > > ln -s "${PYTHON/python/2to3-}" "${workdir}"/bin/2to3 || > > die > > @@ -883,7 +886,7 @@ python_wrapper_setup() { > > "${workdir}"/pkgconfig/python.pc || die > > ln -s python.pc > > "${workdir}"/pkgconfig/python${pyver}.pc || die > > else > > - nonsupp+=( 2to3 python-config ) > > + nonsupp+=( 2to3 python-config "python${pyver}-config" ) > > This should be both 2 and 3, if its not CPython, neither should be > allowed, this bans only $pyver.
The other patch adds $pyother earlier on, so this is correct. My mistake.
