commit: 3822f85be834f2ecc87c7390897fd923019e3dd8
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 4 08:02:44 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 4 08:28:23 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3822f85b
dev-lang/python-exec: EAPI 7, stop using python-r1
Bump to EAPI 7. Replace cheap hack on top of python-r1 with
cheap-as-well but probably cleaner hack on top of python-utils-r1.
This should silence CI warnings.
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
...xec-9999.ebuild => python-exec-2.4.6-r1.ebuild} | 25 ++++++----------------
dev-lang/python-exec/python-exec-9999.ebuild | 17 ++++++---------
2 files changed, 13 insertions(+), 29 deletions(-)
diff --git a/dev-lang/python-exec/python-exec-9999.ebuild
b/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild
similarity index 87%
copy from dev-lang/python-exec/python-exec-9999.ebuild
copy to dev-lang/python-exec/python-exec-2.4.6-r1.ebuild
index c0f5a62b4d0..b40c64f6530 100644
--- a/dev-lang/python-exec/python-exec-9999.ebuild
+++ b/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild
@@ -1,25 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-# Kids, don't do this at home!
inherit python-utils-r1
-PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
-
-# Inherited purely to have PYTHON_TARGET flags which will satisfy USE
-# dependencies and trigger necessary rebuilds.
-inherit autotools git-r3 python-r1
DESCRIPTION="Python script wrapper"
HOMEPAGE="https://github.com/mgorny/python-exec/";
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/mgorny/python-exec.git";
+SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${P}.tar.bz2";
LICENSE="BSD-2"
SLOT="2"
-KEYWORDS=""
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris
~sparc64-solaris ~x64-solaris ~x86-solaris"
+# Internal Python project hack. Do not copy it. Ever.
+IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_}"
# eselect-python because of /usr/bin/python* collisions and new config
# python versions because of missing $scriptdir/python* symlinks
@@ -30,14 +24,9 @@ RDEPEND="
!<dev-lang/python-3.4.3-r4:3.4
!<dev-lang/python-3.5.0-r3:3.5"
-src_prepare() {
- default
- eautoreconf
-}
-
src_configure() {
local pyimpls=() i EPYTHON
- for i in "${PYTHON_COMPAT[@]}"; do
+ for i in "${_PYTHON_ALL_IMPLS[@]}"; do
python_export "${i}" EPYTHON
pyimpls+=( "${EPYTHON}" )
done
diff --git a/dev-lang/python-exec/python-exec-9999.ebuild
b/dev-lang/python-exec/python-exec-9999.ebuild
index c0f5a62b4d0..95c958dd98e 100644
--- a/dev-lang/python-exec/python-exec-9999.ebuild
+++ b/dev-lang/python-exec/python-exec-9999.ebuild
@@ -1,15 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-# Kids, don't do this at home!
-inherit python-utils-r1
-PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
-
-# Inherited purely to have PYTHON_TARGET flags which will satisfy USE
-# dependencies and trigger necessary rebuilds.
-inherit autotools git-r3 python-r1
+inherit autotools git-r3 python-utils-r1
DESCRIPTION="Python script wrapper"
HOMEPAGE="https://github.com/mgorny/python-exec/";
@@ -19,7 +13,8 @@ EGIT_REPO_URI="https://github.com/mgorny/python-exec.git";
LICENSE="BSD-2"
SLOT="2"
KEYWORDS=""
-IUSE=""
+# Internal Python project hack. Do not copy it. Ever.
+IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_}"
# eselect-python because of /usr/bin/python* collisions and new config
# python versions because of missing $scriptdir/python* symlinks
@@ -37,7 +32,7 @@ src_prepare() {
src_configure() {
local pyimpls=() i EPYTHON
- for i in "${PYTHON_COMPAT[@]}"; do
+ for i in "${_PYTHON_ALL_IMPLS[@]}"; do
python_export "${i}" EPYTHON
pyimpls+=( "${EPYTHON}" )
done
