fix use desc, add mbstring, fix file versioning

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

8 files changed, 30 insertions, 252 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 441e87999e9a..0e76525c6a3e 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.381 2010/05/30 10:05:20 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.382 2010/06/01 16:17:05 mabi Exp $
+
+  01 Jun 2010; <mabi@gentoo.org> -files/eblits/common-v2.eblit,
+  -files/eblits/src_compile-v2.eblit, -files/eblits/src_install-v2.eblit,
+  files/eblits/src_prepare-v1.eblit, php-5.3.2.ebuild, metadata.xml:
+  align more closely with original php-5.3 work from hoffie@gentoo.org, fix
+  missing mbstring use description, remove unneeded -v2 eblits, remove
+  dangling mcve references
 
   30 May 2010; <mabi@gentoo.org> -files/20php4-envd, php-5.3.2.ebuild,
   -files/php4-ldvs:
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 6be5dd2f8a44..0651d19f2b7d 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,21 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 20php5-envd 145 RMD160 8c81fb7dc1d1ddf16fd956d748514db3bcb27603 SHA1 f1cef57c0def8e2c5422aaf136f40b4ff47801d2 SHA256 efaae9e6ae5f7010e073c2ab6d8a9dda009f0707c7d7b0c027e142c94f7041a4
 AUX 70_mod_php5.conf-apache2 348 RMD160 9f3f49a52ebf92c2650501c5ceb6f95ce4bb2e76 SHA1 62992e793446b4a9a64900d1ecba7bae06873382 SHA256 5bb8a45570582b4389a7d3feea0398e1c13ed4ced96e559b9406ed8c965dea8c
 AUX 70_mod_php5.conf-apache2-r1 374 RMD160 ca06cdc9d1a3dc4129a60c938ee3a1b542497fbb SHA1 4733066b6324c5870e716485484c44c7c26a9ff1 SHA256 815c1ca23c9afe8479568ceaac4057eb91ea5444fbd863866b29adb4eea2c82b
 AUX 70_mod_php5_concurr.conf-apache2 348 RMD160 9f3f49a52ebf92c2650501c5ceb6f95ce4bb2e76 SHA1 62992e793446b4a9a64900d1ecba7bae06873382 SHA256 5bb8a45570582b4389a7d3feea0398e1c13ed4ced96e559b9406ed8c965dea8c
 AUX 70_mod_php5_concurr.conf-apache2-r1 376 RMD160 4f7de5c0784b6191450b5c1a7de7ad941620e199 SHA1 c42a23bd7a1d3e8c7e0ac906f50f180116349f76 SHA256 c05f499d9c8927391c586b94716a9f59d63767165552ea527ec7ff63c36eaa40
 AUX eblits/common-v1.eblit 376 RMD160 524d38035ef01b215c6dc06699c41550c246de9d SHA1 b85091f9e56b20217e5c2d3e25cef055642cd088 SHA256 d395752919fe05fa64a0e09deaf690e008a04f2c580f42233b5a854a1012045e
-AUX eblits/common-v2.eblit 377 RMD160 b19bbc6f9b4a483e61c3ffaeec64b084428afeda SHA1 9125ee3ec41d980c656e87466f5046802d0aab28 SHA256 046719f0ba027553bc5f364697ae8b8c15883a0e650fd4c10b26dbc68fa2c948
 AUX eblits/pkg_postinst-v1.eblit 2184 RMD160 ce65ba811eab10862d067c7e2b4bdc8d2b0aee56 SHA1 11c14f2235041cfb08e33cf2550bebef2037e92b SHA256 9e1cd81be4f051f3156de0ce5398a338b2ab6f8e73047c5983beda47f2f762b0
 AUX eblits/pkg_setup-v1.eblit 643 RMD160 b0ac84af7c2cddaca058ca0562306cdc8ddff108 SHA1 88572e5da2d10b2bcbfa3f35a2d39366cbabb364 SHA256 6b7181294ce309d5cdee68e1f7e7c9365910c940db4391ae1ca62e0d6eb9b27e
