diff options
| -rw-r--r-- | sci-libs/adolc/ChangeLog | 10 | ||||
| -rw-r--r-- | sci-libs/adolc/Manifest | 12 | ||||
| -rw-r--r-- | sci-libs/adolc/adolc-2.3.0-r1.ebuild (renamed from sci-libs/adolc/adolc-2.3.0.ebuild) | 6 | ||||
| -rw-r--r-- | sci-libs/adolc/files/adolc-2.3.0-libdir.patch | 14 | ||||
| -rw-r--r-- | sci-libs/adolc/files/adolc-2.3.0-no-colpack.patch | 24 |
5 files changed, 58 insertions, 8 deletions
diff --git a/sci-libs/adolc/ChangeLog b/sci-libs/adolc/ChangeLog index 0656d07a33ea..dca52be126e1 100644 --- a/sci-libs/adolc/ChangeLog +++ b/sci-libs/adolc/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sci-libs/adolc # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/adolc/ChangeLog,v 1.1 2012/07/09 18:45:48 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/adolc/ChangeLog,v 1.2 2012/07/19 20:18:26 bicatali Exp $ + +*adolc-2.3.0-r1 (19 Jul 2012) + + 19 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> +adolc-2.3.0-r1.ebuild, + +files/adolc-2.3.0-libdir.patch, +files/adolc-2.3.0-no-colpack.patch, + -adolc-2.3.0.ebuild: + Fixed libdir installation directory (affects amd64-linux) and do not link with + colpack when not asked *adolc-2.3.0 (09 Jul 2012) diff --git a/sci-libs/adolc/Manifest b/sci-libs/adolc/Manifest index 80a1cc1b32ee..5b4fa0d3de9f 100644 --- a/sci-libs/adolc/Manifest +++ b/sci-libs/adolc/Manifest @@ -1,14 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 +AUX adolc-2.3.0-libdir.patch 295 SHA256 8f3084f6bec449a9b1939ed415d5b9cc32d77693d408088d34455c9d9aa8088e SHA512 745215d59f7ba86ba48702bf2beb9240afe58f38a988ae419b2b8aad0bc6b8a3ad3c83680028c5411f52f11878a13976d50ab89c6d6f8618cb5381044180f25d WHIRLPOOL a0b25590324dc4101edf4d07ad9f5f671bc53eb3789e04ad92925704ea121be4855a3da92e2b161879bba6290c576ae98ab70fa1bce19b697899b53220d2fc90 +AUX adolc-2.3.0-no-colpack.patch 575 SHA256 0a378bb799558a81381142e1ed0552c8abdf873ee99fdb01c6b5fff625a0cb93 SHA512 cae6a87f2c626f8f702139ef428a23e11b27ac3ba98ad396ef488aefb3215e5918789415b0a90483c8c2cb70494178f96cb614198e9ebbef1f846f523bf6e80d WHIRLPOOL 28f6ded6c96968aad2d94178ceecc49fcf92ffbe01c5456915bd4afd8b16d90e9a37090a7a82e3f45fb08907395fef9056b311fc26696f44441fdd5aa3096872 DIST ADOL-C-2.3.0.tgz 2135572 SHA256 c795d5bde1299c90376fc398f8e48b21bb5af8f893895af1958b533d14b0a878 SHA512 2ce45f9fc16f6e2f8a40011d82b38847e391e469c33522b47e24c3b070c69b7a24c2af71e1998bb3842cf2d9004613175fdd90cb039af08ecd3ed3f14419d60b WHIRLPOOL 30b3dfbffa2ae7b075fbd427e50cc4bfb4552adf009848a0e77571a3fce655f4c67d142042c6c431dfdc696930ee33027dc56b73401a34cbf9f867d3d282bcc7 -EBUILD adolc-2.3.0.ebuild 910 SHA256 de4f93a21894b95cea642908921bf15294c0a5ac8766093c05738d30b09f9168 SHA512 5af7fbbc2fbdc5a1c96f1f253ff6d2b245784c29123fd7c91a751e740886e9c5fd9ca60d967343ec944ddff5bf9e2642940b9b62ff6c07b42b7b94a3df4cce31 WHIRLPOOL bd231f5da511f7a282e65c52d52dcbdaa570ba9d57b4b1f09272089c5462e4f0cd1eefd90d27b5e1dc9b5738ba8197a7bfb4dc8e62e6fae557e57a59c9e55b58 -MISC ChangeLog 398 SHA256 58b60479bf183c88c0d6d112dc2de250fd60b93affca8097840d0eb91c05e239 SHA512 a6ce242f47a27817e9503abffdaa1ab294ecd97bacfb496ca3714b7d203211f2e86b9c4803ced3cc55806ae476646897259f31449ed8c4e54c94338f112bcf87 WHIRLPOOL a455c6aceccd82524c49b7c90cd2edffd7efadecbea02611a56490de7e8b6d8ddbdf62563a57c443fff466245b51390b7cad612ad724052a192b9beb772d783f +EBUILD adolc-2.3.0-r1.ebuild 954 SHA256 386495ff0f17546688c565ae1c1e093b3129e3b6728b0e33bf0d7403d4bf38d5 SHA512 ca7b998593342a487e652e8dafbe41a32b0a8507e31b4fa452778aff46b15e3c80c5fd60f72be1e3479d889c3aba14d6b8f42d08aead7180c270c2b2444ec6fa WHIRLPOOL 5bdbe5c8e25c11bf2215c83d27df52b3abe118484b8fc6111c5c961843da69bcb50566e16d1835f9fddddf4c5bed42ced4dab09fc59bd7f12560b3c9e9b2ceb4 +MISC ChangeLog 710 SHA256 0a0682b6f757acd4b66b89f42206cc0229ef6c8266594da275ae2b3ef079f672 SHA512 651554f7897361b30e1dc1e44b4fe8938a762a5000ec1e3ebb51ed753643bcc7914569f90ec4d1ae4221ddf0a9146606738e94be398f5ae15d79bcbb90ef5a23 WHIRLPOOL e7c0dff4d3b30ae9ead459147247b8cf2cdb14d831e6c6dc572dc59b64925a32bc2d51999731cd88b1c6a3e11989629636e1603c44fb797340cc1b0c6d7e782f MISC metadata.xml 540 SHA256 35b4d95794e43b4780d2b6b4f480848ef300c9e6135de83594cc88c8dab721c4 SHA512 26fd988050492ea10ab2d8612a82c149db74f8a3518a1175afe81c500d4aca9d0bec31016e5daf8e93a63a1e4d7b4e4d1f186a980dec707bed6c317dcd7a495e WHIRLPOOL ed2174ca449f51b9622ca614ab8a649fd0f34c463af9e447e7f71ca84d6f648b24e01c9eff77df1110fa3be0fd925bad4f626c0c0623a60fe8cf1e6e39499fac -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREKAAYFAk/7JvkACgkQ1ycZbhPLE2CGtwCZAVX+wg0rUs+9u9gQc0+ygSwt -HoMAn0rjUwHmvB2MkmY9Zq24EwkALMJm -=IXYv +iEYEAREKAAYFAlAIa5sACgkQ1ycZbhPLE2AtTwCfX/yBiqJPBCmwqSv8UR47ILgK +rKIAn0IypzvIj0Iw+8FDNZ54vtnXDaKN +=rAIO -----END PGP SIGNATURE----- diff --git a/sci-libs/adolc/adolc-2.3.0.ebuild b/sci-libs/adolc/adolc-2.3.0-r1.ebuild index e09520dcffb2..85ecaef470ee 100644 --- a/sci-libs/adolc/adolc-2.3.0.ebuild +++ b/sci-libs/adolc/adolc-2.3.0-r1.ebuild @@ -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/sci-libs/adolc/adolc-2.3.0.ebuild,v 1.1 2012/07/09 18:45:48 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/adolc/adolc-2.3.0-r1.ebuild,v 1.1 2012/07/19 20:18:26 bicatali Exp $ EAPI=4 @@ -24,10 +24,12 @@ DEPEND="${RDEPEND}" S="${WORKDIR}/${MYPN}-${PV}" +PATCHES=( "${FILESDIR}"/${P}-{libdir,no-colpack}.patch ) + src_configure() { local myeconfargs+=( $(use_enable sparse) - $(use sparse && echo "--with-colpack="${EPREFIX}"/usr") + $(use sparse colpack "${EPREFIX}"/usr) ) autotools-utils_src_configure } diff --git a/sci-libs/adolc/files/adolc-2.3.0-libdir.patch b/sci-libs/adolc/files/adolc-2.3.0-libdir.patch new file mode 100644 index 000000000000..94ab377245c4 --- /dev/null +++ b/sci-libs/adolc/files/adolc-2.3.0-libdir.patch @@ -0,0 +1,14 @@ +Do not force libdir even on 64bits + +--- configure.ac.orig 2012-07-19 12:52:25.402650941 -0700 ++++ configure.ac 2012-07-19 12:56:09.805832945 -0700 +@@ -50,9 +50,7 @@ + else + _lib=lib + fi +-libdir='${prefix}/${_lib}' + AC_SUBST(_lib) +-AC_SUBST(libdir) + + # checks for header files + AC_HEADER_STDC diff --git a/sci-libs/adolc/files/adolc-2.3.0-no-colpack.patch b/sci-libs/adolc/files/adolc-2.3.0-no-colpack.patch new file mode 100644 index 000000000000..3708d911ce78 --- /dev/null +++ b/sci-libs/adolc/files/adolc-2.3.0-no-colpack.patch @@ -0,0 +1,24 @@ +do not test colpack when user says no even when it is installed + +--- configure.ac.orig 2012-07-19 13:04:37.426461811 -0700 ++++ configure.ac 2012-07-19 13:06:06.477916144 -0700 +@@ -177,7 +177,7 @@ + COLPACK_LIBDIR="" + COLPACK_LIBS="-lColPack" + ]) +- ++if x$colpack != xno; then + AC_LANG_PUSH([C++]) + save_CPPFLAGS="$CPPFLAGS" + save_LIBS="$LIBS" +@@ -198,7 +198,9 @@ + CPPFLAGS="$save_CPPFLAGS" + LIBS="$save_LIBS" + AC_LANG_POP([C++]) +- ++else ++ have_colpack=no ++fi + AM_CONDITIONAL(HAVE_LIBCOLPACK,[test x$have_colpack = xyes]) + if test x$have_colpack = xyes; then + sparse=yes |