diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2014-02-03 23:44:11 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2014-02-03 23:44:11 +0000 |
| commit | 343cbe434dd62078bbbb756f6a5dec47535a57c7 (patch) | |
| tree | d09128111f8d0688561284f2f03321a6f0efef4d /sci-libs | |
| parent | Version bump. (diff) | |
| download | historical-343cbe434dd62078bbbb756f6a5dec47535a57c7.tar.gz historical-343cbe434dd62078bbbb756f6a5dec47535a57c7.tar.bz2 historical-343cbe434dd62078bbbb756f6a5dec47535a57c7.zip | |
Fixed bug #499168, thanks jer and getryx, add sub-slot
Package-Manager: portage-2.2.8-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/scotch/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-libs/scotch/Manifest | 12 | ||||
| -rw-r--r-- | sci-libs/scotch/scotch-6.0.0.ebuild | 12 |
3 files changed, 19 insertions, 12 deletions
diff --git a/sci-libs/scotch/ChangeLog b/sci-libs/scotch/ChangeLog index eb5038a54e68..89a9a80557c0 100644 --- a/sci-libs/scotch/ChangeLog +++ b/sci-libs/scotch/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-libs/scotch -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/ChangeLog,v 1.15 2013/07/02 02:07:22 jsbronder Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/ChangeLog,v 1.16 2014/02/03 23:44:02 bicatali Exp $ + + 03 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> scotch-6.0.0.ebuild: + Fixed bug #499168, thanks jer and getryx, add sub-slot 02 Jul 2013; Justin Bronder <jsbronder@gentoo.org> scotch-6.0.0.ebuild: Remove fix for #462602. Handled in sys-cluster/openmpi now. diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest index 0a81e838d10d..2185522735c1 100644 --- a/sci-libs/scotch/Manifest +++ b/sci-libs/scotch/Manifest @@ -6,13 +6,13 @@ AUX scotch-6.0.0-as-needed.patch 5874 SHA256 b9159d4808c91d8846ce05bfe96cd787d77 DIST scotch_5.1.12b_esmumps.tar.gz 3989632 SHA256 82654e63398529cd3bcc8eefdd51d3b3161c0429bb11770e31f8eb0c3790db6e SHA512 8d6e085029f1ec13b74bd583b8fb378db9aef8a005b96bfb726b68a4608caeb31bf7ecaf1af27566e2e4a38dfea03a017d5c2e8dd262562b238cfb113b223671 WHIRLPOOL 85679809826ce09df8a05b09026179dcf4a1424f9f9c44ce97ba172fd18b7dc3af669c686d4ea5b169501dcb011ceab419d0391ae378712302977fb55f35abb8 DIST scotch_6.0.0_esmumps.tar.gz 4534976 SHA256 8206127d038bda868dda5c5a7f60ef8224f2e368298fbb01bf13fa250e378dd4 SHA512 4509a58363957b009cfc56a0a1ade31e2cb718f50edf7674d00471ee375251d03630e988036e14f545f9f4f270ff4a8b4ebe66a6f9e05b5d769b643bcf9d6067 WHIRLPOOL 7083a767d13d24b7b2640109643bb309bfc267a191537d77d6e31828eb1f875f2d0055f18e4038ebb24536c7d098b1d365524ea06092e1253f894351ba1157c3 EBUILD scotch-5.1.12b.ebuild 4560 SHA256 23f394979de4efd158440bdfa9d848233dc7ed35701b9277f8110d55fcc8fb0b SHA512 34f35de629bd963f521ad478cec5ce376fce445dfed091e6f61f45ffa7e41f71ff097071d2e908e9e8b75fbfb88d58a6ce696b8ebe2da8493a63b27a7288fc3a WHIRLPOOL 57287383f9127052c97b7661bba2713ef41228807175ce3f6e65c5c62daea886356b1c86aae2f0bdaa389b912ecf03db102f75a902caa437725319656e431ab4 -EBUILD scotch-6.0.0.ebuild 4629 SHA256 19cb2a8e2c6aa5ad268063511e74576b72220b2381de32323eebdc19a7dd4126 SHA512 62402985ba18b457d7b080c57bb38b1103a4f808ea329f5785547d646ec7fc173a0c46a07f8bc3ba1e2db9f54342378c3bd6bca2518c63d82d662abf00715bfb WHIRLPOOL 9e14083d16e22e5ec39dc191ab0cb1d7a06953ad5b32321f99e14c3231bef03910c25399edbe782b01acfa7e447229d88f7b81c0620115763feae7a2df12b8cd -MISC ChangeLog 3144 SHA256 b97527a6463585da41e1cade951814d8be79c69518caeeac01e7f74e6c2f648b SHA512 c638b6b1f1ba426a77739ade8b9fd3aa6c78eb3985d6372c814b65f8090116b3ebb4ae3d4dfe1a426fc3b6ad9ea77c6ea688eceb1394c3568bf87f12358ea581 WHIRLPOOL 052e1f6a3ab2e200500d5ccdd8eae2a85e9f725ec56cdcfcad69a55e504beff751629537b126fb96b1c2c18081f75570ff0961cfe28a9e1351dc6f11c6d228ff +EBUILD scotch-6.0.0.ebuild 4734 SHA256 7a5f4f4b1641b27c209fd511edeee185b30a8a63889f3b46e1cb947be61f3f0e SHA512 52fd9c9efbe11f6cc642af74c667f8aa738127163036204243ee95fdc90389acd77ac7e96753fdfa8937d70aa694fe5dd032b9a63bf49923326ad47d20f4c169 WHIRLPOOL de4ac22982fd8be8816aa77c8264fe022582536aecff210cbd549a027e4fde99855ca961a0285b6813c32e7a79db02dbf17c8c313d73007cfcc5b49675e1bae5 +MISC ChangeLog 3277 SHA256 d09f2dc3c3a81f3dda391d08f279408e50b6c2841162a43f05eabc008d1fa1a6 SHA512 a037ce72b7af8b03ee482ad953823fd7da237c48c19ae5a1fecfc39143443651eeb6808052a1e0dbbf828c0789478c89faeaa1dac64b268b92d65cc06ced5e95 WHIRLPOOL 9e637ebc3863d6dcdf072e098d50def4a23d75dbfacb2f2c94be4d38f23df1c73782345e34072c4e53c2e385b5dedcd438e657e463be3b9c6c53db07b999b8c7 MISC metadata.xml 1208 SHA256 2a72e20c8562cb65091e4f91ffa545dcde4bc9e99865bfffbca497616ec69b7c SHA512 d89064ca2b4e87c94a113bcafad0b52d4a5b625fdb116cc48c34331261a179ad1466cb3e85076de6b561001459326cc55bb40a5f2fadad7a0d92960901b52f1c WHIRLPOOL 2ec6d91f123f3fee0620a1682d5bc081fa58143ad3570d03156eb9d07755e27c81d50a39a3c8737268dd753ebed096437879226c0a4a9b8273d0051741cf745e -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlHSNdsACgkQ4MrvBE1wQ8mwbQCfXeVnW/NlyHXUfRE1fiWONnEq -SyQAniJZBVCQoV57m/JaoW3O0UAH/BNm -=Dxj3 +iEYEAREIAAYFAlLwKcYACgkQ1ycZbhPLE2AOjQCgotiFr3BH7gSWTaEM2umjbHHy +O3kAn1nNYo1hkYZwhgnO0XCEE7BX5iWf +=FNR3 -----END PGP SIGNATURE----- diff --git a/sci-libs/scotch/scotch-6.0.0.ebuild b/sci-libs/scotch/scotch-6.0.0.ebuild index 98edb3071864..b05d56867d13 100644 --- a/sci-libs/scotch/scotch-6.0.0.ebuild +++ b/sci-libs/scotch/scotch-6.0.0.ebuild @@ -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/sci-libs/scotch/scotch-6.0.0.ebuild,v 1.4 2013/07/02 02:07:22 jsbronder Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/scotch-6.0.0.ebuild,v 1.5 2014/02/03 23:44:02 bicatali Exp $ EAPI=5 @@ -10,13 +10,14 @@ inherit eutils toolchain-funcs versionator flag-o-matic multilib MYP="${PN}_${PV}_esmumps" # download id on gforge changes every goddamn release DID=31832 +SOVER=$(get_major_version) DESCRIPTION="Software for graph, mesh and hypergraph partitioning" HOMEPAGE="http://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/" SRC_URI="http://gforge.inria.fr/frs/download.php/${DID}/${MYP}.tar.gz" LICENSE="CeCILL-2" -SLOT="0" +SLOT="0/${SOVER}" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc int64 mpi static-libs tools threads" @@ -30,7 +31,7 @@ S="${WORKDIR}/${MYP/b}" static_to_shared() { local libstatic=${1}; shift local libname=$(basename ${libstatic%.a}) - local soname=${libname}$(get_libname $(get_version_component_range 1-2)) + local soname=${libname}$(get_libname ${SOVER}) local libdir=$(dirname ${libstatic}) einfo "Making ${soname} from ${libstatic}" @@ -57,6 +58,9 @@ src_prepare() { append-cflags "-DSCOTCH_PTHREAD_NUMBER=$(nproc)" else append-cflags "-DSCOTCH_PTHREAD_NUMBER=1" + sed -i \ + -e e 's/ -DSCOTCH_PTHREAD//' \ + src/Make.inc/Makefile.inc.i686_pc_linux3 || die fi sed -e "s/gcc/$(tc-getCC)/" \ -e "s/-O3/${CFLAGS} -pthread/" \ |