sci-physics/clhep: Add fix for automake-1.12, #423559; move to autotools-utils

(Portage version: 2.2.0_alpha113/cvs/Linux x86_64)

4 files changed, 212 insertions, 12 deletions

diff --git a/sci-physics/clhep/ChangeLog b/sci-physics/clhep/ChangeLog
index b9be36cf8337..ca357f12c5b7 100644
--- a/sci-physics/clhep/ChangeLog
+++ b/sci-physics/clhep/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-physics/clhep
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/ChangeLog,v 1.39 2012/06/06 04:37:11 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/ChangeLog,v 1.40 2012/06/26 06:09:11 jlec Exp $
+
+  26 Jun 2012; Justin Lecher <jlec@gentoo.org> clhep-2.1.2.2.ebuild,
+  +files/clhep-2.1.2.2-automake-1.12.patch, metadata.xml:
+  Add fix for automake-1.12, #423559; move to autotools-utils
 
   06 Jun 2012; Benda Xu <heroxbd@gentoo.org> clhep-2.1.2.2.ebuild:
   keyword ~x86-linux and ~amd64-linux
diff --git a/sci-physics/clhep/clhep-2.1.2.2.ebuild b/sci-physics/clhep/clhep-2.1.2.2.ebuild
index 682850a64eee..d40ea97aefbf 100644
--- a/sci-physics/clhep/clhep-2.1.2.2.ebuild
+++ b/sci-physics/clhep/clhep-2.1.2.2.ebuild
@@ -1,9 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/clhep-2.1.2.2.ebuild,v 1.2 2012/06/06 04:37:11 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/clhep-2.1.2.2.ebuild,v 1.3 2012/06/26 06:09:11 jlec Exp $
 
 EAPI=4
-inherit autotools eutils
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils
 
 DESCRIPTION="High Energy Physics C++ library"
 HOMEPAGE="http://www.cern.ch/clhep"
@@ -18,6 +21,8 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PV}/CLHEP"
 
