[gentoo-dev] [PATCH 1/2] distutils-r1.eclass: Switch setuptools dep to PYTHON_MULTI_USEDEP
Signed-off-by: Michał Górny
---
eclass/distutils-r1.eclass | 16
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index a840769cdecf..3d6866b8db5f 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: distutils-r1.eclass
@@ -117,15 +117,23 @@ _distutils_set_globals() {
local rdep=${PYTHON_DEPS}
local bdep=${rdep}
+ if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
+ local sdep="dev-python/setuptools[${PYTHON_USEDEP}]"
+ else
+ local sdep="$(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+ ')"
+ fi
+
case ${DISTUTILS_USE_SETUPTOOLS} in
no|manual)
;;
bdepend)
- bdep+=" dev-python/setuptools[${PYTHON_USEDEP}]"
+ bdep+=" ${sdep}"
;;
rdepend)
- bdep+=" dev-python/setuptools[${PYTHON_USEDEP}]"
- rdep+=" dev-python/setuptools[${PYTHON_USEDEP}]"
+ bdep+=" ${sdep}"
+ rdep+=" ${sdep}"
;;
*)
die "Invalid
DISTUTILS_USE_SETUPTOOLS=${DISTUTILS_USE_SETUPTOOLS}"
--
2.25.0
[gentoo-dev] [PATCH 2/2] distutils-r1.eclass: Switch test deps to PYTHON_MULTI_USEDEP
Closes: https://bugs.gentoo.org/704522
Signed-off-by: Michał Górny
---
eclass/distutils-r1.eclass | 22 --
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 3d6866b8db5f..2738340d5e26 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -395,16 +395,16 @@ distutils_enable_tests() {
debug-print-function ${FUNCNAME} "${@}"
[[ ${#} -eq 1 ]] || die "${FUNCNAME} takes exactly one argument:
test-runner"
- local test_deps
+ local test_pkg
case ${1} in
nose)
- test_deps="dev-python/nose[${PYTHON_USEDEP}]"
+ test_pkg="dev-python/nose"
python_test() {
nosetests -v || die "Tests fail with ${EPYTHON}"
}
;;
pytest)
- test_deps="dev-python/pytest[${PYTHON_USEDEP}]"
+ test_pkg="dev-python/pytest"
python_test() {
pytest -vv || die "Tests fail with ${EPYTHON}"
}
@@ -424,13 +424,23 @@ distutils_enable_tests() {
die "${FUNCNAME}: unsupported argument: ${1}"
esac
- if [[ -n ${test_deps} || -n ${RDEPEND} ]]; then
+ local test_deps=${RDEPEND}
+ if [[ -n ${test_pkg} ]]; then
+ if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
+ test_deps+=" ${test_pkg}[${PYTHON_USEDEP}]"
+ else
+ test_deps+=" $(python_gen_any_dep '
+ ${test_pkg}[${PYTHON_MULTI_USEDEP}]
+ ')"
+ fi
+ fi
+ if [[ -n ${test_deps} ]]; then
IUSE+=" test"
RESTRICT+=" !test? ( test )"
if [[ ${EAPI} == [56] ]]; then
- DEPEND+=" test? ( ${test_deps} ${RDEPEND} )"
+ DEPEND+=" test? ( ${test_deps} )"
else
- BDEPEND+=" test? ( ${test_deps} ${RDEPEND} )"
+ BDEPEND+=" test? ( ${test_deps} )"
fi
fi
--
2.25.0
Re: [gentoo-dev] Last rites: sys-firmware/iwl6050-ucode
On Fri, Feb 7, 2020 at 9:10 AM Mike Pagano wrote: > > # Mike Pagano (2020-02-07) > # The standalone ebuild for this driver is made > # unnecessary as it is included in the package: > # sys-kernel/linux-firmware > sys-firmware/iwl6050-ucode How about all the others as well? sys-firmware/iwl1000-ucode sys-firmware/iwl3160-7260-bt-ucode sys-firmware/iwl3160-ucode sys-firmware/iwl6005-ucode sys-firmware/iwl6030-ucode sys-firmware/iwl7260-ucode sys-firmware/iwl8000-ucode
Re: [gentoo-dev] Last rites: sys-firmware/iwl6050-ucode
On Fri, Feb 07, 2020 at 12:10:38PM -0500, Mike Pagano wrote: > # Mike Pagano (2020-02-07) > # The standalone ebuild for this driver is made > # unnecessary as it is included in the package: > # sys-kernel/linux-firmware > sys-firmware/iwl6050-ucode Bug #708622 > -- > Mike Pagano > Gentoo Developer - Kernel Project > Gentoo Sources - Member > E-Mail : mpag...@gentoo.org > GnuPG FP : EEE2 601D 0763 B60F 848C 9E14 3C33 C650 B576 E4E3 > Public Key : http://pgp.mit.edu:11371/pks/lookup?search=0xB576E4E3=index > -- Mike Pagano Gentoo Developer - Kernel Project Gentoo Sources - Member E-Mail : mpag...@gentoo.org GnuPG FP : EEE2 601D 0763 B60F 848C 9E14 3C33 C650 B576 E4E3 Public Key : http://pgp.mit.edu:11371/pks/lookup?search=0xB576E4E3=index
Re: [gentoo-dev] Last rites: sys-firmware/iwl6050-ucode
On Fri, Feb 7, 2020 at 11:39 AM Ulrich Mueller wrote: > > > On Fri, 07 Feb 2020, Matt Turner wrote: > > > On Fri, Feb 7, 2020 at 9:10 AM Mike Pagano wrote: > >> > >> # Mike Pagano (2020-02-07) > >> # The standalone ebuild for this driver is made > >> # unnecessary as it is included in the package: > >> # sys-kernel/linux-firmware > >> sys-firmware/iwl6050-ucode > > > How about all the others as well? > > > sys-firmware/iwl1000-ucode > > sys-firmware/iwl3160-7260-bt-ucode > > sys-firmware/iwl3160-ucode > > sys-firmware/iwl6005-ucode > > sys-firmware/iwl6030-ucode > > sys-firmware/iwl7260-ucode > > sys-firmware/iwl8000-ucode > > I had asked the same question back in November, but an argument against > it was that sys-kernel/linux-firmware is quite a monster. In the default > configuration, its installation footprint is 515 MiB. Oh yeah. The thread where the person arguing for keeping them didn't know about USE=savedconfig :)
Re: [gentoo-dev] Last rites: sys-firmware/iwl6050-ucode
> On Fri, 07 Feb 2020, Matt Turner wrote: > On Fri, Feb 7, 2020 at 9:10 AM Mike Pagano wrote: >> >> # Mike Pagano (2020-02-07) >> # The standalone ebuild for this driver is made >> # unnecessary as it is included in the package: >> # sys-kernel/linux-firmware >> sys-firmware/iwl6050-ucode > How about all the others as well? > sys-firmware/iwl1000-ucode > sys-firmware/iwl3160-7260-bt-ucode > sys-firmware/iwl3160-ucode > sys-firmware/iwl6005-ucode > sys-firmware/iwl6030-ucode > sys-firmware/iwl7260-ucode > sys-firmware/iwl8000-ucode I had asked the same question back in November, but an argument against it was that sys-kernel/linux-firmware is quite a monster. In the default configuration, its installation footprint is 515 MiB. But yeah, either we should keep them all or remove them all. Ulrich signature.asc Description: PGP signature
Re: [gentoo-dev] Last rites: sys-firmware/iwl6050-ucode
On 07/02/20 19:50, Matt Turner wrote: > On Fri, Feb 7, 2020 at 11:39 AM Ulrich Mueller wrote: >>> On Fri, 07 Feb 2020, Matt Turner wrote: >>> On Fri, Feb 7, 2020 at 9:10 AM Mike Pagano wrote: # Mike Pagano (2020-02-07) # The standalone ebuild for this driver is made # unnecessary as it is included in the package: # sys-kernel/linux-firmware sys-firmware/iwl6050-ucode >>> How about all the others as well? >>> sys-firmware/iwl1000-ucode >>> sys-firmware/iwl3160-7260-bt-ucode >>> sys-firmware/iwl3160-ucode >>> sys-firmware/iwl6005-ucode >>> sys-firmware/iwl6030-ucode >>> sys-firmware/iwl7260-ucode >>> sys-firmware/iwl8000-ucode >> I had asked the same question back in November, but an argument against >> it was that sys-kernel/linux-firmware is quite a monster. In the default >> configuration, its installation footprint is 515 MiB. > Oh yeah. The thread where the person arguing for keeping them didn't > know about USE=savedconfig :) > You still have to install the full 515MiB before you can apply savedconfig, unless you already know the list of firmwares included, and create the file in advance. For some systems (esp. storage constrained) that's not a very good option ... signature.asc Description: OpenPGP digital signature
[gentoo-dev] Last rites: sys-firmware/iwl6050-ucode
# Mike Pagano (2020-02-07) # The standalone ebuild for this driver is made # unnecessary as it is included in the package: # sys-kernel/linux-firmware sys-firmware/iwl6050-ucode -- Mike Pagano Gentoo Developer - Kernel Project Gentoo Sources - Member E-Mail : mpag...@gentoo.org GnuPG FP : EEE2 601D 0763 B60F 848C 9E14 3C33 C650 B576 E4E3 Public Key : http://pgp.mit.edu:11371/pks/lookup?search=0xB576E4E3=index
Re: [gentoo-dev] Last rites: sys-firmware/iwl6050-ucode
On 07/02/20 20:39, Matt Turner wrote: > On Fri, Feb 7, 2020 at 12:03 PM Michael 'veremitz' Everitt > wrote: >> On 07/02/20 19:50, Matt Turner wrote: >>> On Fri, Feb 7, 2020 at 11:39 AM Ulrich Mueller wrote: > On Fri, 07 Feb 2020, Matt Turner wrote: > On Fri, Feb 7, 2020 at 9:10 AM Mike Pagano wrote: >> # Mike Pagano (2020-02-07) >> # The standalone ebuild for this driver is made >> # unnecessary as it is included in the package: >> # sys-kernel/linux-firmware >> sys-firmware/iwl6050-ucode > How about all the others as well? > sys-firmware/iwl1000-ucode > sys-firmware/iwl3160-7260-bt-ucode > sys-firmware/iwl3160-ucode > sys-firmware/iwl6005-ucode > sys-firmware/iwl6030-ucode > sys-firmware/iwl7260-ucode > sys-firmware/iwl8000-ucode I had asked the same question back in November, but an argument against it was that sys-kernel/linux-firmware is quite a monster. In the default configuration, its installation footprint is 515 MiB. >>> Oh yeah. The thread where the person arguing for keeping them didn't >>> know about USE=savedconfig :) >>> >> You still have to install the full 515MiB before you can apply savedconfig, >> unless you already know the list of firmwares included, and create the file >> in advance. For some systems (esp. storage constrained) that's not a very >> good option ... > Even that's not true. Just look at the git repo. > In that case, and in truth this is what I do in practice, I just simply download the relevant firmware files Direct from git, and side-step all this package nonsense :) signature.asc Description: OpenPGP digital signature
Re: [gentoo-dev] Last rites: sys-firmware/iwl6050-ucode
On Fri, Feb 7, 2020 at 2:39 PM Ulrich Mueller wrote: > > > On Fri, 07 Feb 2020, Matt Turner wrote: > > > On Fri, Feb 7, 2020 at 9:10 AM Mike Pagano wrote: > >> > >> # Mike Pagano (2020-02-07) > >> # The standalone ebuild for this driver is made > >> # unnecessary as it is included in the package: > >> # sys-kernel/linux-firmware > >> sys-firmware/iwl6050-ucode > > > How about all the others as well? > > > sys-firmware/iwl1000-ucode > > sys-firmware/iwl3160-7260-bt-ucode > > sys-firmware/iwl3160-ucode > > sys-firmware/iwl6005-ucode > > sys-firmware/iwl6030-ucode > > sys-firmware/iwl7260-ucode > > sys-firmware/iwl8000-ucode > > I had asked the same question back in November, but an argument against > it was that sys-kernel/linux-firmware is quite a monster. In the default > configuration, its installation footprint is 515 MiB. > > But yeah, either we should keep them all or remove them all. It looks like several different people maintain the individual iwl-ucode packages. Removing them all would require some consensus among those maintainers. Keeping them all means forcing maintainers to work on stuff they don't care about, or will result in stuff getting dropped to maintainer-needed.
Re: [gentoo-dev] Last rites: sys-firmware/iwl6050-ucode
On Fri, Feb 7, 2020 at 12:03 PM Michael 'veremitz' Everitt wrote: > > On 07/02/20 19:50, Matt Turner wrote: > > On Fri, Feb 7, 2020 at 11:39 AM Ulrich Mueller wrote: > >>> On Fri, 07 Feb 2020, Matt Turner wrote: > >>> On Fri, Feb 7, 2020 at 9:10 AM Mike Pagano wrote: > # Mike Pagano (2020-02-07) > # The standalone ebuild for this driver is made > # unnecessary as it is included in the package: > # sys-kernel/linux-firmware > sys-firmware/iwl6050-ucode > >>> How about all the others as well? > >>> sys-firmware/iwl1000-ucode > >>> sys-firmware/iwl3160-7260-bt-ucode > >>> sys-firmware/iwl3160-ucode > >>> sys-firmware/iwl6005-ucode > >>> sys-firmware/iwl6030-ucode > >>> sys-firmware/iwl7260-ucode > >>> sys-firmware/iwl8000-ucode > >> I had asked the same question back in November, but an argument against > >> it was that sys-kernel/linux-firmware is quite a monster. In the default > >> configuration, its installation footprint is 515 MiB. > > Oh yeah. The thread where the person arguing for keeping them didn't > > know about USE=savedconfig :) > > > You still have to install the full 515MiB before you can apply savedconfig, > unless you already know the list of firmwares included, and create the file > in advance. For some systems (esp. storage constrained) that's not a very > good option ... Even that's not true. Just look at the git repo.
Re: [gentoo-dev] Last rites: sys-firmware/iwl6050-ucode
7 февраля 2020 г. 22:50:13 GMT+03:00, Matt Turner пишет: >On Fri, Feb 7, 2020 at 11:39 AM Ulrich Mueller wrote: >> >> > On Fri, 07 Feb 2020, Matt Turner wrote: >> >> > On Fri, Feb 7, 2020 at 9:10 AM Mike Pagano >wrote: >> >> >> >> # Mike Pagano (2020-02-07) >> >> # The standalone ebuild for this driver is made >> >> # unnecessary as it is included in the package: >> >> # sys-kernel/linux-firmware >> >> sys-firmware/iwl6050-ucode >> >> > How about all the others as well? >> >> > sys-firmware/iwl1000-ucode >> > sys-firmware/iwl3160-7260-bt-ucode >> > sys-firmware/iwl3160-ucode >> > sys-firmware/iwl6005-ucode >> > sys-firmware/iwl6030-ucode >> > sys-firmware/iwl7260-ucode >> > sys-firmware/iwl8000-ucode >> >> I had asked the same question back in November, but an argument >against >> it was that sys-kernel/linux-firmware is quite a monster. In the >default >> configuration, its installation footprint is 515 MiB. > >Oh yeah. The thread where the person arguing for keeping them didn't >know about USE=savedconfig :) USE=savedconfig is very inconvinient, especially for a package that can introduce new firmware files for the same hardware. Adding support for masks would improve that a bit. -- Alexander Tsoy
Re: [gentoo-dev] Last rites: sys-firmware/iwl6050-ucode
On Fri, Feb 7, 2020 at 12:44 PM Alexander Tsoy wrote: > > 7 февраля 2020 г. 22:50:13 GMT+03:00, Matt Turner пишет: > >On Fri, Feb 7, 2020 at 11:39 AM Ulrich Mueller wrote: > >> > >> > On Fri, 07 Feb 2020, Matt Turner wrote: > >> > >> > On Fri, Feb 7, 2020 at 9:10 AM Mike Pagano > >wrote: > >> >> > >> >> # Mike Pagano (2020-02-07) > >> >> # The standalone ebuild for this driver is made > >> >> # unnecessary as it is included in the package: > >> >> # sys-kernel/linux-firmware > >> >> sys-firmware/iwl6050-ucode > >> > >> > How about all the others as well? > >> > >> > sys-firmware/iwl1000-ucode > >> > sys-firmware/iwl3160-7260-bt-ucode > >> > sys-firmware/iwl3160-ucode > >> > sys-firmware/iwl6005-ucode > >> > sys-firmware/iwl6030-ucode > >> > sys-firmware/iwl7260-ucode > >> > sys-firmware/iwl8000-ucode > >> > >> I had asked the same question back in November, but an argument > >against > >> it was that sys-kernel/linux-firmware is quite a monster. In the > >default > >> configuration, its installation footprint is 515 MiB. > > > >Oh yeah. The thread where the person arguing for keeping them didn't > >know about USE=savedconfig :) > > USE=savedconfig is very inconvinient, especially for a package that can > introduce new firmware files for the same hardware. Adding support for masks > would improve that a bit. Agreed. Mask/wildcard support would solve that problem well.