-AUX eblits/src_compile-v1.eblit 1590 RMD160 432774abcac37ebbe9f1ae6e37ca219e83a0205d SHA1 fef7bd6415b59fd0af7f3755efa600b53056ad80 SHA256 c432b5e41489db6bfe1df4f03d77294a0b15dd1a33ad8281ef21a5257ab7f32d
-AUX eblits/src_compile-v2.eblit 1863 RMD160 e33cd34f40e329c532856a6f2e985399f751c563 SHA1 211deba63d0c40af092683f6f38caac0d5b6290c SHA256 16024f409c8f0562e254a5584d49fb72714585d16fc173e5a4bd718d14c5f4ff
+AUX eblits/src_compile-v1.eblit 1863 RMD160 e33cd34f40e329c532856a6f2e985399f751c563 SHA1 211deba63d0c40af092683f6f38caac0d5b6290c SHA256 16024f409c8f0562e254a5584d49fb72714585d16fc173e5a4bd718d14c5f4ff
 AUX eblits/src_configure-v1.eblit 9827 RMD160 272b8c5720b4a8f3f9deb601bfd68cc26273adab SHA1 dbfca765215b9539c88767389b6b615a07604146 SHA256 8947ca3957ecf8592db09c71862d4274f866005552a453ad15e842288079fd46
-AUX eblits/src_install-v1.eblit 3646 RMD160 1e7eaea9a769b4c7e324eab4e3eae3f6e12d65b4 SHA1 2e4e84f4ee39b49b9c07c4332553b9c3ea6796bf SHA256 fe673568b92064c63932752c2a599e0577488988e3c56bb4448107cbe0dd5619
-AUX eblits/src_install-v2.eblit 3584 RMD160 3296864c3393fcef3fd70c8f43d0a5a7c3c1760c SHA1 b7eb10bd944caceec0826b948b3e237bd67a7440 SHA256 093ef7303cf6415b7e141918e2382f5624450dc377c32dbbebcb1a926466051d
-AUX eblits/src_prepare-v1.eblit 2725 RMD160 14567fca200ecfa4590f4d9d5f4f46fd6f97996d SHA1 9a6656108555873aad9b4e7604554bb2b8cfa798 SHA256 6d9ab006798ed1f0c3d2cace27dd5a6ef8708406ae1b93beea5eab18b8a8c8f4
+AUX eblits/src_install-v1.eblit 3584 RMD160 3296864c3393fcef3fd70c8f43d0a5a7c3c1760c SHA1 b7eb10bd944caceec0826b948b3e237bd67a7440 SHA256 093ef7303cf6415b7e141918e2382f5624450dc377c32dbbebcb1a926466051d
+AUX eblits/src_prepare-v1.eblit 2616 RMD160 ccff64d09cc90ada1ea5d1311457cf9a05f12f8e SHA1 7db40d0ca7ef01e5b61962f261511803f768f1bc SHA256 915b9755a37f7670f6e436fe5072dae8f5e6b437ccdfbff835e26bb2f9d22b1e
 AUX eblits/src_test-v1.eblit 1480 RMD160 68ef731042ef236efee923649b318239c0219d52 SHA1 81c047f180e43eb1e6b0309ee8d6751950ce1b97 SHA256 ddc836ca2e7b2abac20450fc6eb8c7d30277c567d23051016b903ece1d07a6b2
 AUX php-5.2.10-pdo_dblib.patch 559 RMD160 062604e291113b2bb86044b5eeffb72fad210fbc SHA1 d59d26e6557dac86e582e1a6ed7bb4795cf150c6 SHA256 0548d63d7379cd19f7ade6ca1222b1b577f684b142ff6b0e8e23742b1f7f9794
 AUX php-5.2.12-libpng14.patch 222 RMD160 d63bd712d077d9606a02d6620c7084bca7197c01 SHA1 a25a47386d625a47698094fc4825208c6ec8f2a4 SHA256 af94a9c2a104dcb037aa059dd46b6f534adb939ea44ad4cb9e3a0a7c49b64fab