+PATCHES=( "${FILESDIR}"/${P}-automake-1.12.patch )
+
 src_prepare() {
 	local d
 	for d in $(find . -name configure.ac); do
@@ -37,11 +42,10 @@ src_prepare() {
 			${d} || die
 		# fixing parallel build
 	done
-	eautoreconf
+	autotools-utils_src_prepare
 }
 
 src_configure() {
-	econf \
-		$(use_enable exceptions) \
-		$(use_enable static-libs static)
+	local myeconfargs=( $(use_enable exceptions) )
+	autotools-utils_src_configure
 }
diff --git a/sci-physics/clhep/files/clhep-2.1.2.2-automake-1.12.patch b/sci-physics/clhep/files/clhep-2.1.2.2-automake-1.12.patch
new file mode 100644
index 000000000000..d1b5ce49a5b5
--- /dev/null
+++ b/sci-physics/clhep/files/clhep-2.1.2.2-automake-1.12.patch
@@ -0,0 +1,192 @@
+ CLHEP/Cast/src/Makefile.am             |    2 +-
+ CLHEP/Evaluator/src/Makefile.am        |    2 +-
+ CLHEP/Exceptions/src/Makefile.am       |    2 +-
+ CLHEP/Fields/src/Makefile.am           |    2 +-
+ CLHEP/GenericFunctions/src/Makefile.am |    2 +-
+ CLHEP/Geometry/src/Makefile.am         |    2 +-
+ CLHEP/Makefile.am                      |    4 ++--
+ CLHEP/Matrix/src/Makefile.am           |    2 +-
+ CLHEP/Random/src/Makefile.am           |    2 +-
+ CLHEP/RandomObjects/src/Makefile.am    |    2 +-
+ CLHEP/RefCount/src/Makefile.am         |    2 +-
+ CLHEP/Vector/src/Makefile.am           |    2 +-
+ CLHEP/configure.ac                     |    1 +
+ 13 files changed, 14 insertions(+), 13 deletions(-)
+
+diff --git a/CLHEP/Cast/src/Makefile.am b/CLHEP/Cast/src/Makefile.am
+index ec0fa65..0294bcd 100755
+--- a/CLHEP/Cast/src/Makefile.am
++++ b/CLHEP/Cast/src/Makefile.am
+@@ -50,7 +50,7 @@ endif
+ 
+ install-exec-local: $(lib_shared)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_shared)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    echo " $(INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$p'"; \
+diff --git a/CLHEP/Evaluator/src/Makefile.am b/CLHEP/Evaluator/src/Makefile.am
+index f2faaab..c220d64 100755
+--- a/CLHEP/Evaluator/src/Makefile.am
++++ b/CLHEP/Evaluator/src/Makefile.am
+@@ -52,7 +52,7 @@ endif
+ 
+ install-exec-local: $(lib_shared)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_shared)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    echo " $(INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$p'"; \
+diff --git a/CLHEP/Exceptions/src/Makefile.am b/CLHEP/Exceptions/src/Makefile.am
+index 293e1fe..35da349 100755
+--- a/CLHEP/Exceptions/src/Makefile.am
++++ b/CLHEP/Exceptions/src/Makefile.am
+@@ -58,7 +58,7 @@ endif
+ 
+ install-exec-local: $(lib_shared)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_shared)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    echo " $(INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$p'"; \
+diff --git a/CLHEP/Fields/src/Makefile.am b/CLHEP/Fields/src/Makefile.am
+index 9631546..519e46f 100755
+--- a/CLHEP/Fields/src/Makefile.am
++++ b/CLHEP/Fields/src/Makefile.am
+@@ -52,7 +52,7 @@ endif
+ 
+ install-exec-local: $(lib_shared)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_shared)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    echo " $(INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$p'"; \
+diff --git a/CLHEP/GenericFunctions/src/Makefile.am b/CLHEP/GenericFunctions/src/Makefile.am
+index 4e771a1..fdc82e0 100755
+--- a/CLHEP/GenericFunctions/src/Makefile.am
++++ b/CLHEP/GenericFunctions/src/Makefile.am
+@@ -134,7 +134,7 @@ endif
+ 
+ install-exec-local: $(lib_shared)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_shared)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    echo " $(INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$p'"; \
+diff --git a/CLHEP/Geometry/src/Makefile.am b/CLHEP/Geometry/src/Makefile.am
+index d37d424..495df4a 100755
+--- a/CLHEP/Geometry/src/Makefile.am
++++ b/CLHEP/Geometry/src/Makefile.am
+@@ -56,7 +56,7 @@ endif
+ 
+ install-exec-local: $(lib_shared)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_shared)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    echo " $(INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$p'"; \
+diff --git a/CLHEP/Makefile.am b/CLHEP/Makefile.am
+index adb111b..482d7e4 100755
+--- a/CLHEP/Makefile.am
++++ b/CLHEP/Makefile.am
+@@ -84,7 +84,7 @@ install-exec-local: install-CLHEPLIB install-versionheader
+ 
+ install-CLHEPLIB: $(CLHEPLIB) $(lib_shared)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(CLHEPLIB)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    echo " $(INSTALL_DATA) '$$p' '$(DESTDIR)$(libdir)/$$p'"; \
+@@ -119,7 +119,7 @@ install-CLHEPLIB: $(CLHEPLIB) $(lib_shared)
+ 
+ install-versionheader: versionheader
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+ 	if test -f ClhepVersion.h; then \
+ 	  echo " $(INSTALL_DATA) 'ClhepVersion.h' '$(DESTDIR)$(includedir)/ClhepVersion.h'"; \
+ 	  $(INSTALL_DATA) "ClhepVersion.h" "$(DESTDIR)$(includedir)/ClhepVersion.h"; \
+diff --git a/CLHEP/Matrix/src/Makefile.am b/CLHEP/Matrix/src/Makefile.am
+index 12f5732..645ab96 100755
+--- a/CLHEP/Matrix/src/Makefile.am
++++ b/CLHEP/Matrix/src/Makefile.am
+@@ -61,7 +61,7 @@ endif
+ 
+ install-exec-local: $(lib_shared)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_shared)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    echo " $(INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$p'"; \
+diff --git a/CLHEP/Random/src/Makefile.am b/CLHEP/Random/src/Makefile.am
+index 8bcb0a3..971d688 100755
+--- a/CLHEP/Random/src/Makefile.am
++++ b/CLHEP/Random/src/Makefile.am
+@@ -88,7 +88,7 @@ endif
+ 
+ install-exec-local: $(lib_shared)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_shared)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    echo " $(INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$p'"; \
+diff --git a/CLHEP/RandomObjects/src/Makefile.am b/CLHEP/RandomObjects/src/Makefile.am
+index 2a0ec6e..221e346 100755
+--- a/CLHEP/RandomObjects/src/Makefile.am
++++ b/CLHEP/RandomObjects/src/Makefile.am
+@@ -54,7 +54,7 @@ endif
+ 
+ install-exec-local: $(lib_shared)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_shared)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    echo " $(INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$p'"; \
+diff --git a/CLHEP/RefCount/src/Makefile.am b/CLHEP/RefCount/src/Makefile.am
+index e3e2f85..5850d84 100755
+--- a/CLHEP/RefCount/src/Makefile.am
++++ b/CLHEP/RefCount/src/Makefile.am
+@@ -51,7 +51,7 @@ endif
+ 
+ install-exec-local: $(lib_shared)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_shared)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    echo " $(INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$p'"; \
+diff --git a/CLHEP/Vector/src/Makefile.am b/CLHEP/Vector/src/Makefile.am
+index 4fa1d26..376a85e 100755
+--- a/CLHEP/Vector/src/Makefile.am
++++ b/CLHEP/Vector/src/Makefile.am
+@@ -85,7 +85,7 @@ endif
+ 
+ install-exec-local: $(lib_shared)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_shared)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    echo " $(INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$p'"; \
+diff --git a/CLHEP/configure.ac b/CLHEP/configure.ac
+index 96dcbe8..edb0879 100755
+--- a/CLHEP/configure.ac
++++ b/CLHEP/configure.ac
+@@ -16,6 +16,7 @@ AM_INIT_AUTOMAKE(1.9 foreign)
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_RANLIB
++AC_PROG_MKDIR_P
+ 
+ # ----------------------------------------------------------------------
+ # subpackages
diff --git a/sci-physics/clhep/metadata.xml b/sci-physics/clhep/metadata.xml
index 76aa562cf87c..ced7d05b28e4 100644
--- a/sci-physics/clhep/metadata.xml
+++ b/sci-physics/clhep/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-physics</herd>
-<longdescription lang="en">
+	<herd>sci-physics</herd>
+	<longdescription lang="en">
   A Class Library for High Energy Physics is intended to be a set of
   HEP-specific foundation and utility classes such as random
   generators, physics vectors, geometry and linear algebra.
 </longdescription>
-<use>
-  <flag name='exceptions'>Enable zoom exceptions for user intervention</flag>
-</use>
+	<use>
+		<flag name="exceptions">Enable zoom exceptions for user intervention</flag>
+	</use>
 </pkgmetadata>