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

(-)old/php5_2-sapi.eclass (-21 / +21 lines)
Lines 429-435 Link Here
429
	phpconfutils_extension_disable	"dom"			"xml"			0
429
	phpconfutils_extension_disable	"dom"			"xml"			0
430
	phpconfutils_extension_enable	"exif"			"exif"			1
430
	phpconfutils_extension_enable	"exif"			"exif"			1
431
	phpconfutils_extension_with	"fbsql"			"frontbase"		1
431
	phpconfutils_extension_with	"fbsql"			"frontbase"		1
432
	phpconfutils_extension_with	"fdftk"			"fdftk"			1 "/opt/fdftk-6.0"
432
	phpconfutils_extension_with	"fdftk"			"fdftk"			1 "${EPREFIX}/opt/fdftk-6.0"
433
	phpconfutils_extension_disable	"filter"		"filter"		0
433
	phpconfutils_extension_disable	"filter"		"filter"		0
434
	phpconfutils_extension_enable	"ftp"			"ftp"			1
434
	phpconfutils_extension_enable	"ftp"			"ftp"			1
435
	phpconfutils_extension_with	"gettext"		"nls"			1
435
	phpconfutils_extension_with	"gettext"		"nls"			1
Lines 438-444 Link Here
438
	phpconfutils_extension_without	"iconv"			"iconv"			0
438
	phpconfutils_extension_without	"iconv"			"iconv"			0
439
	phpconfutils_extension_disable	"ipv6"			"ipv6"			0
439
	phpconfutils_extension_disable	"ipv6"			"ipv6"			0
440
	phpconfutils_extension_disable	"json"			"json"			0
440
	phpconfutils_extension_disable	"json"			"json"			0
441
	phpconfutils_extension_with	"kerberos"		"kerberos"		0 "/usr"
441
	phpconfutils_extension_with	"kerberos"		"kerberos"		0 "${EPREFIX}/usr"
442
	phpconfutils_extension_disable	"libxml"		"xml"			0
442
	phpconfutils_extension_disable	"libxml"		"xml"			0
443
	phpconfutils_extension_enable	"mbstring"		"unicode"		1
443
	phpconfutils_extension_enable	"mbstring"		"unicode"		1
444
	phpconfutils_extension_with	"mcrypt"		"crypt"			1
444
	phpconfutils_extension_with	"mcrypt"		"crypt"			1
Lines 447-453 Link Here
447
	phpconfutils_extension_with	"mssql"			"mssql"			1
447
	phpconfutils_extension_with	"mssql"			"mssql"			1
448
	phpconfutils_extension_with	"ncurses"		"ncurses"		1
448
	phpconfutils_extension_with	"ncurses"		"ncurses"		1
449
	phpconfutils_extension_with	"openssl"		"ssl"			0
449
	phpconfutils_extension_with	"openssl"		"ssl"			0
450
	phpconfutils_extension_with	"openssl-dir"		"ssl"			0 "/usr"
450
	phpconfutils_extension_with	"openssl-dir"		"ssl"			0 "${EPREFIX}/usr"
451
	phpconfutils_extension_enable	"pcntl" 		"pcntl" 		1
451
	phpconfutils_extension_enable	"pcntl" 		"pcntl" 		1
452
	phpconfutils_extension_without	"pcre-regex"		"pcre"			0
452
	phpconfutils_extension_without	"pcre-regex"		"pcre"			0
453
	phpconfutils_extension_disable	"pdo"			"pdo"			0
453
	phpconfutils_extension_disable	"pdo"			"pdo"			0
Lines 499-515 Link Here
499
499
500
	# Support for the GD graphics library
500
	# Support for the GD graphics library
501
	if use gd-external || phpconfutils_usecheck gd-external ; then
501
	if use gd-external || phpconfutils_usecheck gd-external ; then
502
		phpconfutils_extension_with	"freetype-dir"	"truetype"		0 "/usr"
502
		phpconfutils_extension_with	"freetype-dir"	"truetype"		0 "${EPREFIX}/usr"
503
		phpconfutils_extension_with	"t1lib"		"truetype"		0 "/usr"
503
		phpconfutils_extension_with	"t1lib"		"truetype"		0 "${EPREFIX}/usr"
504
		phpconfutils_extension_enable	"gd-jis-conv"	"cjk" 			0
504
		phpconfutils_extension_enable	"gd-jis-conv"	"cjk" 			0
505
		phpconfutils_extension_with 	"gd" 		"gd-external"		1 "/usr"
505
		phpconfutils_extension_with 	"gd" 		"gd-external"		1 "${EPREFIX}/usr"
506
	else
506
	else
507
		phpconfutils_extension_with	"freetype-dir"	"truetype"		0 "/usr"
507
		phpconfutils_extension_with	"freetype-dir"	"truetype"		0 "${EPREFIX}/usr"
508
		phpconfutils_extension_with	"t1lib"		"truetype"		0 "/usr"
508
		phpconfutils_extension_with	"t1lib"		"truetype"		0 "${EPREFIX}/usr"
509
		phpconfutils_extension_enable	"gd-jis-conv"	"cjk"			0
509
		phpconfutils_extension_enable	"gd-jis-conv"	"cjk"			0
510
		phpconfutils_extension_with	"jpeg-dir"	"gd"			0 "/usr"
510
		phpconfutils_extension_with	"jpeg-dir"	"gd"			0 "${EPREFIX}/usr"
511
		phpconfutils_extension_with 	"png-dir" 	"gd" 			0 "/usr"
511
		phpconfutils_extension_with 	"png-dir" 	"gd" 			0 "${EPREFIX}/usr"
512
		phpconfutils_extension_with 	"xpm-dir" 	"xpm" 			0 "/usr"
512
		phpconfutils_extension_with 	"xpm-dir" 	"xpm" 			0 "${EPREFIX}/usr"
513
		# enable gd last, so configure can pick up the previous settings
513
		# enable gd last, so configure can pick up the previous settings
514
		phpconfutils_extension_with 	"gd" 		"gd" 			0
514
		phpconfutils_extension_with 	"gd" 		"gd" 			0
515
	fi
515
	fi
Lines 542-557 Link Here
542
542
543
	# MySQL support
543
	# MySQL support
544
	if use mysql ; then
544
	if use mysql ; then
545
		phpconfutils_extension_with	"mysql"			"mysql"		1 "/usr"
545
		phpconfutils_extension_with	"mysql"			"mysql"		1 "${EPREFIX}/usr"
546
		phpconfutils_extension_with	"mysql-sock"		"mysql"		0 "/var/run/mysqld/mysqld.sock"
546
		phpconfutils_extension_with	"mysql-sock"		"mysql"		0 "${EPREFIX}/var/run/mysqld/mysqld.sock"
547
	fi
547
	fi
548
548
549
	# MySQLi support
549
	# MySQLi support
550
	phpconfutils_extension_with		"mysqli"		"mysqli"	1 "/usr/bin/mysql_config"
550
	phpconfutils_extension_with		"mysqli"		"mysqli"	1 "${EPREFIX}/usr/bin/mysql_config"
551
551
552
	# ODBC support
552
	# ODBC support
553
	if use odbc || phpconfutils_usecheck odbc ; then
553
	if use odbc || phpconfutils_usecheck odbc ; then
554
		phpconfutils_extension_with	"unixODBC"		"odbc"		1 "/usr"
554
		phpconfutils_extension_with	"unixODBC"		"odbc"		1 "${EPREFIX}/usr"
555
555
556
		phpconfutils_extension_with	"adabas"		"adabas"	1
556
		phpconfutils_extension_with	"adabas"		"adabas"	1
557
		phpconfutils_extension_with	"birdstep"		"birdstep"	1
557
		phpconfutils_extension_with	"birdstep"		"birdstep"	1
Lines 562-568 Link Here
562
		fi
562
		fi
563
		phpconfutils_extension_with	"esoob"			"esoob"		1
563
		phpconfutils_extension_with	"esoob"			"esoob"		1
564
		phpconfutils_extension_with	"ibm-db2"		"db2"		1
564
		phpconfutils_extension_with	"ibm-db2"		"db2"		1
565
		phpconfutils_extension_with	"iodbc"			"iodbc"		1 "/usr"
565
		phpconfutils_extension_with	"iodbc"			"iodbc"		1 "${EPREFIX}/usr"
566
		phpconfutils_extension_with	"sapdb"			"sapdb"		1
566
		phpconfutils_extension_with	"sapdb"			"sapdb"		1
567
		phpconfutils_extension_with	"solid"			"solid"		1
567
		phpconfutils_extension_with	"solid"			"solid"		1
568
	fi
568
	fi
Lines 574-580 Link Here
574
	if use oci8-instant-client ; then
574
	if use oci8-instant-client ; then
575
		OCI8IC_PKG="`best_version dev-db/oracle-instantclient-basic`"
575
		OCI8IC_PKG="`best_version dev-db/oracle-instantclient-basic`"
576
		OCI8IC_PKG="`printf ${OCI8IC_PKG} | sed -e 's|dev-db/oracle-instantclient-basic-||g' | sed -e 's|-r.*||g'`"
576
		OCI8IC_PKG="`printf ${OCI8IC_PKG} | sed -e 's|dev-db/oracle-instantclient-basic-||g' | sed -e 's|-r.*||g'`"
577
		phpconfutils_extension_with	"oci8"			"oci8-instant-client"	1	"instantclient,/usr/lib/oracle/${OCI8IC_PKG}/client/lib"
577
		phpconfutils_extension_with	"oci8"			"oci8-instant-client"	1	"instantclient,${EPREFIX}/usr/lib/oracle/${OCI8IC_PKG}/client/lib"
578
	fi
578
	fi
579
579
580
	# PDO support
580
	# PDO support
Lines 582-588 Link Here
582
		phpconfutils_extension_with		"pdo-dblib"	"mssql"		1
582
		phpconfutils_extension_with		"pdo-dblib"	"mssql"		1
583
		# The PDO-Firebird driver is broken and unmaintained upstream
583
		# The PDO-Firebird driver is broken and unmaintained upstream
584
		# phpconfutils_extension_with	"pdo-firebird"	"firebird"		1
584
		# phpconfutils_extension_with	"pdo-firebird"	"firebird"		1
585
		phpconfutils_extension_with		"pdo-mysql"	"mysql"		1 "/usr"
585
		phpconfutils_extension_with		"pdo-mysql"	"mysql"		1 "${EPREFIX}/usr"
586
		if use oci8 ; then
586
		if use oci8 ; then
587
			phpconfutils_extension_with	"pdo-oci"	"oci8"		1
587
			phpconfutils_extension_with	"pdo-oci"	"oci8"		1
588
		fi
588
		fi
Lines 591-599 Link Here
591
			OCI8IC_PKG="`printf ${OCI8IC_PKG} | sed -e 's|dev-db/oracle-instantclient-basic-||g' | sed -e 's|-r.*||g'`"
591
			OCI8IC_PKG="`printf ${OCI8IC_PKG} | sed -e 's|dev-db/oracle-instantclient-basic-||g' | sed -e 's|-r.*||g'`"
592
			phpconfutils_extension_with	"pdo-oci"	"oci8-instant-client"	1	"instantclient,/usr,${OCI8IC_PKG}"
592
			phpconfutils_extension_with	"pdo-oci"	"oci8-instant-client"	1	"instantclient,/usr,${OCI8IC_PKG}"
593
		fi
593
		fi
594
		phpconfutils_extension_with		"pdo-odbc"	"odbc"		1 "unixODBC,/usr"
594
		phpconfutils_extension_with		"pdo-odbc"	"odbc"		1 "unixODBC,${EPREFIX}/usr"
595
		phpconfutils_extension_with		"pdo-pgsql"	"postgres"	1
595
		phpconfutils_extension_with		"pdo-pgsql"	"postgres"	1
596
		phpconfutils_extension_with		"pdo-sqlite"	"sqlite"	1 "/usr"
596
		phpconfutils_extension_with		"pdo-sqlite"	"sqlite"	1 "${EPREFIX}/usr"
597
	fi
597
	fi
598
598
599
	# readline/libedit support
599
	# readline/libedit support
Lines 612-618 Link Here
612
	if ! use sqlite && ! phpconfutils_usecheck sqlite ; then
612
	if ! use sqlite && ! phpconfutils_usecheck sqlite ; then
613
		phpconfutils_extension_without		"sqlite"	"sqlite"	0
613
		phpconfutils_extension_without		"sqlite"	"sqlite"	0
614
	else
614
	else
615
		phpconfutils_extension_with		"sqlite"	"sqlite"	0 "/usr"
615
		phpconfutils_extension_with		"sqlite"	"sqlite"	0 "${EPREFIX}/usr"
616
		phpconfutils_extension_enable		"sqlite-utf8"	"unicode"	0
616
		phpconfutils_extension_enable		"sqlite-utf8"	"unicode"	0
617
	fi
617
	fi
618
618

Return to bug 195765