Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/med/, sci-libs/med/files/
Date: Tue, 01 Dec 2020 07:56:18
Message-Id: 1606809362.d380deae6f2c8296632406cf6f461d10aab9749a.juippis@gentoo
1 commit: d380deae6f2c8296632406cf6f461d10aab9749a
2 Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
3 AuthorDate: Thu Nov 26 00:03:13 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 1 07:56:02 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d380deae
7
8 sci-libs/med: drop old
9
10 Package-Manager: Portage-3.0.10, Repoman-3.0.2
11 Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
12 Closes: https://github.com/gentoo/gentoo/pull/18408
13 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
14
15 ...html.doc-Makefile.am-install-into-htmldir.patch | 50 ---------
16 sci-libs/med/med-4.0.0-r1.ebuild | 118 ---------------------
17 sci-libs/med/metadata.xml | 5 -
18 3 files changed, 173 deletions(-)
19
20 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
21 deleted file mode 100644
22 index e9dad6d5feb..00000000000
23 --- a/sci-libs/med/files/med-4.0.0-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch
24 +++ /dev/null
25 @@ -1,50 +0,0 @@
26 -From 73a776f76043d122438d716d0958489fc67bab8e Mon Sep 17 00:00:00 2001
27 -From: Bernd Waibel <waebbl@×××××.com>
28 -Date: Sun, 1 Sep 2019 22:02:42 +0200
29 -Subject: [PATCH] doc/html.doc/Makefile.am: install into $htmldir
30 -
31 -Patches the install-data-local target to use $htmldir instead of $docdir
32 -
33 -Signed-off-by: Bernd Waibel <waebbl@×××××.com>
34 ----
35 - doc/html.dox/Makefile.am | 10 +++++-----
36 - 1 file changed, 5 insertions(+), 5 deletions(-)
37 -
38 -diff --git a/doc/html.dox/Makefile.am b/doc/html.dox/Makefile.am
39 -index 9dc5b08..3946777 100644
40 ---- a/doc/html.dox/Makefile.am
41 -+++ b/doc/html.dox/Makefile.am
42 -@@ -36,25 +36,25 @@ html-local: $(builddir)/../dox/Doxyfile.cfg
43 - diff $(builddir)/htmllistfile2.am.tmp $(srcdir)/htmllistfile2.am || @CP@ $(builddir)/htmllistfile2.am.tmp $(srcdir)/htmllistfile2.am
44 -
45 - install-data-local: $(htmllistfile1) $(htmllistfile2) $(htmllistfile3)
46 -- test -z "$(DESTDIR)$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
47 -+ test -z "$(DESTDIR)$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
48 - for i in $(htmllistfile1) ; do \
49 - $(INSTALL_DATA) \
50 - `test -f $$i || echo $(srcdir)/`$$i \
51 -- $(DESTDIR)$(docdir) ; \
52 -+ $(DESTDIR)$(htmldir) ; \
53 - done
54 - for i in $(htmllistfile2) ; do \
55 - $(INSTALL_DATA) \
56 - `test -f $$i || echo $(srcdir)/`$$i \
57 -- $(DESTDIR)$(docdir) ; \
58 -+ $(DESTDIR)$(htmldir) ; \
59 - done
60 - for i in $(htmllistfile3) ; do \
61 - $(INSTALL_DATA) \
62 - `test -f $$i || echo $(srcdir)/`$$i \
63 -- $(DESTDIR)$(docdir) ; \
64 -+ $(DESTDIR)$(htmldir) ; \
65 - done
66 -
67 - uninstall-local: $(htmllistfile1) $(htmllistfile2) $(htmllistfile3)
68 -- rm -rf $(DESTDIR)$(docdir);
69 -+ rm -rf $(DESTDIR)$(htmldir);
70 -
71 - .PHONY: htmlclean
72 -
73 ---
74 -2.22.0
75 -
76
77 diff --git a/sci-libs/med/med-4.0.0-r1.ebuild b/sci-libs/med/med-4.0.0-r1.ebuild
78 deleted file mode 100644
79 index 267105d848a..00000000000
80 --- a/sci-libs/med/med-4.0.0-r1.ebuild
81 +++ /dev/null
82 @@ -1,118 +0,0 @@
83 -# Copyright 1999-2020 Gentoo Authors
84 -# Distributed under the terms of the GNU General Public License v2
85 -
86 -EAPI=7
87 -
88 -PYTHON_COMPAT=( python3_{6,7} )
89 -
90 -inherit autotools flag-o-matic fortran-2 python-single-r1
91 -
92 -#DESCRIPTION="A library to store and exchange meshed data or computation results"
93 -DESCRIPTION="Modeling and Exchange of Data library"
94 -HOMEPAGE="https://www.salome-platform.org/user-section/about/med"
95 -SRC_URI="https://files.salome-platform.org/Salome/other/${P}.tar.gz"
96 -
97 -LICENSE="LGPL-3"
98 -SLOT="0"
99 -KEYWORDS="~amd64 ~x86"
100 -IUSE="doc fortran hdf5-16-api python test"
101 -
102 -# fails to run parallel tests
103 -RESTRICT="test"
104 -
105 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
106 -# dev-lang/tk is needed for wish-based xmdump utility
107 -RDEPEND="
108 - !sci-libs/libmed
109 - dev-lang/tk:0=
110 - >=sci-libs/hdf5-1.10.2:=[fortran=,mpi(+)]
111 - virtual/mpi[fortran=]
112 - python? ( ${PYTHON_DEPS} )
113 -"
114 -DEPEND="${RDEPEND}"
115 -BDEPEND="python? ( >=dev-lang/swig-3.0.8 )"
116 -
117 -PATCHES=(
118 - "${FILESDIR}/${P}-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch"
119 -)
120 -
121 -DOCS=( AUTHORS ChangeLog README )
122 -
123 -pkg_setup() {
124 - use python && python-single-r1_pkg_setup
125 - use fortran && fortran-2_pkg_setup
126 -}
127 -
128 -src_prepare() {
129 - if use hdf5-16-api; then
130 - append-cppflags -DH5_USE_16_API
131 - fi
132 -
133 - # add flag to produce python 3 code
134 - sed -e 's|SWIG_PYTHON_OPT += -c++|SWIG_PYTHON_OPT += -c++ -relativeimport -py3|' \
135 - -i ./python/Makefile.am || die "failed to change swig options"
136 -
137 - # don't use version information when linking python libraries
138 - sed -e 's|= -module|= -avoid-version -module|' \
139 - -i ./python/Makefile.am || die "failed to change python link flags"
140 -
141 - default
142 - eautoreconf
143 -}
144 -
145 -src_configure() {
146 - local myconf=(
147 - --disable-api23
148 - --disable-installtest
149 - --disable-static
150 - --with-hdf5="${EPREFIX}"/usr
151 - --with-hdf5-lib="${EPREFIX}"/usr/$(get_libdir)
152 - $(use_enable fortran)
153 - $(use_enable python)
154 - )
155 -
156 - if ! use fortran; then
157 - myconf+=(
158 - --with-f90=no
159 - )
160 - fi
161 -
162 - if use python; then
163 - myconf+=(
164 - --with-swig="${EPREFIX}/usr"
165 - )
166 - fi
167 -
168 - export MPICC=mpicc
169 - export MPICXX=mpicxx
170 - export MPIFC=mpif90
171 - export MPIF77=mpif77
172 - export FC=mpif90
173 - export F77=mpif77
174 -
175 - econf "${myconf[@]}"
176 -}
177 -
178 -src_install() {
179 - use python && python_optimize
180 -
181 - default
182 -
183 - find "${ED}/usr/$(get_libdir)" -type f -name '*.la' -delete || die "failed to delete *.la files"
184 -
185 - # remove unnecessary doc subdirs
186 - rm -r "${ED}"/usr/share/doc/${PF}/{gif,jpg,odt,png} || die "failed to remove unneeded doc subdirs"
187 - if ! use doc; then
188 - rm -r "${ED}"/usr/share/doc/${PF}/html || die "failed to remove html documentation"
189 - fi
190 -
191 - # Prevent test executables being installed
192 - if use test; then
193 - rm -r "${ED}"/usr/bin/{testc,testf,testpy} || die "failed to delete test executables"
194 - fi
195 -
196 - # we don't need old 2.3.6 include files
197 - rm -r "${ED}"/usr/include/2.3.6 || die "failed to delete obsolete include dir"
198 -
199 - rm "${ED}"/usr/$(get_libdir)/libmed3.settings || die "failed to remove libmed3.settings"
200 -}
201
202 diff --git a/sci-libs/med/metadata.xml b/sci-libs/med/metadata.xml
203 index 508afc5ef9c..9f49ce730ae 100644
204 --- a/sci-libs/med/metadata.xml
205 +++ b/sci-libs/med/metadata.xml
206 @@ -17,9 +17,4 @@
207 <email>proxy-maint@g.o</email>
208 <description>Gentoo Proxy Maintainers</description>
209 </maintainer>
210 - <use>
211 - <flag name="hdf5-16-api">
212 - Use -DH5_USE_16_API to build the package against old 1.6 API of HDF5
213 - </flag>
214 - </use>
215 </pkgmetadata>