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

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

[Petteri Raty (betelgeuse)]

betelgeuse    07/09/12 20:05:33

  Modified:             base.eclass
  Log:
  Remove setting S to default and add a comment to note that danarmak is retired.

Revision  Changes    Path
1.31                 eclass/base.eclass

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

Index: base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- base.eclass	19 Dec 2005 14:02:12 -0000	1.30
+++ base.eclass	12 Sep 2007 20:05:33 -0000	1.31
@@ -1,15 +1,14 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.30 2005/12/19 14:02:12 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.31 2007/09/12 20:05:33 betelgeuse Exp $
 #
-# Author Dan Armak <danarmak@gentoo.org>
+# Author Dan Armak <danarmak@gentoo.org> (nowadays retired)
 #
 # The base eclass defines some default functions and variables. Nearly everything
 # else inherits from here.
 
 inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Based on the $ECLASS eclass"
 
 base_src_unpack() {



-- 
gentoo-commits@gentoo.org mailing list

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

[Petteri Raty (betelgeuse)]

betelgeuse    08/02/12 23:51:52

  Modified:             base.eclass
  Log:
  Quote variables

Revision  Changes    Path
1.32                 eclass/base.eclass

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

Index: base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- base.eclass	12 Sep 2007 20:05:33 -0000	1.31
+++ base.eclass	12 Feb 2008 23:51:51 -0000	1.32
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.31 2007/09/12 20:05:33 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.32 2008/02/12 23:51:51 betelgeuse Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org> (nowadays retired)
 #
@@ -16,7 +16,7 @@
 	debug-print-function $FUNCNAME $*
 	[ -z "$1" ] && base_src_unpack all
 
-	cd ${WORKDIR}
+	cd "${WORKDIR}"
 
 	while [ "$1" ]; do
 
@@ -27,13 +27,13 @@
 			;;
 		patch)
 			debug-print-section patch
-			cd ${S}
-			epatch ${FILESDIR}/${P}-gentoo.diff
+			cd "${S}"
+			epatch "${FILESDIR}/${P}-gentoo.diff"
 			;;
 		autopatch)
 			debug-print-section autopatch
 			debug-print "$FUNCNAME: autopatch: PATCHES=$PATCHES, PATCHES1=$PATCHES1"
-			cd ${S}
+			cd "${S}"
 			for x in $PATCHES $PATCHES1; do
 				debug-print "$FUNCNAME: autopatch: patching from ${x}"
 				epatch ${x}
@@ -55,7 +55,7 @@
 	debug-print-function $FUNCNAME $*
 	[ -z "$1" ] && base_src_compile all
 
-	cd ${S}
+	cd "${S}"
 
 	while [ "$1" ]; do
 
@@ -84,14 +84,14 @@
 	debug-print-function $FUNCNAME $*
 	[ -z "$1" ] && base_src_install all
 
-	cd ${S}
+	cd "${S}"
 
 	while [ "$1" ]; do
 
 	case $1 in
 		make)
 			debug-print-section make
-			make DESTDIR=${D} install || die "died running make install, $FUNCNAME:make"
+			make DESTDIR="${D}" install || die "died running make install, $FUNCNAME:make"
 			;;
 		all)
 			debug-print-section all



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

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

[Petteri Raty (betelgeuse)]

betelgeuse    08/02/16 20:12:59

  Modified:             base.eclass
  Log:
  Add possibility to use bash arrays for PATCHES.

Revision  Changes    Path
1.33                 eclass/base.eclass

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

Index: base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- base.eclass	12 Feb 2008 23:51:51 -0000	1.32
+++ base.eclass	16 Feb 2008 20:12:58 -0000	1.33
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.32 2008/02/12 23:51:51 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.33 2008/02/16 20:12:58 betelgeuse Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org> (nowadays retired)
 #
@@ -34,10 +34,17 @@
 			debug-print-section autopatch
 			debug-print "$FUNCNAME: autopatch: PATCHES=$PATCHES, PATCHES1=$PATCHES1"
 			cd "${S}"
-			for x in $PATCHES $PATCHES1; do
-				debug-print "$FUNCNAME: autopatch: patching from ${x}"
-				epatch ${x}
-			done
+			if [[ ${#PATCHES[@]} -gt 1 ]]; then
+				for x in "${PATCHES[@]}"; do
+					debug-print "$FUNCNAME: autopatch: patching from ${x}"
+					epatch "${x}"
+				done
+			else
+				for x in ${PATCHES} ${PATCHES1}; do
+					debug-print "$FUNCNAME: autopatch: patching from ${x}"
+					epatch "${x}"
+				done
+			fi
 			;;
 		all)
 			debug-print-section all



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

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

[Peter Volkov (pva)]

pva         08/07/17 09:49:15

  Modified:             base.eclass
  Log:
  Make eclass ready for eclass-manpages, bug #210363, thank mren for all work.

Revision  Changes    Path
1.34                 eclass/base.eclass

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

Index: base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- base.eclass	16 Feb 2008 20:12:58 -0000	1.33
+++ base.eclass	17 Jul 2008 09:49:14 -0000	1.34
@@ -1,16 +1,27 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.33 2008/02/16 20:12:58 betelgeuse Exp $
-#
-# Author Dan Armak <danarmak@gentoo.org> (nowadays retired)
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.34 2008/07/17 09:49:14 pva Exp $
+
+# @ECLASS: base.eclass
+# @MAINTAINER:
+# ???
 #
-# The base eclass defines some default functions and variables. Nearly everything
-# else inherits from here.
+# Original author Dan Armak <danarmak@gentoo.org>
+# @BLURB: The base eclass defines some default functions and variables.
+# @DESCRIPTION:
+# The base eclass defines some default functions and variables. Nearly
+# everything else inherits from here.
+
 
 inherit eutils
 
 DESCRIPTION="Based on the $ECLASS eclass"
 
+# @FUNCTION: base_src_unpack
+# @USAGE: [ unpack ] [ patch ] [ autopatch ] [ all ]
+# @DESCRIPTION:
+# The base src_unpack function, which is exported. If no argument is given,
+# "all" is assumed.
 base_src_unpack() {
 
 	debug-print-function $FUNCNAME $*
@@ -57,6 +68,11 @@
 
 }
 
+# @FUNCTION: base_src_compile
+# @USAGE: [ configure ] [ make ] [ all ]
+# @DESCRIPTION:
+# The base src_compile function, which is exported. If no argument is given,
+# "all" is asasumed.
 base_src_compile() {
 
 	debug-print-function $FUNCNAME $*
@@ -86,6 +102,11 @@
 
 }
 
+# @FUNCTION: base_src_install
+# @USAGE: [ make ] [ all ]
+# @DESCRIPTION:
+# The base src_install function, which is exported. If no argument is given,
+# "all" is assumed.
 base_src_install() {
 
 	debug-print-function $FUNCNAME $*



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

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

[Peter Alfredsen (loki_val)]

loki_val    08/11/09 15:47:47

  Modified:             base.eclass
  Log:
  Apply EAPI-2 support for base.eclass as discussed on gentoo-dev ml.

Revision  Changes    Path
1.35                 eclass/base.eclass

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

Index: base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- base.eclass	17 Jul 2008 09:49:14 -0000	1.34
+++ base.eclass	9 Nov 2008 15:47:47 -0000	1.35
@@ -1,31 +1,77 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.34 2008/07/17 09:49:14 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.35 2008/11/09 15:47:47 loki_val Exp $
 
 # @ECLASS: base.eclass
 # @MAINTAINER:
-# ???
+# Peter Alfredsen <loki_val@gentoo.org>
 #
 # Original author Dan Armak <danarmak@gentoo.org>
 # @BLURB: The base eclass defines some default functions and variables.
 # @DESCRIPTION:
 # The base eclass defines some default functions and variables. Nearly
 # everything else inherits from here.
+#
+# NOTE: You must define EAPI before inheriting from base, or the wrong functions
+# may be exported.
 
 
 inherit eutils
 
+case "${EAPI:-0}" in
+	2)
+		EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install
+		;;
+	*)
+		EXPORT_FUNCTIONS src_unpack src_compile src_install
+		;;
+esac
+
 DESCRIPTION="Based on the $ECLASS eclass"
 
 # @FUNCTION: base_src_unpack
 # @USAGE: [ unpack ] [ patch ] [ autopatch ] [ all ]
 # @DESCRIPTION:
 # The base src_unpack function, which is exported. If no argument is given,
-# "all" is assumed.
+# "all" is assumed if EAPI!=2, "unpack" if EAPI=2.
 base_src_unpack() {
 
-	debug-print-function $FUNCNAME $*
-	[ -z "$1" ] && base_src_unpack all
+	debug-print-function $FUNCNAME "$@"
+
+	if [ -z "$1" ]
+	then
+		case "${EAPI:-0}" in
+			2)
+				base_src_util unpack
+				;;
+			*)
+				base_src_util all
+				;;
+		esac
+	else
+		base_src_util $@
+	fi
+}
+
+# @FUNCTION: base_src_prepare
+# @DESCRIPTION:
+# The base src_prepare function, which is exported when EAPI=2. Performs
+# "base_src_util autopatch".
+base_src_prepare() {
+
+	debug-print-function $FUNCNAME "$@"
+
+	base_src_util autopatch
+}
+
+# @FUNCTION: base_src_util
+# @USAGE: [ unpack ] [ patch ] [ autopatch ] [ all ]
+# @DESCRIPTION:
+# The base_src_util function is the grunt function for base src_unpack
+# and base src_prepare.
+base_src_util() {
+
+	debug-print-function $FUNCNAME "$@"
 
 	cd "${WORKDIR}"
 
@@ -59,7 +105,7 @@
 			;;
 		all)
 			debug-print-section all
-			base_src_unpack unpack autopatch
+			base_src_util unpack autopatch
 			;;
 		esac
 
@@ -68,15 +114,49 @@
 
 }
 
+# @FUNCTION: base_src_configure
+# @DESCRIPTION:
+# The base src_prepare function, which is exported when EAPI=2. Performs
+# "base_src_work configure".
+base_src_configure() {
+
+	debug-print-function $FUNCNAME "$@"
+
+	base_src_work configure
+}
+
 # @FUNCTION: base_src_compile
 # @USAGE: [ configure ] [ make ] [ all ]
 # @DESCRIPTION:
 # The base src_compile function, which is exported. If no argument is given,
-# "all" is asasumed.
+# "all" is assumed if EAPI!=2, "make" if EAPI=2.
 base_src_compile() {
 
-	debug-print-function $FUNCNAME $*
-	[ -z "$1" ] && base_src_compile all
+	debug-print-function $FUNCNAME "$@"
+
+	if [ -z "$1" ]
+	then
+		case "${EAPI:-0}" in
+			2)
+				base_src_work make
+				;;
+			*)
+				base_src_work all
+				;;
+		esac
+	else
+		base_src_work $@
+	fi
+}
+
+# @FUNCTION: base_src_work
+# @USAGE: [ configure ] [ make ] [ all ]
+# @DESCRIPTION:
+# The base_src_work function is the grunt function for base src_configure
+# and base src_compile.
+base_src_work() {
+
+	debug-print-function $FUNCNAME "$@"
 
 	cd "${S}"
 
@@ -93,7 +173,7 @@
 			;;
 		all)
 			debug-print-section all
-			base_src_compile configure make
+			base_src_work configure make
 			;;
 	esac
 
@@ -109,7 +189,7 @@
 # "all" is assumed.
 base_src_install() {
 
-	debug-print-function $FUNCNAME $*
+	debug-print-function $FUNCNAME "$@"
 	[ -z "$1" ] && base_src_install all
 
 	cd "${S}"
@@ -131,5 +211,3 @@
 	done
 
 }
-
-EXPORT_FUNCTIONS src_unpack src_compile src_install

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

[Michael Sterrett (mr_bones_)]

mr_bones_    09/01/17 16:56:55

  Modified:             base.eclass
  Log:
  don't pass empty $A to unpack

Revision  Changes    Path
1.36                 eclass/base.eclass

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

Index: base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- base.eclass	9 Nov 2008 15:47:47 -0000	1.35
+++ base.eclass	17 Jan 2009 16:56:55 -0000	1.36
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.35 2008/11/09 15:47:47 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.36 2009/01/17 16:56:55 mr_bones_ Exp $
 
 # @ECLASS: base.eclass
 # @MAINTAINER:
@@ -38,8 +38,7 @@
 
 	debug-print-function $FUNCNAME "$@"
 
-	if [ -z "$1" ]
-	then
+	if [ -z "$1" ] ; then
 		case "${EAPI:-0}" in
 			2)
 				base_src_util unpack
@@ -80,7 +79,9 @@
 	case $1 in
 		unpack)
 			debug-print-section unpack
-			unpack ${A}
+			if [ ! -z "$A" ] ; then
+				unpack ${A}
+			fi
 			;;
 		patch)
 			debug-print-section patch
@@ -91,7 +92,7 @@
 			debug-print-section autopatch
 			debug-print "$FUNCNAME: autopatch: PATCHES=$PATCHES, PATCHES1=$PATCHES1"
 			cd "${S}"
-			if [[ ${#PATCHES[@]} -gt 1 ]]; then
+			if [[ ${#PATCHES[@]} -gt 1 ]] ; then
 				for x in "${PATCHES[@]}"; do
 					debug-print "$FUNCNAME: autopatch: patching from ${x}"
 					epatch "${x}"

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

[Peter Alfredsen (loki_val)]

loki_val    09/01/18 18:21:08

  Modified:             base.eclass
  Log:
  Rip default() functions so we only run econf and emake if the appropriate files exist.

Revision  Changes    Path
1.37                 eclass/base.eclass

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

Index: base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- base.eclass	17 Jan 2009 16:56:55 -0000	1.36
+++ base.eclass	18 Jan 2009 18:21:08 -0000	1.37
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.36 2009/01/17 16:56:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.37 2009/01/18 18:21:08 loki_val Exp $
 
 # @ECLASS: base.eclass
 # @MAINTAINER:
@@ -166,11 +166,17 @@
 	case $1 in
 		configure)
 			debug-print-section configure
-			econf || die "died running econf, $FUNCNAME:configure"
+			if [[ -x ${ECONF_SOURCE:-.}/configure ]]
+			then
+				econf || die "died running econf, $FUNCNAME:configure"
+			fi
 			;;
 		make)
 			debug-print-section make
-			emake || die "died running emake, $FUNCNAME:make"
+			if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]
+			then
+				emake || die "died running emake, $FUNCNAME:make"
+			fi
 			;;
 		all)
 			debug-print-section all

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

[Peter Alfredsen (loki_val)]

loki_val    09/05/17 09:25:55

  Modified:             base.eclass
  Log:
  x should be declared local. Bug 264466. Thanks to Ulm for noticing and cattleprodding me.

Revision  Changes    Path
1.38                 eclass/base.eclass

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

Index: base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- base.eclass	18 Jan 2009 18:21:08 -0000	1.37
+++ base.eclass	17 May 2009 09:25:55 -0000	1.38
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.37 2009/01/18 18:21:08 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.38 2009/05/17 09:25:55 loki_val Exp $
 
 # @ECLASS: base.eclass
 # @MAINTAINER:
@@ -69,6 +69,7 @@
 # The base_src_util function is the grunt function for base src_unpack
 # and base src_prepare.
 base_src_util() {
+	local x
 
 	debug-print-function $FUNCNAME "$@"
 

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

[Michael Sterrett (mr_bones_)]

mr_bones_    10/01/03 21:07:32

  Modified:             base.eclass
  Log:
  fix typo

Revision  Changes    Path
1.40                 eclass/base.eclass

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

Index: base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- base.eclass	3 Jan 2010 19:13:44 -0000	1.39
+++ base.eclass	3 Jan 2010 21:07:32 -0000	1.40
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.39 2010/01/03 19:13:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.40 2010/01/03 21:07:32 mr_bones_ Exp $
 
 # @ECLASS: base.eclass
 # @MAINTAINER:
@@ -153,7 +153,7 @@
 
 # placeholder for future api so eclasses can be migrated now.
 base_src_make() {
-	debug-print-fucntion $FUNCNAME "$@"
+	debug-print-function $FUNCNAME "$@"
 	base_src_work make
 }
 

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/01/11 16:57:46

  Modified:             base.eclass
  Log:
  Update maintainership to be qa@g.o
  Features information:
  PATCHES now accept also folders as their argument.
  New arrays DOCS and HTML_DOCS, also bash arrays as patches.
  src_install calls emake and not make.
  switched from "function argument" layout to separate functions.
  Review request submited: http://archives.gentoo.org/gentoo-dev/msg_254665435d58a97bcc5a952e5e005cd1.xml

Revision  Changes    Path
1.41                 eclass/base.eclass

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

Index: base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- base.eclass	3 Jan 2010 21:07:32 -0000	1.40
+++ base.eclass	11 Jan 2010 16:57:46 -0000	1.41
@@ -1,227 +1,173 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.40 2010/01/03 21:07:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.41 2010/01/11 16:57:46 scarabeus Exp $
 
 # @ECLASS: base.eclass
 # @MAINTAINER:
-# Peter Alfredsen <loki_val@gentoo.org>
+# QA Team <qa@gentoo.org>
 #
 # Original author Dan Armak <danarmak@gentoo.org>
 # @BLURB: The base eclass defines some default functions and variables.
 # @DESCRIPTION:
 # The base eclass defines some default functions and variables. Nearly
 # everything else inherits from here.
-#
-# NOTE: You must define EAPI before inheriting from base, or the wrong functions
-# may be exported.
-
 
 inherit eutils
 
+BASE_EXPF="src_unpack src_compile src_install"
 case "${EAPI:-0}" in
-	2)
-		EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install
-		;;
-	*)
-		EXPORT_FUNCTIONS src_unpack src_compile src_install
-		;;
+	2|3|4) BASE_EXPF="src_prepare src_configure" ;;
+	*) ;;
 esac
 
-DESCRIPTION="Based on the $ECLASS eclass"
+EXPORT_FUNCTIONS ${BASE_EXPF}
 
-# @FUNCTION: base_src_unpack
-# @USAGE: [ unpack ] [ patch ] [ autopatch ] [ all ]
+# @ECLASS-VARIABLE: DOCS
+# @USAGE: DOCS=( "${S}/doc/document.txt" "${S}/doc/doc_folder/" )
 # @DESCRIPTION:
-# The base src_unpack function, which is exported. If no argument is given,
-# "all" is assumed if EAPI!=2, "unpack" if EAPI=2.
-base_src_unpack() {
+# Array containing documents passed to dodoc command.
 
-	debug-print-function $FUNCNAME "$@"
-
-	if [ -z "$1" ] ; then
-		case "${EAPI:-0}" in
-			2)
-				base_src_util unpack
-				;;
-			*)
-				base_src_util all
-				;;
-		esac
-	else
-		base_src_util $@
-	fi
-}
+# @ECLASS-VARIABLE: HTML_DOCS
+# @USAGE: HTML_DOCS=( "${S}/doc/document.html" "${S}/doc/html_folder/" )
+# @DESCRIPTION:
+# Array containing documents passed to dohtml command.
 
-# @FUNCTION: base_src_prepare
+# @ECLASS-VARIABLE: PATCHES
+# @USAGE: PATCHES=( "${FILESDIR}/mypatch.patch" "${FILESDIR}/patches_folder/" )
 # @DESCRIPTION:
-# The base src_prepare function, which is exported when EAPI=2. Performs
-# "base_src_util autopatch".
-base_src_prepare() {
+# PATCHES array variable containing all various patches to be applied.
+# This variable is expected to be defined in global scope of ebuild.
+# Make sure to specify the full path. This variable is utilised in
+# src_unpack/src_prepare phase based on EAPI.
+# NOTE: if using patches folders with special file suffixes you have to
+# define one additional variable EPATCH_SUFFIX="something"
+
 
+# @FUNCTION: base_src_unpack
+# @DESCRIPTION:
+# The base src_unpack function, which is exported.
+# Calls also src_prepare with eapi older than 2.
+base_src_unpack() {
 	debug-print-function $FUNCNAME "$@"
 
-	base_src_util autopatch
+	pushd "${WORKDIR}" > /dev/null
+
+	[[ -n "${A}" ]] && unpack ${A}
+	has src_prepare ${BASE_EXPF} || base_src_prepare
+
+	popd > /dev/null
 }
 
-# @FUNCTION: base_src_util
-# @USAGE: [ unpack ] [ patch ] [ autopatch ] [ all ]
+# @FUNCTION: base_src_prepare
 # @DESCRIPTION:
-# The base_src_util function is the grunt function for base src_unpack
-# and base src_prepare.
-base_src_util() {
-	local x
-
+# The base src_prepare function, which is exported
+# EAPI is greater or equal to 2.
+base_src_prepare() {
 	debug-print-function $FUNCNAME "$@"
+	debug-print "$FUNCNAME: PATCHES=$PATCHES"
 
-	cd "${WORKDIR}"
-
-	while [ "$1" ]; do
-
-	case $1 in
-		unpack)
-			debug-print-section unpack
-			if [ ! -z "$A" ] ; then
-				unpack ${A}
-			fi
-			;;
-		patch)
-			debug-print-section patch
-			cd "${S}"
-			epatch "${FILESDIR}/${P}-gentoo.diff"
-			;;
-		autopatch)
-			debug-print-section autopatch
-			debug-print "$FUNCNAME: autopatch: PATCHES=$PATCHES, PATCHES1=$PATCHES1"
-			cd "${S}"
-			if [[ ${#PATCHES[@]} -gt 1 ]] ; then
-				for x in "${PATCHES[@]}"; do
-					debug-print "$FUNCNAME: autopatch: patching from ${x}"
-					epatch "${x}"
-				done
-			else
-				for x in ${PATCHES} ${PATCHES1}; do
-					debug-print "$FUNCNAME: autopatch: patching from ${x}"
-					epatch "${x}"
-				done
+	pushd "${S}" > /dev/null
+	if [[ "$(declare -p PATCHES 2>/dev/null 2>&1)" == "declare -a"* ]]; then
+		for x in "${PATCHES[@]}"; do
+			debug-print "$FUNCNAME: applying patch from ${x}"
+			[[ -f "${x}" ]] && epatch "${x}"
+			if [[ -d "${x}" ]]; then
+				# Use standardized names and locations with bulk patching
+				# Patch directory is ${WORKDIR}/patch
+				# See epatch() in eutils.eclass for more documentation
+				EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
+
+				# in order to preserve normal EPATCH_SOURCE value that can
+				# be used other way than with base eclass store in local
+				# variable and restore later
+				oldval=${EPATCH_SOURCE}
+				EPATCH_SOURCE=${x}
+				epatch
+				EPATCH_SOURCE=${oldval}
 			fi
-			;;
-		all)
-			debug-print-section all
-			base_src_util unpack autopatch
-			;;
-		esac
+		done
+	else
+		for x in ${PATCHES}; do
+			debug-print "$FUNCNAME: patching from ${x}"
+			epatch "${x}"
+		done
+	fi
 
-	shift
-	done
+	# Apply user patches
+	debug-print "$FUNCNAME: applying user patches"
+	epatch_user
 
+	popd > /dev/null
 }
 
 # @FUNCTION: base_src_configure
 # @DESCRIPTION:
-# The base src_prepare function, which is exported when EAPI=2. Performs
-# "base_src_work configure".
+# The base src_configure function, which is exported when
+# EAPI is greater or equal to 2. Runs basic econf.
 base_src_configure() {
-
 	debug-print-function $FUNCNAME "$@"
 
-	base_src_work configure
+	# there is no pushd ${S} so we can override its place where to run
+	[[ -x ${ECONF_SOURCE:-.}/configure ]] && econf
 }
 
 # @FUNCTION: base_src_compile
-# @USAGE: [ configure ] [ make ] [ all ]
 # @DESCRIPTION:
-# The base src_compile function, which is exported. If no argument is given,
-# "all" is assumed if EAPI!=2, "make" if EAPI=2.
+# The base src_compile function, calls src_configure with
+# EAPI older than 2.
 base_src_compile() {
-
 	debug-print-function $FUNCNAME "$@"
 
-	if [ -z "$1" ]
-	then
-		case "${EAPI:-0}" in
-			2)
-				base_src_work make
-				;;
-			*)
-				base_src_work all
-				;;
-		esac
-	else
-		base_src_work $@
-	fi
+	has src_configure ${BASE_EXPF} || base_src_configure
+	base_src_make $@
 }
 
