[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-utils.eclass

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-utils.eclass

[Michal Gorny (mgorny)]

mgorny      11/11/27 09:17:35

  Modified:             ChangeLog autotools-utils.eclass
  Log:
  Denote that autotools-utils must not be mixed with econf/emake.

Revision  Changes    Path
1.29                 eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ChangeLog	26 Nov 2011 20:43:55 -0000	1.28
+++ ChangeLog	27 Nov 2011 09:17:35 -0000	1.29
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.28 2011/11/26 20:43:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.29 2011/11/27 09:17:35 mgorny Exp $
+
+  27 Nov 2011; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+  Denote that autotools-utils must not be mixed with econf/emake.
 
   26 Nov 2011; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
   Remove implicit IUSE=debug deprecation warning.



1.28                 eclass/autotools-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.27&r2=1.28

Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- autotools-utils.eclass	26 Nov 2011 20:43:55 -0000	1.27
+++ autotools-utils.eclass	27 Nov 2011 09:17:35 -0000	1.28
@@ -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/autotools-utils.eclass,v 1.27 2011/11/26 20:43:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.28 2011/11/27 09:17:35 mgorny Exp $
 
 # @ECLASS: autotools-utils.eclass
 # @MAINTAINER:
@@ -11,7 +11,11 @@
 # autotools-utils.eclass is autotools.eclass(5) and base.eclass(5) wrapper
 # providing all inherited features along with econf arguments as Bash array,
 # out of source build with overridable build dir location, static archives
-# handling, libtool files removal, enable/disable debug handling.
+# handling, libtool files removal.
+#
+# Please note note that autotools-utils does not support mixing of its phase
+# functions with regular econf/emake calls. If necessary, please call
+# autotools-utils_src_compile instead of the latter.
 #
 # @EXAMPLE:
 # Typical ebuild using autotools-utils.eclass:

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-utils.eclass

[Michal Gorny (mgorny)]

mgorny      12/01/05 22:42:53

  Modified:             ChangeLog autotools-utils.eclass
  Log:
  Add AUTOTOOLS_AUTORECONF for bug #392073.

Revision  Changes    Path
1.71                 eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- ChangeLog	3 Jan 2012 12:18:17 -0000	1.70
+++ ChangeLog	5 Jan 2012 22:42:53 -0000	1.71
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.70 2012/01/03 12:18:17 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.71 2012/01/05 22:42:53 mgorny Exp $
+
+  05 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+  Add AUTOTOOLS_AUTORECONF for bug #392073.
 
   03 Jan 2012; Nirbheek Chauhan <nirbheek@gentoo.org>
   gnome-python-common.eclass:



1.32                 eclass/autotools-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.31&r2=1.32

Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- autotools-utils.eclass	22 Dec 2011 18:01:12 -0000	1.31
+++ autotools-utils.eclass	5 Jan 2012 22:42:53 -0000	1.32
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.31 2011/12/22 18:01:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.32 2012/01/05 22:42:53 mgorny Exp $
 
 # @ECLASS: autotools-utils.eclass
 # @MAINTAINER:
@@ -93,10 +93,28 @@
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
+# @ECLASS-VARIABLE: AUTOTOOLS_AUTORECONF
+# @DEFAULT-UNSET
+# @DESCRIPTION:
+# Set to a non-empty value in order to enable running autoreconf
+# in src_prepare() and adding autotools dependencies.
+#
+# The eclass will try to determine the correct autotools to run including a few
+# external tools: gettext, glib-gettext, intltool, gtk-doc, gnome-doc-prepare.
+# If your tool is not supported, please open a bug and we'll add support for it.
+#
+# Note that dependencies are added for autoconf, automake and libtool only.
+# If your package needs one of the external tools listed above, you need to add
+# appropriate packages to DEPEND yourself.
+[[ ${AUTOTOOLS_AUTORECONF} ]] || _autotools_auto_dep=no
+
+AUTOTOOLS_AUTO_DEPEND=${_autotools_auto_dep} \
 inherit autotools eutils libtool
 
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test
 
+unset _autotools_auto_dep
+
 # @ECLASS-VARIABLE: AUTOTOOLS_BUILD_DIR
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -250,20 +268,96 @@
 	fi
 }
 
+# @FUNCTION: autotools-utils_autoreconf
+# @DESCRIPTION:
+# Reconfigure the sources (like gnome-autogen.sh or eautoreconf).
+autotools-utils_autoreconf() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	# Override this func to not require unnecessary eaclocal calls.
+	autotools_check_macro() {
+		local x
+
+		# Add a few additional variants as we don't get expansions.
+		[[ ${1} = AC_CONFIG_HEADERS ]] && set -- "${@}" AC_CONFIG_HEADER
+
+		for x; do
+			grep -h "^${x}" configure.{ac,in} 2>/dev/null
+		done
+	}
+
+	einfo "Autoreconfiguring '${PWD}' ..."
+
+	local auxdir=$(sed -n -e 's/^AC_CONFIG_AUX_DIR(\(.*\))$/\1/p' \
+			configure.{ac,in} 2>/dev/null)
+	if [[ ${auxdir} ]]; then
+		auxdir=${auxdir%%]}
+		mkdir -p ${auxdir##[}
+	fi
+
+	# Support running additional tools like gnome-autogen.sh.
+	# Note: you need to add additional depends to the ebuild.
+
+	# gettext
+	if [[ $(autotools_check_macro AM_GLIB_GNU_GETTEXT) ]]; then
+		echo 'no' | autotools_run_tool glib-gettextize --copy
+	elif [[ $(autotools_check_macro AM_GNU_GETTEXT) ]]; then
+		eautopoint
+	fi
+
+	# intltool
+	if [[ $(autotools_check_macro AC_PROG_INTLTOOL IT_PROG_INTLTOOL) ]]
+	then
+		autotools_run_tool intltoolize --copy --automake
+	fi
+
+	# gtk-doc
+	if [[ $(autotools_check_macro GTK_DOC_CHECK) ]]; then
+		autotools_run_tool gtkdocize --copy
+	fi
+
+	# gnome-doc
+	if [[ $(autotools_check_macro GNOME_DOC_INIT) ]]; then
+		autotools_run_tool gnome-doc-prepare --copy
+	fi
+
+	# We need to perform the check twice to know whether to run eaclocal.
+	# (_elibtoolize does that itself)
+	if [[ $(autotools_check_macro AC_PROG_LIBTOOL AM_PROG_LIBTOOL LT_INIT) ]]
+	then
+		_elibtoolize --copy --force --install
+	else
+		eaclocal
+	fi
+
+	eautoconf
+	eautoheader
+	eautomake
+
+	local x
+	for x in $(autotools_get_subdirs); do
+		if [[ -d ${x} ]] ; then
+			pushd "${x}" >/dev/null
+			autotools-utils_eautoreconf
+			popd >/dev/null
+		fi
+	done
+}
+
 # @FUNCTION: autotools-utils_src_prepare
 # @DESCRIPTION:
 # The src_prepare function.
 #
 # Supporting PATCHES array and user patches. See base.eclass(5) for reference.
