sci-libs/adolc: Version BUmp; fix installation with /bin/sh -> dash; #527492

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

6 files changed, 271 insertions, 28 deletions

diff --git a/sci-libs/adolc/ChangeLog b/sci-libs/adolc/ChangeLog
index e3e17e22dfe9..a01f2cac0b75 100644
--- a/sci-libs/adolc/ChangeLog
+++ b/sci-libs/adolc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/adolc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/adolc/ChangeLog,v 1.9 2014/06/17 19:57:50 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/adolc/ChangeLog,v 1.10 2014/10/31 08:22:10 jlec Exp $
+
+*adolc-2.5.2 (31 Oct 2014)
+
+  31 Oct 2014; Justin Lecher <jlec@gentoo.org> +adolc-2.5.2.ebuild,
+  files/adolc-2.5.0-no-colpack.patch, +files/adolc-2.5.2-dash.patch,
+  metadata.xml:
+  Version BUmp; fix installation with /bin/sh -> dash; #527492
 
   17 Jun 2014; Jauhien Piatlicki <jauhien@gentoo.org> adolc-2.5.0.ebuild:
   fix MPI support, thanks to  Erik Zeek, see bug #511456
diff --git a/sci-libs/adolc/Manifest b/sci-libs/adolc/Manifest
index 4f95b3bedf70..32530ab7bb4f 100644
--- a/sci-libs/adolc/Manifest
+++ b/sci-libs/adolc/Manifest
@@ -1,29 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX adolc-2.4.0-no-colpack.patch 580 SHA256 75b7b059336059383c8e0e08da8176f7f8084576397341858a93a88b2c6817cd SHA512 974e538343c377ce286c63b5206a5c3c33d9b5995addac07860ca52f6e1d3ca42d1fe8c1384b6d5d0ac39c062d8dc1f984262172b347f273c0e4c7d43fd120a2 WHIRLPOOL aedcd02d2f972d8cf7f7db53a3851f49f23f5d3896d2da9fa632971f29f55a954d99874095503f26889a8517882cd632758d39e972e43b4d103bbdd0c4388e13
-AUX adolc-2.5.0-no-colpack.patch 474 SHA256 cbf88250d37da06fdaf69acd678498a830f05b3b2ed8b044d4aa42d20ad2e664 SHA512 d62679c9bfe64731c3d8c5eeab5eb14e54a3748899eccfa605a42ff37d106c89bafc2e39c2d629e70a0624625ad6ef8c2c42d3639fb5ab1468a49fb8fe281c08 WHIRLPOOL 49a007cd4142a645b55174255949b2a86e447e221dedb4e019231bc1926a2f6e9dd5c558dae5168954502d9ef981ad16afd6a08e6de10fff3f56f7d3f81e57a6
+AUX adolc-2.5.0-no-colpack.patch 1424 SHA256 4d50bdcacb5dcff052011b4db2bb2fd4ea86b9e5a24f6137f30d50192596bd30 SHA512 826023e0066620a1885a462c31cb5be80d880f917df26c007564e327b8be8513621e56b601b6f9bfcec0fc617a15eea5016436aa08bebb0346254089a5d850ec WHIRLPOOL c1354e223d7d502ca0d89efd34a61460876d547110b083e4729aede1bbd5c0a20834a338ff5d1792372d40489d62cb8988daefe8d69c60933a99b59e0ff4a435
 AUX adolc-2.5.0-pkgconfig-no-ldflags.patch 365 SHA256 3ae1db6921963d9f18c1254b08532d9e29c23690757c80255fbda5408b03ad16 SHA512 cb51ae5e5144f0c83c59efd5aab7fbad84aa57e0de81ec2d4a00ce022db49c779337522710e52d19880a8138ef80c57a65404e1aff937c58cb7ddbf60a8a417c WHIRLPOOL 9363852ea63697dd37587d8d973a69108c9d8c472f92504832d2fe1fc19efbbfa8afb1d38fae5aa6a14b28146484474fd3f93323c50df7899c739378a6ffd283
