[gentoo-commits] proj/sci:master commit in: sci-libs/med/

["Justin Lecher" <jlec@gentoo.org>]

commit:     9cc63087abefbfa444e0816309c6698b956c0caa
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 12 18:04:08 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Nov 12 18:04:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9cc63087

sci-libs/med: Fix SRC_URI; move to EAPI=5

Package-Manager: portage-2.2.0_alpha142

---
 sci-libs/med/ChangeLog        |    6 +++-
 sci-libs/med/med-2.3.5.ebuild |   78 -----------------------------------------
 sci-libs/med/med-2.3.6.ebuild |   26 +++++---------
 sci-libs/med/metadata.xml     |    8 ++--
 4 files changed, 18 insertions(+), 100 deletions(-)

diff --git a/sci-libs/med/ChangeLog b/sci-libs/med/ChangeLog
index 7262a7f..317aeff 100644
--- a/sci-libs/med/ChangeLog
+++ b/sci-libs/med/ChangeLog
@@ -1,6 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Nov 2012; Justin Lecher <jlec@gentoo.org> -med-2.3.5.ebuild,
+  med-2.3.6.ebuild, metadata.xml:
+  Fix SRC_URI; move to EAPI=5
+
   24 Jun 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
   med-2.3.5.ebuild:
   QA fixes

diff --git a/sci-libs/med/med-2.3.5.ebuild b/sci-libs/med/med-2.3.5.ebuild
deleted file mode 100644
index db27798..0000000
--- a/sci-libs/med/med-2.3.5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2010 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-1.6.4"
-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
-}

diff --git a/sci-libs/med/med-2.3.6.ebuild b/sci-libs/med/med-2.3.6.ebuild
index 1e11c2f..21275ff 100644
--- a/sci-libs/med/med-2.3.6.ebuild
+++ b/sci-libs/med/med-2.3.6.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=5
 
 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.3/med-fichier_${PV}.tar.gz"
+SRC_URI="http://lyre.mit.edu/~powell/salome/med-fichier_${PV}.orig.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -21,9 +21,7 @@ RDEPEND=${DEPEND}
 S=${WORKDIR}/med-${PV}_SRC
 
 src_prepare() {
-	if has_version ">=sci-libs/hdf5-1.8.3"; then
-		append-flags -DH5_USE_16_API
-	fi
+	has_version ">=sci-libs/hdf5-1.8.3" &&	append-cppflags -DH5_USE_16_API
 }
 
 src_configure() {
@@ -32,23 +30,17 @@ src_configure() {
 	myconf="--docdir=/usr/share/doc/${PF}"
 	## has been desabled, in order to compile salome-med
 	#use amd64 && myconf="${myconf} --with-med_int=long"
-	econf ${myconf} || die "econf failed"
+	econf ${myconf}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install \
-		|| die "emake install failed"
+	default
 
-	rm -R "${D}"/usr/share/doc/*
-	rm -R "${D}"/usr/bin/testc
-	rm -R "${D}"/usr/bin/testf
+	rm -R "${ED}"/usr/share/doc/* "${ED}"/usr/bin/testc "${ED}"/usr/bin/testf
 
-	if use doc; then
-		dodoc AUTHORS NEWS README ChangeLog \
-			|| die "dodoc failed"
+	use doc && \
 		dohtml -r doc/index.html doc/med.css doc/html doc/jpg \
-			doc/png doc/gif doc/tests || die "dohtml failed"
-	fi
+			doc/png doc/gif doc/tests
 
 	if use examples; then
 		dodir /usr/share/doc/${PF}/examples/c/.libs

diff --git a/sci-libs/med/metadata.xml b/sci-libs/med/metadata.xml
index 2a0fb6d..3e42177 100644
--- a/sci-libs/med/metadata.xml
+++ b/sci-libs/med/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<!--<maintainer>-->
-<!--  <email>sci@gentoo.org</email>-->
-<!--</maintainer>-->
+	<herd>sci</herd>
+	<!--<maintainer>-->
+	<!--  <email>sci@gentoo.org</email>-->
+	<!--</maintainer>-->
 </pkgmetadata>