-# placeholder for future api so eclasses can be migrated now.
+# @FUNCTION: base_src_make
+# @DESCRIPTION:
+# Actual function that runs emake command.
 base_src_make() {
 	debug-print-function $FUNCNAME "$@"
-	base_src_work make
+
+	if [[ -f Makefile || -f GNUmakefile || -f makefile ]]; then
+		emake $@ || die "died running emake, $FUNCNAME:make"
+	fi
 }
 
-# @FUNCTION: base_src_work
-# @USAGE: [ configure ] [ make ] [ all ]
+# @FUNCTION: base_src_install
 # @DESCRIPTION:
-# The base_src_work function is the grunt function for base src_configure
-# and base src_compile.
-base_src_work() {
-
+# The base src_install function. Runs make install and
+# installs documents and html documents from DOCS and HTML_DOCS
+# arrays.
+base_src_install() {
 	debug-print-function $FUNCNAME "$@"
 
-	cd "${S}"
-
-	while [ "$1" ]; do
-
-	case $1 in
-		configure)
-			debug-print-section configure
-			if [[ -x ${ECONF_SOURCE:-.}/configure ]]
-			then
-				econf || die "died running econf, $FUNCNAME:configure"
-			fi
-			;;
-		make)
-			debug-print-section make
-			if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]
-			then
-				emake || die "died running emake, $FUNCNAME:make"
-			fi
-			;;
-		all)
-			debug-print-section all
-			base_src_work configure make
-			;;
-	esac
-
-	shift
-	done
-
+	emake DESTDIR="${D}" $@ install || die "died running make install, $FUNCNAME:make"
+	base_src_install_docs
 }
 
-# @FUNCTION: base_src_install
-# @USAGE: [ make ] [ all ]
+# @FUNCTION: base_src_install_docs
 # @DESCRIPTION:
-# The base src_install function, which is exported. If no argument is given,
-# "all" is assumed.
-base_src_install() {
-
+# Actual function that install documentation from
+# DOCS and HTML_DOCS arrays.
+base_src_install_docs() {
 	debug-print-function $FUNCNAME "$@"
-	[ -z "$1" ] && base_src_install all
-
-	cd "${S}"
 
-	while [ "$1" ]; do
+	local x
 
-	case $1 in
-		make)
-			debug-print-section make
-			make DESTDIR="${D}" install || die "died running make install, $FUNCNAME:make"
-			;;
-		all)
-			debug-print-section all
-			base_src_install make
-			;;
-	esac
+	pushd "${S}" > /dev/null
 
-	shift
-	done
+	if [[ "$(declare -p DOCS 2>/dev/null 2>&1)" == "declare -a"* ]]; then
+		for x in "${DOCS[@]}"; do
+			debug-print "$FUNCNAME: docs: creating document from ${x}"
+			dodoc -r "${x}" || die "dodoc failed"
+		done
+	fi
+	if [[ "$(declare -p HTML_DOCS 2>/dev/null 2>&1)" == "declare -a"* ]]; then
+		for x in "${HTML_DOCS[@]}"; do
+			debug-print "$FUNCNAME: docs: creating html document from ${x}"
+			dohtml -r "${x}" || die "dohtml failed"
+		done
+	fi
 
+	popd > /dev/null
 }

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/01/11 17:23:04

  Modified:             base.eclass
  Log:
  Update ECLASSDOC so it is working properly.

