summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Longinotti <chtekk@gentoo.org>2006-01-28 16:17:03 +0000
committerLuca Longinotti <chtekk@gentoo.org>2006-01-28 16:17:03 +0000
commit19ecf38f058d06e6bb8b6e0ea1c97f827ade077f (patch)
tree40a3c40527463f0c5795065b6359ebc6a09faa4d /dev-php5/pecl-pdo-oci
parentFix bug #118848. (diff)
downloadhistorical-19ecf38f058d06e6bb8b6e0ea1c97f827ade077f.tar.gz
historical-19ecf38f058d06e6bb8b6e0ea1c97f827ade077f.tar.bz2
historical-19ecf38f058d06e6bb8b6e0ea1c97f827ade077f.zip
Fix Gentoo bug #118848.
Package-Manager: portage-2.0.54
Diffstat (limited to 'dev-php5/pecl-pdo-oci')
-rw-r--r--dev-php5/pecl-pdo-oci/ChangeLog5
-rw-r--r--dev-php5/pecl-pdo-oci/Manifest14
-rw-r--r--dev-php5/pecl-pdo-oci/pecl-pdo-oci-1.0.ebuild4
3 files changed, 8 insertions, 15 deletions
diff --git a/dev-php5/pecl-pdo-oci/ChangeLog b/dev-php5/pecl-pdo-oci/ChangeLog
index df4a275283b7..c18ee83b0add 100644
--- a/dev-php5/pecl-pdo-oci/ChangeLog
+++ b/dev-php5/pecl-pdo-oci/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-php5/pecl-pdo-oci
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-oci/ChangeLog,v 1.7 2006/01/22 15:06:53 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-oci/ChangeLog,v 1.8 2006/01/28 16:17:03 chtekk Exp $
+
+ 28 Jan 2006; Luca Longinotti <chtekk@gentoo.org> pecl-pdo-oci-1.0.ebuild:
+ Fix Gentoo bug #118848.
22 Jan 2006; Simon Stelling <blubb@gentoo.org> pecl-pdo-oci-1.0.ebuild:
stable on amd64
diff --git a/dev-php5/pecl-pdo-oci/Manifest b/dev-php5/pecl-pdo-oci/Manifest
index f197aa5c20f0..c1718821b975 100644
--- a/dev-php5/pecl-pdo-oci/Manifest
+++ b/dev-php5/pecl-pdo-oci/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 13c0604546c2e1407ce6b79fd87c5842 ChangeLog 1101
+MD5 eb737339f3cae8c7372190eb297d7cda ChangeLog 1205
MD5 0f8397a8d55a3d4107c3f210c0284a91 files/digest-pecl-pdo-oci-1.0 59
MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 de1f1aacb198b85d0249eeb91147b4b0 pecl-pdo-oci-1.0.ebuild 1363
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD05+cH6mNYUtVdIARAvEyAKCcHbQWKFxK4kDDjpSJkk8fKoF9WwCgp+EU
-mLt8r3fgyl1w8g9DFNm0DZQ=
-=qmoA
------END PGP SIGNATURE-----
+MD5 932f2877f89c17043b4c1b38c843b1f7 pecl-pdo-oci-1.0.ebuild 1385
diff --git a/dev-php5/pecl-pdo-oci/pecl-pdo-oci-1.0.ebuild b/dev-php5/pecl-pdo-oci/pecl-pdo-oci-1.0.ebuild
index 00f8ce4b6efe..3a378632bf5e 100644
--- a/dev-php5/pecl-pdo-oci/pecl-pdo-oci-1.0.ebuild
+++ b/dev-php5/pecl-pdo-oci/pecl-pdo-oci-1.0.ebuild
@@ -1,6 +1,6 @@
# 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-oci/pecl-pdo-oci-1.0.ebuild,v 1.7 2006/01/22 15:06:53 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-oci/pecl-pdo-oci-1.0.ebuild,v 1.8 2006/01/28 16:17:03 chtekk Exp $
PHP_EXT_NAME="pdo_oci"
PHP_EXT_PECL_PKG="PDO_OCI"
@@ -39,7 +39,7 @@ src_compile() {
has_php
if useq oci8-instant-client ; then
OCI8IC_PKG="`best_version dev-db/oracle-instantclient-basic`"
- OCI8IC_PKG="`printf ${OCI8IC_PKG} | sed -e 's|dev-db/oracle-instantclient-basic-||g'`"
+ OCI8IC_PKG="`printf ${OCI8IC_PKG} | sed -e 's|dev-db/oracle-instantclient-basic-||g' | sed -e 's|-r.*||g'`"
my_conf="--with-pdo-oci=instantclient,/usr,${OCI8IC_PKG}"
else
my_conf="--with-pdo-oci"