* [gentoo-dev] Fix spurious dep to eselect-python
@ 2012-03-20 4:29 Luca Barbato
2012-03-20 16:41 ` Arfrever Frehtes Taifersar Arahesis
0 siblings, 1 reply; 11+ messages in thread
From: Luca Barbato @ 2012-03-20 4:29 UTC (permalink / raw
To: gentoo-dev; +Cc: Gentoo Python Project
[-- Attachment #1: Type: text/plain, Size: 170 bytes --]
Hi, I tried to avoid depending on eselect-python if the useflag is disabled.
Please test and review.
lu
--
Luca Barbato
Gentoo/linux
http://dev.gentoo.org/~lu_zero
[-- Attachment #2: python.eclass.diff --]
[-- Type: text/x-patch, Size: 2019 bytes --]
--- /usr/portage/eclass/python.eclass 2012-03-06 20:31:12.000000000 -0800
+++ /var/tmp/python.eclass 2012-03-19 21:24:24.937967537 -0700
@@ -33,6 +33,8 @@
_PYPY_GLOBALLY_SUPPORTED_ABIS=(2.7-pypy-1.7 2.7-pypy-1.8)
_PYTHON_GLOBALLY_SUPPORTED_ABIS=(${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]} ${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]} ${_JYTHON_GLOBALLY_SUPPORTED_ABIS[@]} ${_PYPY_GLOBALLY_SUPPORTED_ABIS[@]})
+ESELECT_DEP=">=app-admin/eselect-python-20091230"
+
# ================================================================================================
# ===================================== HANDLING OF METADATA =====================================
# ================================================================================================
@@ -232,26 +234,27 @@
fi
unset -f _append_accepted_versions_range
-
+ DEPEND="${USE_flag}${USE_flag:+? ( }${ESELECT_DEP}${USE_flag:+ )}"
+ RDEPEND="${DEPEND}"
if [[ "${#_PYTHON_ATOMS[@]}" -gt 1 ]]; then
- DEPEND+="${DEPEND:+ }${USE_flag}${USE_flag:+? ( }|| ( ${_PYTHON_ATOMS[@]} )${USE_flag:+ )}"
- RDEPEND+="${RDEPEND:+ }${USE_flag}${USE_flag:+? ( }|| ( ${_PYTHON_ATOMS[@]} )${USE_flag:+ )}"
+ DEPEND+=" ${USE_flag}${USE_flag:+? ( }|| ( ${_PYTHON_ATOMS[@]} )${USE_flag:+ )}"
+ RDEPEND+=" ${USE_flag}${USE_flag:+? ( }|| ( ${_PYTHON_ATOMS[@]} )${USE_flag:+ )}"
else
- DEPEND+="${DEPEND:+ }${USE_flag}${USE_flag:+? ( }${_PYTHON_ATOMS[@]}${USE_flag:+ )}"
- RDEPEND+="${RDEPEND:+ }${USE_flag}${USE_flag:+? ( }${_PYTHON_ATOMS[@]}${USE_flag:+ )}"
+ DEPEND+=" ${USE_flag}${USE_flag:+? ( }${_PYTHON_ATOMS[@]}${USE_flag:+ )}"
+ RDEPEND+=" ${USE_flag}${USE_flag:+? ( }${_PYTHON_ATOMS[@]}${USE_flag:+ )}"
fi
else
die "Invalid syntax of PYTHON_DEPEND"
fi
}
-DEPEND=">=app-admin/eselect-python-20091230"
-RDEPEND="${DEPEND}"
if [[ -n "${PYTHON_DEPEND}" ]]; then
_python_parse_PYTHON_DEPEND
else
_PYTHON_ATOMS=("dev-lang/python")
+ DEPEND="${ESELECT_DEP}"
+ RDEPEND="${DEPEND}"
fi
unset -f _python_parse_PYTHON_DEPEND
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [gentoo-dev] Fix spurious dep to eselect-python
2012-03-20 4:29 [gentoo-dev] Fix spurious dep to eselect-python Luca Barbato
@ 2012-03-20 16:41 ` Arfrever Frehtes Taifersar Arahesis
2012-03-20 16:51 ` Mike Gilbert
2012-03-20 16:53 ` Michał Górny
0 siblings, 2 replies; 11+ messages in thread
From: Arfrever Frehtes Taifersar Arahesis @ 2012-03-20 16:41 UTC (permalink / raw
To: Gentoo Development
[-- Attachment #1: Type: Text/Plain, Size: 390 bytes --]
2012-03-20 05:29:20 Luca Barbato napisał(a):
> Hi, I tried to avoid depending on eselect-python if the useflag is disabled.
>
> Please test and review.
The proper fix is to make python.eclass add dependency on app-admin/eselect-python only when
${CATEGORY}/${PN} is dev-lang/python, dev-java/jython or dev-python/pypy. See bug #341037.
--
Arfrever Frehtes Taifersar Arahesis
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [gentoo-dev] Fix spurious dep to eselect-python
2012-03-20 16:41 ` Arfrever Frehtes Taifersar Arahesis
@ 2012-03-20 16:51 ` Mike Gilbert
2012-03-20 16:53 ` Michał Górny
1 sibling, 0 replies; 11+ messages in thread
From: Mike Gilbert @ 2012-03-20 16:51 UTC (permalink / raw
To: gentoo-dev
On Tue, Mar 20, 2012 at 12:41 PM, Arfrever Frehtes Taifersar Arahesis
<arfrever@gentoo.org> wrote:
> 2012-03-20 05:29:20 Luca Barbato napisał(a):
>> Hi, I tried to avoid depending on eselect-python if the useflag is disabled.
>>
>> Please test and review.
>
> The proper fix is to make python.eclass add dependency on app-admin/eselect-python only when
> ${CATEGORY}/${PN} is dev-lang/python, dev-java/jython or dev-python/pypy. See bug #341037.
>
Could you provide a patch against gentoo-x86 python.eclass for that? I
think you may have already done that, but things said in IRC get
forgotten.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [gentoo-dev] Fix spurious dep to eselect-python
2012-03-20 16:41 ` Arfrever Frehtes Taifersar Arahesis
2012-03-20 16:51 ` Mike Gilbert
@ 2012-03-20 16:53 ` Michał Górny
2012-03-20 19:35 ` Arfrever Frehtes Taifersar Arahesis
1 sibling, 1 reply; 11+ messages in thread
From: Michał Górny @ 2012-03-20 16:53 UTC (permalink / raw
To: gentoo-dev; +Cc: arfrever
[-- Attachment #1: Type: text/plain, Size: 576 bytes --]
On Tue, 20 Mar 2012 17:41:39 +0100
Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> wrote:
> 2012-03-20 05:29:20 Luca Barbato napisał(a):
> > Hi, I tried to avoid depending on eselect-python if the useflag is
> > disabled.
> >
> > Please test and review.
>
> The proper fix is to make python.eclass add dependency on
> app-admin/eselect-python only when ${CATEGORY}/${PN} is
> dev-lang/python, dev-java/jython or dev-python/pypy. See bug #341037.
Couldn't we just push that dependency to the specific ebuilds?
--
Best regards,
Michał Górny
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 316 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [gentoo-dev] Fix spurious dep to eselect-python
2012-03-20 16:53 ` Michał Górny
@ 2012-03-20 19:35 ` Arfrever Frehtes Taifersar Arahesis
2012-03-20 20:57 ` Alexis Ballier
0 siblings, 1 reply; 11+ messages in thread
From: Arfrever Frehtes Taifersar Arahesis @ 2012-03-20 19:35 UTC (permalink / raw
To: Gentoo Development
[-- Attachment #1: Type: Text/Plain, Size: 759 bytes --]
2012-03-20 17:53:56 Michał Górny napisał(a):
> On Tue, 20 Mar 2012 17:41:39 +0100
> Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> wrote:
>
> > 2012-03-20 05:29:20 Luca Barbato napisał(a):
> > > Hi, I tried to avoid depending on eselect-python if the useflag is
> > > disabled.
> > >
> > > Please test and review.
> >
> > The proper fix is to make python.eclass add dependency on
> > app-admin/eselect-python only when ${CATEGORY}/${PN} is
> > dev-lang/python, dev-java/jython or dev-python/pypy. See bug #341037.
>
> Couldn't we just push that dependency to the specific ebuilds?
We want to control required version (>=20091230 in case of app-admin/eselect-python) in 1 place.
--
Arfrever Frehtes Taifersar Arahesis
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [gentoo-dev] Fix spurious dep to eselect-python
2012-03-20 19:35 ` Arfrever Frehtes Taifersar Arahesis
@ 2012-03-20 20:57 ` Alexis Ballier
2012-03-20 21:05 ` Alexis Ballier
0 siblings, 1 reply; 11+ messages in thread
From: Alexis Ballier @ 2012-03-20 20:57 UTC (permalink / raw
To: gentoo-dev
On Tue, 20 Mar 2012 20:35:17 +0100
Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> wrote:
> 2012-03-20 17:53:56 Michał Górny napisał(a):
> > On Tue, 20 Mar 2012 17:41:39 +0100
> > Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> wrote:
> >
> > > 2012-03-20 05:29:20 Luca Barbato napisał(a):
> > > > Hi, I tried to avoid depending on eselect-python if the useflag
> > > > is disabled.
> > > >
> > > > Please test and review.
> > >
> > > The proper fix is to make python.eclass add dependency on
> > > app-admin/eselect-python only when ${CATEGORY}/${PN} is
> > > dev-lang/python, dev-java/jython or dev-python/pypy. See bug
> > > #341037.
> >
> > Couldn't we just push that dependency to the specific ebuilds?
>
> We want to control required version (>=20091230 in case of
> app-admin/eselect-python) in 1 place.
>
this can be achieved by setting a variable that said ebuilds will append
to (R)DEPEND; no need for complex 'if then else' on CAT/PN in an eclass
for this.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [gentoo-dev] Fix spurious dep to eselect-python
2012-03-20 20:57 ` Alexis Ballier
@ 2012-03-20 21:05 ` Alexis Ballier
2012-03-20 21:09 ` Arfrever Frehtes Taifersar Arahesis
2012-03-20 21:09 ` Mike Gilbert
0 siblings, 2 replies; 11+ messages in thread
From: Alexis Ballier @ 2012-03-20 21:05 UTC (permalink / raw
To: gentoo-dev
On Tue, 20 Mar 2012 17:57:29 -0300
Alexis Ballier <aballier@gentoo.org> wrote:
> On Tue, 20 Mar 2012 20:35:17 +0100
> Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> wrote:
>
> > 2012-03-20 17:53:56 Michał Górny napisał(a):
> > > On Tue, 20 Mar 2012 17:41:39 +0100
> > > Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> wrote:
> > >
> > > > 2012-03-20 05:29:20 Luca Barbato napisał(a):
> > > > > Hi, I tried to avoid depending on eselect-python if the
> > > > > useflag is disabled.
> > > > >
> > > > > Please test and review.
> > > >
> > > > The proper fix is to make python.eclass add dependency on
> > > > app-admin/eselect-python only when ${CATEGORY}/${PN} is
> > > > dev-lang/python, dev-java/jython or dev-python/pypy. See bug
> > > > #341037.
> > >
> > > Couldn't we just push that dependency to the specific ebuilds?
> >
> > We want to control required version (>=20091230 in case of
> > app-admin/eselect-python) in 1 place.
> >
>
> this can be achieved by setting a variable that said ebuilds will
> append to (R)DEPEND; no need for complex 'if then else' on CAT/PN in
> an eclass for this.
>
or also by adding a new python-implementation.eclass instead of
polluting an eclass used by hundreds of packages for only 3 special
ones...
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [gentoo-dev] Fix spurious dep to eselect-python
2012-03-20 21:05 ` Alexis Ballier
@ 2012-03-20 21:09 ` Arfrever Frehtes Taifersar Arahesis
2012-03-20 21:09 ` Mike Gilbert
1 sibling, 0 replies; 11+ messages in thread
From: Arfrever Frehtes Taifersar Arahesis @ 2012-03-20 21:09 UTC (permalink / raw
To: Gentoo Development
[-- Attachment #1: Type: Text/Plain, Size: 1581 bytes --]
2012-03-20 22:05:17 Alexis Ballier napisał(a):
> On Tue, 20 Mar 2012 17:57:29 -0300
> Alexis Ballier <aballier@gentoo.org> wrote:
>
> > On Tue, 20 Mar 2012 20:35:17 +0100
> > Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> wrote:
> >
> > > 2012-03-20 17:53:56 Michał Górny napisał(a):
> > > > On Tue, 20 Mar 2012 17:41:39 +0100
> > > > Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> wrote:
> > > >
> > > > > 2012-03-20 05:29:20 Luca Barbato napisał(a):
> > > > > > Hi, I tried to avoid depending on eselect-python if the
> > > > > > useflag is disabled.
> > > > > >
> > > > > > Please test and review.
> > > > >
> > > > > The proper fix is to make python.eclass add dependency on
> > > > > app-admin/eselect-python only when ${CATEGORY}/${PN} is
> > > > > dev-lang/python, dev-java/jython or dev-python/pypy. See bug
> > > > > #341037.
> > > >
> > > > Couldn't we just push that dependency to the specific ebuilds?
> > >
> > > We want to control required version (>=20091230 in case of
> > > app-admin/eselect-python) in 1 place.
> > >
> >
> > this can be achieved by setting a variable that said ebuilds will
> > append to (R)DEPEND; no need for complex 'if then else' on CAT/PN in
> > an eclass for this.
> >
>
> or also by adding a new python-implementation.eclass instead of
> polluting an eclass used by hundreds of packages for only 3 special
> ones...
Some functions in python.eclass need to know if they are called in ebuild of a Python implementation.
--
Arfrever Frehtes Taifersar Arahesis
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [gentoo-dev] Fix spurious dep to eselect-python
2012-03-20 21:05 ` Alexis Ballier
2012-03-20 21:09 ` Arfrever Frehtes Taifersar Arahesis
@ 2012-03-20 21:09 ` Mike Gilbert
2012-03-20 21:20 ` Alexis Ballier
1 sibling, 1 reply; 11+ messages in thread
From: Mike Gilbert @ 2012-03-20 21:09 UTC (permalink / raw
To: gentoo-dev
On Tue, Mar 20, 2012 at 5:05 PM, Alexis Ballier <aballier@gentoo.org> wrote:
> On Tue, 20 Mar 2012 17:57:29 -0300
> Alexis Ballier <aballier@gentoo.org> wrote:
>
>> On Tue, 20 Mar 2012 20:35:17 +0100
>> Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> wrote:
>>
>> > 2012-03-20 17:53:56 Michał Górny napisał(a):
>> > > On Tue, 20 Mar 2012 17:41:39 +0100
>> > > Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> wrote:
>> > >
>> > > > 2012-03-20 05:29:20 Luca Barbato napisał(a):
>> > > > > Hi, I tried to avoid depending on eselect-python if the
>> > > > > useflag is disabled.
>> > > > >
>> > > > > Please test and review.
>> > > >
>> > > > The proper fix is to make python.eclass add dependency on
>> > > > app-admin/eselect-python only when ${CATEGORY}/${PN} is
>> > > > dev-lang/python, dev-java/jython or dev-python/pypy. See bug
>> > > > #341037.
>> > >
>> > > Couldn't we just push that dependency to the specific ebuilds?
>> >
>> > We want to control required version (>=20091230 in case of
>> > app-admin/eselect-python) in 1 place.
>> >
>>
>> this can be achieved by setting a variable that said ebuilds will
>> append to (R)DEPEND; no need for complex 'if then else' on CAT/PN in
>> an eclass for this.
>>
>
> or also by adding a new python-implementation.eclass instead of
> polluting an eclass used by hundreds of packages for only 3 special
> ones...
>
A four-way if-then statement is not what I would call "complex". This
was already present in the eclass anyway, so there is no additional
"pollution".
I have already committed Arfrever's patch. If anyone wants to move the
dependency into the ebuilds, you are welcome to do so; patching the
eclass was just faster/easier.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [gentoo-dev] Fix spurious dep to eselect-python
2012-03-20 21:09 ` Mike Gilbert
@ 2012-03-20 21:20 ` Alexis Ballier
2012-03-20 21:33 ` Mike Gilbert
0 siblings, 1 reply; 11+ messages in thread
From: Alexis Ballier @ 2012-03-20 21:20 UTC (permalink / raw
To: gentoo-dev
On Tue, 20 Mar 2012 17:09:55 -0400
Mike Gilbert <floppym@gentoo.org> wrote:
> On Tue, Mar 20, 2012 at 5:05 PM, Alexis Ballier <aballier@gentoo.org>
> wrote:
> > On Tue, 20 Mar 2012 17:57:29 -0300
> > Alexis Ballier <aballier@gentoo.org> wrote:
> >
> >> On Tue, 20 Mar 2012 20:35:17 +0100
> >> Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> wrote:
> >>
> >> > 2012-03-20 17:53:56 Michał Górny napisał(a):
> >> > > On Tue, 20 Mar 2012 17:41:39 +0100
> >> > > Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
> >> > > wrote:
> >> > >
> >> > > > 2012-03-20 05:29:20 Luca Barbato napisał(a):
> >> > > > > Hi, I tried to avoid depending on eselect-python if the
> >> > > > > useflag is disabled.
> >> > > > >
> >> > > > > Please test and review.
> >> > > >
> >> > > > The proper fix is to make python.eclass add dependency on
> >> > > > app-admin/eselect-python only when ${CATEGORY}/${PN} is
> >> > > > dev-lang/python, dev-java/jython or dev-python/pypy. See bug
> >> > > > #341037.
> >> > >
> >> > > Couldn't we just push that dependency to the specific ebuilds?
> >> >
> >> > We want to control required version (>=20091230 in case of
> >> > app-admin/eselect-python) in 1 place.
> >> >
> >>
> >> this can be achieved by setting a variable that said ebuilds will
> >> append to (R)DEPEND; no need for complex 'if then else' on CAT/PN
> >> in an eclass for this.
> >>
> >
> > or also by adding a new python-implementation.eclass instead of
> > polluting an eclass used by hundreds of packages for only 3 special
> > ones...
> >
>
> A four-way if-then statement is not what I would call "complex". This
> was already present in the eclass anyway, so there is no additional
> "pollution".
a four-way if-then with pattern matching / strcmp is slower than a
constant variable assignment; it could matter when this is done
everytime an ebuild inheriting it is sourced. it probably doesnt, but
imho, its good practice to keep global scope code in eclasses as simple
as possible.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [gentoo-dev] Fix spurious dep to eselect-python
2012-03-20 21:20 ` Alexis Ballier
@ 2012-03-20 21:33 ` Mike Gilbert
0 siblings, 0 replies; 11+ messages in thread
From: Mike Gilbert @ 2012-03-20 21:33 UTC (permalink / raw
To: gentoo-dev
On Tue, Mar 20, 2012 at 5:20 PM, Alexis Ballier <aballier@gentoo.org> wrote:
> On Tue, 20 Mar 2012 17:09:55 -0400
> Mike Gilbert <floppym@gentoo.org> wrote:
>
>> On Tue, Mar 20, 2012 at 5:05 PM, Alexis Ballier <aballier@gentoo.org>
>> wrote:
>> > On Tue, 20 Mar 2012 17:57:29 -0300
>> > Alexis Ballier <aballier@gentoo.org> wrote:
>> >
>> >> On Tue, 20 Mar 2012 20:35:17 +0100
>> >> Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> wrote:
>> >>
>> >> > 2012-03-20 17:53:56 Michał Górny napisał(a):
>> >> > > On Tue, 20 Mar 2012 17:41:39 +0100
>> >> > > Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
>> >> > > wrote:
>> >> > >
>> >> > > > 2012-03-20 05:29:20 Luca Barbato napisał(a):
>> >> > > > > Hi, I tried to avoid depending on eselect-python if the
>> >> > > > > useflag is disabled.
>> >> > > > >
>> >> > > > > Please test and review.
>> >> > > >
>> >> > > > The proper fix is to make python.eclass add dependency on
>> >> > > > app-admin/eselect-python only when ${CATEGORY}/${PN} is
>> >> > > > dev-lang/python, dev-java/jython or dev-python/pypy. See bug
>> >> > > > #341037.
>> >> > >
>> >> > > Couldn't we just push that dependency to the specific ebuilds?
>> >> >
>> >> > We want to control required version (>=20091230 in case of
>> >> > app-admin/eselect-python) in 1 place.
>> >> >
>> >>
>> >> this can be achieved by setting a variable that said ebuilds will
>> >> append to (R)DEPEND; no need for complex 'if then else' on CAT/PN
>> >> in an eclass for this.
>> >>
>> >
>> > or also by adding a new python-implementation.eclass instead of
>> > polluting an eclass used by hundreds of packages for only 3 special
>> > ones...
>> >
>>
>> A four-way if-then statement is not what I would call "complex". This
>> was already present in the eclass anyway, so there is no additional
>> "pollution".
>
> a four-way if-then with pattern matching / strcmp is slower than a
> constant variable assignment; it could matter when this is done
> everytime an ebuild inheriting it is sourced. it probably doesnt, but
> imho, its good practice to keep global scope code in eclasses as simple
> as possible.
>
Ah right. It is now being executed in global scope, so there is a
slight performance degradation there. Point taken.
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2012-03-20 21:33 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-20 4:29 [gentoo-dev] Fix spurious dep to eselect-python Luca Barbato
2012-03-20 16:41 ` Arfrever Frehtes Taifersar Arahesis
2012-03-20 16:51 ` Mike Gilbert
2012-03-20 16:53 ` Michał Górny
2012-03-20 19:35 ` Arfrever Frehtes Taifersar Arahesis
2012-03-20 20:57 ` Alexis Ballier
2012-03-20 21:05 ` Alexis Ballier
2012-03-20 21:09 ` Arfrever Frehtes Taifersar Arahesis
2012-03-20 21:09 ` Mike Gilbert
2012-03-20 21:20 ` Alexis Ballier
2012-03-20 21:33 ` Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox