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 1F4CC139694 for ; Tue, 11 Jul 2017 14:43:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68C762340B0; Tue, 11 Jul 2017 14:43:26 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 3381D2340B0 for ; Tue, 11 Jul 2017 14:43:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 D7B97341B5F for ; Tue, 11 Jul 2017 14:43:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BA3A37490 for ; Tue, 11 Jul 2017 14:43:22 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1499784192.21edd6ec86951ac1b5b6e43d9710d21498d300ce.grknight@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-php/files/, app-eselect/eselect-php/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-eselect/eselect-php/eselect-php-9999.ebuild app-eselect/eselect-php/files/php-fpm-launcher-r1 X-VCS-Directories: app-eselect/eselect-php/ app-eselect/eselect-php/files/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 21edd6ec86951ac1b5b6e43d9710d21498d300ce X-VCS-Branch: master Date: Tue, 11 Jul 2017 14:43:22 +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: 5e182104-3a60-4fc3-8f52-e1aa7c395895 X-Archives-Hash: 62dba38dd5623165c43f237984abff7e commit: 21edd6ec86951ac1b5b6e43d9710d21498d300ce Author: Brian Evans gentoo org> AuthorDate: Tue Jul 11 14:43:12 2017 +0000 Commit: Brian Evans gentoo org> CommitDate: Tue Jul 11 14:43:12 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21edd6ec app-eselect/eselect-php: Add live version for testing Package-Manager: Portage-2.3.6, Repoman-2.3.2 app-eselect/eselect-php/eselect-php-9999.ebuild | 66 +++++++++++++++++++++++ app-eselect/eselect-php/files/php-fpm-launcher-r1 | 9 ++++ 2 files changed, 75 insertions(+) diff --git a/app-eselect/eselect-php/eselect-php-9999.ebuild b/app-eselect/eselect-php/eselect-php-9999.ebuild new file mode 100644 index 00000000000..bbb40ca5261 --- /dev/null +++ b/app-eselect/eselect-php/eselect-php-9999.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit systemd git-r3 autotools + +DESCRIPTION="PHP eselect module" +HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/" +EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/eselect-php.git" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="" +IUSE="fpm apache2" + +# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir. +RDEPEND="app-admin/eselect + sys-apps/gentoo-functions + apache2? ( www-servers/apache[apache2_modules_dir] )" + +src_prepare() { + eapply_user + eautoreconf +} + +src_configure(){ + # We expect localstatedir to be "var"ish, not "var/lib"ish, because + # that's what PHP upstream expects. See for example the FPM + # configuration where they put logs in @localstatedir@/log. + econf --localstatedir="${EPREFIX}"/var $(use_enable apache2) +} + +src_install() { + default + [[ -f "${D}/etc/init.d/php-fpm.example.init" ]] && rm "${D}/etc/init.d/php-fpm.example.init" || die + # This can be removed after a while... + if use apache2 ; then + insinto /etc/apache2/modules.d + newins "${FILESDIR}/70_mod_php5.backcompat.conf" 70_mod_php5.conf + fi + + if use fpm ; then + newinitd "doc/php-fpm.example.init" "php-fpm" + newconfd "doc/php-fpm.example.conf" "php-fpm" + systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf" + exeinto /usr/libexec + newexe "${FILESDIR}/php-fpm-launcher-r1" php-fpm-launcher + fi +} + +pkg_postinst() { + if use apache2 ; then + elog + elog "If you are upgrading, be warned that our mod_php configuration" + elog "file has changed! You should now define -DPHP for the apache2" + elog "daemon, and inspect the new 70_mod_php.conf which has been" + elog "installed. Module loading involves eselect as of this version." + elog + elog "You must run eselect at least once to choose your apache2 target" + elog "before the new configuration will work. Afterwards, and after you" + elog "have reviewed your new configuration, you are advised to remove" + elog "the obsolete 70_mod_php5.conf file." + elog + fi +} diff --git a/app-eselect/eselect-php/files/php-fpm-launcher-r1 b/app-eselect/eselect-php/files/php-fpm-launcher-r1 new file mode 100644 index 00000000000..c7cc2e983a0 --- /dev/null +++ b/app-eselect/eselect-php/files/php-fpm-launcher-r1 @@ -0,0 +1,9 @@ +#!/bin/sh + +source /lib/gentoo/functions.sh + +PHPSLOT="${1}" +[ -z "${PHPSLOT}" ] && PHPSLOT="$(eselect php show fpm)" +shift + +exec /usr/$(get_libdir)/${PHPSLOT}/bin/php-fpm "${@}"