diff options
Diffstat (limited to 'dev-php5/pecl-pdo-mysql')
| -rw-r--r-- | dev-php5/pecl-pdo-mysql/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-php5/pecl-pdo-mysql/Manifest | 21 | ||||
| -rw-r--r-- | dev-php5/pecl-pdo-mysql/files/digest-pecl-pdo-mysql-1.0.1 | 2 | ||||
| -rw-r--r-- | dev-php5/pecl-pdo-mysql/files/digest-pecl-pdo-mysql-1.0.1-r1 | 3 | ||||
| -rw-r--r-- | dev-php5/pecl-pdo-mysql/files/pecl-pdo_mysql-readmycnf.patch | 33 | ||||
| -rw-r--r-- | dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-1.0.1-r1.ebuild | 54 |
6 files changed, 114 insertions, 7 deletions
diff --git a/dev-php5/pecl-pdo-mysql/ChangeLog b/dev-php5/pecl-pdo-mysql/ChangeLog index ba3de2a82113..c509bedbb89d 100644 --- a/dev-php5/pecl-pdo-mysql/ChangeLog +++ b/dev-php5/pecl-pdo-mysql/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-php5/pecl-pdo-mysql # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-mysql/ChangeLog,v 1.15 2006/02/24 13:58:41 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-mysql/ChangeLog,v 1.16 2006/04/14 11:49:43 chtekk Exp $ + +*pecl-pdo-mysql-1.0.1-r1 (14 Apr 2006) + + 14 Apr 2006; Luca Longinotti <chtekk@gentoo.org> + +files/pecl-pdo_mysql-readmycnf.patch, +pecl-pdo-mysql-1.0.1-r1.ebuild: + Fix Gentoo bug #129761. 24 Feb 2006; Jeroen Roovers <jer@gentoo.org> pecl-pdo-mysql-1.0.1.ebuild: Stable on hppa (preparation for bug #119461). diff --git a/dev-php5/pecl-pdo-mysql/Manifest b/dev-php5/pecl-pdo-mysql/Manifest index cfc60b5a8e8f..f0482b009d17 100644 --- a/dev-php5/pecl-pdo-mysql/Manifest +++ b/dev-php5/pecl-pdo-mysql/Manifest @@ -1,15 +1,24 @@ -MD5 1f587a210b9d58385d164e93e0450caf ChangeLog 1981 -RMD160 9e34eecb1fa121e367f87975ed9173269d901e63 ChangeLog 1981 -SHA256 7a197db2aee1ba3ed56c0610261358dd5be31f4f3c1cfcefd5091bcbc157bfaf ChangeLog 1981 +MD5 d88be46177711d66b93027b11139e0f2 ChangeLog 2176 +RMD160 05ce8093ec48d1ee1ab42978681ee72afdfba1fd ChangeLog 2176 +SHA256 73ac7239e38240fd570a09f0d5d8e0a1c1db335867a50341eaef891620e8d04c ChangeLog 2176 MD5 3056c682a94fb76a1c8adeb30bf69c6b files/config-sed.patch 490 RMD160 6672ed8210d1b19301cb1bf7b653dbfbcfc6c17b files/config-sed.patch 490 SHA256 796f61b3156a17269f3dc3ec3044a8b547c57b8bfc1c470171764c0bcfc40200 files/config-sed.patch 490 -MD5 4ee92172ccf8ef55a8ec4ab538ddcaa0 files/digest-pecl-pdo-mysql-1.0.1 63 -RMD160 033b42f656b77e8640533e2b676dba3f2a4f8bb6 files/digest-pecl-pdo-mysql-1.0.1 63 -SHA256 6c862de363da3b6e79796ae02c249f5641a38c266a28dcf86680a06d78deb606 files/digest-pecl-pdo-mysql-1.0.1 63 +MD5 8615751b9b23de53fc7771daa992884d files/digest-pecl-pdo-mysql-1.0.1 235 +RMD160 c50f3a553d7511aaf8177946734eb057e190efa1 files/digest-pecl-pdo-mysql-1.0.1 235 +SHA256 8f6db9c1aadd2a8f4ef3768a95c5e8fa4a13ec440862c6706e5fcf9b3b54a975 files/digest-pecl-pdo-mysql-1.0.1 235 +MD5 8615751b9b23de53fc7771daa992884d files/digest-pecl-pdo-mysql-1.0.1-r1 235 +RMD160 c50f3a553d7511aaf8177946734eb057e190efa1 files/digest-pecl-pdo-mysql-1.0.1-r1 235 +SHA256 8f6db9c1aadd2a8f4ef3768a95c5e8fa4a13ec440862c6706e5fcf9b3b54a975 files/digest-pecl-pdo-mysql-1.0.1-r1 235 +MD5 782fcb1dbe361a624309096cad87cc83 files/pecl-pdo_mysql-readmycnf.patch 949 +RMD160 052232e62b3c51ff62a8875c7d0901c115264ea2 files/pecl-pdo_mysql-readmycnf.patch 949 +SHA256 0357637b43cf4096039a77c6018928e7cc308333cbe825cad07257fe87176831 files/pecl-pdo_mysql-readmycnf.patch 949 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 metadata.xml 157 +MD5 be3fb34919cfa81a35fc460e4f42623a pecl-pdo-mysql-1.0.1-r1.ebuild 1280 +RMD160 0f3a3ad54b470c6702141332b42e8fa38c779c71 pecl-pdo-mysql-1.0.1-r1.ebuild 1280 +SHA256 3966e168f16e4a0d9fc2fe21e75032e2351a28e49388ca48d3ff223f75ee84b0 pecl-pdo-mysql-1.0.1-r1.ebuild 1280 MD5 e35930a5c66066991d78e8a129cdd177 pecl-pdo-mysql-1.0.1.ebuild 1184 RMD160 a89f441c28a55a9824d94a36ebad3a4b1851558b pecl-pdo-mysql-1.0.1.ebuild 1184 SHA256 2ff43c8b3b4cbf80e5ebe9a02acd26634be49f8712810abfd63a92b401ddbeba pecl-pdo-mysql-1.0.1.ebuild 1184 diff --git a/dev-php5/pecl-pdo-mysql/files/digest-pecl-pdo-mysql-1.0.1 b/dev-php5/pecl-pdo-mysql/files/digest-pecl-pdo-mysql-1.0.1 index 34cfde73b6b0..6dfcb1a90c73 100644 --- a/dev-php5/pecl-pdo-mysql/files/digest-pecl-pdo-mysql-1.0.1 +++ b/dev-php5/pecl-pdo-mysql/files/digest-pecl-pdo-mysql-1.0.1 @@ -1 +1,3 @@ MD5 cfa8e0c6cfe8df78b31842d9757bd3d7 PDO_MYSQL-1.0.1.tgz 13002 +RMD160 b7f09c74696cf293c971186fd1dcc5ab0de5681e PDO_MYSQL-1.0.1.tgz 13002 +SHA256 20fe26e0f3761902fbecf95992a27a886c847b4528cc7fe4b681e6c8ad12a991 PDO_MYSQL-1.0.1.tgz 13002 diff --git a/dev-php5/pecl-pdo-mysql/files/digest-pecl-pdo-mysql-1.0.1-r1 b/dev-php5/pecl-pdo-mysql/files/digest-pecl-pdo-mysql-1.0.1-r1 new file mode 100644 index 000000000000..6dfcb1a90c73 --- /dev/null +++ b/dev-php5/pecl-pdo-mysql/files/digest-pecl-pdo-mysql-1.0.1-r1 @@ -0,0 +1,3 @@ +MD5 cfa8e0c6cfe8df78b31842d9757bd3d7 PDO_MYSQL-1.0.1.tgz 13002 +RMD160 b7f09c74696cf293c971186fd1dcc5ab0de5681e PDO_MYSQL-1.0.1.tgz 13002 +SHA256 20fe26e0f3761902fbecf95992a27a886c847b4528cc7fe4b681e6c8ad12a991 PDO_MYSQL-1.0.1.tgz 13002 diff --git a/dev-php5/pecl-pdo-mysql/files/pecl-pdo_mysql-readmycnf.patch b/dev-php5/pecl-pdo-mysql/files/pecl-pdo_mysql-readmycnf.patch new file mode 100644 index 000000000000..fe3aef076593 --- /dev/null +++ b/dev-php5/pecl-pdo-mysql/files/pecl-pdo_mysql-readmycnf.patch @@ -0,0 +1,33 @@ +--- mysql_driver.c 2006-04-13 19:39:36.000000000 +0200 ++++ mysql_driver.c 2006-04-13 19:42:30.000000000 +0200 +@@ -32,7 +32,7 @@ + #include "php_pdo_mysql_int.h" + #include <mysqld_error.h> + #include "zend_exceptions.h" +- ++#include "SAPI.h" + + const char *pdo_mysql_get_sqlstate(unsigned int my_errno) { + switch (my_errno) { +@@ -390,7 +390,7 @@ + { + pdo_mysql_db_handle *H; + int i, ret = 0; +- char *host = NULL, *unix_socket = NULL; ++ char *host = NULL, *unix_socket = NULL, *option_section = NULL; + unsigned int port = 3306; + char *dbname; + struct pdo_data_src_parser vars[] = { +@@ -475,6 +475,12 @@ + } + } + ++ /* Read settings from my.cnf */ ++ option_section = emalloc(strlen("php-%s") + strlen(sapi_module.name)); ++ sprintf(option_section, "php-%s", sapi_module.name); ++ mysql_options(H->server, MYSQL_READ_DEFAULT_GROUP, option_section); ++ efree(option_section); ++ + dbname = vars[1].optval; + host = vars[2].optval; + if(vars[3].optval) { diff --git a/dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-1.0.1-r1.ebuild b/dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-1.0.1-r1.ebuild new file mode 100644 index 000000000000..a0bf8ca637ce --- /dev/null +++ b/dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-1.0.1-r1.ebuild @@ -0,0 +1,54 @@ +# 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-mysql/pecl-pdo-mysql-1.0.1-r1.ebuild,v 1.1 2006/04/14 11:49:43 chtekk Exp $ + +PHP_EXT_NAME="pdo_mysql" +PHP_EXT_PECL_PKG="PDO_MYSQL" +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 MySQL Server." +LICENSE="PHP" +SLOT="0" +IUSE="" + +DEPEND="${DEPEND} + dev-php5/pecl-pdo + dev-db/mysql" + +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 #115921 + epatch "${FILESDIR}/config-sed.patch" + + # Fix Gentoo bug #129761 + epatch "${FILESDIR}/pecl-pdo_mysql-readmycnf.patch" +} + +src_compile() { + has_php + my_conf="--with-pdo-mysql=/usr" + php-ext-pecl-r1_src_compile +} |