1 |
commit: e18e0f8c932e03f92919936d757cfc5a15388764 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 18 16:02:39 2017 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 18 16:22:36 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e18e0f8c |
7 |
|
8 |
www-misc/fcgiwrap: Sync ebuilds |
9 |
|
10 |
www-misc/fcgiwrap/fcgiwrap-9999.ebuild | 36 +++++++++++++++++++++++----------- |
11 |
1 file changed, 25 insertions(+), 11 deletions(-) |
12 |
|
13 |
diff --git a/www-misc/fcgiwrap/fcgiwrap-9999.ebuild b/www-misc/fcgiwrap/fcgiwrap-9999.ebuild |
14 |
index 33cef8e6ed1..7f64c53a10a 100644 |
15 |
--- a/www-misc/fcgiwrap/fcgiwrap-9999.ebuild |
16 |
+++ b/www-misc/fcgiwrap/fcgiwrap-9999.ebuild |
17 |
@@ -1,33 +1,33 @@ |
18 |
# Copyright 1999-2017 Gentoo Foundation |
19 |
# Distributed under the terms of the GNU General Public License v2 |
20 |
|
21 |
-EAPI="4" |
22 |
+EAPI="5" |
23 |
|
24 |
[[ ${PV} = *9999* ]] && VCS_ECLASS="git-r3" || VCS_ECLASS="" |
25 |
-inherit autotools ${VCS_ECLASS} |
26 |
+inherit autotools systemd toolchain-funcs ${VCS_ECLASS} |
27 |
|
28 |
DESCRIPTION="Simple FastCGI wrapper for CGI scripts (CGI support for nginx)" |
29 |
HOMEPAGE="http://nginx.localdomain.pl/wiki/FcgiWrap" |
30 |
|
31 |
LICENSE="BSD" |
32 |
SLOT="0" |
33 |
-IUSE="" |
34 |
+IUSE="systemd" |
35 |
|
36 |
if [[ ${PV} == *9999* ]]; then |
37 |
EGIT_REPO_URI="git://github.com/gnosek/${PN}.git" |
38 |
|
39 |
KEYWORDS="" |
40 |
else |
41 |
- MY_REV="58ec209" |
42 |
- #SRC_URI="https://download.github.com/gnosek-${P}-4-g${MY_REV}.tar.gz" |
43 |
- SRC_URI="mirror://gentoo/${P}.tar.gz" |
44 |
- S="${WORKDIR}/gnosek-${PN}-${MY_REV}" |
45 |
- |
46 |
- KEYWORDS="~amd64 ~x86" |
47 |
+ SRC_URI="https://github.com/gnosek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
48 |
+ KEYWORDS="~amd64 ~arm ~x86" |
49 |
fi |
50 |
|
51 |
-DEPEND="dev-libs/fcgi" |
52 |
-RDEPEND="${DEPEND}" |
53 |
+RDEPEND=" |
54 |
+ dev-libs/fcgi |
55 |
+ systemd? ( sys-apps/systemd ) |
56 |
+" |
57 |
+DEPEND="${RDEPEND} |
58 |
+ virtual/pkgconfig" |
59 |
|
60 |
DOCS=( README.rst ) |
61 |
|
62 |
@@ -38,9 +38,23 @@ src_prepare() { |
63 |
sed -e '/man8dir = $(DESTDIR)/s/@prefix@//' \ |
64 |
-i Makefile.in || die "sed failed" |
65 |
|
66 |
+ sed -e "s/libsystemd-daemon/libsystemd/" \ |
67 |
+ -i configure.ac || die "sed failed" |
68 |
+ tc-export CC |
69 |
+ |
70 |
+ # Fix systemd units for Gentoo |
71 |
+ sed -i -e '/User/d' systemd/fcgiwrap.service || die |
72 |
+ sed -i -e '/Group/d' systemd/fcgiwrap.service || die |
73 |
+ |
74 |
eautoreconf |
75 |
} |
76 |
|
77 |
+src_configure() { |
78 |
+ econf \ |
79 |
+ $(use_with systemd) \ |
80 |
+ "$(systemd_with_unitdir)" |
81 |
+} |
82 |
+ |
83 |
pkg_postinst() { |
84 |
einfo 'You may want to install www-servers/spawn-fcgi to use with fcgiwrap.' |
85 |
} |