diff options
Diffstat (limited to 'sci-libs/scotch')
-rw-r--r-- | sci-libs/scotch/Manifest | 7 | ||||
-rw-r--r-- | sci-libs/scotch/files/scotch-5.1.12b-as-needed.patch | 112 | ||||
-rw-r--r-- | sci-libs/scotch/metadata.xml | 2 | ||||
-rw-r--r-- | sci-libs/scotch/scotch-5.1.12b.ebuild | 157 | ||||
-rw-r--r-- | sci-libs/scotch/scotch-6.0.4-r2.ebuild | 12 |
5 files changed, 10 insertions, 280 deletions
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest index 2fc1c6b42165..6d029a62eb35 100644 --- a/sci-libs/scotch/Manifest +++ b/sci-libs/scotch/Manifest @@ -1,8 +1,5 @@ -AUX scotch-5.1.12b-as-needed.patch 4878 BLAKE2B 1fa95b1d7e03a8d2c3fe6840428b07974dcb2bffe30f17ace62e7998397a27f77b12c497d6bbf9c568b1b81bab785fc7588ac33567e82b9c5a84721bd7a1ac85 SHA512 9f5bf65999978d851b0c61de2235af982e6d1d057af5906d328f2a4b83775f8dd567f1386eecc186d6ec1287d8e84215a88b879ec77de4ac6de5b129ad263411 AUX scotch-6.0.4-as-needed.patch 6168 BLAKE2B 5b008f9035379d91cd8ffde6d64a22b021fd5070a106592abefac78a0522282fbd0dd7f8b439b0452c0d15c57891c9d4eb4415120ea95788fe74e149e6069fc3 SHA512 cd58425866a1726f776318e3792e72d7250686f033ceeda57f0f007fdb4c5e1c2bc3c9346630e39f16023f2a3d70cd106b357c21e5406a1c44b49a316655d8dd AUX scotch-6.0.4-flex-2.6.3-fix.patch 1623 BLAKE2B 9d86299eb543147ce7e736779b05c3b8113c12b54fbaf46a2b99a6cef2b670fc1b448d059858f954f37acf72c7c268acf1793de89f193d02f8b61d3f5d4ca1e5 SHA512 1a2a5a363e1dd59e1cced76928da15132cd1c8af57d6d0ad0eec04e02d029c6ae275e202e8c87bc65ff0188f41e379865829b5b61e4f1e44a885d48c4462b09e -DIST scotch_5.1.12b_esmumps.tar.gz 3989632 BLAKE2B c529601d68bf7a5497d363a746ad46e0c5b4d0831cd9e128ce10a09580215d5370e3766ceb1c2550985b554e2ae6c125149b11f376b32881fc66c052885c814d SHA512 8d6e085029f1ec13b74bd583b8fb378db9aef8a005b96bfb726b68a4608caeb31bf7ecaf1af27566e2e4a38dfea03a017d5c2e8dd262562b238cfb113b223671 DIST scotch_6.0.4_esmumps.tar.gz 4804966 BLAKE2B 63c058fac9206e70975463b1748eb5ce7cd2ba01d9fcbb28eba8f5914ac49a71fcf87941fafd6047712fa519f3b5523ce199bdf5228a8b094bbb465dd64a1083 SHA512 0fcf639ab1a09451256444005f1a4a739403159e3ab22c34fbcedc481be387cd4c86be6fb029b4b5816220564f64f662434bf7f1d3921ed18be081ae2a7a9ee2 -EBUILD scotch-5.1.12b.ebuild 4446 BLAKE2B 6c02eb7b272e22e2c62e95daf9a99745420a69233d0b95bc9479556ba08b6cdc36339272a0cd16eec51934125c3f50afa9873a5a03b21fbd63a87592889726bd SHA512 8020ca4ed7709607e1bc9f4cf21b96efd03ad413912304d70bde02606b1c2cba6abcb6e3a14ae0ff59c19ab82a40efb02567bafe1bce53d0e39d192f3aff1dbb -EBUILD scotch-6.0.4-r2.ebuild 4910 BLAKE2B b71de7fd6f6471efe2dbd3037d78aaeb5e6dcda6b1e529014335eebf5714775a79dc4a342e1793042f5e82c2ad181546a2a8a74c067ecec86d1f65e0ea7126e3 SHA512 9909700133b6c8a5ef4094066b19c69fe85a07f413dd0e970f9016567aa161a1963f453cd11aa0e96c1f569b2681aa498cac6b5469a05cff3f614d8b4123412d -MISC metadata.xml 1199 BLAKE2B c5d721a43a47c20cf10d18bf0f9e1a2db04a2473bf772d6b64a8360a897ddfea8904b0bb65443fbf0738a4580d867477d9b58f8e720c8bd39933d461bd744b85 SHA512 78345510290afd5d47a88595c3d2b07cbdb6f99d1341c6433095750bd27bb0f81fbe5e98cb6ffd23b5c8c2e0a346d1a2f25b5bf2f83093dff471906fdadc4eee +EBUILD scotch-6.0.4-r2.ebuild 4985 BLAKE2B 3baaddc8fac4e76c1bd525533e52f5a34f952768c6fa2fe44e30d36e7d401aa87254357894dc99bf0b7992b7df4b335d2f03573e5a779dfe8005522921c218de SHA512 23e09c7c275b38dab64665b959e1002857068536bf41f50a4743474b2ac2f8dcc5473fecf7ced3a1ec8f9a44b1a14cae99f0a8628aa3b6c18326c1743de96391 +MISC metadata.xml 1274 BLAKE2B e140dd2a836530be2e4f61dd42200172d1b5c54608fd77d743ab349546ae1d9cb06d3be48c847fc646b31be3df78928d08168a53e90fe6a103cceb799a4429dd SHA512 7a0f3fdfdc71568a0a0ce2972ba93f2b17dce7725f0eeb56f046fa94dfc62747ffa0a33186e91265d6f46ab35c201ae49481db1077dac6c4866df818fb2b7136 diff --git a/sci-libs/scotch/files/scotch-5.1.12b-as-needed.patch b/sci-libs/scotch/files/scotch-5.1.12b-as-needed.patch deleted file mode 100644 index 73888d8797e7..000000000000 --- a/sci-libs/scotch/files/scotch-5.1.12b-as-needed.patch +++ /dev/null @@ -1,112 +0,0 @@ -diff -Nur src.orig/esmumps/Makefile src/esmumps/Makefile ---- src.orig/esmumps/Makefile 2012-03-12 00:14:14.536109811 +0000 -+++ src/esmumps/Makefile 2012-03-12 04:26:12.884108074 +0000 -@@ -44,7 +44,7 @@ - $(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -c $(<) -o $(@) - - %$(EXE) : %.c -- $(CC) $(CFLAGS) -I$(includedir) $(<) -o $(@) -L$(libdir) $(LDFLAGS) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit -+ $(CC) $(CFLAGS) -I$(includedir) $(<) -L$(libdir) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@) - - ## - ## Project rules. -@@ -57,9 +57,9 @@ - libesmumps$(LIB) \ - main_esmumps$(EXE) - --ptscotch : clean -+ptscotch : clean common.h - $(MAKE) CFLAGS="$(CFLAGS) -DSCOTCH_PTSCOTCH" CC=$(CCP) SCOTCHLIB=ptscotch ESMUMPSLIB=ptesmumps \ -- libesmumps$(LIB) \ -+ libptesmumps$(LIB) \ - main_esmumps$(EXE) - - install : -@@ -142,7 +142,7 @@ - common.h \ - esmumps.h - --libesmumps$(LIB) : graph_graph$(OBJ) \ -+lib$(ESMUMPSLIB)$(LIB) : graph_graph$(OBJ) \ - order$(OBJ) \ - order_scotch_graph$(OBJ) \ - dof$(OBJ) \ -diff -Nur src.orig/libscotch/Makefile src/libscotch/Makefile ---- src.orig/libscotch/Makefile 2012-03-12 00:14:14.496108751 +0000 -+++ src/libscotch/Makefile 2012-03-12 01:32:28.562403624 +0000 -@@ -43,7 +43,7 @@ - $(CC) $(CFLAGS) $(CLIBFLAGS) -c $(<) -o $(@) - - %$(EXE) : %.c -- $(CC) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS) -+ $(CC) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) $(LDFLAGS) -o $(@) - - ## - ## Project rules. -@@ -2543,7 +2543,7 @@ - mapping.h \ - order.h \ - parser.h -- $(CCD) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS) -+ $(CCD) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) $(LDFLAGS) -o $(@) - - scotch.h : dummysizes$(EXE) \ - library.h -diff -Nur src.orig/libscotchmetis/Makefile src/libscotchmetis/Makefile ---- src.orig/libscotchmetis/Makefile 2012-03-12 00:14:14.456107691 +0000 -+++ src/libscotchmetis/Makefile 2012-03-12 01:35:00.166422784 +0000 -@@ -44,7 +44,7 @@ - $(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@) - - %$(EXE) : %.c -- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) $(LDFLAGS) -+ $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) $(LDFLAGS) -o $(@) - - ## - ## Project rules. -diff -Nur src.orig/scotch/Makefile src/scotch/Makefile ---- src.orig/scotch/Makefile 2012-03-12 00:14:14.536109811 +0000 -+++ src/scotch/Makefile 2012-03-12 00:50:22.033571205 +0000 -@@ -41,13 +41,13 @@ - include ../Makefile.inc - - %$(EXE) : %$(OBJ) -- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -+ $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@) - - %$(OBJ) : %.c - $(CC) $(CFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@) - - %$(EXE) : %.c -- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -+ $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@) - - ## - ## Project rules. -@@ -205,7 +205,7 @@ - $(libdir)/libptscotch$(LIB) \ - $(libdir)/libptscotcherrexit$(LIB) \ - dgmap.h -- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -+ $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@) - - dgscat$(EXE) : dgscat.c \ - ../libscotch/module.h \ -@@ -315,7 +315,7 @@ - gout_o.c \ - $(includedir)/scotch.h \ - $(libdir)/libscotch$(LIB) -- $(CC) $(CFLAGS) -I../libscotch -I$(includedir) gout_c.c gout_o.c -o $(@) -L$(libdir) -lscotch -lscotcherrexit $(LDFLAGS) -+ $(CC) $(CFLAGS) -I../libscotch -I$(includedir) gout_c.c gout_o.c -L$(libdir) -lscotch -lscotcherrexit $(LDFLAGS) -o $(@) - - gpart$(EXE) : gmap.c \ - ../libscotch/module.h \ -@@ -324,7 +324,7 @@ - $(libdir)/libscotch$(LIB) \ - $(libdir)/libscotcherrexit$(LIB) \ - gmap.h -- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -+ $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@) - - - gscat$(EXE) : gscat.c \ diff --git a/sci-libs/scotch/metadata.xml b/sci-libs/scotch/metadata.xml index 48cba73d79f1..acd9751ef399 100644 --- a/sci-libs/scotch/metadata.xml +++ b/sci-libs/scotch/metadata.xml @@ -11,7 +11,7 @@ </maintainer> <use> <flag name="int64">Build the 64 bits integer library (needed for > 2^31 vertices)</flag> - <flag name="tools">Build and install extra exec tools</flag> + <flag name="tools">Provides the graph, mesh, architecture, mapping/ordering, output handling programs (see Scotch User's Guide).</flag> </use> <longdescription lang="en"> SCOTCH is a software package and libraries for graph, mesh and diff --git a/sci-libs/scotch/scotch-5.1.12b.ebuild b/sci-libs/scotch/scotch-5.1.12b.ebuild deleted file mode 100644 index 7188b5ab48f2..000000000000 --- a/sci-libs/scotch/scotch-5.1.12b.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils toolchain-funcs versionator flag-o-matic multilib - -# use esmumps version to allow linking with mumps -MYP="${PN}_${PV}_esmumps" -# download id on gforge changes every goddamn release -DID=28978 - -DESCRIPTION="Software for graph, mesh and hypergraph partitioning" -HOMEPAGE="http://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/" -# broken ssl cert, so mirroring -#SRC_URI="http://gforge.inria.fr/frs/download.php/${DID}/${MYP}.tar.gz" -SRC_URI="http://dev.gentooexperimental.org/~patrick/${MYP}.tar.gz" - -LICENSE="CeCILL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples int64 mpi static-libs tools" - -DEPEND="sys-libs/zlib - mpi? ( virtual/mpi )" -RDEPEND="${DEPEND}" - -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 libdir=$(dirname ${libstatic}) - - einfo "Making ${soname} from ${libstatic}" - if [[ ${CHOST} == *-darwin* ]] ; then - ${LINK:-$(tc-getCC)} ${LDFLAGS} \ - -dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \ - -Wl,-all_load -Wl,${libstatic} \ - "$@" -o ${libdir}/${soname} || die "${soname} failed" - else - ${LINK:-$(tc-getCC)} ${LDFLAGS} \ - -shared -Wl,-soname=${soname} \ - -Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \ - "$@" -o ${libdir}/${soname} || die "${soname} failed" - [[ $(get_version_component_count) -gt 1 ]] && \ - ln -s ${soname} ${libdir}/${libname}$(get_libname $(get_major_version)) - ln -s ${soname} ${libdir}/${libname}$(get_libname) - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-as-needed.patch - sed -e "s/gcc/$(tc-getCC)/" \ - -e "s/-O3/${CFLAGS} -pthread/" \ - -e "s/ ar/ $(tc-getAR)/" \ - -e "s/ranlib/$(tc-getRANLIB)/" \ - src/Make.inc/Makefile.inc.i686_pc_linux2 > src/Makefile.inc || die - use int64 && append-cflags -DIDXSIZE64 -} - -src_compile() { - emake -C src CLIBFLAGS=-fPIC - static_to_shared lib/libscotcherr.a - static_to_shared lib/libscotcherrexit.a - static_to_shared lib/libscotch.a -Llib -lz -lm -lrt -lscotcherr - static_to_shared lib/libesmumps.a -Llib -lscotch - static_to_shared lib/libscotchmetis.a -Llib -lscotch - - if use mpi; then - emake -C src CLIBFLAGS=-fPIC ptscotch - export LINK=mpicc - static_to_shared lib/libptscotcherr.a - static_to_shared lib/libptscotcherrexit.a - static_to_shared lib/libptscotch.a -Llib -lptscotcherr -lz -lm -lrt - static_to_shared lib/libptesmumps.a -Llib -lptscotch - static_to_shared lib/libptscotchparmetis.a -Llib -lptscotch - fi - if use static-libs; then - emake -C src clean - emake -C src - use mpi && emake -C src ptscotch - fi -} - -src_install() { - dolib.so lib/lib*$(get_libname)* - use static-libs && dolib.a lib/*.a - - insinto /usr/include/scotch - doins include/* - - cat <<-EOF > scotchmetis.pc - prefix=${EPREFIX}/usr - libdir=\${prefix}/$(get_libdir) - includedir=\${prefix}/include - Name: scotchmetis - Description: ${DESCRIPTION} - Version: ${PV} - URL: ${HOMEPAGE} - Libs: -L\${libdir} -lscotchmetis -lscotcherr -lscotch - Private: -lm -lz -lrt - Cflags: -I\${includedir}/scotch - EOF - insinto /usr/$(get_libdir)/pkgconfig - doins scotchmetis.pc - - # not sure it is actually a full replacement of metis - #alternatives_for metis scotch 0 \ - # /usr/$(get_libdir)/pkgconfig/metis.pc scotchmetis.pc - - if use mpi; then - cat <<-EOF > ptscotchparmetis.pc - prefix=${EPREFIX}/usr - libdir=\${prefix}/$(get_libdir) - includedir=\${prefix}/include - Name: ptscotchparmetis - Description: ${DESCRIPTION} - Version: ${PV} - URL: ${HOMEPAGE} - Libs: -L\${libdir} -lptscotchparmetis -lptscotcherr -lptscotch - Private: -lm -lz -lrt - Cflags: -I\${includedir}/scotch - Requires: scotchmetis - EOF - insinto /usr/$(get_libdir)/pkgconfig - doins ptscotchparmetis.pc - # not sure it is actually a full replacement of parmetis - #alternatives_for metis-mpi ptscotch 0 \ - # /usr/$(get_libdir)/pkgconfig/metis-mpi.pc ptscotchparmetis.pc - fi - - dodoc README.txt - - if use tools; then - local b m - pushd bin > /dev/null - for b in *; do - newbin ${b} scotch_${b} - done - popd > /dev/null - - pushd man/man1 > /dev/null - for m in *; do - newman ${m} scotch_${m} - done - popd > /dev/null - fi - - use doc && dodoc doc/*.pdf - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins -r examples/* tgt grf - fi -} diff --git a/sci-libs/scotch/scotch-6.0.4-r2.ebuild b/sci-libs/scotch/scotch-6.0.4-r2.ebuild index 9f16ee0554d2..09ea23318f8d 100644 --- a/sci-libs/scotch/scotch-6.0.4-r2.ebuild +++ b/sci-libs/scotch/scotch-6.0.4-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -7,26 +7,28 @@ inherit eutils toolchain-funcs versionator flag-o-matic multilib # use esmumps version to allow linking with mumps MYP="${PN}_${PV}_esmumps" -# download id on gforge changes every goddamn release +# download id on gforge changes every release(!) DID=34618 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" +S="${WORKDIR}/${P/-/_}" LICENSE="CeCILL-2" SLOT="0/${SOVER}" KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="doc int64 mpi static-libs tools threads" +IUSE="doc int64 mpi static-libs test tools threads" +# bug #532620 +REQUIRED_USE="test? ( threads )" +RESTRICT="!test? ( test )" DEPEND=" sys-libs/zlib mpi? ( virtual/mpi )" RDEPEND="${DEPEND}" -S=${WORKDIR}/${P/-/_} - static_to_shared() { local libstatic=${1}; shift local libname=$(basename ${libstatic%.a}) |