update for PHP-5.3 USE changes

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 16 insertions, 49 deletions

diff --git a/dev-php5/pecl-sca_sdo/ChangeLog b/dev-php5/pecl-sca_sdo/ChangeLog
index 505b7ce16fdb..e7b409188c53 100644
--- a/dev-php5/pecl-sca_sdo/ChangeLog
+++ b/dev-php5/pecl-sca_sdo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php5/pecl-sca_sdo
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-sca_sdo/ChangeLog,v 1.6 2009/07/25 22:15:29 halcy0n Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-sca_sdo/ChangeLog,v 1.7 2010/05/29 18:48:46 mabi Exp $
+
+*pecl-sca_sdo-1.2.4-r1 (29 May 2010)
+
+  29 May 2010; <mabi@gentoo.org> -pecl-sca_sdo-1.2.3.ebuild,
+  -pecl-sca_sdo-1.2.4.ebuild, +pecl-sca_sdo-1.2.4-r1.ebuild:
+  update for php-5.3 USE changes (bug #301159)
 
   25 Jul 2009; Mark Loeser <halcy0n@gentoo.org> pecl-sca_sdo-1.2.4.ebuild,
   +files/pecl-sca_sdo-1.2.4-gcc44.patch:
diff --git a/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.3.ebuild b/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.3.ebuild
deleted file mode 100644
index e3780b6db304..000000000000
--- a/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.3.ebuild,v 1.1 2007/08/30 13:07:09 jokey Exp $
-
-PHP_EXT_NAME="sdo"
-PHP_EXT_PECL_PKG="SCA_SDO"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-inherit php-ext-pecl-r1 depend.php
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Service Component Architecture (SCA) and Service Data Objects (SDO) for PHP."
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="examples"
-
-DEPEND=""
-RDEPEND=""
-
-need_php_by_category
-
-pkg_setup() {
-	require_php_with_use reflection spl xml
-}
-
-src_install() {
-	php-ext-pecl-r1_src_install
-
-	insinto /usr/share/php5
-	doins -r DAS SCA
-
-	if use examples ; then
-		insinto /usr/share/doc/${CATEGORY}/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.4.ebuild b/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.4-r1.ebuild
index 23e5a57713c0..f94e175aa7c3 100644
--- a/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.4.ebuild
+++ b/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.4-r1.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.4.ebuild,v 1.2 2009/07/25 22:15:29 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.4-r1.ebuild,v 1.1 2010/05/29 18:48:46 mabi Exp $
+
+EAPI="2"
 
 PHP_EXT_NAME="sdo"
 PHP_EXT_PECL_PKG="SCA_SDO"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-inherit eutils php-ext-pecl-r1 depend.php
+inherit eutils php-ext-pecl-r1
 
 KEYWORDS="~amd64 ~x86"
 
@@ -16,15 +18,12 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="examples"
 
-DEPEND=""
-RDEPEND=""
+DEPEND=">=dev-lang/php-5.2[json,soap,xml]
+	    || ( <dev-lang/php-5.3[pcre,reflection,spl] >=dev-lang/php-5.3.1 )"
+RDEPEND="${DEPEND}"
 
 need_php_by_category
 
-pkg_setup() {
-	require_php_with_use json reflection soap spl xml
-}
-
 src_unpack() {
 	php-ext-source-r1_src_unpack