bug #324739

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 11 insertions, 14 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 14e605b6bde2..9c084ea9a61f 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.396 2010/07/28 20:20:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.397 2010/07/29 16:27:41 mabi Exp $
+
+  29 Jul 2010; Matti Bickel <mabi@gentoo.org>
+  files/eblits/src_install-v1.eblit:
+  add addpredict to work-around bug #324739
 
   28 Jul 2010; Markus Meier <maekke@gentoo.org> php-5.3.3.ebuild:
   add ~arm, bug #321743
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 9a9cdb919d42..da6cff3ece23 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 20php5-envd 145 RMD160 8c81fb7dc1d1ddf16fd956d748514db3bcb27603 SHA1 f1cef57c0def8e2c5422aaf136f40b4ff47801d2 SHA256 efaae9e6ae5f7010e073c2ab6d8a9dda009f0707c7d7b0c027e142c94f7041a4
 AUX 70_mod_php5.conf-apache2 348 RMD160 9f3f49a52ebf92c2650501c5ceb6f95ce4bb2e76 SHA1 62992e793446b4a9a64900d1ecba7bae06873382 SHA256 5bb8a45570582b4389a7d3feea0398e1c13ed4ced96e559b9406ed8c965dea8c
 AUX 70_mod_php5.conf-apache2-r1 374 RMD160 ca06cdc9d1a3dc4129a60c938ee3a1b542497fbb SHA1 4733066b6324c5870e716485484c44c7c26a9ff1 SHA256 815c1ca23c9afe8479568ceaac4057eb91ea5444fbd863866b29adb4eea2c82b
@@ -11,7 +8,7 @@ AUX eblits/pkg_postinst-v1.eblit 2184 RMD160 ce65ba811eab10862d067c7e2b4bdc8d2b0
 AUX eblits/pkg_setup-v1.eblit 777 RMD160 aa63e7ab1bae34feffbbfaae902f11c6e797ba9d SHA1 f7334a4750b1a1bb2f24021dff884733a88ac347 SHA256 2613f51ee9e3a258dbab38ff2df724f2971a50a5ad8c097cb5a4e3744df5fc8a
 AUX eblits/src_compile-v1.eblit 1897 RMD160 45aa94bdf920a567ab9002309f6afbed8ba13abb SHA1 83c7fce59355d4bc7684bcfad975a147426f7911 SHA256 0fe6bfd4734f0dfe0bf420b09a5e19698490a8441c1ee20d7446bcceee480336
 AUX eblits/src_configure-v1.eblit 10019 RMD160 32f9cf226742689ed0ddf8c2fe87fa3233f83071 SHA1 2e027b84a318452068dcee0a1d1934d1b4b14e03 SHA256 540e9e770a8039aa4b40f9f915cb839e7f2ed8c05a06b9cf87f41253f0ccb5bc
-AUX eblits/src_install-v1.eblit 4415 RMD160 dc02d3abc3aa3dae2208675c4f00b3d616d1262b SHA1 f41b3430e0054866dbfbdbac5ce11127d4963112 SHA256 0dba349226de4559cd62c73572cb5c1d8213d7ce9f7d5338887d71158f2da64e
+AUX eblits/src_install-v1.eblit 4516 RMD160 62ca67c86975f3f4ffaeca5c3280cd9d4dccba70 SHA1 04f023e5ec1b50f38ac3523ab6ec0e5c8fe10c1f SHA256 b701e68b62eba1944f1df9926c19320f0dc27f2f2c29cf8c2b11420f20aabac7
 AUX eblits/src_prepare-v1.eblit 2616 RMD160 ccff64d09cc90ada1ea5d1311457cf9a05f12f8e SHA1 7db40d0ca7ef01e5b61962f261511803f768f1bc SHA256 915b9755a37f7670f6e436fe5072dae8f5e6b437ccdfbff835e26bb2f9d22b1e
 AUX eblits/src_test-v1.eblit 1480 RMD160 68ef731042ef236efee923649b318239c0219d52 SHA1 81c047f180e43eb1e6b0309ee8d6751950ce1b97 SHA256 ddc836ca2e7b2abac20450fc6eb8c7d30277c567d23051016b903ece1d07a6b2
 AUX php-5.2.10-pdo_dblib.patch 559 RMD160 062604e291113b2bb86044b5eeffb72fad210fbc SHA1 d59d26e6557dac86e582e1a6ed7bb4795cf150c6 SHA256 0548d63d7379cd19f7ade6ca1222b1b577f684b142ff6b0e8e23742b1f7f9794
@@ -31,12 +28,5 @@ DIST suhosin-patch-5.3.3-0.9.10.patch.gz 41298 RMD160 8dcd8b51ea0357b6cc51e70e49
 EBUILD php-5.2.13.ebuild 16859 RMD160 e899ea551626ec77614931e052189a51b52cac5f SHA1 9092d7dd5eb208954096f67df1a36eef8be37ffa SHA256 95e359d899c9e42e358789029e535a4b54d8ab428a3c83503e0964831ed1775d
 EBUILD php-5.3.2.ebuild 9228 RMD160 a809dae438ea243e519b4b46d00ebe1cd3eb09ee SHA1 ea00f7476447459337e3c967948293d67ff32818 SHA256 868a4e6dc6a158bcdba7dc4178e2f317273775675caf061e0796ea8ec9f406f0
 EBUILD php-5.3.3.ebuild 9469 RMD160 f6f2f6cf86951625104bfbcfce887c4fd6e584bb SHA1 70022d291f6fed3494da63410958388191ecc04c SHA256 137857c64582b0f2e621328913035aed5d503d92fe5dc06b6836b0cae35e0c29
-MISC ChangeLog 836 RMD160 0886f5c5c6e806e4e4c8bae19d45b25a1fc670d4 SHA1 93394aecb7c5087ca2a37e9d7c1c13fbaa5eaca9 SHA256 c8b00fb5fc66ea1f5872fc4cc12950318632de37d0adb8c60a12cb026f6242f1
+MISC ChangeLog 962 RMD160 bd02035e289ee75408d1a8b69b4c00c2f85884be SHA1 ea74f359c61d37ee6c039645a65348e39a7aa37a SHA256 a9ad7d88e1caa1b478956156a21f7594ddbec69d0c682e8d9452cebf94984e72
 MISC metadata.xml 2251 RMD160 4167b367fe5472e090fec27c09a465e558b8caf9 SHA1 059e3863cc1e500cf438f12ca98fe7f4ebd24722 SHA256 f402e3753e18c32922a694ab1bbde615754f26bbebc401b90b18f57bf5e49342
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkxQkWEACgkQkKaRLQcq0GIy2ACeKrdKWZRtN1tHcXyElCriWqHm
-c2oAnj/d0v+9vTJHjnOpm8tUJEwxcLvV
-=+sU1
------END PGP SIGNATURE-----
diff --git a/dev-lang/php/files/eblits/src_install-v1.eblit b/dev-lang/php/files/eblits/src_install-v1.eblit
index c30d5444764a..73cec15afdc7 100644
--- a/dev-lang/php/files/eblits/src_install-v1.eblit
+++ b/dev-lang/php/files/eblits/src_install-v1.eblit
@@ -1,8 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v1.eblit,v 1.4 2010/07/26 13:42:12 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v1.eblit,v 1.5 2010/07/29 16:27:41 mabi Exp $
 
 eblit-php-src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
 	# Makefile forgets to create this before trying to write to it...
 	dodir "${PHP_DESTDIR}/bin"