public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in eclass: gnome2.eclass
@ 2009-02-17 16:05 Daniel Gryniewicz (dang)
  0 siblings, 0 replies; 16+ messages in thread
From: Daniel Gryniewicz (dang) @ 2009-02-17 16:05 UTC (permalink / raw
  To: gentoo-commits

dang        09/02/17 16:05:33

  Modified:             gnome2.eclass
  Log:
  Make gnome2.eclass EAPI 2 ready.  Bug #239123

Revision  Changes    Path
1.86                 eclass/gnome2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2.eclass?rev=1.86&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2.eclass?rev=1.86&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2.eclass?r1=1.85&r2=1.86

Index: gnome2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- gnome2.eclass	22 Mar 2008 10:19:05 -0000	1.85
+++ gnome2.eclass	17 Feb 2009 16:05:33 -0000	1.86
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.85 2008/03/22 10:19:05 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.86 2009/02/17 16:05:33 dang Exp $
 
 #
 # gnome2.eclass
@@ -14,6 +14,14 @@
 
 inherit fdo-mime libtool gnome.org gnome2-utils
 
+case "${EAPI:-0}" in
+	0|1)
+		EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
+		;;
+	*)
+		EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm
+		;;
+esac
 
 # Extra configure opts passed to econf
 G2CONF=${G2CONF:-""}
@@ -38,7 +46,10 @@
 gnome2_src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	has ${EAPI:-0} 0 1 && gnome2_src_prepare
+}
 
+gnome2_src_prepare() {
 	# Prevent scrollkeeper access violations
 	gnome2_omf_fix
 
@@ -67,7 +78,7 @@
 }
 
 gnome2_src_compile() {
-	gnome2_src_configure "$@"
+	has ${EAPI:-0} 0 1 && gnome2_src_configure "$@"
 	emake || die "compile failure"
 }
 
@@ -137,4 +148,3 @@
 }
 
 # pkg_prerm
-EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm






^ permalink raw reply	[flat|nested] 16+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: gnome2.eclass
@ 2010-04-26 19:37 Jonathan Callen (abcd)
  0 siblings, 0 replies; 16+ messages in thread
