X-Git-Url: https://git.wh0rd.org/?p=patches.git;a=blobdiff_plain;f=autotools.eclass.patch;fp=autotools.eclass.patch;h=0cf0b68ddafcfef877754b23f4010b84f9a19d22;hp=0000000000000000000000000000000000000000;hb=b53d1f41b32c8078c755a63c7bf0d2852263ee99;hpb=6d7b707a99652eefa9b245d8f1e0053f3583c79c

diff --git a/autotools.eclass.patch b/autotools.eclass.patch
new file mode 100644
index 0000000..0cf0b68
--- /dev/null
+++ b/autotools.eclass.patch
@@ -0,0 +1,93 @@
+Index: autotools.eclass
+===================================================================
+RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
+retrieving revision 1.56
+diff -u -p -r1.56 autotools.eclass
+--- autotools.eclass	1 Nov 2006 10:58:46 -0000	1.56
++++ autotools.eclass	4 Nov 2006 10:13:05 -0000
+@@ -20,6 +20,8 @@ if [[ -n ${WANT_AUTOMAKE} ]]; then
+ 		latest) _automake_atom="|| ( =sys-devel/automake-1.10* =sys-devel/automake-1.9* )" ;;
+ 		*) _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;;
+ 	esac
++	[[ ${WANT_AUTOMAKE} == "latest" ]] && WANT_AUTOMAKE="1.10:1.9"
++	export WANT_AUTOMAKE
+ fi
+ 
+ if [[ -n ${WANT_AUTOCONF} ]] ; then
+@@ -27,6 +29,8 @@ if [[ -n ${WANT_AUTOCONF} ]] ; then
+ 		2.1) _autoconf_atom="=sys-devel/autoconf-${WANT_AUTOCONF}*" ;;
+ 		latest | 2.5) _autoconf_atom=">=sys-devel/autoconf-2.59" ;;
+ 	esac
++	[[ ${WANT_AUTOCONF} == "latest" ]] && WANT_AUTOCONF="2.5"
++	export WANT_AUTOCONF
+ fi
+ DEPEND="${_automake_atom}
+ 	${_autoconf_atom}
+@@ -116,7 +120,6 @@ eaclocal() {
+ 		done
+ 	fi
+ 
+-	autotools_set_versions
+ 	[[ ! -f aclocal.m4 || -n $(grep -e 'generated.*by aclocal' aclocal.m4) ]] && \
+ 		autotools_run_tool aclocal "$@" ${aclocal_opts}
+ }
+@@ -142,7 +145,6 @@ _elibtoolize() {
+ eautoheader() {
+ 	# Check if we should run autoheader
+ 	[[ -n $(autotools_check_macro "AC_CONFIG_HEADERS") ]] || return 0
+-	autotools_set_versions
+ 	autotools_run_tool autoheader "$@"
+ }
+ 
+@@ -154,7 +156,6 @@ eautoconf() {
+ 		die "No configure.{ac,in} present!"
+ 	fi
+ 
+-	autotools_set_versions
+ 	autotools_run_tool autoconf "$@"
+ }
+ 
+@@ -163,7 +164,6 @@ eautomake() {
+ 
+ 	[[ -f Makefile.am ]] || return 0
+ 
+-	autotools_set_versions
+ 	if [[ -z ${FROM_EAUTORECONF} && -f Makefile.in ]]; then
+ 		local used_automake
+ 		local installed_automake
+@@ -188,35 +188,6 @@ eautomake() {
+ 	autotools_run_tool automake --add-missing --copy ${extra_opts} "$@"
+ }
+ 
+-autotools_set_versions() {
+-	[[ -n ${autotools_version_sets} ]] && return 0
+-
+-	if [[ -n ${WANT_AUTOCONF} ]]; then
+-		[[ ${WANT_AUTOCONF} == "latest" ]] && WANT_AUTOCONF="2.5"
+-		export WANT_AUTOCONF
+-		einfo "Requested autoconf ${WANT_AUTOCONF}"
+-		einfo "Using $(autoconf --version 2>/dev/null | head -n 1)"
+-		einfo "Using $(autoheader --version 2>/dev/null | head -n 1)"
+-	fi
+-
+-	if [[ -n ${WANT_AUTOMAKE} ]]; then
+-		local latest_automake
+-		if [[ ${WANT_AUTOMAKE} == "latest" ]]; then
+-			latest_automake="latest: "
+-			for amver in 1.10 1.9 1.8 1.7 1.6; do
+-				WANT_AUTOMAKE="${amver}"
+-				ROOT=/ has_version =sys-devel/automake-${amver}* && break
+-			done
+-		fi
+-		export WANT_AUTOMAKE
+-		einfo "Requested automake ${latest_automake}${WANT_AUTOMAKE}"
+-		einfo "Using $(automake --version 2>/dev/null | head -n 1)"
+-		einfo "Using $(aclocal --version 2>/dev/null | head -n 1)"
+-	fi
+-
+-	autotools_version_sets="yes"
+-}
+-
+ # Internal function to run an autotools' tool
+ autotools_run_tool() {
+ 	local STDERR_TARGET="${T}/$$.out"