@@ -47,13 +41,6 @@ EBUILD php-5.2.11.ebuild 16796 RMD160 4d55fe8a9787c726a23a426e891ceffbb44faef6 S
 EBUILD php-5.2.12.ebuild 16901 RMD160 42ad4d01a89392445e491f1d784a7f23028fb0dc SHA1 17f6e1da1793a06c10636e332440c37535262a7d SHA256 cbab429ae3fe5bc0fe4cb961dbb1df91be35c04f7c8340cfee39117afcfeddcc
 EBUILD php-5.2.13.ebuild 16879 RMD160 c580f3e8de5be0a3338ae3f816153c1d42b4337f SHA1 4bc3f1792d3f85a96ecbf538f97c76d1de8dda4a SHA256 811314bfdf521766794650581c963b31d81c10071311e20121e4a1ca5458a51f
 EBUILD php-5.2.9-r2.ebuild 16727 RMD160 aa0e1af3e50b550111c3d1490adc9e8ed2432b34 SHA1 1e4b46b562d74e758db1ec52751419cd02333878 SHA256 7187f6feedc92c355543713cb07218a48f1cd45e9394fa6d4a00bbe7e5b3010b
-EBUILD php-5.3.2.ebuild 9442 RMD160 792d29e12db3c034efb27967482c27cb803ff39c SHA1 84d597957629312c4b71e1653ec0ee83dcfc8cf1 SHA256 cb21c83738ac92e4356228388003a8b39a604fe549a616c6d0af95e0384af0b0
-MISC ChangeLog 65861 RMD160 6ffeeba0871256fbb0aeaed2d87c9725be328c4c SHA1 d67ff521bd98e34f56be51946beee6e5ec91c7f1 SHA256 693035dccaec07a50e133a9a448019fbf02ac615691d3f48b4af04573cc3666c
-MISC metadata.xml 2185 RMD160 2e1d4afa19f7370b62080f3f62bc0f8e525b82bd SHA1 2b758e52eb1e1130fffe162e6cd2122deaf18bf3 SHA256 8a8be20f80edd56dd9f16b90f4ff91fde426b05861e737750664223801e2c667
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwEg2wACgkQsiLx3HvNzgftIQCgirBmoK0fRPPmjlVKDkjZufnn
-63IAoKP1Ej5J7DSHchhnlVr0J/RYdl4/
-=5XJE
------END PGP SIGNATURE-----
+EBUILD php-5.3.2.ebuild 9379 RMD160 1858cc318c381f956e68a7cb215dda200c0b15b4 SHA1 726a6468111f36f4107d71239c18bb897e953c40 SHA256 681d51da472e131baec3b818987af8060a9e6931ddf0d0c68c017a2a4e1f7a7a
+MISC ChangeLog 66243 RMD160 caba27460aa1e15656528617319dfc95a5e4b703 SHA1 813272eb7024271e059485ecef023432d633f7dc SHA256 e3c7c0bdb7298328aead72a2c231125a939c466db3f9ef09b8c5ce23644c84ad
+MISC metadata.xml 2264 RMD160 82c0da8dfb32f6747d25e1fcd228e7ff87661195 SHA1 1fdbe39bbc372da83fa44d620d087a11f075e20d SHA256 dfbbbf2fb81666c8051408f2e0f4695b3a5f38940ba2adbd0f7f53785ed9338e
diff --git a/dev-lang/php/files/eblits/common-v2.eblit b/dev-lang/php/files/eblits/common-v2.eblit
deleted file mode 100644
index 519a7c938db6..000000000000
--- a/dev-lang/php/files/eblits/common-v2.eblit
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/common-v2.eblit,v 1.1 2010/05/27 23:05:04 mabi Exp $
-
-php_set_ini_dir() {
-	PHP_INI_DIR="/etc/php/${1}-php${PHP_MV}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
diff --git a/dev-lang/php/files/eblits/src_compile-v2.eblit b/dev-lang/php/files/eblits/src_compile-v2.eblit
deleted file mode 100644
index 40423e154b8c..000000000000
--- a/dev-lang/php/files/eblits/src_compile-v2.eblit
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_compile-v2.eblit,v 1.1 2010/05/27 23:05:04 mabi Exp $
-
-eblit-php-src_compile() {
-	SAPI_DIR="${WORKDIR}/sapis"
-	local is_first_sapi=1
-
-	for sapi in ${SAPIS} ; do
-		use "${sapi}" || continue
-		if [[ ${is_first_sapi} == 1 ]]; then
-			is_first_sapi=0
-		else
-			emake clean
-		fi
-
-		php_sapi_build "${sapi}"
-		php_sapi_copy "${sapi}"
-	done
-}
-
-php_sapi_build() {
-	local sapi="$1"
-	php_set_ini_dir "${sapi}"
-
-	mkdir -p "${SAPI_DIR}/${sapi}"
-
-	sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
-		--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
-
-	for one_sapi in $SAPIS ; do
-		case "$one_sapi" in
-			cli|cgi|embed)
-				if [[ "${one_sapi}" == "${sapi}" ]] ; then
-					sapi_conf="${sapi_conf} --enable-${available_sapi}"
-				else
-					sapi_conf="${sapi_conf} --disable-${available_sapi}"
-				fi
-				;;
-
-			apache2)
-				if [[ "${one_sapi}" == "${sapi}" ]] ; then
-					sapi_conf="${sapi_conf} --with-apxs2=/usr/sbin/apxs"
-				else
-					sapi_conf="${sapi_conf} --without-apxs2"
-				fi
-				;;
-
-		esac
-	done
-
-	econf ${sapi_conf}
-	emake || die "emake failed"
-}
-
-php_sapi_copy() {
-	local sapi="$1"
-	local source=""
-
-	case "$sapi" in
-		cli)
-			source="sapi/cli/php"
-			;;
-		cgi)
-			source="sapi/cgi/php-cgi"
-			;;
-		embed)
-			source="libs/libphp${PHP_MV}.so"
-			;;
-
-		apache2)
-			# apache2 is a special case; the necessary files
-			# (yes, multiple) are copied by make install, not
-			# by the ebuild; that's the reason, why apache2 has
-			# to be the last sapi
-			emake INSTALL_ROOT="${SAPI_DIR}/${sapi}/" install-sapi
-			;;
-
-		*)
-			die "unhandled sapi in php_sapi_copy"
-			;;
-	esac
-
-	if [[ "${source}" ]] ; then
-		cp "$source" "${SAPI_DIR}/$sapi" || die "Unable to copy ${sapi} SAPI"
-	fi
-}
diff --git a/dev-lang/php/files/eblits/src_install-v2.eblit b/dev-lang/php/files/eblits/src_install-v2.eblit
deleted file mode 100644
index e592109227ae..000000000000
--- a/dev-lang/php/files/eblits/src_install-v2.eblit
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v 1.1 2010/05/27 23:05:04 mabi Exp $
-
-eblit-php-src_install() {
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR}/bin"
-
-	# Install php environment (without any sapis)
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs \
-		|| die "emake install failed"
-
-	local extension_dir="$("${D}/${PHP_DESTDIR}/bin/php-config" --extension-dir)"
-
-	# And install the modules to it
-	if use sharedext ; then
-		insinto "${extension_dir}"
-		doins "${S}/modules/"*.so
-	fi
-
-	# Generate the USE file for PHP
-	phpconfutils_generate_usefile
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir /usr/share/php${PHP_MV}
-
-	local sapi="", file=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			# needed each time, php_install_ini would reset it
-			into "${PHP_DESTDIR}"
-			file=$(find "${SAPI_DIR}/${sapi}/" -type f | head -n 1)
-
-			if [[ "${file: -3}" == ".so" ]]; then 
-				if [[ "${sapi}" == "apache2" ]]; then
-					insinto "${PHP_DESTDIR}/../apache2/modules/"
-					newins "${file}" "${file/*\/}"
-				else
-					dolib.so "${file}" || die "Unable to install ${sapi} sapi"
-				fi
-			else
-				dobin "${file}" || die "Unable to install ${sapi} sapi"
-			fi
-
-			php_install_ini "${sapi}"
-		fi
-	done
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php${PHP_MV}-envd" \
-		"20php${PHP_MV}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
-		"${D}/etc/env.d/20php${PHP_MV}"
-}
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
-	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
-
-	# default to expose_php=Off, bug 300695
-	sed -e 's|^expose_php .*|expose_php = Off|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 = ".:/usr/share/php'${PHP_MV}':/usr/share/php"|' -i "${phpinisrc}"
-
-	dodir "${PHP_INI_DIR}"
-	insinto "${PHP_INI_DIR}"
-	newins "${phpinisrc}" "${PHP_INI_FILE}"
-
-	dodir "${PHP_EXT_INI_DIR}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE}"
-
-	# Install any extensions built as shared objects
-	if use sharedext ; then
-		insinto "${PHP_EXT_INI_DIR}"
-		for extension in "${D}/${extension_dir}/"*.so ; do
-			extension="${extension##*/}"
-			inifilename="${extension/.so/.ini}"
-			echo "extension=${extension}" > "${S}/modules/$inifilename"
-			doins "${S}/modules/$inifilename"
-			dosym "${PHP_EXT_INI_DIR}/${inifilename}" "${PHP_EXT_INI_DIR_ACTIVE}/${inifilename}"
-		done
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "apache2" ]] ; then
-		if use concurrentmodphp ; then
-			einfo "Installing Apache2 config file 70_mod_php${PHP_MV}_concurr.conf"
-			insinto "${APACHE_MODULES_CONFDIR}"
-			newins "${FILESDIR}/70_mod_php${PHP_MV}_concurr.conf-apache2" \
-				"70_mod_php${PHP_MV}_concurr.conf"
-
-			# Put the ld version script in the right place so
-			# it's always accessible
-			insinto "/var/lib/php-pkg/${CATEGORY}/${PN}-${PVR}/"
-			doins "${FILESDIR}/php${PHP_MV}-ldvs"
-		else
-			einfo "Installing Apache2 config 70_mod_php${PHP_MV}.conf)"
-			insinto ${APACHE_MODULES_CONFDIR}
-			newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \
-				"70_mod_php${PHP_MV}.conf"
-		fi
-	fi
-}
diff --git a/dev-lang/php/files/eblits/src_prepare-v1.eblit b/dev-lang/php/files/eblits/src_prepare-v1.eblit
index e8d7ae2a3290..d6856b8bf497 100644
--- a/dev-lang/php/files/eblits/src_prepare-v1.eblit
+++ b/dev-lang/php/files/eblits/src_prepare-v1.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_prepare-v1.eblit,v 1.2 2010/05/28 11:32:55 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_prepare-v1.eblit,v 1.3 2010/06/01 16:17:05 mabi Exp $
 
 eblit-php-src_prepare() {
 	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
@@ -31,9 +31,6 @@ eblit-php-src_prepare() {
 	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
 		-i configure.in || die "Failed to fix server platform name"
 
-	# Disable interactive make test
-	sed -e 's/'`echo "\!getenv('NO_INTERACTION')"`'/false/g' -i run-tests.php
-
 	# Prevent PHP from activating the Apache config,
 	# as we will do that ourselves
 	sed -i \
diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml
index 09a50059bb3b..046237f85c07 100644
--- a/dev-lang/php/metadata.xml
+++ b/dev-lang/php/metadata.xml
@@ -18,6 +18,7 @@
 		<flag name='java-external'>Use the external java extension rather than the bundled one</flag>
 		<flag name='json'>Enable JSON support</flag>
 		<flag name='ldap-sasl'>Add SASL support for the PHP LDAP extension</flag>
+		<flag name='mbstring'>Add support for the Multi-Byte String extension</flag>
 		<flag name='mysqlnd'>Use native driver for mysql, mysqli, PDO_Mysql</flag>
 		<flag name='pcre'>Adds support for Perl Compatible Regular Expressions  (deprecated: always "on" in php 5.3)</flag>
 		<flag name='pic'>Force shared modules to build as PIC on x86 (speed tradeoff with memory usage)</flag>
diff --git a/dev-lang/php/php-5.3.2.ebuild b/dev-lang/php/php-5.3.2.ebuild
index 7797b7edaf7f..d6e411903e72 100644
--- a/dev-lang/php/php-5.3.2.ebuild
+++ b/dev-lang/php/php-5.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.2.ebuild,v 1.4 2010/06/01 03:49:53 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.2.ebuild,v 1.5 2010/06/01 16:17:05 mabi Exp $
 
 EAPI=2
 
@@ -33,7 +33,7 @@ function php_get_uri ()
 			die "unhandled case in php_get_uri"
 		;;
 	esac
-};
+}
 
 PHP_MV="$(get_major_version)"
 
