From a71cd47ebab295e3cf66b83e89b615f42befc1ab Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Wed, 23 Dec 2020 11:09:59 +0100 Subject: Revert "app-arch/tar: add patch for macOS Big Sur 11.1" This reverts commit fa9750b4c24e402475d4edaa1b2ef34f17d945c3. It appears I was mistaken, and we don't need this patch in the tree, for within Prefix itself, this issue doesn't occur. See comment #5 Bug: https://bugs.gentoo.org/761322 Signed-off-by: Fabian Groffen --- ...tar-1.32-check-sys-ioctl-header-configure.patch | 53 ---------------------- app-arch/tar/tar-1.32.90.ebuild | 4 -- app-arch/tar/tar-1.32.ebuild | 3 -- 3 files changed, 60 deletions(-) delete mode 100644 app-arch/tar/files/tar-1.32-check-sys-ioctl-header-configure.patch diff --git a/app-arch/tar/files/tar-1.32-check-sys-ioctl-header-configure.patch b/app-arch/tar/files/tar-1.32-check-sys-ioctl-header-configure.patch deleted file mode 100644 index c8aee2fcce89..000000000000 --- a/app-arch/tar/files/tar-1.32-check-sys-ioctl-header-configure.patch +++ /dev/null @@ -1,53 +0,0 @@ -[buildsys] macOS Big Sur 11.1 doesn't have sys/ioctl.h - -Author: Alexei Colin -Bug: https://bugs.gentoo.org/761322 -Bug: https://savannah.gnu.org/bugs/index.php?59755 - ---- a/configure 2020-12-23 00:49:19.000000000 -0500 -+++ b/configure 2020-12-23 00:49:52.000000000 -0500 -@@ -3422,6 +3422,7 @@ - as_fn_append ac_header_list " sys/device.h" - as_fn_append ac_header_list " sys/gentape.h" - as_fn_append ac_header_list " sys/inet.h" -+as_fn_append ac_header_list " sys/ioctl.h" - as_fn_append ac_header_list " sys/io/trioctl.h" - as_fn_append ac_header_list " sys/mtio.h" - as_fn_append ac_header_list " sys/time.h" ---- a/config.h.in 2019-02-23 07:56:20.000000000 -0500 -+++ b/config.h.in 2020-12-23 01:04:49.000000000 -0500 -@@ -1480,6 +1480,9 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_SYS_INTTYPES_H - -+/* Define to 1 if you have the header file. */ -+#undef HAVE_SYS_IOCTL_H -+ - /* Define to 1 if you have the header file. */ - #undef HAVE_SYS_IO_TRIOCTL_H - ---- a/lib/system-ioctl.h 2020-12-22 20:57:00.000000000 -0500 -+++ b/lib/system-ioctl.h 2020-12-22 20:57:35.000000000 -0500 -@@ -41,8 +41,10 @@ - # endif - # include - # else --# if HAVE_SYS_MTIO_H -+# if HAVE_SYS_IOCTL_H - # include -+# endif -+# if HAVE_SYS_MTIO_H - # if HAVE_SGTTY_H - # include - # endif ---- a/src/checkpoint.c 2020-12-22 20:56:48.000000000 -0500 -+++ b/src/checkpoint.c 2020-12-22 20:58:29.000000000 -0500 -@@ -20,7 +20,7 @@ - #include - #include "common.h" - #include "wordsplit.h" --#include -+#include - #include - #include "fprintftime.h" - #include diff --git a/app-arch/tar/tar-1.32.90.ebuild b/app-arch/tar/tar-1.32.90.ebuild index 43686c3c26d9..87f3d927f1c8 100644 --- a/app-arch/tar/tar-1.32.90.ebuild +++ b/app-arch/tar/tar-1.32.90.ebuild @@ -25,10 +25,6 @@ DEPEND="${RDEPEND} xattr? ( elibc_glibc? ( sys-apps/attr ) )" BDEPEND="nls? ( sys-devel/gettext )" -PATCHES=( - "${FILESDIR}"/${PN}-1.32-check-sys-ioctl-header-configure.patch -) - src_prepare() { default diff --git a/app-arch/tar/tar-1.32.ebuild b/app-arch/tar/tar-1.32.ebuild index d1fd78649195..81267f7aa858 100644 --- a/app-arch/tar/tar-1.32.ebuild +++ b/app-arch/tar/tar-1.32.ebuild @@ -33,9 +33,6 @@ src_prepare() { scripts/{backup,dump-remind,restore}.in \ || die "sed non-GNU" fi - - [[ ${CHOST} == *darwin20* ]] && \ - eapply "${FILESDIR}"/${PN}-1.32-check-sys-ioctl-header-configure.patch } src_configure() { -- cgit v1.2.3-65-gdbad From eb3688599050367fc39d0d46f2bc1e5e369568c9 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Wed, 23 Dec 2020 11:05:42 +0100 Subject: xfce-extra/xfdashboard: Bump to 0.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- xfce-extra/xfdashboard/Manifest | 1 + xfce-extra/xfdashboard/xfdashboard-0.8.0.ebuild | 45 +++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 xfce-extra/xfdashboard/xfdashboard-0.8.0.ebuild diff --git a/xfce-extra/xfdashboard/Manifest b/xfce-extra/xfdashboard/Manifest index cd11d7e5ace7..0b5ef85509a4 100644 --- a/xfce-extra/xfdashboard/Manifest +++ b/xfce-extra/xfdashboard/Manifest @@ -1,2 +1,3 @@ DIST xfdashboard-0.7.5.tar.bz2 3366413 BLAKE2B 4fb9c9bd298f5e9b0f3052e1f3d488386446d37e9130e750ee09756da856d232fdc4c18fc21e9883c3df46e7cba636c82f32942b17473a5710e30006baf6a54f SHA512 5d32aa3a49e02d85ca92bee6aa37a3b743e50ca5d992128decea5846e8c9008a9f5bdb98cc0ee3e980761a6538a4867ff28410e066ef22f0aa2c2bd4c5ce1523 DIST xfdashboard-0.7.90.tar.bz2 3394745 BLAKE2B 5550851a7a60802f079fb19ba32064cb43e09b0d36956ee87fbca3878ff6df20624e2c4262f9fcf81071a42aeb937f97954f0724faed70ffd0592472fa36cfc1 SHA512 8aea6127ffae2a7f0a241be04b2c518070688b56621f629798c9b8becd749577f2902e342ba0a99e14e3f38d0cb00f4887d04d2a418e619d97e413c2517faa9f +DIST xfdashboard-0.8.0.tar.bz2 3341109 BLAKE2B 8787bd5069d8c4781c1b728e051e344dab227c847faf0762595079556a206b61ba4e6e45cc967f0f7267b41125bee62ff5fdf05cbbc7b3663fa785ad1fdddc16 SHA512 3bbddf079f129c8f32b764f61c75cc4efac52dff752375bdafd5537ad9c9435a5b12ead51176a684fca8fdc24f5bf44d774d8d3d6eae6942b266e1d0e4e89d62 diff --git a/xfce-extra/xfdashboard/xfdashboard-0.8.0.ebuild b/xfce-extra/xfdashboard/xfdashboard-0.8.0.ebuild new file mode 100644 index 000000000000..994d8b9135bb --- /dev/null +++ b/xfce-extra/xfdashboard/xfdashboard-0.8.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit xdg-utils + +DESCRIPTION="Maybe a GNOME shell like dashboard for the Xfce desktop environment" +HOMEPAGE="https://goodies.xfce.org/projects/applications/xfdashboard/start" +SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=dev-libs/glib-2.38:2 + >=x11-libs/gtk+-3.2:3 + >=media-libs/clutter-1.12:1.0=[gtk] + >=x11-libs/libwnck-3:3= + x11-libs/libX11:= + x11-libs/libXcomposite:= + x11-libs/libXdamage:= + x11-libs/libXinerama:= + >=xfce-base/garcon-0.2.0:= + >=xfce-base/libxfce4ui-4.10:= + >=xfce-base/libxfce4util-4.10:= + >=xfce-base/xfconf-4.13:=" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/intltool + virtual/pkgconfig" + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} -- cgit v1.2.3-65-gdbad From 21701c805ea2d0d140ad77495ffd26cbcbe2e97c Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Wed, 23 Dec 2020 11:07:10 +0100 Subject: profiles/updates: Remove obsolete pyfltk move MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- profiles/updates/4Q-2015 | 1 - 1 file changed, 1 deletion(-) diff --git a/profiles/updates/4Q-2015 b/profiles/updates/4Q-2015 index 0640fe75b8f7..dea11a7d7777 100644 --- a/profiles/updates/4Q-2015 +++ b/profiles/updates/4Q-2015 @@ -3,7 +3,6 @@ move sys-apps/cv sys-apps/progress slotmove =dev-ruby/recog-2.0.6 2 2.0.6 slotmove =dev-ruby/recog-2.0.12 2 2.0.12 slotmove =dev-ruby/recog-2.0.14 2 2.0.14 -slotmove =dev-python/pyfltk-1.3.3 1 0 move kde-apps/oxygen-icons kde-frameworks/oxygen-icons slotmove =dev-ruby/rack-cache-1.3.0 1.3 1.2 move dev-perl/module-info dev-perl/Module-Info -- cgit v1.2.3-65-gdbad From e57711012dfd82be7dcb8d10836197fb2b0cff06 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 17 Dec 2020 21:58:41 +0100 Subject: python-any-r1.eclass: Update PYTHON_USEDEP to match python-r1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- eclass/python-any-r1.eclass | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass index c634e19813e0..9fd7fd6bc27d 100644 --- a/eclass/python-any-r1.eclass +++ b/eclass/python-any-r1.eclass @@ -131,20 +131,19 @@ EXPORT_FUNCTIONS pkg_setup # An eclass-generated USE-dependency string for the currently tested # implementation. It is set locally for python_check_deps() call. # -# The generate USE-flag list is compatible with packages using python-r1, -# python-single-r1 and python-distutils-ng eclasses. It must not be used -# on packages using python.eclass. +# The generate USE-flag list is compatible with packages using python-r1 +# eclass. It must not be used on packages using other eclasses. # # Example use: # @CODE # python_check_deps() { -# has_version "dev-python/foo[${PYTHON_USEDEP}]" +# has_version "dev-python/foo[${PYTHON_USEDEP}]" # } # @CODE # # Example value: # @CODE -# python_targets_python2_7(-)?,python_single_target_python2_7(+)? +# python_targets_python3_7(-),-python_single_target_python3_7(-) # @CODE _python_any_set_globals() { @@ -213,16 +212,16 @@ if [[ ! ${_PYTHON_ANY_R1} ]]; then # @CODE # || ( # ( -# dev-lang/python:2.7 -# dev-python/foo[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] -# || ( dev-python/bar[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] -# dev-python/baz[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) +# dev-lang/python:3.7 +# dev-python/foo[python_targets_python3_7(-),-python_single_target_python3_7(-)] +# || ( dev-python/bar[python_targets_python3_7(-),-python_single_target_python3_7(-)] +# dev-python/baz[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) # ) # ( -# dev-lang/python:3.3 -# dev-python/foo[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] -# || ( dev-python/bar[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] -# dev-python/baz[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] ) +# dev-lang/python:3.8 +# dev-python/foo[python_targets_python3_8(-),-python_single_target_python3_8(-)] +# || ( dev-python/bar[python_targets_python3_8(-),-python_single_target_python3_8(-)] +# dev-python/baz[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) # ) # ) # @CODE @@ -234,7 +233,7 @@ python_gen_any_dep() { local i PYTHON_PKG_DEP out= for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do - local PYTHON_USEDEP="python_targets_${i}(-),python_single_target_${i}(+)" + local PYTHON_USEDEP="python_targets_${i}(-),-python_single_target_${i}(-)" _python_export "${i}" PYTHON_PKG_DEP local i_depstr=${depstr//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}} @@ -268,7 +267,7 @@ _python_EPYTHON_supported() { if has "${i}" "${_PYTHON_SUPPORTED_IMPLS[@]}"; then if python_is_installed "${i}"; then if declare -f python_check_deps >/dev/null; then - local PYTHON_USEDEP="python_targets_${i}(-),python_single_target_${i}(+)" + local PYTHON_USEDEP="python_targets_${i}(-),-python_single_target_${i}(-)" python_check_deps return ${?} fi -- cgit v1.2.3-65-gdbad From c198649a978db824629c09c1017610adaebfec1d Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 17 Dec 2020 22:03:39 +0100 Subject: python-r1.eclass: Update PYTHON_USEDEP in python_gen_any_dep() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- eclass/python-r1.eclass | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass index 40944684ec8b..e7a660219c17 100644 --- a/eclass/python-r1.eclass +++ b/eclass/python-r1.eclass @@ -547,16 +547,16 @@ python_gen_impl_dep() { # @CODE # || ( # ( -# dev-lang/python:2.7 -# dev-python/foo[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] -# || ( dev-python/bar[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] -# dev-python/baz[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) +# dev-lang/python:3.7 +# dev-python/foo[python_targets_python3_7(-),-python_single_target_python3_7(-)] +# || ( dev-python/bar[python_targets_python3_7(-),-python_single_target_python3_7(-)] +# dev-python/baz[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) # ) # ( -# dev-lang/python:3.3 -# dev-python/foo[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] -# || ( dev-python/bar[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] -# dev-python/baz[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] ) +# dev-lang/python:3.8 +# dev-python/foo[python_targets_python3_8(-),-python_single_target_python3_8(-)] +# || ( dev-python/bar[python_targets_python3_8(-),-python_single_target_python3_8(-)] +# dev-python/baz[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) # ) # ) # @CODE @@ -571,7 +571,7 @@ python_gen_any_dep() { _python_verify_patterns "${@}" for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do if _python_impl_matches "${i}" "${@}"; then - local PYTHON_USEDEP="python_targets_${i}(-),python_single_target_${i}(+)" + local PYTHON_USEDEP="python_targets_${i}(-),-python_single_target_${i}(-)" _python_export "${i}" PYTHON_PKG_DEP local i_depstr=${depstr//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}} @@ -779,7 +779,7 @@ python_setup() { # first check if the interpreter is installed python_is_installed "${impl}" || continue # then run python_check_deps - local PYTHON_USEDEP="python_targets_${impl}(-),python_single_target_${impl}(+)" + local PYTHON_USEDEP="python_targets_${impl}(-),-python_single_target_${impl}(-)" python_check_deps || continue fi -- cgit v1.2.3-65-gdbad From af76aa5899fa0c9acbefe94891449321f02f70cd Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 17 Dec 2020 22:15:56 +0100 Subject: python-any-r1.eclass: Support PYTHON_SINGLE_USEDEP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/713894 Signed-off-by: Michał Górny --- eclass/python-any-r1.eclass | 48 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass index 9fd7fd6bc27d..5f2dc5b8f384 100644 --- a/eclass/python-any-r1.eclass +++ b/eclass/python-any-r1.eclass @@ -24,9 +24,10 @@ # be called by the eclass with EPYTHON set to each matching Python # implementation and it is expected to check whether the implementation # fulfills the package requirements. You can use the locally exported -# PYTHON_USEDEP to check USE-dependencies of relevant packages. It -# should return a true value (0) if the Python implementation fulfills -# the requirements, a false value (non-zero) otherwise. +# PYTHON_USEDEP or PYTHON_SINGLE_USEDEP to check USE-dependencies +# of relevant packages. It should return a true value (0) if the Python +# implementation fulfills the requirements, a false value (non-zero) +# otherwise. # # Please note that python-any-r1 will always inherit python-utils-r1 # as well. Thus, all the functions defined there can be used in the @@ -131,8 +132,9 @@ EXPORT_FUNCTIONS pkg_setup # An eclass-generated USE-dependency string for the currently tested # implementation. It is set locally for python_check_deps() call. # -# The generate USE-flag list is compatible with packages using python-r1 -# eclass. It must not be used on packages using other eclasses. +# The generated USE-flag list is compatible with packages using +# python-r1 eclass. For python-single-r1 dependencies, +# use PYTHON_SINGLE_USEDEP. # # Example use: # @CODE @@ -146,6 +148,28 @@ EXPORT_FUNCTIONS pkg_setup # python_targets_python3_7(-),-python_single_target_python3_7(-) # @CODE +# @ECLASS-VARIABLE: PYTHON_SINGLE_USEDEP +# @OUTPUT_VARIABLE +# @DESCRIPTION: +# An eclass-generated USE-dependency string for the currently tested +# implementation. It is set locally for python_check_deps() call. +# +# The generated USE-flag list is compatible with packages using +# python-single-r1 eclass. For python-r1 dependencies, +# use PYTHON_USEDEP. +# +# Example use: +# @CODE +# python_check_deps() { +# has_version "dev-python/bar[${PYTHON_SINGLE_USEDEP}]" +# } +# @CODE +# +# Example value: +# @CODE +# python_single_target_python3_7(-) +# @CODE + _python_any_set_globals() { local usestr deps i PYTHON_PKG_DEP [[ ${PYTHON_REQ_USE} ]] && usestr="[${PYTHON_REQ_USE}]" @@ -189,7 +213,8 @@ if [[ ! ${_PYTHON_ANY_R1} ]]; then # Generate an any-of dependency that enforces a version match between # the Python interpreter and Python packages. needs # to list one or more dependencies with verbatim '${PYTHON_USEDEP}' -# references (quoted!) that will get expanded inside the function. +# or '${PYTHON_SINGLE_USEDEP}' references (quoted!) that will get +# expanded inside the function. # # This should be used along with an appropriate python_check_deps() # that checks which of the any-of blocks were matched. @@ -197,12 +222,12 @@ if [[ ! ${_PYTHON_ANY_R1} ]]; then # Example use: # @CODE # DEPEND="$(python_gen_any_dep ' -# dev-python/foo[${PYTHON_USEDEP}] +# dev-python/foo[${PYTHON_SINGLE_USEDEP}] # || ( dev-python/bar[${PYTHON_USEDEP}] # dev-python/baz[${PYTHON_USEDEP}] )')" # # python_check_deps() { -# has_version "dev-python/foo[${PYTHON_USEDEP}]" \ +# has_version "dev-python/foo[${PYTHON_SINGLE_USEDEP}]" \ # && { has_version "dev-python/bar[${PYTHON_USEDEP}]" \ # || has_version "dev-python/baz[${PYTHON_USEDEP}]"; } # } @@ -213,13 +238,13 @@ if [[ ! ${_PYTHON_ANY_R1} ]]; then # || ( # ( # dev-lang/python:3.7 -# dev-python/foo[python_targets_python3_7(-),-python_single_target_python3_7(-)] +# dev-python/foo[python_single_target_python3_7(-)] # || ( dev-python/bar[python_targets_python3_7(-),-python_single_target_python3_7(-)] # dev-python/baz[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) # ) # ( # dev-lang/python:3.8 -# dev-python/foo[python_targets_python3_8(-),-python_single_target_python3_8(-)] +# dev-python/foo[python_single_target_python3_8(-)] # || ( dev-python/bar[python_targets_python3_8(-),-python_single_target_python3_8(-)] # dev-python/baz[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) # ) @@ -234,9 +259,11 @@ python_gen_any_dep() { local i PYTHON_PKG_DEP out= for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do local PYTHON_USEDEP="python_targets_${i}(-),-python_single_target_${i}(-)" + local PYTHON_SINGLE_USEDEP="python_single_target_${i}(-)" _python_export "${i}" PYTHON_PKG_DEP local i_depstr=${depstr//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}} + i_depstr=${i_depstr//\$\{PYTHON_SINGLE_USEDEP\}/${PYTHON_SINGLE_USEDEP}} # note: need to strip '=' slot operator for || deps out="( ${PYTHON_PKG_DEP%=} ${i_depstr} ) ${out}" done @@ -268,6 +295,7 @@ _python_EPYTHON_supported() { if python_is_installed "${i}"; then if declare -f python_check_deps >/dev/null; then local PYTHON_USEDEP="python_targets_${i}(-),-python_single_target_${i}(-)" + local PYTHON_SINGLE_USEDEP="python_single_target_${i}(-)" python_check_deps return ${?} fi -- cgit v1.2.3-65-gdbad From 8c07d5519bac319ef715fecbdc63c270f612330a Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 17 Dec 2020 22:19:45 +0100 Subject: python-r1.eclass: Support PYTHON_SINGLE_USEDEP in any-dep API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- eclass/python-r1.eclass | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass index e7a660219c17..5cae020c6d90 100644 --- a/eclass/python-r1.eclass +++ b/eclass/python-r1.eclass @@ -152,6 +152,28 @@ fi # python_targets_python2_7(-)?,python_targets_python3_4(-)? # @CODE +# @ECLASS-VARIABLE: PYTHON_SINGLE_USEDEP +# @OUTPUT_VARIABLE +# @DESCRIPTION: +# An eclass-generated USE-dependency string for the currently tested +# implementation. It is set locally for python_check_deps() call. +# +# The generated USE-flag list is compatible with packages using +# python-single-r1 eclass. For python-r1 dependencies, +# use PYTHON_USEDEP. +# +# Example use: +# @CODE +# python_check_deps() { +# has_version "dev-python/bar[${PYTHON_SINGLE_USEDEP}]" +# } +# @CODE +# +# Example value: +# @CODE +# python_single_target_python3_7(-) +# @CODE + # @ECLASS-VARIABLE: PYTHON_REQUIRED_USE # @OUTPUT_VARIABLE # @DESCRIPTION: @@ -507,9 +529,10 @@ python_gen_impl_dep() { # Generate an any-of dependency that enforces a version match between # the Python interpreter and Python packages. needs # to list one or more dependencies with verbatim '${PYTHON_USEDEP}' -# references (quoted!) that will get expanded inside the function. -# Optionally, patterns may be specified to restrict the dependency -# to a subset of Python implementations supported by the ebuild. +# or '${PYTHON_SINGLE_USEDEP}' references (quoted!) that will get +# expanded inside the function. Optionally, patterns may be specified +# to restrict the dependency to a subset of Python implementations +# supported by the ebuild. # # The patterns can be either fnmatch-style patterns (matched via bash # == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate @@ -524,12 +547,12 @@ python_gen_impl_dep() { # Example use: # @CODE # DEPEND="$(python_gen_any_dep ' -# dev-python/foo[${PYTHON_USEDEP}] +# dev-python/foo[${PYTHON_SINGLE_USEDEP}] # || ( dev-python/bar[${PYTHON_USEDEP}] # dev-python/baz[${PYTHON_USEDEP}] )' -2)" # # python_check_deps() { -# has_version "dev-python/foo[${PYTHON_USEDEP}]" \ +# has_version "dev-python/foo[${PYTHON_SINGLE_USEDEP}]" \ # && { has_version "dev-python/bar[${PYTHON_USEDEP}]" \ # || has_version "dev-python/baz[${PYTHON_USEDEP}]"; } # } @@ -548,13 +571,13 @@ python_gen_impl_dep() { # || ( # ( # dev-lang/python:3.7 -# dev-python/foo[python_targets_python3_7(-),-python_single_target_python3_7(-)] +# dev-python/foo[python_single_target_python3_7(-)] # || ( dev-python/bar[python_targets_python3_7(-),-python_single_target_python3_7(-)] # dev-python/baz[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) # ) # ( # dev-lang/python:3.8 -# dev-python/foo[python_targets_python3_8(-),-python_single_target_python3_8(-)] +# dev-python/foo[python_single_target_python3_8(-)] # || ( dev-python/bar[python_targets_python3_8(-),-python_single_target_python3_8(-)] # dev-python/baz[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) # ) @@ -572,9 +595,11 @@ python_gen_any_dep() { for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do if _python_impl_matches "${i}" "${@}"; then local PYTHON_USEDEP="python_targets_${i}(-),-python_single_target_${i}(-)" + local PYTHON_SINGLE_USEDEP="python_single_target_${i}(-)" _python_export "${i}" PYTHON_PKG_DEP local i_depstr=${depstr//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}} + i_depstr=${i_depstr//\$\{PYTHON_SINGLE_USEDEP\}/${PYTHON_SINGLE_USEDEP}} # note: need to strip '=' slot operator for || deps out="( ${PYTHON_PKG_DEP/:0=/:0} ${i_depstr} ) ${out}" fi @@ -780,6 +805,7 @@ python_setup() { python_is_installed "${impl}" || continue # then run python_check_deps local PYTHON_USEDEP="python_targets_${impl}(-),-python_single_target_${impl}(-)" + local PYTHON_SINGLE_USEDEP="python_single_target_${impl}(-)" python_check_deps || continue fi -- cgit v1.2.3-65-gdbad