gentoo resync : 06.08.2019

5 files changed, 186 insertions, 51 deletions

diff --git a/sci-libs/med/Manifest b/sci-libs/med/Manifest
index 7f3fba95a489..be3be43db4b2 100644
--- a/sci-libs/med/Manifest
+++ b/sci-libs/med/Manifest
@@ -1,3 +1,4 @@
+AUX med-4.0.0-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch 1683 BLAKE2B 7b5c58e14c36d08e534139df2deba0cd3dd14bc3b66ed3472f89c8693aad73b7215806b4a4a6e3696e5e54855e4deea428309cea48519c85bf99f94f6355f5ba SHA512 4175e0c4b89e541cf27932392333e08960849ebd8e2897a340bce09c7500782064afadfaa51ff8dea89d420636e8bbb28a60fa8fe23432531b233da4462f568a
 DIST med-4.0.0.tar.gz 47849098 BLAKE2B 0bc6710f7b5156e09962e3125349573989429e614a203f649843f00dea06217040ebee70e481eed9c0dd304cb7d167efcd216c3600f6954a74f262cc845fff63 SHA512 2840437010481fc5f12a56e3282f8ca5e94df541899e2b511756702f86d0f87dbf2f6e086d8e591e2bd370d8f4bab8089e7f7f939fea16354a23e2b5a4d96cd7