Revision  Changes    Path
1.42                 eclass/base.eclass

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

Index: base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- base.eclass	11 Jan 2010 16:57:46 -0000	1.41
+++ base.eclass	11 Jan 2010 17:23:04 -0000	1.42
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.41 2010/01/11 16:57:46 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.42 2010/01/11 17:23:04 scarabeus Exp $
 
 # @ECLASS: base.eclass
 # @MAINTAINER:
@@ -23,24 +23,28 @@
 EXPORT_FUNCTIONS ${BASE_EXPF}
 
 # @ECLASS-VARIABLE: DOCS
-# @USAGE: DOCS=( "${S}/doc/document.txt" "${S}/doc/doc_folder/" )
 # @DESCRIPTION:
 # Array containing documents passed to dodoc command.
+#
+# DOCS=( "${S}/doc/document.txt" "${S}/doc/doc_folder/" )
 
 # @ECLASS-VARIABLE: HTML_DOCS
-# @USAGE: HTML_DOCS=( "${S}/doc/document.html" "${S}/doc/html_folder/" )
 # @DESCRIPTION:
 # Array containing documents passed to dohtml command.
+#
+# HTML_DOCS=( "${S}/doc/document.html" "${S}/doc/html_folder/" )
 
 # @ECLASS-VARIABLE: PATCHES
-# @USAGE: PATCHES=( "${FILESDIR}/mypatch.patch" "${FILESDIR}/patches_folder/" )
 # @DESCRIPTION:
 # PATCHES array variable containing all various patches to be applied.
 # This variable is expected to be defined in global scope of ebuild.
 # Make sure to specify the full path. This variable is utilised in
 # src_unpack/src_prepare phase based on EAPI.
+#
 # NOTE: if using patches folders with special file suffixes you have to
 # define one additional variable EPATCH_SUFFIX="something"
+#
+# PATCHES=( "${FILESDIR}/mypatch.patch" "${FILESDIR}/patches_folder/" )
 
 
 # @FUNCTION: base_src_unpack
@@ -103,7 +107,8 @@
 # @FUNCTION: base_src_configure
 # @DESCRIPTION:
 # The base src_configure function, which is exported when
-# EAPI is greater or equal to 2. Runs basic econf.
+# EAPI is greater or equal to 2. Runs basic econf. Here the PATCHES array is
+# evaluated.
 base_src_configure() {
 	debug-print-function $FUNCNAME "$@"
 

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

[Patrick Lauer (patrick)]

patrick     10/01/13 01:58:53

  Modified:             base.eclass
  Log:
  Fix BASE_EXPF to export all relevant functions for EAPI > 2.
  Thanks to max_posedon for spotting it.

Revision  Changes    Path
1.43                 eclass/base.eclass

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

Index: base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- base.eclass	11 Jan 2010 17:23:04 -0000	1.42
+++ base.eclass	13 Jan 2010 01:58:53 -0000	1.43
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.42 2010/01/11 17:23:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.43 2010/01/13 01:58:53 patrick Exp $
 
 # @ECLASS: base.eclass
 # @MAINTAINER:
@@ -16,7 +16,7 @@
 
 BASE_EXPF="src_unpack src_compile src_install"
 case "${EAPI:-0}" in
-	2|3|4) BASE_EXPF="src_prepare src_configure" ;;
+	2|3|4) BASE_EXPF="${BASE_EXPF} src_prepare src_configure" ;;
 	*) ;;
 esac
 

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

[Dror Levin (spatz)]

spatz       10/01/20 12:57:13

  Modified:             base.eclass
  Log:
  Fix critical bug in base.eclass where patching with PATCHES would silently fail if file does not exist

Revision  Changes    Path
1.45                 eclass/base.eclass

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

Index: base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- base.eclass	13 Jan 2010 09:51:53 -0000	1.44
+++ base.eclass	20 Jan 2010 12:57:13 -0000	1.45
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.44 2010/01/13 09:51:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.45 2010/01/20 12:57:13 spatz Exp $
 
 # @ECLASS: base.eclass
 # @MAINTAINER:
@@ -74,7 +74,6 @@
 	if [[ "$(declare -p PATCHES 2>/dev/null 2>&1)" == "declare -a"* ]]; then
 		for x in "${PATCHES[@]}"; do
 			debug-print "$FUNCNAME: applying patch from ${x}"
-			[[ -f "${x}" ]] && epatch "${x}"
 			if [[ -d "${x}" ]]; then
 				# Use standardized names and locations with bulk patching
 				# Patch directory is ${WORKDIR}/patch
@@ -88,6 +87,8 @@
 				EPATCH_SOURCE=${x}
 				epatch
 				EPATCH_SOURCE=${oldval}
+			else
+				epatch "${x}"
 			fi
 		done
 	else

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/01/20 19:21:20

  Modified:             base.eclass
  Log:
  Do not die when PATCHES content cant be found. Just print evil QA warning.

Revision  Changes    Path
1.46                 eclass/base.eclass

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

Index: base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- base.eclass	20 Jan 2010 12:57:13 -0000	1.45
+++ base.eclass	20 Jan 2010 19:21:19 -0000	1.46
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.45 2010/01/20 12:57:13 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.46 2010/01/20 19:21:19 scarabeus Exp $
 
 # @ECLASS: base.eclass
 # @MAINTAINER:
@@ -87,8 +87,11 @@
 				EPATCH_SOURCE=${x}
 				epatch
 				EPATCH_SOURCE=${oldval}
-			else
+			elif [[ -f "${x}" ]]; then
 				epatch "${x}"
+			else
+				eqawarn "File or directory \"${x}\" does not exist."
+				eqawarn "Check your PATCHES array or add missing file/directory."
 			fi
 		done
 	else

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/01/22 09:34:04

  Modified:             base.eclass
  Log:
  Drop usage of eqawarn.

