[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      07/10/10 20:34:09

  Modified:             eutils.eclass
  Log:
  add back in message for people to delete old SONAMEs of libs #159245

Revision  Changes    Path
1.291                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- eutils.eclass	1 Oct 2007 13:16:44 -0000	1.290
+++ eutils.eclass	10 Oct 2007 20:34:08 -0000	1.291
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.290 2007/10/01 13:16:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.291 2007/10/10 20:34:08 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1615,6 +1615,11 @@
 		fi
 		ewarn "  # revdep-rebuild --library ${lib##*/}"
 	done
+	if [[ ${notice} -eq 1 ]] ; then
+		ewarn
+		ewarn "Once you've finished running revdep-rebuild, it should be safe to"
+		ewarn "delete the old libraries."
+	fi
 }
 
 # @FUNCTION: built_with_use



-- 
gentoo-commits@gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      07/10/14 21:55:35

  Modified:             eutils.eclass
  Log:
  fix from James Le Cuirot to check to see if the directory to search exists before searching it to avoid confusing messages being posted #195864

Revision  Changes    Path
1.292                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- eutils.eclass	10 Oct 2007 20:34:08 -0000	1.291
+++ eutils.eclass	14 Oct 2007 21:55:35 -0000	1.292
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.291 2007/10/10 20:34:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.292 2007/10/14 21:55:35 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1477,6 +1477,7 @@
 					! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
 					&& continue
 				point=${point//\040/ }
+				[[ ! -d ${point}/${dir} ]] && continue
 				[[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
 				export CDROM_ROOT=${point}
 				export CDROM_SET=${i}



-- 
gentoo-commits@gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Chris Gianelloni (wolf31o2)]

wolf31o2    07/11/20 22:32:02

  Modified:             eutils.eclass
  Log:
  Added a couple minor fixes for make_desktop_entry to clean it up, per discussion on the gentoo-dev mailing list.  This closes bug #181999 and bug #197891.  Thanks to Carsten Lohrke <carlo@gentoo.org>, Samuli Suominen <drac@gentoo.org, and Daniel Pielmeier <daniel.pielmeier@googlemail.com>.

Revision  Changes    Path
1.293                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- eutils.eclass	14 Oct 2007 21:55:35 -0000	1.292
+++ eutils.eclass	20 Nov 2007 22:32:01 -0000	1.293
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.292 2007/10/14 21:55:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.293 2007/11/20 22:32:01 wolf31o2 Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -741,7 +741,7 @@
 
 	local exec=${1}
 	local name=${2:-${PN}}
-	local icon=${3:-${PN}.png}
+	local icon=${3:-${PN}}
 	local type=${4}
 	local path=${5}
 
@@ -875,18 +875,18 @@
 
 	cat <<-EOF > "${desktop}"
 	[Desktop Entry]
-	Encoding=UTF-8
 	Version=1.0
 	Name=${name}
 	Type=Application
 	Comment=${DESCRIPTION}
 	Exec=${exec}
 	TryExec=${exec%% *}
-	Path=${path}
 	Icon=${icon}
 	Categories=${type};
 	EOF
 
+	[[ ${path} ]] && echo "Path=${path}" >> "${desktop}"
+
 	(
 		# wrap the env here so that the 'insinto' call
 		# doesn't corrupt the env of the caller
@@ -938,7 +938,6 @@
 
 	cat <<-EOF > "${desktop}"
 	[Desktop Entry]
-	Encoding=UTF-8
 	Name=${title}
 	Comment=This session logs you into ${title}
 	Exec=${command}



-- 
gentoo-commits@gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      08/01/14 04:52:36

  Modified:             eutils.eclass
  Log:
  handle whitespace in epatch/epunt_cxx better #205339 by Santiago M. Mola

Revision  Changes    Path
1.294                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- eutils.eclass	20 Nov 2007 22:32:01 -0000	1.293
+++ eutils.eclass	14 Jan 2008 04:52:35 -0000	1.294
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.293 2007/11/20 22:32:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.294 2008/01/14 04:52:35 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -145,8 +145,7 @@
 			local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
 		fi
 	else
-		if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ]
-		then
+		if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then
 			if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
 			then
 				EPATCH_SOURCE="$1"
@@ -1722,8 +1721,8 @@
 	[[ -z ${dir} ]] && dir=${S}
 	ebegin "Removing useless C++ checks"
 	local f
-	for f in $(find ${dir} -name configure) ; do
-		patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
+	find "${dir}" -name configure | while read f ; do
+		patch --no-backup-if-mismatch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
 	done
 	eend 0
 }



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Chris Gianelloni (wolf31o2)]

wolf31o2    08/02/07 04:17:07

  Modified:             eutils.eclass
  Log:
  Changing comments on make_wrapper so the third option (chdir) looks optional to match the actual code.

Revision  Changes    Path
1.295                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -r1.294 -r1.295
--- eutils.eclass	14 Jan 2008 04:52:35 -0000	1.294
+++ eutils.eclass	7 Feb 2008 04:17:06 -0000	1.295
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.294 2008/01/14 04:52:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.295 2008/02/07 04:17:06 wolf31o2 Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1728,7 +1728,7 @@
 }
 
 # @FUNCTION: make_wrapper
-# @USAGE: <wrapper> <target> <chdir> [libpaths] [installpath]
+# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
 # @DESCRIPTION:
 # Create a shell wrapper script named wrapper in installpath
 # (defaults to the bindir) to execute target (default of wrapper) by



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Chris Gianelloni (wolf31o2)]

wolf31o2    08/02/13 20:50:06

  Modified:             eutils.eclass
  Log:
  Change the Joliet information in cdrom_get_cds to only display after a failed attempt to find the CD since we're now using ewarn and ebeep to get the user's attention.  Yes, this sucks, but I'm getting tired of trying to support people who cannot seem to read the last 4 lines of output from the CD detection when it doesn't find a CD and hope that maybe the beeps will help.

Revision  Changes    Path
1.296                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- eutils.eclass	7 Feb 2008 04:17:06 -0000	1.295
+++ eutils.eclass	13 Feb 2008 20:50:06 -0000	1.296
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.295 2008/02/07 04:17:06 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.296 2008/02/13 20:50:06 wolf31o2 Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1456,7 +1456,7 @@
 # (2) the user hits CTRL+C
 _cdrom_locate_file_on_cd() {
 	local mline=""
-	local showedmsg=0
+	local showedmsg=0 showjolietmsg=0
 
 	while [[ -z ${CDROM_ROOT} ]] ; do
 		local i=0
@@ -1507,10 +1507,15 @@
 		einfo "Press return to scan for the cd again"
 		einfo "or hit CTRL+C to abort the emerge."
 		echo
-		einfo "If you are having trouble with the detection"
-		einfo "of your CD, it is possible that you do not have"
-		einfo "Joliet support enabled in your kernel.  Please"
-		einfo "check that CONFIG_JOLIET is enabled in your kernel."
+		if [[ ${showjolietmsg} -eq 0 ]] ; then
+			showjolietmsg=1
+		else
+			ewarn "If you are having trouble with the detection"
+			ewarn "of your CD, it is possible that you do not have"
+			ewarn "Joliet support enabled in your kernel.  Please"
+			ewarn "check that CONFIG_JOLIET is enabled in your kernel."
+			ebeep 5
+		fi
 		read || die "something is screwed with your system"
 	done
 }



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      08/02/15 07:43:45

  Modified:             eutils.eclass
  Log:
  if user has FEATURES=preserve-libs, then we will let portage handle the saving/warning of the libraries #210182

Revision  Changes    Path
1.297                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- eutils.eclass	13 Feb 2008 20:50:06 -0000	1.296
+++ eutils.eclass	15 Feb 2008 07:43:45 -0000	1.297
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.296 2008/02/13 20:50:06 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.297 2008/02/15 07:43:45 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1585,6 +1585,9 @@
 	fi
 	[[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
 
+	# let portage worry about it
+	has preserve-libs ${FEATURES} && return 0
+
 	local lib dir
 	for lib in "$@" ; do
 		[[ -e ${ROOT}/${lib} ]] || continue
@@ -1605,6 +1608,9 @@
 		die "Invalid preserve_old_lib_notify() usage"
 	fi
 
+	# let portage worry about it
+	has preserve-libs ${FEATURES} && return 0
+
 	local lib notice=0
 	for lib in "$@" ; do
 		[[ -e ${ROOT}/${lib} ]] || continue



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Benedikt Boehm (hollow)]

hollow      08/02/20 12:36:15

  Modified:             eutils.eclass
  Log:
  add ecvs_clean and esvn_clean, bug #210708

Revision  Changes    Path
1.298                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -r1.297 -r1.298
--- eutils.eclass	15 Feb 2008 07:43:45 -0000	1.297
+++ eutils.eclass	20 Feb 2008 12:36:14 -0000	1.298
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.297 2008/02/15 07:43:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.298 2008/02/20 12:36:14 hollow Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -49,6 +49,27 @@
 	fi
 }
 
+# @FUNCTION: ecvs_clean
+# @USAGE: <dir> [more dirs ...]
+# @DESCRIPTION:
+# Remove CVS directories recursiveley. Useful when a source tarball contains
+# internal CVS directories.
+ecvs_clean() {
+	[[ $# -gt 0 ]] || set -- .
+	find "$@" -type d -name 'CVS' -prune -print0 | xargs -0 rm -rf
+	find "$@" -type f -name '.cvs*' -print0 | xargs -0 rm -rf
+}
+
+# @FUNCTION: esvn_clean
+# @USAGE: <dir> [more dirs ...]
+# @DESCRIPTION:
+# Remove .svn directories recursiveley. Useful when a source tarball contains
+# internal Subversion directories.
+esvn_clean() {
+	[[ $# -gt 0 ]] || set -- .
+	find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
+}
+
 # Default directory where patches are located
 EPATCH_SOURCE="${WORKDIR}/patch"
 # Default extension for patches



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      08/02/20 17:32:03

  Modified:             eutils.eclass
  Log:
  for e{cvs,svn}_clean, tweak the test for no args, and update the help text to match reality

Revision  Changes    Path
1.299                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- eutils.eclass	20 Feb 2008 12:36:14 -0000	1.298
+++ eutils.eclass	20 Feb 2008 17:32:02 -0000	1.299
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.298 2008/02/20 12:36:14 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.299 2008/02/20 17:32:02 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -50,23 +50,23 @@
 }
 
 # @FUNCTION: ecvs_clean
-# @USAGE: <dir> [more dirs ...]
+# @USAGE: [list of dirs]
 # @DESCRIPTION:
-# Remove CVS directories recursiveley. Useful when a source tarball contains
-# internal CVS directories.
+# Remove CVS directories recursiveley.  Useful when a source tarball contains
+# internal CVS directories.  Defaults to $PWD.
 ecvs_clean() {
-	[[ $# -gt 0 ]] || set -- .
+	[[ -z $* ]] && set -- .
 	find "$@" -type d -name 'CVS' -prune -print0 | xargs -0 rm -rf
 	find "$@" -type f -name '.cvs*' -print0 | xargs -0 rm -rf
 }
 
 # @FUNCTION: esvn_clean
-# @USAGE: <dir> [more dirs ...]
+# @USAGE: [list of dirs]
 # @DESCRIPTION:
-# Remove .svn directories recursiveley. Useful when a source tarball contains
-# internal Subversion directories.
+# Remove .svn directories recursiveley.  Useful when a source tarball contains
+# internal Subversion directories.  Defaults to $PWD.
 esvn_clean() {
-	[[ $# -gt 0 ]] || set -- .
+	[[ -z $* ]] && set -- .
 	find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
 }
 



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      08/03/01 21:59:55

  Modified:             eutils.eclass
  Log:
  add rm copy & paste lines #212018

Revision  Changes    Path
1.300                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- eutils.eclass	20 Feb 2008 17:32:02 -0000	1.299
+++ eutils.eclass	1 Mar 2008 21:59:54 -0000	1.300
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.299 2008/02/20 17:32:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.300 2008/03/01 21:59:54 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1649,7 +1649,10 @@
 	if [[ ${notice} -eq 1 ]] ; then
 		ewarn
 		ewarn "Once you've finished running revdep-rebuild, it should be safe to"
-		ewarn "delete the old libraries."
+		ewarn "delete the old libraries.  Here is a copy & paste for the lazy:"
+		for lib in "$@" ; do
+			ewarn "  # rm '${lib}'"
+		done
 	fi
 }
 



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Zac Medico (zmedico)]

zmedico     08/04/05 22:38:26

  Modified:             eutils.eclass
  Log:
  Bug #215673 - Make built_with_use() handle default IUSE properly. Thanks
  to David Leverton for suggesting this approach which uses a bash array.

Revision  Changes    Path
1.301                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- eutils.eclass	1 Mar 2008 21:59:54 -0000	1.300
+++ eutils.eclass	5 Apr 2008 22:38:26 -0000	1.301
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.300 2008/03/01 21:59:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.301 2008/04/05 22:38:26 zmedico Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1712,7 +1712,7 @@
 	fi
 
 	if [[ ${hidden} == "no" ]] ; then
-		local IUSE_BUILT=$(<${IUSEFILE})
+		local IUSE_BUILT=( $(<"${IUSEFILE}") )
 		# Don't check USE_EXPAND #147237
 		local expand
 		for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
@@ -1722,7 +1722,7 @@
 			fi
 		done
 		if [[ -n ${expand} ]] ; then
-			if ! has $1 ${IUSE_BUILT} ; then
+			if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
 				case ${missing_action} in
 					true)  return 0;;
 					false) return 1;;



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Christian Faulhammer (opfer)]

opfer       08/08/17 22:21:53

  Modified:             eutils.eclass
  Log:
  fix a typo

Revision  Changes    Path
1.302                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- eutils.eclass	5 Apr 2008 22:38:26 -0000	1.301
+++ eutils.eclass	17 Aug 2008 22:21:52 -0000	1.302
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.301 2008/04/05 22:38:26 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.302 2008/08/17 22:21:52 opfer Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1667,7 +1667,7 @@
 # The default is to abort (call die).  The -a and -o flags control
 # the requirements of the USE flags.  They correspond to "and" and "or"
 # logic.  So the -a flag means all listed USE flags must be enabled
-# while the -o flag means at least one of the listed fIUSE flags must be
+# while the -o flag means at least one of the listed IUSE flags must be
 # enabled.  The --hidden option is really for internal use only as it
 # means the USE flag we're checking is hidden expanded, so it won't be found
 # in IUSE like normal USE flags.

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      08/09/20 18:32:35

  Modified:             eutils.eclass
  Log:
  add support for lzma patches

Revision  Changes    Path
1.303                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -r1.302 -r1.303
--- eutils.eclass	17 Aug 2008 22:21:52 -0000	1.302
+++ eutils.eclass	20 Sep 2008 18:32:35 -0000	1.303
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.302 2008/08/17 22:21:52 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.303 2008/09/20 18:32:35 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -185,6 +185,10 @@
 	fi
 
 	case ${EPATCH_SUFFIX##*\.} in
+		lzma)
+			PIPE_CMD="lzma -dc"
+			PATCH_SUFFIX="lzma"
+			;;
 		bz2)
 			PIPE_CMD="bzip2 -dc"
 			PATCH_SUFFIX="bz2"

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      08/09/20 18:45:26

  Modified:             eutils.eclass
  Log:
  optimize patch decompression so we only do it once

Revision  Changes    Path
1.304                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -r1.303 -r1.304
--- eutils.eclass	20 Sep 2008 18:32:35 -0000	1.303
+++ eutils.eclass	20 Sep 2008 18:45:26 -0000	1.304
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.303 2008/09/20 18:32:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.304 2008/09/20 18:45:26 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -248,6 +248,22 @@
 			echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
 			echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
 
+			# Decompress the patch if need be
+			if [[ ${PATCH_SUFFIX} != "patch" ]] ; then
+				echo -n "PIPE_COMMAND:	" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
+				echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
+
+				if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 ; then
+					echo
+					eerror "Could not extract patch!"
+					#die "Could not extract patch!"
+					count=5
+					break
+				fi
+			else
+				PATCH_TARGET="${x}"
+			fi
+
 			# Allow for prefix to differ ... im lazy, so shoot me :/
 			while [ "${count}" -lt 5 ]
 			do
@@ -255,32 +271,12 @@
 				_epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
 				echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
 
-				if [ "${PATCH_SUFFIX}" != "patch" ]
-				then
-					echo -n "PIPE_COMMAND:	" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
-					echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
-				else
-					PATCH_TARGET="${x}"
-				fi
-
 				echo -n "PATCH COMMAND:	 " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
 				echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
 
 				echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
 				_epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
 
-				if [ "${PATCH_SUFFIX}" != "patch" ]
-				then
-					if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
-					then
-						echo
-						eerror "Could not extract patch!"
-						#die "Could not extract patch!"
-						count=5
-						break
-					fi
-				fi
-
 				if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
 				then
 					_epatch_draw_line "***** ${patchname} *****" >	${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      08/09/20 18:55:08

  Modified:             eutils.eclass
  Log:
  start whining about absolute paths in patch files

Revision  Changes    Path
1.305                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -r1.304 -r1.305
--- eutils.eclass	20 Sep 2008 18:45:26 -0000	1.304
+++ eutils.eclass	20 Sep 2008 18:55:07 -0000	1.305
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.304 2008/09/20 18:45:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.305 2008/09/20 18:55:07 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -264,6 +264,13 @@
 				PATCH_TARGET="${x}"
 			fi
 
+			# Check for absolute paths in patches.  If sandbox is disabled,
+			# people could (accidently) patch files in the root filesystem.
+			# Or trigger other unpleasantries #237667.
+			if egrep -q '^[-+]{3} /' "${PATCH_TARGET}" ; then
+				ewarn "Absolute paths found in ${patchname}!  Please remove them!"
+			fi
+
 			# Allow for prefix to differ ... im lazy, so shoot me :/
 			while [ "${count}" -lt 5 ]
 			do

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      08/09/20 18:58:57

  Modified:             eutils.eclass
  Log:
  filter /dev/null from abs path check and include the offending line in the warning

Revision  Changes    Path
1.306                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -r1.305 -r1.306
--- eutils.eclass	20 Sep 2008 18:55:07 -0000	1.305
+++ eutils.eclass	20 Sep 2008 18:58:57 -0000	1.306
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.305 2008/09/20 18:55:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.306 2008/09/20 18:58:57 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -267,8 +267,10 @@
 			# Check for absolute paths in patches.  If sandbox is disabled,
 			# people could (accidently) patch files in the root filesystem.
 			# Or trigger other unpleasantries #237667.
-			if egrep -q '^[-+]{3} /' "${PATCH_TARGET}" ; then
+			local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
+			if [[ -n ${abs_paths} ]] ; then
 				ewarn "Absolute paths found in ${patchname}!  Please remove them!"
+				ewarn "${abs_paths}"
 			fi
 
 			# Allow for prefix to differ ... im lazy, so shoot me :/

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      08/09/20 19:03:32

  Modified:             eutils.eclass
  Log:
  even better: dont whine about abs paths, just transparently skip the -p0 step and log why we are

Revision  Changes    Path
1.307                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -r1.306 -r1.307
--- eutils.eclass	20 Sep 2008 18:58:57 -0000	1.306
+++ eutils.eclass	20 Sep 2008 19:03:31 -0000	1.307
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.306 2008/09/20 18:58:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.307 2008/09/20 19:03:31 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -266,11 +266,13 @@
 
 			# Check for absolute paths in patches.  If sandbox is disabled,
 			# people could (accidently) patch files in the root filesystem.
-			# Or trigger other unpleasantries #237667.
+			# Or trigger other unpleasantries #237667.  So disallow -p0 on
+			# such patches.
 			local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
 			if [[ -n ${abs_paths} ]] ; then
-				ewarn "Absolute paths found in ${patchname}!  Please remove them!"
-				ewarn "${abs_paths}"
+				count=1
+				echo "NOTE: skipping -p0 due to absolute paths in patch:" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
+				echo "${abs_paths}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
 			fi
 
 			# Allow for prefix to differ ... im lazy, so shoot me :/

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Michael Sterrett (mr_bones_)]

mr_bones_    08/09/28 04:37:29

  Modified:             eutils.eclass
  Log:
  typo: Not -> Note (bug #238889)

Revision  Changes    Path
1.308                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -r1.307 -r1.308
--- eutils.eclass	20 Sep 2008 19:03:31 -0000	1.307
+++ eutils.eclass	28 Sep 2008 04:37:29 -0000	1.308
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.307 2008/09/20 19:03:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.308 2008/09/28 04:37:29 mr_bones_ Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -79,7 +79,7 @@
 # Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
 # Set -E to automatically remove empty files.
 EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
-# List of patches not to apply.	 Not this is only file names,
+# List of patches not to apply.	 Note this is only file names,
 # and not the full path ..
 EPATCH_EXCLUDE=""
 # Change the printed message for a single patch.

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Peter Volkov (pva)]

pva         09/02/07 10:57:38

  Modified:             eutils.eclass
  Log:
  Fixed typo in comments.

Revision  Changes    Path
1.309                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -r1.308 -r1.309
--- eutils.eclass	28 Sep 2008 04:37:29 -0000	1.308
+++ eutils.eclass	7 Feb 2009 10:57:38 -0000	1.309
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.308 2008/09/28 04:37:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.309 2009/02/07 10:57:38 pva Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -107,7 +107,7 @@
 #
 # Patches are applied in current directory.
 #
-# Bulk Patches should preferibly have the form of:
+# Bulk Patches should preferably have the form of:
 #
 #	??_${ARCH}_foo.${EPATCH_SUFFIX}
 #

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Fabian Groffen (grobian)]

grobian     09/02/15 20:09:09

  Modified:             eutils.eclass
  Log:
  Apply patch by Armando Di Cianno to add support for OSX 10.5+ in egetent, bug #257945

Revision  Changes    Path
1.310                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -r1.309 -r1.310
--- eutils.eclass	7 Feb 2009 10:57:38 -0000	1.309
+++ eutils.eclass	15 Feb 2009 20:09:09 -0000	1.310
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.309 2009/02/07 10:57:38 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.310 2009/02/15 20:09:09 grobian Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -389,10 +389,26 @@
 # usata@gentoo.org (OS X)
 # Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
 # @DESCRIPTION:
-# Small wrapper for getent (Linux), nidump (Mac OS X),
+# Small wrapper for getent (Linux),
+# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
 # and pw (FreeBSD) used in enewuser()/enewgroup()
 egetent() {
 	case ${CHOST} in
+	*-darwin9)
+		local mytype=$1
+		[[ "passwd" == $mytype ]] && mytype="Users"
+		[[ "group" == $mytype ]] && mytype="Groups"
+		case "$2" in
+		*[!0-9]*) # Non numeric
+			dscl . -read /$mytype/$2 2>/dev/null |grep RecordName
+			;;
+		*)	# Numeric
+			local mykey="UniqueID"
+			[[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
+			dscl . -search /$mytype $mykey $2 2>/dev/null
+			;;
+		esac
+		;;
 	*-darwin*)
 		case "$2" in
 		*[!0-9]*) # Non numeric

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Michael Sterrett (mr_bones_)]

mr_bones_    09/02/18 08:05:52

  Modified:             eutils.eclass
  Log:
  Add a prepalldocs function to provide the functionality of the deprecated prepalldocs utility.

Revision  Changes    Path
1.311                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -r1.310 -r1.311
--- eutils.eclass	15 Feb 2009 20:09:09 -0000	1.310
+++ eutils.eclass	18 Feb 2009 08:05:52 -0000	1.311
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.310 2009/02/15 20:09:09 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.311 2009/02/18 08:05:52 mr_bones_ Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1823,3 +1823,21 @@
 		newbin "${tmpwrapper}" "${wrapper}" || die
 	fi
 }
+
+# @FUNCTION: prepalldocs
+# @USAGE:
+# @DESCRIPTION:
+# Compress files in /usr/share/doc which are not already
+# compressed, excluding /usr/share/doc/${PF}/html.
+# Uses the ecompressdir to do the compression.
+prepalldocs() {
+	if [[ -n $1 ]] ; then
+		ewarn "prepalldocs: invalid usage; takes no arguments"
+	fi
+
+	cd "${D}"
+	[[ -d usr/share/doc ]] || exit 0
+
+	ecompressdir --ignore /usr/share/doc/${PF}/html
+	ecompressdir --queue /usr/share/doc
+}

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Michael Sterrett (mr_bones_)]

mr_bones_    09/02/18 18:40:07

  Modified:             eutils.eclass
  Log:
  return, don't exit from the function

Revision  Changes    Path
1.312                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -r1.311 -r1.312
--- eutils.eclass	18 Feb 2009 08:05:52 -0000	1.311
+++ eutils.eclass	18 Feb 2009 18:40:07 -0000	1.312
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.311 2009/02/18 08:05:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.312 2009/02/18 18:40:07 mr_bones_ Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1836,7 +1836,7 @@
 	fi
 
 	cd "${D}"
-	[[ -d usr/share/doc ]] || exit 0
+	[[ -d usr/share/doc ]] || return 0
 
 	ecompressdir --ignore /usr/share/doc/${PF}/html
 	ecompressdir --queue /usr/share/doc

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Petteri Raty (betelgeuse)]

betelgeuse    09/02/18 20:17:18

  Modified:             eutils.eclass
  Log:
  Comment about prepalldocs with approval from lu_zero and dev-zero.

Revision  Changes    Path
1.313                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -r1.312 -r1.313
--- eutils.eclass	18 Feb 2009 18:40:07 -0000	1.312
+++ eutils.eclass	18 Feb 2009 20:17:18 -0000	1.313
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.312 2009/02/18 18:40:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.313 2009/02/18 20:17:18 betelgeuse Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1830,14 +1830,20 @@
 # Compress files in /usr/share/doc which are not already
 # compressed, excluding /usr/share/doc/${PF}/html.
 # Uses the ecompressdir to do the compression.
-prepalldocs() {
-	if [[ -n $1 ]] ; then
-		ewarn "prepalldocs: invalid usage; takes no arguments"
-	fi
-
-	cd "${D}"
-	[[ -d usr/share/doc ]] || return 0
-
-	ecompressdir --ignore /usr/share/doc/${PF}/html
-	ecompressdir --queue /usr/share/doc
-}
+# 2009-02-18 by betelgeuse:
+# Commented because ecompressdir is even more internal to
+# Portage than prepalldocs (it's not even mentioned in man 5
+# ebuild). Please submit a better version for review to gentoo-dev
+# if you want prepalldocs here.
+#prepalldocs() {
+#	if [[ -n $1 ]] ; then
+#		ewarn "prepalldocs: invalid usage; takes no arguments"
+#	fi
+
+#	cd "${D}"
+#	[[ -d usr/share/doc ]] || return 0
+
+#	find usr/share/doc -exec gzip {} +
+#	ecompressdir --ignore /usr/share/doc/${PF}/html
+#	ecompressdir --queue /usr/share/doc
+#}

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      09/02/21 07:35:14

  Modified:             eutils.eclass
  Log:
  fixup broken make_session_desktop()
   - document $wm var and have it default to $PN
   - set Type to XSession, not Application
   - allow arguments to the command and split Exec/TryExec accordingly

Revision  Changes    Path
1.314                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -r1.313 -r1.314
--- eutils.eclass	18 Feb 2009 20:17:18 -0000	1.313
+++ eutils.eclass	21 Feb 2009 07:35:14 -0000	1.314
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.313 2009/02/18 20:17:18 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.314 2009/02/21 07:35:14 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -971,25 +971,28 @@
 }
 
 # @FUNCTION: make_session_desktop
-# @USAGE: <title> <command>
+# @USAGE: <title> <command> [command args...]
 # @DESCRIPTION:
 # Make a GDM/KDM Session file.  The title is the file to execute to start the
 # Window Manager.  The command is the name of the Window Manager.
+#
+# You can set the name of the file via the ${wm} variable.
 make_session_desktop() {
-	[[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
-	[[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
+	[[ -z $1 ]] && eerror "$0: You must specify the title" && return 1
+	[[ -z $2 ]] && eerror "$0: You must specify the command" && return 1
 
 	local title=$1
 	local command=$2
-	local desktop=${T}/${wm}.desktop
+	local desktop=${T}/${wm:-${PN}}.desktop
+	shift 2
 
 	cat <<-EOF > "${desktop}"
 	[Desktop Entry]
 	Name=${title}
 	Comment=This session logs you into ${title}
-	Exec=${command}
+	Exec=${command} $*
 	TryExec=${command}
-	Type=Application
+	Type=XSession
 	EOF
 
 	(

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      09/02/21 23:28:21

  Modified:             eutils.eclass
  Log:
  quote semicolons in subshells to work around bash-4.0 regression

Revision  Changes    Path
1.315                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -r1.314 -r1.315
--- eutils.eclass	21 Feb 2009 07:35:14 -0000	1.314
+++ eutils.eclass	21 Feb 2009 23:28:21 -0000	1.315
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.314 2009/02/21 07:35:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.315 2009/02/21 23:28:21 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1585,7 +1585,7 @@
 	local ls newls nols
 	if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
 		local op=$1; shift
-		ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
+		ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
 		local d f
 		for d in "$@" ; do
 			if [[ ${op} == "-u" ]] ; then
@@ -1593,7 +1593,7 @@
 			else
 				newls=""
 			fi
-			for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
+			for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
 				if [[ ${op} == "-i" ]] ; then
 					hasq ${f} ${ls} && newls="${newls} ${f}"
 				else

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      09/02/27 01:49:41

  Modified:             eutils.eclass
  Log:
  tweak output case to avoid confusing people #260214 by Caleb Cushing

Revision  Changes    Path
1.316                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -r1.315 -r1.316
--- eutils.eclass	21 Feb 2009 23:28:21 -0000	1.315
+++ eutils.eclass	27 Feb 2009 01:49:41 -0000	1.316
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.315 2009/02/21 23:28:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.316 2009/02/27 01:49:41 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1616,7 +1616,7 @@
 		fi
 	done
 	[[ -n ${nols} ]] \
-		&& ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
+		&& ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
 	export LINGUAS=${newls:1}
 }
 

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      09/03/01 08:06:00

  Modified:             eutils.eclass
  Log:
  add xz support by Brandon Berhent #260653

Revision  Changes    Path
1.317                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -r1.316 -r1.317
--- eutils.eclass	27 Feb 2009 01:49:41 -0000	1.316
+++ eutils.eclass	1 Mar 2009 08:06:00 -0000	1.317
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.316 2009/02/27 01:49:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.317 2009/03/01 08:06:00 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -185,6 +185,10 @@
 	fi
 
 	case ${EPATCH_SUFFIX##*\.} in
+		xz)
+			PIPE_CMD="xz -dc"
+			PATCH_SUFFIX="xz"
+			;;
 		lzma)
 			PIPE_CMD="lzma -dc"
 			PATCH_SUFFIX="lzma"

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Fabian Groffen (grobian)]

grobian     09/09/12 14:37:51

  Modified:             eutils.eclass
  Log:
  properly detect OSX 10.6/Darwin 10, thanks Sören Kuklau in bug #284701

Revision  Changes    Path
1.319                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -r1.318 -r1.319
--- eutils.eclass	26 Aug 2009 21:47:56 -0000	1.318
+++ eutils.eclass	12 Sep 2009 14:37:51 -0000	1.319
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.318 2009/08/26 21:47:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.319 2009/09/12 14:37:51 grobian Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -417,28 +417,28 @@
 # and pw (FreeBSD) used in enewuser()/enewgroup()
 egetent() {
 	case ${CHOST} in
-	*-darwin9)
-		local mytype=$1
-		[[ "passwd" == $mytype ]] && mytype="Users"
-		[[ "group" == $mytype ]] && mytype="Groups"
+	*-darwin[678])
 		case "$2" in
 		*[!0-9]*) # Non numeric
-			dscl . -read /$mytype/$2 2>/dev/null |grep RecordName
+			nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
 			;;
 		*)	# Numeric
-			local mykey="UniqueID"
-			[[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
-			dscl . -search /$mytype $mykey $2 2>/dev/null
+			nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
 			;;
 		esac
 		;;
 	*-darwin*)
+		local mytype=$1
+		[[ "passwd" == $mytype ]] && mytype="Users"
+		[[ "group" == $mytype ]] && mytype="Groups"
 		case "$2" in
 		*[!0-9]*) # Non numeric
-			nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
+			dscl . -read /$mytype/$2 2>/dev/null |grep RecordName
 			;;
 		*)	# Numeric
-			nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
+			local mykey="UniqueID"
+			[[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
+			dscl . -search /$mytype $mykey $2 2>/dev/null
 			;;
 		esac
 		;;

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      09/09/24 02:49:32

  Modified:             eutils.eclass
  Log:
  make_desktop_entry: dont bother writing Version= anymore #285920 by Josh Saddler

Revision  Changes    Path
1.320                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -r1.319 -r1.320
--- eutils.eclass	12 Sep 2009 14:37:51 -0000	1.319
+++ eutils.eclass	24 Sep 2009 02:49:32 -0000	1.320
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.319 2009/09/12 14:37:51 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.320 2009/09/24 02:49:32 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -945,7 +945,6 @@
 
 	cat <<-EOF > "${desktop}"
 	[Desktop Entry]
-	Version=1.0
 	Name=${name}
 	Type=Application
 	Comment=${DESCRIPTION}

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Fabian Groffen (grobian)]

grobian     09/10/18 07:52:23

  Modified:             eutils.eclass
  Log:
  move euser argument to the end, to conform to more implementations of useradd, bug #271081

Revision  Changes    Path
1.321                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -r1.320 -r1.321
--- eutils.eclass	24 Sep 2009 02:49:32 -0000	1.320
+++ eutils.eclass	18 Oct 2009 07:52:23 -0000	1.321
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.320 2009/09/24 02:49:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.321 2009/10/18 07:52:23 grobian Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -648,12 +648,14 @@
 
 	*)
 		if [[ -z $@ ]] ; then
-			useradd ${opts} ${euser} \
+			useradd ${opts} \
 				-c "added by portage for ${PN}" \
+				${euser} \
 				|| die "enewuser failed"
 		else
 			einfo " - Extra: $@"
-			useradd ${opts} ${euser} "$@" \
+			useradd ${opts} "$@" \
+				${euser} \
 				|| die "enewuser failed"
 		fi
 		;;

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      09/12/11 20:31:34

  Modified:             eutils.eclass
  Log:
  add new eshopts_{push,pop} functions to simplify mucking with shell options

Revision  Changes    Path
1.322                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -r1.321 -r1.322
--- eutils.eclass	18 Oct 2009 07:52:23 -0000	1.321
+++ eutils.eclass	11 Dec 2009 20:31:34 -0000	1.322
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.321 2009/10/18 07:52:23 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.322 2009/12/11 20:31:34 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -70,6 +70,50 @@
 	find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
 }
 
+# @FUNCTION: eshopts_push
+# @USAGE: [options to `set`]
+# @DESCRIPTION:
+# Often times code will want to enable a shell option to change code behavior.
+# Since changing shell options can easily break other pieces of code (which
+# assume the default state), eshopts_push is used to (1) push the current shell
+# options onto a stack and (2) pass the specified arguments to set.
+#
+# A common example is to disable shell globbing so that special meaning/care
+# may be used with variables/arguments to custom functions.  That would be:
+# @CODE
+#		eshopts_push -o noglob
+#		for x in ${foo} ; do
+#			if ...some check... ; then
+#				eshopts_pop
+#				return 0
+#			fi
+#		done
+#		eshopts_pop
+# @CODE
+eshopts_push() {
+	# have to assume __ESHOPTS_SAVE__ isn't screwed with
+	# as a `declare -a` here will reset its value
+	local i=${#__ESHOPTS_SAVE__[@]}
+	__ESHOPTS_SAVE__[$i]=$-
+	[[ $# -eq 0 ]] && return 0
+	set "$@" || die "eshopts_push: bad options to set: $*"
+}
+
+# @FUNCTION: eshopts_pop
+# @USAGE:
+# @DESCRIPTION:
+# Restore the shell options to the state saved with the corresponding
+# eshopts_push call.  See that function for more details.
+eshopts_pop() {
+	[[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
+	local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
+	[[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
+	local s=${__ESHOPTS_SAVE__[$i]}
+	unset __ESHOPTS_SAVE__[$i]
+	set +$-   || die "eshopts_pop: sanity: invalid shell settings: $-"
+	set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
+}
+
 # Default directory where patches are located
 EPATCH_SOURCE="${WORKDIR}/patch"
 # Default extension for patches
@@ -1343,16 +1387,15 @@
 
 	# here is where we check for the licenses the user already
 	# accepted ... if we don't find a match, we make the user accept
-	local shopts=$-
 	local alic
-	set -o noglob #so that bash doesn't expand "*"
+	eshopts_push -o noglob # so that bash doesn't expand "*"
 	for alic in ${ACCEPT_LICENSE} ; do
 		if [[ ${alic} == ${l} ]]; then
-			set +o noglob; set -${shopts} #reset old shell opts
+			eshopts_pop
 			return 0
 		fi
 	done
-	set +o noglob; set -$shopts #reset old shell opts
+	eshopts_pop
 
 	local licmsg=$(emktemp)
 	cat <<-EOF > ${licmsg}

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Zac Medico (zmedico)]

zmedico     09/12/19 00:01:04

  Modified:             eutils.eclass
  Log:
  Bug #297392 - Remove extra leading slash in epatch_user() output.

Revision  Changes    Path
1.323                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -r1.322 -r1.323
--- eutils.eclass	11 Dec 2009 20:31:34 -0000	1.322
+++ eutils.eclass	19 Dec 2009 00:01:04 -0000	1.323
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.322 2009/12/11 20:31:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.323 2009/12/19 00:01:04 zmedico Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -397,7 +397,7 @@
 	[[ $# -ne 0 ]] && die "epatch_user takes no options"
 
 	# don't clobber any EPATCH vars that the parent might want
-	local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT}/etc/portage/patches
+	local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
 	for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
 		EPATCH_SOURCE=${base}/${CTARGET}/${check}
 		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Zac Medico (zmedico)]

zmedico     10/01/03 19:57:10

  Modified:             eutils.eclass
  Log:
  Bug #281314 - Do die if the license file can not be found until after
  ACCEPT_LICENSE has been checked (since it may not be necessary to die).

Revision  Changes    Path
1.324                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- eutils.eclass	19 Dec 2009 00:01:04 -0000	1.323
+++ eutils.eclass	3 Jan 2010 19:57:10 -0000	1.324
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.323 2009/12/19 00:01:04 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.324 2010/01/03 19:57:10 zmedico Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1382,7 +1382,6 @@
 			lic="${lic}"
 		fi
 	fi
-	[ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
 	local l="`basename ${lic}`"
 
 	# here is where we check for the licenses the user already
@@ -1396,6 +1395,7 @@
 		fi
 	done
 	eshopts_pop
+	[ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
 
 	local licmsg=$(emktemp)
 	cat <<-EOF > ${licmsg}

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      10/01/09 20:06:25

  Modified:             eutils.eclass
  Log:
  rewrite epatch greatly -- clean up logging, quoting, shell opts, file name checking, and decompression

Revision  Changes    Path
1.325                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -r1.324 -r1.325
--- eutils.eclass	3 Jan 2010 19:57:10 -0000	1.324
+++ eutils.eclass	9 Jan 2010 20:06:24 -0000	1.325
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.324 2010/01/03 19:57:10 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.325 2010/01/09 20:06:24 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -114,284 +114,272 @@
 	set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
 }
 
-# Default directory where patches are located
+# @VARIABLE: EPATCH_SOURCE
+# @DESCRIPTION:
+# Default directory to search for patches.
 EPATCH_SOURCE="${WORKDIR}/patch"
-# Default extension for patches
+# @VARIABLE: EPATCH_SUFFIX
+# @DESCRIPTION:
+# Default extension for patches (do not prefix the period yourself).
 EPATCH_SUFFIX="patch.bz2"
-# Default options for patch
-# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
-# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
-# Set -E to automatically remove empty files.
+# @VARIABLE: EPATCH_OPTS
+# @DESCRIPTION:
+# Default options for patch:
+# @CODE
+#	-g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571
+#	--no-backup-if-mismatch - do not leave .orig files behind
+#	-E - automatically remove empty files
+# @CODE
 EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
+# @VARIABLE: EPATCH_EXCLUDE
+# @DESCRIPTION:
 # List of patches not to apply.	 Note this is only file names,
-# and not the full path ..
+# and not the full path.  Globs accepted.
 EPATCH_EXCLUDE=""
+# @VARIABLE: EPATCH_SINGLE_MSG
+# @DESCRIPTION:
 # Change the printed message for a single patch.
 EPATCH_SINGLE_MSG=""
+# @VARIABLE: EPATCH_MULTI_MSG
+# @DESCRIPTION:
 # Change the printed message for multiple patches.
 EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
-# Force applying bulk patches even if not following the style:
-#
-#	??_${ARCH}_foo.${EPATCH_SUFFIX}
-#
+# @VARIABLE: EPATCH_FORCE
+# @DESCRIPTION:
+# Only require patches to match EPATCH_SUFFIX rather than the extended
+# arch naming style.
 EPATCH_FORCE="no"
 
-# This function is for bulk patching, or in theory for just one
-# or two patches.
-#
-# It should work with .bz2, .gz, .zip and plain text patches.
-# Currently all patches should be the same format.
-#
-# You do not have to specify '-p' option to patch, as it will
-# try with -p0 to -p5 until it succeed, or fail at -p5.
-#
-# Above EPATCH_* variables can be used to control various defaults,
-# bug they should be left as is to ensure an ebuild can rely on
-# them for.
-#
-# Patches are applied in current directory.
-#
-# Bulk Patches should preferably have the form of:
-#
-#	??_${ARCH}_foo.${EPATCH_SUFFIX}
-#
-# For example:
-#
-#	01_all_misc-fix.patch.bz2
-#	02_sparc_another-fix.patch.bz2
+# @FUNCTION: epatch
+# @USAGE: [patches] [dirs of patches]
+# @DESCRIPTION:
+# epatch is designed to greatly simplify the application of patches.  It can
+# process patch files directly, or directories of patches.  The patches may be
+# compressed (bzip/gzip/etc...) or plain text.  You generally need not specify
+# the -p option as epatch will automatically attempt -p0 to -p5 until things
+# apply successfully.
 #
-# This ensures that there are a set order, and you can have ARCH
-# specific patches.
+# If you do not specify any options, then epatch will default to the directory
+# specified by EPATCH_SOURCE.
 #
-# If you however give an argument to epatch(), it will treat it as a
-# single patch that need to be applied if its a file.  If on the other
-# hand its a directory, it will set EPATCH_SOURCE to this.
+# When processing directories, epatch will apply all patches that match:
+# @CODE
+#	${EPATCH_FORCE} == "yes"
+#		??_${ARCH}_foo.${EPATCH_SUFFIX}
+#	else
+#		*.${EPATCH_SUFFIX}
+# @CODE
+# The leading ?? are typically numbers used to force consistent patch ordering.
+# The arch field is used to apply patches only for the host architecture with
+# the special value of "all" means apply for everyone.  Note that using values
+# other than "all" is highly discouraged -- you should apply patches all the
+# time and let architecture details be detected at configure/compile time.
 #
-# <azarah@gentoo.org> (10 Nov 2002)
+# If EPATCH_SUFFIX is empty, then no period before it is implied when searching
+# for patches to apply.
 #
+# Refer to the other EPATCH_xxx variables for more customization of behavior.
 epatch() {
 	_epatch_draw_line() {
+		# create a line of same length as input string
 		[[ -z $1 ]] && set "$(printf "%65s" '')"
 		echo "${1//?/=}"
 	}
-	_epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
-	local PIPE_CMD=""
-	local STDERR_TARGET="${T}/$$.out"
-	local PATCH_TARGET="${T}/$$.patch"
-	local PATCH_SUFFIX=""
-	local SINGLE_PATCH="no"
-	local x=""
 
 	unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
 
-	if [ "$#" -gt 1 ]
-	then
-		local m=""
+	# Let the rest of the code process one user arg at a time --
+	# each arg may expand into multiple patches, and each arg may
+	# need to start off with the default global EPATCH_xxx values
+	if [[ $# -gt 1 ]] ; then
+		local m
 		for m in "$@" ; do
 			epatch "${m}"
 		done
 		return 0
 	fi
 
-	if [ -n "$1" -a -f "$1" ]
-	then
-		SINGLE_PATCH="yes"
+	local SINGLE_PATCH="no"
+	# no args means process ${EPATCH_SOURCE}
+	[[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}"
 
-		local EPATCH_SOURCE="$1"
-		local EPATCH_SUFFIX="${1##*\.}"
+	if [[ -f $1 ]] ; then
+		SINGLE_PATCH="yes"
+		set -- "$1"
+		# Use the suffix from the single patch (localize it); the code
+		# below will find the suffix for us
+		local EPATCH_SUFFIX=$1
+
+	elif [[ -d $1 ]] ; then
+		# Some people like to make dirs of patches w/out suffixes (vim)
+		set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
 
-	elif [ -n "$1" -a -d "$1" ]
-	then
-		# Allow no extension if EPATCH_FORCE=yes ... used by vim for example ...
-		if [ "${EPATCH_FORCE}" = "yes" ] && [ -z "${EPATCH_SUFFIX}" ]
-		then
-			local EPATCH_SOURCE="$1/*"
-		else
-			local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
-		fi
 	else
-		if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then
-			if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
-			then
-				EPATCH_SOURCE="$1"
-			fi
-
-			echo
-			eerror "Cannot find \$EPATCH_SOURCE!  Value for \$EPATCH_SOURCE is:"
-			eerror
-			eerror "  ${EPATCH_SOURCE}"
-			eerror "  ( ${EPATCH_SOURCE##*/} )"
-			echo
-			die "Cannot find \$EPATCH_SOURCE!"
-		fi
-
-		local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
+		# sanity check ... if it isn't a dir or file, wtf man ?
+		[[ $# -ne 0 ]] && EPATCH_SOURCE=$1
+		echo
+		eerror "Cannot find \$EPATCH_SOURCE!  Value for \$EPATCH_SOURCE is:"
+		eerror
+		eerror "  ${EPATCH_SOURCE}"
+		eerror "  ( ${EPATCH_SOURCE##*/} )"
+		echo
+		die "Cannot find \$EPATCH_SOURCE!"
 	fi
 
+	local PIPE_CMD
 	case ${EPATCH_SUFFIX##*\.} in
-		xz)
-			PIPE_CMD="xz -dc"
-			PATCH_SUFFIX="xz"
-			;;
-		lzma)
-			PIPE_CMD="lzma -dc"
-			PATCH_SUFFIX="lzma"
-			;;
-		bz2)
-			PIPE_CMD="bzip2 -dc"
-			PATCH_SUFFIX="bz2"
-			;;
-		gz|Z|z)
-			PIPE_CMD="gzip -dc"
-			PATCH_SUFFIX="gz"
-			;;
-		ZIP|zip)
-			PIPE_CMD="unzip -p"
-			PATCH_SUFFIX="zip"
-			;;
-		*)
-			PIPE_CMD="cat"
-			PATCH_SUFFIX="patch"
-			;;
+		xz)      PIPE_CMD="xz -dc"    ;;
+		lzma)    PIPE_CMD="lzma -dc"  ;;
+		bz2)     PIPE_CMD="bzip2 -dc" ;;
+		gz|Z|z)  PIPE_CMD="gzip -dc"  ;;
+		ZIP|zip) PIPE_CMD="unzip -p"  ;;
+		*)       ;;
 	esac
 
-	if [ "${SINGLE_PATCH}" = "no" ]
-	then
-		einfo "${EPATCH_MULTI_MSG}"
-	fi
-	for x in ${EPATCH_SOURCE}
-	do
-		# New ARCH dependant patch naming scheme ...
-		#
+	[[ ${SINGLE_PATCH} == "no" ]] && einfo "${EPATCH_MULTI_MSG}"
+
+	local x
+	for x in "$@" ; do
+		# If the patch dir given contains subdirs, or our EPATCH_SUFFIX
+		# didn't match anything, ignore continue on
+		[[ ! -f ${x} ]] && continue
+
+		local patchname=${x##*/}
+
+		# Apply single patches, or forced sets of patches, or
+		# patches with ARCH dependant names.
 		#	???_arch_foo.patch
-		#
-		if [ -f ${x} ] && \
-		   ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
-			[ "${EPATCH_FORCE}" = "yes" ])
+		# Else, skip this input altogether
+		local a=${patchname#*_} # strip the ???_
+		a=${a%%_*}              # strip the _foo.patch
+		if ! [[ ${SINGLE_PATCH} == "yes" || \
+		        ${EPATCH_FORCE} == "yes" || \
+		        ${a} == all     || \
+		        ${a} == ${ARCH} ]]
 		then
-			local count=0
-			local popts="${EPATCH_OPTS}"
-			local patchname=${x##*/}
+			continue
+		fi
 
-			if [ -n "${EPATCH_EXCLUDE}" ]
-			then
-				if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
-				then
+		# Let people filter things dynamically
+		if [[ -n ${EPATCH_EXCLUDE} ]] ; then
+			# let people use globs in the exclude
+			eshopts_push -o noglob
+
+			local ex
+			for ex in ${EPATCH_EXCLUDE} ; do
+				if [[ ${patchname} == ${ex} ]] ; then
+					eshopts_pop
 					continue
 				fi
-			fi
+			done
+			eshopts_pop
+		fi
 
-			if [ "${SINGLE_PATCH}" = "yes" ]
-			then
-				if [ -n "${EPATCH_SINGLE_MSG}" ]
-				then
-					einfo "${EPATCH_SINGLE_MSG}"
-				else
-					einfo "Applying ${patchname} ..."
-				fi
+		if [[ ${SINGLE_PATCH} == "yes" ]] ; then
+			if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
+				einfo "${EPATCH_SINGLE_MSG}"
 			else
-				einfo "  ${patchname} ..."
+				einfo "Applying ${patchname} ..."
 			fi
+		else
+			einfo "  ${patchname} ..."
+		fi
 
-			echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
-			echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
+		# most of the time, there will only be one run per unique name,
+		# but if there are more, make sure we get unique log filenames
+		local STDERR_TARGET="${T}/${patchname}.out"
+		if [[ -e ${STDERR_TARGET} ]] ; then
+			STDERR_TARGET="${T}/${patchname}-$$.out"
+		fi
 
-			# Decompress the patch if need be
-			if [[ ${PATCH_SUFFIX} != "patch" ]] ; then
-				echo -n "PIPE_COMMAND:	" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
-				echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
+		printf "***** %s *****\n\n" "${patchname}" > "${STDERR_TARGET}"
 
-				if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 ; then
-					echo
-					eerror "Could not extract patch!"
-					#die "Could not extract patch!"
-					count=5
-					break
-				fi
-			else
-				PATCH_TARGET="${x}"
-			fi
+		# Decompress the patch if need be
+		local count=0
+		local PATCH_TARGET
+		if [[ -n ${PIPE_CMD} ]] ; then
+			PATCH_TARGET="${T}/$$.patch"
+			echo "PIPE_COMMAND:  ${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> "${STDERR_TARGET}"
 
-			# Check for absolute paths in patches.  If sandbox is disabled,
-			# people could (accidently) patch files in the root filesystem.
-			# Or trigger other unpleasantries #237667.  So disallow -p0 on
-			# such patches.
-			local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
-			if [[ -n ${abs_paths} ]] ; then
-				count=1
-				echo "NOTE: skipping -p0 due to absolute paths in patch:" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
-				echo "${abs_paths}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
+			if ! (${PIPE_CMD} "${x}" > "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
+				echo
+				eerror "Could not extract patch!"
+				#die "Could not extract patch!"
+				count=5
+				break
 			fi
+		else
+			PATCH_TARGET=${x}
+		fi
 
-			# Allow for prefix to differ ... im lazy, so shoot me :/
-			while [ "${count}" -lt 5 ]
-			do
-				# Generate some useful debug info ...
-				_epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
-				echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
-
-				echo -n "PATCH COMMAND:	 " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
-				echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
-
-				echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
-				_epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
-
-				if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
-				then
-					_epatch_draw_line "***** ${patchname} *****" >	${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
-					echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
-					echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
-					echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
-					_epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
-
-					cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
-					_epatch_assert
-
-					if [ "$?" -ne 0 ]
-					then
-						cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
-						echo
-						eerror "A dry-run of patch command succeeded, but actually"
-						eerror "applying the patch failed!"
-						#die "Real world sux compared to the dreamworld!"
-						count=5
-					fi
+		# Check for absolute paths in patches.  If sandbox is disabled,
+		# people could (accidently) patch files in the root filesystem.
+		# Or trigger other unpleasantries #237667.  So disallow -p0 on
+		# such patches.
+		local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
+		if [[ -n ${abs_paths} ]] ; then
+			count=1
+			printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
+		fi
+
+		# Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
+		while [[ ${count} -lt 5 ]] ; do
+			# Generate some useful debug info ...
+			(
+			_epatch_draw_line "***** ${patchname} *****"
+			echo
+			echo "PATCH COMMAND:  patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
+			echo
+			_epatch_draw_line "***** ${patchname} *****"
+			) >> "${STDERR_TARGET}"
 
-					rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
+			if (patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
+				(
+				_epatch_draw_line "***** ${patchname} *****"
+				echo
+				echo "ACTUALLY APPLYING ${patchname} ..."
+				echo
+				_epatch_draw_line "***** ${patchname} *****"
+				patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
+				) >> "${STDERR_TARGET}"
 
-					break
+				if [ $? -ne 0 ] ; then
+					echo
+					eerror "A dry-run of patch command succeeded, but actually"
+					eerror "applying the patch failed!"
+					#die "Real world sux compared to the dreamworld!"
+					count=5
 				fi
-
-				count=$((count + 1))
-			done
-
-			if [ "${PATCH_SUFFIX}" != "patch" ]
-			then
-				rm -f ${PATCH_TARGET}
+				break
 			fi
 
-			if [ "${count}" -eq 5 ]
-			then
-				echo
-				eerror "Failed Patch: ${patchname} !"
-				eerror " ( ${PATCH_TARGET} )"
-				eerror
-				eerror "Include in your bugreport the contents of:"
-				eerror
-				eerror "  ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
-				echo
-				die "Failed Patch: ${patchname}!"
-			fi
+			: $(( count++ ))
+		done
 
-			rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
+		# if we had to decompress the patch, delete the temp one
+		if [[ -n ${PIPE_CMD} ]] ; then
+			rm -f "${PATCH_TARGET}"
+		fi
 
-			eend 0
+		if [[ ${count} -ge 5 ]] ; then
+			echo
+			eerror "Failed Patch: ${patchname} !"
+			eerror " ( ${PATCH_TARGET} )"
+			eerror
+			eerror "Include in your bugreport the contents of:"
+			eerror
+			eerror "  ${STDERR_TARGET}"
+			echo
+			die "Failed Patch: ${patchname}!"
 		fi
+
+		# if everything worked, delete the patch log
+		rm -f "${STDERR_TARGET}"
+		eend 0
 	done
-	if [ "${SINGLE_PATCH}" = "no" ]
-	then
-		einfo "Done with patching"
-	fi
+
+	[[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
+	: # everything worked
 }
 epatch_user() {
 	[[ $# -ne 0 ]] && die "epatch_user takes no options"

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      10/01/10 05:53:37

  Modified:             eutils.eclass
  Log:
  epatch - fix unbalanced eshopts_pop #300360

Revision  Changes    Path
1.326                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -r1.325 -r1.326
--- eutils.eclass	9 Jan 2010 20:06:24 -0000	1.325
+++ eutils.eclass	10 Jan 2010 05:53:36 -0000	1.326
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.325 2010/01/09 20:06:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.326 2010/01/10 05:53:36 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -267,11 +267,9 @@
 
 			local ex
 			for ex in ${EPATCH_EXCLUDE} ; do
-				if [[ ${patchname} == ${ex} ]] ; then
-					eshopts_pop
-					continue
-				fi
+				[[ ${patchname} == ${ex} ]] && continue
 			done
+
 			eshopts_pop
 		fi
 

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Tomas Chvatal (scarabeus)]

scarabeus    10/01/10 15:49:01

  Modified:             eutils.eclass
  Log:
  [eutils.eclass] QA: Fix EPATCH_EXCLUDE not working at all.

Revision  Changes    Path
1.327                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -r1.326 -r1.327
--- eutils.eclass	10 Jan 2010 05:53:36 -0000	1.326
+++ eutils.eclass	10 Jan 2010 15:49:01 -0000	1.327
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.326 2010/01/10 05:53:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.327 2010/01/10 15:49:01 scarabeus Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -265,12 +265,14 @@
 			# let people use globs in the exclude
 			eshopts_push -o noglob
 
-			local ex
+			local ex skip
 			for ex in ${EPATCH_EXCLUDE} ; do
-				[[ ${patchname} == ${ex} ]] && continue
+				[[ ${patchname} == ${ex} ]] && skip=1
 			done
 
 			eshopts_pop
+
+			[[ ${skip} = 1 ]] && continue
 		fi
 
 		if [[ ${SINGLE_PATCH} == "yes" ]] ; then

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Tomas Chvatal (scarabeus)]

scarabeus    10/01/10 15:58:58

  Modified:             eutils.eclass
  Log:
  Fix the EPATCH_EXCLUDE properly by patch from Griffon26. Also it fixes bug #300360.

Revision  Changes    Path
1.328                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -r1.327 -r1.328
--- eutils.eclass	10 Jan 2010 15:49:01 -0000	1.327
+++ eutils.eclass	10 Jan 2010 15:58:58 -0000	1.328
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.327 2010/01/10 15:49:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.328 2010/01/10 15:58:58 scarabeus Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -265,14 +265,15 @@
 			# let people use globs in the exclude
 			eshopts_push -o noglob
 
-			local ex skip
+			local ex
 			for ex in ${EPATCH_EXCLUDE} ; do
-				[[ ${patchname} == ${ex} ]] && skip=1
+				if [[ ${patchname} == ${ex} ]] ; then
+					eshopts_pop
+					continue 2
+				fi
 			done
 
 			eshopts_pop
-
-			[[ ${skip} = 1 ]] && continue
 		fi
 
 		if [[ ${SINGLE_PATCH} == "yes" ]] ; then

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Petteri Raty (betelgeuse)]

betelgeuse    10/01/28 22:00:13

  Modified:             eutils.eclass
  Log:
  Only define epause and ebeep in EAPIs 0 1 2. Mark built_with_use as deprecated.

Revision  Changes    Path
1.329                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -r1.328 -r1.329
--- eutils.eclass	10 Jan 2010 15:58:58 -0000	1.328
+++ eutils.eclass	28 Jan 2010 22:00:12 -0000	1.329
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.328 2010/01/10 15:58:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.329 2010/01/28 22:00:12 betelgeuse Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -19,13 +19,15 @@
 
 DESCRIPTION="Based on the ${ECLASS} eclass"
 
+if has "${EAPI:-0}" 0 1 2; then
+
 # @FUNCTION: epause
 # @USAGE: [seconds]
 # @DESCRIPTION:
 # Sleep for the specified number of seconds (default of 5 seconds).  Useful when
 # printing a message the user should probably be reading and often used in
 # conjunction with the ebeep function.  If the EPAUSE_IGNORE env var is set,
-# don't wait at all.
+# don't wait at all. Defined in EAPIs 0 1 and 2.
 epause() {
 	[[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
 }
@@ -36,7 +38,7 @@
 # Issue the specified number of beeps (default of 5 beeps).  Useful when
 # printing a message the user should probably be reading and often used in
 # conjunction with the epause function.  If the EBEEP_IGNORE env var is set,
-# don't beep at all.
+# don't beep at all. Defined in EAPIs 0 1 and 2.
 ebeep() {
 	local n
 	if [[ -z ${EBEEP_IGNORE} ]] ; then
@@ -49,6 +51,8 @@
 	fi
 }
 
+fi
+
 # @FUNCTION: ecvs_clean
 # @USAGE: [list of dirs]
 # @DESCRIPTION:
@@ -1745,6 +1749,9 @@
 # @FUNCTION: built_with_use
 # @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
 # @DESCRIPTION:
+#
+# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
+#
 # A temporary hack until portage properly supports DEPENDing on USE
 # flags being enabled in packages.  This will check to see if the specified
 # DEPEND atom was built with the specified list of USE flags.  The

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      10/02/15 02:10:40

  Modified:             eutils.eclass
  Log:
  eshopts_{push,pop}: add support for the extended options available only via `shopt`

Revision  Changes    Path
1.330                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -r1.329 -r1.330
--- eutils.eclass	28 Jan 2010 22:00:12 -0000	1.329
+++ eutils.eclass	15 Feb 2010 02:10:39 -0000	1.330
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.329 2010/01/28 22:00:12 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.330 2010/02/15 02:10:39 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -75,13 +75,16 @@
 }
 
 # @FUNCTION: eshopts_push
-# @USAGE: [options to `set`]
+# @USAGE: [options to `set` or `shopt`]
 # @DESCRIPTION:
 # Often times code will want to enable a shell option to change code behavior.
 # Since changing shell options can easily break other pieces of code (which
 # assume the default state), eshopts_push is used to (1) push the current shell
 # options onto a stack and (2) pass the specified arguments to set.
 #
+# If the first argument is '-s' or '-u', we assume you want to call `shopt`
+# rather than `set` as there are some options only available via that.
+#
 # A common example is to disable shell globbing so that special meaning/care
 # may be used with variables/arguments to custom functions.  That would be:
 # @CODE
@@ -98,9 +101,15 @@
 	# have to assume __ESHOPTS_SAVE__ isn't screwed with
 	# as a `declare -a` here will reset its value
 	local i=${#__ESHOPTS_SAVE__[@]}
-	__ESHOPTS_SAVE__[$i]=$-
-	[[ $# -eq 0 ]] && return 0
-	set "$@" || die "eshopts_push: bad options to set: $*"
+	if [[ $1 == -[su] ]] ; then
+		__ESHOPTS_SAVE__[$i]=$(shopt -p)
+		[[ $# -eq 0 ]] && return 0
+		shopt "$@" || die "eshopts_push: bad options to shopt: $*"
+	else
+		__ESHOPTS_SAVE__[$i]=$-
+		[[ $# -eq 0 ]] && return 0
+		set "$@" || die "eshopts_push: bad options to set: $*"
+	fi
 }
 
 # @FUNCTION: eshopts_pop
@@ -114,8 +123,12 @@
 	[[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
 	local s=${__ESHOPTS_SAVE__[$i]}
 	unset __ESHOPTS_SAVE__[$i]
-	set +$-   || die "eshopts_pop: sanity: invalid shell settings: $-"
-	set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
+	if [[ ${s} == "shopt -"* ]] ; then
+		eval "${s}" || die "eshopts_pop: sanity: invalid shopt options: ${s}"
+	else
+		set +$-     || die "eshopts_pop: sanity: invalid shell settings: $-"
+		set -${s}   || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
+	fi
 }
 
 # @VARIABLE: EPATCH_SOURCE

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Maciej Mrozowski (reavertm)]

reavertm    10/02/17 02:20:37

  Modified:             eutils.eclass
  Log:
  Added fallback implementations for ebeep and epause that display QA Notice when used in EAPI-3

Revision  Changes    Path
1.331                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -r1.330 -r1.331
--- eutils.eclass	15 Feb 2010 02:10:39 -0000	1.330
+++ eutils.eclass	17 Feb 2010 02:20:35 -0000	1.331
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.330 2010/02/15 02:10:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.331 2010/02/17 02:20:35 reavertm Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -51,6 +51,16 @@
 	fi
 }
 
+else
+
+	ebeep() {
+		eqawarn "QA Notice: ebeep is not defined in EAPI=3, please file a bug at http://bugs.gentoo.org"
+	}
+
+	epause() {
+		eqawarn "QA Notice: epause is not defined in EAPI=3, please file a bug at http://bugs.gentoo.org"
+	}
+
 fi
 
 # @FUNCTION: ecvs_clean

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Maciej Mrozowski (reavertm)]

reavertm    10/02/17 02:22:44

  Modified:             eutils.eclass
  Log:
  Fixed indentation.

Revision  Changes    Path
1.332                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -r1.331 -r1.332
--- eutils.eclass	17 Feb 2010 02:20:35 -0000	1.331
+++ eutils.eclass	17 Feb 2010 02:22:43 -0000	1.332
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.331 2010/02/17 02:20:35 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.332 2010/02/17 02:22:43 reavertm Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -53,13 +53,13 @@
 
 else
 
-	ebeep() {
-		eqawarn "QA Notice: ebeep is not defined in EAPI=3, please file a bug at http://bugs.gentoo.org"
-	}
+ebeep() {
+	eqawarn "QA Notice: ebeep is not defined in EAPI=3, please file a bug at http://bugs.gentoo.org"
+}
 
-	epause() {
-		eqawarn "QA Notice: epause is not defined in EAPI=3, please file a bug at http://bugs.gentoo.org"
-	}
+epause() {
+	eqawarn "QA Notice: epause is not defined in EAPI=3, please file a bug at http://bugs.gentoo.org"
+}
 
 fi
 

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Petteri Raty (betelgeuse)]

betelgeuse    10/02/17 17:10:24

  Modified:             eutils.eclass
  Log:
  Check if eqawarn is defined before calling it.

Revision  Changes    Path
1.333                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -r1.332 -r1.333
--- eutils.eclass	17 Feb 2010 02:22:43 -0000	1.332
+++ eutils.eclass	17 Feb 2010 17:10:23 -0000	1.333
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.332 2010/02/17 02:22:43 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.333 2010/02/17 17:10:23 betelgeuse Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -54,11 +54,13 @@
 else
 
 ebeep() {
-	eqawarn "QA Notice: ebeep is not defined in EAPI=3, please file a bug at http://bugs.gentoo.org"
+	[[ $(type -t eqawarn) == function ]] && \
+		eqawarn "QA Notice: ebeep is not defined in EAPI=3, please file a bug at http://bugs.gentoo.org"
 }
 
 epause() {
-	eqawarn "QA Notice: epause is not defined in EAPI=3, please file a bug at http://bugs.gentoo.org"
+	[[ $(type -t eqawarn) == function ]] && \
+		eqawarn "QA Notice: epause is not defined in EAPI=3, please file a bug at http://bugs.gentoo.org"
 }
 
 fi

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Jonathan Callen (abcd)]

abcd        10/02/26 03:15:27

  Modified:             eutils.eclass
  Log:
  Properly implement the Desktop File Specification in make_desktop_entry()

Revision  Changes    Path
1.334                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -r1.333 -r1.334
--- eutils.eclass	17 Feb 2010 17:10:23 -0000	1.333
+++ eutils.eclass	26 Feb 2010 03:15:26 -0000	1.334
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.333 2010/02/17 17:10:23 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.334 2010/02/26 03:15:26 abcd Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -961,6 +961,7 @@
 					news)	type=News;;
 					nntp)	type=News;;
 					p2p)	type=FileTransfer;;
+					voip)	type=Telephony;;
 					*)		type=;;
 				esac
 				type="Network;${type}"
@@ -979,7 +980,7 @@
 					visual*) type=DataVisualization;;
 					*)		 type=;;
 				esac
-				type="Science;${type}"
+				type="Education;Science;${type}"
 				;;
 
 			sys)
@@ -991,7 +992,7 @@
 					client) type=WebBrowser;;
 					*)		type=;;
 				esac
-				type="Network"
+				type="Network;${type}"
 				;;
 
 			*)
@@ -1007,6 +1008,17 @@
 	local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
 	#local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
 