From: Jonathan Callen (abcd) @ 2010-04-26 19:37 UTC (permalink / raw
  To: gentoo-commits

abcd        10/04/26 19:37:25

  Modified:             gnome2.eclass
  Log:
  Add EAPI-3/Prefix support, bug #312531

Revision  Changes    Path
1.87                 eclass/gnome2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2.eclass?rev=1.87&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2.eclass?rev=1.87&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2.eclass?r1=1.86&r2=1.87

Index: gnome2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- gnome2.eclass	17 Feb 2009 16:05:33 -0000	1.86
+++ gnome2.eclass	26 Apr 2010 19:37:25 -0000	1.87
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.86 2009/02/17 16:05:33 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.87 2010/04/26 19:37:25 abcd Exp $
 
 #
 # gnome2.eclass
@@ -83,6 +83,7 @@
 }
 
 gnome2_src_install() {
+	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
 	# if this is not present, scrollkeeper-update may segfault and
 	# create bogus directories in /var/lib/
 	local sk_tmp_dir="/var/lib/scrollkeeper"
@@ -93,10 +94,10 @@
 
 	if [[ -z "${USE_EINSTALL}" || "${USE_EINSTALL}" = "0" ]]; then
 		debug-print "Installing with 'make install'"
-		emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${D}${sk_tmp_dir} " "$@" install || die "install failed"
+		emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" install || die "install failed"
 	else
 		debug-print "Installing with 'einstall'"
-		einstall "scrollkeeper_localstate_dir=${D}${sk_tmp_dir} " "$@" || die "einstall failed"
+		einstall "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" || die "einstall failed"
 	fi
 
 	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
@@ -106,15 +107,15 @@
 
 	# Do not keep /var/lib/scrollkeeper because:
 	# 1. The scrollkeeper database is regenerated at pkg_postinst()
-	# 2. ${D}/var/lib/scrollkeeper contains only indexes for the current pkg
+	# 2. ${ED}/var/lib/scrollkeeper contains only indexes for the current pkg
 	#    thus it makes no sense if pkg_postinst ISN'T run for some reason.
 	if [[ -z "$(find "${D}" -name '*.omf')" ]]; then
 		export SCROLLKEEPER_UPDATE="0"
 	fi
-	rm -rf "${D}${sk_tmp_dir}"
+	rm -rf "${ED}${sk_tmp_dir}"
 
 	# Make sure this one doesn't get in the portage db
-	rm -fr "${D}/usr/share/applications/mimeinfo.cache"
+	rm -fr "${ED}/usr/share/applications/mimeinfo.cache"
 }
 
 gnome2_pkg_preinst() {






^ permalink raw reply	[flat|nested] 16+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: gnome2.eclass
@ 2010-12-07  6:19 Gilles Dartiguelongue (eva)
  0 siblings, 0 replies; 16+ messages in thread
From: Gilles Dartiguelongue (eva) @ 2010-12-07  6:19 UTC (permalink / raw
  To: gentoo-commits

eva         10/12/07 06:19:54

  Modified:             gnome2.eclass
  Log:
  add die statement to dodir and dodoc

Revision  Changes    Path
1.89                 eclass/gnome2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.89&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.89&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?r1=1.88&r2=1.89

Index: gnome2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- gnome2.eclass	7 Dec 2010 06:18:55 -0000	1.88
+++ gnome2.eclass	7 Dec 2010 06:19:54 -0000	1.89
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.88 2010/12/07 06:18:55 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.89 2010/12/07 06:19:54 eva Exp $
 
 #
 # gnome2.eclass
@@ -87,7 +87,7 @@
 	# if this is not present, scrollkeeper-update may segfault and
 	# create bogus directories in /var/lib/
 	local sk_tmp_dir="/var/lib/scrollkeeper"
-	dodir "${sk_tmp_dir}"
+	dodir "${sk_tmp_dir}" || die "dodir failed"
 
 	# we must delay gconf schema installation due to sandbox
 	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
@@ -103,7 +103,9 @@
 	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 	# Manual document installation
-	[[ -n "${DOCS}" ]] && dodoc ${DOCS}
+	if [[ -n "${DOCS}" ]]; then
+		dodoc ${DOCS} || die "dodoc failed"
+	fi
 
 	# Do not keep /var/lib/scrollkeeper because:
 	# 1. The scrollkeeper database is regenerated at pkg_postinst()






^ permalink raw reply	[flat|nested] 16+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: gnome2.eclass
@ 2010-12-07  6:20 Gilles Dartiguelongue (eva)
  0 siblings, 0 replies; 16+ messages in thread
From: Gilles Dartiguelongue (eva) @ 2010-12-07  6:20 UTC (permalink / raw
  To: gentoo-commits

eva         10/12/07 06:20:40

  Modified:             gnome2.eclass
  Log:
  list supported EAPI explicitely

Revision  Changes    Path
1.90                 eclass/gnome2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.90&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.90&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?r1=1.89&r2=1.90

Index: gnome2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- gnome2.eclass	7 Dec 2010 06:19:54 -0000	1.89
+++ gnome2.eclass	7 Dec 2010 06:20:40 -0000	1.90
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.89 2010/12/07 06:19:54 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.90 2010/12/07 06:20:40 eva Exp $
 
 #
 # gnome2.eclass
@@ -18,9 +18,10 @@
 	0|1)
 		EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
 		;;
-	*)
+	2|3)
 		EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm
 		;;
+	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
 # Extra configure opts passed to econf






^ permalink raw reply	[flat|nested] 16+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: gnome2.eclass
@ 2011-04-09 13:14 Gilles Dartiguelongue (eva)
  0 siblings, 0 replies; 16+ messages in thread