-EBUILD med-4.0.0.ebuild 855 BLAKE2B b10da966988f792f38bacee9d3262429f7d8f5da33b3e0d4785c77fdcf216b22ce1af488407938ad1e1a3154b139fc0385418bb35d4ced76023ee62bdf111727 SHA512 20cc36592197be6d7365cbe6410dfd3701b9236e79dfaa00d147afbff3d27151137d1f13945e2aa74be016bdae196b7a90a5e0b247ff5d14bae5cd4b466e18e6
-MISC metadata.xml 361 BLAKE2B fbd2fb8f0943722292e127f49064380cbe92df453a9c30ac6e0f4767866d81c3ca69b2605cb6269d8cc02604507068dbb967317b6cdc2d1184420bff2d592200 SHA512 a25fbe30ddfa3b62d7c7fff16a022a19145e161099fc59cb2df072461452f2c8a2a0246da7bbc3e18dd580789e514f6a85232b908e921a9762eff18059c85f94
+EBUILD med-4.0.0-r1.ebuild 2955 BLAKE2B 0ec34136f384fd172b7cf07fb8d0ed896f363f4a05b2a784bce784fb7747258aef27894c3850988536b1eb9d27c02729aa14609b4a76988eb7b4a4beafe6801b SHA512 b07717aa5cebf4421b9caa11a48adfd303ef661cc75d656f60ee0315134387028067e2d420556277248bbe408f8a97b6b0bd31f3c2726ca4a27dc0fca381e3ec
+MISC metadata.xml 743 BLAKE2B 26b8d89344c704c98c0819d9c10818667619f77ac704086ee645cbae2d15a59c36533edfe13e787da7e20f0611ddedbc2d761e33277d5a0b1f3328f2704971f9 SHA512 65a7ccf699c82ba6830d0172c87e83651f7d02182f3974fbd725e027046e4a2496fbdab9be852d1796f254622a73f697a3677fbb771a30a06a0b8d9c0a54c4bf
diff --git a/sci-libs/med/files/med-4.0.0-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch b/sci-libs/med/files/med-4.0.0-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch
new file mode 100644
index 000000000000..e9dad6d5febe
--- /dev/null
+++ b/sci-libs/med/files/med-4.0.0-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch
@@ -0,0 +1,50 @@
+From 73a776f76043d122438d716d0958489fc67bab8e Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Sun, 1 Sep 2019 22:02:42 +0200
+Subject: [PATCH] doc/html.doc/Makefile.am: install into $htmldir
+
+Patches the install-data-local target to use $htmldir instead of $docdir
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ doc/html.dox/Makefile.am | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/doc/html.dox/Makefile.am b/doc/html.dox/Makefile.am
+index 9dc5b08..3946777 100644
+--- a/doc/html.dox/Makefile.am
++++ b/doc/html.dox/Makefile.am
+@@ -36,25 +36,25 @@ html-local: $(builddir)/../dox/Doxyfile.cfg
+ 	diff $(builddir)/htmllistfile2.am.tmp $(srcdir)/htmllistfile2.am || @CP@ $(builddir)/htmllistfile2.am.tmp $(srcdir)/htmllistfile2.am
+ 
+ install-data-local: $(htmllistfile1) $(htmllistfile2) $(htmllistfile3)
+-	test -z "$(DESTDIR)$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
++	test -z "$(DESTDIR)$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
+ 	for i in $(htmllistfile1) ; do \
+ 	  $(INSTALL_DATA) \
+ 	     `test -f $$i || echo $(srcdir)/`$$i \
+-	     $(DESTDIR)$(docdir) ; \
++	     $(DESTDIR)$(htmldir) ; \
+ 	done 
+ 	for i in $(htmllistfile2) ; do \
+ 	  $(INSTALL_DATA) \
+ 	     `test -f $$i || echo $(srcdir)/`$$i \
+-	     $(DESTDIR)$(docdir) ; \
++	     $(DESTDIR)$(htmldir) ; \
+ 	done
+ 	for i in $(htmllistfile3) ; do \
+ 	  $(INSTALL_DATA) \
+ 	     `test -f $$i || echo $(srcdir)/`$$i \
+-	     $(DESTDIR)$(docdir) ; \
++	     $(DESTDIR)$(htmldir) ; \
+ 	done
+ 
+ uninstall-local: $(htmllistfile1) $(htmllistfile2) $(htmllistfile3)
+-	rm -rf $(DESTDIR)$(docdir); 
++	rm -rf $(DESTDIR)$(htmldir); 
+ 
+ .PHONY: htmlclean
+ 
+-- 
+2.22.0
+
diff --git a/sci-libs/med/med-4.0.0-r1.ebuild b/sci-libs/med/med-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..3eaa9806e84f
--- /dev/null
+++ b/sci-libs/med/med-4.0.0-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit autotools flag-o-matic fortran-2 python-single-r1
+
+#DESCRIPTION="A library to store and exchange meshed data or computation results"
+DESCRIPTION="Modeling and Exchange of Data library"
+HOMEPAGE="https://www.salome-platform.org/user-section/about/med"
+SRC_URI="https://files.salome-platform.org/Salome/other/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fortran hdf5-16-api python test"
+
+# fails to run parallel tests
+RESTRICT="test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# dev-lang/tk is needed for wish-based xmdump utility
+RDEPEND="
+	!sci-libs/libmed
+	dev-lang/tk:0=
+	>=sci-libs/hdf5-1.10.2:=[fortran=,mpi(+)]
+	virtual/mpi[fortran=]
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="python? ( >=dev-lang/swig-3.0.8 )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch"
+)
+
+DOCS=( AUTHORS ChangeLog README )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+	if use hdf5-16-api; then
+		append-cppflags -DH5_USE_16_API
+	fi
+
+	# add flag to produce python 3 code
+	sed -e 's|SWIG_PYTHON_OPT += -c++|SWIG_PYTHON_OPT += -c++ -relativeimport -py3|' \
+		-i ./python/Makefile.am || die "failed to change swig options"
+
+	# don't use version information when linking python libraries
+	sed -e 's|= -module|= -avoid-version -module|' \
+		-i ./python/Makefile.am || die "failed to change python link flags"
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-api23
+		--disable-installtest
+		--disable-static
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+		--with-hdf5="${EPREFIX}"/usr
+		--with-hdf5-lib="${EPREFIX}"/usr/$(get_libdir)
+		$(use_enable fortran)
+		$(use_enable python)
+	)
+
+	if ! use fortran; then
+		myconf+=(
+			--with-f90=no
+		)
+	fi
+
+	if use python; then
+		myconf+=(
+			--with-swig="${EPREFIX}/usr"
+		)
+	fi
+
+	export MPICC=mpicc
+	export MPICXX=mpicxx
+	export MPIFC=mpif90
+	export MPIF77=mpif77
+	export FC=mpif90
+	export F77=mpif77
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	use python && python_optimize
+
+	default
+
+	find "${ED}/usr/$(get_libdir)" -type f -name '*.la' -delete || die "failed to delete *.la files"
+
+	# remove unnecessary doc subdirs
+	rm -r "${ED}"/usr/share/doc/${PF}/{gif,jpg,odt,png} || die "failed to remove unneeded doc subdirs"
+	if ! use doc; then
+		rm -r "${ED}"/usr/share/doc/${PF}/html || die "failed to remove html documentation"
+	fi
+
+	# Prevent test executables being installed
+	if use test; then
+		rm -r "${ED}"/usr/bin/{testc,testf,testpy} || die "failed to delete test executables"
+	fi
+
+	# we don't need old 2.3.6 include files
+	rm -r "${ED}"/usr/include/2.3.6 || die "failed to delete obsolete include dir"
+
+	rm "${ED}"/usr/$(get_libdir)/libmed3.settings || die "failed to remove libmed3.settings"
+}
diff --git a/sci-libs/med/med-4.0.0.ebuild b/sci-libs/med/med-4.0.0.ebuild
deleted file mode 100644
index 721d2173d35b..000000000000
--- a/sci-libs/med/med-4.0.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Modeling and Exchange of Data library"
-HOMEPAGE="https://www.salome-platform.org/user-section/about/med"
-SRC_URI="https://files.salome-platform.org/Salome/other/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mpi"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=sci-libs/hdf5-1.10.5[mpi=]
-	mpi? ( virtual/mpi )
-"
-
-DEPEND="
-	${DEPEND}
-"
-
-src_prepare() {
-	default
-	append-cppflags -DH5_USE_16_API
-}
-
-src_configure() {
-	local myconf=(
-		--docdir="/usr/share/doc/${PF}"
-		--disable-python
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	mv "${ED}"/usr/$(get_libdir)/libmed3.settings \
-		"${ED}"/usr/share/doc/${PF}/ || die "mv failed"
-
-	rm -rf "${ED}"/usr/include/2.3.6 || die "rm failed"
-}
diff --git a/sci-libs/med/metadata.xml b/sci-libs/med/metadata.xml
index dd66d18ef4fd..508afc5ef9c1 100644
--- a/sci-libs/med/metadata.xml
+++ b/sci-libs/med/metadata.xml
@@ -5,8 +5,21 @@
 		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>waebbl@gmail.com</email>
+		<name>Bernd Waibel</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
+		<description>Gentoo Science Project</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<description>Gentoo Proxy Maintainers</description>
 	</maintainer>
+	<use>
+		<flag name="hdf5-16-api">
+			Use -DH5_USE_16_API to build the package against old 1.6 API of HDF5
+		</flag>
+	</use>
 </pkgmetadata>