@@ -44,7 +44,7 @@ PHP_RELEASE="php"
 PHP_P="${PN}-${PHP_PV}"
 PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
 
-PHP_PATCHSET="${PHP_PATCHSET:-${PR/r/}}";
+PHP_PATCHSET="${PHP_PATCHSET:-${PR/r/}}"
 PHP_PATCHSET_URI="
 	$(php_get_uri gentoo "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")"
 
@@ -54,9 +54,9 @@ if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then
 	SUHOSIN_TYPE="gentoo"
 else
 	SUHOSIN_TYPE="suhosin"
-fi;
+fi
 
-SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch";
+SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"
 SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
 
 SRC_URI="
@@ -72,7 +72,7 @@ LICENSE="PHP-3"
 SAPIS="cli cgi embed apache2"
 
 # Gentoo-specific, common features
-IUSE="kolab mcve"
+IUSE="kolab"
 
 # SAPIs and SAPI-specific USE flags:
 IUSE="${IUSE}
@@ -84,7 +84,7 @@ IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk
 	empress-bcs enchant esoob exif frontbase fileinfo filter firebird
 	flatfile ftp gd gd-external gdbm gmp hash iconv imap inifile
 	interbase intl iodbc ipv6 json kerberos ldap ldap-sasl libedit
-	mssql mysql mysqlnd mysqli nls oci8
+	mbstring mssql mysql mysqlnd mysqli nls oci8
 	oci8-instant-client odbc pcntl pdo phar pic posix postgres qdbm
 	readline recode sapdb session sharedext sharedmem
 	simplexml snmp soap sockets solid spell sqlite sqlite3 ssl suhosin
