[gentoo-dev] [PATCH 0/4] gnome2.eclass updates

[gentoo-dev] [PATCH 0/4] gnome2.eclass updates

[Gilles Dartiguelongue]

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

Hi list,

here are a couple of patches to fix some bad behavior of the gnome2.eclass.

They have been sitting in the overlay for a while and I don't expect them to
cause any problem so I will commit then later today if nobody objects.

Gilles Dartiguelongue (4):
  eclass/gnome2.eclass: switch IUSE tests to in_iuse, bug #383901
  eclass/gnome2.eclass: drop deprecated SCROLLKEEPER_UPDATE
  eclass/gnome2.eclass: allow ebuild override of eclass generated econf
  eclass/gnome2.eclass: update wrt comment on bug #383901

 eclass/gnome2.eclass | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

-- 
1.8.1

-- 
Gilles Dartiguelongue <eva@gentoo.org>
Gentoo

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

[gentoo-dev] [PATCH 1/4] switch IUSE tests to in_iuse, bug #383901

[Gilles Dartiguelongue]

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


has bla ${IUSE} is "standardized" through in_iuse. Make use of this function.

---
 eclass/gnome2.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 70eb491..e263232 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -158,7 +158,7 @@ gnome2_src_configure() {
 	# rebuild docs.
 	# Preserve old behavior for older EAPI.
 	if grep -q "enable-gtk-doc" ${ECONF_SOURCE:-.}/configure ; then
-		if has ${EAPI-0} 0 1 2 3 4 && has doc ${IUSE} ; then
+		if has ${EAPI:-0} 0 1 2 3 4 && in_iuse doc ; then
 			G2CONF="${G2CONF} $(use_enable doc gtk-doc)"
 		else
 			G2CONF="${G2CONF} --disable-gtk-doc"
@@ -266,7 +266,7 @@ gnome2_src_install() {
 	if has ${EAPI:-0} 0 1 2 3 4; then
 		if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then
 			ebegin "Removing .la files"
-			if ! { has static-libs ${IUSE//+} && use static-libs; }; then
+			if ! { in_iuse static-libs && use static-libs; }; then
 				find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
 			fi
 			eend
-- 
1.8.1


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

[gentoo-dev] [PATCH 2/4] drop deprecated SCROLLKEEPER_UPDATE

[Gilles Dartiguelongue]

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


SCROLLKEEPER_UPDATE variable was deprecated long ago. It is no longer needed
and no longer in use in tree.

---
 eclass/gnome2.eclass | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index e263232..e2540d1 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -68,12 +68,6 @@ ELTCONF=${ELTCONF:-""}
 # Should we use EINSTALL instead of DESTDIR
 USE_EINSTALL=${USE_EINSTALL:-""}
 
-# @ECLASS-VARIABLE: SCROLLKEEPER_UPDATE
-# @DEPRECATED
-# @DESCRIPTION:
-# Whether to run scrollkeeper for this package or not.
-SCROLLKEEPER_UPDATE=${SCROLLKEEPER_UPDATE:-"1"}
-
 # @ECLASS-VARIABLE: DOCS
 # @DEFAULT-UNSET
 # @DESCRIPTION:
-- 
1.8.1


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

[gentoo-dev] [PATCH 3/4] allow ebuild override of eclass generated econf

[Gilles Dartiguelongue]

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


gnome2.eclass appends configure switches to user arguments.
Change logic so that it prepends values to G2CONF and pass extra args
of 
gnome2_src_configure after G2CONF so that ebuilds can indeed override
eclass
settings.

---
 eclass/gnome2.eclass | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index e2540d1..750f20b 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -140,7 +140,7 @@ gnome2_src_configure() {
 	# Update the GNOME configuration options
 	if [[ ${GCONF_DEBUG} != 'no' ]] ; then
 		if use debug ; then
-			G2CONF="${G2CONF} --enable-debug=yes"
+			G2CONF="--enable-debug=yes ${G2CONF}"
 		fi
 	fi
 
@@ -153,44 +153,44 @@ gnome2_src_configure() {
 	# Preserve old behavior for older EAPI.
 	if grep -q "enable-gtk-doc" ${ECONF_SOURCE:-.}/configure ; then
 		if has ${EAPI:-0} 0 1 2 3 4 && in_iuse doc ; then
-			G2CONF="${G2CONF} $(use_enable doc gtk-doc)"
+			G2CONF="$(use_enable doc gtk-doc) ${G2CONF}"
 		else
-			G2CONF="${G2CONF} --disable-gtk-doc"
+			G2CONF="--disable-gtk-doc ${G2CONF}"
 		fi
 	fi
 
 	# Pass --disable-maintainer-mode when needed
 	if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" \
 		${ECONF_SOURCE:-.}/configure.*; then
-		G2CONF="${G2CONF} --disable-maintainer-mode"
+		G2CONF="--disable-maintainer-mode ${G2CONF}"
 	fi
 
 	# Pass --disable-scrollkeeper when possible
 	if grep -q "disable-scrollkeeper" ${ECONF_SOURCE:-.}/configure; then
-		G2CONF="${G2CONF} --disable-scrollkeeper"
+		G2CONF="--disable-scrollkeeper ${G2CONF}"
 	fi
 
 	# Pass --disable-silent-rules when possible (not needed for eapi5),
bug #429308
 	if has ${EAPI:-0} 0 1 2 3 4; then
 		if grep -q "disable-silent-rules" ${ECONF_SOURCE:-.}/configure; then
-			G2CONF="${G2CONF} --disable-silent-rules"
+			G2CONF="--disable-silent-rules ${G2CONF}"
 		fi
 	fi
 
 	# Pass --disable-schemas-install when possible
 	if grep -q "disable-schemas-install" ${ECONF_SOURCE:-.}/configure;
then
-		G2CONF="${G2CONF} --disable-schemas-install"
+		G2CONF="--disable-schemas-install ${G2CONF}"
 	fi
 
 	# Pass --disable-schemas-compile when possible
 	if grep -q "disable-schemas-compile" ${ECONF_SOURCE:-.}/configure;
then
-		G2CONF="${G2CONF} --disable-schemas-compile"
+		G2CONF="--disable-schemas-compile ${G2CONF}"
 	fi
 
 	# Avoid sandbox violations caused by gnome-vfs (bug #128289 and
#345659)
 	addwrite "$(unset HOME; echo ~)/.gnome2"
 
-	econf "$@" ${G2CONF}
+	econf ${G2CONF} "$@"
 }
 
 # @FUNCTION: gnome2_src_compile
-- 
1.8.1


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

[gentoo-dev] [PATCH 4/4] update wrt comment on bug #383901

[Gilles Dartiguelongue]

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


Update previous patch fixing bug #383901 with comments on this bug.

---
 eclass/gnome2.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 750f20b..592585c 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -260,7 +260,7 @@ gnome2_src_install() {
 	if has ${EAPI:-0} 0 1 2 3 4; then
 		if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then
 			ebegin "Removing .la files"
-			if ! { in_iuse static-libs && use static-libs; }; then
+			if ! use_if_iuse static-libs ; then
 				find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
 			fi
 			eend
-- 
1.8.1


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [gentoo-dev] [PATCH 1/4] switch IUSE tests to in_iuse, bug #383901

[Ciaran McCreesh]

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

On Sun, 13 Jan 2013 20:03:20 +0100
Gilles Dartiguelongue <eva@gentoo.org> wrote:
> -		if has ${EAPI-0} 0 1 2 3 4 && has doc ${IUSE} ; then
> +		if has ${EAPI:-0} 0 1 2 3 4 && in_iuse doc ; then

This is still wrong... You can't use IUSE like that.

-- 
Ciaran McCreesh

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [gentoo-dev] [PATCH 1/4] switch IUSE tests to in_iuse, bug #383901

[Michał Górny]

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

On Sun, 13 Jan 2013 19:09:05 +0000
Ciaran McCreesh <ciaran.mccreesh@googlemail.com> wrote:

> On Sun, 13 Jan 2013 20:03:20 +0100
> Gilles Dartiguelongue <eva@gentoo.org> wrote:
> > -		if has ${EAPI-0} 0 1 2 3 4 && has doc ${IUSE} ; then
> > +		if has ${EAPI:-0} 0 1 2 3 4 && in_iuse doc ; then
> 
> This is still wrong... You can't use IUSE like that.

We missed you!

-- 
Best regards,
Michał Górny

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 316 bytes --]

Re: [gentoo-dev] [PATCH 1/4] switch IUSE tests to in_iuse, bug #383901

[Gilles Dartiguelongue]

Le dimanche 13 janvier 2013 à 19:09 +0000, Ciaran McCreesh a écrit :
> On Sun, 13 Jan 2013 20:03:20 +0100
> Gilles Dartiguelongue <eva@gentoo.org> wrote:
> > -		if has ${EAPI-0} 0 1 2 3 4 && has doc ${IUSE} ; then
> > +		if has ${EAPI:-0} 0 1 2 3 4 && in_iuse doc ; then
> 
> This is still wrong... You can't use IUSE like that.
> 

I think this debate has already happened on this very list.

I don't presently want to fix your particular issues with that solution
but at the very least we can use the same "hack" (if you will)
everywhere so it is more easy to search for and eventually fix later on.

-- 
Gilles Dartiguelongue <eva@gentoo.org>
Gentoo

Re: [gentoo-dev] [PATCH 1/4] switch IUSE tests to in_iuse, bug #383901

[Ciaran McCreesh]

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

On Sun, 13 Jan 2013 20:35:59 +0100
Gilles Dartiguelongue <eva@gentoo.org> wrote:
> Le dimanche 13 janvier 2013 à 19:09 +0000, Ciaran McCreesh a écrit :
> > On Sun, 13 Jan 2013 20:03:20 +0100
> > Gilles Dartiguelongue <eva@gentoo.org> wrote:
> > > -		if has ${EAPI-0} 0 1 2 3 4 && has doc ${IUSE} ;
> > > then
> > > +		if has ${EAPI:-0} 0 1 2 3 4 && in_iuse doc ; then
> > 
> > This is still wrong... You can't use IUSE like that.
> > 
> 
> I think this debate has already happened on this very list.

Yes, it has, and the conclusion was that in_iuse was not to be used in
the way that you're using it.

-- 
Ciaran McCreesh

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]