From: Gilles Dartiguelongue (eva) @ 2011-04-09 13:14 UTC (permalink / raw
  To: gentoo-commits

eva         11/04/09 13:14:06

  Modified:             gnome2.eclass
  Log:
  Add eclass documentation.

Revision  Changes    Path
1.91                 eclass/gnome2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.91&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.91&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?r1=1.90&r2=1.91

Index: gnome2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- gnome2.eclass	7 Dec 2010 06:20:40 -0000	1.90
+++ gnome2.eclass	9 Apr 2011 13:14:06 -0000	1.91
@@ -1,16 +1,14 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.90 2010/12/07 06:20:40 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.91 2011/04/09 13:14:06 eva Exp $
 
-#
-# gnome2.eclass
-#
+# @ECLASS: gnome2.eclass
+# @MAINTAINER:
+# gnome@gentoo.org
+# @BLURB: 
+# @DESCRIPTION:
 # Exports portage base functions used by ebuilds written for packages using the
 # GNOME framework. For additional functions, see gnome2-utils.eclass.
-#
-# Maintained by Gentoo's GNOME herd <gnome@gentoo.org>
-#
-
 
 inherit fdo-mime libtool gnome.org gnome2-utils
 
@@ -24,18 +22,45 @@
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
+# @ECLASS-VARIABLE: G2CONF
+# @DEFAULT-UNSET
+# @DESCRIPTION:
 # Extra configure opts passed to econf
 G2CONF=${G2CONF:-""}
 
+# @ECLASS-VARIABLE: ELTCONF
+# @DEFAULT-UNSET
+# @DESCRIPTION:
 # Extra options passed to elibtoolize
 ELTCONF=${ELTCONF:-""}
 
+# @ECLASS-VARIABLE: USE_EINSTALL
+# @DEFAULT-UNSET
+# @DEPRECATED
+# @DESCRIPTION:
 # Should we use EINSTALL instead of DESTDIR
 USE_EINSTALL=${USE_EINSTALL:-""}
 
-# Run scrollkeeper for this package?
+# @ECLASS-VARIABLE: USE_EINSTALL
+# @DEPRECATED
+# @DESCRIPTION:
+# Whether to run scrollkeeper for this package or not.
 SCROLLKEEPER_UPDATE=${SCROLLKEEPER_UPDATE:-"1"}
 
+# @ECLASS-VARIABLE: DOCS
+# @DEFAULT-UNSET
+# @DESCRIPTION:
+# String containing documents passed to dodoc command.
+
+# @ECLASS-VARIABLE: GCONF_DEBUG
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Whether to handle debug or not.
+# Some gnome applications support various levels of debugging (yes, no, minimum,
+# etc), but using --disable-debug also removes g_assert which makes debugging
+# harder. This variable should be set to yes for such packages for the eclass
+# to handle it properly. It will enable minimal debug with USE=-debug.
+# Note that this is most commonly found in configure.ac as GNOME_DEBUG_CHECK.
 
 
 if [[ ${GCONF_DEBUG} != "no" ]]; then
@@ -43,13 +68,18 @@
 fi
 
 
-
+# @FUNCTION: gnome2_src_unpack
+# @DESCRIPTION:
+# Stub function for old EAPI.
 gnome2_src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	has ${EAPI:-0} 0 1 && gnome2_src_prepare
 }
 
+# @FUNCTION: gnome2_src_prepare
+# @DESCRIPTION:
+# Fix build of scrollkeeper documentation and run elibtoolize.
 gnome2_src_prepare() {
 	# Prevent scrollkeeper access violations
 	gnome2_omf_fix
@@ -58,6 +88,9 @@
 	elibtoolize ${ELTCONF}
 }
 
+# @FUNCTION: gnome2_src_configure
+# @DESCRIPTION:
+# Gnome specific configure handling
 gnome2_src_configure() {
 	# Update the GNOME configuration options
 	if [[ ${GCONF_DEBUG} != 'no' ]] ; then
@@ -78,11 +111,18 @@
 	GST_REGISTRY="${S}/registry.xml" econf "$@" ${G2CONF} || die "configure failed"
 }
 
+# @FUNCTION: gnome2_src_compile
+# @DESCRIPTION:
+# Stub function for old EAPI.
 gnome2_src_compile() {
 	has ${EAPI:-0} 0 1 && gnome2_src_configure "$@"
 	emake || die "compile failure"
 }
 
+# @FUNCTION: gnome2_src_install
+# @DESCRIPTION:
+# Gnome specific install. Handles typical GConf and scrollkeeper setup
+# in packages.
 gnome2_src_install() {
 	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
 	# if this is not present, scrollkeeper-update may segfault and
@@ -121,12 +161,19 @@
 	rm -fr "${ED}/usr/share/applications/mimeinfo.cache"
 }
 
+# @FUNCTION: gnome2_pkg_preinst
+# @DESCRIPTION:
+# Finds Icons, GConf and GSettings schemas for later handling in pkg_postinst
 gnome2_pkg_preinst() {
 	gnome2_gconf_savelist
 	gnome2_icon_savelist
 	gnome2_schemas_savelist
 }
 
+# @FUNCTION: gnome2_pkg_postinst
+# @DESCRIPTION:
+# Handle scrollkeeper, GConf, GSettings, Icons, desktop and mime
+# database updates.
 gnome2_pkg_postinst() {
 	gnome2_gconf_install
 	fdo-mime_desktop_database_update
@@ -139,10 +186,16 @@
 	fi
 }
 
