Cleanup.

Package-Manager: portage-2.1.2-r13

9 files changed, 22 insertions, 122 deletions

diff --git a/dev-php5/pecl-pdo-odbc/ChangeLog b/dev-php5/pecl-pdo-odbc/ChangeLog
index bb36281b6f4a..219f2636a7f0 100644
--- a/dev-php5/pecl-pdo-odbc/ChangeLog
+++ b/dev-php5/pecl-pdo-odbc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php5/pecl-pdo-odbc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-odbc/ChangeLog,v 1.15 2007/02/22 00:02:08 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-odbc/ChangeLog,v 1.16 2007/03/04 20:50:50 chtekk Exp $
+
+  04 Mar 2007; Luca Longinotti <chtekk@gentoo.org>
+  -pecl-pdo-odbc-1.0.ebuild, pecl-pdo-odbc-1.0.1.ebuild:
+  Cleanup.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/dev-php5/pecl-pdo-odbc/files/digest-pecl-pdo-odbc-1.0 b/dev-php5/pecl-pdo-odbc/files/digest-pecl-pdo-odbc-1.0
deleted file mode 100644
index bd4c4c5bf393..000000000000
--- a/dev-php5/pecl-pdo-odbc/files/digest-pecl-pdo-odbc-1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 14bac779f40430cfc5c676ad170f0e14 PDO_ODBC-1.0.tgz 13019
-RMD160 5fc75c10e8aa0b78bc99a8c76b070fad4f2102c6 PDO_ODBC-1.0.tgz 13019
-SHA256 1edf6691fbae80aef85a8b61891045d58bb3a60fcfa6ef754f73750a023adf25 PDO_ODBC-1.0.tgz 13019
diff --git a/dev-php5/pecl-pdo-odbc/pecl-pdo-odbc-1.0.1.ebuild b/dev-php5/pecl-pdo-odbc/pecl-pdo-odbc-1.0.1.ebuild
index b368350b28e0..289e6c40acba 100644
--- a/dev-php5/pecl-pdo-odbc/pecl-pdo-odbc-1.0.1.ebuild
+++ b/dev-php5/pecl-pdo-odbc/pecl-pdo-odbc-1.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-odbc/pecl-pdo-odbc-1.0.1.ebuild,v 1.1 2006/09/29 17:18:26 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-odbc/pecl-pdo-odbc-1.0.1.ebuild,v 1.2 2007/03/04 20:50:50 chtekk Exp $
 
 PHP_EXT_NAME="pdo_odbc"
 PHP_EXT_PECL_PKG="PDO_ODBC"
@@ -9,15 +9,16 @@ PHP_EXT_ZENDEXT="no"
 
 inherit php-ext-pecl-r1
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
+
 DESCRIPTION="PHP Data Objects (PDO) Driver For ODBC Interface."
 LICENSE="PHP"
 SLOT="0"
 IUSE=""
 
-DEPEND="${DEPEND}
-		dev-php5/pecl-pdo
+DEPEND="dev-php5/pecl-pdo
 		dev-db/unixODBC"
+RDEPEND="${DEPEND}"
 
 need_php_by_category
 
