From 70587addcdd55d10fe5eaef5e8b3cf0c4c41889a Mon Sep 17 00:00:00 2001 From: Micha Glave Date: Tue, 16 Feb 2010 15:37:57 +0100 Subject: [PATCH] patch with http://bugs.gentoo.org/attachment.cgi?id=216733 --- app-admin/php-toolkit/Manifest | 3 ++ .../php-toolkit/files/php-toolkit-fpm.patch | 42 +++++++++++++++++++ .../php-toolkit/php-toolkit-1.0.2.ebuild | 8 ++++ 3 files changed, 53 insertions(+) create mode 100644 app-admin/php-toolkit/Manifest create mode 100644 app-admin/php-toolkit/files/php-toolkit-fpm.patch diff --git a/app-admin/php-toolkit/Manifest b/app-admin/php-toolkit/Manifest new file mode 100644 index 0000000..500291c --- /dev/null +++ b/app-admin/php-toolkit/Manifest @@ -0,0 +1,3 @@ +AUX php-toolkit-fpm.patch 1584 RMD160 b3c5163eb8f31ed6f6f6370caed2a477facdb341 SHA1 251e7fcf8b9472ef40715f7897531a79c924653a SHA256 17e9e35fb16ace5f3576beb132bea393f1e2a22d149c516d40d7ac24a32efea3 +DIST php-toolkit-1.0.2.tar.bz2 5583 RMD160 c63dc32dcc4c90863f12c83b1add9c9bd2d27c7a SHA1 3f479a3e600d5401648e92ff4241a834cc306138 SHA256 f6f574d94a10e985a13ccb625e888ca84d8bffdb3bc9498b80ed68bce1e4d82a +EBUILD php-toolkit-1.0.2.ebuild 957 RMD160 6b15073a9b9b8ea5695df9b0c904e56c52208f64 SHA1 a8108aa619c5a581924ef36c9c73c4f58a9f3a3d SHA256 a61da917093a84745bb66cb415e911351981f476df3199d836bedb9f263f6301 diff --git a/app-admin/php-toolkit/files/php-toolkit-fpm.patch b/app-admin/php-toolkit/files/php-toolkit-fpm.patch new file mode 100644 index 0000000..966c71f --- /dev/null +++ b/app-admin/php-toolkit/files/php-toolkit-fpm.patch @@ -0,0 +1,42 @@ +diff -urN php-toolkit-1.0.2.orig/php-select php-toolkit-1.0.2/php-select +--- php-toolkit-1.0.2.orig/php-select 2010-01-17 13:52:25.000000000 +0300 ++++ php-toolkit-1.0.2/php-select 2010-01-17 14:00:34.000000000 +0300 +@@ -18,7 +18,7 @@ + # + # where + # is one of +-# php|php-cgi|php-devel|apache|apache2 ++# php|php-cgi|php-fpm|php-devel|apache|apache2 + # + # is the directory under /usr/lib where PHP is installed + # +@@ -107,6 +107,7 @@ + echo " apache2 - Apache webserver v2.x" + echo " php - /usr/bin/php (the CLI SAPI)" + echo " php-cgi - /usr/bin/php-cgi (the CGI SAPI)" ++ echo " php-fpm - /usr/bin/php-fpm (the FPM SAPI)" + echo " php-devel - the scripts used to build PECL extensions" + echo + echo "and where is one of:" +diff -urN php-toolkit-1.0.2.orig/php-select-modules/php-fpm.sh php-toolkit-1.0.2/php-select-modules/php-fpm.sh +--- php-toolkit-1.0.2.orig/php-select-modules/php-fpm.sh 1970-01-01 03:00:00.000000000 +0300 ++++ php-toolkit-1.0.2/php-select-modules/php-fpm.sh 2010-01-17 13:53:28.000000000 +0300 +@@ -0,0 +1,18 @@ ++# ++# /usr/share/php-select/php-fpm.sh ++# Module to manage /usr/bin/php-fpm binary ++# ++# Written for Gentoo Linux ++# ++# Author Stuart Herbert ++# (stuart@gentoo.org) ++# ++# Copyright (c) 2005 Gentoo Foundation, Inc. ++# Released under version 2 of the GNU General Public License ++# ++# ======================================================================== ++ ++G_SYMLINK_SOURCE[0]="bin/php-fpm" ++G_SYMLINK_TARGET[0]="/usr/bin/php-fpm" ++ ++. $G_MODULE_PATH/libsymlink.sh diff --git a/app-admin/php-toolkit/php-toolkit-1.0.2.ebuild b/app-admin/php-toolkit/php-toolkit-1.0.2.ebuild index 0510bb4..3ab4470 100644 --- a/app-admin/php-toolkit/php-toolkit-1.0.2.ebuild +++ b/app-admin/php-toolkit/php-toolkit-1.0.2.ebuild @@ -16,6 +16,14 @@ IUSE="" DEPEND="" +inherit eutils + +src_unpack () { + unpack ${A} + cd "${WORKDIR}" + epatch "${FILESDIR}/${PN}-fpm.patch" +} + src_configure() { sed -i php-select -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):" || \ die "GENTOO_LIBDIR sed failed"