+# @#FUNCTION: gnome2_pkg_prerm
+# @#DESCRIPTION:
+# # FIXME Handle GConf schemas removal
 #gnome2_pkg_prerm() {
 #	gnome2_gconf_uninstall
 #}
 
+# @FUNCTION: gnome2_pkg_postrm
+# @DESCRIPTION:
+# Handle scrollkeeper, GSettings, Icons, desktop and mime database updates.
 gnome2_pkg_postrm() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
@@ -153,5 +206,3 @@
 		gnome2_scrollkeeper_update
 	fi
 }
-
-# pkg_prerm






^ permalink raw reply	[flat|nested] 16+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: gnome2.eclass
@ 2011-04-21 20:58 Gilles Dartiguelongue (eva)
  0 siblings, 0 replies; 16+ messages in thread
From: Gilles Dartiguelongue (eva) @ 2011-04-21 20:58 UTC (permalink / raw
  To: gentoo-commits

eva         11/04/21 20:58:58

  Modified:             gnome2.eclass
  Log:
  Drop die for econf, econf dies on its own.

Revision  Changes    Path
1.92                 eclass/gnome2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.92&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.92&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?r1=1.91&r2=1.92

Index: gnome2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- gnome2.eclass	9 Apr 2011 13:14:06 -0000	1.91
+++ gnome2.eclass	21 Apr 2011 20:58:58 -0000	1.92
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.91 2011/04/09 13:14:06 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.92 2011/04/21 20:58:58 eva Exp $
 
 # @ECLASS: gnome2.eclass
 # @MAINTAINER:
@@ -108,7 +108,7 @@
 	addwrite "/root/.gnome2"
 
 	# GST_REGISTRY is to work around gst-inspect trying to read/write /root
-	GST_REGISTRY="${S}/registry.xml" econf "$@" ${G2CONF} || die "configure failed"
+	GST_REGISTRY="${S}/registry.xml" econf "$@" ${G2CONF}
 }
 
 # @FUNCTION: gnome2_src_compile






^ permalink raw reply	[flat|nested] 16+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: gnome2.eclass
@ 2011-04-21 21:06 Gilles Dartiguelongue (eva)
  0 siblings, 0 replies; 16+ messages in thread
From: Gilles Dartiguelongue (eva) @ 2011-04-21 21:06 UTC (permalink / raw
  To: gentoo-commits

eva         11/04/21 21:06:15

  Modified:             gnome2.eclass
  Log:
  Enable stupid/basic EAPI=4 support.

Revision  Changes    Path
1.94                 eclass/gnome2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.94&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.94&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?r1=1.93&r2=1.94

Index: gnome2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- gnome2.eclass	21 Apr 2011 20:59:59 -0000	1.93
+++ gnome2.eclass	21 Apr 2011 21:06:15 -0000	1.94
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.93 2011/04/21 20:59:59 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.94 2011/04/21 21:06:15 eva Exp $
 
 # @ECLASS: gnome2.eclass
 # @MAINTAINER:
@@ -16,7 +16,7 @@
 	0|1)
 		EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
 		;;
-	2|3)
+	2|3|4)
 		EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm
 		;;
 	*) die "EAPI=${EAPI} is not supported" ;;
@@ -85,7 +85,13 @@
 	gnome2_omf_fix
 
 	# Run libtoolize
-	elibtoolize ${ELTCONF}
+	if has ${EAPI:-0} 0 1 2 3; then
+		elibtoolize ${ELTCONF}
+	else
+		# Everything is fatal EAPI 4 onwards
+		nonfatal elibtoolize ${ELTCONF}
+	fi
+
 }
 
 # @FUNCTION: gnome2_src_configure






^ permalink raw reply	[flat|nested] 16+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: gnome2.eclass
@ 2011-04-21 21:27 Gilles Dartiguelongue (eva)
  0 siblings, 0 replies; 16+ messages in thread