diff --git a/dev-php5/pecl-pdo-odbc/pecl-pdo-odbc-1.0.ebuild b/dev-php5/pecl-pdo-odbc/pecl-pdo-odbc-1.0.ebuild
deleted file mode 100644
index 904ad86fd718..000000000000
--- a/dev-php5/pecl-pdo-odbc/pecl-pdo-odbc-1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-odbc/pecl-pdo-odbc-1.0.ebuild,v 1.10 2006/02/24 14:05:30 jer Exp $
-
-PHP_EXT_NAME="pdo_odbc"
-PHP_EXT_PECL_PKG="PDO_ODBC"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-inherit php-ext-pecl-r1
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-DESCRIPTION="PHP Data Objects (PDO) Driver For ODBC Interface."
-LICENSE="PHP"
-SLOT="0"
-IUSE=""
-
-DEPEND="${DEPEND}
-		dev-php5/pecl-pdo
-		dev-db/unixODBC"
-
-need_php_by_category
-
-pkg_setup() {
-	has_php
-
-	# if the user has compiled in PDO, he can't use this package
-	if built_with_use =${PHP_PKG} pdo ; then
-		eerror
-		eerror "You have built ${PHP_PKG} to use the bundled PDO support."
-		eerror "If you want to use the PECL PDO packages, you must rebuild"
-		eerror "your PHP with the 'pdo-external' USE flag instead."
-		eerror
-		die "PHP built to use bundled PDO support"
-	fi
-}
-
-src_compile() {
-	has_php
-	my_conf="--with-pdo-odbc=unixODBC,/usr"
-	php-ext-pecl-r1_src_compile
-}
diff --git a/dev-php5/pecl-pdo-pgsql/ChangeLog b/dev-php5/pecl-pdo-pgsql/ChangeLog
index 5c9bae3782c2..5c6d4a89ebf0 100644
--- a/dev-php5/pecl-pdo-pgsql/ChangeLog
+++ b/dev-php5/pecl-pdo-pgsql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php5/pecl-pdo-pgsql
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-pgsql/ChangeLog,v 1.18 2007/02/22 00:03:07 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-pgsql/ChangeLog,v 1.19 2007/03/04 20:54:04 chtekk Exp $
+
+  04 Mar 2007; Luca Longinotti <chtekk@gentoo.org> -files/fix-tsrm.patch,
+  -pecl-pdo-pgsql-1.0.1.ebuild, pecl-pdo-pgsql-1.0.2.ebuild:
+  Cleanup.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/dev-php5/pecl-pdo-pgsql/files/digest-pecl-pdo-pgsql-1.0.1 b/dev-php5/pecl-pdo-pgsql/files/digest-pecl-pdo-pgsql-1.0.1
deleted file mode 100644
index 26298a1200d9..000000000000
--- a/dev-php5/pecl-pdo-pgsql/files/digest-pecl-pdo-pgsql-1.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e8af91f5a5b20f87ca59d07ea8f5297f PDO_PGSQL-1.0.1.tgz 13308
-RMD160 51088de4660210053eebf87685621835b3a45157 PDO_PGSQL-1.0.1.tgz 13308
-SHA256 65aa9cb9447ba4cdf1d06550748b97a7dabe0131e1150fcfdd6cdd909d58f5c6 PDO_PGSQL-1.0.1.tgz 13308
diff --git a/dev-php5/pecl-pdo-pgsql/files/fix-tsrm.patch b/dev-php5/pecl-pdo-pgsql/files/fix-tsrm.patch
deleted file mode 100644
index db78cb0c4613..000000000000
--- a/dev-php5/pecl-pdo-pgsql/files/fix-tsrm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pgsql_driver.c	2006-01-18 20:54:18.000000000 +0100
-+++ pgsql_driver.c	2006-01-18 20:55:15.000000000 +0100
-@@ -132,7 +132,7 @@
- 		lo_close(self->conn, self->lfd);
- 	}
- 	efree(self);
--	php_pdo_dbh_delref(dbh TSRMLS_DC);
-+	php_pdo_dbh_delref(dbh TSRMLS_CC);
- 	return 0;
- }
- 
diff --git a/dev-php5/pecl-pdo-pgsql/pecl-pdo-pgsql-1.0.1.ebuild b/dev-php5/pecl-pdo-pgsql/pecl-pdo-pgsql-1.0.1.ebuild
deleted file mode 100644
index 6f365785b072..000000000000
--- a/dev-php5/pecl-pdo-pgsql/pecl-pdo-pgsql-1.0.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-pgsql/pecl-pdo-pgsql-1.0.1.ebuild,v 1.12 2006/02/24 14:02:12 jer Exp $
-
-PHP_EXT_NAME="pdo_pgsql"
-PHP_EXT_PECL_PKG="PDO_PGSQL"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-inherit php-ext-pecl-r1
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-DESCRIPTION="PHP Data Objects (PDO) Driver For PostgreSQL Server."
-LICENSE="PHP"
-SLOT="0"
-IUSE=""
-
-DEPEND="${DEPEND}
-		dev-php5/pecl-pdo
-		dev-db/libpq"
-
-need_php_by_category
-
-pkg_setup() {
-	has_php
-
-	# if the user has compiled in PDO, he can't use this package
-	if built_with_use =${PHP_PKG} pdo ; then
-		eerror
-		eerror "You have built ${PHP_PKG} to use the bundled PDO support."
-		eerror "If you want to use the PECL PDO packages, you must rebuild"
-		eerror "your PHP with the 'pdo-external' USE flag instead."
-		eerror
-		die "PHP built to use bundled PDO support"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	# fix Gentoo bug #116914
-	epatch "${FILESDIR}/fix-tsrm.patch"
-}
-
-src_compile() {
-	has_php
-	my_conf="--with-pdo-pgsql"
-	php-ext-pecl-r1_src_compile
-}
diff --git a/dev-php5/pecl-pdo-pgsql/pecl-pdo-pgsql-1.0.2.ebuild b/dev-php5/pecl-pdo-pgsql/pecl-pdo-pgsql-1.0.2.ebuild
index eb2491dee29b..1ce879f1e91c 100644
--- a/dev-php5/pecl-pdo-pgsql/pecl-pdo-pgsql-1.0.2.ebuild
+++ b/dev-php5/pecl-pdo-pgsql/pecl-pdo-pgsql-1.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-pgsql/pecl-pdo-pgsql-1.0.2.ebuild,v 1.1 2006/09/29 17:24:31 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-pgsql/pecl-pdo-pgsql-1.0.2.ebuild,v 1.2 2007/03/04 20:54:04 chtekk Exp $
 
 PHP_EXT_NAME="pdo_pgsql"
 PHP_EXT_PECL_PKG="PDO_PGSQL"
@@ -9,15 +9,16 @@ PHP_EXT_ZENDEXT="no"
 
 inherit php-ext-pecl-r1
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
+
 DESCRIPTION="PHP Data Objects (PDO) Driver For PostgreSQL Server."
 LICENSE="PHP"
 SLOT="0"
 IUSE=""
 
-DEPEND="${DEPEND}
-		dev-php5/pecl-pdo
+DEPEND="dev-php5/pecl-pdo
 		dev-db/libpq"
+RDEPEND="${DEPEND}"
 
 need_php_by_category