Revision  Changes    Path
1.47                 eclass/base.eclass

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

Index: base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- base.eclass	20 Jan 2010 19:21:19 -0000	1.46
+++ base.eclass	22 Jan 2010 09:34:04 -0000	1.47
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.46 2010/01/20 19:21:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.47 2010/01/22 09:34:04 scarabeus Exp $
 
 # @ECLASS: base.eclass
 # @MAINTAINER:
@@ -90,8 +90,8 @@
 			elif [[ -f "${x}" ]]; then
 				epatch "${x}"
 			else
-				eqawarn "File or directory \"${x}\" does not exist."
-				eqawarn "Check your PATCHES array or add missing file/directory."
+				ewarn "QA: File or directory \"${x}\" does not exist."
+				ewarn "QA: Check your PATCHES array or add missing file/directory."
 			fi
 		done
 	else

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/01/24 13:43:26

  Modified:             base.eclass
  Log:
  Die if some patches fail to be found, but still print out all warnings about missing ones first.

Revision  Changes    Path
1.48                 eclass/base.eclass

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

Index: base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- base.eclass	22 Jan 2010 09:34:04 -0000	1.47
+++ base.eclass	24 Jan 2010 13:43:26 -0000	1.48
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.47 2010/01/22 09:34:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.48 2010/01/24 13:43:26 scarabeus Exp $
 
 # @ECLASS: base.eclass
 # @MAINTAINER:
@@ -70,6 +70,8 @@
 	debug-print-function $FUNCNAME "$@"
 	debug-print "$FUNCNAME: PATCHES=$PATCHES"
 
+	local patches_failed=0
+
 	pushd "${S}" > /dev/null
 	if [[ "$(declare -p PATCHES 2>/dev/null 2>&1)" == "declare -a"* ]]; then
 		for x in "${PATCHES[@]}"; do
@@ -92,8 +94,10 @@
 			else
 				ewarn "QA: File or directory \"${x}\" does not exist."
 				ewarn "QA: Check your PATCHES array or add missing file/directory."
+				patches_failed=1
 			fi
 		done
+		[[ ${patches_failed} -eq 1 ]] && die "Some patches failed. See above messages."
 	else
 		for x in ${PATCHES}; do
 			debug-print "$FUNCNAME: patching from ${x}"

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/02/02 10:20:26

  Modified:             base.eclass
  Log:
  Remove wrong -r argument from dodoc call.

Revision  Changes    Path
1.49                 eclass/base.eclass

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

Index: base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- base.eclass	24 Jan 2010 13:43:26 -0000	1.48
+++ base.eclass	2 Feb 2010 10:20:25 -0000	1.49
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.48 2010/01/24 13:43:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.49 2010/02/02 10:20:25 scarabeus Exp $
 
 # @ECLASS: base.eclass
 # @MAINTAINER:
@@ -172,7 +172,7 @@
 	if [[ "$(declare -p DOCS 2>/dev/null 2>&1)" == "declare -a"* ]]; then
 		for x in "${DOCS[@]}"; do
 			debug-print "$FUNCNAME: docs: creating document from ${x}"
-			dodoc -r "${x}" || die "dodoc failed"
+			dodoc "${x}" || die "dodoc failed"
 		done
 	fi
 	if [[ "$(declare -p HTML_DOCS 2>/dev/null 2>&1)" == "declare -a"* ]]; then

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/04/12 15:33:03

  Modified:             base.eclass
  Log:
  Use EPATCH_FORCE=yes. Otherwise patches as dir are not populated.

Revision  Changes    Path
1.50                 eclass/base.eclass

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

Index: base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- base.eclass	2 Feb 2010 10:20:25 -0000	1.49
+++ base.eclass	12 Apr 2010 15:33:03 -0000	1.50
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.49 2010/02/02 10:20:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.50 2010/04/12 15:33:03 scarabeus Exp $
 
 # @ECLASS: base.eclass
 # @MAINTAINER:
@@ -87,6 +87,7 @@
 				# variable and restore later
 				oldval=${EPATCH_SOURCE}
 				EPATCH_SOURCE=${x}
+				EPATCH_FORCE=yes
 				epatch
 				EPATCH_SOURCE=${oldval}
 			elif [[ -f "${x}" ]]; then

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

[Maciej Mrozowski (reavertm)]

reavertm    10/05/25 20:37:12

  Modified:             base.eclass
  Log:
  Make econf accept base_src_configure arguments (only >=EAPI-2), fix documentation wrt PATCHES variable

Revision  Changes    Path
1.51                 eclass/base.eclass

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

Index: base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- base.eclass	12 Apr 2010 15:33:03 -0000	1.50
+++ base.eclass	25 May 2010 20:37:12 -0000	1.51
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.50 2010/04/12 15:33:03 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.51 2010/05/25 20:37:12 reavertm Exp $
 
 # @ECLASS: base.eclass
 # @MAINTAINER:
@@ -65,7 +65,7 @@
 # @FUNCTION: base_src_prepare
 # @DESCRIPTION:
 # The base src_prepare function, which is exported