+AUX adolc-2.5.2-dash.patch 5020 SHA256 1869d2b2b9c5050469924dc328a7e64bee219834d87649cb856f59f8c6d1f2f5 SHA512 3240473df5fc4aa03edb5d0a5c61cf086b76065400bb735cb1b994a2c28cd69e7a4e7be87fe1cb044a329a08c787777bf3c5276acaf4ce2a193f2f44bd05335e WHIRLPOOL 9bd03e3d64139ee320ccf0502449139153403bcc9232eee88b54ff56d79f95a021af261148e7116c9e8f13f56d533fd1f331751561084878e7a2843829f428a3
 DIST ADOL-C-2.4.1.tgz 2210414 SHA256 05bf946cc1764e2b3fa7e708ccc4303f289699d9f36b9d525f6a9a6129b4d578 SHA512 5e5135ca587d159510bf77338fdff3d324f4d32c4ec6f8cf64ddc92253b427b8ee26a30bc1d83fe18121bbfdc7454c3536f58849c0c335e1b240e39d46acdccc WHIRLPOOL cd66a895dc3cb1f6f4f705a9fbce5a93dcb6856b6288704c3d3420be7f90e57296acd3fb2ea897ba5362e706429ec56b070bf0baa7094edcbf46c92d535bc492
 DIST ADOL-C-2.5.0.tgz 2313753 SHA256 908753153e0eca31752222150977eabd8ab97c4ab8fcd19f92667aba69a048a6 SHA512 e680565ed911bc15165c27281428c1daf35e95292dc3abc64aab6633068ec0d7e7ae626e692e0574b2c696a0c4aec2c79b2b02c3760acd2bd1b579a4c42d9585 WHIRLPOOL c0301c9a8f1357aa06be8e6a53bee9825a5d56cd31a2734862bcfd1f7c944935a4cd2c8c2ed49028493cb7c998008c9853b2d4bd7f6e0519ed353bbd3b7d0a8c
+DIST ADOL-C-2.5.2.tgz 2320010 SHA256 2fa514d9799989d6379738c2bcf75070d9834e4d227eb32a5b278840893b2af9 SHA512 3d2ef6e42504de9e9c1b5777afda8ece83fa61ab7c22fd471dce6bcb74af0a789d37cd2a6c9c9ead13f6c78e07ba985e7d14e79bcdf35fa56f8e73a2411905b5 WHIRLPOOL 55043cabe44b9913a7fba73ddaf0d64caa234d7002582d78dd9cfc05510ce3fbcb6dd3d1c40a2d6425f5ee1b7cc986d525d065671191096fbb303e122089c954
 EBUILD adolc-2.4.1.ebuild 974 SHA256 cc34d9177f06887f95b7c2054367622da58964f6b7b610b7db7cb33044071f9b SHA512 979cf54f82acbec15762b64d0ef6f8f9460180132cea81e648607e796b9ff4fb0f2830f014501b711adf77aaaa6001705b5cdcf9d236f17436cd017bef7e4fec WHIRLPOOL ec7ce74094da96d84dff04c4b3d6521bb152829d93bae895195cc09072b084677c2354c0908ca9d90957ed68e9bd32678a1c9dd744b712acd4de5f3ca61f75c8
 EBUILD adolc-2.5.0.ebuild 1093 SHA256 bc34ebf4a2c58d5a2b9c3fd7f172c4624728441fbc90dcc564ba1f211fa8d44a SHA512 f15fb854c46244ba1f008a35916217dfc71820ce1e9abaf5494f4d4d379396a398fa6be6ae168519555c724b01164d6589f10cdfda5ac5ddef217e74fa27aff7 WHIRLPOOL 5ec70b44b25c0d8c5bbbacd1d39690f5886e03b72780ea66200309ff6d8b7ed966cf25ee8d666955df4dffa94e35898ea0ffb9822b35d7e35024cc56a0cb53b2