+	# Don't append another ";" when a valid category value is provided.
+	type=${type%;}${type:+;}
+
+	eshopts_push -s extglob
+	if [[ -n ${icon} && ${icon} != /* && ${icon} == *.@(xpm|png|svg) ]]; then
+		ewarn "As described in the Icon Theme Specification, icon file extensions are not"
+		ewarn "allowed in .desktop files if the value is not an absolute path."
+		icon=${icon%.@(xpm|png|svg)}
+	fi
+	eshopts_pop
+
 	cat <<-EOF > "${desktop}"
 	[Desktop Entry]
 	Name=${name}
@@ -1015,7 +1027,7 @@
 	Exec=${exec}
 	TryExec=${exec%% *}
 	Icon=${icon}
-	Categories=${type};
+	Categories=${type}
 	EOF
 
 	[[ ${path} ]] && echo "Path=${path}" >> "${desktop}"

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mark Loeser (halcy0n)]

halcy0n     10/02/26 05:17:25

  Modified:             eutils.eclass
  Log:
  Broken with stable versions of bash

Revision  Changes    Path
1.335                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -r1.334 -r1.335
--- eutils.eclass	26 Feb 2010 03:15:26 -0000	1.334
+++ eutils.eclass	26 Feb 2010 05:17:24 -0000	1.335
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.334 2010/02/26 03:15:26 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.335 2010/02/26 05:17:24 halcy0n Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -961,7 +961,6 @@
 					news)	type=News;;
 					nntp)	type=News;;
 					p2p)	type=FileTransfer;;
-					voip)	type=Telephony;;
 					*)		type=;;
 				esac
 				type="Network;${type}"
@@ -980,7 +979,7 @@
 					visual*) type=DataVisualization;;
 					*)		 type=;;
 				esac
-				type="Education;Science;${type}"
+				type="Science;${type}"
 				;;
 
 			sys)
@@ -992,7 +991,7 @@
 					client) type=WebBrowser;;
 					*)		type=;;
 				esac
-				type="Network;${type}"
+				type="Network"
 				;;
 
 			*)
@@ -1008,17 +1007,6 @@
 	local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
 	#local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
 
-	# Don't append another ";" when a valid category value is provided.
-	type=${type%;}${type:+;}
-
-	eshopts_push -s extglob
-	if [[ -n ${icon} && ${icon} != /* && ${icon} == *.@(xpm|png|svg) ]]; then
-		ewarn "As described in the Icon Theme Specification, icon file extensions are not"
-		ewarn "allowed in .desktop files if the value is not an absolute path."
-		icon=${icon%.@(xpm|png|svg)}
-	fi
-	eshopts_pop
-
 	cat <<-EOF > "${desktop}"
 	[Desktop Entry]
 	Name=${name}
@@ -1027,7 +1015,7 @@
 	Exec=${exec}
 	TryExec=${exec%% *}
 	Icon=${icon}
-	Categories=${type}
+	Categories=${type};
 	EOF
 
 	[[ ${path} ]] && echo "Path=${path}" >> "${desktop}"

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Jonathan Callen (abcd)]

abcd        10/02/26 05:33:57

  Modified:             eutils.eclass
  Log:
  Reapply patch, this time with workaround for an apparent bug in bash 3.2 and 4.0

Revision  Changes    Path
1.336                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -r1.335 -r1.336
--- eutils.eclass	26 Feb 2010 05:17:24 -0000	1.335
+++ eutils.eclass	26 Feb 2010 05:33:57 -0000	1.336
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.335 2010/02/26 05:17:24 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.336 2010/02/26 05:33:57 abcd Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -961,6 +961,7 @@
 					news)	type=News;;
 					nntp)	type=News;;
 					p2p)	type=FileTransfer;;
+					voip)	type=Telephony;;
 					*)		type=;;
 				esac
 				type="Network;${type}"
@@ -979,7 +980,7 @@
 					visual*) type=DataVisualization;;
 					*)		 type=;;
 				esac
-				type="Science;${type}"
+				type="Education;Science;${type}"
 				;;
 
 			sys)
@@ -991,7 +992,7 @@
 					client) type=WebBrowser;;
 					*)		type=;;
 				esac
-				type="Network"
+				type="Network;${type}"
 				;;
 
 			*)
@@ -1007,6 +1008,17 @@
 	local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
 	#local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
 
+	# Don't append another ";" when a valid category value is provided.
+	type=${type%;}${type:+;}
+
+	eshopts_push -s extglob
+	if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
+		ewarn "As described in the Icon Theme Specification, icon file extensions are not"
+		ewarn "allowed in .desktop files if the value is not an absolute path."
+		icon=${icon%.@(xpm|png|svg)}
+	fi
+	eshopts_pop
+
 	cat <<-EOF > "${desktop}"
 	[Desktop Entry]
 	Name=${name}
@@ -1015,7 +1027,7 @@
 	Exec=${exec}
 	TryExec=${exec%% *}
 	Icon=${icon}
-	Categories=${type};
+	Categories=${type}
 	EOF
 
 	[[ ${path} ]] && echo "Path=${path}" >> "${desktop}"

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Maciej Mrozowski (reavertm)]

reavertm    10/03/02 00:52:27

  Modified:             eutils.eclass
  Log:
  Replace eqawarn with ewarn - as it's present in all EAPIs

Revision  Changes    Path
1.337                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- eutils.eclass	26 Feb 2010 05:33:57 -0000	1.336
+++ eutils.eclass	2 Mar 2010 00:52:26 -0000	1.337
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.336 2010/02/26 05:33:57 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.337 2010/03/02 00:52:26 reavertm Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -54,13 +54,11 @@
 else
 
 ebeep() {
-	[[ $(type -t eqawarn) == function ]] && \
-		eqawarn "QA Notice: ebeep is not defined in EAPI=3, please file a bug at http://bugs.gentoo.org"
+	ewarn "QA Notice: ebeep is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
 }
 
 epause() {
-	[[ $(type -t eqawarn) == function ]] && \
-		eqawarn "QA Notice: epause is not defined in EAPI=3, please file a bug at http://bugs.gentoo.org"
+	ewarn "QA Notice: epause is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
 }
 
 fi

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      10/03/07 02:52:25

  Modified:             eutils.eclass
  Log:
  make_desktop_entry: fix tab/space corruption

Revision  Changes    Path
1.338                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -r1.337 -r1.338
--- eutils.eclass	2 Mar 2010 00:52:26 -0000	1.337
+++ eutils.eclass	7 Mar 2010 02:52:25 -0000	1.338
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.337 2010/03/02 00:52:26 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.338 2010/03/07 02:52:25 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -884,22 +884,21 @@
 			app)
 				case ${catmin} in
 					accessibility) type=Accessibility;;
-					admin)	   type=System;;
-					antivirus) type=System;;
-					arch)      type=Archiving;;
-					backup)    type=Archiving;;
-					cdr)	   type=DiscBurning;;
-					dicts)	   type=Dictionary;;
-					doc)       type=Documentation;;
-					editors)   type=TextEditor;;
-					emacs)	   type=TextEditor;;
-					emulation) type=Emulator;;
-					laptop)	   type=HardwareSettings;;
-					office)	   type=Office;;
-					pda)       type=PDA;;
-					vim)	   type=TextEditor;;
-					xemacs)	   type=TextEditor;;
-					*)		   type=;;
+					admin)         type=System;;
+					antivirus)     type=System;;
+					arch)          type=Archiving;;
+					backup)        type=Archiving;;
+					cdr)           type=DiscBurning;;
+					dicts)         type=Dictionary;;
+					doc)           type=Documentation;;
+					editors)       type=TextEditor;;
+					emacs)         type=TextEditor;;
+					emulation)     type=Emulator;;
+					laptop)        type=HardwareSettings;;
+					office)        type=Office;;
+					pda)           type=PDA;;
+					vim)           type=TextEditor;;
+					xemacs)        type=TextEditor;;
 				esac
 				;;
 
@@ -910,17 +909,16 @@
 			games)
 				case ${catmin} in
 					action|fps) type=ActionGame;;
-					arcade)		type=ArcadeGame;;
-					board)		type=BoardGame;;
-					emulation)	type=Emulator;;
-					kids)		type=KidsGame;;
-					puzzle)		type=LogicGame;;
-					roguelike)	type=RolePlaying;;
-					rpg)		type=RolePlaying;;
+					arcade)     type=ArcadeGame;;
+					board)      type=BoardGame;;
+					emulation)  type=Emulator;;
+					kids)       type=KidsGame;;
+					puzzle)     type=LogicGame;;
+					roguelike)  type=RolePlaying;;
+					rpg)        type=RolePlaying;;
 					simulation) type=Simulation;;
-					sports)		type=SportsGame;;
-					strategy)	type=StrategyGame;;
-					*)			type=;;
+					sports)     type=SportsGame;;
+					strategy)   type=StrategyGame;;
 				esac
 				type="Game;${type}"
 				;;
@@ -942,9 +940,8 @@
 					gfx)   type=Graphics;;
 					radio) type=Tuner;;
 					sound) type=Audio;;
-					tv)	   type=TV;;
+					tv)    type=TV;;
 					video) type=Video;;
-					*)	   type=;;
 				esac
 				type="AudioVideo;${type}"
 				;;
@@ -952,15 +949,14 @@
 			net)
 				case ${catmin} in
 					dialup) type=Dialup;;
-					ftp)	type=FileTransfer;;
-					im)		type=InstantMessaging;;
-					irc)	type=IRCClient;;
-					mail)	type=Email;;
-					news)	type=News;;
-					nntp)	type=News;;
-					p2p)	type=FileTransfer;;
-					voip)	type=Telephony;;
-					*)		type=;;
+					ftp)    type=FileTransfer;;
+					im)     type=InstantMessaging;;
+					irc)    type=IRCClient;;
+					mail)   type=Email;;
+					news)   type=News;;
+					nntp)   type=News;;
+					p2p)    type=FileTransfer;;
+					voip)   type=Telephony;;
 				esac
 				type="Network;${type}"
 				;;
@@ -968,15 +964,14 @@
 			sci)
 				case ${catmin} in
 					astro*)  type=Astronomy;;
-					bio*)	 type=Biology;;
-					calc*)	 type=Calculator;;
-					chem*)	 type=Chemistry;;
+					bio*)    type=Biology;;
+					calc*)   type=Calculator;;
+					chem*)   type=Chemistry;;
 					elec*)   type=Electronics;;
-					geo*)	 type=Geology;;
-					math*)	 type=Math;;
+					geo*)    type=Geology;;
+					math*)   type=Math;;
 					physics) type=Physics;;
 					visual*) type=DataVisualization;;
-					*)		 type=;;
 				esac
 				type="Education;Science;${type}"
 				;;
@@ -988,7 +983,6 @@
 			www)
 				case ${catmin} in
 					client) type=WebBrowser;;
-					*)		type=;;
 				esac
 				type="Network;${type}"
 				;;

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      10/03/07 02:55:54

  Modified:             eutils.eclass
  Log:
  make_desktop_entry: place media-gfx into Graphics only, not AudioVideo;Graphics

Revision  Changes    Path
1.339                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -r1.338 -r1.339
--- eutils.eclass	7 Mar 2010 02:52:25 -0000	1.338
+++ eutils.eclass	7 Mar 2010 02:55:54 -0000	1.339
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.338 2010/03/07 02:52:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.339 2010/03/07 02:55:54 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -937,13 +937,19 @@
 
 			media)
 				case ${catmin} in
-					gfx)   type=Graphics;;
-					radio) type=Tuner;;
-					sound) type=Audio;;
-					tv)    type=TV;;
-					video) type=Video;;
+					gfx)
+						type=Graphics
+						;;
+					*)
+						case ${catmin} in
+							radio) type=Tuner;;
+							sound) type=Audio;;
+							tv)    type=TV;;
+							video) type=Video;;
+						esac
+						type="AudioVideo;${type}"
+						;;
 				esac
-				type="AudioVideo;${type}"
 				;;
 
 			net)

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      10/03/07 03:00:08

  Modified:             eutils.eclass
  Log:
  make_desktop_entry: call `die` if `doins` failed #305165

Revision  Changes    Path
1.340                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- eutils.eclass	7 Mar 2010 02:55:54 -0000	1.339
+++ eutils.eclass	7 Mar 2010 03:00:08 -0000	1.340
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.339 2010/03/07 02:55:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.340 2010/03/07 03:00:08 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1035,7 +1035,7 @@
 		# doesn't corrupt the env of the caller
 		insinto /usr/share/applications
 		doins "${desktop}"
-	)
+	) || die "installing desktop file failed"
 }
 
 # @FUNCTION: validate_desktop_entries

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      10/03/23 03:40:19

  Modified:             eutils.eclass
  Log:
  make_desktop_entry: let 5th arg take arbitrary fields to append to the desktop file #310763 by Jim Ramsay

Revision  Changes    Path
1.341                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- eutils.eclass	7 Mar 2010 03:00:08 -0000	1.340
+++ eutils.eclass	23 Mar 2010 03:40:18 -0000	1.341
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.340 2010/03/07 03:00:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.341 2010/03/23 03:40:18 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -858,7 +858,7 @@
 # Great for making those icons in kde/gnome startmenu !
 # Amaze your friends !	Get the women !	 Join today !
 #
-# make_desktop_entry(<command>, [name], [icon], [type], [path])
+# make_desktop_entry(<command>, [name], [icon], [type], [fields])
 #
 # binary:	what command does the app run with ?
 # name:		the name that will show up in the menu
@@ -867,15 +867,15 @@
 #			a full path to an icon
 # type:		what kind of application is this ?	for categories:
 #			http://standards.freedesktop.org/menu-spec/latest/apa.html
-# path:		if your app needs to startup in a specific dir
+# fields:	extra fields to append to the desktop file; a printf string
 make_desktop_entry() {
-	[[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
+	[[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
 
 	local exec=${1}
 	local name=${2:-${PN}}
 	local icon=${3:-${PN}}
 	local type=${4}
-	local path=${5}
+	local fields=${5}
 
 	if [[ -z ${type} ]] ; then
 		local catmaj=${CATEGORY%%-*}
@@ -1028,7 +1028,12 @@
 	Categories=${type}
 	EOF
 
-	[[ ${path} ]] && echo "Path=${path}" >> "${desktop}"
+	if [[ ${fields:-=} != *=* ]] ; then
+		# 5th arg used to be value to Path=
+		ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
+		fields="Path=${fields}"
+	fi
+	[[ -n ${fields} ]] && printf "${fields}\n" >> "${desktop}"
 
 	(
 		# wrap the env here so that the 'insinto' call

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      10/04/19 19:54:47

  Modified:             eutils.eclass
  Log:
  make_desktop_entry: use printf %b to make arg passing simpler since we only want to support embedded escape sequences

Revision  Changes    Path
1.342                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- eutils.eclass	23 Mar 2010 03:40:18 -0000	1.341
+++ eutils.eclass	19 Apr 2010 19:54:47 -0000	1.342
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.341 2010/03/23 03:40:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.342 2010/04/19 19:54:47 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1033,7 +1033,7 @@
 		ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
 		fields="Path=${fields}"
 	fi
-	[[ -n ${fields} ]] && printf "${fields}\n" >> "${desktop}"
+	[[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}"
 
 	(
 		# wrap the env here so that the 'insinto' call

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Michael Sterrett (mr_bones_)]

mr_bones_    10/05/11 20:08:02

  Modified:             eutils.eclass
  Log:
  add -m1 to grep for unpack_makeself for bug #319059

Revision  Changes    Path
1.343                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -r1.342 -r1.343
--- eutils.eclass	19 Apr 2010 19:54:47 -0000	1.342
+++ eutils.eclass	11 May 2010 20:08:02 -0000	1.343
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.342 2010/04/19 19:54:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.343 2010/05/11 20:08:02 mr_bones_ Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1329,7 +1329,7 @@
 	local shrtsrc=$(basename "${src}")
 	echo ">>> Unpacking ${shrtsrc} to ${PWD}"
 	if [[ -z ${skip} ]] ; then
-		local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
+		local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
 		local skip=0
 		exe=tail
 		case ${ver} in

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      10/05/20 02:21:18

  Modified:             eutils.eclass
  Log:
  drop unnecessary output padding in unpack_makeself #320313

Revision  Changes    Path
1.344                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -r1.343 -r1.344
--- eutils.eclass	11 May 2010 20:08:02 -0000	1.343
+++ eutils.eclass	20 May 2010 02:21:17 -0000	1.344
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.343 2010/05/11 20:08:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.344 2010/05/20 02:21:17 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1341,15 +1341,15 @@
 				;;
 			2.1.1)
 				skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
-				let skip="skip + 1"
+				(( skip++ ))
 				;;
 			2.1.2)
 				skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
-				let skip="skip + 1"
+				(( skip++ ))
 				;;
 			2.1.3)
 				skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
-				let skip="skip + 1"
+				(( skip++ ))
 				;;
 			2.1.4|2.1.5)
 				skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
@@ -1368,7 +1368,7 @@
 	fi
 	case ${exe} in
 		tail)	exe="tail -n +${skip} '${src}'";;
-		dd)		exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
+		dd)		exe="dd ibs=${skip} skip=1 if='${src}'";;
 		*)		die "makeself cant handle exe '${exe}'"
 	esac
 

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Doug Goldstein (cardoe)]

cardoe      10/06/23 21:24:50

  Modified:             eutils.eclass
  Log:
  Add -r to groupadd and useradd so that users and groups created on Linux are created in the system range as defined by login.defs. Fixes bug #264519 & bug #262559

Revision  Changes    Path
1.345                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- eutils.eclass	20 May 2010 02:21:17 -0000	1.344
+++ eutils.eclass	23 Jun 2010 21:24:50 -0000	1.345
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.344 2010/05/20 02:21:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.345 2010/06/23 21:24:50 cardoe Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -708,13 +708,13 @@
 
 	*)
 		if [[ -z $@ ]] ; then
-			useradd ${opts} \
+			useradd -r ${opts} \
 				-c "added by portage for ${PN}" \
 				${euser} \
 				|| die "enewuser failed"
 		else
 			einfo " - Extra: $@"
-			useradd ${opts} "$@" \
+			useradd -r ${opts} "$@" \
 				${euser} \
 				|| die "enewuser failed"
 		fi
@@ -837,7 +837,8 @@
 		;;
 
 	*)
-		groupadd ${opts} ${egroup} || die "enewgroup failed"
+		# We specify -r so that we get a GID in the system range from login.defs
+		groupadd -r ${opts} ${egroup} || die "enewgroup failed"
 		;;
 	esac
 	export SANDBOX_ON="${oldsandbox}"

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Doug Goldstein (cardoe)]

cardoe      10/07/10 06:02:59

  Modified:             eutils.eclass
  Log:
  Fix bug in cdrom_get_cds() identified by Jared <nitro@legroom.net> when using multiple CDs. bug #327549. Also found a minor typo and fixed that.

Revision  Changes    Path
1.346                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -r1.345 -r1.346
--- eutils.eclass	23 Jun 2010 21:24:50 -0000	1.345
+++ eutils.eclass	10 Jul 2010 06:02:59 -0000	1.346
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.345 2010/06/23 21:24:50 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.346 2010/07/10 06:02:59 cardoe Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1512,7 +1512,7 @@
 		export CDROM_SET=-1
 		for f in ${CDROM_CHECK_1//:/ } ; do
 			((++CDROM_SET))
-			[[ -e ${CD_ROOT}/${f} ]] && break
+			[[ -e ${CDROM_ROOT}/${f} ]] && break
 		done
 		export CDROM_MATCH=${f}
 		return
@@ -1552,7 +1552,7 @@
 		einfo "If you do not have the CDs, but have the data files"
 		einfo "mounted somewhere on your filesystem, just export"
 		einfo "the following variables so they point to the right place:"
-		einfon ""
+		einfo ""
 		cdcnt=0
 		while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
 			((++cdcnt))

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Tristan Heaven (nyhm)]

nyhm        10/07/10 09:52:47

  Modified:             eutils.eclass
  Log:
  einfon wasn't a typo

Revision  Changes    Path
1.347                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -r1.346 -r1.347
--- eutils.eclass	10 Jul 2010 06:02:59 -0000	1.346
+++ eutils.eclass	10 Jul 2010 09:52:47 -0000	1.347
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.346 2010/07/10 06:02:59 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.347 2010/07/10 09:52:47 nyhm Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1552,7 +1552,7 @@
 		einfo "If you do not have the CDs, but have the data files"
 		einfo "mounted somewhere on your filesystem, just export"
 		einfo "the following variables so they point to the right place:"
-		einfo ""
+		einfon ""
 		cdcnt=0
 		while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
 			((++cdcnt))

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Petteri Raty (betelgeuse)]

betelgeuse    10/07/11 17:29:10

  Modified:             eutils.eclass
  Log:
  Add eqawarn

Revision  Changes    Path
1.348                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -r1.347 -r1.348
--- eutils.eclass	10 Jul 2010 09:52:47 -0000	1.347
+++ eutils.eclass	11 Jul 2010 17:29:10 -0000	1.348
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.347 2010/07/10 09:52:47 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.348 2010/07/11 17:29:10 betelgeuse Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -63,6 +63,17 @@
 
 fi
 
+# @FUNCTION: eqawarn
+# @USAGE: [message]
+# @DESCRIPTION:
+# Proxy to einfo for package managers that don't provide eqawarn and use the PM
+# implementation if available.
+if ! declare -F eqawarn >/dev/null ; then
+	eqawarn() {
+		einfo "$@"
+	}
+fi
+
 # @FUNCTION: ecvs_clean
 # @USAGE: [list of dirs]
 # @DESCRIPTION:

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      10/08/19 21:32:26

  Modified:             eutils.eclass
  Log:
  epatch_user: return 0/1 depending on user patches actually applied

Revision  Changes    Path
1.349                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -r1.348 -r1.349
--- eutils.eclass	11 Jul 2010 17:29:10 -0000	1.348
+++ eutils.eclass	19 Aug 2010 21:32:26 -0000	1.349
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.348 2010/07/11 17:29:10 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.349 2010/08/19 21:32:26 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -435,9 +435,10 @@
 			EPATCH_FORCE="yes" \
 			EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
 			epatch
-			break
+			return 0
 		fi
 	done
+	return 1
 }
 
 # @FUNCTION: emktemp

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      10/09/16 22:38:25

  Modified:             eutils.eclass
  Log:
  epatch docs: fix inverted logic in documentation

Revision  Changes    Path
1.350                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -r1.349 -r1.350
--- eutils.eclass	19 Aug 2010 21:32:26 -0000	1.349
+++ eutils.eclass	16 Sep 2010 22:38:25 -0000	1.350
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.349 2010/08/19 21:32:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.350 2010/09/16 22:38:25 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -202,7 +202,7 @@
 #
 # When processing directories, epatch will apply all patches that match:
 # @CODE
-#	${EPATCH_FORCE} == "yes"
+#	if ${EPATCH_FORCE} != "yes"
 #		??_${ARCH}_foo.${EPATCH_SUFFIX}
 #	else
 #		*.${EPATCH_SUFFIX}

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      10/10/17 21:35:44

  Modified:             eutils.eclass
  Log:
  path_exists: new function for checking existence of multiple paths

Revision  Changes    Path
1.351                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -r1.350 -r1.351
--- eutils.eclass	16 Sep 2010 22:38:25 -0000	1.350
+++ eutils.eclass	17 Oct 2010 21:35:44 -0000	1.351
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.350 2010/09/16 22:38:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.351 2010/10/17 21:35:44 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1966,3 +1966,32 @@
 #	ecompressdir --ignore /usr/share/doc/${PF}/html
 #	ecompressdir --queue /usr/share/doc
 #}
+
+# @FUNCTION: path_exists
+# @USAGE: [-a|-o] <paths>
+# @DESCRIPTION:
+# Check if the specified paths exist.  Works for all types of paths
+# (files/dirs/etc...).  The -a and -o flags control the requirements
+# of the paths.  They correspond to "and" and "or" logic.  So the -a
+# flag means all the paths must exist while the -o flag means at least
+# one of the paths must exist.  The default behavior is "and".  If no
+# paths are specified, then the return value is "false".
+path_exists() {
+	local opt=$1
+	[[ ${opt} == -[ao] ]] && shift || opt="-a"
+
+	# no paths -> return false
+	# same behavior as: [[ -e "" ]]
+	[[ $# -eq 0 ]] && return 1
+
+	local p r=0
+	for p in "$@" ; do
+		[[ -e ${p} ]]
+		: $(( r += $? ))
+	done
+
+	case ${opt} in
+		-a) return $(( r != 0 )) ;;
+		-o) return $(( r == $# )) ;;
+	esac
+}

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      10/11/22 00:31:03

  Modified:             eutils.eclass
  Log:
  preserve_old_lib_notify: keep full path to lib in revdep-rebuild example output to help with multilib setups #339134 by Bernardo Costa

Revision  Changes    Path
1.352                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- eutils.eclass	17 Oct 2010 21:35:44 -0000	1.351
+++ eutils.eclass	22 Nov 2010 00:31:03 -0000	1.352
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.351 2010/10/17 21:35:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.352 2010/11/22 00:31:03 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1787,7 +1787,7 @@
 			ewarn "helper program, simply emerge the 'gentoolkit' package."
 			ewarn
 		fi
-		ewarn "  # revdep-rebuild --library ${lib##*/}"
+		ewarn "  # revdep-rebuild --library '${lib}'"
 	done
 	if [[ ${notice} -eq 1 ]] ; then
 		ewarn

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      11/01/09 02:16:53

  Modified:             eutils.eclass
  Log:
  warn about relative paths in patches

Revision  Changes    Path
1.353                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -r1.352 -r1.353
--- eutils.eclass	22 Nov 2010 00:31:03 -0000	1.352
+++ eutils.eclass	9 Jan 2011 02:16:53 -0000	1.353
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.352 2010/11/22 00:31:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.353 2011/01/09 02:16:53 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -360,6 +360,13 @@
 			count=1
 			printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
 		fi
+		# Similar reason, but with relative paths.
+		local rel_paths=$(egrep -n '^[-+]{3} [^	]*[.][.]/' "${PATCH_TARGET}")
+		if [[ -n ${rel_paths} ]] ; then
+			eqawarn "QA Notice: Your patch uses relative paths '../'."
+			eqawarn " In the future this will cause a failure."
+			eqawarn "${rel_paths}"
+		fi
 
 		# Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
 		while [[ ${count} -lt 5 ]] ; do

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Ulrich Mueller (ulm)]

ulm         11/02/25 21:58:19

  Modified:             eutils.eclass
  Log:
  Remove dead and commented prepalldocs function.

Revision  Changes    Path
1.354                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- eutils.eclass	9 Jan 2011 02:16:53 -0000	1.353
+++ eutils.eclass	25 Feb 2011 21:58:19 -0000	1.354
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.353 2011/01/09 02:16:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.354 2011/02/25 21:58:19 ulm Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -291,9 +291,9 @@
 		local a=${patchname#*_} # strip the ???_
 		a=${a%%_*}              # strip the _foo.patch
 		if ! [[ ${SINGLE_PATCH} == "yes" || \
-		        ${EPATCH_FORCE} == "yes" || \
-		        ${a} == all     || \
-		        ${a} == ${ARCH} ]]
+				${EPATCH_FORCE} == "yes" || \
+				${a} == all     || \
+				${a} == ${ARCH} ]]
 		then
 			continue
 		fi
@@ -1950,30 +1950,6 @@
 	fi
 }
 
