| 1 |
bicatali 14/02/03 23:44:02 |
| 2 |
|
| 3 |
Modified: scotch-6.0.0.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fixed bug #499168, thanks jer and getryx, add sub-slot |
| 6 |
|
| 7 |
(Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.5 sci-libs/scotch/scotch-6.0.0.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scotch/scotch-6.0.0.ebuild?rev=1.5&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scotch/scotch-6.0.0.ebuild?rev=1.5&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scotch/scotch-6.0.0.ebuild?r1=1.4&r2=1.5 |
| 15 |
|
| 16 |
Index: scotch-6.0.0.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/scotch/scotch-6.0.0.ebuild,v |
| 19 |
retrieving revision 1.4 |
| 20 |
retrieving revision 1.5 |
| 21 |
diff -u -r1.4 -r1.5 |
| 22 |
--- scotch-6.0.0.ebuild 2 Jul 2013 02:07:22 -0000 1.4 |
| 23 |
+++ scotch-6.0.0.ebuild 3 Feb 2014 23:44:02 -0000 1.5 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
-# Copyright 1999-2013 Gentoo Foundation |
| 26 |
+# Copyright 1999-2014 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/scotch-6.0.0.ebuild,v 1.4 2013/07/02 02:07:22 jsbronder Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/scotch-6.0.0.ebuild,v 1.5 2014/02/03 23:44:02 bicatali Exp $ |
| 30 |
|
| 31 |
EAPI=5 |
| 32 |
|
| 33 |
@@ -10,13 +10,14 @@ |
| 34 |
MYP="${PN}_${PV}_esmumps" |
| 35 |
# download id on gforge changes every goddamn release |
| 36 |
DID=31832 |
| 37 |
+SOVER=$(get_major_version) |
| 38 |
|
| 39 |
DESCRIPTION="Software for graph, mesh and hypergraph partitioning" |
| 40 |
HOMEPAGE="http://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/" |
| 41 |
SRC_URI="http://gforge.inria.fr/frs/download.php/${DID}/${MYP}.tar.gz" |
| 42 |
|
| 43 |
LICENSE="CeCILL-2" |
| 44 |
-SLOT="0" |
| 45 |
+SLOT="0/${SOVER}" |
| 46 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 47 |
IUSE="doc int64 mpi static-libs tools threads" |
| 48 |
|
| 49 |
@@ -30,7 +31,7 @@ |
| 50 |
static_to_shared() { |
| 51 |
local libstatic=${1}; shift |
| 52 |
local libname=$(basename ${libstatic%.a}) |
| 53 |
- local soname=${libname}$(get_libname $(get_version_component_range 1-2)) |
| 54 |
+ local soname=${libname}$(get_libname ${SOVER}) |
| 55 |
local libdir=$(dirname ${libstatic}) |
| 56 |
|
| 57 |
einfo "Making ${soname} from ${libstatic}" |
| 58 |
@@ -57,6 +58,9 @@ |
| 59 |
append-cflags "-DSCOTCH_PTHREAD_NUMBER=$(nproc)" |
| 60 |
else |
| 61 |
append-cflags "-DSCOTCH_PTHREAD_NUMBER=1" |
| 62 |
+ sed -i \ |
| 63 |
+ -e e 's/ -DSCOTCH_PTHREAD//' \ |
| 64 |
+ src/Make.inc/Makefile.inc.i686_pc_linux3 || die |
| 65 |
fi |
| 66 |
sed -e "s/gcc/$(tc-getCC)/" \ |
| 67 |
-e "s/-O3/${CFLAGS} -pthread/" \ |
| 68 |
|
| 69 |
|
| 70 |
|
| 71 |
1.16 sci-libs/scotch/ChangeLog |
| 72 |
|
| 73 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scotch/ChangeLog?rev=1.16&view=markup |
| 74 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scotch/ChangeLog?rev=1.16&content-type=text/plain |
| 75 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scotch/ChangeLog?r1=1.15&r2=1.16 |
| 76 |
|
| 77 |
Index: ChangeLog |
| 78 |
=================================================================== |
| 79 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/scotch/ChangeLog,v |
| 80 |
retrieving revision 1.15 |
| 81 |
retrieving revision 1.16 |
| 82 |
diff -u -r1.15 -r1.16 |
| 83 |
--- ChangeLog 2 Jul 2013 02:07:22 -0000 1.15 |
| 84 |
+++ ChangeLog 3 Feb 2014 23:44:02 -0000 1.16 |
| 85 |
@@ -1,6 +1,9 @@ |
| 86 |
# ChangeLog for sci-libs/scotch |
| 87 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 88 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/ChangeLog,v 1.15 2013/07/02 02:07:22 jsbronder Exp $ |
| 89 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 90 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/ChangeLog,v 1.16 2014/02/03 23:44:02 bicatali Exp $ |
| 91 |
+ |
| 92 |
+ 03 Feb 2014; Sébastien Fabbro <bicatali@g.o> scotch-6.0.0.ebuild: |
| 93 |
+ Fixed bug #499168, thanks jer and getryx, add sub-slot |
| 94 |
|
| 95 |
02 Jul 2013; Justin Bronder <jsbronder@g.o> scotch-6.0.0.ebuild: |
| 96 |
Remove fix for #462602. Handled in sys-cluster/openmpi now. |
Archives