From ff5c4ba6aceaa472163cc1750da1c0d006bd2897 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Wed, 27 Dec 2006 21:03:44 +0000 Subject: [PATCH] Use system installed copy of sqlite instead of the bundled one. Fixes bug #159207. Package-Manager: portage-2.1.2_rc4-r1 --- dev-php5/pecl-pdo-sqlite/ChangeLog | 9 +++- dev-php5/pecl-pdo-sqlite/Manifest | 31 ++++++----- .../files/digest-pecl-pdo-sqlite-1.0 | 2 + .../files/digest-pecl-pdo-sqlite-1.0.1-r1 | 3 ++ .../pecl-pdo-sqlite-1.0.1-r1.ebuild | 51 +++++++++++++++++++ 5 files changed, 83 insertions(+), 13 deletions(-) create mode 100644 dev-php5/pecl-pdo-sqlite/files/digest-pecl-pdo-sqlite-1.0.1-r1 create mode 100644 dev-php5/pecl-pdo-sqlite/pecl-pdo-sqlite-1.0.1-r1.ebuild diff --git a/dev-php5/pecl-pdo-sqlite/ChangeLog b/dev-php5/pecl-pdo-sqlite/ChangeLog index 523fbbbab75a..273fd3e84ce6 100644 --- a/dev-php5/pecl-pdo-sqlite/ChangeLog +++ b/dev-php5/pecl-pdo-sqlite/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-php5/pecl-pdo-sqlite # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-sqlite/ChangeLog,v 1.15 2006/09/29 17:06:40 sebastian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-sqlite/ChangeLog,v 1.16 2006/12/27 21:03:44 betelgeuse Exp $ + +*pecl-pdo-sqlite-1.0.1-r1 (27 Dec 2006) + + 27 Dec 2006; Petteri Räty + +pecl-pdo-sqlite-1.0.1-r1.ebuild: + Use system installed copy of sqlite instead of the bundled one. Fixes bug + #159207. *pecl-pdo-sqlite-1.0.1 (29 Sep 2006) diff --git a/dev-php5/pecl-pdo-sqlite/Manifest b/dev-php5/pecl-pdo-sqlite/Manifest index 0eca8378fcca..25204695c4c6 100644 --- a/dev-php5/pecl-pdo-sqlite/Manifest +++ b/dev-php5/pecl-pdo-sqlite/Manifest @@ -2,7 +2,11 @@ Hash: SHA1 DIST PDO_SQLITE-1.0.1.tgz 868469 RMD160 341a7f0f4edac0126271fb65c9c286b19998c95d SHA1 5344d1d23a9ad43f0033df3965514bd8282b3787 SHA256 67b3d852fb089f6c3b2f940e1921acbbbc658a30f59069cc32552ddd380f1980 -DIST PDO_SQLITE-1.0.tgz 866928 +DIST PDO_SQLITE-1.0.tgz 866928 RMD160 9a98101e0a37a8869118da0cb686c502448d422b SHA1 acad8d84b0bca37511aa4bc072288e763174c60d SHA256 448d163b0d9c9952c097a2902952c5730691d3b1a1ef1983bc168e8b98b7011d +EBUILD pecl-pdo-sqlite-1.0.1-r1.ebuild 1326 RMD160 646ea1dc11f17ddc26d9e52f5c10ebe7d6dfdc61 SHA1 504021ae887d677bb8d131c3aa3d9a41cc2014ae SHA256 45c72d3e60037968e8e2d325903428935a6f129147382cfecadb7bd78c794cad +MD5 4295aba3ae314eae7721c312ca3d8f2e pecl-pdo-sqlite-1.0.1-r1.ebuild 1326 +RMD160 646ea1dc11f17ddc26d9e52f5c10ebe7d6dfdc61 pecl-pdo-sqlite-1.0.1-r1.ebuild 1326 +SHA256 45c72d3e60037968e8e2d325903428935a6f129147382cfecadb7bd78c794cad pecl-pdo-sqlite-1.0.1-r1.ebuild 1326 EBUILD pecl-pdo-sqlite-1.0.1.ebuild 991 RMD160 e0a656c1d67fdc883f1bc6affcf80167a03b0687 SHA1 427080a2525bd6cc258b7548002b18419d994bf7 SHA256 83d871624f7a15b4befbf22db13bd7ed9fe5b3ecf483c55f245c3eb05a372356 MD5 268553d1719a35cbf5138fafeee4de1d pecl-pdo-sqlite-1.0.1.ebuild 991 RMD160 e0a656c1d67fdc883f1bc6affcf80167a03b0687 pecl-pdo-sqlite-1.0.1.ebuild 991 @@ -11,24 +15,27 @@ EBUILD pecl-pdo-sqlite-1.0.ebuild 973 RMD160 c9639a989af460e7ae8b99e40efd06b2d39 MD5 ec8a91f2552b4dcfd3f4419f04e85ef2 pecl-pdo-sqlite-1.0.ebuild 973 RMD160 c9639a989af460e7ae8b99e40efd06b2d39b8f47 pecl-pdo-sqlite-1.0.ebuild 973 SHA256 371e0d99f9a79cf511d5d2a0a175cc290388e33e444a9eff794c754622b70263 pecl-pdo-sqlite-1.0.ebuild 973 -MISC ChangeLog 2050 RMD160 1af366ec4acd0cf3cf896456fb48dd5ac3d97588 SHA1 ec471185fd224091fa1a91d3169bb9a1797a24b7 SHA256 8e6b62174ff37ca6e7f9c8083fc235dc9aef04c66271ab20daa81a8550d60974 -MD5 810dfbd00951b8e3033e2c0e4a59fcca ChangeLog 2050 -RMD160 1af366ec4acd0cf3cf896456fb48dd5ac3d97588 ChangeLog 2050 -SHA256 8e6b62174ff37ca6e7f9c8083fc235dc9aef04c66271ab20daa81a8550d60974 ChangeLog 2050 +MISC ChangeLog 2269 RMD160 6ed5b13ed43c148b849f774f818145c59c472d9f SHA1 2dc55444cc95b0e384012ffaddfd33b4546967b9 SHA256 b719ef1f76aa78a6eba52723267d0947b29ac71135de78b0f8a48fd791f73423 +MD5 b12d3f9088634413fd1824e9680eacf5 ChangeLog 2269 +RMD160 6ed5b13ed43c148b849f774f818145c59c472d9f ChangeLog 2269 +SHA256 b719ef1f76aa78a6eba52723267d0947b29ac71135de78b0f8a48fd791f73423 ChangeLog 2269 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 metadata.xml 157 -MD5 c461ca8eb5580c8a514a8b8827200fda files/digest-pecl-pdo-sqlite-1.0 63 -RMD160 6c487a6941c87d77481753499737a55aaa71f2f0 files/digest-pecl-pdo-sqlite-1.0 63 -SHA256 550e86672c1e4734b56b215dcefcfa9240596ee14f49598cfd8cdb6f0e96bac5 files/digest-pecl-pdo-sqlite-1.0 63 +MD5 760f749a14ad84a53b1452a126671dc2 files/digest-pecl-pdo-sqlite-1.0 235 +RMD160 53046c91ad082d4c2d5d331f42d7d679e1f6d8bc files/digest-pecl-pdo-sqlite-1.0 235 +SHA256 793382773fcf414c89165dcc3558563786326feed9a19153d7d48c37dd762cc5 files/digest-pecl-pdo-sqlite-1.0 235 MD5 8938dd7b0c19a6aa5d73cf344d875f96 files/digest-pecl-pdo-sqlite-1.0.1 241 RMD160 da68217b3e0cb1181f456ffa1323171c799daeb2 files/digest-pecl-pdo-sqlite-1.0.1 241 SHA256 22527194c02acc027c2ef5a86e47bfcf414230d1b25b18b8cebf7266b5db51be files/digest-pecl-pdo-sqlite-1.0.1 241 +MD5 8938dd7b0c19a6aa5d73cf344d875f96 files/digest-pecl-pdo-sqlite-1.0.1-r1 241 +RMD160 da68217b3e0cb1181f456ffa1323171c799daeb2 files/digest-pecl-pdo-sqlite-1.0.1-r1 241 +SHA256 22527194c02acc027c2ef5a86e47bfcf414230d1b25b18b8cebf7266b5db51be files/digest-pecl-pdo-sqlite-1.0.1-r1 241 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFHVKnaGfFFLhbXWkRAhfKAKCdijJkVJ0eZW3N3vlITcjzbHicswCeKE2D -VGEEPzotS1TQyiVPry1jkMc= -=l0T6 +iD8DBQFFkt/AcxLzpIGCsLQRAstpAJ9ku7IKXHf4RT76CJnpnvg7f59rJACfe3Hl +Ze05ufHJ+SprJFfIXY3eLYA= +=q9+8 -----END PGP SIGNATURE----- diff --git a/dev-php5/pecl-pdo-sqlite/files/digest-pecl-pdo-sqlite-1.0 b/dev-php5/pecl-pdo-sqlite/files/digest-pecl-pdo-sqlite-1.0 index 078be713213b..49dfd3e9860c 100644 --- a/dev-php5/pecl-pdo-sqlite/files/digest-pecl-pdo-sqlite-1.0 +++ b/dev-php5/pecl-pdo-sqlite/files/digest-pecl-pdo-sqlite-1.0 @@ -1 +1,3 @@ MD5 5f611f154504a2b7a33db033f3943534 PDO_SQLITE-1.0.tgz 866928 +RMD160 9a98101e0a37a8869118da0cb686c502448d422b PDO_SQLITE-1.0.tgz 866928 +SHA256 448d163b0d9c9952c097a2902952c5730691d3b1a1ef1983bc168e8b98b7011d PDO_SQLITE-1.0.tgz 866928 diff --git a/dev-php5/pecl-pdo-sqlite/files/digest-pecl-pdo-sqlite-1.0.1-r1 b/dev-php5/pecl-pdo-sqlite/files/digest-pecl-pdo-sqlite-1.0.1-r1 new file mode 100644 index 000000000000..672c0bedba69 --- /dev/null +++ b/dev-php5/pecl-pdo-sqlite/files/digest-pecl-pdo-sqlite-1.0.1-r1 @@ -0,0 +1,3 @@ +MD5 15c55f85b2793aab7be1e073eb9c9b31 PDO_SQLITE-1.0.1.tgz 868469 +RMD160 341a7f0f4edac0126271fb65c9c286b19998c95d PDO_SQLITE-1.0.1.tgz 868469 +SHA256 67b3d852fb089f6c3b2f940e1921acbbbc658a30f59069cc32552ddd380f1980 PDO_SQLITE-1.0.1.tgz 868469 diff --git a/dev-php5/pecl-pdo-sqlite/pecl-pdo-sqlite-1.0.1-r1.ebuild b/dev-php5/pecl-pdo-sqlite/pecl-pdo-sqlite-1.0.1-r1.ebuild new file mode 100644 index 000000000000..397f0423432e --- /dev/null +++ b/dev-php5/pecl-pdo-sqlite/pecl-pdo-sqlite-1.0.1-r1.ebuild @@ -0,0 +1,51 @@ +# 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-sqlite/pecl-pdo-sqlite-1.0.1-r1.ebuild,v 1.1 2006/12/27 21:03:44 betelgeuse Exp $ + +PHP_EXT_NAME="pdo_sqlite" +PHP_EXT_PECL_PKG="PDO_SQLITE" +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 SQLite Server." +LICENSE="PHP" +SLOT="0" +IUSE="" + +DEPEND="dev-php5/pecl-pdo + =dev-db/sqlite-3*" + +RDEPEND="${DEPEND}" + +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}" + # This is a copy of the sqlite3 sources and a old version + # So we make sure the bundled copy is never used + # https://bugs.gentoo.org/show_bug.cgi?id=159207 + rm -fr sqlite +} + +src_compile() { + my_conf="--with-pdo-sqlite=/usr" + php-ext-source-r1_src_compile +} -- 2.26.2