-# @FUNCTION: prepalldocs
-# @USAGE:
-# @DESCRIPTION:
-# Compress files in /usr/share/doc which are not already
-# compressed, excluding /usr/share/doc/${PF}/html.
-# Uses the ecompressdir to do the compression.
-# 2009-02-18 by betelgeuse:
-# Commented because ecompressdir is even more internal to
-# Portage than prepalldocs (it's not even mentioned in man 5
-# ebuild). Please submit a better version for review to gentoo-dev
-# if you want prepalldocs here.
-#prepalldocs() {
-#	if [[ -n $1 ]] ; then
-#		ewarn "prepalldocs: invalid usage; takes no arguments"
-#	fi
-
-#	cd "${D}"
-#	[[ -d usr/share/doc ]] || return 0
-
-#	find usr/share/doc -exec gzip {} +
-#	ecompressdir --ignore /usr/share/doc/${PF}/html
-#	ecompressdir --queue /usr/share/doc
-#}
-
 # @FUNCTION: path_exists
 # @USAGE: [-a|-o] <paths>
 # @DESCRIPTION:

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      11/03/18 20:36:37

  Modified:             eutils.eclass
  Log:
  add temp hack for revdep-rebuild/mpfr so we can move forward on stabilization

Revision  Changes    Path
1.355                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -r1.354 -r1.355
--- eutils.eclass	25 Feb 2011 21:58:19 -0000	1.354
+++ eutils.eclass	18 Mar 2011 20:36:37 -0000	1.355
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.354 2011/02/25 21:58:19 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.355 2011/03/18 20:36:37 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1794,6 +1794,8 @@
 			ewarn "helper program, simply emerge the 'gentoolkit' package."
 			ewarn
 		fi
+		# temp hack for #348634 #357225
+		[[ ${PN} == "mpfr" ]] && lib=${lib##*/}
 		ewarn "  # revdep-rebuild --library '${lib}'"
 	done
 	if [[ ${notice} -eq 1 ]] ; then

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      11/04/18 15:09:16

  Modified:             eutils.eclass
  Log:
  unpack_makeself: catch errors from `file`

Revision  Changes    Path
1.356                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- eutils.eclass	18 Mar 2011 20:36:37 -0000	1.355
+++ eutils.eclass	18 Apr 2011 15:09:16 -0000	1.356
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.355 2011/03/18 20:36:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.356 2011/04/18 15:09:16 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1393,9 +1393,9 @@
 	esac
 
 	# lets grab the first few bytes of the file to figure out what kind of archive it is
-	local tmpfile=$(emktemp)
+	local filetype tmpfile=$(emktemp)
 	eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
-	local filetype=$(file -b "${tmpfile}")
+	filetype=$(file -b "${tmpfile}") || die
 	case ${filetype} in
 		*tar\ archive*)
 			eval ${exe} | tar --no-same-owner -xf -

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Petteri Raty (betelgeuse)]

betelgeuse    11/06/14 20:16:51

  Modified:             eutils.eclass
  Log:
  Escape $ in double quotes when it's meant to be used literally. Acked by flameeyes.

Revision  Changes    Path
1.357                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -r1.356 -r1.357
--- eutils.eclass	18 Apr 2011 15:09:16 -0000	1.356
+++ eutils.eclass	14 Jun 2011 20:16:51 -0000	1.357
@@ -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/eutils.eclass,v 1.356 2011/04/18 15:09:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.357 2011/06/14 20:16:51 betelgeuse Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -499,7 +499,7 @@
 	*-darwin[678])
 		case "$2" in
 		*[!0-9]*) # Non numeric
-			nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
+			nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2\$/) {print \$0;exit;} }"
 			;;
 		*)	# Numeric
 			nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      11/07/20 05:46:46

  Modified:             eutils.eclass
  Log:
  epatch: use EPATCH_SOURCE as a [relative] search dir even when patches are specified on the command line

Revision  Changes    Path
1.359                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -r1.358 -r1.359
--- eutils.eclass	8 Jul 2011 11:35:01 -0000	1.358
+++ eutils.eclass	20 Jul 2011 05:46:46 -0000	1.359
@@ -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/eutils.eclass,v 1.358 2011/07/08 11:35:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.359 2011/07/20 05:46:46 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -252,6 +252,11 @@
 		# Some people like to make dirs of patches w/out suffixes (vim)
 		set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
 
+	elif [[ -f ${EPATCH_SOURCE}/$1 ]] ; then
+		# Re-use EPATCH_SOURCE as a search dir
+		epatch "${EPATCH_SOURCE}/$1"
+		return $?
+
 	else
 		# sanity check ... if it isn't a dir or file, wtf man ?
 		[[ $# -ne 0 ]] && EPATCH_SOURCE=$1

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      11/08/07 23:35:28

  Modified:             eutils.eclass
  Log:
  epatch: log exit status of `patch` command #375983 by Toralf Förster

Revision  Changes    Path
1.360                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- eutils.eclass	20 Jul 2011 05:46:46 -0000	1.359
+++ eutils.eclass	7 Aug 2011 23:35:28 -0000	1.360
@@ -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/eutils.eclass,v 1.359 2011/07/20 05:46:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.360 2011/08/07 23:35:28 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -382,9 +382,14 @@
 			echo "PATCH COMMAND:  patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
 			echo
 			_epatch_draw_line "***** ${patchname} *****"
+			patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}" 2>&1
+			ret=$?
+			echo
+			echo "patch program exited with status ${ret}"
+			exit ${ret}
 			) >> "${STDERR_TARGET}"
 
