Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/fcgi/
Date: Tue, 18 Feb 2020 19:11:52
Message-Id: 1582053064.5069d2b1c7b274a34c1091c6eb59d1121b8af402.soap@gentoo
1 commit: 5069d2b1c7b274a34c1091c6eb59d1121b8af402
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 18 19:11:04 2020 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 18 19:11:04 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5069d2b1
7
8 dev-libs/fcgi: Port to EAPI 7
9
10 Package-Manager: Portage-2.3.89, Repoman-2.3.20
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild | 47 +++++++++++++-----------
14 1 file changed, 26 insertions(+), 21 deletions(-)
15
16 diff --git a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
17 index ce2b68111c9..2cf2e56dae2 100644
18 --- a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
19 +++ b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
20 @@ -1,9 +1,9 @@
21 # Copyright 1999-2020 Gentoo Authors
22 # Distributed under the terms of the GNU General Public License v2
23
24 -EAPI="4"
25 +EAPI=7
26
27 -inherit eutils autotools multilib
28 +inherit autotools
29
30 DESCRIPTION="FastCGI Developer's Kit"
31 HOMEPAGE="http://www.fastcgi.com/"
32 @@ -14,38 +14,43 @@ SLOT="0"
33 KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
34 IUSE="html"
35
36 -DEPEND=""
37 -RDEPEND=""
38 +S="${WORKDIR}/${PN}-2.4.1-SNAP-0910052249"
39
40 -S="${WORKDIR}/fcgi-2.4.1-SNAP-0910052249"
41 +PATCHES=(
42 + "${FILESDIR}"/${PN}-2.4.0-Makefile.patch
43 + "${FILESDIR}"/${PN}-2.4.0-clientdata-pointer.patch
44 + "${FILESDIR}"/${PN}-2.4.0-html-updates.patch
45 + "${FILESDIR}"/${PN}-2.4.1_pre0311112127-gcc44.patch
46 + "${FILESDIR}"/${P}-link.patch
47 + "${FILESDIR}"/${P}-poll.patch
48 +)
49
50 src_prepare() {
51 - epatch "${FILESDIR}/fcgi-2.4.0-Makefile.patch"
52 - epatch "${FILESDIR}/fcgi-2.4.0-clientdata-pointer.patch"
53 - epatch "${FILESDIR}/fcgi-2.4.0-html-updates.patch"
54 - epatch "${FILESDIR}"/fcgi-2.4.1_pre0311112127-gcc44.patch
55 - epatch "${FILESDIR}"/${P}-link.patch
56 - epatch "${FILESDIR}"/${P}-poll.patch
57 -
58 + default
59 eautoreconf
60 }
61
62 -src_install() {
63 - emake DESTDIR="${D}" install LIBRARY_PATH="${ED}/usr/$(get_libdir)"
64 +src_configure() {
65 + econf --disable-static
66 +}
67
68 - dodoc README
69 +src_install() {
70 + emake DESTDIR="${D}" install LIBRARY_PATH="${ED}"/usr/$(get_libdir)
71 + einstalldocs
72
73 # install the manpages into the right place
74 doman doc/*.[13]
75
76 # Only install the html documentation if USE=html
77 - if use html ; then
78 - dohtml "${S}"/doc/*/*
79 - insinto /usr/share/doc/${PF}/html
80 - doins -r "${S}/images"
81 + if use html; then
82 + docinto html
83 + dodoc -r doc/*/* images
84 fi
85
86 # install examples in the right place
87 - insinto /usr/share/doc/${PF}/examples
88 - doins "${S}/examples/"*.c
89 + docinto examples
90 + dodoc examples/*.c
91 +
92 + # no static archives
93 + find "${D}" -name '*.la' -delete || die
94 }