summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOle Markus With <olemarkus@gentoo.org>2010-10-11 19:53:44 +0000
committerOle Markus With <olemarkus@gentoo.org>2010-10-11 19:53:44 +0000
commit4915a30b0706d5b74a8c39ec475a25374eeb803d (patch)
tree8a8c285204872a09ba6fb9055a71f59d1184b827 /dev-php
parentClean up patch. Remove unused patch by jalan (bug #340088). (diff)
downloadhistorical-4915a30b0706d5b74a8c39ec475a25374eeb803d.tar.gz
historical-4915a30b0706d5b74a8c39ec475a25374eeb803d.tar.bz2
historical-4915a30b0706d5b74a8c39ec475a25374eeb803d.zip
Removed require_php_with_use mhash as it breaks php 5.3
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'dev-php')
-rw-r--r--dev-php/PEAR-File_SMBPasswd/Manifest2
-rw-r--r--dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3.ebuild14
2 files changed, 7 insertions, 9 deletions
diff --git a/dev-php/PEAR-File_SMBPasswd/Manifest b/dev-php/PEAR-File_SMBPasswd/Manifest
index 8d7d2db3ed90..d02fb0cc27c5 100644
--- a/dev-php/PEAR-File_SMBPasswd/Manifest
+++ b/dev-php/PEAR-File_SMBPasswd/Manifest
@@ -1,6 +1,6 @@
DIST File_SMBPasswd-1.0.2.tgz 4947 RMD160 62016218fd6bc1a9257aa77af709bb7a2342f252 SHA1 cb50c5a09c402d8b75a289c2541899a16088494b SHA256 93b1c58ea0576629c97a6eb6ab45b474191957866503760432721ea21dd7296d
DIST File_SMBPasswd-1.0.3.tgz 5251 RMD160 beebc7c1b02e8e6780be6a9b14ca5aca68efc1b2 SHA1 29089b9220be623af5436d29cf419577a1e7d414 SHA256 8dcb8ce91e1cad2ba2024f664d7c508b798ef666f3e8bfd25b9505e4be95e749
EBUILD PEAR-File_SMBPasswd-1.0.2.ebuild 501 RMD160 6da4153c35f085c43aeb67eec1bd405bd3db2a82 SHA1 5b80d2b5443f7b6ad710da8517fbdf8051a63523 SHA256 a58062ea6427e95e7c09b3d6ca4335b2b1b94b880bbb50b5dd3cef3f3393a7d9
-EBUILD PEAR-File_SMBPasswd-1.0.3.ebuild 516 RMD160 6e8f433246a426fd9431873d5bed68f34c471898 SHA1 1debf4003a0eae46c099b461e3c9ee101e9cfd76 SHA256 ba31917e91ead538b072ec7a026435325a5c10424493fe680a822e147a8b7ae9
+EBUILD PEAR-File_SMBPasswd-1.0.3.ebuild 524 RMD160 9aacc8a52f9e22524e763af3aca2d2fae5a32692 SHA1 c9e7451e22c3dc9035761631337b0fdf5fcac2dd SHA256 3b0c16017ca0e102539e4333e44545943666f5f3d0d21b7bbe944573f1fa503d
MISC ChangeLog 2067 RMD160 3645760978f0ab4e19445b0b5dafb33927b21075 SHA1 438e2f0ab4c1074fc1c86c13118cf3dee2413dde SHA256 338b47989c1eb725b251a94103fa1a162fdd95f0a0f2ec7676142fd70fda32ba
MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
diff --git a/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3.ebuild b/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3.ebuild
index 95d966025c56..a0c5660a01d7 100644
--- a/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3.ebuild
+++ b/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3.ebuild
@@ -1,16 +1,14 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3.ebuild,v 1.1 2009/08/22 18:51:00 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3.ebuild,v 1.2 2010/10/11 19:53:44 olemarkus Exp $
-inherit php-pear-r1 depend.php
+EAPI="2"
+inherit php-pear-r1
DESCRIPTION="Class for managing SAMBA style password files."
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
-RDEPEND=">=dev-php/PEAR-Crypt_CHAP-1.0.0"
-
-pkg_setup() {
- require_php_with_use mhash
-}
+RDEPEND="|| ( <dev-lang/php-5.3[mhash] >=dev-lang/php-5.3 )
+ >=dev-php/PEAR-Crypt_CHAP-1.0.0"