[gentoo-dev] [PATCH 0/5] RFC: Patches for wxwidgets.eclass

[gentoo-dev] [PATCH 0/5] RFC: Patches for wxwidgets.eclass

[Justin Lecher]

while tracking down the following error when running "egencache"

GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found

I found that the global scope get_libdir() usage of the wxwidgets.eclass
doens't work on EAPI=6. The following patches correct some minor things
and block EAPI=6 for now until the eclass is ready.

Justin Lecher (5):
  wxwidgets.eclass: Update Copyright year
  wxwidgets.eclass: Fix whitespaces
  wxwidgets.eclass: unset unneeded variables in global scope after usage
  wxwidgets.eclass: Only inherit eclass ones
  wxwidgets.eclass: Add EAPI support

 eclass/wxwidgets.eclass | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

-- 
2.7.0

[gentoo-dev] [PATCH 1/5] wxwidgets.eclass: Update Copyright year

[Justin Lecher]

Signed-off-by: Justin Lecher <jlec@gentoo.org>
---
 eclass/wxwidgets.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass
index ea7cf9f..6ca9f76 100644
--- a/eclass/wxwidgets.eclass
+++ b/eclass/wxwidgets.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-- 
2.7.0

[gentoo-dev] [PATCH 2/5] wxwidgets.eclass: Fix whitespaces

[Justin Lecher]

Signed-off-by: Justin Lecher <jlec@gentoo.org>
---
 eclass/wxwidgets.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass
index 6ca9f76..bcdeb53 100644
--- a/eclass/wxwidgets.eclass
+++ b/eclass/wxwidgets.eclass
@@ -29,7 +29,7 @@
 #      DEPEND="wxwidgets? ( x11-libs/wxGTK:2.8[X?] )"
 #
 #      src_configure() {
-#          if use wxwidgets; then 
+#          if use wxwidgets; then
 #              WX_GTK_VER="2.8"
 #              if use X; then
 #                  need-wxwidgets unicode
@@ -106,7 +106,7 @@ need-wxwidgets() {
 		echo
 		die
 	fi
-	
+
 	if [[ ${WX_GTK_VER} != 2.8 && ${WX_GTK_VER} != 2.9 && ${WX_GTK_VER} != 3.0 ]]; then
 		eerror "Invalid WX_GTK_VER: ${WX_GTK_VER} - must be set to a valid wxGTK SLOT."
 		echo
-- 
2.7.0

[gentoo-dev] [PATCH 3/5] wxwidgets.eclass: unset unneeded variables in global scope after usage

[Justin Lecher]

Signed-off-by: Justin Lecher <jlec@gentoo.org>
---
 eclass/wxwidgets.eclass | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass
index bcdeb53..5c0719d 100644
--- a/eclass/wxwidgets.eclass
+++ b/eclass/wxwidgets.eclass
@@ -64,14 +64,14 @@ inherit eutils flag-o-matic multilib
 # inheriting.
 if [[ -z ${WX_CONFIG} ]]; then
 	if [[ -n ${WX_GTK_VER} ]]; then
-		for wxtoolkit in mac gtk2 base; do
+		for _wxtoolkit in mac gtk2 base; do
 			# newer versions don't have a seperate debug profile
-			for wxdebug in xxx release- debug-; do
-				wxconf="${wxtoolkit}-unicode-${wxdebug/xxx/}${WX_GTK_VER}"
+			for _wxdebug in xxx release- debug-; do
+				_wxconf="${_wxtoolkit}-unicode-${_wxdebug/xxx/}${WX_GTK_VER}"
 
-				[[ -f ${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf} ]] || continue
+				[[ -f ${EPREFIX}/usr/$(get_libdir)/wx/config/${_wxconf} ]] || continue
 
-				WX_CONFIG="${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf}"
+				WX_CONFIG="${EPREFIX}/usr/$(get_libdir)/wx/config/${_wxconf}"
 				WX_ECLASS_CONFIG="${WX_CONFIG}"
 				break
 			done
@@ -80,6 +80,9 @@ if [[ -z ${WX_CONFIG} ]]; then
 		[[ -n ${WX_CONFIG} ]] && export WX_CONFIG WX_ECLASS_CONFIG
 	fi
 fi
+unset _wxtoolkit
+unset _wxdebug
+unset _wxconf
 
 # @FUNCTION:    need-wxwidgets
 # @USAGE:       <profile>
-- 
2.7.0

[gentoo-dev] [PATCH 4/5] wxwidgets.eclass: Only inherit eclass ones

[Justin Lecher]

Signed-off-by: Justin Lecher <jlec@gentoo.org>
---
 eclass/wxwidgets.eclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass
index 5c0719d..aaac074 100644
--- a/eclass/wxwidgets.eclass
+++ b/eclass/wxwidgets.eclass
@@ -58,6 +58,8 @@
 # Use the -DNDEBUG preprocessor flag to disable debugging features.
 # (Using need-wxwidgets will do this for you, see below.)
 
+if [[ -z ${_WXWIDGETS_ECLASS} ]]; then
+
 inherit eutils flag-o-matic multilib
 
 # We do this in global scope so ebuilds can get sane defaults just by
@@ -163,3 +165,6 @@ need-wxwidgets() {
 	einfo "Using wxWidgets:            ${wxconf}"
 	echo
 }
+
+_WXWIDGETS_ECLASS=1
+fi
-- 
2.7.0

[gentoo-dev] [PATCH 5/5] wxwidgets.eclass: Add EAPI support

[Justin Lecher]

Signed-off-by: Justin Lecher <jlec@gentoo.org>
---
 eclass/wxwidgets.eclass | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass
index aaac074..dc6db5a 100644
--- a/eclass/wxwidgets.eclass
+++ b/eclass/wxwidgets.eclass
@@ -60,7 +60,14 @@
 
 if [[ -z ${_WXWIDGETS_ECLASS} ]]; then
 
-inherit eutils flag-o-matic multilib
+case ${EAPI} in
+	0|1|2|3|4|5)
+		inherit eutils flag-o-matic multilib
+		;;
+	*)
+		die "EAPI=${EAPI:-0} is not supported"
+		;;
+esac
 
 # We do this in global scope so ebuilds can get sane defaults just by
 # inheriting.