-#
-# This function calls elibtoolize implicitly. If you need to call eautoreconf
-# afterwards, please use AT_NOELIBTOOLIZE=yes to avoid it being called twice.
 autotools-utils_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	local want_autoreconf=${AUTOTOOLS_AUTORECONF}
+
 	[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
 	epatch_user
 
+	[[ ${want_autoreconf} ]] && autotools-utils_autoreconf
 	elibtoolize --patch-only
 }
 

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-utils.eclass

[Justin Lecher (jlec)]

jlec        12/01/09 10:16:25

  Modified:             ChangeLog autotools-utils.eclass
  Log:
  Correct typo in autotools-utils.eclass: @DEFAULT-UNSET -> @DEFAULT_UNSET

Revision  Changes    Path
1.75                 eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- ChangeLog	7 Jan 2012 17:53:47 -0000	1.74
+++ ChangeLog	9 Jan 2012 10:16:25 -0000	1.75
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.74 2012/01/07 17:53:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.75 2012/01/09 10:16:25 jlec Exp $
+
+  09 Jan 2012; Justin Lecher <jlec@gentoo.org> autotools-utils.eclass:
+  Correct typo in autotools-utils.eclass: @DEFAULT-UNSET -> @DEFAULT_UNSET
 
   07 Jan 2012; Michał Górny <mgorny@gentoo.org> systemd.eclass:
   Install systemd units to /usr/lib.



1.33                 eclass/autotools-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.32&r2=1.33

Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- autotools-utils.eclass	5 Jan 2012 22:42:53 -0000	1.32
+++ autotools-utils.eclass	9 Jan 2012 10:16:25 -0000	1.33
@@ -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/autotools-utils.eclass,v 1.32 2012/01/05 22:42:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.33 2012/01/09 10:16:25 jlec Exp $
 
 # @ECLASS: autotools-utils.eclass
 # @MAINTAINER:
@@ -94,7 +94,7 @@
 esac
 
 # @ECLASS-VARIABLE: AUTOTOOLS_AUTORECONF
-# @DEFAULT-UNSET
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Set to a non-empty value in order to enable running autoreconf
 # in src_prepare() and adding autotools dependencies.

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-utils.eclass

[Michal Gorny (mgorny)]

mgorny      12/01/14 14:59:18

  Modified:             ChangeLog autotools-utils.eclass
  Log:
  Autoreconfigure packages when user patches need it.

Revision  Changes    Path
1.82                 eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- ChangeLog	14 Jan 2012 14:58:29 -0000	1.81
+++ ChangeLog	14 Jan 2012 14:59:18 -0000	1.82
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.81 2012/01/14 14:58:29 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.82 2012/01/14 14:59:18 mgorny Exp $
+
+  14 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+  Autoreconfigure packages when user patches need it.
 
   14 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
   Disallow eautomake from calling eautoreconf unnecessarily.



1.37                 eclass/autotools-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.36&r2=1.37

Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- autotools-utils.eclass	14 Jan 2012 14:58:29 -0000	1.36
+++ autotools-utils.eclass	14 Jan 2012 14:59:18 -0000	1.37
@@ -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/autotools-utils.eclass,v 1.36 2012/01/14 14:58:29 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.37 2012/01/14 14:59:18 mgorny Exp $
 
 # @ECLASS: autotools-utils.eclass
 # @MAINTAINER:
@@ -99,6 +99,11 @@
 # Set to a non-empty value in order to enable running autoreconf
 # in src_prepare() and adding autotools dependencies.
 #
+# This is usually necessary when using live sources or applying patches
+# modifying configure.ac or Makefile.am files. Note that in the latter case
+# setting this variable is obligatory even though the eclass will work without
+# it (to add the necessary dependencies).
+#
 # The eclass will try to determine the correct autotools to run including a few
 # external tools: gettext, glib-gettext, intltool, gtk-doc, gnome-doc-prepare.
 # If your tool is not supported, please open a bug and we'll add support for it.
@@ -354,8 +359,19 @@
 
 	local want_autoreconf=${AUTOTOOLS_AUTORECONF}
 
