diff options
author | Etienne Lorriaux <etienne.lorriaux@gmail.com> | 2009-10-15 16:07:57 +0200 |
---|---|---|
committer | Etienne Lorriaux <etienne.lorriaux@gmail.com> | 2009-10-15 16:07:57 +0200 |
commit | 8a931211ee932929828a82e7178f6d915b10f906 (patch) | |
tree | fbbf741859a74bd2b1b89010359f537de35e5252 /sci-libs/med | |
parent | [sys-infiniband/ibutils] Fix bug 289037. thanks to Kacper Kowalik (diff) | |
download | sci-8a931211ee932929828a82e7178f6d915b10f906.tar.gz sci-8a931211ee932929828a82e7178f6d915b10f906.tar.bz2 sci-8a931211ee932929828a82e7178f6d915b10f906.zip |
sci-libs/med: Version bump + corrections, doc and examples USE flags
added
Diffstat (limited to 'sci-libs/med')
-rw-r--r-- | sci-libs/med/ChangeLog | 12 | ||||
-rw-r--r-- | sci-libs/med/Manifest | 12 | ||||
-rw-r--r-- | sci-libs/med/files/med-2.3.1-med_int_type.patch | 45 | ||||
-rw-r--r-- | sci-libs/med/files/med-2.3.1-test.patch | 22 | ||||
-rw-r--r-- | sci-libs/med/files/med-2.3.4-gcc-4.3.patch | 11 | ||||
-rw-r--r-- | sci-libs/med/files/med-2.3.5-gcc-4.3.patch | 22 | ||||
-rw-r--r-- | sci-libs/med/med-2.3.1.ebuild | 38 | ||||
-rw-r--r-- | sci-libs/med/med-2.3.4.ebuild | 37 | ||||
-rw-r--r-- | sci-libs/med/med-2.3.5.ebuild | 79 |
9 files changed, 116 insertions, 162 deletions
diff --git a/sci-libs/med/ChangeLog b/sci-libs/med/ChangeLog index 42ac953ed..2e82c6fe9 100644 --- a/sci-libs/med/ChangeLog +++ b/sci-libs/med/ChangeLog @@ -1,6 +1,16 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*med-2.3.5 (15 Oct 2009) + + 15 Oct 2009; Etienne Lorriaux <etienne.lorriaux@gmail.com> + -med-2.3.1.ebuild, -files/med-2.3.1-med_int_type.patch, + -files/med-2.3.1-test.patch, -med-2.3.4.ebuild, + -files/med-2.3.4-gcc-4.3.patch, +med-2.3.5.ebuild, + +files/med-2.3.5-gcc-4.3.patch: + Version bump + corrections, doc and examples USE flags added + + *med-2.3.4 (17 Sep 2009) 17 Sep 2009; Etienne Lorriaux <etienne.lorriaux@gmail.com> @@ -17,4 +27,4 @@ 20 May 2008; Daniel Tourde <daniel.tourde@caelae.se> +med-2.3.1.ebuild, +med-2.3.1-test.patch, +med-2.3.1-med_int_type.patch Initial import. Ebuild created by Rogier Eggers <rogiereggers@hotmail.com>, Jon Hood <squinky86@gmail.com> and Richard Westwell <garlicbread@ntlworld.com> - See bug #130502 for anything relating the building process.
\ No newline at end of file + See bug #130502 for anything relating the building process. diff --git a/sci-libs/med/Manifest b/sci-libs/med/Manifest index c45207784..d6091d1df 100644 --- a/sci-libs/med/Manifest +++ b/sci-libs/med/Manifest @@ -1,9 +1,5 @@ -AUX med-2.3.1-med_int_type.patch 1208 RMD160 182015013072491a7839a4345d92f7a610e6d63d SHA1 a6f54babc7cf12eda765796a38771d69167704d1 SHA256 68dac2454c4aa5c1c73ad66915901e0798a882f4c4c7d6fa642b9b36a39b3a40 -AUX med-2.3.1-test.patch 759 RMD160 b80e803a893bc2f1dab85587d40984546aa41329 SHA1 23b116c7dbfc38d1dba65a5145a80551ab13ffc8 SHA256 bec206c3e84278bccbfc505338abe8e3dc6de827943cbb6a725d81af87be2f17 -AUX med-2.3.4-gcc-4.3.patch 379 RMD160 4ae5a16a1fa4653c0fd29f3cbf756641bd0a02df SHA1 c09f64d5cbd331964617675c5813e9696d630919 SHA256 f2a074c08a07cac69ef5e4d3f4373839f36d5d9a35809eb627c926a7bdff244f -DIST med-2.3.1.tar.gz 2022500 RMD160 d6a02acf845ef4ffeea8aac4dfec4103fd690bbd SHA1 538c2e582be28e6711d45fa840af0ced8ea41fac SHA256 f46166c6850c0157f6b13429524de91e42a3e53de9b859555baba85d3a4c11b6 -DIST med-2.3.4.tar.gz 2149185 RMD160 90265d9a34e927f7bd585679c95bcc0ec3c8a957 SHA1 cf74aa59f425b2c05451306fffb6ef5ac66f91f6 SHA256 ccc36dd587dd803cc7a008d2edd67dd792a6c37a19ae0c5a73723bda32cbd16d -EBUILD med-2.3.1.ebuild 828 RMD160 98625af58404544571bae37a6f4db2b119e0ca16 SHA1 e57a8c7381cf38ae5891281aa6c2d40612235244 SHA256 2fc008665df8fd654c3075ae4126930177395232202405f8685821bd379e8d12 -EBUILD med-2.3.4.ebuild 747 RMD160 5c62feceab71a7dcb834dc1ad8070e4fead6f0c0 SHA1 77b0fece8e3009648b1426354749f6453a4b9824 SHA256 d6b569f20084408f45a838081f352a267b8caf0eede0724a518b1bc914f47a8d -MISC ChangeLog 774 RMD160 b0edf7a6f998ffe6acb4f75b38fbf32386a90d4e SHA1 88af26ffe954845e89b0241ca2489f2d98c37ccd SHA256 d2f8afb5668d8f0d82cd4b8b12c7e983a5ff9865d64d9649502bbe0d44d2b54f +AUX med-2.3.5-gcc-4.3.patch 813 RMD160 280873aa15f32088476ff58347b2345fc859650e SHA1 c759d60559e9e70838733c2bde00713646d3644f SHA256 64f1d181b65184b72cac6b7a637ce7d8e3260738b353eee03f8750cf2f8cc79a +DIST med-fichier_2.3.5.tar.gz 2190755 RMD160 ed3ad90b23ca9fd5f46feba759a318aefa2c620a SHA1 91c06aca4cfbc6847d8be1ba5ba25ad1af36cf2f SHA256 13a3667726a36b59be41266d09faeec95704fed6adc4f9ded87d2aab838df97d +EBUILD med-2.3.5.ebuild 1918 RMD160 0bf4a1b384d89d630b3c5f4910d1e7d314abd637 SHA1 bb857c3d9ffecea6468d1408c377ce0a4ebc9484 SHA256 97447a7b1ea4489887fa1f8ba83925bcc46c9a37a34869ad9cc43317a5a9b1e5 +MISC ChangeLog 1122 RMD160 ef67ac2abfb8e74f9700f8cd59b525d802c6380f SHA1 b7adf644738f0d83933a02b09aa70dfd86feb0b4 SHA256 a33aeb48d223ea652161af50e56fef8e916bed90bd3d9b98e9a791a61124a664 MISC metadata.xml 236 RMD160 be3a66b6b0e2394816642cf3311b5de1e2aafff9 SHA1 48f5d58e70ad260121d9ba1c96ec3956891f0bbe SHA256 fce14384c15fdf47e86e7be22d19aced1565ce2c30f6bfa2096d84e67103147a diff --git a/sci-libs/med/files/med-2.3.1-med_int_type.patch b/sci-libs/med/files/med-2.3.1-med_int_type.patch deleted file mode 100644 index 6a46d1cb7..000000000 --- a/sci-libs/med/files/med-2.3.1-med_int_type.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -Naur med-2.3.1.orig/configure med-2.3.1/configure ---- med-2.3.1.orig/configure 2006-05-18 10:47:22.000000000 +0100 -+++ med-2.3.1/configure 2008-04-22 01:18:14.000000000 +0100 -@@ -1049,6 +1049,7 @@ - Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -+ --with-med_int=<C type> Use <C type> for med_int - --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pic try to use only PIC/non-PIC objects [default=use - both] -@@ -4635,6 +4636,21 @@ - - - -+## Guess where as med_int type is provided by --with-med_int option -+## or auto-detection must be used -+ -+ -+# Check whether --with-med_int was given. -+if test "${with_med_int+set}" = set; then -+ withval=$with_med_int; -+else -+ withval=no -+fi -+ -+ -+if test "x$withval" = "xno" -+then -+ - ## Guess the fortran int size - - -@@ -5718,6 +5734,11 @@ - { (exit 1); exit 1; }; } - fi - -+else -+ LONG_OR_INT="$withval" -+ { echo "$as_me:$LINENO: Using type $withval for med_int" >&5 -+echo "$as_me: Using type $withval for med_int" >&6;} -+fi - - - ## Check if user want to disable explicit error messages diff --git a/sci-libs/med/files/med-2.3.1-test.patch b/sci-libs/med/files/med-2.3.1-test.patch deleted file mode 100644 index 5ad629f6b..000000000 --- a/sci-libs/med/files/med-2.3.1-test.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur med-2.3.1/tests/f/test33.f med-2.3.1.fixed/tests/f/test33.f ---- med-2.3.1/tests/f/test33.f 2006-02-27 05:46:24.000000000 -0600 -+++ med-2.3.1.fixed/tests/f/test33.f 2008-01-03 09:38:00.000000000 -0600 -@@ -68,12 +68,12 @@ - call efexit(-1) - endif - -- call efnema(fid,maa,MED_CONN,MED_ARETE,MED_SEG2,MED_DESC -- 1 ,narr,cret) -- if (cret .ne. 0 ) then -- print *,'Erreur acces au nombre d''arretes du premier maillage' -- call efexit(-1) -- endif -+C call efnema(fid,maa,MED_CONN,MED_ARETE,MED_SEG2,MED_DESC -+C 1 ,narr,cret) -+C if (cret .ne. 0 ) then -+C print *,'Erreur acces au nombre d''arretes du premier maillage' -+C call efexit(-1) -+C endif - - - print '(A,I1,A,A4,A,I1,A,I4)','maillage ' diff --git a/sci-libs/med/files/med-2.3.4-gcc-4.3.patch b/sci-libs/med/files/med-2.3.4-gcc-4.3.patch deleted file mode 100644 index 29e4e6c0f..000000000 --- a/sci-libs/med/files/med-2.3.4-gcc-4.3.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -aur med-2.3.4.old/src/misc/MEDerreur.cxx med-2.3.4/src/misc/MEDerreur.cxx ---- med-2.3.4.old/src/misc/MEDerreur.cxx 2009-02-03 01:03:19.000000000 +0100 -+++ med-2.3.4/src/misc/MEDerreur.cxx 2009-02-03 01:05:16.000000000 +0100 -@@ -5,6 +5,7 @@ - //#include <memory> - - #include <cstdlib> -+#include <cstring> - - /** - * Class OSS is useful when streaming data through a function diff --git a/sci-libs/med/files/med-2.3.5-gcc-4.3.patch b/sci-libs/med/files/med-2.3.5-gcc-4.3.patch new file mode 100644 index 000000000..106e5febc --- /dev/null +++ b/sci-libs/med/files/med-2.3.5-gcc-4.3.patch @@ -0,0 +1,22 @@ +diff -aur med-2.3.5.old/tools/medimport/include/MAJ_21_22.h med-2.3.5/tools/medimport/include/MAJ_21_22.h +--- med-2.3.5.old/tools/medimport/include/MAJ_21_22.h 2009-09-13 17:05:38.000000000 +0200 ++++ med-2.3.5/tools/medimport/include/MAJ_21_22.h 2009-09-13 17:18:20.000000000 +0200 +@@ -22,6 +22,7 @@ + #ifdef __cplusplus + + #include "MEDerreur.hxx" ++#include <cstring> + + #endif + +diff -aur med-2.3.5.old/tools/medimport/include/MAJ_231_232.h med-2.3.5/tools/medimport/include/MAJ_231_232.h +--- med-2.3.5.old/tools/medimport/include/MAJ_231_232.h 2009-09-13 17:05:38.000000000 +0200 ++++ med-2.3.5/tools/medimport/include/MAJ_231_232.h 2009-09-13 17:23:10.000000000 +0200 +@@ -22,6 +22,7 @@ + + #ifdef __cplusplus + # include "MEDerreur.hxx" ++#include <cstring> + #endif + + extern void MAJ_231_232_champs(med_idt fid); diff --git a/sci-libs/med/med-2.3.1.ebuild b/sci-libs/med/med-2.3.1.ebuild deleted file mode 100644 index 8b3b10074..000000000 --- a/sci-libs/med/med-2.3.1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils - -DESCRIPTION="Modeling and Exchange of Data library" -HOMEPAGE="http://www.code-aster.org/outils/med/" -SRC_URI="ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="" - -DEPEND="sci-libs/hdf5" -RDEPEND="${DEPEND}" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/"${P}"-test.patch - epatch "${FILESDIR}"/"${P}"-med_int_type.patch -} - -src_compile() { - if [ "$(tc-arch)" = "amd64" ]; then - econf --with-med_int=long || die "econf failed" - else - econf || die "econf failed" - fi - sed -i -e 's:-lgfortranbegin::g' src/Makefile || die "sed failed" - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install -} diff --git a/sci-libs/med/med-2.3.4.ebuild b/sci-libs/med/med-2.3.4.ebuild deleted file mode 100644 index 42e29b431..000000000 --- a/sci-libs/med/med-2.3.4.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils fortran - -DESCRIPTION="Modeling and Exchange of Data library" -HOMEPAGE="http://www.code-aster.org/outils/med/" -SRC_URI="ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="" -FORTRAN="gfortran ifc" - -DEPEND="sci-libs/hdf5" -RDEPEND="${DEPEND}" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/"${P}"-gcc-4.3.patch -} - -src_compile() { - if [ "$(tc-arch)" = "amd64" ]; then - econf --with-med_int=long || die "econf failed" - else - econf || die "econf failed" - fi - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install -} diff --git a/sci-libs/med/med-2.3.5.ebuild b/sci-libs/med/med-2.3.5.ebuild new file mode 100644 index 000000000..f47618afc --- /dev/null +++ b/sci-libs/med/med-2.3.5.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=2 +inherit eutils flag-o-matic + +DESCRIPTION="Modeling and Exchange of Data library" +HOMEPAGE="http://www.code-aster.org/outils/med/" +SRC_URI="http://files.opencascade.com/Salome/Salome5.1.2/med-fichier_2.3.5.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="doc examples" + +DEPEND="sci-libs/hdf5" +RDEPEND="${DEPEND}" + +src_unpack() { + unpack med-fichier_${PV}.tar.gz + mv med-fichier_${PV} ${PF} +} + +src_prepare() { + if has_version ">=sci-libs/hdf5-1.8.3"; then + append-flags -DH5_USE_16_API +# this patch is only neede with hdf5-1.8.3, probably because hdf5-1.6.7 +# included the missing headers + epatch "${FILESDIR}/${P}-gcc-4.3.patch" + fi +} + +src_configure() { + local myconf + + myconf="--docdir=/usr/share/doc/${PF}" + use amd64 && myconf="${myconf} --with-med_int=long" + econf ${myconf} || die "econf failed" +} + +src_install() { + emake DESTDIR="${D}" install \ + || die "emake install failed" + + rm -R "${D}"/usr/share/doc/* + rm -R "${D}"/usr/bin/testc + rm -R "${D}"/usr/bin/testf + + + if use doc + then + dodoc AUTHORS NEWS LGPL README ChangeLog \ + || die "dodoc failed" + dohtml -r doc/index.html doc/med.css doc/html doc/jpg \ + doc/png doc/gif doc/tests || die "dohtml failed" + fi + + if use examples + then + dodir /usr/share/doc/${PF}/examples/c/.libs + exeinto /usr/share/doc/${PF}/examples/c + for i in `ls tests/c/*.o` ; + do + doexe tests/c/`basename ${i} .o` || die "doexe failed" + done + exeinto /usr/share/doc/${PF}/examples/c/.libs + doexe tests/c/.libs/* || die "doexe failed" + + dodir /usr/share/doc/${PF}/examples/f/.libs + exeinto /usr/share/doc/${PF}/examples/f + for i in `ls tests/f/*.o` ; + do + doexe tests/f/`basename ${i} .o` || die "doexe failed" + done + exeinto /usr/share/doc/${PF}/examples/f/.libs + doexe tests/f/.libs/* || die "doexe failed" + fi +} |