-MISC ChangeLog 1877 SHA256 1fec1b5867b96f0d246e0d805b7d5d07177d58aeada4f647dc809ffdb17a5cf8 SHA512 0115f38988f1e9f23f04a9ebf0c36d5394d5c21d73358259f20b7d6e32a233378125a653609d9107dc619a76b46a5c12a63d5e087e116708751bf3b9d8a20eda WHIRLPOOL e09cfb4cabaa581a0da6f2eaa36a8d9d4c0a16976d2c0fc275c977b2927debaf9cef02633c0efd4119d9246c72de4578f97a447bb33b767a262ce8e986d6e9d4
-MISC metadata.xml 540 SHA256 35b4d95794e43b4780d2b6b4f480848ef300c9e6135de83594cc88c8dab721c4 SHA512 26fd988050492ea10ab2d8612a82c149db74f8a3518a1175afe81c500d4aca9d0bec31016e5daf8e93a63a1e4d7b4e4d1f186a980dec707bed6c317dcd7a495e WHIRLPOOL ed2174ca449f51b9622ca614ab8a649fd0f34c463af9e447e7f71ca84d6f648b24e01c9eff77df1110fa3be0fd925bad4f626c0c0623a60fe8cf1e6e39499fac
+EBUILD adolc-2.5.2.ebuild 1123 SHA256 6c8f24c71b3e4ca0d4258912f365716d1bb1a35ad0f503d5ac16daa2d619f978 SHA512 283cdc2fce36b8970e4df7cf9b8a0058b76fc3bbe05b0445b0de6203f826d8d5da5aac20b0e974c6d3f4bb0d73406873d7ef5e7529c9b73b4d2c721153b3a406 WHIRLPOOL 6f00cbb945090be2c39c9e31063f3b2f80adca03fac171a7d57739e133b5aa05f8355606d805acfa90ed41b73addace98968d098704d4b27b0e0a73305587d90
+MISC ChangeLog 2120 SHA256 b4649b76d41ab5b8a7e19f89ebf2459695170c6a3e652e96148146151c770855 SHA512 fbc95e204b4948b682f6b886c11e3480e3e155e7b3a353b777c3b5c30089efa81701291532270a60b4e70afe0f2871aec9c5f9b7f5963582571d7824955f967d WHIRLPOOL 3fb1c6fa07f9c76fe3ac8f2e494594a868af2060261fe3a89c611772d09148f2215bfe214080478d3f887268d895f46d69b4228a8a0cc2dedf912995a6e8a57a
+MISC metadata.xml 550 SHA256 27cb908f7fc036db750cfe3e801f0c9d641094b77d1926f0dd10155c5ca3b675 SHA512 d047845d134037be92bcb9b50c5f7d63818e539fe8ebb4fef4d46cc7748da8d33fc37613afe652a19abbe303a0c08fb9899ee9d0ec5197b705e9ac6a2712f22e WHIRLPOOL 5ac1b08afb4ea9eb96f0a33e10d2b8815f1b8161a1d97609cf6aad66a2f3826c0dead5ade03971e80ba3a99b47ddbf93f7e68f237d39a61ad80a0a77fab12db6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJToJ3IAAoJELvuk32y76HUrVYQAL1ROWXterzKF4fYJ4myaAtX
-Vr0V8ZNosUgB8VL/vF+BRJmbVrqjoTWbVrSSByluihX+4dEHXEZRpltfYpnv3xoL
-/LakO3ZdhfS+H7e2AMb7yIeQYGAb6OBJ0m9KVAbVz/g87KcHa6YY/kfBmYAJ8a1b
-9pZJNLAIrEX/iWwILOTyEb0DPf2k4p89WFvcrvDl7RZkkHVFqOzd/Fq+i+mpuk7k
-K3iXRgRhBdpaXw3cHBo4TIi1bbzJJaHGkDOZXSS/BpKyTfNsJZFuGYEL5LcL5FOD
-dSHqqzwqzhY0IF/htPi4AQ9AfdxzFl0Yzqx+veJsO4JUoaWW2OXUNEFFVPEODKLH
-r/SPL6dusQpS8TEtC1qYSgy6L4mYSnAalhA0oMpPU5Jp4wt9aXqlD2LbbniDQGft
-/X1APLliOtJmxwQTwAHIjHZKaTNDPP7ZxkVp8Kw/lD6N2L8UIHu2CICOMxSq4m2C
-vznLMQNOVIxX0G4M1AvRkhinWlZRv+48epWYD29CoAhukTkAeu+qB6At7bxoLUK5
-8Xdd2r4DxwLsBYnLIjAX1Sie86duzUHw96g+VIvzJoFBHZGP0uvBGAjWV7AYBXfb
-C2FYDXN4RLRZJvEKp2uwcJaD+vvI7KGcGEF3pIrxXere3wFgZM5ZaavD+D54Zi56
-NijTveJ+s7bxtY6DNt/3
-=BSuM
+iQJ8BAEBCgBmBQJUU0azXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirFIIP/jvmoL35pJaQZUwSfovF+Pax
+1F+RCOeGxngFAPqWMioHmBePiHgTSFAVxXilVvkkE4Vt/weWZpWuoSoIQ2rfEQ24
+cp/8H8lKxRoTdWFTMZWs9nENZWFTxtaNjkY+6/VPprOLc39lXcCmbAnm6SrnGBh9
+nEnL3x1aT0rxOx1WemUmodIhzY+FtxHpdxMpxihiKFPk7P1i+OMNn4B9Blg55+wz
+MAjv+tF/eQJKp7doFZJEt2wl2RlXAv74fxvxRm5ExGvlxVVlhjqySpfLb97p9deK
+IMHzlb8f4gpfeDZTdt8QTRNgaqfILxTjIro357/FdnjnVtpj2TtKfGX0Gj5tUSNa
+nc31eECYH9eYeecxkV3bfjrtHAmgAaITGH6OVl5iEuzF2ePnWaiu4TYWhwU5LEGl
+z6HPJtFuRX4iAPOgGu2a9KgULLCkk3n9B49MQ8B79ZJBMsohwbcK5XgD8Fno+g44
++NKrykpK4fNEnq4hir4ggKSdeCBvj42yxc9SaQm/ugpZqFeTMhLock6Chzc/aHYM
+m8hHo4vYnLt0r8TJ4NVTKpxPRL0/b5QgvOqrvbDerYVwuGHie3uBAFY5LzqUOtv0
+WXxFkNk3azYvv1lpvhYQhIblpnLzjJsJRrbmAqNMgYPd1bKl3g7reMWDC+QDvJAR
+BIVikfm5SmlqIxwdCw5U
+=5Ng1
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/adolc/adolc-2.5.2.ebuild b/sci-libs/adolc/adolc-2.5.2.ebuild
new file mode 100644
index 000000000000..85dde2a4b7cc
--- /dev/null
+++ b/sci-libs/adolc/adolc-2.5.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/adolc/adolc-2.5.2.ebuild,v 1.1 2014/10/31 08:22:10 jlec Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+#AUTOTOOLS_IN_SOURCE_BUILD=yes
+
+inherit autotools-utils toolchain-funcs
+
+MYPN=ADOL-C
+
+DESCRIPTION="Automatic differentiation system for C/C++"
+HOMEPAGE="https://projects.coin-or.org/ADOL-C/"
+SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
+
+LICENSE="|| ( EPL-1.0 GPL-2 )"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="mpi sparse static-libs"
+
+RDEPEND="
+	mpi? ( sys-cluster/ampi:0= )
+	sparse? ( sci-libs/colpack:0= )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MYPN}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.0-no-colpack.patch
+	"${FILESDIR}"/${PN}-2.5.0-pkgconfig-no-ldflags.patch
+	"${FILESDIR}"/${P}-dash.patch
+)
+
+src_configure() {
+	 local myeconfargs=(
+		 $(use_enable mpi ampi)
+		 $(use_enable sparse)
+		 $(use_with sparse colpack "${EPREFIX}"/usr)
+	 )
+	 autotools-utils_src_configure
+}
+
+src_test() {
+	autotools-utils_src_test test
+}
diff --git a/sci-libs/adolc/files/adolc-2.5.0-no-colpack.patch b/sci-libs/adolc/files/adolc-2.5.0-no-colpack.patch
index 9e94d1a9673b..779890c8cf2b 100644
--- a/sci-libs/adolc/files/adolc-2.5.0-no-colpack.patch
+++ b/sci-libs/adolc/files/adolc-2.5.0-no-colpack.patch
@@ -1,15 +1,51 @@
---- autoconf/colpack.m4.orig	2014-05-21 09:01:30.749673830 -0700
-+++ autoconf/colpack.m4	2014-05-21 09:01:30.749673830 -0700
-@@ -21,7 +21,7 @@
+ autoconf/colpack.m4 | 23 +++++++++++++----------
+ 1 file changed, 13 insertions(+), 10 deletions(-)
+
+diff --git a/autoconf/colpack.m4 b/autoconf/colpack.m4
+index 9792786..bd4ba5e 100644
+--- a/autoconf/colpack.m4
++++ b/autoconf/colpack.m4
+@@ -8,20 +8,20 @@ AC_ARG_WITH(colpack,
+ AS_HELP_STRING([--with-colpack=DIR],[path to the colpack library and headers [default=system libraries]])],
+ [
+ colpack=$withval
+-COLPACK_CFLAGS="-I$colpack/include"
+-if test x${_lib} != xlib ; then
+-   D[[0]]="$colpack/${_lib}"
+-   D[[1]]="$colpack/lib"
+-else
+-   D[[0]]="$colpack/${_lib}"
+-fi
+ ],
+ [
+ COLPACK_CFLAGS=""
  COLPACK_LIBS="-lColPack"
  D[[0]]=""
  ])
 -
 +if test x$colpack != xno; then