-# EAPI is greater or equal to 2.
+# EAPI is greater or equal to 2. Here the PATCHES array is evaluated.
 base_src_prepare() {
 	debug-print-function $FUNCNAME "$@"
 	debug-print "$FUNCNAME: PATCHES=$PATCHES"
@@ -116,13 +116,12 @@
 # @FUNCTION: base_src_configure
 # @DESCRIPTION:
 # The base src_configure function, which is exported when
-# EAPI is greater or equal to 2. Runs basic econf. Here the PATCHES array is
-# evaluated.
+# EAPI is greater or equal to 2. Runs basic econf.
 base_src_configure() {
 	debug-print-function $FUNCNAME "$@"
 
 	# there is no pushd ${S} so we can override its place where to run
-	[[ -x ${ECONF_SOURCE:-.}/configure ]] && econf
+	[[ -x ${ECONF_SOURCE:-.}/configure ]] && econf $@
 }
 
 # @FUNCTION: base_src_compile

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

[Maciej Mrozowski (reavertm)]

reavertm    10/05/25 21:16:54

  Modified:             base.eclass
  Log:
  Quote function arguments

Revision  Changes    Path
1.52                 eclass/base.eclass

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

Index: base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- base.eclass	25 May 2010 20:37:12 -0000	1.51
+++ base.eclass	25 May 2010 21:16:54 -0000	1.52
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.51 2010/05/25 20:37:12 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.52 2010/05/25 21:16:54 reavertm Exp $
 
 # @ECLASS: base.eclass
 # @MAINTAINER:
@@ -121,7 +121,7 @@
 	debug-print-function $FUNCNAME "$@"
 
 	# there is no pushd ${S} so we can override its place where to run
-	[[ -x ${ECONF_SOURCE:-.}/configure ]] && econf $@
+	[[ -x ${ECONF_SOURCE:-.}/configure ]] && econf "$@"
 }
 
 # @FUNCTION: base_src_compile
@@ -132,7 +132,7 @@
 	debug-print-function $FUNCNAME "$@"
 
 	has src_configure ${BASE_EXPF} || base_src_configure
-	base_src_make $@
+	base_src_make "$@"
 }
 
 # @FUNCTION: base_src_make
@@ -142,7 +142,7 @@
 	debug-print-function $FUNCNAME "$@"
 
 	if [[ -f Makefile || -f GNUmakefile || -f makefile ]]; then
-		emake $@ || die "died running emake, $FUNCNAME:make"
+		emake "$@" || die "died running emake, $FUNCNAME:make"
 	fi
 }
 
@@ -154,7 +154,7 @@
 base_src_install() {
 	debug-print-function $FUNCNAME "$@"
 
-	emake DESTDIR="${D}" $@ install || die "died running make install, $FUNCNAME:make"
+	emake DESTDIR="${D}" "$@" install || die "died running make install, $FUNCNAME:make"
 	base_src_install_docs
 }
 

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/05/27 08:09:33

  Modified:             base.eclass
  Log:
  Drop useless text in die messages.

Revision  Changes    Path
1.53                 eclass/base.eclass

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

Index: base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- base.eclass	25 May 2010 21:16:54 -0000	1.52
+++ base.eclass	27 May 2010 08:09:33 -0000	1.53
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.52 2010/05/25 21:16:54 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.53 2010/05/27 08:09:33 scarabeus Exp $
 
 # @ECLASS: base.eclass
 # @MAINTAINER:
@@ -142,7 +142,7 @@
 	debug-print-function $FUNCNAME "$@"
 
 	if [[ -f Makefile || -f GNUmakefile || -f makefile ]]; then
-		emake "$@" || die "died running emake, $FUNCNAME:make"
+		emake "$@" || die "died running emake, $FUNCNAME"
 	fi
 }
 
@@ -154,7 +154,7 @@
 base_src_install() {
 	debug-print-function $FUNCNAME "$@"
 
-	emake DESTDIR="${D}" "$@" install || die "died running make install, $FUNCNAME:make"
+	emake DESTDIR="${D}" "$@" install || die "died running make install, $FUNCNAME"
 	base_src_install_docs
 }
 

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

[Mike Frysinger (vapier)]

vapier      11/12/14 23:38:09

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

Revision  Changes    Path
1.55                 eclass/base.eclass

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

Index: base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- base.eclass	22 Aug 2011 04:46:31 -0000	1.54
+++ base.eclass	14 Dec 2011 23:38:09 -0000	1.55
@@ -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/base.eclass,v 1.54 2011/08/22 04:46:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.55 2011/12/14 23:38:09 vapier Exp $
 
 # @ECLASS: base.eclass
 # @MAINTAINER:
@@ -12,6 +12,9 @@
 # The base eclass defines some default functions and variables. Nearly
 # everything else inherits from here.
 
+if [[ ${___ECLASS_ONCE_BASE} != "recur -_+^+_- spank" ]] ; then
+___ECLASS_ONCE_BASE="recur -_+^+_- spank"
+
 inherit eutils
 
 BASE_EXPF="src_unpack src_compile src_install"
@@ -184,3 +187,5 @@
 
 	popd > /dev/null
 }
+
+fi

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

[Mike Frysinger (vapier)]

vapier      12/02/06 21:33:59

  Modified:             base.eclass
  Log:
  automatically use unpacker eclass if it is available

Revision  Changes    Path
1.56                 eclass/base.eclass

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

Index: base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- base.eclass	14 Dec 2011 23:38:09 -0000	1.55
+++ base.eclass	6 Feb 2012 21:33:59 -0000	1.56
@@ -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/base.eclass,v 1.55 2011/12/14 23:38:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.56 2012/02/06 21:33:59 vapier Exp $
 
 # @ECLASS: base.eclass
 # @MAINTAINER:
@@ -59,7 +59,11 @@
 
 	pushd "${WORKDIR}" > /dev/null
 
-	[[ -n "${A}" ]] && unpack ${A}
+	if [[ $(type -t unpacker_src_unpack) == "function" ]] ; then
+		unpacker_src_unpack
+	elif [[ -n ${A} ]] ; then
+		unpack ${A}
+	fi
 	has src_prepare ${BASE_EXPF} || base_src_prepare
 
 	popd > /dev/null