| 1 |
commit: f29a28bb1af16b582c7e8cc3311d64e850424ec3 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 28 17:26:25 2019 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 29 08:14:28 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f29a28bb |
| 7 |
|
| 8 |
app-portage/esearch: Replace python_export_best |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
app-portage/esearch/esearch-1.3-r2.ebuild | 10 ++++------ |
| 13 |
app-portage/esearch/esearch-9999.ebuild | 11 +++++------ |
| 14 |
2 files changed, 9 insertions(+), 12 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-portage/esearch/esearch-1.3-r2.ebuild b/app-portage/esearch/esearch-1.3-r2.ebuild |
| 17 |
index c7d538437df..f2e2ee6be36 100644 |
| 18 |
--- a/app-portage/esearch/esearch-1.3-r2.ebuild |
| 19 |
+++ b/app-portage/esearch/esearch-1.3-r2.ebuild |
| 20 |
@@ -29,17 +29,15 @@ PATCHES=( |
| 21 |
"${FILESDIR}"/${PV}-Fix-python-3-compatability.patch |
| 22 |
) |
| 23 |
|
| 24 |
-python_prepare_all() { |
| 25 |
- python_export_best |
| 26 |
- echo VERSION="${PVR}" "${PYTHON}" setup.py set_version |
| 27 |
- VERSION="${PVR}" "${PYTHON}" setup.py set_version \ |
| 28 |
+python_configure_all() { |
| 29 |
+ echo VERSION="${PVR}" "${EPYTHON}" setup.py set_version |
| 30 |
+ VERSION="${PVR}" "${EPYTHON}" setup.py set_version \ |
| 31 |
|| die "setup.py set_version failed" |
| 32 |
- distutils-r1_python_prepare_all |
| 33 |
} |
| 34 |
|
| 35 |
python_install_all() { |
| 36 |
distutils-r1_python_install_all |
| 37 |
- dodoc eupdatedb.cron || die "dodoc failed" |
| 38 |
+ dodoc eupdatedb.cron |
| 39 |
|
| 40 |
# Remove unused man pages according to the l10n flags |
| 41 |
if ! use l10n_fr ; then |
| 42 |
|
| 43 |
diff --git a/app-portage/esearch/esearch-9999.ebuild b/app-portage/esearch/esearch-9999.ebuild |
| 44 |
index d3487f839a8..10b62a631ed 100644 |
| 45 |
--- a/app-portage/esearch/esearch-9999.ebuild |
| 46 |
+++ b/app-portage/esearch/esearch-9999.ebuild |
| 47 |
@@ -21,16 +21,15 @@ KEYWORDS="" |
| 48 |
DEPEND="sys-apps/portage" |
| 49 |
RDEPEND="${DEPEND}" |
| 50 |
|
| 51 |
-python_prepare_all() { |
| 52 |
- python_export_best |
| 53 |
- echo VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version |
| 54 |
- VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version |
| 55 |
- distutils-r1_python_prepare_all |
| 56 |
+python_configure_all() { |
| 57 |
+ echo VERSION="${PVR}" "${EPYTHON}" setup.py set_version |
| 58 |
+ VERSION="${PVR}" "${EPYTHON}" setup.py set_version \ |
| 59 |
+ || die "setup.py set_version failed" |
| 60 |
} |
| 61 |
|
| 62 |
python_install_all() { |
| 63 |
distutils-r1_python_install_all |
| 64 |
- dodoc eupdatedb.cron || die "dodoc failed" |
| 65 |
+ dodoc eupdatedb.cron |
| 66 |
|
| 67 |
# Remove unused man pages according to the l10n flags |
| 68 |
if ! use l10n_fr ; then |
Archives