From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 320B2139694 for ; Sun, 18 Jun 2017 16:23:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5E3A2254013; Sun, 18 Jun 2017 16:23:03 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3EEB6254013 for ; Sun, 18 Jun 2017 16:23:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EF1FB3419CE for ; Sun, 18 Jun 2017 16:23:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5724D7485 for ; Sun, 18 Jun 2017 16:23:00 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1497802956.e18e0f8c932e03f92919936d757cfc5a15388764.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-misc/fcgiwrap/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-misc/fcgiwrap/fcgiwrap-9999.ebuild X-VCS-Directories: www-misc/fcgiwrap/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: e18e0f8c932e03f92919936d757cfc5a15388764 X-VCS-Branch: master Date: Sun, 18 Jun 2017 16:23:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 101c31c2-2e5b-4b5b-9bcf-b411e8bbcc06 X-Archives-Hash: 9bc1c827fcded2c1464b504ba954f9b4 commit: e18e0f8c932e03f92919936d757cfc5a15388764 Author: Matt Turner gentoo org> AuthorDate: Sun Jun 18 16:02:39 2017 +0000 Commit: Matt Turner gentoo org> CommitDate: Sun Jun 18 16:22:36 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e18e0f8c www-misc/fcgiwrap: Sync ebuilds www-misc/fcgiwrap/fcgiwrap-9999.ebuild | 36 +++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/www-misc/fcgiwrap/fcgiwrap-9999.ebuild b/www-misc/fcgiwrap/fcgiwrap-9999.ebuild index 33cef8e6ed1..7f64c53a10a 100644 --- a/www-misc/fcgiwrap/fcgiwrap-9999.ebuild +++ b/www-misc/fcgiwrap/fcgiwrap-9999.ebuild @@ -1,33 +1,33 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI="5" [[ ${PV} = *9999* ]] && VCS_ECLASS="git-r3" || VCS_ECLASS="" -inherit autotools ${VCS_ECLASS} +inherit autotools systemd toolchain-funcs ${VCS_ECLASS} DESCRIPTION="Simple FastCGI wrapper for CGI scripts (CGI support for nginx)" HOMEPAGE="http://nginx.localdomain.pl/wiki/FcgiWrap" LICENSE="BSD" SLOT="0" -IUSE="" +IUSE="systemd" if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="git://github.com/gnosek/${PN}.git" KEYWORDS="" else - MY_REV="58ec209" - #SRC_URI="https://download.github.com/gnosek-${P}-4-g${MY_REV}.tar.gz" - SRC_URI="mirror://gentoo/${P}.tar.gz" - S="${WORKDIR}/gnosek-${PN}-${MY_REV}" - - KEYWORDS="~amd64 ~x86" + SRC_URI="https://github.com/gnosek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~x86" fi -DEPEND="dev-libs/fcgi" -RDEPEND="${DEPEND}" +RDEPEND=" + dev-libs/fcgi + systemd? ( sys-apps/systemd ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig" DOCS=( README.rst ) @@ -38,9 +38,23 @@ src_prepare() { sed -e '/man8dir = $(DESTDIR)/s/@prefix@//' \ -i Makefile.in || die "sed failed" + sed -e "s/libsystemd-daemon/libsystemd/" \ + -i configure.ac || die "sed failed" + tc-export CC + + # Fix systemd units for Gentoo + sed -i -e '/User/d' systemd/fcgiwrap.service || die + sed -i -e '/Group/d' systemd/fcgiwrap.service || die + eautoreconf } +src_configure() { + econf \ + $(use_with systemd) \ + "$(systemd_with_unitdir)" +} + pkg_postinst() { einfo 'You may want to install www-servers/spawn-fcgi to use with fcgiwrap.' }