Merge updates from master

14 files changed, 69 insertions, 52 deletions

diff --git a/app-portage/esearch/esearch-1.3-r2.ebuild b/app-portage/esearch/esearch-1.3-r2.ebuild
index c7d538437df6..f2e2ee6be360 100644
--- a/app-portage/esearch/esearch-1.3-r2.ebuild
+++ b/app-portage/esearch/esearch-1.3-r2.ebuild
@@ -29,17 +29,15 @@ PATCHES=(
 	"${FILESDIR}"/${PV}-Fix-python-3-compatability.patch
 )
 
-python_prepare_all() {
-	python_export_best
-	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version \
+python_configure_all() {
+	echo VERSION="${PVR}" "${EPYTHON}" setup.py set_version
+	VERSION="${PVR}" "${EPYTHON}" setup.py set_version \
 		|| die "setup.py set_version failed"
-	distutils-r1_python_prepare_all
 }
 
 python_install_all() {
 	distutils-r1_python_install_all
-	dodoc eupdatedb.cron || die "dodoc failed"
+	dodoc eupdatedb.cron
 
 	# Remove unused man pages according to the l10n flags
 	if ! use l10n_fr ; then
diff --git a/app-portage/esearch/esearch-9999.ebuild b/app-portage/esearch/esearch-9999.ebuild
index d3487f839a86..10b62a631ed8 100644
--- a/app-portage/esearch/esearch-9999.ebuild
+++ b/app-portage/esearch/esearch-9999.ebuild
@@ -21,16 +21,15 @@ KEYWORDS=""
 DEPEND="sys-apps/portage"
 RDEPEND="${DEPEND}"
 
-python_prepare_all() {
-	python_export_best
-	echo VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
-	VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
-	distutils-r1_python_prepare_all
+python_configure_all() {
+	echo VERSION="${PVR}" "${EPYTHON}" setup.py set_version
+	VERSION="${PVR}" "${EPYTHON}" setup.py set_version \
+		|| die "setup.py set_version failed"
 }
 
 python_install_all() {
 	distutils-r1_python_install_all
-	dodoc eupdatedb.cron || die "dodoc failed"
+	dodoc eupdatedb.cron
 
 	# Remove unused man pages according to the l10n flags
 	if ! use l10n_fr ; then
diff --git a/dev-lang/yasm/yasm-1.2.0-r1.ebuild b/dev-lang/yasm/yasm-1.2.0-r1.ebuild
index be32d57759d7..9cd5c98942fb 100644
--- a/dev-lang/yasm/yasm-1.2.0-r1.ebuild
+++ b/dev-lang/yasm/yasm-1.2.0-r1.ebuild
@@ -37,7 +37,7 @@ src_prepare() {
 }
 
 src_configure() {
-	use python && python_export_best
+	use python && python_setup
 
 	econf \
 		$(use_enable python) \
diff --git a/dev-lang/yasm/yasm-1.3.0.ebuild b/dev-lang/yasm/yasm-1.3.0.ebuild
index cee1a7f6f93e..e1ef59791ee0 100644
--- a/dev-lang/yasm/yasm-1.3.0.ebuild
+++ b/dev-lang/yasm/yasm-1.3.0.ebuild
@@ -26,7 +26,7 @@ DEPEND="
 	python? ( >=dev-python/cython-0.14[${PYTHON_USEDEP}] )"
 
 src_configure() {
-	use python && python_export_best
+	use python && python_setup
 
 	XMLTO=: \
 	econf \
diff --git a/dev-lang/yasm/yasm-9999.ebuild b/dev-lang/yasm/yasm-9999.ebuild
index c667fd21f2b2..1dc81bc993d4 100644
--- a/dev-lang/yasm/yasm-9999.ebuild
+++ b/dev-lang/yasm/yasm-9999.ebuild
@@ -50,9 +50,9 @@ src_prepare() {
 
 src_configure() {
 	if [[ ${PV} == 9999* ]]; then
-		python_export_best
+		python_setup
 	else
-		use python && python_export_best
+		use python && python_setup
 	fi
 
 	econf \
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 7665edbd87e3..335ae9fe6370 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -763,36 +763,6 @@ python_setup() {
 	python_wrapper_setup
 }
 
-# @FUNCTION: python_export_best
-# @USAGE: [<variable>...]
-# @DESCRIPTION:
-# Find the best (most preferred) Python implementation enabled
-# and export given variables for it. If no variables are provided,
-# EPYTHON & PYTHON will be exported.
-python_export_best() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
-
-	eqawarn "python_export_best() is deprecated. Please use python_setup instead,"
-	eqawarn "combined with python_export if necessary."
-
-	[[ ${#} -gt 0 ]] || set -- EPYTHON PYTHON
-
-	local best MULTIBUILD_VARIANTS
-	_python_obtain_impls
-
-	_python_set_best() {
-		best=${MULTIBUILD_VARIANT}
-	}
-	multibuild_for_best_variant _python_set_best
-	unset -f _python_set_best
-
-	debug-print "${FUNCNAME}: Best implementation is: ${best}"
-	python_export "${best}" "${@}"
-	python_wrapper_setup
-}
-
 # @FUNCTION: python_replicate_script
 # @USAGE: <path>...
 # @DESCRIPTION:
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild
index 595d61ff0bd0..f48d6fa875ab 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild
@@ -55,7 +55,7 @@ src_prepare() {
 }
 
 src_configure() {
-	python_export_best
+	python_setup
 	gnome2_src_configure \
 		--with-gnome-distributor=Gentoo \
 		--disable-scrollkeeper \
diff --git a/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild
index 1419c0468b89..ba29db204a63 100644
--- a/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild
+++ b/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild
@@ -42,7 +42,7 @@ pkg_setup () {
 		plugin to the group 'dropbox'. You need to setup a drobox account
 		before using this plugin. Visit ${HOMEPAGE} for more information."
 
-	python_export_best
+	python_setup
 }
 
 src_prepare() {
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 2b03a3d83eb3..adaee579012b 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Michał Górny <mgorny@gentoo.org> (2019-11-29)
+# Requires dev-python/astropy that's being removed.
+sci-visualization/veusz fits
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-11-28)
 # sci-visualization/visit is on the way out, bug #657952
 sci-libs/libgeodecomp visit
diff --git a/profiles/package.mask b/profiles/package.mask
index 2a3bb3e7f2c2..cbf3a82c1832 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,52 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2019-11-29)
+# Astronomy-related Python packages and their revdeps.  They are
+# unmaintained.  Most of them are outdated.  None of them were tested
+# on Python 3.7, some even on 3.6.  The leaf packages are 2.7-only.
+# All of them depend on astropy which has an unconditional dependency
+# on ipython, which in turn dropped py2 support.
+# Bug #701454.  Removal in 30 days.
+dev-python/aplpy
+dev-python/asdf
+dev-python/astlib
+dev-python/astrodendro
+dev-python/astroml-addons
+dev-python/astroml
+dev-python/astroplan
+dev-python/astropy-helpers
+dev-python/astropy
+dev-python/astroquery
+dev-python/astroscrappy
+dev-python/atpy
+dev-python/ccdproc
+dev-python/gammapy
+dev-python/ginga
+dev-python/glue-vispy-viewers
+dev-python/glueviz
+dev-python/gwcs
+dev-python/healpy
+dev-python/imexam
+dev-python/montage-wrapper
+dev-python/naima
+dev-python/photutils
+dev-python/pyavm
+dev-python/pydl
+dev-python/pyfits
+dev-python/pymoc
+dev-python/pyregion
+dev-python/regions
+dev-python/reproject
+dev-python/spectral-cube
+dev-python/specutils
+dev-python/stsci-distutils
+dev-python/stsci-sphinxext
+dev-python/sunpy
+dev-python/wcsaxes
+sci-astronomy/astrometry
+sci-astronomy/kapteyn
+
 # David Seifert <soap@gentoo.org> (2019-11-28)
 # No revdeps, blocking move to python 3.7, unnecessary maintenance
 # burden, bug #701426. Removal in 30 days.
diff --git a/sci-chemistry/apbs/apbs-1.4.1-r2.ebuild b/sci-chemistry/apbs/apbs-1.4.1-r2.ebuild
index b3c4f192894b..88910ddde996 100644
--- a/sci-chemistry/apbs/apbs-1.4.1-r2.ebuild
+++ b/sci-chemistry/apbs/apbs-1.4.1-r2.ebuild
@@ -106,7 +106,7 @@ src_compile(){
 }
 
 src_test() {
-	python_export_best
+	python_setup
 	cd tests || die
 	LD_LIBRARY_PATH="${S}"/lib "${PYTHON}" apbs_tester.py -l log || die
 	grep -q 'FAILED' log && die "Tests failed"
diff --git a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
index 8999e495cd4d..bf7ad7318874 100644
--- a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
@@ -89,7 +89,7 @@ src_prepare() {
 }
 
 python_prepare_all() {
-	python_export_best
+	python_setup
 	# Extract python info out of SConstruct so we can use saner distribute
 	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
 	local pybins=$(pyvar python_progs | tail -1)
diff --git a/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild
index 78e26cfd7985..cd0378d90c4d 100644
--- a/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild
@@ -91,7 +91,7 @@ src_prepare() {
 }
 
 python_prepare_all() {
-	python_export_best
+	python_setup
 	# Extract python info out of SConstruct so we can use saner distribute
 	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
 	local pybins=$(pyvar python_progs | tail -1)
diff --git a/x11-wm/openbox/openbox-3.6.1.ebuild b/x11-wm/openbox/openbox-3.6.1.ebuild
index 4fee4c0952ca..35d268b94df5 100644
--- a/x11-wm/openbox/openbox-3.6.1.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1.ebuild
@@ -50,7 +50,7 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
 src_prepare() {
-	use xdg && python_export_best
+	use xdg && python_setup
 	epatch "${FILESDIR}"/${PN}-3.5.2-gnome-session.patch
 	sed -i \
 		-e "s:-O0 -ggdb ::" \