Diff cpl-6.4.2 with a cpl-6.6.1

/usr/portage/sci-astronomy/cpl/cpl-6.6.1.ebuild 2020-02-15 13:10:00.000000000 +0300
1
# Copyright 1999-2014 Gentoo Foundation
1
# Copyright 1999-2020 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4
EAPI=5
4
EAPI=6
5 5

  
6 6
JAVA_PKG_OPT_USE=gasgano
7
AUTOTOOLS_AUTORECONF=1
8 7

  
9
inherit eutils java-pkg-opt-2 autotools-utils
8
inherit autotools java-pkg-opt-2 ltprune
10 9

  
11 10
DESCRIPTION="ESO common pipeline library for astronomical data reduction"
12 11
HOMEPAGE="http://www.eso.org/sci/software/cpl/"
......
20 19

  
21 20
RDEPEND="
22 21
	sci-astronomy/wcslib:0=
23
	>=sci-libs/cfitsio-3.310:0=
22
	sci-libs/cfitsio:0=
24 23
	sci-libs/fftw:3.0=
25 24
	gasgano? ( sci-astronomy/gasgano )"
26 25
DEPEND="${RDEPEND}
27 26
	doc? ( app-doc/doxygen )"
28 27

  
29 28
PATCHES=(
30
	"${FILESDIR}"/${PN}-6.1.1-check-shared-libs.patch
31
	"${FILESDIR}"/${PN}-6.1.1-use-system-ltdl.patch
29
	"${FILESDIR}"/${PN}-6.6.1-use-system-ltdl.patch
32 30
)
33 31

  
34 32
src_prepare() {
35
	# bug 422455 and remove cpu chcking
36
	sed -i \
37
		-e '/AM_C_PROTOTYPES/d' \
38
		-e '/CPL_CHECK_CPU/d' \
39
		configure.ac libcext/configure.ac || die
40
	autotools-utils_src_prepare
33
	default
34
	# remove cpu chcking
35
	sed -e '/CPL_CHECK_CPU/d' \
36
		-i configure.ac libcext/configure.ac || die
37
	# search for shared libs, not static
38
	sed -e 's/\.a/\.so/g' \
39
		-i m4/cpl.m4 || die
40
	eautoreconf
41 41
}
42 42

  
43 43
src_configure() {
......
49 49
		--with-wcs="${EPREFIX}/usr"
50 50
		--with-fftw="${EPREFIX}/usr"
51 51
		$(use_enable doc maintainer-mode)
52
		$(use_enable static-libs static)
52 53
		$(use_enable threads)
53 54
	)
54 55
	if use gasgano; then
......
61 62
	else
62 63
		myeconfargs+=( --disable-gasgano )
63 64
	fi
64
	autotools-utils_src_configure
65
	econf ${myeconfargs[@]}
65 66
}
66 67

  
67 68
src_compile() {
68
	autotools-utils_src_compile all $(use doc && echo html)
69
	default
70
	use doc && emake html
69 71
}
70 72

  
71 73
src_install() {
72
	autotools-utils_src_install all $(use doc && echo install-html)
74
	default
75
	prune_libtool_files --all
76
	use doc && emake install-html
73 77
}
Thank you!