++COLPACK_CFLAGS="-I$colpack/include"
++if test x${_lib} != xlib ; then
++   D[[0]]="$colpack/${_lib}"
++   D[[1]]="$colpack/lib"
++else
++   D[[0]]="$colpack/${_lib}"
++fi
  AC_LANG_PUSH([C++])
  save_CXXFLAGS="$CXXFLAGS"
  save_CPPFLAGS="$CPPFLAGS"
-@@ -56,6 +56,9 @@
+@@ -33,8 +33,8 @@ have_colpackheaders=no
+ CPPFLAGS="$save_CPPFLAGS"
+ CXXFLAGS="$save_CXXFLAGS"
+ ])
+-for ((i=0; i < ${#D[@]} ; i++)); do
+-COLPACK_LIBDIR="${D[[$i]]}"
++for i in ${D[@]}; do
++COLPACK_LIBDIR="${i}"
+ if test -n "$COLPACK_LIBDIR" ; then
+ COLPACK_LIBS="-L$COLPACK_LIBDIR -lColPack -Wl,-rpath,$COLPACK_LIBDIR"
+ fi
+@@ -56,6 +56,9 @@ else
  fi
  done
  AC_LANG_POP([C++])
diff --git a/sci-libs/adolc/files/adolc-2.5.2-dash.patch b/sci-libs/adolc/files/adolc-2.5.2-dash.patch
new file mode 100644
index 000000000000..3aa5a3035a14
--- /dev/null
+++ b/sci-libs/adolc/files/adolc-2.5.2-dash.patch
@@ -0,0 +1,148 @@
+ configure.ac | 45 +++++++++++++++++----------------------------
+ 1 file changed, 17 insertions(+), 28 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 926832c..1310025 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,12 +29,12 @@ AM_SILENT_RULES([yes])
+ 
+ adolclib=adolc
+ 
+-if test "x$CFLAGS" == x ; then
++if test "x$CFLAGS" = x ; then
+     ac_shell_cflags="not_set"
+ else
+     ac_shell_cflags="$CFLAGS"
+ fi
+-if test "x$CXXFLAGS" == x ; then
++if test "x$CXXFLAGS" = x ; then
+     ac_shell_cxxflags="not_set"
+ else
+     ac_shell_cxxflags="$CXXFLAGS"
+@@ -225,12 +225,12 @@ AS_HELP_STRING([--enable-harddebug],[enable ADOL-C hard debug mode
+    AC_MSG_RESULT(no)
+    ])
+ 
+-if test x$adolc_harddebug == xyes ; then
++if test x$adolc_harddebug = xyes ; then
+ adolc_debug=yes
+ AC_DEFINE(ADOLC_HARDDEBUG,1,[ADOL-C hard debug mode])
+ fi
+ 
+-if test x$adolc_debug == xyes ; then
++if test x$adolc_debug = xyes ; then
+ AC_DEFINE(ADOLC_DEBUG,1,[ADOL-C debug mode])
+ fi
+ 
+@@ -248,7 +248,7 @@ AS_HELP_STRING([--disable-stdczero],[adouble default constructor does not initia
+   AC_MSG_RESULT(yes)
+   ])
+ 
+-if test x$adolc_stdczero == xyes; then
++if test x$adolc_stdczero = xyes; then
+ AC_DEFINE(ADOLC_ADOUBLE_STDCZERO,1,[ADOL-C adouble zeroing mode])
+ fi
+ 
+@@ -265,7 +265,7 @@ AS_HELP_STRING([--enable-lateinit],[adouble constructors need to be called. With
+   AC_MSG_RESULT(no)
+   ])
+ 
+-if test x$adolc_late_init == xyes; then
++if test x$adolc_late_init = xyes; then
+ AC_DEFINE(ADOLC_ADOUBLE_LATEINIT,1,[ADOL-C adouble late initialization mode])
+ fi
+ 
+@@ -282,7 +282,7 @@ AS_HELP_STRING([--enable-tserrno],[use errno as thread number cache [default=no]
+   AC_MSG_RESULT(no)
+   ])
+ 
+-if test x$adolc_tserrno == xyes ; then
++if test x$adolc_tserrno = xyes ; then
+ AC_DEFINE(ADOLC_THREADSAVE_ERRNO,1,[ADOL-C thread save errno mode])
+ fi
+ 
+@@ -351,8 +351,8 @@ AC_ARG_WITH(cflags,
+             [AS_HELP_STRING([--with-cflags=FLAGS],
+                             [use CFLAGS=FLAGS (default: -O2)])],
+             [ac_adolc_cflags="$withval"
+-             if test x${adolc_debug} == xyes ||
+-                test x${adolc_harddebug} == xyes ; then
++             if test "x${adolc_debug}" = xyes ||
++                test "x${adolc_harddebug}" = xyes ; then
+                 ac_adolc_cflags="$ac_adolc_cflags -g -O0"
+              fi
+              ac_adolc_cflags="$ac_adolc_cflags $ac_adolc_openmpflag"
+@@ -360,8 +360,8 @@ AC_ARG_WITH(cflags,
+              AC_MSG_RESULT($ac_adolc_cflags)],
+             [if test "$ac_shell_cflags" = "not_set"; then
+                 ac_adolc_cflags="-O2"
+-                if test x${adolc_debug} == xyes ||
+-                   test x${adolc_harddebug} == xyes ; then
++                if test "x${adolc_debug}" = xyes ||
++                   test "x${adolc_harddebug}" = xyes ; then
+                    ac_adolc_cflags="-g -O0 -Wall -ansi"
+                 fi
+              else
+@@ -377,8 +377,8 @@ AC_ARG_WITH(cxxflags,
+             [AS_HELP_STRING([--with-cxxflags=FLAGS],
+                             [use CXXFLAGS=FLAGS (default: -O2)])],
+             [ac_adolc_cxxflags="$withval"
+-             if test x${adolc_debug} == xyes ||
+-                test x${adolc_harddebug} == xyes ; then
++             if test x${adolc_debug} = xyes ||
++                test x${adolc_harddebug} = xyes ; then
+                 ac_adolc_cxxflags="$ac_adolc_cxxflags -g -O0"
+              fi
+              ac_adolc_cxxflags="$ac_adolc_cxxflags $ac_adolc_openmpflag"
+@@ -386,8 +386,8 @@ AC_ARG_WITH(cxxflags,
+              AC_MSG_RESULT($ac_adolc_cxxflags)],
+             [if test "$ac_shell_cxxflags" = "not_set"; then
+                 ac_adolc_cxxflags="-O2"
+-                if test x${adolc_debug} == xyes ||
+-                   test x${adolc_harddebug} == xyes ; then
++                if test x${adolc_debug} = xyes ||
++                   test x${adolc_harddebug} = xyes ; then
+                    ac_adolc_cxxflags="-g -O0 -Wall"
+                 fi
+              else
+@@ -420,7 +420,7 @@ AC_ARG_ENABLE(tapedoc_values,
+   ])
+ AC_MSG_RESULT($tapedoc_values)
+ 
+-if test x$tapedoc_values == xyes; then
++if test x$tapedoc_values = xyes; then
+ AC_DEFINE(ADOLC_TAPE_DOC_VALUES,1,[ADOL-C tape_doc routine computes values])
+ fi
+ 
+@@ -583,7 +583,7 @@ while test "x${pdir}" != "x/" ; do
+         break
+     fi
+ done
+-if test "x${pdir}" == "x/" ; then
++if test "x${pdir}" = "x/" ; then
+     writable=false
+ fi
+ if ! ${writable} ; then
+@@ -595,15 +595,6 @@ if ! ${writable} ; then
+     warn=true
+ fi
+ 
+-case ${prefix} in 
+-   ${HOME}|${HOME}/*)
+-if $warn ; then
+-    for (( i=5; i>0; i-- )); do
+-        echo -ne "\rPlease read the above messages carefully, continuing in ${i} seconds"
+-        sleep 1
+-    done
+-    echo -e "\rPlease read the above messages carefully                                 "
+-fi
+ echo \
+ "
+ *****************************************************************************
+@@ -629,5 +620,3 @@ echo \
+ 
+ *****************************************************************************
+ "
+-;;
+-esac
diff --git a/sci-libs/adolc/metadata.xml b/sci-libs/adolc/metadata.xml
index 7c103ede2151..ea1d9dd9ce2e 100644
--- a/sci-libs/adolc/metadata.xml
+++ b/sci-libs/adolc/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
   The ADOLC system automatically calculates exact derivatives of a
   C/C++ function.  It uses C++ overloading to record arithmetic
   operations, which it plays back later in various ways to calculate
   the requested values.
 </longdescription>
-<use>
-  <flag name='sparse'>Add support for sparse matrix algebra with <pkg>sci-libs/colpack</pkg></flag>
-</use>
+  <use>
+    <flag name="sparse">Add support for sparse matrix algebra with <pkg>sci-libs/colpack</pkg></flag>
+  </use>
 </pkgmetadata>