app-portage/esearch: Replace python_export_best

Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/app-portage/esearch/esearch-1.3-r2.ebuild b/app-portage/esearch/esearch-1.3-r2.ebuild
index c7d538437df67eed2d22ba0bc219ce72fbd8dc64..f2e2ee6be360626a89073267ade4ef44a7f8951b 100644 (file)
--- 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 d3487f839a86dc3b044f553026d5c5ff59ffa439..10b62a631ed81cd7738239e4f3b1781e03095381 100644 (file)
--- 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