Bug #394995 - Remove invalid birdstep? conditionals from RDEPEND and REQUIRED_USE...

Package-Manager: portage-2.2.0_alpha81_p16/cvs/Linux i686
RepoMan-Options: --force

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 9b5ffdd710f37c0dcdb21d977bc2ed335dd128fb..0bbe57a2e4f50991218bea1465eeb89857bd578d 100644 (file)
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.529 2011/12/16 09:02:43 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.530 2011/12/17 19:08:17 zmedico Exp $
+
+  17 Dec 2011; Zac Medico <zmedico@gentoo.org> php-5.3.9_rc3.ebuild:
+  Bug #394995 - Remove invalid birdstep? conditionals from RDEPEND and
+  REQUIRED_USE, since the birdstep flag is no longer listed in IUSE.
 
 *php-5.3.9_rc3 (16 Dec 2011)
 

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index b0112c97bd3194ab2c07b89015af69536d227a75..7e73f936c5673d52d2de5238604ec33e85b05d18 100644 (file)
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -39,18 +39,14 @@ EBUILD php-5.2.17.ebuild 11388 RMD160 13e05493c05d46ff503788226ddfc57c94066cbe S
 EBUILD php-5.3.8.ebuild 11627 RMD160 ba0e75c495295b27c725db1bc1a3e3a7ff9c628f SHA1 5b79321fe0b37ef88b70bb971a8b74f2d4b0c85e SHA256 6ce6b8947720c94fe2b2883c38844bea3ad1dfc93026bda92ff275383c0bced3
 EBUILD php-5.3.9_rc1.ebuild 11649 RMD160 97f3550b242af2e4c53f54b06960467d5e813922 SHA1 654f0c7259e90cf0e041367af9b84aaa6b858acf SHA256 7c6bd39881d6b846aa2e5eb0b50a1d174d7aba1c4eb60a0660408f2f24160658
 EBUILD php-5.3.9_rc2.ebuild 11649 RMD160 56a12297d94a7482790e8e7ae0f3c4e3e1f8c421 SHA1 b0e12600d9ce4ce8714fd1199fc673f3133a10bc SHA256 05551ed04efcd6ea761fdfe4810e11dc581dae3c29ebba446ca55ca90cd92e62
-EBUILD php-5.3.9_rc3.ebuild 10968 RMD160 253acfa19d0478cb0c17dc3bee50703a71c241ed SHA1 6f5ec1865e63b867df133a9a55b45a4bc7f1ab77 SHA256 8069bdeee422bad76d4108e03faed577bebb527b6419fb40ec9abdb28ce7eb6d
+EBUILD php-5.3.9_rc3.ebuild 10906 RMD160 a758474ae64023d0273183c2d4a93ea8c48faa20 SHA1 b0ccf35ad52fd6bd87fa86375ec879eaed99de28 SHA256 efaa97d36b6a3788a7806ddc9ab71aa98844ceaa307067a200467b8defd8a1cd
 EBUILD php-5.4.0_rc3.ebuild 10614 RMD160 3d1cd8477b3abb27f6aff0760cf38e39d261c729 SHA1 8c4feba760bea2ce094c8abd4b32f896dd9592a0 SHA256 d8238f97f6d030c33bc8bd229fa50f4f1d2000b30671361daf90af391a9dead0
-MISC ChangeLog 90612 RMD160 b2e70ad80cb7668f6817ebbc7807c24af60ab3f7 SHA1 a5a1274993344549856adfd21e9872d140218d8c SHA256 5c33d556294ca8b9b1979a692688545eee638d2b38b8449aa6c9cae4529a22ae
+MISC ChangeLog 90820 RMD160 312cd1ea8b94f14d86523a8f761e2bb547fff03d SHA1 d9e2c5410d1b63240778a8960649eff9eca2e034 SHA256 e1ba7e7fbbb64a4926de6363d43e70d8fc04bf0a43d4660bc3b77b160db78d24
 MISC metadata.xml 2075 RMD160 e2eb44e39169dc2ff8e099d670a222e7102b1aea SHA1 9cebbc373dc8441aa0374132a3b5d87df6d37ffc SHA256 3d8bc9305be300ef7ef92d18ba5476927ec90a5b6d43c2408936229590ff5ac5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO6wlGAAoJEGurSuXEqSv15WwH/2kJMuNDI+XUIYUIdlTsgM+B
-3SdkQqs9akhgE8Bl8FyKOKvzvllYwxgx3+u1TkGRtiYlaSczggVGVJCQTErXlIOA
-AfNETTFmsER6y5AyePsJMYy/9uRrW4oQrGofLZgg8s2k8yCVtFdCP4x/Cr7wcZGB
-Eo283qXifsS62pbL/ayb3URQx3QQOX4OKGRcxa58AVrMNjpnKhYervyndtCmWK7l
-FDPGJWwel0FAlA+xMzLr8qTyZGEuxVcW7p/faC/xKKy03QhfqrqSlD7LeJLtW8IR
-M/mRt0jQKQkray+n7QqeF3/n/isZh3MEUxNBgGTOjWhipMeEUcVJ2ZhiF3bpIPs=
-=H6S8
+iEYEARECAAYFAk7s6KcACgkQ/ejvha5XGaOYdgCgktxIOvta1ot4mx7if6Kjsn70
+BcgAoMpvsd4k9Abf1nBg8PCh4IOenIGx
+=jwCl
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/php/php-5.3.9_rc3.ebuild b/dev-lang/php/php-5.3.9_rc3.ebuild
index 473fc64e022a895d36cc342216a671e8bb4f1229..7288f8162b55a82c36f117b46eadce0a7c738326 100644 (file)
--- a/dev-lang/php/php-5.3.9_rc3.ebuild
+++ b/dev-lang/php/php-5.3.9_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.9_rc3.ebuild,v 1.1 2011/12/16 09:02:43 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.9_rc3.ebuild,v 1.2 2011/12/17 19:08:17 zmedico Exp $
 
 EAPI=4
 
@@ -118,7 +118,6 @@ DEPEND="!dev-lang/php:5
        adabas? ( >=dev-db/unixODBC-1.8.13 )
        apache2? ( www-servers/apache[threads=] )
        berkdb? ( =sys-libs/db-4* )
-       birdstep? ( >=dev-db/unixODBC-1.8.13 )
        bzip2? ( app-arch/bzip2 )
        cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
        cjk? ( !gd? (
@@ -212,7 +211,6 @@ REQUIRED_USE="
        xmlreader? ( xml )
        xsl? ( xml )
        ldap-sasl? ( ldap )
-       birdstep? ( odbc )
        kolab? ( imap )
        mhash? ( hash )
        phar? ( hash )