@@ -92,7 +92,6 @@ IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk
 	xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
 
 DEPEND="app-admin/php-toolkit
-	sys-devel/flex
 	>=dev-libs/libpcre-7.9[unicode]
 	adabas? ( >=dev-db/unixODBC-1.8.13 )
 	apache2? ( !threads? ( www-servers/apache[-threads] ) )
@@ -136,7 +135,6 @@ DEPEND="app-admin/php-toolkit
 	ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) )
 	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
 	mbstring? ( dev-libs/oniguruma )
-	mcve? ( >=dev-libs/openssl-0.9.7 )
 	mssql? ( dev-db/freetds )
 	!mysqlnd? (
 		mysql? ( virtual/mysql )
@@ -191,9 +189,9 @@ DEPEND="app-admin/php-toolkit
 	zip? ( sys-libs/zlib )
 	zlib? ( sys-libs/zlib )
 	virtual/mta
-";
+"
 
-php="=${CATEGORY}/${PF}";
+php="=${CATEGORY}/${PF}"
 RDEPEND="${DEPEND}
 	truetype? ( || ( $php[gd] $php[gd-external] ) )
 	cjk? ( || ( $php[gd] $php[gd-external] ) )
@@ -209,7 +207,6 @@ RDEPEND="${DEPEND}
 	xmlreader? ( $php[xml] )
 	xsl? ( $php[xml] )
 	ldap-sasl? ( $php[ldap,-oci8] )
-	mcve? ( $php[ssl] )
 	suhosin? ( $php[unicode] )
 	adabas? ( $php[odbc] )
 	birdstep? ( $php[odbc] )
@@ -218,7 +215,7 @@ RDEPEND="${DEPEND}
 	empress? ( $php[odbc] )
 	esoob? ( $php[odbc] )
 	db2? ( $php[odbc] )
-	iodbc? ( $php[odbc] )
+	iodbc? ( $php[iodbc] )
 	sapdb? ( $php[odbc] )
 	solid? ( $php[odbc] )
 	kolab? ( $php[imap] )
@@ -248,6 +245,7 @@ RDEPEND="${DEPEND}
 	zip? ( !dev-php${PHP_MV}/pecl-zip )"
 
 DEPEND="${DEPEND}
+	sys-devel/flex
 	>=sys-devel/m4-1.4.3
 	>=sys-devel/libtool-1.5.18"
 
@@ -260,7 +258,7 @@ PDEPEND="doc? ( app-doc/php-docs )
 # for the best
 PROVIDE="virtual/php virtual/httpd-php"
 
-SLOT="${PHP_MV}";
+SLOT="${PHP_MV}"
 S="${WORKDIR}/${PHP_P}"
 
 PHP_INI_FILE="php.ini"
@@ -332,8 +330,8 @@ eblit-pkg pkg_setup v1
 
 src_prepare() { eblit-run src_prepare v1 ; }
 src_configure() { eblit-run src_configure v1 ; }
-src_compile() { eblit-run src_compile v2 ; }
-src_install() { eblit-run src_install v2 ; }
+src_compile() { eblit-run src_compile v1 ; }
+src_install() { eblit-run src_install v1 ; }
 src_test() { eblit-run src_test v1 ; }
 
 eblit-pkg pkg_postinst v1