+	touch "${T}"/.autotools-utils.timestamp || die
 	[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
 	epatch_user
+	if [[ ! ${want_autoreconf} ]]; then
+		if [[ $(find . -newer "${T}"/.autotools-utils.timestamp \
+				-a '(' -name 'Makefile.am' \
+				-o -name 'configure.ac' \
+				-o -name 'configure.in' ')' \
+				-print -quit) ]]; then
+			einfo 'Will autoreconfigure due to patches applied.'
+			want_autoreconf=yep
+		fi
+	fi
 
 	[[ ${want_autoreconf} ]] && autotools-utils_autoreconf
 	elibtoolize --patch-only

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-utils.eclass

[Michal Gorny (mgorny)]

mgorny      12/01/14 15:18:06

  Modified:             ChangeLog autotools-utils.eclass
  Log:
  Pass --force to eautopoint and few other pre-autoreconf funcs.

Revision  Changes    Path
1.83                 eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- ChangeLog	14 Jan 2012 14:59:18 -0000	1.82
+++ ChangeLog	14 Jan 2012 15:18:05 -0000	1.83
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.82 2012/01/14 14:59:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.83 2012/01/14 15:18:05 mgorny Exp $
+
+  14 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+  Pass --force to eautopoint and few other pre-autoreconf funcs.
 
   14 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
   Autoreconfigure packages when user patches need it.



1.38                 eclass/autotools-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.37&r2=1.38

Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- autotools-utils.eclass	14 Jan 2012 14:59:18 -0000	1.37
+++ autotools-utils.eclass	14 Jan 2012 15:18:05 -0000	1.38
@@ -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/autotools-utils.eclass,v 1.37 2012/01/14 14:59:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.38 2012/01/14 15:18:05 mgorny Exp $
 
 # @ECLASS: autotools-utils.eclass
 # @MAINTAINER:
@@ -307,13 +307,13 @@
 	if [[ $(autotools_check_macro AM_GLIB_GNU_GETTEXT) ]]; then
 		echo 'no' | autotools_run_tool glib-gettextize --copy
 	elif [[ $(autotools_check_macro AM_GNU_GETTEXT) ]]; then
-		eautopoint
+		eautopoint --force
 	fi
 
 	# intltool
 	if [[ $(autotools_check_macro AC_PROG_INTLTOOL IT_PROG_INTLTOOL) ]]
 	then
-		autotools_run_tool intltoolize --copy --automake
+		autotools_run_tool intltoolize --copy --automake --force
 	fi
 
 	# gtk-doc
@@ -323,7 +323,7 @@
 
 	# gnome-doc
 	if [[ $(autotools_check_macro GNOME_DOC_INIT) ]]; then
-		autotools_run_tool gnome-doc-prepare --copy
+		autotools_run_tool gnome-doc-prepare --copy --force
 	fi
 
 	# We need to perform the check twice to know whether to run eaclocal.

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-utils.eclass

[Michal Gorny (mgorny)]

mgorny      12/01/14 18:14:39

  Modified:             ChangeLog autotools-utils.eclass
  Log:
  Replace the docdir-directory error with a warning.

Revision  Changes    Path
1.84                 eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- ChangeLog	14 Jan 2012 15:18:05 -0000	1.83
+++ ChangeLog	14 Jan 2012 18:14:39 -0000	1.84
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.83 2012/01/14 15:18:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.84 2012/01/14 18:14:39 mgorny Exp $
+
+  14 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+  Replace the docdir-directory error with a warning.
 
   14 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
   Pass --force to eautopoint and few other pre-autoreconf funcs.



1.39                 eclass/autotools-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.38&r2=1.39

Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- autotools-utils.eclass	14 Jan 2012 15:18:05 -0000	1.38
+++ autotools-utils.eclass	14 Jan 2012 18:14:39 -0000	1.39
@@ -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/autotools-utils.eclass,v 1.38 2012/01/14 15:18:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.39 2012/01/14 18:14:39 mgorny Exp $
 
 # @ECLASS: autotools-utils.eclass
 # @MAINTAINER:
@@ -447,18 +447,16 @@
 
 	# Move docs installed by autotools (in EAPI < 4).
 	if [[ ${EAPI} == [23] && -d ${D}${EPREFIX}/usr/share/doc/${PF} ]]; then
-		mkdir "${T}"/temp-docdir
-		mv "${D}${EPREFIX}"/usr/share/doc/${PF}/* "${T}"/temp-docdir/ \
-			|| die "moving docs to tempdir failed"
+		if [[ $(find "${D}${EPREFIX}"/usr/share/doc/${PF}/* -type d) ]]; then
+			eqawarn "autotools-utils: directories in docdir require at least EAPI 4"
+		else
+			mkdir "${T}"/temp-docdir
+			mv "${D}${EPREFIX}"/usr/share/doc/${PF}/* "${T}"/temp-docdir/ \
+				|| die "moving docs to tempdir failed"
 
-		local f
-		for f in "${T}"/temp-docdir/*; do
-			[[ -d ${f} ]] \
-				&& die "directories in docdir require at least EAPI 4"
-		done
-
-		dodoc "${T}"/temp-docdir/* || die "docdir dodoc failed"
-		rm -r "${T}"/temp-docdir || die
+			dodoc "${T}"/temp-docdir/* || die "docdir dodoc failed"
+			rm -r "${T}"/temp-docdir || die
+		fi
 	fi
 
 	# XXX: support installing them from builddir as well?

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-utils.eclass

[Justin Lecher (jlec)]

jlec        12/01/30 13:11:27

  Modified:             ChangeLog autotools-utils.eclass
  Log:
  Call glib-gettextize with --force in autotools-utils.eclass

Revision  Changes    Path
1.104                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- ChangeLog	22 Jan 2012 00:55:15 -0000	1.103
+++ ChangeLog	30 Jan 2012 13:11:27 -0000	1.104
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.103 2012/01/22 00:55:15 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.104 2012/01/30 13:11:27 jlec Exp $
+
+  30 Jan 2012; Justin Lecher <jlec@gentoo.org> autotools-utils.eclass:
+  Call glib-gettextize with --force in autotools-utils.eclass
 
   21 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> cmake-utils.eclass:
   Dont force CMAKE_BUILD_WITH_INSTALL_RPATH in APPLE prefix on request from



1.46                 eclass/autotools-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.46&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.46&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.45&r2=1.46

Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- autotools-utils.eclass	21 Jan 2012 20:44:28 -0000	1.45
+++ autotools-utils.eclass	30 Jan 2012 13:11:27 -0000	1.46
@@ -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/autotools-utils.eclass,v 1.45 2012/01/21 20:44:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.46 2012/01/30 13:11:27 jlec Exp $
 
 # @ECLASS: autotools-utils.eclass
 # @MAINTAINER:
@@ -306,7 +306,7 @@
 
 	# gettext
 	if [[ $(autotools_check_macro AM_GLIB_GNU_GETTEXT) ]]; then
-		echo 'no' | autotools_run_tool glib-gettextize --copy
+		echo 'no' | autotools_run_tool glib-gettextize --copy --force
 	elif [[ $(autotools_check_macro AM_GNU_GETTEXT) ]]; then
 		eautopoint --force
 	fi

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-utils.eclass

[Michal Gorny (mgorny)]

mgorny      12/02/02 22:01:13

  Modified:             ChangeLog autotools-utils.eclass
  Log:
  Use checksums to determine whether files need autoreconf. Fixes bug #399641.

Revision  Changes    Path
1.112                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- ChangeLog	2 Feb 2012 03:17:56 -0000	1.111
+++ ChangeLog	2 Feb 2012 22:01:13 -0000	1.112
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.111 2012/02/02 03:17:56 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.112 2012/02/02 22:01:13 mgorny Exp $
+
+  02 Feb 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+  Use checksums to determine whether files need autoreconf. Fixes bug #399641.
 
   02 Feb 2012; Mike Gilbert <floppym@gentoo.org> subversion.eclass:
   Introduce ESVN_UMASK variable to override default umask. Patch by Arfrever.



1.47                 eclass/autotools-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.47&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.47&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.46&r2=1.47

Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- autotools-utils.eclass	30 Jan 2012 13:11:27 -0000	1.46
+++ autotools-utils.eclass	2 Feb 2012 22:01:13 -0000	1.47
@@ -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/autotools-utils.eclass,v 1.46 2012/01/30 13:11:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.47 2012/02/02 22:01:13 mgorny Exp $
 
 # @ECLASS: autotools-utils.eclass
 # @MAINTAINER:
@@ -362,14 +362,17 @@
 
 	[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
 
-	touch "${T}"/.autotools-utils.timestamp || die
+	at_checksum() {
+		find '(' -name 'Makefile.am' \
+			-o -name 'configure.ac' \
+			-o -name 'configure.in' ')' \
+			-exec cksum {} + | sort -k2
+	}
+
+	[[ ! ${want_autoreconf} ]] && local checksum=$(at_checksum)
 	epatch_user
 	if [[ ! ${want_autoreconf} ]]; then
-		if [[ $(find . -newer "${T}"/.autotools-utils.timestamp \
-				-a '(' -name 'Makefile.am' \
-				-o -name 'configure.ac' \
-				-o -name 'configure.in' ')' \
-				-print -quit) ]]; then
+		if [[ ${checksum} != $(at_checksum) ]]; then
 			einfo 'Will autoreconfigure due to user patches applied.'
 			want_autoreconf=yep
 		fi

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-utils.eclass

[Michal Gorny (mgorny)]

mgorny      12/02/04 09:26:16

  Modified:             ChangeLog autotools-utils.eclass
  Log:
  Fix typo in recursive autoreconf.

Revision  Changes    Path
1.113                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- ChangeLog	2 Feb 2012 22:01:13 -0000	1.112
+++ ChangeLog	4 Feb 2012 09:26:16 -0000	1.113
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.112 2012/02/02 22:01:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.113 2012/02/04 09:26:16 mgorny Exp $
+
+  04 Feb 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+  Fix typo in recursive autoreconf.
 
   02 Feb 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
   Use checksums to determine whether files need autoreconf. Fixes bug #399641.



1.48                 eclass/autotools-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.47&r2=1.48

Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- autotools-utils.eclass	2 Feb 2012 22:01:13 -0000	1.47
+++ autotools-utils.eclass	4 Feb 2012 09:26:16 -0000	1.48
@@ -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/autotools-utils.eclass,v 1.47 2012/02/02 22:01:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.48 2012/02/04 09:26:16 mgorny Exp $
 
 # @ECLASS: autotools-utils.eclass
 # @MAINTAINER:
@@ -344,7 +344,7 @@
 	for x in $(autotools_get_subdirs); do
 		if [[ -d ${x} ]] ; then
 			pushd "${x}" >/dev/null
-			autotools-utils_eautoreconf
+			autotools-utils_autoreconf
 			popd >/dev/null
 		fi
 	done

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-utils.eclass

[Michal Gorny (mgorny)]

mgorny      12/05/28 07:47:00

  Modified:             ChangeLog autotools-utils.eclass
  Log:
  Remove invalid use check, these should be fixed by now.

Revision  Changes    Path
1.273                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -r1.272 -r1.273
--- ChangeLog	28 May 2012 07:45:19 -0000	1.272
+++ ChangeLog	28 May 2012 07:46:59 -0000	1.273
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.272 2012/05/28 07:45:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.273 2012/05/28 07:46:59 mgorny Exp $
+
+  28 May 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+  Remove invalid use check, these should be fixed by now.
 
   28 May 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
   Fail whenever unable to change directory, wrt #391927.



1.53                 eclass/autotools-utils.eclass

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

Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- autotools-utils.eclass	28 May 2012 07:45:19 -0000	1.52
+++ autotools-utils.eclass	28 May 2012 07:46:59 -0000	1.53
@@ -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/autotools-utils.eclass,v 1.52 2012/05/28 07:45:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.53 2012/05/28 07:46:59 mgorny Exp $
 
 # @ECLASS: autotools-utils.eclass
 # @MAINTAINER:
@@ -259,15 +259,6 @@
 			rm -f "${f}" || die
 		fi
 	done
-
-	# check for invalid eclass use
-	# this is the most commonly used function, so do it here
-	_check_build_dir
-	if [[ ! -d "${AUTOTOOLS_BUILD_DIR}" ]]; then
-		eqawarn "autotools-utils used but autotools-utils_src_configure was never called."
-		eqawarn "This is not supported and never was. Please report a bug against"
-		eqawarn "the offending ebuild. This will become a fatal error in a near future."
-	fi
 }
 
 # @FUNCTION: autotools-utils_autoreconf

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-utils.eclass

[Michal Gorny (mgorny)]

mgorny      12/06/06 15:43:45

  Modified:             ChangeLog autotools-utils.eclass
  Log:
  Start using prune_libtool_files() from eutils, deprecate remove_libtool_files().

Revision  Changes    Path
1.292                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- ChangeLog	6 Jun 2012 15:37:50 -0000	1.291
+++ ChangeLog	6 Jun 2012 15:43:45 -0000	1.292
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.291 2012/06/06 15:37:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.292 2012/06/06 15:43:45 mgorny Exp $
+
+  06 Jun 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+  Start using prune_libtool_files() from eutils, deprecate
+  remove_libtool_files().
 
   06 Jun 2012; Michał Górny <mgorny@gentoo.org> eutils.eclass:
   Introduce prune_libtool_files() for .la file removal. Based on one used



1.54                 eclass/autotools-utils.eclass

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

Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- autotools-utils.eclass	28 May 2012 07:46:59 -0000	1.53
+++ autotools-utils.eclass	6 Jun 2012 15:43:45 -0000	1.54
@@ -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/autotools-utils.eclass,v 1.53 2012/05/28 07:46:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.54 2012/06/06 15:43:45 mgorny Exp $
 
 # @ECLASS: autotools-utils.eclass
 # @MAINTAINER:
@@ -204,6 +204,10 @@
 remove_libtool_files() {
 	debug-print-function ${FUNCNAME} "$@"
 	local removing_all
+
+	eqawarn "The remove_libtool_files() function was deprecated."
+	eqawarn "Please use prune_libtool_files() from eutils eclass instead."
+
 	[[ ${#} -le 1 ]] || die "Invalid number of args to ${FUNCNAME}()"
 	if [[ ${#} -eq 1 ]]; then
 		case "${1}" in
@@ -472,7 +476,7 @@
 	fi
 
 	# Remove libtool files and unnecessary static libs
-	remove_libtool_files
+	prune_libtool_files
 }
 
 # @FUNCTION: autotools-utils_src_test

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-utils.eclass

[Michal Gorny (mgorny)]

mgorny      12/12/14 08:40:18

  Modified:             ChangeLog autotools-utils.eclass
  Log:
  Support directories in DOCS, in EAPI 4+.

Revision  Changes    Path
1.559                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.558
retrieving revision 1.559
diff -u -r1.558 -r1.559
--- ChangeLog	13 Dec 2012 16:47:25 -0000	1.558
+++ ChangeLog	14 Dec 2012 08:40:18 -0000	1.559
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.558 2012/12/13 16:47:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.559 2012/12/14 08:40:18 mgorny Exp $
+
+  14 Dec 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+  Support directories in DOCS, in EAPI 4+.
 
   13 Dec 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Add (temporary) fix for sandbox failures when compiling Python modules. Bug



1.61                 eclass/autotools-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.61&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.61&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.60&r2=1.61

Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- autotools-utils.eclass	3 Dec 2012 12:05:51 -0000	1.60
+++ autotools-utils.eclass	14 Dec 2012 08:40:18 -0000	1.61
@@ -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/autotools-utils.eclass,v 1.60 2012/12/03 12:05:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.61 2012/12/14 08:40:18 mgorny Exp $
 
 # @ECLASS: autotools-utils.eclass
 # @MAINTAINER:
@@ -157,6 +157,8 @@
 # @DESCRIPTION:
 # Array containing documents passed to dodoc command.
 #
+# In EAPIs 4+, can list directories as well.
+#
 # Example:
 # @CODE
 # DOCS=( NEWS README )
@@ -485,7 +487,12 @@
 
 	# XXX: support installing them from builddir as well?
 	if [[ ${DOCS} ]]; then
-		dodoc "${DOCS[@]}" || die "dodoc failed"
+		if [[ ${EAPI} == [23] ]]; then
+			dodoc "${DOCS[@]}" || die
+		else
+			# dies by itself
+			dodoc -r "${DOCS[@]}"
+		fi
 	else
 		local f
 		# same list as in PMS

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-utils.eclass

[Michal Gorny (mgorny)]

mgorny      13/04/01 09:16:07

  Modified:             ChangeLog autotools-utils.eclass
  Log:
  Support setting mode of prune_libtool_files through AUTOTOOLS_PRUNE_LIBTOOL_FILES.

Revision  Changes    Path
1.761                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.760
retrieving revision 1.761
diff -u -r1.760 -r1.761
--- ChangeLog	30 Mar 2013 20:14:41 -0000	1.760
+++ ChangeLog	1 Apr 2013 09:16:07 -0000	1.761
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.760 2013/03/30 20:14:41 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.761 2013/04/01 09:16:07 mgorny Exp $
+
+  01 Apr 2013; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+  Support setting mode of prune_libtool_files through
+  AUTOTOOLS_PRUNE_LIBTOOL_FILES.
 
   30 Mar 2013; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
   fixed missing VDRVERSION up from >=vdr-1.7.34



1.64                 eclass/autotools-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.64&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.64&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.63&r2=1.64

Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- autotools-utils.eclass	3 Mar 2013 00:22:56 -0000	1.63
+++ autotools-utils.eclass	1 Apr 2013 09:16:07 -0000	1.64
@@ -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/autotools-utils.eclass,v 1.63 2013/03/03 00:22:56 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.64 2013/04/01 09:16:07 mgorny Exp $
 
 # @ECLASS: autotools-utils.eclass
 # @MAINTAINER:
@@ -184,6 +184,23 @@
 # PATCHES=( "${FILESDIR}"/${P}-mypatch.patch )
 # @CODE
 
+# @ECLASS-VARIABLE: AUTOTOOLS_PRUNE_LIBTOOL_FILES
+# @DEFAULT-UNSET
+# @DESCRIPTION:
+# Sets the mode of pruning libtool files. The values correspond to
+# prune_libtool_files parameters, with leading dashes stripped.
+#
+# Defaults to pruning the libtool files when static libraries are not
+# installed or can be linked properly without them. Libtool files
+# for modules (plugins) will be kept in case plugin loader needs them.
+#
+# If set to 'modules', the .la files for modules will be removed
+# as well. This is often the preferred option.
+#
+# If set to 'all', all .la files will be removed unconditionally. This
+# option is discouraged and shall be used only if 'modules' does not
+# remove the files.
+
 # Determine using IN or OUT source build
 _check_build_dir() {
 	: ${ECONF_SOURCE:=${S}}
@@ -511,7 +528,8 @@
 	fi
 
 	# Remove libtool files and unnecessary static libs
-	prune_libtool_files
+	local prune_ltfiles=${AUTOTOOLS_PRUNE_LIBTOOL_FILES}
+	prune_libtool_files ${prune_ltfiles:+--${prune_ltfiles}}
 }
 
 # @FUNCTION: autotools-utils_src_test

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-utils.eclass

[Michal Gorny (mgorny)]

mgorny      13/04/05 14:54:48

  Modified:             ChangeLog autotools-utils.eclass
  Log:
  Fix eclassdoc.

Revision  Changes    Path
1.767                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.766
retrieving revision 1.767
diff -u -r1.766 -r1.767
--- ChangeLog	5 Apr 2013 13:25:25 -0000	1.766
+++ ChangeLog	5 Apr 2013 14:54:48 -0000	1.767
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.766 2013/04/05 13:25:25 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.767 2013/04/05 14:54:48 mgorny Exp $
+
+  05 Apr 2013; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+  Fix eclassdoc.
 
   05 Apr 2013; Ben de Groot <yngwin@gentoo.org> font.eclass:
   RDEPEND=$DEPEND to fix bug #446012



1.65                 eclass/autotools-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.65&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.65&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.64&r2=1.65

Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- autotools-utils.eclass	1 Apr 2013 09:16:07 -0000	1.64
+++ autotools-utils.eclass	5 Apr 2013 14:54:48 -0000	1.65
@@ -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/autotools-utils.eclass,v 1.64 2013/04/01 09:16:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.65 2013/04/05 14:54:48 mgorny Exp $
 
 # @ECLASS: autotools-utils.eclass
 # @MAINTAINER:
@@ -185,7 +185,7 @@
 # @CODE
 
 # @ECLASS-VARIABLE: AUTOTOOLS_PRUNE_LIBTOOL_FILES
-# @DEFAULT-UNSET
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Sets the mode of pruning libtool files. The values correspond to
 # prune_libtool_files parameters, with leading dashes stripped.

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-utils.eclass

[Michal Gorny (mgorny)]

mgorny      13/05/01 15:48:16

  Modified:             ChangeLog autotools-utils.eclass
  Log:
  Inline src_test and allow passing arguments.

Revision  Changes    Path
1.810                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.809
retrieving revision 1.810
diff -u -r1.809 -r1.810
--- ChangeLog	30 Apr 2013 07:51:24 -0000	1.809
+++ ChangeLog	1 May 2013 15:48:16 -0000	1.810
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.809 2013/04/30 07:51:24 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.810 2013/05/01 15:48:16 mgorny Exp $
+
+  01 May 2013; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+  Inline src_test and allow passing arguments.
 
   30 Apr 2013; Sergey Popov <pinkbyte@gentoo.org> leechcraft.eclass:
   Leechcraft changed license since 0.5.95



1.66                 eclass/autotools-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.66&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.66&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.65&r2=1.66

Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- autotools-utils.eclass	5 Apr 2013 14:54:48 -0000	1.65
+++ autotools-utils.eclass	1 May 2013 15:48:16 -0000	1.66
@@ -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/autotools-utils.eclass,v 1.65 2013/04/05 14:54:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.66 2013/05/01 15:48:16 mgorny Exp $
 
 # @ECLASS: autotools-utils.eclass
 # @MAINTAINER:
@@ -540,7 +540,9 @@
 
 	_check_build_dir
 	pushd "${BUILD_DIR}" > /dev/null || die
-	# Run default src_test as defined in ebuild.sh
-	default_src_test
+
+	# XXX: do we need to support other targets in autotools?
+	emake check "${@}" || die 'emake check failed.'
+
 	popd > /dev/null || die
 }

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-utils.eclass

[Michal Gorny (mgorny)]

mgorny      13/05/03 09:20:56

  Modified:             ChangeLog autotools-utils.eclass
  Log:
  Support disabling .la pruning completely.

Revision  Changes    Path
1.811                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.810
retrieving revision 1.811
diff -u -r1.810 -r1.811
--- ChangeLog	1 May 2013 15:48:16 -0000	1.810
+++ ChangeLog	3 May 2013 09:20:56 -0000	1.811
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.810 2013/05/01 15:48:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.811 2013/05/03 09:20:56 mgorny Exp $
+
+  03 May 2013; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+  Support disabling .la pruning completely.
 
   01 May 2013; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
   Inline src_test and allow passing arguments.



1.67                 eclass/autotools-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.67&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.67&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.66&r2=1.67

Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- autotools-utils.eclass	1 May 2013 15:48:16 -0000	1.66
+++ autotools-utils.eclass	3 May 2013 09:20:56 -0000	1.67
@@ -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/autotools-utils.eclass,v 1.66 2013/05/01 15:48:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.67 2013/05/03 09:20:56 mgorny Exp $
 
 # @ECLASS: autotools-utils.eclass
 # @MAINTAINER:
@@ -200,6 +200,9 @@
 # If set to 'all', all .la files will be removed unconditionally. This
 # option is discouraged and shall be used only if 'modules' does not
 # remove the files.
+#
+# If set to 'none', no .la files will be pruned ever. Use in corner
+# cases only.
 
 # Determine using IN or OUT source build
 _check_build_dir() {
@@ -529,7 +532,9 @@
 
 	# Remove libtool files and unnecessary static libs
 	local prune_ltfiles=${AUTOTOOLS_PRUNE_LIBTOOL_FILES}
-	prune_libtool_files ${prune_ltfiles:+--${prune_ltfiles}}
+	if [[ ${prune_ltfiles} != none ]]; then
+		prune_libtool_files ${prune_ltfiles:+--${prune_ltfiles}}
+	fi
 }
 
 # @FUNCTION: autotools-utils_src_test

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-utils.eclass

[Michal Gorny (mgorny)]

mgorny      13/05/05 20:22:25

  Modified:             ChangeLog autotools-utils.eclass
  Log:
  Support complete EAPI src_test().

Revision  Changes    Path
1.813                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.812
retrieving revision 1.813
diff -u -r1.812 -r1.813
--- ChangeLog	4 May 2013 20:06:42 -0000	1.812
+++ ChangeLog	5 May 2013 20:22:25 -0000	1.813
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.812 2013/05/04 20:06:42 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.813 2013/05/05 20:22:25 mgorny Exp $
+
+  05 May 2013; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+  Support complete EAPI src_test().
 
   04 May 2013; Julian Ospald <hasufell@gentoo.org> multilib-minimal.eclass:
   improve handling of DOCS variable wrt #468092



1.68                 eclass/autotools-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.68&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.68&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.67&r2=1.68

Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- autotools-utils.eclass	3 May 2013 09:20:56 -0000	1.67
+++ autotools-utils.eclass	5 May 2013 20:22:25 -0000	1.68
@@ -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/autotools-utils.eclass,v 1.67 2013/05/03 09:20:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.68 2013/05/05 20:22:25 mgorny Exp $
 
 # @ECLASS: autotools-utils.eclass
 # @MAINTAINER:
@@ -546,8 +546,11 @@
 	_check_build_dir
 	pushd "${BUILD_DIR}" > /dev/null || die
 
-	# XXX: do we need to support other targets in autotools?
-	emake check "${@}" || die 'emake check failed.'
+	if make -n check &>/dev/null; then
+		emake check "${@}" || die 'emake check failed.'
+	elif make -n test &>/dev/null; then
+		emake test "${@}" || die 'emake test failed.'
+	fi
 
 	popd > /dev/null || die
 }

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-utils.eclass

[Mike Gilbert (floppym)]

floppym     13/06/07 20:59:13

  Modified:             ChangeLog autotools-utils.eclass
  Log:
  Convert econfargs from an ECLASS-VARIABLE to a function-specifc VARIABLE for autotools-utils_src_configure.

Revision  Changes    Path
1.851                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.850
retrieving revision 1.851
diff -u -r1.850 -r1.851
--- ChangeLog	7 Jun 2013 01:11:31 -0000	1.850
+++ ChangeLog	7 Jun 2013 20:59:13 -0000	1.851
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.850 2013/06/07 01:11:31 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.851 2013/06/07 20:59:13 floppym Exp $
+
+  07 Jun 2013; Mike Gilbert <floppym@gentoo.org> autotools-utils.eclass:
+  Convert econfargs from an ECLASS-VARIABLE to a function-specifc VARIABLE for
+  autotools-utils_src_configure.
 
   07 Jun 2013; Mike Gilbert <floppym@gentoo.org> python-utils-r1.eclass:
   Improve docs for PYTHON and EPYTHON.



1.69                 eclass/autotools-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.69&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.69&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.68&r2=1.69

Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- autotools-utils.eclass	5 May 2013 20:22:25 -0000	1.68
+++ autotools-utils.eclass	7 Jun 2013 20:59:13 -0000	1.69
@@ -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/autotools-utils.eclass,v 1.68 2013/05/05 20:22:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.69 2013/06/07 20:59:13 floppym Exp $
 
 # @ECLASS: autotools-utils.eclass
 # @MAINTAINER:
@@ -136,22 +136,6 @@
 # @DESCRIPTION:
 # Specify location of autotools' configure script. By default it uses ${S}.
 
-# @ECLASS-VARIABLE: myeconfargs
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Optional econf arguments as Bash array. Should be defined before calling src_configure.
-# @CODE
-# src_configure() {
-# 	local myeconfargs=(
-# 		--disable-readline
-# 		--with-confdir="/etc/nasty foo confdir/"
-# 		$(use_enable debug cnddebug)
-# 		$(use_enable threads multithreading)
-# 	)
-# 	autotools-utils_src_configure
-# }
-# @CODE
-
 # @ECLASS-VARIABLE: DOCS
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -427,6 +411,22 @@
 #
 # IUSE="static-libs" passes --enable-shared and either --disable-static/--enable-static
 # to econf respectively.
+
+# @VARIABLE: myeconfargs
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Optional econf arguments as Bash array. Should be defined before calling src_configure.
+# @CODE
+# src_configure() {
+# 	local myeconfargs=(
+# 		--disable-readline
+# 		--with-confdir="/etc/nasty foo confdir/"
+# 		$(use_enable debug cnddebug)
+# 		$(use_enable threads multithreading)
+# 	)
+# 	autotools-utils_src_configure
+# }
+# @CODE
 autotools-utils_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-utils.eclass

[Michal Gorny (mgorny)]

mgorny      13/06/29 08:17:06

  Modified:             ChangeLog autotools-utils.eclass
  Log:
  Respect arguments when checking for test targets. This becomes helpful if one of the arguments is -C.

Revision  Changes    Path
1.867                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.866
retrieving revision 1.867
diff -u -r1.866 -r1.867
--- ChangeLog	28 Jun 2013 12:42:48 -0000	1.866
+++ ChangeLog	29 Jun 2013 08:17:06 -0000	1.867
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.866 2013/06/28 12:42:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.867 2013/06/29 08:17:06 mgorny Exp $
+
+  29 Jun 2013; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+  Respect arguments when checking for test targets. This becomes helpful if one
+  of the arguments is -C.
 
   28 Jun 2013; Michał Górny <mgorny@gentoo.org> autotools-multilib.eclass,
   multilib-minimal.eclass:



1.70                 eclass/autotools-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.70&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.70&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.69&r2=1.70

Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- autotools-utils.eclass	7 Jun 2013 20:59:13 -0000	1.69
+++ autotools-utils.eclass	29 Jun 2013 08:17:06 -0000	1.70
@@ -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/autotools-utils.eclass,v 1.69 2013/06/07 20:59:13 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.70 2013/06/29 08:17:06 mgorny Exp $
 
 # @ECLASS: autotools-utils.eclass
 # @MAINTAINER:
@@ -546,9 +546,9 @@
 	_check_build_dir
 	pushd "${BUILD_DIR}" > /dev/null || die
 
-	if make -n check &>/dev/null; then
+	if make -n check "${@}" &>/dev/null; then
 		emake check "${@}" || die 'emake check failed.'
-	elif make -n test &>/dev/null; then
+	elif make -n test "${@}" &>/dev/null; then
 		emake test "${@}" || die 'emake test failed.'
 	fi
 

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-utils.eclass

[Michal Gorny (mgorny)]

mgorny      13/10/08 10:34:45

  Modified:             ChangeLog autotools-utils.eclass
  Log:
  Remove deprecated autotools-utils_autoreconf.

Revision  Changes    Path
1.1013               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1012
retrieving revision 1.1013
diff -u -r1.1012 -r1.1013
--- ChangeLog	7 Oct 2013 12:21:14 -0000	1.1012
+++ ChangeLog	8 Oct 2013 10:34:45 -0000	1.1013
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1012 2013/10/07 12:21:14 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1013 2013/10/08 10:34:45 mgorny Exp $
+
+  08 Oct 2013; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+  Remove deprecated autotools-utils_autoreconf.
 
   07 Oct 2013; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
   small modification on output from function dev_check



1.71                 eclass/autotools-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.71&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.71&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.70&r2=1.71

Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- autotools-utils.eclass	29 Jun 2013 08:17:06 -0000	1.70
+++ autotools-utils.eclass	8 Oct 2013 10:34:45 -0000	1.71
@@ -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/autotools-utils.eclass,v 1.70 2013/06/29 08:17:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.71 2013/10/08 10:34:45 mgorny Exp $
 
 # @ECLASS: autotools-utils.eclass
 # @MAINTAINER:
@@ -292,84 +292,6 @@
 	done
 }
 
-# @FUNCTION: autotools-utils_autoreconf
-# @DESCRIPTION:
-# Reconfigure the sources (like gnome-autogen.sh or eautoreconf).
-autotools-utils_autoreconf() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	eqawarn "The autotools-utils_autoreconf() function was deprecated."
-	eqawarn "Please call autotools-utils_src_prepare()"
-	eqawarn "with AUTOTOOLS_AUTORECONF set instead."
-
-	# Override this func to not require unnecessary eaclocal calls.
-	autotools_check_macro() {
-		local x
-
-		# Add a few additional variants as we don't get expansions.
-		[[ ${1} = AC_CONFIG_HEADERS ]] && set -- "${@}" \
-			AC_CONFIG_HEADER AM_CONFIG_HEADER
-
-		for x; do
-			grep -h "^${x}" configure.{ac,in} 2>/dev/null
-		done
-	}
-
-	einfo "Autoreconfiguring '${PWD}' ..."
-
-	local auxdir=$(sed -n -e 's/^AC_CONFIG_AUX_DIR(\(.*\))$/\1/p' \
-			configure.{ac,in} 2>/dev/null)
-	if [[ ${auxdir} ]]; then
-		auxdir=${auxdir%%]}
-		mkdir -p ${auxdir##[}
-	fi
-
-	# Support running additional tools like gnome-autogen.sh.
-	# Note: you need to add additional depends to the ebuild.
-
-	# gettext
-	if [[ $(autotools_check_macro AM_GLIB_GNU_GETTEXT) ]]; then
-		echo 'no' | autotools_run_tool glib-gettextize --copy --force
-	elif [[ $(autotools_check_macro AM_GNU_GETTEXT) ]]; then
-		eautopoint --force
-	fi
-
-	# intltool
-	if [[ $(autotools_check_macro AC_PROG_INTLTOOL IT_PROG_INTLTOOL) ]]
-	then
-		autotools_run_tool intltoolize --copy --automake --force
-	fi
-
-	# gtk-doc
-	if [[ $(autotools_check_macro GTK_DOC_CHECK) ]]; then
-		autotools_run_tool gtkdocize --copy
-	fi
-
-	# gnome-doc
-	if [[ $(autotools_check_macro GNOME_DOC_INIT) ]]; then
-		autotools_run_tool gnome-doc-prepare --copy --force
-	fi
-
-	if [[ $(autotools_check_macro AC_PROG_LIBTOOL AM_PROG_LIBTOOL LT_INIT) ]]
-	then
-		_elibtoolize --copy --force --install
-	fi
-
-	eaclocal
-	eautoconf
-	eautoheader
-	FROM_EAUTORECONF=sure eautomake
-
-	local x
-	for x in $(autotools_check_macro_val AC_CONFIG_SUBDIRS); do
-		if [[ -d ${x} ]] ; then
-			pushd "${x}" >/dev/null || die
-			autotools-utils_autoreconf
-			popd >/dev/null || die
-		fi
-	done
-}
-
 # @FUNCTION: autotools-utils_src_prepare
 # @DESCRIPTION:
 # The src_prepare function.

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-utils.eclass

[Michal Gorny (mgorny)]

mgorny      13/11/24 10:53:13

  Modified:             ChangeLog autotools-utils.eclass
  Log:
  Respect BUILD_DIR in in-source builds when set earlier.

Revision  Changes    Path
1.1066               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1065
retrieving revision 1.1066
diff -u -r1.1065 -r1.1066
--- ChangeLog	24 Nov 2013 10:25:52 -0000	1.1065
+++ ChangeLog	24 Nov 2013 10:53:13 -0000	1.1066
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1065 2013/11/24 10:25:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1066 2013/11/24 10:53:13 mgorny Exp $
+
+  24 Nov 2013; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+  Respect BUILD_DIR in in-source builds when set earlier.
 
   24 Nov 2013; Michał Górny <mgorny@gentoo.org> autotools-multilib.eclass:
   Reuse multilib-minimal to reduce code duplication and allow easier function



1.72                 eclass/autotools-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.72&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.72&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.71&r2=1.72

Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- autotools-utils.eclass	8 Oct 2013 10:34:45 -0000	1.71
+++ autotools-utils.eclass	24 Nov 2013 10:53:13 -0000	1.72
@@ -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/autotools-utils.eclass,v 1.71 2013/10/08 10:34:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.72 2013/11/24 10:53:13 mgorny Exp $
 
 # @ECLASS: autotools-utils.eclass
 # @MAINTAINER:
@@ -191,22 +191,22 @@
 # Determine using IN or OUT source build
 _check_build_dir() {
 	: ${ECONF_SOURCE:=${S}}
-	if [[ -n ${AUTOTOOLS_IN_SOURCE_BUILD} ]]; then
-		BUILD_DIR="${ECONF_SOURCE}"
-	else
-		# Respect both the old variable and the new one, depending
-		# on which one was set by the ebuild.
-		if [[ ! ${BUILD_DIR} && ${AUTOTOOLS_BUILD_DIR} ]]; then
-			eqawarn "The AUTOTOOLS_BUILD_DIR variable has been renamed to BUILD_DIR."
-			eqawarn "Please migrate the ebuild to use the new one."
-
-			# In the next call, both variables will be set already
-			# and we'd have to know which one takes precedence.
-			_RESPECT_AUTOTOOLS_BUILD_DIR=1
-		fi
+	# Respect both the old variable and the new one, depending
+	# on which one was set by the ebuild.
+	if [[ ! ${BUILD_DIR} && ${AUTOTOOLS_BUILD_DIR} ]]; then
+		eqawarn "The AUTOTOOLS_BUILD_DIR variable has been renamed to BUILD_DIR."
+		eqawarn "Please migrate the ebuild to use the new one."
+
+		# In the next call, both variables will be set already
+		# and we'd have to know which one takes precedence.
+		_RESPECT_AUTOTOOLS_BUILD_DIR=1
+	fi
 
-		if [[ ${_RESPECT_AUTOTOOLS_BUILD_DIR} ]]; then
-			BUILD_DIR=${AUTOTOOLS_BUILD_DIR:-${WORKDIR}/${P}_build}
+	if [[ ${_RESPECT_AUTOTOOLS_BUILD_DIR} ]]; then
+		BUILD_DIR=${AUTOTOOLS_BUILD_DIR:-${WORKDIR}/${P}_build}
+	else
+		if [[ -n ${AUTOTOOLS_IN_SOURCE_BUILD} ]]; then
+			: ${BUILD_DIR:=${ECONF_SOURCE}}
 		else
 			: ${BUILD_DIR:=${WORKDIR}/${P}_build}
 		fi

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-utils.eclass

[Mike Gilbert (floppym)]

floppym     14/03/11 23:55:44

  Modified:             ChangeLog autotools-utils.eclass
  Log:
  Indicate that AUTOTOOLS_AUTORECONF should be set before calling inherit.

Revision  Changes    Path
1.1170               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1169
retrieving revision 1.1170
diff -u -r1.1169 -r1.1170
--- ChangeLog	9 Mar 2014 18:54:44 -0000	1.1169
+++ ChangeLog	11 Mar 2014 23:55:44 -0000	1.1170
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1169 2014/03/09 18:54:44 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1170 2014/03/11 23:55:44 floppym Exp $
+
+  11 Mar 2014; Mike Gilbert <floppym@gentoo.org> autotools-utils.eclass:
+  Indicate that AUTOTOOLS_AUTORECONF should be set before calling inherit.
 
   09 Mar 2014; Ulrich Müller <ulm@gentoo.org> texlive-module.eclass:
   Do not inherit base.eclass, bug 497054.



1.73                 eclass/autotools-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.73&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.73&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.72&r2=1.73

Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- autotools-utils.eclass	24 Nov 2013 10:53:13 -0000	1.72
+++ autotools-utils.eclass	11 Mar 2014 23:55:44 -0000	1.73
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.72 2013/11/24 10:53:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.73 2014/03/11 23:55:44 floppym Exp $
 
 # @ECLASS: autotools-utils.eclass
 # @MAINTAINER:
@@ -96,7 +96,7 @@
 # @ECLASS-VARIABLE: AUTOTOOLS_AUTORECONF
 # @DEFAULT_UNSET
 # @DESCRIPTION:
-# Set to a non-empty value in order to enable running autoreconf
+# Set to a non-empty value before calling inherit to enable running autoreconf
 # in src_prepare() and adding autotools dependencies.
 #
 # This is usually necessary when using live sources or applying patches

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-utils.eclass

[Michal Gorny (mgorny)]

mgorny      15/06/07 12:55:46

  Modified:             ChangeLog autotools-utils.eclass
  Log:
  Remove deprecated remove_libtool_files() function.

Revision  Changes    Path
1.1642               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1641
retrieving revision 1.1642
diff -u -r1.1641 -r1.1642
--- ChangeLog	5 Jun 2015 16:38:21 -0000	1.1641
+++ ChangeLog	7 Jun 2015 12:55:46 -0000	1.1642
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1641 2015/06/05 16:38:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1642 2015/06/07 12:55:46 mgorny Exp $
+
+  07 Jun 2015; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+  Remove deprecated remove_libtool_files() function.
 
   05 Jun 2015; Michał Górny <mgorny@gentoo.org> freebsd.eclass:
   Enable IUSE=profile globally. Use upstream tarball for FreeBSD > 10.0.



1.75                 eclass/autotools-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.75&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.75&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.74&r2=1.75

Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- autotools-utils.eclass	31 Jul 2014 23:24:56 -0000	1.74
+++ autotools-utils.eclass	7 Jun 2015 12:55:46 -0000	1.75
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.74 2014/07/31 23:24:56 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.75 2015/06/07 12:55:46 mgorny Exp $
 
 # @ECLASS: autotools-utils.eclass
 # @MAINTAINER:
@@ -217,81 +217,6 @@
 	echo ">>> Working in BUILD_DIR: \"${BUILD_DIR}\""
 }
 
-# @FUNCTION: remove_libtool_files
-# @USAGE: [all]
-# @DESCRIPTION:
-# Determines unnecessary libtool files (.la) and libtool static archives (.a)
-# and removes them from installation image.
-#
-# To unconditionally remove all libtool files, pass 'all' as argument.
-# Otherwise, libtool archives required for static linking will be preserved.
-#
-# In most cases it's not necessary to manually invoke this function.
-# See autotools-utils_src_install for reference.
-remove_libtool_files() {
-	debug-print-function ${FUNCNAME} "$@"
-	local removing_all
-
-	eqawarn "The remove_libtool_files() function was deprecated."
-	eqawarn "Please use prune_libtool_files() from eutils eclass instead."
-
-	[[ ${#} -le 1 ]] || die "Invalid number of args to ${FUNCNAME}()"
-	if [[ ${#} -eq 1 ]]; then
-		case "${1}" in
-			all)
-				removing_all=1
-				;;
-			*)
-				die "Invalid argument to ${FUNCNAME}(): ${1}"
-		esac
-	fi
-
-	local pc_libs=()
-	if [[ ! ${removing_all} ]]; then
-		local arg
-		for arg in $(find "${D}" -name '*.pc' -exec \
-					sed -n -e 's;^Libs:;;p' {} +); do
-			[[ ${arg} == -l* ]] && pc_libs+=(lib${arg#-l}.la)
-		done
-	fi
-
-	local f
-	find "${D}" -type f -name '*.la' -print0 | while read -r -d '' f; do
-		local shouldnotlink=$(sed -ne '/^shouldnotlink=yes$/p' "${f}")
-		local archivefile=${f/%.la/.a}
-		[[ "${f}" != "${archivefile}" ]] || die 'regex sanity check failed'
-
-		# Remove static libs we're not supposed to link against.
-		if [[ ${shouldnotlink} ]]; then
-			einfo "Removing unnecessary ${archivefile#${D%/}}"
-			rm -f "${archivefile}" || die
-			# The .la file may be used by a module loader, so avoid removing it
-			# unless explicitly requested.
-			[[ ${removing_all} ]] || continue
-		fi
-
-		# Remove .la files when:
-		# - user explicitly wants us to remove all .la files,
-		# - respective static archive doesn't exist,
-		# - they are covered by a .pc file already,
-		# - they don't provide any new information (no libs & no flags).
-		local removing
-		if [[ ${removing_all} ]]; then removing='forced'
-		elif [[ ! -f ${archivefile} ]]; then removing='no static archive'
-		elif has "$(basename "${f}")" "${pc_libs[@]}"; then
-			removing='covered by .pc'
-		elif [[ ! $(sed -n -e \
-			"s/^\(dependency_libs\|inherited_linker_flags\)='\(.*\)'$/\2/p" \
-			"${f}") ]]; then removing='no libs & flags'
-		fi
-
-		if [[ ${removing} ]]; then
-			einfo "Removing unnecessary ${f#${D%/}} (${removing})"
-			rm -f "${f}" || die
-		fi
-	done
-}
-
 # @FUNCTION: autotools-utils_src_prepare
 # @DESCRIPTION:
 # The src_prepare function.