From: Gilles Dartiguelongue (eva) @ 2011-04-21 21:27 UTC (permalink / raw
  To: gentoo-commits

eva         11/04/21 21:27:40

  Modified:             gnome2.eclass
  Log:
  Add GNOME2_LA_PUNT support from the overlay.

Revision  Changes    Path
1.95                 eclass/gnome2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.95&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.95&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?r1=1.94&r2=1.95

Index: gnome2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- gnome2.eclass	21 Apr 2011 21:06:15 -0000	1.94
+++ gnome2.eclass	21 Apr 2011 21:27:40 -0000	1.95
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.94 2011/04/21 21:06:15 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.95 2011/04/21 21:27:40 eva Exp $
 
 # @ECLASS: gnome2.eclass
 # @MAINTAINER:
@@ -28,6 +28,12 @@
 # Extra configure opts passed to econf
 G2CONF=${G2CONF:-""}
 
+# @ECLASS-VARIABLE: GNOME2_LA_PUNT
+# @DESCRIPTION:
+# Should we delete all the .la files?
+# NOT to be used without due consideration.
+GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-"no"}
+
 # @ECLASS-VARIABLE: ELTCONF
 # @DEFAULT-UNSET
 # @DESCRIPTION:
@@ -128,7 +134,7 @@
 # @FUNCTION: gnome2_src_install
 # @DESCRIPTION:
 # Gnome specific install. Handles typical GConf and scrollkeeper setup
-# in packages.
+# in packages and removal of .la files if requested
 gnome2_src_install() {
 	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
 	# if this is not present, scrollkeeper-update may segfault and
@@ -165,6 +171,13 @@
 
 	# Make sure this one doesn't get in the portage db
 	rm -fr "${ED}/usr/share/applications/mimeinfo.cache"
+
+	# Delete all .la files
+	if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then
+		ebegin "Removing .la files"
+		find "${ED}" -name '*.la' -delete || die "la file removal failed"
+		eend
+	fi
 }
 
 # @FUNCTION: gnome2_pkg_preinst






^ permalink raw reply	[flat|nested] 16+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: gnome2.eclass
@ 2011-04-22 11:04 Nirbheek Chauhan (nirbheek)
  0 siblings, 0 replies; 16+ messages in thread
From: Nirbheek Chauhan (nirbheek) @ 2011-04-22 11:04 UTC (permalink / raw
  To: gentoo-commits

nirbheek    11/04/22 11:04:13

  Modified:             gnome2.eclass
  Log:
  Fix la file removal 'find' call to not use GNU find options, and not require EAPI 3

Revision  Changes    Path
1.96                 eclass/gnome2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.96&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.96&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?r1=1.95&r2=1.96

Index: gnome2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- gnome2.eclass	21 Apr 2011 21:27:40 -0000	1.95
+++ gnome2.eclass	22 Apr 2011 11:04:13 -0000	1.96
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.95 2011/04/21 21:27:40 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.96 2011/04/22 11:04:13 nirbheek Exp $
 
 # @ECLASS: gnome2.eclass
 # @MAINTAINER:
@@ -175,7 +175,7 @@
 	# Delete all .la files
 	if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then
 		ebegin "Removing .la files"
-		find "${ED}" -name '*.la' -delete || die "la file removal failed"
+		find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
 		eend
 	fi
 }






^ permalink raw reply	[flat|nested] 16+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: gnome2.eclass
@ 2011-07-15 17:31 Zac Medico (zmedico)
  0 siblings, 0 replies; 16+ messages in thread