-			if (patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
+			if [ $? -eq 0 ] ; then
 				(
 				_epatch_draw_line "***** ${patchname} *****"
 				echo
@@ -392,6 +397,10 @@
 				echo
 				_epatch_draw_line "***** ${patchname} *****"
 				patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
+				ret=$?
+				echo
+				echo "patch program exited with status ${ret}"
+				exit ${ret}
 				) >> "${STDERR_TARGET}"
 
 				if [ $? -ne 0 ] ; then

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      11/08/08 02:01:41

  Modified:             eutils.eclass
  Log:
  epatch_user: add documentation by Martin von Gagern

Revision  Changes    Path
1.361                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -r1.360 -r1.361
--- eutils.eclass	7 Aug 2011 23:35:28 -0000	1.360
+++ eutils.eclass	8 Aug 2011 02:01:40 -0000	1.361
@@ -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/eutils.eclass,v 1.360 2011/08/07 23:35:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.361 2011/08/08 02:01:40 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -441,9 +441,40 @@
 	[[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
 	: # everything worked
 }
+
+# @FUNCTION: epatch_user
+# @USAGE:
+# @DESCRIPTION:
+# Applies user-provided patches to the source tree. The patches are
+# taken from /etc/portage/patches/<CATEGORY>/<PF|P|PN>/, where the first
+# of these three directories to exist will be the one to use, ignoring
+# any more general directories which might exist as well.
+#
+# User patches are intended for quick testing of patches without ebuild
+# modifications, as well as for permanent customizations a user might
+# desire. Obviously, there can be no official support for arbitrarily
+# patched ebuilds. So whenever a build log in a bug report mentions that
+# user patches were applied, the user should be asked to reproduce the
+# problem without these.
+#
+# Not all ebuilds do call this function, so placing patches in the
+# stated directory might or might not work, depending on the package and
+# the eclasses it inherits and uses. It is safe to call the function
+# repeatedly, so it is always possible to add a call at the ebuild
+# level. The first call is the time when the patches will be
+# applied.
+#
+# Ideally, this function should be called after gentoo-specific patches
+# have been applied, so that their code can be modified as well, but
+# before calls to e.g. eautoreconf, as the user patches might affect
+# autotool input files as well.
 epatch_user() {
 	[[ $# -ne 0 ]] && die "epatch_user takes no options"
 
+	# Allow multiple calls to this function; ignore all but the first
+	local applied="${T}/epach_user.applied"
+	[[ -e ${applied} ]] && return 2
+
 	# don't clobber any EPATCH vars that the parent might want
 	local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
 	for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
@@ -456,9 +487,11 @@
 			EPATCH_FORCE="yes" \
 			EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
 			epatch
+			echo "${EPATCH_SOURCE}" > "${applied}"
 			return 0
 		fi
 	done
+	echo "none" > "${applied}"
 	return 1
 }
 

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      11/08/09 00:43:48

  Modified:             eutils.eclass
  Log:
  fix typo pointed out by Samuli

Revision  Changes    Path
1.362                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- eutils.eclass	8 Aug 2011 02:01:40 -0000	1.361
+++ eutils.eclass	9 Aug 2011 00:43:48 -0000	1.362
@@ -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/eutils.eclass,v 1.361 2011/08/08 02:01:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.362 2011/08/09 00:43:48 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -472,7 +472,7 @@
 	[[ $# -ne 0 ]] && die "epatch_user takes no options"
 
 	# Allow multiple calls to this function; ignore all but the first
-	local applied="${T}/epach_user.applied"
+	local applied="${T}/epatch_user.applied"
 	[[ -e ${applied} ]] && return 2
 
 	# don't clobber any EPATCH vars that the parent might want

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Michal Gorny (mgorny)]

mgorny      11/09/12 20:44:02

  Modified:             eutils.eclass
  Log:
  Rewrite eqawarn() to reuse PORTAGE_ELOG_CLASSES set by dev profile.

Revision  Changes    Path
1.363                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -r1.362 -r1.363
--- eutils.eclass	9 Aug 2011 00:43:48 -0000	1.362
+++ eutils.eclass	12 Sep 2011 20:44:01 -0000	1.363
@@ -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/eutils.eclass,v 1.362 2011/08/09 00:43:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.363 2011/09/12 20:44:01 mgorny Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -66,11 +66,12 @@
 # @FUNCTION: eqawarn
 # @USAGE: [message]
 # @DESCRIPTION:
-# Proxy to einfo for package managers that don't provide eqawarn and use the PM
-# implementation if available.
+# Proxy to ewarn for package managers that don't provide eqawarn and use the PM
+# implementation if available. Reuses PORTAGE_ELOG_CLASSES as set by the dev
+# profile.
 if ! declare -F eqawarn >/dev/null ; then
 	eqawarn() {
-		einfo "$@"
+		has qa ${PORTAGE_ELOG_CLASSES} && ewarn "$@"
 	}
 fi
 

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Michal Gorny (mgorny)]

mgorny      11/09/21 21:46:49

  Modified:             eutils.eclass
  Log:
  Introduce in_iuse() for IUSE checks.
  
  Such checks are used at least in autotools-utils & kde* eclasses, and
  are done wrong there. Thus, I've created a little reusable snippet
  suitable for eutils.

Revision  Changes    Path
1.364                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -r1.363 -r1.364
--- eutils.eclass	12 Sep 2011 20:44:01 -0000	1.363
+++ eutils.eclass	21 Sep 2011 21:46:49 -0000	1.364
@@ -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/eutils.eclass,v 1.363 2011/09/12 20:44:01 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.364 2011/09/21 21:46:49 mgorny Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -2028,3 +2028,20 @@
 		-o) return $(( r == $# )) ;;
 	esac
 }
+
+# @FUNCTION: in_iuse
+# @USAGE: <flag>
+# @DESCRIPTION:
+# Determines whether the given flag is in IUSE. Strips IUSE default prefixes
+# as necessary.
+#
+# Note that this function should not be used in the global scope.
+in_iuse() {
+	debug-print-function ${FUNCNAME} "${@}"
+	[[ ${#} -eq 1 ]] || die "Invalid args to ${FUNCNAME}()"
+
+	local flag=${1}
+	local liuse=( ${IUSE} )
+
+	has "${flag}" "${liuse[@]#[+-]}"
+}

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      11/09/29 02:32:20

  Modified:             eutils.eclass
  Log:
  add usex() helper #382963

Revision  Changes    Path
1.365                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -r1.364 -r1.365
--- eutils.eclass	21 Sep 2011 21:46:49 -0000	1.364
+++ eutils.eclass	29 Sep 2011 02:32:20 -0000	1.365
@@ -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/eutils.eclass,v 1.364 2011/09/21 21:46:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.365 2011/09/29 02:32:20 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -2045,3 +2045,10 @@
 
 	has "${flag}" "${liuse[@]#[+-]}"
 }
+
+# @FUNCTION: usex
+# @USAGE: <USE flag> [true output] [false output] [true suffix] [false suffix]
+# @DESCRIPTION:
+# If USE flag is set, echo [true output][true suffix] (defaults to "yes"),
+# otherwise echo [false output][false suffix] (defaults to "no").
+usex() { use "$1" && echo "${2-yes}$4" || echo "${3-no}$5" ; } #382963

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      11/09/30 16:51:01

  Modified:             eutils.eclass
  Log:
  edos2unix now dies when sed fails

Revision  Changes    Path
1.366                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.365
retrieving revision 1.366
diff -u -r1.365 -r1.366
--- eutils.eclass	29 Sep 2011 02:32:20 -0000	1.365
+++ eutils.eclass	30 Sep 2011 16:51:01 -0000	1.366
@@ -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/eutils.eclass,v 1.365 2011/09/29 02:32:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.366 2011/09/30 16:51:01 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -919,7 +919,8 @@
 # is a script based solution.  Just give it a list of files to convert and
 # they will all be changed from the DOS CRLF format to the UNIX LF format.
 edos2unix() {
-	echo "$@" | xargs sed -i 's/\r$//'
+	[[ $# -eq 0 ]] && return 0
+	sed -i 's/\r$//' -- "$@" || die
 }
 
 # Make a desktop file !

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      11/12/02 03:27:37

  Modified:             eutils.eclass
  Log:
  include $PWD in epatch log

Revision  Changes    Path
1.369                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -r1.368 -r1.369
--- eutils.eclass	27 Oct 2011 07:16:08 -0000	1.368
+++ eutils.eclass	2 Dec 2011 03:27:37 -0000	1.369
@@ -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/eutils.eclass,v 1.368 2011/10/27 07:16:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.369 2011/12/02 03:27:37 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -337,7 +337,7 @@
 			STDERR_TARGET="${T}/${patchname}-$$.out"
 		fi
 
-		printf "***** %s *****\n\n" "${patchname}" > "${STDERR_TARGET}"
+		printf "***** %s *****\nPWD: %s\n\n" "${patchname}" "${PWD}" > "${STDERR_TARGET}"
 
 		# Decompress the patch if need be
 		local count=0

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      11/12/14 17:27:16

  Modified:             eutils.eclass
  Log:
  avoid multiple inclusions when possible to speed caching up

Revision  Changes    Path
1.371                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -r1.370 -r1.371
--- eutils.eclass	2 Dec 2011 10:22:41 -0000	1.370
+++ eutils.eclass	14 Dec 2011 17:27:16 -0000	1.371
@@ -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/eutils.eclass,v 1.370 2011/12/02 10:22:41 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.371 2011/12/14 17:27:16 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -15,6 +15,9 @@
 # Due to the nature of this eclass, some functions may have maintainers
 # different from the overall eclass!
 
+if [[ ${___ECLASS_ONCE_EUTILS} != "recur -_+^+_- spank" ]] ; then
+___ECLASS_ONCE_EUTILS="recur -_+^+_- spank"
+
 inherit multilib portability user
 
 DESCRIPTION="Based on the ${ECLASS} eclass"
@@ -1685,3 +1688,5 @@
 # If USE flag is set, echo [true output][true suffix] (defaults to "yes"),
 # otherwise echo [false output][false suffix] (defaults to "no").
 usex() { use "$1" && echo "${2-yes}$4" || echo "${3-no}$5" ; } #382963
+
+fi

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      11/12/14 17:36:18

  Modified:             eutils.eclass
  Log:
  drop check_license now that the PM supports ACCEPT_LICENSE natively

Revision  Changes    Path
1.372                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -r1.371 -r1.372
--- eutils.eclass	14 Dec 2011 17:27:16 -0000	1.371
+++ eutils.eclass	14 Dec 2011 17:36:18 -0000	1.372
@@ -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/eutils.eclass,v 1.371 2011/12/14 17:27:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.372 2011/12/14 17:36:18 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1090,65 +1090,6 @@
 	assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})"
 }
 
-# @FUNCTION: check_license
-# @USAGE: [license]
-# @DESCRIPTION:
-# Display a license for user to accept.  If no license is
-# specified, then ${LICENSE} is used.
-check_license() {
-	local lic=$1
-	if [ -z "${lic}" ] ; then
-		lic="${PORTDIR}/licenses/${LICENSE}"
-	else
-		if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
-			lic="${PORTDIR}/licenses/${lic}"
-		elif [ -e "${PWD}/${lic}" ] ; then
-			lic="${PWD}/${lic}"
-		elif [ -e "${lic}" ] ; then
-			lic="${lic}"
-		fi
-	fi
-	local l="`basename ${lic}`"
-
-	# here is where we check for the licenses the user already
-	# accepted ... if we don't find a match, we make the user accept
-	local alic
-	eshopts_push -o noglob # so that bash doesn't expand "*"
-	for alic in ${ACCEPT_LICENSE} ; do
-		if [[ ${alic} == ${l} ]]; then
-			eshopts_pop
-			return 0
-		fi
-	done
-	eshopts_pop
-	[ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
-
-	local licmsg=$(emktemp)
-	cat <<-EOF > ${licmsg}
-	**********************************************************
-	The following license outlines the terms of use of this
-	package.  You MUST accept this license for installation to
-	continue.  When you are done viewing, hit 'q'.	If you
-	CTRL+C out of this, the install will not run!
-	**********************************************************
-
-	EOF
-	cat ${lic} >> ${licmsg}
-	${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
-	einfon "Do you accept the terms of this license (${l})? [yes/no] "
-	read alic
-	case ${alic} in
-		yes|Yes|y|Y)
-			return 0
-			;;
-		*)
-			echo;echo;echo
-			eerror "You MUST accept the license to continue!  Exiting!"
-			die "Failed to accept license"
-			;;
-	esac
-}
-
 # @FUNCTION: cdrom_get_cds
 # @USAGE: <file on cd1> [file on cd2] [file on cd3] [...]
 # @DESCRIPTION:
@@ -1689,4 +1630,6 @@
 # otherwise echo [false output][false suffix] (defaults to "no").
 usex() { use "$1" && echo "${2-yes}$4" || echo "${3-no}$5" ; } #382963
 
+check_license() { die "you no longer need this as portage supports ACCEPT_LICENSE itself"; }
+
 fi

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      11/12/16 23:38:41

  Modified:             eutils.eclass
  Log:
  add new generic stack helpers estack_{push,pop}, rebase eshopts_{push,pop} on top of those, and then add new helpers for messing with the umask sanely

Revision  Changes    Path
1.373                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -r1.372 -r1.373
--- eutils.eclass	14 Dec 2011 17:36:18 -0000	1.372
+++ eutils.eclass	16 Dec 2011 23:38:41 -0000	1.373
@@ -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/eutils.eclass,v 1.372 2011/12/14 17:36:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.373 2011/12/16 23:38:41 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -100,6 +100,54 @@
 	find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
 }
 
+# @FUNCTION: estack_push
+# @USAGE: <stack> [items to push]
+# @DESCRIPTION:
+# Push any number of items onto the specified stack.  Pick a name that
+# is a valid variable (i.e. stick to alphanumerics), and push as many
+# items as you like onto the stack at once.
+#
+# The following code snippet will echo 5, then 4, then 3, then ...
+# @CODE
+#		estack_push mystack 1 2 3 4 5
+#		while estack_pop mystack i ; do
+#			echo "${i}"
+#		done
+# @CODE
+estack_push() {
+	[[ $# -eq 0 ]] && die "estack_push: incorrect # of arguments"
+	local stack_name="__ESTACK_$1__" ; shift
+	eval ${stack_name}+=\( \"\$@\" \)
+}
+
+# @FUNCTION: estack_pop
+# @USAGE: <stack> [variable]
+# @DESCRIPTION:
+# Pop a single item off the specified stack.  If a variable is specified,
+# the popped item is stored there.  If no more items are available, return
+# 1, else return 0.  See estack_push for more info.
+estack_pop() {
+	[[ $# -eq 0 || $# -gt 2 ]] && die "estack_pop: incorrect # of arguments"
+
+	# We use the fugly __estack_xxx var names to avoid collision with
+	# passing back the return value.  If we used "local i" and the
+	# caller ran `estack_pop ... i`, we'd end up setting the local
+	# copy of "i" rather than the caller's copy.  The __estack_xxx
+	# garbage is preferable to using $1/$2 everywhere as that is a
+	# bit harder to read.
+	local __estack_name="__ESTACK_$1__" ; shift
+	local __estack_retvar=$1 ; shift
+	eval local __estack_i=\${#${__estack_name}[@]}
+	# Don't warn -- let the caller interpret this as a failure
+	# or as normal behavior (akin to `shift`)
+	[[ $(( --__estack_i )) -eq -1 ]] && return 1
+
+	if [[ -n ${__estack_retvar} ]] ; then
+		eval ${__estack_retvar}=\"\${${__estack_name}[${__estack_i}]}\"
+	fi
+	eval unset ${__estack_name}[${__estack_i}]
+}
+
 # @FUNCTION: eshopts_push
 # @USAGE: [options to `set` or `shopt`]
 # @DESCRIPTION:
@@ -126,15 +174,14 @@
 eshopts_push() {
 	# have to assume __ESHOPTS_SAVE__ isn't screwed with
 	# as a `declare -a` here will reset its value
-	local i=${#__ESHOPTS_SAVE__[@]}
 	if [[ $1 == -[su] ]] ; then
-		__ESHOPTS_SAVE__[$i]=$(shopt -p)
+		estack_push eshopts "$(shopt -p)"
 		[[ $# -eq 0 ]] && return 0
-		shopt "$@" || die "eshopts_push: bad options to shopt: $*"
+		shopt "$@" || die "${FUNCNAME}: bad options to shopt: $*"
 	else
-		__ESHOPTS_SAVE__[$i]=$-
+		estack_push eshopts $-
 		[[ $# -eq 0 ]] && return 0
-		set "$@" || die "eshopts_push: bad options to set: $*"
+		set "$@" || die "${FUNCNAME}: bad options to set: $*"
 	fi
 }
 
@@ -144,19 +191,36 @@
 # Restore the shell options to the state saved with the corresponding
 # eshopts_push call.  See that function for more details.
 eshopts_pop() {
-	[[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
-	local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
-	[[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
-	local s=${__ESHOPTS_SAVE__[$i]}
-	unset __ESHOPTS_SAVE__[$i]
+	local s
+	estack_pop eshopts s || die "${FUNCNAME}: unbalanced push"
 	if [[ ${s} == "shopt -"* ]] ; then
-		eval "${s}" || die "eshopts_pop: sanity: invalid shopt options: ${s}"
+		eval "${s}" || die "${FUNCNAME}: sanity: invalid shopt options: ${s}"
 	else
-		set +$-     || die "eshopts_pop: sanity: invalid shell settings: $-"
-		set -${s}   || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
+		set +$-     || die "${FUNCNAME}: sanity: invalid shell settings: $-"
+		set -${s}   || die "${FUNCNAME}: sanity: unable to restore saved shell settings: ${s}"
 	fi
 }
 
+# @FUNCTION: eumask_push
+# @USAGE: <new umask>
+# @DESCRIPTION:
+# Set the umask to the new value specified while saving the previous
+# value onto a stack.  Useful for temporarily changing the umask.
+eumask_push() {
+	estack_push eumask "$(umask)"
+	umask "$@" || die "${FUNCNAME}: bad options to umask: $*"
+}
+
+# @FUNCTION: eumask_pop
+# @USAGE:
+# @DESCRIPTION:
+# Restore the previous umask state.
+eumask_pop() {
+	local s
+	estack_pop eumask s || die "${FUNCNAME}: unbalanced push"
+	umask ${s} || die "${FUNCNAME}: sanity: could not restore umask: ${s}"
+}
+
 # @VARIABLE: EPATCH_SOURCE
 # @DESCRIPTION:
 # Default directory to search for patches.

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      11/12/17 04:55:41

  Modified:             eutils.eclass
  Log:
  keep die message updates in eshopts_{push,pop} to $FUNCNAME

Revision  Changes    Path
1.375                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -r1.374 -r1.375
--- eutils.eclass	17 Dec 2011 03:57:38 -0000	1.374
+++ eutils.eclass	17 Dec 2011 04:55:41 -0000	1.375
@@ -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/eutils.eclass,v 1.374 2011/12/17 03:57:38 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.375 2011/12/17 04:55:41 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -178,11 +178,11 @@
 	if [[ $1 == -[su] ]] ; then
 		__ESHOPTS_SAVE__[$i]=$(shopt -p)
 		[[ $# -eq 0 ]] && return 0
-		shopt "$@" || die "eshopts_push: bad options to shopt: $*"
+		shopt "$@" || die "${FUNCNAME}: bad options to shopt: $*"
 	else
 		__ESHOPTS_SAVE__[$i]=$-
 		[[ $# -eq 0 ]] && return 0
-		set "$@" || die "eshopts_push: bad options to set: $*"
+		set "$@" || die "${FUNCNAME}: bad options to set: $*"
 	fi
 }
 
@@ -192,16 +192,16 @@
 # Restore the shell options to the state saved with the corresponding
 # eshopts_push call.  See that function for more details.
 eshopts_pop() {
-	[[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
+	[[ $# -ne 0 ]] && die "${FUNCNAME} takes no arguments"
 	local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
 	[[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
 	local s=${__ESHOPTS_SAVE__[$i]}
 	unset __ESHOPTS_SAVE__[$i]
 	if [[ ${s} == "shopt -"* ]] ; then
-		eval "${s}" || die "eshopts_pop: sanity: invalid shopt options: ${s}"
+		eval "${s}" || die "${FUNCNAME}: sanity: invalid shopt options: ${s}"
 	else
-		set +$-     || die "eshopts_pop: sanity: invalid shell settings: $-"
-		set -${s}   || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
+		set +$-     || die "${FUNCNAME}: sanity: invalid shell settings: $-"
+		set -${s}   || die "${FUNCNAME}: sanity: unable to restore saved shell settings: ${s}"
 	fi
 }
 

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      11/12/17 06:13:50

  Modified:             eutils.eclass
  Log:
  escape the brackets so that globbing doesnt kick in, or in the nullglob case, make the arg disappear #395025 by Maciej Mrozowski

Revision  Changes    Path
1.376                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -r1.375 -r1.376
--- eutils.eclass	17 Dec 2011 04:55:41 -0000	1.375
+++ eutils.eclass	17 Dec 2011 06:13:50 -0000	1.376
@@ -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/eutils.eclass,v 1.375 2011/12/17 04:55:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.376 2011/12/17 06:13:50 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -137,15 +137,15 @@
 	# bit harder to read.
 	local __estack_name="__ESTACK_$1__" ; shift
 	local __estack_retvar=$1 ; shift
-	eval local __estack_i=\${#${__estack_name}[@]}
+	eval local __estack_i=\${#${__estack_name}\[@\]}
 	# Don't warn -- let the caller interpret this as a failure
 	# or as normal behavior (akin to `shift`)
 	[[ $(( --__estack_i )) -eq -1 ]] && return 1
 
 	if [[ -n ${__estack_retvar} ]] ; then
-		eval ${__estack_retvar}=\"\${${__estack_name}[${__estack_i}]}\"
+		eval ${__estack_retvar}=\"\${${__estack_name}\[${__estack_i}\]}\"
 	fi
-	eval unset ${__estack_name}[${__estack_i}]
+	eval unset ${__estack_name}\[${__estack_i}\]
 }
 
 # @FUNCTION: eshopts_push
@@ -162,7 +162,7 @@
 # A common example is to disable shell globbing so that special meaning/care
 # may be used with variables/arguments to custom functions.  That would be:
 # @CODE
-#		eshopts_push -o noglob
+#		eshopts_push -s noglob
 #		for x in ${foo} ; do
 #			if ...some check... ; then
 #				eshopts_pop
@@ -172,15 +172,12 @@
 #		eshopts_pop
 # @CODE
 eshopts_push() {
-	# have to assume __ESHOPTS_SAVE__ isn't screwed with
-	# as a `declare -a` here will reset its value
-	local i=${#__ESHOPTS_SAVE__[@]}
 	if [[ $1 == -[su] ]] ; then
-		__ESHOPTS_SAVE__[$i]=$(shopt -p)
+		estack_push eshopts "$(shopt -p)"
 		[[ $# -eq 0 ]] && return 0
 		shopt "$@" || die "${FUNCNAME}: bad options to shopt: $*"
 	else
-		__ESHOPTS_SAVE__[$i]=$-
+		estack_push eshopts $-
 		[[ $# -eq 0 ]] && return 0
 		set "$@" || die "${FUNCNAME}: bad options to set: $*"
 	fi
@@ -192,11 +189,8 @@
 # Restore the shell options to the state saved with the corresponding
 # eshopts_push call.  See that function for more details.
 eshopts_pop() {
-	[[ $# -ne 0 ]] && die "${FUNCNAME} takes no arguments"
-	local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
-	[[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
-	local s=${__ESHOPTS_SAVE__[$i]}
-	unset __ESHOPTS_SAVE__[$i]
+	local s
+	estack_pop eshopts s || die "${FUNCNAME}: unbalanced push"
 	if [[ ${s} == "shopt -"* ]] ; then
 		eval "${s}" || die "${FUNCNAME}: sanity: invalid shopt options: ${s}"
 	else

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Justin Lecher (jlec)]

jlec        12/01/03 08:45:36

  Modified:             eutils.eclass
  Log:
  Convert make_desktop_entry() comment block to be eclass-manpages conform, #397451

Revision  Changes    Path
1.377                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -r1.376 -r1.377
--- eutils.eclass	17 Dec 2011 06:13:50 -0000	1.376
+++ eutils.eclass	3 Jan 2012 08:45:36 -0000	1.377
@@ -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/eutils.eclass,v 1.376 2011/12/17 06:13:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.377 2012/01/03 08:45:36 jlec Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -609,20 +609,23 @@
 	sed -i 's/\r$//' -- "$@" || die
 }
 
-# Make a desktop file !
-# Great for making those icons in kde/gnome startmenu !
-# Amaze your friends !	Get the women !	 Join today !
-#
-# make_desktop_entry(<command>, [name], [icon], [type], [fields])
-#
-# binary:	what command does the app run with ?
-# name:		the name that will show up in the menu
-# icon:		give your little like a pretty little icon ...
-#			this can be relative (to /usr/share/pixmaps) or
-#			a full path to an icon
-# type:		what kind of application is this ?	for categories:
-#			http://standards.freedesktop.org/menu-spec/latest/apa.html
+# @FUNCTION: make_desktop_entry
+# @USAGE: make_desktop_entry(<command>, [name], [icon], [type], [fields])
+# @DESCRIPTION:
+# Make a .desktop file.
+#
+# @CODE
+# binary:   what command does the app run with ?
+# name:     the name that will show up in the menu
+# icon:     give your little like a pretty little icon ...
+#           this can be relative (to /usr/share/pixmaps) or
+#           a full path to an icon
+# type:     what kind of application is this?
+#           for categories:
+#           http://standards.freedesktop.org/menu-spec/latest/apa.html
+#           if unset, function tries to guess from package's category
 # fields:	extra fields to append to the desktop file; a printf string
+# @CODE
 make_desktop_entry() {
 	[[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
 

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Ulrich Mueller (ulm)]

ulm         12/01/31 06:55:37

  Modified:             eutils.eclass
  Log:
  Revert previous commit, because cdrom.eclass sets PROPERTIES=interactive.

Revision  Changes    Path
1.380                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -r1.379 -r1.380
--- eutils.eclass	31 Jan 2012 06:44:00 -0000	1.379
+++ eutils.eclass	31 Jan 2012 06:55:37 -0000	1.380
@@ -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/eutils.eclass,v 1.379 2012/01/31 06:44:00 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.380 2012/01/31 06:55:37 ulm Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -18,7 +18,7 @@
 if [[ ${___ECLASS_ONCE_EUTILS} != "recur -_+^+_- spank" ]] ; then
 ___ECLASS_ONCE_EUTILS="recur -_+^+_- spank"
 
-inherit multilib cdrom user
+inherit multilib portability user
 
 DESCRIPTION="Based on the ${ECLASS} eclass"
 
@@ -1155,6 +1155,221 @@
 	assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})"
 }
 
+# @FUNCTION: cdrom_get_cds
+# @USAGE: <file on cd1> [file on cd2] [file on cd3] [...]
+# @DESCRIPTION:
+# Aquire cd(s) for those lovely cd-based emerges.  Yes, this violates
+# the whole 'non-interactive' policy, but damnit I want CD support !
+#
+# With these cdrom functions we handle all the user interaction and
+# standardize everything.  All you have to do is call cdrom_get_cds()
+# and when the function returns, you can assume that the cd has been
+# found at CDROM_ROOT.
+#
+# The function will attempt to locate a cd based upon a file that is on
+# the cd.  The more files you give this function, the more cds
+# the cdrom functions will handle.
+#
+# Normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
+# etc...  If you want to give the cds better names, then just export
+# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
+# Use CDROM_NAME for one cd, or CDROM_NAME_# for multiple cds.  You can
+# also use the CDROM_NAME_SET bash array.
+#
+# For those multi cd ebuilds, see the cdrom_load_next_cd() function.
+cdrom_get_cds() {
+	# first we figure out how many cds we're dealing with by
+	# the # of files they gave us
+	local cdcnt=0
+	local f=
+	for f in "$@" ; do
+		((++cdcnt))
+		export CDROM_CHECK_${cdcnt}="$f"
+	done
+	export CDROM_TOTAL_CDS=${cdcnt}
+	export CDROM_CURRENT_CD=1
+
+	# now we see if the user gave use CD_ROOT ...
+	# if they did, let's just believe them that it's correct
+	if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
+		local var=
+		cdcnt=0
+		while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
+			((++cdcnt))
+			var="CD_ROOT_${cdcnt}"
+			[[ -z ${!var} ]] && var="CD_ROOT"
+			if [[ -z ${!var} ]] ; then
+				eerror "You must either use just the CD_ROOT"
+				eerror "or specify ALL the CD_ROOT_X variables."
+				eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
+				die "could not locate CD_ROOT_${cdcnt}"
+			fi
+		done
+		export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
+		einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
+		export CDROM_SET=-1
+		for f in ${CDROM_CHECK_1//:/ } ; do
+			((++CDROM_SET))
+			[[ -e ${CDROM_ROOT}/${f} ]] && break
+		done
+		export CDROM_MATCH=${f}
+		return
+	fi
+
+	# User didn't help us out so lets make sure they know they can
+	# simplify the whole process ...
+	if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
+		einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
+		echo
+		einfo "If you do not have the CD, but have the data files"
+		einfo "mounted somewhere on your filesystem, just export"
+		einfo "the variable CD_ROOT so that it points to the"
+		einfo "directory containing the files."
+		echo
+		einfo "For example:"
+		einfo "export CD_ROOT=/mnt/cdrom"
+		echo
+	else
+		if [[ -n ${CDROM_NAME_SET} ]] ; then
+			# Translate the CDROM_NAME_SET array into CDROM_NAME_#
+			cdcnt=0
+			while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
+				((++cdcnt))
+				export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
+			done
+		fi
+
+		einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
+		cdcnt=0
+		while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
+			((++cdcnt))
+			var="CDROM_NAME_${cdcnt}"
+			[[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
+		done
+		echo
+		einfo "If you do not have the CDs, but have the data files"
+		einfo "mounted somewhere on your filesystem, just export"
+		einfo "the following variables so they point to the right place:"
+		einfon ""
+		cdcnt=0
+		while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
+			((++cdcnt))
+			echo -n " CD_ROOT_${cdcnt}"
+		done
+		echo
+		einfo "Or, if you have all the files in the same place, or"
+		einfo "you only have one cdrom, you can export CD_ROOT"
+		einfo "and that place will be used as the same data source"
+		einfo "for all the CDs."
+		echo
+		einfo "For example:"
+		einfo "export CD_ROOT_1=/mnt/cdrom"
+		echo
+	fi
+
+	export CDROM_SET=""
+	export CDROM_CURRENT_CD=0
+	cdrom_load_next_cd
+}
+
+# @FUNCTION: cdrom_load_next_cd
+# @DESCRIPTION:
+# Some packages are so big they come on multiple CDs.  When you're done reading
+# files off a CD and want access to the next one, just call this function.
+# Again, all the messy details of user interaction are taken care of for you.
+# Once this returns, just read the variable CDROM_ROOT for the location of the
+# mounted CD.  Note that you can only go forward in the CD list, so make sure
+# you only call this function when you're done using the current CD.
+cdrom_load_next_cd() {
+	local var
+	((++CDROM_CURRENT_CD))
+
+	unset CDROM_ROOT
+	var=CD_ROOT_${CDROM_CURRENT_CD}
+	[[ -z ${!var} ]] && var="CD_ROOT"
+	if [[ -z ${!var} ]] ; then
+		var="CDROM_CHECK_${CDROM_CURRENT_CD}"
+		_cdrom_locate_file_on_cd ${!var}
+	else
+		export CDROM_ROOT=${!var}
+	fi
+
+	einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
+}
+
+# this is used internally by the cdrom_get_cds() and cdrom_load_next_cd()
+# functions.  this should *never* be called from an ebuild.
+# all it does is try to locate a give file on a cd ... if the cd isn't
+# found, then a message asking for the user to insert the cdrom will be
+# displayed and we'll hang out here until:
+# (1) the file is found on a mounted cdrom
+# (2) the user hits CTRL+C
+_cdrom_locate_file_on_cd() {
+	local mline=""
+	local showedmsg=0 showjolietmsg=0
+
+	while [[ -z ${CDROM_ROOT} ]] ; do
+		local i=0
+		local -a cdset=(${*//:/ })
+		if [[ -n ${CDROM_SET} ]] ; then
+			cdset=(${cdset[${CDROM_SET}]})
+		fi
+
+		while [[ -n ${cdset[${i}]} ]] ; do
+			local dir=$(dirname ${cdset[${i}]})
+			local file=$(basename ${cdset[${i}]})
+
+			local point= node= fs= foo=
+			while read point node fs foo ; do
+				[[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \
+					! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
+					&& continue
+				point=${point//\040/ }
+				[[ ! -d ${point}/${dir} ]] && continue
+				[[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
+				export CDROM_ROOT=${point}
+				export CDROM_SET=${i}
+				export CDROM_MATCH=${cdset[${i}]}
+				return
+			done <<< "$(get_mounts)"
+
+			((++i))
+		done
+
+		echo
+		if [[ ${showedmsg} -eq 0 ]] ; then
+			if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
+				if [[ -z ${CDROM_NAME} ]] ; then
+					einfo "Please insert+mount the cdrom for ${PN} now !"
+				else
+					einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
+				fi
+			else
+				if [[ -z ${CDROM_NAME_1} ]] ; then
+					einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
+				else
+					local var="CDROM_NAME_${CDROM_CURRENT_CD}"
+					einfo "Please insert+mount the ${!var} cdrom now !"
+				fi
+			fi
+			showedmsg=1
+		fi
+		einfo "Press return to scan for the cd again"
+		einfo "or hit CTRL+C to abort the emerge."
+		echo
+		if [[ ${showjolietmsg} -eq 0 ]] ; then
+			showjolietmsg=1
+		else
+			ewarn "If you are having trouble with the detection"
+			ewarn "of your CD, it is possible that you do not have"
+			ewarn "Joliet support enabled in your kernel.  Please"
+			ewarn "check that CONFIG_JOLIET is enabled in your kernel."
+			ebeep 5
+		fi
+		read || die "something is screwed with your system"
+	done
+}
+
 # @FUNCTION: strip-linguas
 # @USAGE: [<allow LINGUAS>|<-i|-u> <directories of .po files>]
 # @DESCRIPTION:

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      12/02/14 16:01:21

  Modified:             eutils.eclass
  Log:
  drop unpack_{makeself,pdv} since they are in unpacker.eclass now

Revision  Changes    Path
1.381                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -r1.380 -r1.381
--- eutils.eclass	31 Jan 2012 06:55:37 -0000	1.380
+++ eutils.eclass	14 Feb 2012 16:01:21 -0000	1.381
@@ -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/eutils.eclass,v 1.380 2012/01/31 06:55:37 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.381 2012/02/14 16:01:21 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -944,217 +944,6 @@
 	)
 }
 
-# for internal use only (unpack_pdv and unpack_makeself)
-find_unpackable_file() {
-	local src=$1
-	if [[ -z ${src} ]] ; then
-		src=${DISTDIR}/${A}
-	else
-		if [[ -e ${DISTDIR}/${src} ]] ; then
-			src=${DISTDIR}/${src}
-		elif [[ -e ${PWD}/${src} ]] ; then
-			src=${PWD}/${src}
-		elif [[ -e ${src} ]] ; then
-			src=${src}
-		fi
-	fi
-	[[ ! -e ${src} ]] && return 1
-	echo "${src}"
-}
-
-# @FUNCTION: unpack_pdv
-# @USAGE: <file to unpack> <size of off_t>
-# @DESCRIPTION:
-# Unpack those pesky pdv generated files ...
-# They're self-unpacking programs with the binary package stuffed in
-# the middle of the archive.  Valve seems to use it a lot ... too bad
-# it seems to like to segfault a lot :(.  So lets take it apart ourselves.
-#
-# You have to specify the off_t size ... I have no idea how to extract that
-# information out of the binary executable myself.  Basically you pass in
-# the size of the off_t type (in bytes) on the machine that built the pdv
-# archive.
-#
-# One way to determine this is by running the following commands:
-#
-# @CODE
-# 	strings <pdv archive> | grep lseek
-# 	strace -elseek <pdv archive>
-# @CODE
-#
-# Basically look for the first lseek command (we do the strings/grep because
-# sometimes the function call is _llseek or something) and steal the 2nd
-# parameter.  Here is an example:
-#
-# @CODE
-# 	vapier@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
-# 	lseek
-# 	vapier@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
-# 	lseek(3, -4, SEEK_END)					= 2981250
-# @CODE
-#
-# Thus we would pass in the value of '4' as the second parameter.
-unpack_pdv() {
-	local src=$(find_unpackable_file "$1")
-	local sizeoff_t=$2
-
-	[[ -z ${src} ]] && die "Could not locate source for '$1'"
-	[[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
-
-	local shrtsrc=$(basename "${src}")
-	echo ">>> Unpacking ${shrtsrc} to ${PWD}"
-	local metaskip=$(tail -c ${sizeoff_t} "${src}" | hexdump -e \"%i\")
-	local tailskip=$(tail -c $((${sizeoff_t}*2)) "${src}" | head -c ${sizeoff_t} | hexdump -e \"%i\")
-
-	# grab metadata for debug reasons
-	local metafile=$(emktemp)
-	tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
-
-	# rip out the final file name from the metadata
-	local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
-	datafile=$(basename "${datafile}")
-
-	# now lets uncompress/untar the file if need be
-	local tmpfile=$(emktemp)
-	tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
-
-	local iscompressed=$(file -b "${tmpfile}")
-	if [[ ${iscompressed:0:8} == "compress" ]] ; then
-		iscompressed=1
-		mv ${tmpfile}{,.Z}
-		gunzip ${tmpfile}
-	else
-		iscompressed=0
-	fi
-	local istar=$(file -b "${tmpfile}")
-	if [[ ${istar:0:9} == "POSIX tar" ]] ; then
-		istar=1
-	else
-		istar=0
-	fi
-
-	#for some reason gzip dies with this ... dd cant provide buffer fast enough ?
-	#dd if=${src} ibs=${metaskip} count=1 \
-	#	| dd ibs=${tailskip} skip=1 \
-	#	| gzip -dc \
-	#	> ${datafile}
-	if [ ${iscompressed} -eq 1 ] ; then
-		if [ ${istar} -eq 1 ] ; then
-			tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \
-				| head -c $((${metaskip}-${tailskip})) \
-				| tar -xzf -
-		else
-			tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \
-				| head -c $((${metaskip}-${tailskip})) \
-				| gzip -dc \
-				> ${datafile}
-		fi
-	else
-		if [ ${istar} -eq 1 ] ; then
-			tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \
-				| head -c $((${metaskip}-${tailskip})) \
-				| tar --no-same-owner -xf -
-		else
-			tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \
-				| head -c $((${metaskip}-${tailskip})) \
-				> ${datafile}
-		fi
-	fi
-	true
-	#[ -s "${datafile}" ] || die "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
-	#assert "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
-}
-
-# @FUNCTION: unpack_makeself
-# @USAGE: [file to unpack] [offset] [tail|dd]
-# @DESCRIPTION:
-# Unpack those pesky makeself generated files ...
-# They're shell scripts with the binary package tagged onto
-# the end of the archive.  Loki utilized the format as does
-# many other game companies.
-#
-# If the file is not specified, then ${A} is used.  If the
-# offset is not specified then we will attempt to extract
-# the proper offset from the script itself.
-unpack_makeself() {
-	local src_input=${1:-${A}}
-	local src=$(find_unpackable_file "${src_input}")
-	local skip=$2
-	local exe=$3
-
-	[[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
-
-	local shrtsrc=$(basename "${src}")
-	echo ">>> Unpacking ${shrtsrc} to ${PWD}"
-	if [[ -z ${skip} ]] ; then
-		local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
-		local skip=0
-		exe=tail
-		case ${ver} in
-			1.5.*|1.6.0-nv)	# tested 1.5.{3,4,5} ... guessing 1.5.x series is same
-				skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
-				;;
-			2.0|2.0.1)
-				skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
-				;;
-			2.1.1)
-				skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
-				(( skip++ ))
-				;;
-			2.1.2)
-				skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
-				(( skip++ ))
-				;;
-			2.1.3)
-				skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
-				(( skip++ ))
-				;;
-			2.1.4|2.1.5)
-				skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
-				skip=$(head -n ${skip} "${src}" | wc -c)
-				exe="dd"
-				;;
-			*)
-				eerror "I'm sorry, but I was unable to support the Makeself file."
-				eerror "The version I detected was '${ver}'."
-				eerror "Please file a bug about the file ${shrtsrc} at"
-				eerror "http://bugs.gentoo.org/ so that support can be added."
-				die "makeself version '${ver}' not supported"
-				;;
-		esac
-		debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
-	fi
-	case ${exe} in
-		tail)	exe="tail -n +${skip} '${src}'";;
-		dd)		exe="dd ibs=${skip} skip=1 if='${src}'";;
-		*)		die "makeself cant handle exe '${exe}'"
-	esac
-
-	# lets grab the first few bytes of the file to figure out what kind of archive it is
-	local filetype tmpfile=$(emktemp)
-	eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
-	filetype=$(file -b "${tmpfile}") || die
-	case ${filetype} in
-		*tar\ archive*)
-			eval ${exe} | tar --no-same-owner -xf -
-			;;
-		bzip2*)
-			eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
-			;;
-		gzip*)
-			eval ${exe} | tar --no-same-owner -xzf -
-			;;
-		compress*)
-			eval ${exe} | gunzip | tar --no-same-owner -xf -
-			;;
-		*)
-			eerror "Unknown filetype \"${filetype}\" ?"
-			false
-			;;
-	esac
-	assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})"
-}
-
 # @FUNCTION: cdrom_get_cds
 # @USAGE: <file on cd1> [file on cd2] [file on cd3] [...]
 # @DESCRIPTION:

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      12/02/14 16:08:54

  Modified:             eutils.eclass
  Log:
  eumask_pop: error out if someone tries to pass args to us

Revision  Changes    Path
1.382                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -r1.381 -r1.382
--- eutils.eclass	14 Feb 2012 16:01:21 -0000	1.381
+++ eutils.eclass	14 Feb 2012 16:08:54 -0000	1.382
@@ -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/eutils.eclass,v 1.381 2012/02/14 16:01:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.382 2012/02/14 16:08:54 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -214,6 +214,7 @@
 # @DESCRIPTION:
 # Restore the previous umask state.
 eumask_pop() {
+	[[ $# -eq 0 ]] || die "${FUNCNAME}: we take no options"
 	local s
 	estack_pop eumask s || die "${FUNCNAME}: unbalanced push"
 	umask ${s} || die "${FUNCNAME}: sanity: could not restore umask: ${s}"

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      12/03/23 02:33:49

  Modified:             eutils.eclass
  Log:
  epatch_user: document .patch suffix #409293

Revision  Changes    Path
1.387                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -r1.386 -r1.387
--- eutils.eclass	1 Mar 2012 22:10:50 -0000	1.386
+++ eutils.eclass	23 Mar 2012 02:33:49 -0000	1.387
@@ -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/eutils.eclass,v 1.386 2012/03/01 22:10:50 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.387 2012/03/23 02:33:49 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -527,7 +527,8 @@
 # Applies user-provided patches to the source tree. The patches are
 # taken from /etc/portage/patches/<CATEGORY>/<PF|P|PN>/, where the first
 # of these three directories to exist will be the one to use, ignoring
-# any more general directories which might exist as well.
+# any more general directories which might exist as well. They must end
+# in ".patch" to be applied.
 #
 # User patches are intended for quick testing of patches without ebuild
 # modifications, as well as for permanent customizations a user might

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      12/04/15 20:02:43

  Modified:             eutils.eclass
  Log:
  add makeopts_jobs for extracting the -j# from MAKEOPTS

Revision  Changes    Path
1.389                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -r1.388 -r1.389
--- eutils.eclass	2 Apr 2012 22:13:57 -0000	1.388
+++ eutils.eclass	15 Apr 2012 20:02:43 -0000	1.389
@@ -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/eutils.eclass,v 1.388 2012/04/02 22:13:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.389 2012/04/15 20:02:43 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1282,6 +1282,21 @@
 # otherwise echo [false output][false suffix] (defaults to "no").
 usex() { use "$1" && echo "${2-yes}$4" || echo "${3-no}$5" ; } #382963
 
+# @FUNCTION: makeopts_jobs
+# @USAGE: [${MAKEOPTS}]
+# @DESCRIPTION:
+# Searches the arguments (defaults to ${MAKEOPTS}) and extracts the jobs number
+# specified therein.  i.e. if the user has MAKEOPTS=-j9, this will show "9".
+# We can't return the number as bash normalizes it to [0, 255].  If the flags
+# havn't specified a -j flag, then "1" is shown as that is the default `make`
+# uses.  Useful for running non-make tools in parallel too.
+makeopts_jobs() {
+	[[ $# -eq 0 ]] && set -- ${MAKEOPTS}
+	local x jobs
+	for x ; do [[ ${x} == -j* ]] && jobs=${x#-j} ; done
+	echo ${jobs:-1}
+}
+
 check_license() { die "you no longer need this as portage supports ACCEPT_LICENSE itself"; }
 
 fi

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      12/04/16 14:40:17

  Modified:             eutils.eclass
  Log:
  fix typo pointed out by Arfrever

Revision  Changes    Path
1.390                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -r1.389 -r1.390
--- eutils.eclass	15 Apr 2012 20:02:43 -0000	1.389
+++ eutils.eclass	16 Apr 2012 14:40:16 -0000	1.390
@@ -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/eutils.eclass,v 1.389 2012/04/15 20:02:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.390 2012/04/16 14:40:16 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1288,7 +1288,7 @@
 # Searches the arguments (defaults to ${MAKEOPTS}) and extracts the jobs number
 # specified therein.  i.e. if the user has MAKEOPTS=-j9, this will show "9".
 # We can't return the number as bash normalizes it to [0, 255].  If the flags
-# havn't specified a -j flag, then "1" is shown as that is the default `make`
+# haven't specified a -j flag, then "1" is shown as that is the default `make`
 # uses.  Useful for running non-make tools in parallel too.
 makeopts_jobs() {
 	[[ $# -eq 0 ]] && set -- ${MAKEOPTS}

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      12/04/20 19:35:37

  Modified:             eutils.eclass
  Log:
  epatch: split common opts out from what devs usually want to control, and allow flags to be passed directly to epatch

Revision  Changes    Path
1.391                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -r1.390 -r1.391
--- eutils.eclass	16 Apr 2012 14:40:16 -0000	1.390
+++ eutils.eclass	20 Apr 2012 19:35:37 -0000	1.391
@@ -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/eutils.eclass,v 1.390 2012/04/16 14:40:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.391 2012/04/20 19:35:37 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -230,13 +230,21 @@
 EPATCH_SUFFIX="patch.bz2"
 # @VARIABLE: EPATCH_OPTS
 # @DESCRIPTION:
-# Default options for patch:
+# Options to pass to patch.  Meant for ebuild/package-specific tweaking
+# such as forcing the patch level (-p#) or fuzz (-F#) factor.  Note that
+# for single patch tweaking, you can also pass flags directly to epatch.
+EPATCH_OPTS=""
+# @VARIABLE: EPATCH_COMMON_OPTS
+# @DESCRIPTION:
+# Common options to pass to `patch`.  You probably should never need to
+# change these.  If you do, please discuss it with base-system first to
+# be sure.
 # @CODE
 #	-g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571
 #	--no-backup-if-mismatch - do not leave .orig files behind
 #	-E - automatically remove empty files
 # @CODE
-EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
+EPATCH_COMMON_OPTS="-g0 -E --no-backup-if-mismatch"
 # @VARIABLE: EPATCH_EXCLUDE
 # @DESCRIPTION:
 # List of patches not to apply.	 Note this is only file names,
@@ -257,7 +265,7 @@
 EPATCH_FORCE="no"
 
 # @FUNCTION: epatch
-# @USAGE: [patches] [dirs of patches]
+# @USAGE: [options] [patches] [dirs of patches]
 # @DESCRIPTION:
 # epatch is designed to greatly simplify the application of patches.  It can
 # process patch files directly, or directories of patches.  The patches may be
@@ -265,8 +273,12 @@
 # the -p option as epatch will automatically attempt -p0 to -p5 until things
 # apply successfully.
 #
-# If you do not specify any options, then epatch will default to the directory
-# specified by EPATCH_SOURCE.
+# If you do not specify any patches/dirs, then epatch will default to the
+# directory specified by EPATCH_SOURCE.
+#
+# Any options specified that start with a dash will be passed down to patch
+# for this specific invocation.  As soon as an arg w/out a dash is found, then
+# arg processing stops.
 #
 # When processing directories, epatch will apply all patches that match:
 # @CODE
@@ -294,6 +306,18 @@
 
 	unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
 
+	# First process options.  We localize the EPATCH_OPTS setting
+	# from above so that we can pass it on in the loop below with
+	# any additional values the user has specified.
+	local EPATCH_OPTS=( ${EPATCH_OPTS[*]} )
+	while [[ $# -gt 0 ]] ; do
+		case $1 in
+		-*) EPATCH_OPTS+=( "$1" ) ;;
+		*) break ;;
+		esac
+		shift
+	done
+
 	# Let the rest of the code process one user arg at a time --
 	# each arg may expand into multiple patches, and each arg may
 	# need to start off with the default global EPATCH_xxx values
@@ -337,6 +361,10 @@
 		die "Cannot find \$EPATCH_SOURCE!"
 	fi
 
+	# Now that we know we're actually going to apply something, merge
+	# all of the patch options back in to a single variable for below.
+	EPATCH_OPTS="${EPATCH_COMMON_OPTS} ${EPATCH_OPTS[*]}"
+
 	local PIPE_CMD
 	case ${EPATCH_SUFFIX##*\.} in
 		xz)      PIPE_CMD="xz -dc"    ;;

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      12/05/11 14:22:01

  Modified:             eutils.eclass
  Log:
  support extended makeflag syntax and not just -j#

Revision  Changes    Path
1.392                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -r1.391 -r1.392
--- eutils.eclass	20 Apr 2012 19:35:37 -0000	1.391
+++ eutils.eclass	11 May 2012 14:22:01 -0000	1.392
@@ -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/eutils.eclass,v 1.391 2012/04/20 19:35:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.392 2012/05/11 14:22:01 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1314,14 +1314,19 @@
 # @USAGE: [${MAKEOPTS}]
 # @DESCRIPTION:
 # Searches the arguments (defaults to ${MAKEOPTS}) and extracts the jobs number
-# specified therein.  i.e. if the user has MAKEOPTS=-j9, this will show "9".
+# specified therein.  Useful for running non-make tools in parallel too.
+# i.e. if the user has MAKEOPTS=-j9, this will show "9".
 # We can't return the number as bash normalizes it to [0, 255].  If the flags
 # haven't specified a -j flag, then "1" is shown as that is the default `make`
-# uses.  Useful for running non-make tools in parallel too.
+# uses.  Since there's no way to represent infinity, we return 999 if the user
+# has -j without a number.
 makeopts_jobs() {
 	[[ $# -eq 0 ]] && set -- ${MAKEOPTS}
-	local x jobs
-	for x ; do [[ ${x} == -j* ]] && jobs=${x#-j} ; done
+	# This assumes the first .* will be more greedy than the second .*
+	# since POSIX doesn't specify a non-greedy match (i.e. ".*?").
+	local jobs=$(echo " $* " | sed -r -n \
+		-e 's:.*[[:space:]](-j|--jobs[=[:space:]])[[:space:]]*([0-9]+).*:\2:p' \
+		-e 's:.*[[:space:]](-j|--jobs)[[:space:]].*:999:p')
 	echo ${jobs:-1}
 }
 

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      12/06/07 05:59:20

  Modified:             eutils.eclass
  Log:
  makeopts_jobs has been moved to multiprocessing.eclass, and all consumers should be upated now

Revision  Changes    Path
1.396                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -r1.395 -r1.396
--- eutils.eclass	6 Jun 2012 15:37:50 -0000	1.395
+++ eutils.eclass	7 Jun 2012 05:59:20 -0000	1.396
@@ -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/eutils.eclass,v 1.395 2012/06/06 15:37:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.396 2012/06/07 05:59:20 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1379,26 +1379,6 @@
 # otherwise echo [false output][false suffix] (defaults to "no").
 usex() { use "$1" && echo "${2-yes}$4" || echo "${3-no}$5" ; } #382963
 
-# @FUNCTION: makeopts_jobs
-# @USAGE: [${MAKEOPTS}]
-# @DESCRIPTION:
-# Searches the arguments (defaults to ${MAKEOPTS}) and extracts the jobs number
-# specified therein.  Useful for running non-make tools in parallel too.
-# i.e. if the user has MAKEOPTS=-j9, this will show "9".
-# We can't return the number as bash normalizes it to [0, 255].  If the flags
-# haven't specified a -j flag, then "1" is shown as that is the default `make`
-# uses.  Since there's no way to represent infinity, we return 999 if the user
-# has -j without a number.
-makeopts_jobs() {
-	[[ $# -eq 0 ]] && set -- ${MAKEOPTS}
-	# This assumes the first .* will be more greedy than the second .*
-	# since POSIX doesn't specify a non-greedy match (i.e. ".*?").
-	local jobs=$(echo " $* " | sed -r -n \
-		-e 's:.*[[:space:]](-j|--jobs[=[:space:]])[[:space:]]*([0-9]+).*:\2:p' \
-		-e 's:.*[[:space:]](-j|--jobs)[[:space:]].*:999:p')
-	echo ${jobs:-1}
-}
-
 # @FUNCTION: prune_libtool_files
 # @USAGE: [--all]
 # @DESCRIPTION:

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      12/06/14 00:11:38

  Modified:             eutils.eclass
  Log:
  mpfr has gone stable, so drop hack #420957

Revision  Changes    Path
1.397                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -r1.396 -r1.397
--- eutils.eclass	7 Jun 2012 05:59:20 -0000	1.396
+++ eutils.eclass	14 Jun 2012 00:11:38 -0000	1.397
@@ -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/eutils.eclass,v 1.396 2012/06/07 05:59:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.397 2012/06/14 00:11:38 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1165,8 +1165,6 @@
 			ewarn "helper program, simply emerge the 'gentoolkit' package."
 			ewarn
 		fi
-		# temp hack for #348634 #357225
-		[[ ${PN} == "mpfr" ]] && lib=${lib##*/}
 		ewarn "  # revdep-rebuild --library '${lib}' && rm '${lib}'"
 	done
 }

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Samuli Suominen (ssuominen)]

ssuominen    12/06/14 23:40:29

  Modified:             eutils.eclass
  Log:
  Be slightly more polite.

Revision  Changes    Path
1.399                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -r1.398 -r1.399
--- eutils.eclass	14 Jun 2012 23:07:31 -0000	1.398
+++ eutils.eclass	14 Jun 2012 23:40:29 -0000	1.399
@@ -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/eutils.eclass,v 1.398 2012/06/14 23:07:31 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.399 2012/06/14 23:40:29 ssuominen Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1036,9 +1036,9 @@
 # results in: insinto /usr/share/pixmaps
 #             doins foobar.png fuqbar.svg suckbar.png
 #
-# example 2: doicon -s 48 foobar.png fuqbar.png gaybar.png
+# example 2: doicon -s 48 foobar.png fuqbar.png blobbar.png
 # results in: insinto /usr/share/icons/hicolor/48x48/apps
-#             doins foobar.png fuqbar.png gaybar.png
+#             doins foobar.png fuqbar.png blobbar.png
 # @CODE
 doicon() {
 	_iconins ${FUNCNAME} "$@"

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      12/08/20 19:45:58

  Modified:             eutils.eclass
  Log:
  fix grammar in make_desktop_entry icon description #431940 by Greg Turner

Revision  Changes    Path
1.401                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -r1.400 -r1.401
--- eutils.eclass	20 Jun 2012 09:26:50 -0000	1.400
+++ eutils.eclass	20 Aug 2012 19:45:57 -0000	1.401
@@ -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/eutils.eclass,v 1.400 2012/06/20 09:26:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.401 2012/08/20 19:45:57 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -658,7 +658,7 @@
 # @CODE
 # binary:   what command does the app run with ?
 # name:     the name that will show up in the menu
-# icon:     give your little like a pretty little icon ...
+# icon:     the icon to use in the menu entry
 #           this can be relative (to /usr/share/pixmaps) or
 #           a full path to an icon
 # type:     what kind of application is this?

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      12/10/07 06:22:01

  Modified:             eutils.eclass
  Log:
  add :${SLOT} support to epatch_user #435132 by Bartosz Brachaczek

Revision  Changes    Path
1.406                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -r1.405 -r1.406
--- eutils.eclass	28 Sep 2012 15:18:04 -0000	1.405
+++ eutils.eclass	7 Oct 2012 06:22:01 -0000	1.406
@@ -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/eutils.eclass,v 1.405 2012/09/28 15:18:04 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.406 2012/10/07 06:22:01 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -551,7 +551,7 @@
 # @USAGE:
 # @DESCRIPTION:
 # Applies user-provided patches to the source tree. The patches are
-# taken from /etc/portage/patches/<CATEGORY>/<PF|P|PN>/, where the first
+# taken from /etc/portage/patches/<CATEGORY>/<PF|P|PN>[:SLOT]/, where the first
 # of these three directories to exist will be the one to use, ignoring
 # any more general directories which might exist as well. They must end
 # in ".patch" to be applied.
@@ -583,7 +583,7 @@
 
 	# don't clobber any EPATCH vars that the parent might want
 	local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
-	for check in ${CATEGORY}/{${P}-${PR},${P},${PN}}; do
+	for check in ${CATEGORY}/{${P}-${PR},${P},${PN}}{,:${SLOT}}; do
 		EPATCH_SOURCE=${base}/${CTARGET}/${check}
 		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
 		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      13/03/11 00:13:16

  Modified:             eutils.eclass
  Log:
  make_wrapper: optimize output slightly in common cases by omitting dead code

Revision  Changes    Path
1.414                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -r1.413 -r1.414
--- eutils.eclass	9 Mar 2013 18:18:09 -0000	1.413
+++ eutils.eclass	11 Mar 2013 00:13:16 -0000	1.414
@@ -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/eutils.eclass,v 1.413 2013/03/09 18:18:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.414 2013/03/11 00:13:16 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1292,21 +1292,25 @@
 make_wrapper() {
 	local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
 	local tmpwrapper=$(emktemp)
-	# We don't want to quote ${bin} so that people can pass complex
-	# things as $bin ... "./someprog --args"
-	cat << EOF > "${tmpwrapper}"
-#!/bin/sh
-cd "${chdir:-.}"
-if [ -n "${libdir}" ] ; then
-	if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
-		export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
-	else
-		export LD_LIBRARY_PATH="${libdir}"
+
+	(
+	echo '#!/bin/sh'
+	[[ -n ${chdir} ]] && printf 'cd "%s"\n' "${chdir}"
+	if [[ -n ${libdir} ]] ; then
+		cat <<-EOF
+			if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
+				export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
+			else
+				export LD_LIBRARY_PATH="${libdir}"
+			fi
+		EOF
 	fi
-fi
-exec ${bin} "\$@"
-EOF
+	# We don't want to quote ${bin} so that people can pass complex
+	# things as ${bin} ... "./someprog --args"
+	printf 'exec %s "$@"\n' "${bin}"
+	) > "${tmpwrapper}"
 	chmod go+rx "${tmpwrapper}"
+
 	if [[ -n ${path} ]] ; then
 		(
 		exeinto "${path}"

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      13/03/12 14:16:15

  Modified:             eutils.eclass
  Log:
  epunt_cxx: support different versions of autotools since 2.64 changed the signature #460992 by Michał Górny

Revision  Changes    Path
1.415                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -r1.414 -r1.415
--- eutils.eclass	11 Mar 2013 00:13:16 -0000	1.414
+++ eutils.eclass	12 Mar 2013 14:16:15 -0000	1.415
@@ -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/eutils.eclass,v 1.414 2013/03/11 00:13:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.415 2013/03/12 14:16:15 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1269,16 +1269,19 @@
 	local dir=$1
 	[[ -z ${dir} ]] && dir=${S}
 	ebegin "Removing useless C++ checks"
-	local f any_found
+	local f p any_found
 	while IFS= read -r -d '' f; do
-		patch --no-backup-if-mismatch -p0 "${f}" \
-			"${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null \
-			&& any_found=1
+		for p in "${PORTDIR}"/eclass/ELT-patches/nocxx/*.patch ; do
+			if patch --no-backup-if-mismatch -p1 "${f}" "${p}" >/dev/null ; then
+				any_found=1
+				break
+			fi
+		done
 	done < <(find "${dir}" -name configure -print0)
 
-#	if [[ -z ${any_found} ]]; then
-#		eqawarn "epunt_cxx called unnecessarily (no C++ checks to punt)."
-#	fi
+	if [[ -z ${any_found} ]]; then
+		eqawarn "epunt_cxx called unnecessarily (no C++ checks to punt)."
+	fi
 	eend 0
 }
 

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      13/03/31 02:17:12

  Modified:             eutils.eclass
  Log:
  epatch: add support for users to exclude specific patches via EPATCH_USER_EXCLUDE #439402

Revision  Changes    Path
1.416                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -r1.415 -r1.416
--- eutils.eclass	12 Mar 2013 14:16:15 -0000	1.415
+++ eutils.eclass	31 Mar 2013 02:17:12 -0000	1.416
@@ -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/eutils.eclass,v 1.415 2013/03/12 14:16:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.416 2013/03/31 02:17:12 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -261,6 +261,11 @@
 # Only require patches to match EPATCH_SUFFIX rather than the extended
 # arch naming style.
 EPATCH_FORCE="no"
+# @VARIABLE: EPATCH_USER_EXCLUDE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# List of patches not to apply.	 Note this is only file names,
+# and not the full path.  Globs accepted.
 
 # @FUNCTION: epatch
 # @USAGE: [options] [patches] [dirs of patches]
@@ -405,6 +410,15 @@
 			local ex
 			for ex in ${EPATCH_EXCLUDE} ; do
 				if [[ ${patchname} == ${ex} ]] ; then
+					einfo "  Skipping ${patchname} due to EPATCH_EXCLUDE ..."
+					eshopts_pop
+					continue 2
+				fi
+			done
+
+			for ex in ${EPATCH_USER_EXCLUDE} ; do
+				if [[ ${patchname} == ${ex} ]] ; then
+					einfo "  Skipping ${patchname} due to EPATCH_USER_EXCLUDE ..."
 					eshopts_pop
 					continue 2
 				fi

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      13/04/25 18:38:02

  Modified:             eutils.eclass
  Log:
  epatch: handle aliased `patch` commands in a way that works with <=bash-3.2 #461568 by Michał Górny

Revision  Changes    Path
1.417                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -r1.416 -r1.417
--- eutils.eclass	31 Mar 2013 02:17:12 -0000	1.416
+++ eutils.eclass	25 Apr 2013 18:38:02 -0000	1.417
@@ -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/eutils.eclass,v 1.416 2013/03/31 02:17:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.417 2013/04/25 18:38:02 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -483,8 +483,11 @@
 
 		# Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
 		local patch_cmd
+		# Handle aliased patch command #404447 #461568
+		local patch="patch"
+		eval $(alias patch 2>/dev/null | sed 's:^alias ::')
 		while [[ ${count} -lt 5 ]] ; do
-			patch_cmd="${BASH_ALIASES[patch]:-patch} -p${count} ${EPATCH_OPTS}"
+			patch_cmd="${patch} -p${count} ${EPATCH_OPTS}"
 
 			# Generate some useful debug info ...
 			(

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      13/05/21 02:57:22

  Modified:             eutils.eclass
  Log:
  epatch: turn qa warning to hard failure w/relative paths in patches as people have had over 2 years to clean things up

Revision  Changes    Path
1.419                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -r1.418 -r1.419
--- eutils.eclass	15 May 2013 19:01:36 -0000	1.418
+++ eutils.eclass	21 May 2013 02:57:22 -0000	1.419
@@ -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/eutils.eclass,v 1.418 2013/05/15 19:01:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.419 2013/05/21 02:57:22 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -476,9 +476,14 @@
 		# Similar reason, but with relative paths.
 		local rel_paths=$(egrep -n '^[-+]{3} [^	]*[.][.]/' "${PATCH_TARGET}")
 		if [[ -n ${rel_paths} ]] ; then
-			eqawarn "QA Notice: Your patch uses relative paths '../'."
-			eqawarn " In the future this will cause a failure."
-			eqawarn "${rel_paths}"
+			echo
+			eerror "Rejected Patch: ${patchname} !"
+			eerror " ( ${PATCH_TARGET} )"
+			eerror
+			eerror "Your patch uses relative paths '../':"
+			eerror "${rel_paths}"
+			echo
+			die "you need to fix the relative paths in patch"
 		fi
 
 		# Dynamically detect the correct -p# ... i'm lazy, so shoot me :/

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      13/06/21 23:52:50

  Modified:             eutils.eclass
  Log:
  isdigit: new func for testing if args are all numbers

Revision  Changes    Path
1.422                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -r1.421 -r1.422
--- eutils.eclass	22 May 2013 05:10:29 -0000	1.421
+++ eutils.eclass	21 Jun 2013 23:52:50 -0000	1.422
@@ -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/eutils.eclass,v 1.421 2013/05/22 05:10:29 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.422 2013/06/21 23:52:50 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -218,6 +218,18 @@
 	umask ${s} || die "${FUNCNAME}: sanity: could not restore umask: ${s}"
 }
 
+# @FUNCTION: isdigit
+# @USAGE: <number> [more numbers]
+# @DESCRIPTION:
+# Return true if all arguments are numbers.
+isdigit() {
+	local d
+	for d ; do
+		[[ ${d:-bad} == *[!0-9]* ]] && return 1
+	done
+	return 0
+}
+
 # @VARIABLE: EPATCH_SOURCE
 # @DESCRIPTION:
 # Default directory to search for patches.

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      13/06/21 23:56:06

  Modified:             eutils.eclass
  Log:
  evar_push/evar_pop: new api for saving/restoring variables on a stack

Revision  Changes    Path
1.423                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -r1.422 -r1.423
--- eutils.eclass	21 Jun 2013 23:52:50 -0000	1.422
+++ eutils.eclass	21 Jun 2013 23:56:06 -0000	1.423
@@ -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/eutils.eclass,v 1.422 2013/06/21 23:52:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.423 2013/06/21 23:56:06 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -146,6 +146,77 @@
 	eval unset ${__estack_name}\[${__estack_i}\]
 }
 
+# @FUNCTION: evar_push
+# @USAGE: <variable to save> [more vars to save]
+# @DESCRIPTION:
+# This let's you temporarily modify a variable and then restore it (including
+# set vs unset semantics).  Arrays are not supported at this time.
+#
+# This is meant for variables where using `local` does not work (such as
+# exported variables, or only temporarily changing things in a func).
+#
+# For example:
+# @CODE
+#		evar_push LC_ALL
+#		export LC_ALL=C
+#		... do some stuff that needs LC_ALL=C set ...
+#		evar_pop
+#
+#		# You can also save/restore more than one var at a time
+#		evar_push BUTTERFLY IN THE SKY
+#		... do stuff with the vars ...
+#		evar_pop     # This restores just one var, SKY
+#		... do more stuff ...
+#		evar_pop 3   # This pops the remaining 3 vars
+# @CODE
+evar_push() {
+	local var val
+	for var ; do
+		[[ ${!var+set} == "set" ]] \
+			&& val=${!var} \
+			|| val="${___ECLASS_ONCE_EUTILS}"
+		estack_push evar "${var}" "${val}"
+	done
+}
+
+# @FUNCTION: evar_push_set
+# @USAGE: <variable to save> [new value to store]
+# @DESCRIPTION:
+# This is a handy shortcut to save and temporarily set a variable.  If a value
+# is not specified, the var will be unset.
+evar_push_set() {
+	local var=$1
+	evar_push ${var}
+	case $# in
+	1) unset ${var} ;;
+	2) printf -v "${var}" '%s' "$2" ;;
+	*) die "${FUNCNAME}: incorrect # of args: $*" ;;
+	esac
+}
+
+# @FUNCTION: evar_pop
+# @USAGE: [number of vars to restore]
+# @DESCRIPTION:
+# Restore the variables to the state saved with the corresponding
+# evar_push call.  See that function for more details.
+evar_pop() {
+	local cnt=${1:-bad}
+	case $# in
+	0) cnt=1 ;;
+	1) isdigit "${cnt}" || die "${FUNCNAME}: first arg must be a number: $*" ;;
+	*) die "${FUNCNAME}: only accepts one arg: $*" ;;
+	esac
+
+	local var val
+	while (( cnt-- )) ; do
+		estack_pop evar val || die "${FUNCNAME}: unbalanced push"
+		estack_pop evar var || die "${FUNCNAME}: unbalanced push"
+		[[ ${val} == "${___ECLASS_ONCE_EUTILS}" ]] \
+			&& unset ${var} \
+			|| printf -v "${var}" '%s' "${val}"
+	done
+}
+
 # @FUNCTION: eshopts_push
 # @USAGE: [options to `set` or `shopt`]
 # @DESCRIPTION:

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      13/06/21 23:57:03

  Modified:             eutils.eclass
  Log:
  epatch: make sure we sort dirs of patches consistently #471666 by Pavel Riha

Revision  Changes    Path
1.424                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -r1.423 -r1.424
--- eutils.eclass	21 Jun 2013 23:56:06 -0000	1.423
+++ eutils.eclass	21 Jun 2013 23:57:03 -0000	1.424
@@ -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/eutils.eclass,v 1.423 2013/06/21 23:56:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.424 2013/06/21 23:57:03 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -427,8 +427,11 @@
 		local EPATCH_SUFFIX=$1
 
 	elif [[ -d $1 ]] ; then
-		# Some people like to make dirs of patches w/out suffixes (vim)
+		# We have to force sorting to C so that the wildcard expansion is consistent #471666.
+		evar_push_set LC_COLLATE C
+		# Some people like to make dirs of patches w/out suffixes (vim).
 		set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
+		evar_pop
 
 	elif [[ -f ${EPATCH_SOURCE}/$1 ]] ; then
 		# Re-use EPATCH_SOURCE as a search dir

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      13/09/13 00:51:46

  Modified:             eutils.eclass
  Log:
  epatch: fix documentation on -p4 vs -p5 limit to match reality #484642 by Patrick Lauer

Revision  Changes    Path
1.425                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -r1.424 -r1.425
--- eutils.eclass	21 Jun 2013 23:57:03 -0000	1.424
+++ eutils.eclass	13 Sep 2013 00:51:46 -0000	1.425
@@ -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/eutils.eclass,v 1.424 2013/06/21 23:57:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.425 2013/09/13 00:51:46 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -356,7 +356,7 @@
 # epatch is designed to greatly simplify the application of patches.  It can
 # process patch files directly, or directories of patches.  The patches may be
 # compressed (bzip/gzip/etc...) or plain text.  You generally need not specify
-# the -p option as epatch will automatically attempt -p0 to -p5 until things
+# the -p option as epatch will automatically attempt -p0 to -p4 until things
 # apply successfully.
 #
 # If you do not specify any patches/dirs, then epatch will default to the

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      13/12/03 08:09:50

  Modified:             eutils.eclass
  Log:
  add prefix support by Christoph Junghans #485438

Revision  Changes    Path
1.428                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.427
retrieving revision 1.428
diff -u -r1.427 -r1.428
--- eutils.eclass	14 Sep 2013 19:00:10 -0000	1.427
+++ eutils.eclass	3 Dec 2013 08:09:49 -0000	1.428
@@ -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/eutils.eclass,v 1.427 2013/09/14 19:00:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.428 2013/12/03 08:09:49 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -948,6 +948,14 @@
 	) || die "installing desktop file failed"
 }
 
+# @FUNCTION: _eutils_eprefix_init
+# @INTERNAL
+# @DESCRIPTION:
+# Initialized prefix variables for EAPI<3. 
+_eutils_eprefix_init() {
+	has "${EAPI:-0}" 0 1 2 && : ${ED:=${D}} ${EPREFIX:=} ${EROOT:=${ROOT}}
+}
+
 # @FUNCTION: validate_desktop_entries
 # @USAGE: [directories]
 # @MAINTAINER:
@@ -955,11 +963,12 @@
 # @DESCRIPTION:
 # Validate desktop entries using desktop-file-utils
 validate_desktop_entries() {
-	if [[ -x /usr/bin/desktop-file-validate ]] ; then
+	_eutils_eprefix_init
+	if [[ -x "${EPREFIX}"/usr/bin/desktop-file-validate ]] ; then
 		einfo "Checking desktop entry validity"
 		local directories=""
 		for d in /usr/share/applications $@ ; do
-			[[ -d ${D}${d} ]] && directories="${directories} ${D}${d}"
+			[[ -d ${ED}${d} ]] && directories="${directories} ${ED}${d}"
 		done
 		if [[ -n ${directories} ]] ; then
 			for FILE in $(find ${directories} -name "*\.desktop" \
@@ -967,7 +976,7 @@
 			do
 				local temp=$(desktop-file-validate ${FILE} | grep -v "warning:" | \
 								sed -e "s|error: ||" -e "s|${FILE}:|--|g" )
-				[[ -n $temp ]] && elog ${temp/--/${FILE/${D}/}:}
+				[[ -n $temp ]] && elog ${temp/--/${FILE/${ED}/}:}
 			done
 		fi
 		echo ""
@@ -1227,6 +1236,7 @@
 # solution, so instead you can call this from pkg_preinst.  See also the
 # preserve_old_lib_notify function.
 preserve_old_lib() {
+	_eutils_eprefix_init
 	if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
 		eerror "preserve_old_lib() must be called from pkg_preinst() only"
 		die "Invalid preserve_old_lib() usage"
@@ -1238,11 +1248,11 @@
 
 	local lib dir
 	for lib in "$@" ; do
-		[[ -e ${ROOT}/${lib} ]] || continue
+		[[ -e ${EROOT}/${lib} ]] || continue
 		dir=${lib%/*}
 		dodir ${dir} || die "dodir ${dir} failed"
-		cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
-		touch "${D}"/${lib}
+		cp "${EROOT}"/${lib} "${ED}"/${lib} || die "cp ${lib} failed"
+		touch "${ED}"/${lib}
 	done
 }
 
@@ -1259,9 +1269,11 @@
 	# let portage worry about it
 	has preserve-libs ${FEATURES} && return 0
 
+	_eutils_eprefix_init
+	
 	local lib notice=0
 	for lib in "$@" ; do
-		[[ -e ${ROOT}/${lib} ]] || continue
+		[[ -e ${EROOT}/${lib} ]] || continue
 		if [[ ${notice} -eq 0 ]] ; then
 			notice=1
 			ewarn "Old versions of installed libraries were detected on your system."
@@ -1297,6 +1309,7 @@
 # Remember that this function isn't terribly intelligent so order of optional
 # flags matter.
 built_with_use() {
+	_eutils_eprefix_init
 	local hidden="no"
 	if [[ $1 == "--hidden" ]] ; then
 		hidden="yes"
@@ -1320,8 +1333,8 @@
 	[[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
 	shift
 
-	local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
-	local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
+	local USEFILE=${EROOT}/var/db/pkg/${PKG}/USE
+	local IUSEFILE=${EROOT}/var/db/pkg/${PKG}/IUSE
 
 	# if the IUSE file doesn't exist, the read will error out, we need to handle
 	# this gracefully
@@ -1401,24 +1414,31 @@
 # first optionally setting LD_LIBRARY_PATH to the colon-delimited
 # libpaths followed by optionally changing directory to chdir.
 make_wrapper() {
+	_eutils_eprefix_init
 	local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
 	local tmpwrapper=$(emktemp)
 
 	(
 	echo '#!/bin/sh'
-	[[ -n ${chdir} ]] && printf 'cd "%s"\n' "${chdir}"
+	[[ -n ${chdir} ]] && printf 'cd "%s"\n' "${EPREFIX}${chdir}"
 	if [[ -n ${libdir} ]] ; then
+		local var
+		if [[ ${CHOST} == *-darwin* ]] ; then
+			var=DYLD_LIBRARY_PATH
+		else
+			var=LD_LIBRARY_PATH
+		fi
 		cat <<-EOF
-			if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
-				export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
+			if [ "\${${var}+set}" = "set" ] ; then
+				export ${var}="\${${var}}:${EPREFIX}${libdir}"
 			else
-				export LD_LIBRARY_PATH="${libdir}"
+				export ${var}="${EPREFIX}${libdir}"
 			fi
 		EOF
 	fi
 	# We don't want to quote ${bin} so that people can pass complex
 	# things as ${bin} ... "./someprog --args"
-	printf 'exec %s "$@"\n' "${bin}"
+	printf 'exec %s "$@"\n' "${bin/#\//${EPREFIX}\/}"
 	) > "${tmpwrapper}"
 	chmod go+rx "${tmpwrapper}"
 
@@ -1529,6 +1549,7 @@
 	debug-print-function ${FUNCNAME} "$@"
 
 	local removing_all removing_modules opt
+	_eutils_eprefix_init
 	for opt; do
 		case "${opt}" in
 			--all)
@@ -1638,7 +1659,7 @@
 			einfo "Removing unnecessary ${f#${D%/}} (${reason})"
 			queue+=( "${f}" )
 		fi
-	done < <(find "${D}" -xtype f -name '*.la' -print0)
+	done < <(find "${ED}" -xtype f -name '*.la' -print0)
 
 	if [[ ${queue[@]} ]]; then
 		rm -f "${queue[@]}"

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      14/01/08 06:46:18

  Modified:             eutils.eclass
  Log:
  drop user eclass inherit ... people have had plenty of time to migrate

Revision  Changes    Path
1.431                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -r1.430 -r1.431
--- eutils.eclass	28 Dec 2013 17:19:10 -0000	1.430
+++ eutils.eclass	8 Jan 2014 06:46:18 -0000	1.431
@@ -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/eutils.eclass,v 1.430 2013/12/28 17:19:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.431 2014/01/08 06:46:18 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -18,7 +18,7 @@
 if [[ ${___ECLASS_ONCE_EUTILS} != "recur -_+^+_- spank" ]] ; then
 ___ECLASS_ONCE_EUTILS="recur -_+^+_- spank"
 
-inherit multilib toolchain-funcs user
+inherit multilib toolchain-funcs
 
 if has "${EAPI:-0}" 0 1 2; then
 

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Chris Reffett (creffett)]

creffett    14/03/15 00:47:42

  Modified:             eutils.eclass
  Log:
  Add optfeature to eutils.eclass wrt bug 498988, ACKed by WilliamH

Revision  Changes    Path
1.432                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -r1.431 -r1.432
--- eutils.eclass	8 Jan 2014 06:46:18 -0000	1.431
+++ eutils.eclass	15 Mar 2014 00:47:42 -0000	1.432
@@ -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/eutils.eclass,v 1.431 2014/01/08 06:46:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.432 2014/03/15 00:47:42 creffett Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1729,4 +1729,49 @@
 
 check_license() { die "you no longer need this as portage supports ACCEPT_LICENSE itself"; }
 
+# @FUNCTION: optfeature
+# @USAGE: <short description> <package atom to match> [other atoms]
+# @DESCRIPTION:
+# Print out a message suggesting an optional package (or packages) which
+# provide the described functionality
+#
+# The following snippet would suggest app-misc/foo for optional foo support,
+# app-misc/bar or app-misc/baz[bar] for optional bar support
+# and either both app-misc/a and app-misc/b or app-misc/c for alphabet support.
+# @CODE:
+# 		optfeature "foo support" app-misc/foo
+# 		optfeature "bar support" app-misc/bar app-misc/baz[bar]
+#		optfeature "alphabet support" "app-misc/a app-misc/b" app-misc/c
+#
+optfeature() {
+	debug-print-function ${FUNCNAME} "$@"
+	local i j msg
+	local desc=$1
+	local flag=0
+	shift
+	for i; do
+		for j in $i; do
+			if has_version "$j"; then
+				flag=1
+			else
+				flag=0
+				break
+			fi
+		done
+		if [[ $flag -eq 1 ]]; then
+			break
+		fi
+	done
+	if [[ $flag -eq 0 ]]; then
+		for i; do
+			msg=" "
+			for j in $i; do
+				msg="${msg} ${j} and"
+			done
+			msg="${msg:0: -4} for ${desc}"
+			elog "${msg}"
+		done
+	fi
+}
+
 fi

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      14/04/27 18:58:07

  Modified:             eutils.eclass
  Log:
  optfeature: fix eclass doc and style #498988

Revision  Changes    Path
1.433                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -r1.432 -r1.433
--- eutils.eclass	15 Mar 2014 00:47:42 -0000	1.432
+++ eutils.eclass	27 Apr 2014 18:58:07 -0000	1.433
@@ -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/eutils.eclass,v 1.432 2014/03/15 00:47:42 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.433 2014/04/27 18:58:07 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1738,11 +1738,11 @@
 # The following snippet would suggest app-misc/foo for optional foo support,
 # app-misc/bar or app-misc/baz[bar] for optional bar support
 # and either both app-misc/a and app-misc/b or app-misc/c for alphabet support.
-# @CODE:
-# 		optfeature "foo support" app-misc/foo
-# 		optfeature "bar support" app-misc/bar app-misc/baz[bar]
-#		optfeature "alphabet support" "app-misc/a app-misc/b" app-misc/c
-#
+# @CODE
+#	optfeature "foo support" app-misc/foo
+#	optfeature "bar support" app-misc/bar app-misc/baz[bar]
+#	optfeature "alphabet support" "app-misc/a app-misc/b" app-misc/c
+# @CODE
 optfeature() {
 	debug-print-function ${FUNCNAME} "$@"
 	local i j msg
@@ -1750,23 +1750,23 @@
 	local flag=0
 	shift
 	for i; do
-		for j in $i; do
-			if has_version "$j"; then
+		for j in ${i}; do
+			if has_version "${j}"; then
 				flag=1
 			else
 				flag=0
 				break
 			fi
 		done
-		if [[ $flag -eq 1 ]]; then
+		if [[ ${flag} -eq 1 ]]; then
 			break
 		fi
 	done
-	if [[ $flag -eq 0 ]]; then
+	if [[ ${flag} -eq 0 ]]; then
 		for i; do
 			msg=" "
-			for j in $i; do
-				msg="${msg} ${j} and"
+			for j in ${i}; do
+				msg+=" ${j} and"
 			done
 			msg="${msg:0: -4} for ${desc}"
 			elog "${msg}"

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      14/04/27 19:01:30

  Modified:             eutils.eclass
  Log:
  epatch_user: tweak docs to reflect the use of $P-$PR rather than $PF (where the latter omits -r0) #504856

Revision  Changes    Path
1.434                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.433
retrieving revision 1.434
diff -u -r1.433 -r1.434
--- eutils.eclass	27 Apr 2014 18:58:07 -0000	1.433
+++ eutils.eclass	27 Apr 2014 19:01:30 -0000	1.434
@@ -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/eutils.eclass,v 1.433 2014/04/27 18:58:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.434 2014/04/27 19:01:30 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -659,7 +659,7 @@
 # @USAGE:
 # @DESCRIPTION:
 # Applies user-provided patches to the source tree. The patches are
-# taken from /etc/portage/patches/<CATEGORY>/<PF|P|PN>[:SLOT]/, where the first
+# taken from /etc/portage/patches/<CATEGORY>/<P-PR|P|PN>[:SLOT]/, where the first
 # of these three directories to exist will be the one to use, ignoring
 # any more general directories which might exist as well. They must end
 # in ".patch" to be applied.

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      14/09/19 17:09:05

  Modified:             eutils.eclass
  Log:
  epatch: fix EPATCH_USER_EXCLUDE handling when EPATCH_EXCLUDE is not set #522934 by Pavel Šimerda

Revision  Changes    Path
1.437                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.436
retrieving revision 1.437
diff -u -r1.436 -r1.437
--- eutils.eclass	11 Jul 2014 08:21:58 -0000	1.436
+++ eutils.eclass	19 Sep 2014 17:09:05 -0000	1.437
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.436 2014/07/11 08:21:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.437 2014/09/19 17:09:05 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -489,7 +489,7 @@
 		fi
 
 		# Let people filter things dynamically
-		if [[ -n ${EPATCH_EXCLUDE} ]] ; then
+		if [[ -n ${EPATCH_EXCLUDE}${EPATCH_USER_EXCLUDE} ]] ; then
 			# let people use globs in the exclude
 			eshopts_push -o noglob
 

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      14/11/03 22:55:20

  Modified:             eutils.eclass
  Log:
  eshopts_push: fix typo in command example #528120 by Tupone Alfredo

Revision  Changes    Path
1.438                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -r1.437 -r1.438
--- eutils.eclass	19 Sep 2014 17:09:05 -0000	1.437
+++ eutils.eclass	3 Nov 2014 22:55:20 -0000	1.438
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.437 2014/09/19 17:09:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.438 2014/11/03 22:55:20 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -231,7 +231,7 @@
 # A common example is to disable shell globbing so that special meaning/care
 # may be used with variables/arguments to custom functions.  That would be:
 # @CODE
-#		eshopts_push -s noglob
+#		eshopts_push -o noglob
 #		for x in ${foo} ; do
 #			if ...some check... ; then
 #				eshopts_pop

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      14/11/13 04:55:06

  Modified:             eutils.eclass
  Log:
  make_wrapper: fix by Jason Zaman to drop spurious blackslash in wrapped commands #509936

Revision  Changes    Path
1.439                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -r1.438 -r1.439
--- eutils.eclass	3 Nov 2014 22:55:20 -0000	1.438
+++ eutils.eclass	13 Nov 2014 04:55:06 -0000	1.439
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.438 2014/11/03 22:55:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.439 2014/11/13 04:55:06 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -1438,7 +1438,7 @@
 	fi
 	# We don't want to quote ${bin} so that people can pass complex
 	# things as ${bin} ... "./someprog --args"
-	printf 'exec %s "$@"\n' "${bin/#\//${EPREFIX}\/}"
+	printf 'exec %s "$@"\n' "${bin/#\//${EPREFIX}/}"
 	) > "${tmpwrapper}"
 	chmod go+rx "${tmpwrapper}"
 

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      14/11/15 09:49:10

  Modified:             eutils.eclass
  Log:
  chop off the subslot from the SLOT #528078 by Mark Wright

Revision  Changes    Path
1.440                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -r1.439 -r1.440
--- eutils.eclass	13 Nov 2014 04:55:06 -0000	1.439
+++ eutils.eclass	15 Nov 2014 09:49:10 -0000	1.440
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.439 2014/11/13 04:55:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.440 2014/11/15 09:49:10 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -903,10 +903,11 @@
 				;;
 		esac
 	fi
-	if [ "${SLOT}" == "0" ] ; then
+	local slot=${SLOT%/*}
+	if [[ ${slot} == "0" ]] ; then
 		local desktop_name="${PN}"
 	else
-		local desktop_name="${PN}-${SLOT}"
+		local desktop_name="${PN}-${slot}"
 	fi
 	local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
 	#local desktop=${T}/${exec%% *:-${desktop_name}}.desktop

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      15/03/20 18:22:05

  Modified:             eutils.eclass
  Log:
  epatch: include `patch --version` output in the failure log

Revision  Changes    Path
1.443                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -r1.442 -r1.443
--- eutils.eclass	14 Jan 2015 22:50:02 -0000	1.442
+++ eutils.eclass	20 Mar 2015 18:22:05 -0000	1.443
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.442 2015/01/14 22:50:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.443 2015/03/20 18:22:05 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -523,6 +523,10 @@
 			einfo "  ${patchname} ..."
 		fi
 
+		# Handle aliased patch command #404447 #461568
+		local patch="patch"
+		eval $(alias patch 2>/dev/null | sed 's:^alias ::')
+
 		# most of the time, there will only be one run per unique name,
 		# but if there are more, make sure we get unique log filenames
 		local STDERR_TARGET="${T}/${patchname}.out"
@@ -530,7 +534,13 @@
 			STDERR_TARGET="${T}/${patchname}-$$.out"
 		fi
 
-		printf "***** %s *****\nPWD: %s\n\n" "${patchname}" "${PWD}" > "${STDERR_TARGET}"
+		printf "***** %s *****\nPWD: %s\nPATCH TOOL: %s -> %s\nVERSION INFO:\n%s\n\n" \
+			"${patchname}" \
+			"${PWD}" \
+			"${patch}" \
+			"$(type -P "${patch}")" \
+			"$(${patch} --version)" \
+			> "${STDERR_TARGET}"
 
 		# Decompress the patch if need be
 		local count=0
@@ -574,9 +584,6 @@
 
 		# Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
 		local patch_cmd
-		# Handle aliased patch command #404447 #461568
-		local patch="patch"
-		eval $(alias patch 2>/dev/null | sed 's:^alias ::')
 		while [[ ${count} -lt 5 ]] ; do
 			patch_cmd="${patch} -p${count} ${EPATCH_OPTS}"
 

[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Mike Frysinger (vapier)]

vapier      15/03/20 18:28:11

  Modified:             eutils.eclass
  Log:
  epatch_user: add an explicit notice of patches applied when die is called #543878 by Sergey S. Starikoff

Revision  Changes    Path
1.444                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -r1.443 -r1.444
--- eutils.eclass	20 Mar 2015 18:22:05 -0000	1.443
+++ eutils.eclass	20 Mar 2015 18:28:11 -0000	1.444
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.443 2015/03/20 18:22:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.444 2015/03/20 18:28:11 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -709,12 +709,21 @@
 			EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
 			epatch
 			echo "${EPATCH_SOURCE}" > "${applied}"
+			has epatch_user_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" epatch_user_death_notice"
 			return 0
 		fi
 	done
 	echo "none" > "${applied}"
 	return 1
 }
+# @FUNCTION: epatch_user_death_notice
+# @INTERNAL
+# @DESCRIPTION:
+# Include an explicit notice in the die message itself that user patches were
+# applied to this build.
+epatch_user_death_notice() {
+	ewarn "!!! User patches were applied to this build!"
+}
 
 # @FUNCTION: emktemp
 # @USAGE: [temp dir]