-- 
2.7.0

[gentoo-dev] Re: [PATCH 4/5] wxwidgets.eclass: Only inherit eclass ones

[Duncan]

Justin Lecher posted on Mon, 01 Feb 2016 12:08:32 +0100 as excerpted:

[Title/description only comment, body quote snipped]

What about eclass twos and eclass threes?

IOW, s/ones/once/

Meanwhile, thanks, you and everyone else working so hard on EAPI-6 
upgrades. =:^)

-- 
Duncan - List replies preferred.   No HTML msgs.
"Every nonfree program has a lord, a master --
and if you use the program, he is your master."  Richard Stallman

Re: [gentoo-dev] Re: [PATCH 4/5] wxwidgets.eclass: Only inherit eclass ones

[Justin Lecher (jlec)]

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

On 02/02/16 00:18, Duncan wrote:
> Justin Lecher posted on Mon, 01 Feb 2016 12:08:32 +0100 as excerpted:
> 
> [Title/description only comment, body quote snipped]
> 
> What about eclass twos and eclass threes?
> 
> IOW, s/ones/once/
> 

yeah, I have some weaknesses with those words :D

Thanks for spotting.



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 959 bytes --]

[gentoo-dev] Re: [PATCH 0/5] RFC: Patches for wxwidgets.eclass

[Ryan Hill]

On Mon,  1 Feb 2016 12:08:28 +0100
Justin Lecher <jlec@gentoo.org> wrote:

> while tracking down the following error when running "egencache"
> 
> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
> 
> I found that the global scope get_libdir() usage of the wxwidgets.eclass
> doens't work on EAPI=6. The following patches correct some minor things
> and block EAPI=6 for now until the eclass is ready.
> 
> Justin Lecher (5):
>   wxwidgets.eclass: Update Copyright year
>   wxwidgets.eclass: Fix whitespaces
>   wxwidgets.eclass: unset unneeded variables in global scope after usage
>   wxwidgets.eclass: Only inherit eclass ones
>   wxwidgets.eclass: Add EAPI support
> 
>  eclass/wxwidgets.eclass | 33 ++++++++++++++++++++++++---------
>  1 file changed, 24 insertions(+), 9 deletions(-)
> 

