From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A582E58973 for ; Fri, 22 Jan 2016 20:58:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6AF8A21C007; Fri, 22 Jan 2016 20:58:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F2F5A21C007 for ; Fri, 22 Jan 2016 20:58:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AD3F1340B50 for ; Fri, 22 Jan 2016 20:58:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9E23EFF9 for ; Fri, 22 Jan 2016 20:58:31 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1453496130.9d3e2859e56afb38a751b56a0e79b7428265f917.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-php/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-eselect/eselect-php/Manifest app-eselect/eselect-php/eselect-php-0.9.1.ebuild X-VCS-Directories: app-eselect/eselect-php/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 9d3e2859e56afb38a751b56a0e79b7428265f917 X-VCS-Branch: master Date: Fri, 22 Jan 2016 20:58:31 +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: c4ae081c-8833-42d9-b632-0011a5092084 X-Archives-Hash: 087512e3329687f193535fd04b248d70 commit: 9d3e2859e56afb38a751b56a0e79b7428265f917 Author: Michael Orlitzky gentoo org> AuthorDate: Fri Jan 22 20:55:30 2016 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Fri Jan 22 20:55:30 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d3e2859 app-eselect/eselect-php: add version 0.9.1 (masked for testing). Package-Manager: portage-2.2.26 app-eselect/eselect-php/Manifest | 1 + app-eselect/eselect-php/eselect-php-0.9.1.ebuild | 66 ++++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest index c1394eb..a5f7c7d 100644 --- a/app-eselect/eselect-php/Manifest +++ b/app-eselect/eselect-php/Manifest @@ -1,3 +1,4 @@ DIST eselect-php-0.7.1.bz2 2251 SHA256 10aa400e2d08bc71989366993f12ddb546a0ea29f191c40e37beba1d11d7abd7 SHA512 a6b4c1475dda9f368d799db7658c50cef7d6f71482a53a186fb1394e7ea1fff3c0ef123c82b7ca4d1e45aadb0a034d36f213fc9450766878a60d28639761cb3d WHIRLPOOL a4e45492068616ff30fd888b0cc64441a6eb6e6656e0107d00bd2cf15360dce15052d4d62089ab89d43e6bb36e126529aa101c70e8bd94a9fc916a5369463e3b DIST eselect-php-0.8.2.tar.xz 51832 SHA256 3601d0612a19ccc1c5146be2c8cd7df955a37c517817ae4f59bb3ead446f5355 SHA512 da1d71affe275d07db7a76fd98fd89ffdea6f671262a615bf4dda5a1bba8d19e5d1a3c8afe3f1eb1e70fd71298476a6f0d4e73eba7aafe7555f018f89005bc3d WHIRLPOOL dcc75d93eeaaa85f63f5329491d010debd83ed2a82af0051d59ab4aff639703a6f4c1baa5388ed2a8867d6ab610740d5a1ac86d28cddb0de5be47872ada040b4 DIST eselect-php-0.8.5.tar.xz 45800 SHA256 73b1dfab538dad971644ae9542e311cd9160e5dff3947086fc7691f0fedb835d SHA512 dbb97ddca2cd031e57e1efccc2a92dcb7aa3c4a4813c72dc5ad688b8e32e4e2ec8083781c450e9c439a9e70f04c26249e335a4eb814ac944dfc6e2d06ca724f6 WHIRLPOOL 00d8a1b6e065962105b704e8a6ab806c6f8181a4ec4c266902854ce61cb4532063412449c623ea7288e49dd64c4a8b762b9771abb89664071ff81b7b9728a8e5 +DIST eselect-php-0.9.1.tar.xz 47548 SHA256 0c9768c9dd361dd3910f26e11956fc2121467ab56c52ba80d7620b1d757bc143 SHA512 bea84b4ae386d60cea2703d1b1c2a91bdc19188dfe151619750a1979dcfbdf2a2ada05d87faa7e0f371ab003e05be6fc7dd15f96459ae6e998c62e6d5caeb64a WHIRLPOOL 3d74edfa6962942836aa3823e9901b461433ce57f2fcb624eb1652b36245599a1bc076db5cb902b675747f2255f00ac887a5e35859dbcf62279944595ea02d6c diff --git a/app-eselect/eselect-php/eselect-php-0.9.1.ebuild b/app-eselect/eselect-php/eselect-php-0.9.1.ebuild new file mode 100644 index 0000000..c02040a --- /dev/null +++ b/app-eselect/eselect-php/eselect-php-0.9.1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit depend.apache systemd + +DESCRIPTION="PHP eselect module" +HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/" +SRC_URI=" + https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz + https://dev.gentoo.org/~grknight/distfiles/${P}.tar.xz +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="fpm apache2" + +# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir. +RDEPEND="app-admin/eselect + apache2? ( www-servers/apache[apache2_modules_dir] )" + +want_apache + +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 + + # After a while, this can go, along with the want_apache call and + # depend.apache eclass. + if use apache2 ; then + insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}" + newins "${FILESDIR}/70_mod_php5.backcompat.conf" 70_mod_php5.conf + fi + + if use fpm ; then + newinitd "${FILESDIR}/php-fpm.init-r4" "php-fpm" + systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf" + exeinto /usr/libexec + doexe "${FILESDIR}/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 +}