Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 195765 | Differences between
and this patch

Collapse All | Expand All

(-)/Gentoo/usr/portage.main.converted/dev-lang/php/php-4.4.8.ebuild (-9 / +9 lines)
Lines 8-14 Link Here
8
APACHE2_SAPI_USE="concurrentmodphp threads"
8
APACHE2_SAPI_USE="concurrentmodphp threads"
9
IUSE="cli cgi ${CGI_SAPI_USE} ${APACHE2_SAPI_USE} fastbuild"
9
IUSE="cli cgi ${CGI_SAPI_USE} ${APACHE2_SAPI_USE} fastbuild"
10
10
11
KEYWORDS="~amd64-linux ~ia64-linux ~x86-linux ~x86-freebsd ~x86-macos"
11
KEYWORDS="~amd64-linux ~ia64-linux ~x86-linux ~x86-fbsd ~x86-macos"
12
12
13
# NOTE: Portage doesn't support setting PROVIDE based on the USE flags
13
# NOTE: Portage doesn't support setting PROVIDE based on the USE flags
14
#		that have been enabled, so we have to PROVIDE everything for now
14
#		that have been enabled, so we have to PROVIDE everything for now
Lines 212-218 Link Here
212
	fi
212
	fi
213
213
214
	if [[ ${build_apache2} = 1 ]] ; then
214
	if [[ ${build_apache2} = 1 ]] ; then
215
		my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2"
215
		my_conf="${my_conf} --with-apxs2=\"${EPREFIX}/usr/sbin/apxs2\""
216
216
217
		# Threaded Apache2 support
217
		# Threaded Apache2 support
218
		if use threads ; then
218
		if use threads ; then
Lines 324-330 Link Here
324
				cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
324
				cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
325
				;;
325
				;;
326
			apache2)
326
			apache2)
327
				my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2"
327
				my_conf="${my_conf} --disable-cli --with-apxs2=${EPREFIX}/usr/sbin/apxs2"
328
				php4_4-sapi_src_compile
328
				php4_4-sapi_src_compile
329
				;;
329
				;;
330
		esac
330
		esac
Lines 337-343 Link Here
337
src_install() {
337
src_install() {
338
	php_determine_sapis
338
	php_determine_sapis
339
339
340
	destdir=/usr/$(get_libdir)/php4
340
	destdir="${EPREFIX}/usr/$(get_libdir)/php4"
341
341
342
	# Let the eclass do the common work
342
	# Let the eclass do the common work
343
	php4_4-sapi_src_install
343
	php4_4-sapi_src_install
Lines 428-435 Link Here
428
			php-select php php4
428
			php-select php php4
429
		elif [[ ${exitStatus} == 4 ]] ; then
429
		elif [[ ${exitStatus} == 4 ]] ; then
430
			ewarn
430
			ewarn
431
			ewarn "/usr/bin/php links to a different version of PHP."
431
			ewarn "${EPREFIX}/usr/bin/php links to a different version of PHP."
432
			ewarn "To make /usr/bin/php point to PHP v4, use php-select:"
432
			ewarn "To make ${EPREFIX}/usr/bin/php point to PHP v4, use php-select:"
433
			ewarn
433
			ewarn
434
			ewarn "    php-select php php4"
434
			ewarn "    php-select php php4"
435
			ewarn
435
			ewarn
Lines 444-451 Link Here
444
			php-select php-cgi php4
444
			php-select php-cgi php4
445
		elif [[ ${exitStatus} == 4 ]] ; then
445
		elif [[ ${exitStatus} == 4 ]] ; then
446
			ewarn
446
			ewarn
447
			ewarn "/usr/bin/php-cgi links to a different version of PHP."
447
			ewarn "${EPREFIX}/usr/bin/php-cgi links to a different version of PHP."
448
			ewarn "To make /usr/bin/php-cgi point to PHP v4, use php-select:"
448
			ewarn "To make ${EPREFIX}/usr/bin/php-cgi point to PHP v4, use php-select:"
449
			ewarn
449
			ewarn
450
			ewarn "    php-select php-cgi php4"
450
			ewarn "    php-select php-cgi php4"
451
			ewarn
451
			ewarn
Lines 459-465 Link Here
459
		php-select php-devel php4
459
		php-select php-devel php4
460
	elif [[ $exitStatus == 4 ]] ; then
460
	elif [[ $exitStatus == 4 ]] ; then
461
		ewarn
461
		ewarn
462
		ewarn "/usr/bin/php-config and/or /usr/bin/phpize are linked to a"
462
		ewarn "${EPREFIX}/usr/bin/php-config and/or ${EPREFIX}/usr/bin/phpize are linked to a"
463
		ewarn "different version of PHP. To make them point to PHP v4, use"
463
		ewarn "different version of PHP. To make them point to PHP v4, use"
464
		ewarn "php-select:"
464
		ewarn "php-select:"
465
		ewarn
465
		ewarn

Return to bug 195765