Attachment #323036 for bug #433842

Lines 3-9 Link Here

(-)/usr/portage/dev-lang/php/files/eblits/common-v2.eblit (-1 / +1 lines)
3	# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/common-v2.eblit,v 1.3 2010/10/08 18:25:10 olemarkus Exp $	3	# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/common-v2.eblit,v 1.3 2010/10/08 18:25:10 olemarkus Exp $
4		4
5	php_set_ini_dir() {	5	php_set_ini_dir() {
6	PHP_INI_DIR="/etc/php/${1}-php${SLOT}"	6	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
7	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"	7	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
8	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"	8	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
9	}	9	}




	addpredict /usr/share/snmp/mibs/.index
	addpredict /var/lib/net-snmp/mib_indexes

	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"

	# This is a global variable and should be in caps. It isn't because the
	# phpconfutils eclass relies on exactly this name...

	#                             extension	      USE flag        shared
	my_conf+="
	$(use_enable bcmath bcmath )
	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
	$(use_enable calendar calendar )
	$(use_enable ctype ctype )
	$(use_with curl curl "${EPREFIX}"/usr)
	$(use_with curlwrappers curlwrappers "${EPREFIX}"/usr)
	$(use_enable xml dom )
	$(use_with enchant enchant "${EPREFIX}"/usr)
	$(use_enable exif exif )
	$(use_enable fileinfo fileinfo )
	$(use_enable filter filter )
	$(use_enable ftp ftp )
	$(use_with nls gettext "${EPREFIX}"/usr)
	$(use_with gmp gmp "${EPREFIX}"/usr)
	$(use_enable hash hash )
	$(use_with mhash mhash "${EPREFIX}"/usr)
	$(use_with iconv iconv )
	$(use_enable intl intl )
	$(use_enable ipv6 ipv6 )
	$(use_enable json json )
	$(use_with kerberos kerberos "${EPREFIX}"/usr)
	$(use_enable xml libxml )
	$(use_with xml libxml-dir "${EPREFIX}"/usr)
	$(use_enable unicode mbstring )
	$(use_with crypt mcrypt "${EPREFIX}"/usr)
	$(use_with mssql mssql "${EPREFIX}"/usr)
	$(use_with unicode onig "${EPREFIX}"/usr)
	$(use_with ssl openssl "${EPREFIX}"/usr)
	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
	$(use_enable pcntl pcntl )
	$(use_enable phar phar )
	$(use_enable pdo pdo )
	$(use_with postgres pgsql "${EPREFIX}"/usr)
	$(use_enable posix posix )
	$(use_with spell pspell "${EPREFIX}"/usr)
	$(use_with recode recode "${EPREFIX}"/usr)
	$(use_enable simplexml simplexml )
	$(use_enable sharedmem shmop )
	$(use_with snmp snmp "${EPREFIX}"/usr)
	$(use_enable soap soap )
	$(use_enable sockets sockets )
	$(use_with sqlite3 sqlite3 "${EPREFIX}"/usr)
	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
	$(use_enable sysvipc sysvmsg )
	$(use_enable sysvipc sysvsem )
	$(use_enable sysvipc sysvshm )
	$(use_with tidy tidy "${EPREFIX}"/usr)
	$(use_enable tokenizer tokenizer )
	$(use_enable wddx wddx )
	$(use_enable xml xml )
	$(use_enable xmlreader xmlreader )
	$(use_enable xmlwriter xmlwriter )
	$(use_with xmlrpc xmlrpc "${EPREFIX}"/usr)
	$(use_with xsl xsl "${EPREFIX}"/usr)
	$(use_enable zip zip )
	$(use_with zlib zlib "${EPREFIX}"/usr)
	$(use_enable debug debug )"

	# DBA support


	# DBA drivers support
	my_conf+="
	$(use_with cdb cdb ${EPREFIX}/usr)
	$(use_with berkdb db4 ${EPREFIX}/usr)
	$(use_enable flatfile flatfile )
	$(use_with gdbm gdbm ${EPREFIX}/usr)
	$(use_enable inifile inifile )
	$(use_with qdbm qdbm ${EPREFIX}/usr)"

	# Support for the GD graphics library
	my_conf+="
	$(use_with truetype freetype-dir ${EPREFIX}/usr)
	$(use_with truetype t1lib ${EPREFIX}/usr)
	$(use_enable cjk gd-jis-conv )
	$(use_with gd jpeg-dir ${EPREFIX}/usr)
	$(use_with gd png-dir ${EPREFIX}/usr)
	$(use_with xpm xpm-dir ${EPREFIX}/usr)"
	# enable gd last, so configure can pick up the previous settings
	my_conf+="
	$(use_with gd gd ${EPREFIX}/usr)"

	# IMAP support
	if use imap ; then
	    my_conf+="
		$(use_with imap imap ${EPREFIX}/usr)
		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
	fi

	# Interbase/firebird support
	
	if use firebird ; then
	    my_conf+="
		$(use_with firebird interbase ${EPREFIX}/usr)"
	fi

	# LDAP support
	if use ldap ; then
	    my_conf+="
		$(use_with ldap ldap ${EPREFIX}/usr)
		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
	fi

	# MySQL support

			$(use_with mysql mysql mysqlnd)"
		else
	        my_conf+="
			$(use_with mysql mysql ${EPREFIX}/usr)"
		fi
	    my_conf+="
		$(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
	fi

	# MySQLi support

		$(use_with mysqli mysqli mysqlnd)"
	else
	    my_conf+="
		$(use_with mysqli mysqli ${EPREFIX}/usr/bin/mysql_config)"
	fi

	# ODBC support
	if use odbc ; then
	    my_conf+="
		$(use_with odbc unixODBC ${EPREFIX}/usr)"
	fi

	if use iodbc ; then
	    my_conf+="
		$(use_with iodbc iodbc ${EPREFIX}/usr)"
	fi

	# Oracle support

			$(use_with mysql pdo-mysql mysqlnd)"
		else
	        my_conf+="
			$(use_with mysql pdo-mysql ${EPREFIX}/usr)"
		fi
	    my_conf+="
		$(use_with postgres pdo-pgsql )
		$(use_with sqlite3 pdo-sqlite ${EPREFIX}/usr)
		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
		if use oci8-instant-client ; then
	        my_conf+="
			$(use_with oci8-instant-client pdo-oci)"


	# readline/libedit support
	my_conf+="
	$(use_with readline readline ${EPREFIX}/usr)
	$(use_with libedit libedit ${EPREFIX}/usr)"

	# Session support
	if use session ; then
	    my_conf+="
		$(use_with sharedmem mm ${EPREFIX}/usr)"
	else
	    my_conf+="
		$(use_enable session session )"

	# we use the system copy of pcre
	# --with-pcre-regex affects ext/pcre
	# --with-pcre-dir affects ext/filter and ext/zip
	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"

	# Catch CFLAGS problems
    # Fixes bug #14067.


				apache2)
					if [[ "${one_sapi}" == "${sapi}" ]] ; then
						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
					else
						sapi_conf="${sapi_conf} --without-apxs2"
					fi




	done

	# Makefile forgets to create this before trying to write to it...
	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"

	# Install php environment (without any sapis)
	cd "${WORKDIR}/sapis-build/$first_sapi"

		install-build install-headers install-programs \
		|| die "emake install failed"

	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"

	# Create the directory where we'll put version-specific php scripts
	keepdir /usr/share/php${PHP_MV}

			if [[ "${sapi}" == "apache2" ]] ; then
				# We're specifically not using emake install-sapi as libtool
				# may cause unnecessary relink failures (see bug #351266)
				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
				keepdir "/usr/$(get_libdir)/apache2/modules"
			else
				# needed each time, php_install_ini would reset it
				into "${PHP_DESTDIR#${EPREFIX}}"
			    case "$sapi" in
					cli)
						source="sapi/cli/php"

						source="sapi/fpm/php-fpm"
						;;
					embed)
						source="libs/libphp${PHP_MV}$(get_libname)"
						;;
					*)
						die "unhandled sapi in src_install"
						;;
				esac

				if [[ "${source}" == *"$(get_libname)" ]]; then 
					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
				else
					dobin "${source}" || die "Unable to install ${sapi} sapi"

	newenvd "${FILESDIR}/20php5-envd" \
		"20php${SLOT}"
	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
		"${ED}/etc/env.d/20php${SLOT}"
	sed -e "s|php5|php${SLOT}|g" -i \
		"${ED}/etc/env.d/20php${SLOT}"

	# set php-config variable correctly (bug #278439)
	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
}

php_install_ini() {

	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"

	# default to /tmp for save_path, bug #282768
	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"

	# Set the extension dir
	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"

	# Set the include path to point to where we want to find PEAR packages
	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
	
	dodir "${PHP_INI_DIR#${EPREFIX}}"
	insinto "${PHP_INI_DIR#${EPREFIX}}"
	newins "${phpinisrc}" "${PHP_INI_FILE}"

	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
	elog

	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"

	# SAPI-specific handling
	if [[ "${sapi}" == "apache2" ]] ; then
		insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
		newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \
			"70_mod_php${PHP_MV}.conf"
	fi

	if [[ "${sapi}" == "fpm" ]] ; then
        [[ -z ${PHP_FPM_INIT_VER} ]] && PHP_FPM_INIT_VER=3
        [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
		einfo "Installing FPM CGI config file php-fpm.conf"
		insinto "${PHP_INI_DIR#${EPREFIX}}"
		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
		dodir "/etc/init.d"
		insinto "/etc/init.d"
		newinitd "${FILESDIR}/php-fpm-r${PHP_FPM_INIT_VER}.init" "php-fpm"
		# dosym "${PHP_DESTDIR#${EPREFIX}}/bin/php-fpm" "/usr/bin/php-fpm"
		
		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
	fi

  # Install PHP ini files into /usr/share/php

Return to bug 433842

Lines 6-12 Link Here

(-)/usr/portage/dev-lang/php/files/eblits/src_configure-v54.eblit (-52 / +53 lines)
6	addpredict /usr/share/snmp/mibs/.index	6	addpredict /usr/share/snmp/mibs/.index
7	addpredict /var/lib/net-snmp/mib_indexes	7	addpredict /var/lib/net-snmp/mib_indexes
8		8
9	PHP_DESTDIR="/usr/$(get_libdir)/php${SLOT}"	9	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
10		10
11	# This is a global variable and should be in caps. It isn't because the	11	# This is a global variable and should be in caps. It isn't because the
12	# phpconfutils eclass relies on exactly this name...	12	# phpconfutils eclass relies on exactly this name...
Lines 23-82 Link Here
23	# extension USE flag shared	23	# extension USE flag shared
24	my_conf+="	24	my_conf+="
25	$(use_enable bcmath bcmath )	25	$(use_enable bcmath bcmath )
26	$(use_with bzip2 bz2 )	26	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
27	$(use_enable calendar calendar )	27	$(use_enable calendar calendar )
28	$(use_enable ctype ctype )	28	$(use_enable ctype ctype )
29	$(use_with curl curl )	29	$(use_with curl curl "${EPREFIX}"/usr)
30	$(use_with curlwrappers curlwrappers )	30	$(use_with curlwrappers curlwrappers "${EPREFIX}"/usr)
31	$(use_enable xml dom )	31	$(use_enable xml dom )
32	$(use_with enchant enchant /usr)	32	$(use_with enchant enchant "${EPREFIX}"/usr)
33	$(use_enable exif exif )	33	$(use_enable exif exif )
34	$(use_enable fileinfo fileinfo )	34	$(use_enable fileinfo fileinfo )
35	$(use_enable filter filter )	35	$(use_enable filter filter )
36	$(use_enable ftp ftp )	36	$(use_enable ftp ftp )
37	$(use_with nls gettext )	37	$(use_with nls gettext "${EPREFIX}"/usr)
38	$(use_with gmp gmp )	38	$(use_with gmp gmp "${EPREFIX}"/usr)
39	$(use_enable hash hash )	39	$(use_enable hash hash )
40	$(use_with mhash mhash )	40	$(use_with mhash mhash "${EPREFIX}"/usr)
41	$(use_with iconv iconv )	41	$(use_with iconv iconv )
42	$(use_enable intl intl )	42	$(use_enable intl intl )
43	$(use_enable ipv6 ipv6 )	43	$(use_enable ipv6 ipv6 )
44	$(use_enable json json )	44	$(use_enable json json )
45	$(use_with kerberos kerberos /usr)	45	$(use_with kerberos kerberos "${EPREFIX}"/usr)
46	$(use_enable xml libxml )	46	$(use_enable xml libxml )
		47	$(use_with xml libxml-dir "${EPREFIX}"/usr)
47	$(use_enable unicode mbstring )	48	$(use_enable unicode mbstring )
48	$(use_with crypt mcrypt )	49	$(use_with crypt mcrypt "${EPREFIX}"/usr)
49	$(use_with mssql mssql )	50	$(use_with mssql mssql "${EPREFIX}"/usr)
50	$(use_with unicode onig /usr)	51	$(use_with unicode onig "${EPREFIX}"/usr)
51	$(use_with ssl openssl )	52	$(use_with ssl openssl "${EPREFIX}"/usr)
52	$(use_with ssl openssl-dir /usr)	53	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
53	$(use_enable pcntl pcntl )	54	$(use_enable pcntl pcntl )
54	$(use_enable phar phar )	55	$(use_enable phar phar )
55	$(use_enable pdo pdo )	56	$(use_enable pdo pdo )
56	$(use_with postgres pgsql )	57	$(use_with postgres pgsql "${EPREFIX}"/usr)
57	$(use_enable posix posix )	58	$(use_enable posix posix )
58	$(use_with spell pspell )	59	$(use_with spell pspell "${EPREFIX}"/usr)
59	$(use_with recode recode )	60	$(use_with recode recode "${EPREFIX}"/usr)
60	$(use_enable simplexml simplexml )	61	$(use_enable simplexml simplexml )
61	$(use_enable sharedmem shmop )	62	$(use_enable sharedmem shmop )
62	$(use_with snmp snmp )	63	$(use_with snmp snmp "${EPREFIX}"/usr)
63	$(use_enable soap soap )	64	$(use_enable soap soap )
64	$(use_enable sockets sockets )	65	$(use_enable sockets sockets )
65	$(use_with sqlite3 sqlite3 /usr)	66	$(use_with sqlite3 sqlite3 "${EPREFIX}"/usr)
66	$(use_with sybase-ct sybase-ct /usr)	67	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
67	$(use_enable sysvipc sysvmsg )	68	$(use_enable sysvipc sysvmsg )
68	$(use_enable sysvipc sysvsem )	69	$(use_enable sysvipc sysvsem )
69	$(use_enable sysvipc sysvshm )	70	$(use_enable sysvipc sysvshm )
70	$(use_with tidy tidy )	71	$(use_with tidy tidy "${EPREFIX}"/usr)
71	$(use_enable tokenizer tokenizer )	72	$(use_enable tokenizer tokenizer )
72	$(use_enable wddx wddx )	73	$(use_enable wddx wddx )
73	$(use_enable xml xml )	74	$(use_enable xml xml )
74	$(use_enable xmlreader xmlreader )	75	$(use_enable xmlreader xmlreader )
75	$(use_enable xmlwriter xmlwriter )	76	$(use_enable xmlwriter xmlwriter )
76	$(use_with xmlrpc xmlrpc )	77	$(use_with xmlrpc xmlrpc "${EPREFIX}"/usr)
77	$(use_with xsl xsl )	78	$(use_with xsl xsl "${EPREFIX}"/usr)
78	$(use_enable zip zip )	79	$(use_enable zip zip )
79	$(use_with zlib zlib )	80	$(use_with zlib zlib "${EPREFIX}"/usr)
80	$(use_enable debug debug )"	81	$(use_enable debug debug )"
81		82
82	# DBA support	83	# DBA support
Lines 87-130 Link Here
87		88
88	# DBA drivers support	89	# DBA drivers support
89	my_conf+="	90	my_conf+="
90	$(use_with cdb cdb )	91	$(use_with cdb cdb ${EPREFIX}/usr)
91	$(use_with berkdb db4 )	92	$(use_with berkdb db4 ${EPREFIX}/usr)
92	$(use_enable flatfile flatfile )	93	$(use_enable flatfile flatfile )
93	$(use_with gdbm gdbm )	94	$(use_with gdbm gdbm ${EPREFIX}/usr)
94	$(use_enable inifile inifile )	95	$(use_enable inifile inifile )
95	$(use_with qdbm qdbm )"	96	$(use_with qdbm qdbm ${EPREFIX}/usr)"
96		97
97	# Support for the GD graphics library	98	# Support for the GD graphics library
98	my_conf+="	99	my_conf+="
99	$(use_with truetype freetype-dir /usr)	100	$(use_with truetype freetype-dir ${EPREFIX}/usr)
100	$(use_with truetype t1lib /usr)	101	$(use_with truetype t1lib ${EPREFIX}/usr)
101	$(use_enable cjk gd-jis-conv )	102	$(use_enable cjk gd-jis-conv )
102	$(use_with gd jpeg-dir /usr)	103	$(use_with gd jpeg-dir ${EPREFIX}/usr)
103	$(use_with gd png-dir /usr)	104	$(use_with gd png-dir ${EPREFIX}/usr)
104	$(use_with xpm xpm-dir /usr)"	105	$(use_with xpm xpm-dir ${EPREFIX}/usr)"
105	# enable gd last, so configure can pick up the previous settings	106	# enable gd last, so configure can pick up the previous settings
106	my_conf+="	107	my_conf+="
107	$(use_with gd gd )"	108	$(use_with gd gd ${EPREFIX}/usr)"
108		109
109	# IMAP support	110	# IMAP support
110	if use imap ; then	111	if use imap ; then
111	my_conf+="	112	my_conf+="
112	$(use_with imap imap )	113	$(use_with imap imap ${EPREFIX}/usr)
113	$(use_with ssl imap-ssl )"	114	$(use_with ssl imap-ssl ${EPREFIX}/usr)"
114	fi	115	fi
115		116
116	# Interbase/firebird support	117	# Interbase/firebird support
117		118
118	if use firebird ; then	119	if use firebird ; then
119	my_conf+="	120	my_conf+="
120	$(use_with firebird interbase /usr)"	121	$(use_with firebird interbase ${EPREFIX}/usr)"
121	fi	122	fi
122		123
123	# LDAP support	124	# LDAP support
124	if use ldap ; then	125	if use ldap ; then
125	my_conf+="	126	my_conf+="
126	$(use_with ldap ldap )	127	$(use_with ldap ldap ${EPREFIX}/usr)
127	$(use_with ldap-sasl ldap-sasl )"	128	$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
128	fi	129	fi
129		130
130	# MySQL support	131	# MySQL support
Lines 134-143 Link Here
134	$(use_with mysql mysql mysqlnd)"	135	$(use_with mysql mysql mysqlnd)"
135	else	136	else
136	my_conf+="	137	my_conf+="
137	$(use_with mysql mysql /usr)"	138	$(use_with mysql mysql ${EPREFIX}/usr)"
138	fi	139	fi
139	my_conf+="	140	my_conf+="
140	$(use_with mysql mysql-sock /var/run/mysqld/mysqld.sock)"	141	$(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
141	fi	142	fi
142		143
143	# MySQLi support	144	# MySQLi support
Lines 146-163 Link Here
146	$(use_with mysqli mysqli mysqlnd)"	147	$(use_with mysqli mysqli mysqlnd)"
147	else	148	else
148	my_conf+="	149	my_conf+="
149	$(use_with mysqli mysqli /usr/bin/mysql_config)"	150	$(use_with mysqli mysqli ${EPREFIX}/usr/bin/mysql_config)"
150	fi	151	fi
151		152
152	# ODBC support	153	# ODBC support
153	if use odbc ; then	154	if use odbc ; then
154	my_conf+="	155	my_conf+="
155	$(use_with odbc unixODBC /usr)"	156	$(use_with odbc unixODBC ${EPREFIX}/usr)"
156	fi	157	fi
157		158
158	if use iodbc ; then	159	if use iodbc ; then
159	my_conf+="	160	my_conf+="
160	$(use_with iodbc iodbc /usr)"	161	$(use_with iodbc iodbc ${EPREFIX}/usr)"
161	fi	162	fi
162		163
163	# Oracle support	164	# Oracle support
Lines 175-186 Link Here
175	$(use_with mysql pdo-mysql mysqlnd)"	176	$(use_with mysql pdo-mysql mysqlnd)"
176	else	177	else
177	my_conf+="	178	my_conf+="
178	$(use_with mysql pdo-mysql /usr)"	179	$(use_with mysql pdo-mysql ${EPREFIX}/usr)"
179	fi	180	fi
180	my_conf+="	181	my_conf+="
181	$(use_with postgres pdo-pgsql )	182	$(use_with postgres pdo-pgsql )
182	$(use_with sqlite3 pdo-sqlite /usr)	183	$(use_with sqlite3 pdo-sqlite ${EPREFIX}/usr)
183	$(use_with odbc pdo-odbc unixODBC,/usr)"	184	$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
184	if use oci8-instant-client ; then	185	if use oci8-instant-client ; then
185	my_conf+="	186	my_conf+="
186	$(use_with oci8-instant-client pdo-oci)"	187	$(use_with oci8-instant-client pdo-oci)"
Lines 189-201 Link Here
189		190
190	# readline/libedit support	191	# readline/libedit support
191	my_conf+="	192	my_conf+="
192	$(use_with readline readline )	193	$(use_with readline readline ${EPREFIX}/usr)
193	$(use_with libedit libedit )"	194	$(use_with libedit libedit ${EPREFIX}/usr)"
194		195
195	# Session support	196	# Session support
196	if use session ; then	197	if use session ; then
197	my_conf+="	198	my_conf+="
198	$(use_with sharedmem mm )"	199	$(use_with sharedmem mm ${EPREFIX}/usr)"
199	else	200	else
200	my_conf+="	201	my_conf+="
201	$(use_enable session session )"	202	$(use_enable session session )"
Lines 208-214 Link Here
208	# we use the system copy of pcre	209	# we use the system copy of pcre
209	# --with-pcre-regex affects ext/pcre	210	# --with-pcre-regex affects ext/pcre
210	# --with-pcre-dir affects ext/filter and ext/zip	211	# --with-pcre-dir affects ext/filter and ext/zip
211	my_conf="${my_conf} --with-pcre-regex=/usr --with-pcre-dir=/usr"	212	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
212		213
213	# Catch CFLAGS problems	214	# Catch CFLAGS problems
214	# Fixes bug #14067.	215	# Fixes bug #14067.
Lines 244-250 Link Here
244		245
245	apache2)	246	apache2)
246	if [[ "${one_sapi}" == "${sapi}" ]] ; then	247	if [[ "${one_sapi}" == "${sapi}" ]] ; then
247	sapi_conf="${sapi_conf} --with-apxs2=/usr/sbin/apxs"	248	sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
248	else	249	else
249	sapi_conf="${sapi_conf} --without-apxs2"	250	sapi_conf="${sapi_conf} --without-apxs2"
250	fi	251	fi

Lines 16-22 Link Here

(-)/usr/portage/dev-lang/php/files/eblits/src_install-v3.eblit (-24 / +24 lines)
16	done	16	done
17		17
18	# Makefile forgets to create this before trying to write to it...	18	# Makefile forgets to create this before trying to write to it...
19	dodir "${PHP_DESTDIR}/bin"	19	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
20		20
21	# Install php environment (without any sapis)	21	# Install php environment (without any sapis)
22	cd "${WORKDIR}/sapis-build/$first_sapi"	22	cd "${WORKDIR}/sapis-build/$first_sapi"
Lines 24-30 Link Here
24	install-build install-headers install-programs \	24	install-build install-headers install-programs \
25	\|\| die "emake install failed"	25	\|\| die "emake install failed"
26		26
27	local extension_dir="$("${D}/${PHP_DESTDIR}/bin/php-config" --extension-dir)"	27	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
28		28
29	# Create the directory where we'll put version-specific php scripts	29	# Create the directory where we'll put version-specific php scripts
30	keepdir /usr/share/php${PHP_MV}	30	keepdir /usr/share/php${PHP_MV}
Lines 40-51 Link Here
40	if [[ "${sapi}" == "apache2" ]] ; then	40	if [[ "${sapi}" == "apache2" ]] ; then
41	# We're specifically not using emake install-sapi as libtool	41	# We're specifically not using emake install-sapi as libtool
42	# may cause unnecessary relink failures (see bug #351266)	42	# may cause unnecessary relink failures (see bug #351266)
43	insinto "${PHP_DESTDIR}/apache2/"	43	insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
44	newins ".libs/libphp5.so" "libphp${PHP_MV}.so"	44	newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
45	keepdir "/usr/$(get_libdir)/apache2/modules"	45	keepdir "/usr/$(get_libdir)/apache2/modules"
46	else	46	else
47	# needed each time, php_install_ini would reset it	47	# needed each time, php_install_ini would reset it
48	into "${PHP_DESTDIR}"	48	into "${PHP_DESTDIR#${EPREFIX}}"
49	case "$sapi" in	49	case "$sapi" in
50	cli)	50	cli)
51	source="sapi/cli/php"	51	source="sapi/cli/php"
Lines 57-70 Link Here
57	source="sapi/fpm/php-fpm"	57	source="sapi/fpm/php-fpm"
58	;;	58	;;
59	embed)	59	embed)
60	source="libs/libphp${PHP_MV}.so"	60	source="libs/libphp${PHP_MV}$(get_libname)"
61	;;	61	;;
62	*)	62	*)
63	die "unhandled sapi in src_install"	63	die "unhandled sapi in src_install"
64	;;	64	;;
65	esac	65	esac
66		66
67	if [[ "${source: -3}" == ".so" ]]; then	67	if [[ "${source}" == *"$(get_libname)" ]]; then
68	dolib.so "${source}" \|\| die "Unable to install ${sapi} sapi"	68	dolib.so "${source}" \|\| die "Unable to install ${sapi} sapi"
69	else	69	else
70	dobin "${source}" \|\| die "Unable to install ${sapi} sapi"	70	dobin "${source}" \|\| die "Unable to install ${sapi} sapi"
Lines 87-99 Link Here
87	newenvd "${FILESDIR}/20php5-envd" \	87	newenvd "${FILESDIR}/20php5-envd" \
88	"20php${SLOT}"	88	"20php${SLOT}"
89	sed -e "s\|/lib/\|/$(get_libdir)/\|g" -i \	89	sed -e "s\|/lib/\|/$(get_libdir)/\|g" -i \
90	"${D}/etc/env.d/20php${SLOT}"	90	"${ED}/etc/env.d/20php${SLOT}"
91	sed -e "s\|php5\|php${SLOT}\|g" -i \	91	sed -e "s\|php5\|php${SLOT}\|g" -i \
92	"${D}/etc/env.d/20php${SLOT}"	92	"${ED}/etc/env.d/20php${SLOT}"
93		93
94	# set php-config variable correctly (bug #278439)	94	# set php-config variable correctly (bug #278439)
95	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \	95	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
96	"${D}/usr/$(get_libdir)/php${SLOT}/bin/php-config"	96	"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
97	}	97	}
98		98
99	php_install_ini() {	99	php_install_ini() {
Lines 106-149 Link Here
106	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"	106	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
107		107
108	# default to /tmp for save_path, bug #282768	108	# default to /tmp for save_path, bug #282768
109	sed -e 's\|^;session.save_path .*$\|session.save_path = "/tmp"\|g' -i "${phpinisrc}"	109	sed -e 's\|^;session.save_path .*$\|session.save_path = "'"${EPREFIX}"'/tmp"\|g' -i "${phpinisrc}"
110		110
111	# Set the extension dir	111	# Set the extension dir
112	sed -e "s\|^extension_dir .*$\|extension_dir = ${extension_dir}\|g" -i "${phpinisrc}"	112	sed -e "s\|^extension_dir .*$\|extension_dir = ${extension_dir}\|g" -i "${phpinisrc}"
113		113
114	# Set the include path to point to where we want to find PEAR packages	114	# Set the include path to point to where we want to find PEAR packages
115	sed -e 's\|^;include_path = ".:/php/includes".*\|include_path = ".:/usr/share/php'${PHP_MV}':/usr/share/php"\|' -i "${phpinisrc}"	115	sed -e 's\|^;include_path = ".:/php/includes".*\|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"\|' -i "${phpinisrc}"
116		116
117	dodir "${PHP_INI_DIR}"	117	dodir "${PHP_INI_DIR#${EPREFIX}}"
118	insinto "${PHP_INI_DIR}"	118	insinto "${PHP_INI_DIR#${EPREFIX}}"
119	newins "${phpinisrc}" "${PHP_INI_FILE}"	119	newins "${phpinisrc}" "${PHP_INI_FILE}"
120		120
121	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR}"	121	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
122	elog	122	elog
123		123
124	dodir "${PHP_EXT_INI_DIR}"	124	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
125	dodir "${PHP_EXT_INI_DIR_ACTIVE}"	125	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
126		126
127	# SAPI-specific handling	127	# SAPI-specific handling
128	if [[ "${sapi}" == "apache2" ]] ; then	128	if [[ "${sapi}" == "apache2" ]] ; then
129	insinto "${APACHE_MODULES_CONFDIR}"	129	insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
130	newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \	130	newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \
131	"70_mod_php${PHP_MV}.conf"	131	"70_mod_php${PHP_MV}.conf"
132	fi	132	fi
133		133
134	if [[ "${sapi}" == "fpm" ]] ; then	134	if [[ "${sapi}" == "fpm" ]] ; then
135	[[ -z ${PHP_FPM_INIT_VER} ]] && PHP_FPM_INIT_VER=3	135	[[ -z ${PHP_FPM_INIT_VER} ]] && PHP_FPM_INIT_VER=3
136	[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0	136	[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
137	einfo "Installing FPM CGI config file php-fpm.conf"	137	einfo "Installing FPM CGI config file php-fpm.conf"
138	insinto ${PHP_INI_DIR}	138	insinto "${PHP_INI_DIR#${EPREFIX}}"
139	newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf	139	newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
140	dodir "/etc/init.d"	140	dodir "/etc/init.d"
141	insinto "/etc/init.d"	141	insinto "/etc/init.d"
142	newinitd "${FILESDIR}/php-fpm-r${PHP_FPM_INIT_VER}.init" "php-fpm"	142	newinitd "${FILESDIR}/php-fpm-r${PHP_FPM_INIT_VER}.init" "php-fpm"
143	#dosym "${PHP_DESTDIR}/bin/php-fpm" "/usr/bin/php-fpm"	143	# dosym "${PHP_DESTDIR#${EPREFIX}}/bin/php-fpm" "/usr/bin/php-fpm"
144		144
145	# Remove bogus /etc/php-fpm.conf.default (bug 359906)	145	# Remove bogus /etc/php-fpm.conf.default (bug 359906)
146	[[ -f "${D}/etc/php-fpm.conf.default" ]] && rm "${D}/etc/php-fpm.conf.default"	146	[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
147	fi	147	fi
148		148
149	# Install PHP ini files into /usr/share/php	149	# Install PHP ini files into /usr/share/php