1. I don't think most of this is necessary but go ahead I guess.
2. When did we start posting every @&#$! eclass change to g-dev?  File a bug
like a normal person.  (There's already one open you could have used)

Re: [gentoo-dev] Re: [PATCH 0/5] RFC: Patches for wxwidgets.eclass

[Justin Lecher (jlec)]

[-- Attachment #1: Type: text/plain, Size: 2269 bytes --]

On 02/02/16 23:36, Ryan Hill wrote:
> On Mon,  1 Feb 2016 12:08:28 +0100
> Justin Lecher <jlec@gentoo.org> wrote:
> 
>> while tracking down the following error when running "egencache"
>>
>> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
>> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
>> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
>> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
>> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
>> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
>> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
>> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
>> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
>>
>> I found that the global scope get_libdir() usage of the wxwidgets.eclass
>> doens't work on EAPI=6. The following patches correct some minor things
>> and block EAPI=6 for now until the eclass is ready.
>>
>> Justin Lecher (5):
>>   wxwidgets.eclass: Update Copyright year
>>   wxwidgets.eclass: Fix whitespaces
>>   wxwidgets.eclass: unset unneeded variables in global scope after usage
>>   wxwidgets.eclass: Only inherit eclass ones
>>   wxwidgets.eclass: Add EAPI support
>>
>>  eclass/wxwidgets.eclass | 33 ++++++++++++++++++++++++---------
>>  1 file changed, 24 insertions(+), 9 deletions(-)
>>
> 
> 1. I don't think most of this is necessary but go ahead I guess.

Most of them are trivial, but excluding EAPI=6 from supported EAPIs is
essential. The usage of get_libdir needs to be moved to a phase
function. Which should perhaps be coupled with an env variable which is
checked in the later function to ensure the phase function has been run.

> 2. When did we start posting every @&#$! eclass change to g-dev?  File a bug
> like a normal person.  (There's already one open you could have used)

I feel pretty "normal" when sending eclass changes to g-dev. Having code
reviewed which influences a larger number of packages at once in the
most public and open way is something we should strive for, isn't it?


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 959 bytes --]

[gentoo-dev] Re: [PATCH 0/5] RFC: Patches for wxwidgets.eclass

[Ryan Hill]

[-- Attachment #1: Type: text/plain, Size: 2632 bytes --]

On Wed, 3 Feb 2016 10:21:40 +0100
"Justin Lecher (jlec)" <jlec@gentoo.org> wrote:

> On 02/02/16 23:36, Ryan Hill wrote:
> > On Mon,  1 Feb 2016 12:08:28 +0100
> > Justin Lecher <jlec@gentoo.org> wrote:
> >   
> >> while tracking down the following error when running "egencache"
> >>
> >> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
> >> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
> >> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
> >> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
> >> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
> >> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
> >> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
> >> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
> >> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found
> >>
> >> I found that the global scope get_libdir() usage of the wxwidgets.eclass
> >> doens't work on EAPI=6. The following patches correct some minor things
> >> and block EAPI=6 for now until the eclass is ready.
> >>
> >> Justin Lecher (5):
> >>   wxwidgets.eclass: Update Copyright year
> >>   wxwidgets.eclass: Fix whitespaces
> >>   wxwidgets.eclass: unset unneeded variables in global scope after usage
> >>   wxwidgets.eclass: Only inherit eclass ones
> >>   wxwidgets.eclass: Add EAPI support
> >>
> >>  eclass/wxwidgets.eclass | 33 ++++++++++++++++++++++++---------
> >>  1 file changed, 24 insertions(+), 9 deletions(-)
> >>  
> > 
> > 1. I don't think most of this is necessary but go ahead I guess.  
> 
> Most of them are trivial, but excluding EAPI=6 from supported EAPIs is
> essential. The usage of get_libdir needs to be moved to a phase
> function. Which should perhaps be coupled with an env variable which is
> checked in the later function to ensure the phase function has been run.

Yeah, it just kind of screws us from getting sane defaults just by inheriting
the eclass.  I guess we'll have to find another way.

> > 2. When did we start posting every @&#$! eclass change to g-dev?  File a bug
> > like a normal person.  (There's already one open you could have used)  
> 
> I feel pretty "normal" when sending eclass changes to g-dev. Having code
> reviewed which influences a larger number of packages at once in the
> most public and open way is something we should strive for, isn't it?

Yes, thanks and sorry for being crabby.

-- 

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 951 bytes --]

Re: [gentoo-dev] Re: [PATCH 0/5] RFC: Patches for wxwidgets.eclass

[Daniel Campbell]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

On 02/02/2016 02:36 PM, Ryan Hill wrote:
> On Mon,  1 Feb 2016 12:08:28 +0100 Justin Lecher <jlec@gentoo.org>
> wrote:
> 
>> while tracking down the following error when running "egencache"
>> 
>> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command
>> not found GENTOO.GIT//eclass/wxwidgets.eclass: line 84:
>> get_libdir: command not found 
>> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command
>> not found GENTOO.GIT//eclass/wxwidgets.eclass: line 84:
>> get_libdir: command not found 
>> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command
>> not found GENTOO.GIT//eclass/wxwidgets.eclass: line 84:
>> get_libdir: command not found 
>> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command
>> not found GENTOO.GIT//eclass/wxwidgets.eclass: line 84:
>> get_libdir: command not found 
>> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command
>> not found
>> 
>> I found that the global scope get_libdir() usage of the
>> wxwidgets.eclass doens't work on EAPI=6. The following patches
>> correct some minor things and block EAPI=6 for now until the
>> eclass is ready.
>> 
>> Justin Lecher (5): wxwidgets.eclass: Update Copyright year 
>> wxwidgets.eclass: Fix whitespaces wxwidgets.eclass: unset
>> unneeded variables in global scope after usage wxwidgets.eclass:
>> Only inherit eclass ones wxwidgets.eclass: Add EAPI support
>> 
>> eclass/wxwidgets.eclass | 33 ++++++++++++++++++++++++--------- 1
>> file changed, 24 insertions(+), 9 deletions(-)
>> 
> 
> 1. I don't think most of this is necessary but go ahead I guess. 2.
> When did we start posting every @&#$! eclass change to g-dev?  File
> a bug like a normal person.  (There's already one open you could
> have used)
> 
> 

I see nothing wrong with discussing changes to parts of the tree that
will affect other developers. Bugzilla is nice and all, but imo it's
more of an AND thing instead of an OR thing. If the bug is already
present, I see no real reason not to have a thread about it on g-dev.
It keeps unrelated developers in the loop, as well, in the event that
they come across weird eclass behavior or take on a project using a
given eclass.

I guess if eclass discussion is a problem, one could always add a rule
to whatever they use to filter their mail.

- -- 
Daniel Campbell - Gentoo Developer
OpenPGP Key: 0x1EA055D6 @ hkp://keys.gnupg.net
fpr: AE03 9064 AE00 053C 270C  1DE4 6F7A 9091 1EA0 55D6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJWsqRfAAoJEAEkDpRQOeFwMNEQAJTu8qR9PRV0yWOJpiUdNYXM
bdshcE17w41+xXSdDK+rhWxdQeZwG5fzxzqwtvzNr8lYtKPuTOaKRNV/KxjhBMH8
tiwIfggw0RfnKnlysQPXMB6YDrbkYAYZmRIObZBF9ZBhLqkod+HW2Ek0gLUfC1jP
3HIU6ymexHc+AGehw/L6FzQPGnv7SSDcTFqU8XI5HZZjT4M4xGdU9S3hM3kHFqOL
f8Ua/ygYnWgAe7XeR7pxC9N1wRZHUbBXEc+I8hQa0i3a0vM0j62c2xQZ/tF7/wwy
1ie/7ogU2+4CCAqXUU783I9HtZC+kGeNGPtuBMgQUlwJ96NavK7fxCvLRRejs+Pc
9AhPYSQcGF/abeqVxSib2QBnXUumWXWKKPNSqpVvKWgTjGhtE0HNjHHq+y5tv3pi
l7IlyK3eR4jGbDxxswUkFo0be1OU/LKP9jKM0nNB+GT3OT5Xu6qV2lDQIpAe3r/i
E1yGZXTe+WlfhVbtaz6KQKqa4wf9nF85JMu3lfwigAucxIbfrcMkXKEnrROq9qpw
5ouNyUTrbPgnap5v8JUMNmKp2PgR87v9ZUwtwum2w7FH5+qzGGGC+5dGnwC9JiUj
9G0ETBaUnMkqcTRAUyz9q+BHdgD9+ZWIfw3U4Db23YtDEtwwHcZgZDg2TA7Ch6jm
EY+h/UWs3jYNjT4ZTulx
=V736
-----END PGP SIGNATURE-----

[gentoo-dev] Re: [PATCH 0/5] RFC: Patches for wxwidgets.eclass

[Ryan Hill]

[-- Attachment #1: Type: text/plain, Size: 1040 bytes --]

On Wed, 3 Feb 2016 17:07:48 -0800
Daniel Campbell <zlg@gentoo.org> wrote:

> I see nothing wrong with discussing changes to parts of the tree that
> will affect other developers. Bugzilla is nice and all, but imo it's
> more of an AND thing instead of an OR thing. If the bug is already
> present, I see no real reason not to have a thread about it on g-dev.
> It keeps unrelated developers in the loop, as well, in the event that
> they come across weird eclass behavior or take on a project using a
> given eclass.
> 
> I guess if eclass discussion is a problem, one could always add a rule
> to whatever they use to filter their mail.

I had thought that this got sent to gentoo-dev but not to wxwidgets, and I got
the impression that patches were being proposed for our eclass only here, where
I would have missed them (I don't read this list).  I didn't notice until today
we were CC'd.  I didn't see these come through on that alias, but I think my
mailer is eating messages again.

Sorry for the noise.


-- 

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 951 bytes --]