Fix compile on 5.2.

Package-Manager: portage-2.1.2.1

diff --git a/dev-php5/pecl-pdo/ChangeLog b/dev-php5/pecl-pdo/ChangeLog
index ba066978c4f0fc46a4ac56b14c743796e5fa91e1..5fc43bcb423977cdd84f962ef49e1db0d73df3f4 100644 (file)
--- a/dev-php5/pecl-pdo/ChangeLog
+++ b/dev-php5/pecl-pdo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php5/pecl-pdo
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo/ChangeLog,v 1.19 2007/03/04 21:04:43 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo/ChangeLog,v 1.20 2007/03/05 01:40:55 chtekk Exp $
+
+  05 Mar 2007; Luca Longinotti <chtekk@gentoo.org>
+  +files/pecl-pdo-1.0.3-verscheck.patch, pecl-pdo-1.0.3.ebuild:
+  Fix emerge on PHP 5.2.
 
   04 Mar 2007; Luca Longinotti <chtekk@gentoo.org> -pecl-pdo-1.0.2.ebuild,
   pecl-pdo-1.0.3.ebuild:

diff --git a/dev-php5/pecl-pdo/Manifest b/dev-php5/pecl-pdo/Manifest
index b4f717148abc135d600c5f1023b75bc831d8ff03..3d7ef71c3a171d2dd9fe2895914285affb882b60 100644 (file)
--- a/dev-php5/pecl-pdo/Manifest
+++ b/dev-php5/pecl-pdo/Manifest
@@ -1,12 +1,16 @@
+AUX pecl-pdo-1.0.3-verscheck.patch 298 RMD160 499e9d414b2d0ea65a3d4167c6919861c0189620 SHA1 df34e89b7423c411bb50bf022a9f350587e23de5 SHA256 0bbbc76e2596d30db93490001caf8e6319608a40a75a1c868e2127c9fbd5db81
+MD5 e71eb393753236ef31d13c6c4b9241d0 files/pecl-pdo-1.0.3-verscheck.patch 298
+RMD160 499e9d414b2d0ea65a3d4167c6919861c0189620 files/pecl-pdo-1.0.3-verscheck.patch 298
+SHA256 0bbbc76e2596d30db93490001caf8e6319608a40a75a1c868e2127c9fbd5db81 files/pecl-pdo-1.0.3-verscheck.patch 298
 DIST PDO-1.0.3.tgz 52613 RMD160 1a1aeb9cf16d2aecda407e015bf3193d272b9970 SHA1 93f627b4b3fc053d8a00042217fc6bf3666c170c SHA256 a7922b658c7a68c092bc9806602d5d6ecee2214a388e1731352de7b3663f89bf
-EBUILD pecl-pdo-1.0.3.ebuild 1498 RMD160 d3159ce9133529578eda8d1454abcfa92357491f SHA1 fa83c80aff430e5103f0677abf32df5d60546a76 SHA256 2067c488511d691c4d2416668626ccd1878202a6e43436fa0948d9ac5fb04f80
-MD5 38a1318820b5a3a63b2533dec223efb5 pecl-pdo-1.0.3.ebuild 1498
-RMD160 d3159ce9133529578eda8d1454abcfa92357491f pecl-pdo-1.0.3.ebuild 1498
-SHA256 2067c488511d691c4d2416668626ccd1878202a6e43436fa0948d9ac5fb04f80 pecl-pdo-1.0.3.ebuild 1498
-MISC ChangeLog 2426 RMD160 58220a59afe21124cbf8ab2c0313ba54db0d866e SHA1 5843d0a41618b80bf254eb542a38d66386e83f7b SHA256 97ce0eb7b22837bdac04f659a57ac612b548bc226bf8416cb793d15c052118d2
-MD5 a0df26c8cbc55563c452c5fed6dfb0f7 ChangeLog 2426
-RMD160 58220a59afe21124cbf8ab2c0313ba54db0d866e ChangeLog 2426
-SHA256 97ce0eb7b22837bdac04f659a57ac612b548bc226bf8416cb793d15c052118d2 ChangeLog 2426
+EBUILD pecl-pdo-1.0.3.ebuild 1583 RMD160 9efc6813fc969f2d19c73298731a367da2811ae0 SHA1 d0954c1de4807010403e19fa4c56e8628f0b9ef3 SHA256 f193544c8edf844e9d665412c8c9c92ee4214b12149578440d62c6adc970ece8
+MD5 5c4eb13c321e1f2e67a5a072c287f524 pecl-pdo-1.0.3.ebuild 1583
+RMD160 9efc6813fc969f2d19c73298731a367da2811ae0 pecl-pdo-1.0.3.ebuild 1583
+SHA256 f193544c8edf844e9d665412c8c9c92ee4214b12149578440d62c6adc970ece8 pecl-pdo-1.0.3.ebuild 1583
+MISC ChangeLog 2567 RMD160 9ba77e67795b96ca80201f7fa11ad2ab2cd8d303 SHA1 04a8d95510ba274b736bd53e1590db9754157d4b SHA256 2cad111e13403fd3085d0fbadef498a8d76391ce9ba011636ed0586bdf8f6d7a
+MD5 f955c144a1b3911ac4862470300584a2 ChangeLog 2567
+RMD160 9ba77e67795b96ca80201f7fa11ad2ab2cd8d303 ChangeLog 2567
+SHA256 2cad111e13403fd3085d0fbadef498a8d76391ce9ba011636ed0586bdf8f6d7a ChangeLog 2567
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157

diff --git a/dev-php5/pecl-pdo/files/pecl-pdo-1.0.3-verscheck.patch b/dev-php5/pecl-pdo/files/pecl-pdo-1.0.3-verscheck.patch
new file mode 100644 (file)
index 0000000..405fc63
--- /dev/null
+++ b/dev-php5/pecl-pdo/files/pecl-pdo-1.0.3-verscheck.patch
@@ -0,0 +1,11 @@
+--- pdo.c      2006/01/01 12:50:11     1.57.2.17
++++ pdo.c      2006/05/09 23:54:48     1.57.2.17.2.1
+@@ -74,7 +74,7 @@
+               }
+       }
+ #endif
+-#if (PHP_MAJOR_VERSION < 6)
++#if (PHP_MAJOR_VERSION <= 5) && (PHP_MINOR_VERSION < 2)
+       return zend_exception_get_default();
+ #else
+       return zend_exception_get_default(TSRMLS_C);

diff --git a/dev-php5/pecl-pdo/pecl-pdo-1.0.3.ebuild b/dev-php5/pecl-pdo/pecl-pdo-1.0.3.ebuild
index 5b41f7eba0c3df116e81c1e55df3608a607a2b92..4b64e7d0133736383af804957509ac1591e92e00 100644 (file)
--- a/dev-php5/pecl-pdo/pecl-pdo-1.0.3.ebuild
+++ b/dev-php5/pecl-pdo/pecl-pdo-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # 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/pecl-pdo-1.0.3.ebuild,v 1.3 2007/03/04 21:04:43 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo/pecl-pdo-1.0.3.ebuild,v 1.4 2007/03/05 01:40:55 chtekk Exp $
 
 PHP_EXT_NAME="pdo"
 PHP_EXT_PECL_PKG="PDO"
@@ -40,6 +40,12 @@ pkg_setup() {
        fi
 }
 
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}/${P}-verscheck.patch"
+}
+
 src_install() {
        php-ext-pecl-r1_src_install