From: Zac Medico (zmedico) @ 2011-07-15 17:31 UTC (permalink / raw
  To: gentoo-commits

zmedico     11/07/15 17:31:37

  Modified:             gnome2.eclass
  Log:
  Bug #345659 - fix hardcoded /root/.gnome2
  
  This uses a special $(unset HOME; echo ~) trick to query the home
  directory that gnome-vfs uses from the password database, as suggested
  by Jonathan Callen <abcd@gentoo.org> in bug 345659, comment #24.

Revision  Changes    Path
1.98                 eclass/gnome2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.98&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.98&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?r1=1.97&r2=1.98

Index: gnome2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- gnome2.eclass	8 Jul 2011 11:35:01 -0000	1.97
+++ gnome2.eclass	15 Jul 2011 17:31:37 -0000	1.98
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.97 2011/07/08 11:35:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.98 2011/07/15 17:31:37 zmedico Exp $
 
 # @ECLASS: gnome2.eclass
 # @MAINTAINER:
@@ -116,8 +116,8 @@
 		G2CONF="${G2CONF} $(use_enable doc gtk-doc)"
 	fi
 
-	# Avoid sandbox violations caused by misbehaving packages (bug #128289)
-	addwrite "/root/.gnome2"
+	# Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659)
+	addwrite "$(unset HOME; echo ~)/.gnome2"
 
 	# GST_REGISTRY is to work around gst-inspect trying to read/write /root
 	GST_REGISTRY="${S}/registry.xml" econf "$@" ${G2CONF}






^ permalink raw reply	[flat|nested] 16+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: gnome2.eclass
@ 2011-08-14  3:46 Nirbheek Chauhan (nirbheek)
  0 siblings, 0 replies; 16+ messages in thread
From: Nirbheek Chauhan (nirbheek) @ 2011-08-14  3:46 UTC (permalink / raw
  To: gentoo-commits

nirbheek    11/08/14 03:46:33

  Modified:             gnome2.eclass
  Log:
  For ebuilds with USE=static-libs, remove .la files conditionally for GNOME2_LA_PUNT

Revision  Changes    Path
1.99                 eclass/gnome2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.99&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.99&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?r1=1.98&r2=1.99

Index: gnome2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- gnome2.eclass	15 Jul 2011 17:31:37 -0000	1.98
+++ gnome2.eclass	14 Aug 2011 03:46:33 -0000	1.99
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.98 2011/07/15 17:31:37 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.99 2011/08/14 03:46:33 nirbheek Exp $
 
 # @ECLASS: gnome2.eclass
 # @MAINTAINER:
@@ -175,7 +175,9 @@
 	# Delete all .la files
 	if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then
 		ebegin "Removing .la files"
-		find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+		if ! { has static-libs ${IUSE//+} && use static-libs; }; then
+			find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+		fi
 		eend
 	fi
 }






^ permalink raw reply	[flat|nested] 16+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: gnome2.eclass
@ 2011-08-24  7:12 Arun Raghavan (ford_prefect)
  0 siblings, 0 replies; 16+ messages in thread
From: Arun Raghavan (ford_prefect) @ 2011-08-24  7:12 UTC (permalink / raw
  To: gentoo-commits

ford_prefect    11/08/24 07:12:35

  Modified:             gnome2.eclass
  Log:
  Move GST_REGISTRY export to src_prepare
  
  We might end up calling gst functions anywhere (gupnp-dlna calls it in
  documentation generation, for example).

Revision  Changes    Path
1.100                eclass/gnome2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.100&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.100&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?r1=1.99&r2=1.100

Index: gnome2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- gnome2.eclass	14 Aug 2011 03:46:33 -0000	1.99
+++ gnome2.eclass	24 Aug 2011 07:12:35 -0000	1.100
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.99 2011/08/14 03:46:33 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.100 2011/08/24 07:12:35 ford_prefect Exp $
 
 # @ECLASS: gnome2.eclass
 # @MAINTAINER:
@@ -85,8 +85,12 @@
 
 # @FUNCTION: gnome2_src_prepare
 # @DESCRIPTION:
-# Fix build of scrollkeeper documentation and run elibtoolize.
+# Prepare environment for build, fix build of scrollkeeper documentation,
+# run elibtoolize.
 gnome2_src_prepare() {
+	# GST_REGISTRY is to work around gst utilities trying to read/write /root
+	export GST_REGISTRY="${S}/registry.xml"
+
 	# Prevent scrollkeeper access violations
 	gnome2_omf_fix
 
@@ -119,8 +123,7 @@
 	# Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659)
 	addwrite "$(unset HOME; echo ~)/.gnome2"
 
-	# GST_REGISTRY is to work around gst-inspect trying to read/write /root
-	GST_REGISTRY="${S}/registry.xml" econf "$@" ${G2CONF}
+	econf "$@" ${G2CONF}
 }
 
 # @FUNCTION: gnome2_src_compile






^ permalink raw reply	[flat|nested] 16+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: gnome2.eclass
@ 2011-08-25 18:08 Nirbheek Chauhan (nirbheek)
  0 siblings, 0 replies; 16+ messages in thread
From: Nirbheek Chauhan (nirbheek) @ 2011-08-25 18:08 UTC (permalink / raw
  To: gentoo-commits

nirbheek    11/08/25 18:08:59

  Modified:             gnome2.eclass
  Log:
  Use ${T} instead of ${S} for the gstreamer registry

Revision  Changes    Path
1.101                eclass/gnome2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.101&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.101&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?r1=1.100&r2=1.101

Index: gnome2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- gnome2.eclass	24 Aug 2011 07:12:35 -0000	1.100
+++ gnome2.eclass	25 Aug 2011 18:08:59 -0000	1.101
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.100 2011/08/24 07:12:35 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.101 2011/08/25 18:08:59 nirbheek Exp $
 
 # @ECLASS: gnome2.eclass
 # @MAINTAINER:
@@ -89,7 +89,7 @@
 # run elibtoolize.
 gnome2_src_prepare() {
 	# GST_REGISTRY is to work around gst utilities trying to read/write /root
-	export GST_REGISTRY="${S}/registry.xml"
+	export GST_REGISTRY="${T}/registry.xml"
 
 	# Prevent scrollkeeper access violations
 	gnome2_omf_fix






^ permalink raw reply	[flat|nested] 16+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: gnome2.eclass
@ 2011-09-25 15:15 Pacho Ramos (pacho)
  0 siblings, 0 replies; 16+ messages in thread
From: Pacho Ramos (pacho) @ 2011-09-25 15:15 UTC (permalink / raw
  To: gentoo-commits

pacho       11/09/25 15:15:21

  Modified:             gnome2.eclass
  Log:
  Pass --disable-maintainer-mode when needed, thanks to Nirbheek for his help.

Revision  Changes    Path
1.102                eclass/gnome2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.102&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.102&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?r1=1.101&r2=1.102

Index: gnome2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- gnome2.eclass	25 Aug 2011 18:08:59 -0000	1.101
+++ gnome2.eclass	25 Sep 2011 15:15:21 -0000	1.102
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.101 2011/08/25 18:08:59 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.102 2011/09/25 15:15:21 pacho Exp $
 
 # @ECLASS: gnome2.eclass
 # @MAINTAINER:
@@ -120,6 +120,11 @@
 		G2CONF="${G2CONF} $(use_enable doc gtk-doc)"
 	fi
 
+	# Pass --disable-maintainer-mode when needed
+	if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" configure.*; then
+		G2CONF="${G2CONF} --disable-maintainer-mode"
+	fi
+
 	# Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659)
 	addwrite "$(unset HOME; echo ~)/.gnome2"
 






^ permalink raw reply	[flat|nested] 16+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: gnome2.eclass
@ 2012-12-05 23:41 Doug Goldstein (cardoe)
  0 siblings, 0 replies; 16+ messages in thread
From: Doug Goldstein (cardoe) @ 2012-12-05 23:41 UTC (permalink / raw
  To: gentoo-commits

cardoe      12/12/05 23:41:52

  Modified:             gnome2.eclass
  Log:
  The gnome2.eclass checks the configure script for certain items and
  adjusts the arguments to econf based on those checks. Unfortunately
  when checking the configure script it did not respect ECONF_SOURCE.

Revision  Changes    Path
1.116                eclass/gnome2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.116&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.116&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?r1=1.115&r2=1.116

Index: gnome2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- gnome2.eclass	2 Dec 2012 11:07:09 -0000	1.115
+++ gnome2.eclass	5 Dec 2012 23:41:52 -0000	1.116
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.115 2012/12/02 11:07:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.116 2012/12/05 23:41:52 cardoe Exp $
 
 # @ECLASS: gnome2.eclass
 # @MAINTAINER:
@@ -129,7 +129,7 @@
 	# Remember to drop 'doc' USE flag from your package if it was only used to
 	# rebuild docs.
 	# Preserve old behavior for older EAPI.
-	if grep -q "enable-gtk-doc" configure ; then
+	if grep -q "enable-gtk-doc" ${ECONF_SOURCE:-.}/configure ; then
 		if has ${EAPI-0} 0 1 2 3 4 && has doc ${IUSE} ; then
 			G2CONF="${G2CONF} $(use_enable doc gtk-doc)"
 		else
@@ -138,24 +138,25 @@
 	fi
 
 	# Pass --disable-maintainer-mode when needed
-	if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" configure.*; then
+	if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" \
+		${ECONF_SOURCE:-.}/configure.*; then
 		G2CONF="${G2CONF} --disable-maintainer-mode"
 	fi
 
 	# Pass --disable-scrollkeeper when possible
-	if grep -q "disable-scrollkeeper" configure; then
+	if grep -q "disable-scrollkeeper" ${ECONF_SOURCE:-.}/configure; then
 		G2CONF="${G2CONF} --disable-scrollkeeper"
 	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" configure; then
+		if grep -q "disable-silent-rules" ${ECONF_SOURCE:-.}/configure; then
 			G2CONF="${G2CONF} --disable-silent-rules"
 		fi
 	fi
 
 	# Pass --disable-schemas-install when possible
-	if grep -q "disable-schemas-install" configure; then
+	if grep -q "disable-schemas-install" ${ECONF_SOURCE:-.}/configure; then
 		G2CONF="${G2CONF} --disable-schemas-install"
 	fi
 





^ permalink raw reply	[flat|nested] 16+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: gnome2.eclass
@ 2013-05-23 19:31 Mike Frysinger (vapier)
  0 siblings, 0 replies; 16+ messages in thread
From: Mike Frysinger (vapier) @ 2013-05-23 19:31 UTC (permalink / raw
  To: gentoo-commits

vapier      13/05/23 19:31:13

  Modified:             gnome2.eclass
  Log:
  quote $ECONF_SOURCE

Revision  Changes    Path
1.121                eclass/gnome2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.121&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.121&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?r1=1.120&r2=1.121

Index: gnome2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- gnome2.eclass	16 Jan 2013 23:01:02 -0000	1.120
+++ gnome2.eclass	23 May 2013 19:31:12 -0000	1.121
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.120 2013/01/16 23:01:02 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.121 2013/05/23 19:31:12 vapier Exp $
 
 # @ECLASS: gnome2.eclass
 # @MAINTAINER:
@@ -122,7 +122,7 @@
 	# Remember to drop 'doc' USE flag from your package if it was only used to
 	# rebuild docs.
 	# Preserve old behavior for older EAPI.
-	if grep -q "enable-gtk-doc" ${ECONF_SOURCE:-.}/configure ; then
+	if grep -q "enable-gtk-doc" "${ECONF_SOURCE:-.}"/configure ; then
 		if has ${EAPI:-0} 0 1 2 3 4 && in_iuse doc ; then
 			G2CONF="$(use_enable doc gtk-doc) ${G2CONF}"
 		else
@@ -132,29 +132,29 @@
 
 	# Pass --disable-maintainer-mode when needed
 	if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" \
-		${ECONF_SOURCE:-.}/configure.*; then
+		"${ECONF_SOURCE:-.}"/configure.*; then
 		G2CONF="--disable-maintainer-mode ${G2CONF}"
 	fi
 
 	# Pass --disable-scrollkeeper when possible
-	if grep -q "disable-scrollkeeper" ${ECONF_SOURCE:-.}/configure; then
+	if grep -q "disable-scrollkeeper" "${ECONF_SOURCE:-.}"/configure; then
 		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
+		if grep -q "disable-silent-rules" "${ECONF_SOURCE:-.}"/configure; then
 			G2CONF="--disable-silent-rules ${G2CONF}"
 		fi
 	fi
 
 	# Pass --disable-schemas-install when possible
-	if grep -q "disable-schemas-install" ${ECONF_SOURCE:-.}/configure; then
+	if grep -q "disable-schemas-install" "${ECONF_SOURCE:-.}"/configure; then
 		G2CONF="--disable-schemas-install ${G2CONF}"
 	fi
 
 	# Pass --disable-schemas-compile when possible
-	if grep -q "disable-schemas-compile" ${ECONF_SOURCE:-.}/configure; then
+	if grep -q "disable-schemas-compile" "${ECONF_SOURCE:-.}"/configure; then
 		G2CONF="--disable-schemas-compile ${G2CONF}"
 	fi
 





^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2013-05-23 19:31 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-07  6:19 [gentoo-commits] gentoo-x86 commit in eclass: gnome2.eclass Gilles Dartiguelongue (eva)
  -- strict thread matches above, loose matches on Subject: below --
2013-05-23 19:31 Mike Frysinger (vapier)
2012-12-05 23:41 Doug Goldstein (cardoe)
2011-09-25 15:15 Pacho Ramos (pacho)
2011-08-25 18:08 Nirbheek Chauhan (nirbheek)
2011-08-24  7:12 Arun Raghavan (ford_prefect)
2011-08-14  3:46 Nirbheek Chauhan (nirbheek)
2011-07-15 17:31 Zac Medico (zmedico)
2011-04-22 11:04 Nirbheek Chauhan (nirbheek)
2011-04-21 21:27 Gilles Dartiguelongue (eva)
2011-04-21 21:06 Gilles Dartiguelongue (eva)
2011-04-21 20:58 Gilles Dartiguelongue (eva)
2011-04-09 13:14 Gilles Dartiguelongue (eva)
2010-12-07  6:20 Gilles Dartiguelongue (eva)
2010-04-26 19:37 Jonathan Callen (abcd)
2009-02-17 16:05 Daniel Gryniewicz (dang)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox