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

Collapse All | Expand All

(-)php5-sapi.eclass.orig (-16 / +10 lines)
Lines 46-51 Link Here
46
	ming? ( media-libs/ming )
46
	ming? ( media-libs/ming )
47
	mssql? ( dev-db/freetds )
47
	mssql? ( dev-db/freetds )
48
	mysql? ( >=dev-db/mysql-3.23.26 )
48
	mysql? ( >=dev-db/mysql-3.23.26 )
49
	mysqli? ( >=dev-db/mysql-4.1.2 )
49
	ncurses? ( sys-libs/ncurses )
50
	ncurses? ( sys-libs/ncurses )
50
	nls? ( sys-devel/gettext )
51
	nls? ( sys-devel/gettext )
51
	odbc? ( >=dev-db/unixODBC-1.8.13 )
52
	odbc? ( >=dev-db/unixODBC-1.8.13 )
Lines 98-113 Link Here
98
99
99
php5-sapi_check_awkward_uses () {
100
php5-sapi_check_awkward_uses () {
100
101
101
	# mysqli support isn't possible yet
102
103
	if useq mysqli ; then
104
		eerror
105
		eerror "We currently do not support the mysqli extension"
106
		eerror "Support will be added once MySQL 4.1 has been added to Portage"
107
		eerror
108
		die "mysqli not supported yet"
109
	fi
110
111
	# recode not available; upstream bug
102
	# recode not available; upstream bug
112
103
113
	if useq recode ; then
104
	if useq recode ; then
Lines 191-199 Link Here
191
	fi
182
	fi
192
183
193
	if useq mysql ; then
184
	if useq mysql ; then
194
		enable_extension_with		"mysql"			"mysql"			1
185
		enable_extension_with		"mysql=/usr"	"mysql"			1
195
	else
186
	fi
196
		enable_extension_with		"mysqli"		"mysqli"			1
187
188
	if useq mysqli ; then
189
		enable_extension_with		"mysqli"		"mysqli"		1
197
	fi
190
	fi
198
191
199
	confutils_use_conflict "readline" "libedit"
192
	confutils_use_conflict "readline" "libedit"
Lines 228-236 Link Here
228
	# ldap support
221
	# ldap support
229
	confutils_use_depend_all "sasl" "ldap"
222
	confutils_use_depend_all "sasl" "ldap"
230
223
231
	# mysql support
232
	confutils_use_conflict "mysqli" "mysql"
233
234
	# odbc support
224
	# odbc support
235
	confutils_use_depend_all "adabas"		"odbc"
225
	confutils_use_depend_all "adabas"		"odbc"
236
	confutils_use_depend_all "birdstep"		"odbc"
226
	confutils_use_depend_all "birdstep"		"odbc"
Lines 412-414 Link Here
412
		rm -rf ${D}/usr/share/man/man1/php.1*
402
		rm -rf ${D}/usr/share/man/man1/php.1*
413
	fi
403
	fi
414
}
404
}
405
406
php5-sapi_pkg_preinst () {
407
	#Nothing to do yet
408
}

Return to bug 53886