Fix bug #125451.

(Portage version: 2.1_pre5-r3)

10 files changed, 146 insertions, 30 deletions

diff --git a/dev-php/PEAR-Mail_Mime/ChangeLog b/dev-php/PEAR-Mail_Mime/ChangeLog
index 0a18740a8709..381f50c66e13 100644
--- a/dev-php/PEAR-Mail_Mime/ChangeLog
+++ b/dev-php/PEAR-Mail_Mime/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/PEAR-Mail_Mime
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Mail_Mime/ChangeLog,v 1.42 2006/02/17 21:57:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Mail_Mime/ChangeLog,v 1.43 2006/03/09 20:45:49 chtekk Exp $
+
+*PEAR-Mail_Mime-1.3.1-r2 (09 Mar 2006)
+
+  09 Mar 2006; Luca Longinotti <chtekk@gentoo.org>
+  +files/php-pass-by-reference-fix.patch, +PEAR-Mail_Mime-1.3.1-r2.ebuild:
+  Fix bug #125451.
 
   17 Feb 2006; Aron Griffis <agriffis@gentoo.org>
   PEAR-Mail_Mime-1.3.1-r1.ebuild:
diff --git a/dev-php/PEAR-Mail_Mime/Manifest b/dev-php/PEAR-Mail_Mime/Manifest
index f92667820c63..42d022a996a5 100644
--- a/dev-php/PEAR-Mail_Mime/Manifest
+++ b/dev-php/PEAR-Mail_Mime/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 33d32baa642fe96366182859a63ee8a4 ChangeLog 4727
-RMD160 7eb859f78aa1a0e1f6c6316715e86b5f3931e482 ChangeLog 4727
-SHA256 834a20aaa8e021fe571c3660a8f635ad1a444b7f5b90910ae14805983a420a8c ChangeLog 4727
+MD5 ff7e969f7ba344c0daac49ad227ba5c6 ChangeLog 4913
+RMD160 d24e644ce6d5221b5f95e517627d39c81e5e934b ChangeLog 4913
+SHA256 9048aa377a300cc66ff8f1dc1e5e9ad0dfcac14acd2e5e2028194df537c7732a ChangeLog 4913
 MD5 b08b3fd7df09663874d0b246f528b8c3 PEAR-Mail_Mime-1.2.1-r1.ebuild 432
 RMD160 193d819f13681ee2283f41717d4699cc820c9c80 PEAR-Mail_Mime-1.2.1-r1.ebuild 432
 SHA256 522ace7d37329fa5c7de949b8eed25e1270ebc5ae376cb44159312031d06e6b0 PEAR-Mail_Mime-1.2.1-r1.ebuild 432
@@ -13,28 +10,30 @@ SHA256 53587a846c06e5d2d101343ee88ebebb9b1410a54f7bf1978a92979a9e78960e PEAR-Mai
 MD5 d9b5305210a4167ed3895d538824e749 PEAR-Mail_Mime-1.3.1-r1.ebuild 437
 RMD160 791d2871ba01c80be5fe24b297d4b5dcea8d476d PEAR-Mail_Mime-1.3.1-r1.ebuild 437
 SHA256 e700ca2bd051b92fdf3c7963fa80f2834378a10b46c6430c46f755a244fe56a3 PEAR-Mail_Mime-1.3.1-r1.ebuild 437
+MD5 a0c8dba5aa34a96c1c25217df4037ac6 PEAR-Mail_Mime-1.3.1-r2.ebuild 487
+RMD160 9747263e592fa7bb98fb3f66be5c7cf142941521 PEAR-Mail_Mime-1.3.1-r2.ebuild 487
+SHA256 74a93914f1f2257a147eaedf240d9eacb731b0f40f7a7590e06229b4a144a953 PEAR-Mail_Mime-1.3.1-r2.ebuild 487
 MD5 53e0fb4d54b08a2a308a637cf65d3bfc PEAR-Mail_Mime-1.3.1.ebuild 440
 RMD160 72b79bfbe2b0190fc01242238f9631e1cc74fd2c PEAR-Mail_Mime-1.3.1.ebuild 440
 SHA256 4fcbd030e5109745d1d036c384d8560ff4cf25d96d3f4f67d960fcaa410d127a PEAR-Mail_Mime-1.3.1.ebuild 440
-MD5 97d65d78c9962444a24de3e6c15003fd files/digest-PEAR-Mail_Mime-1.2.1-r1 63
-RMD160 509dbf9aa26b47f6d9dc2999ee48c37270763a48 files/digest-PEAR-Mail_Mime-1.2.1-r1 63
-SHA256 de0b7bc62c36a5f4fff2fe161a528c58c5735994280a5956b9b0481379033489 files/digest-PEAR-Mail_Mime-1.2.1-r1 63
-MD5 6cf5a2edce8f6ae84bf62d0b3cd5bf27 files/digest-PEAR-Mail_Mime-1.3.0 63
-RMD160 0ee367e8d1df74a0c90fdb86f0e03eac85e68914 files/digest-PEAR-Mail_Mime-1.3.0 63
-SHA256 86ae1e0475c41659f50606644729c570ef5c5af826cabbe6d60eb39929ff5647 files/digest-PEAR-Mail_Mime-1.3.0 63
-MD5 5900e07a7f4a605ab9194ffa58022c02 files/digest-PEAR-Mail_Mime-1.3.1 63
-RMD160 469bc52a8865ae7f126c84b3cd4602fa137f2c93 files/digest-PEAR-Mail_Mime-1.3.1 63
-SHA256 a8ae0c4194ab14b30ac93ddec3b4d7c005a25af76508905ceab32964d9b414d6 files/digest-PEAR-Mail_Mime-1.3.1 63
-MD5 5900e07a7f4a605ab9194ffa58022c02 files/digest-PEAR-Mail_Mime-1.3.1-r1 63
-RMD160 469bc52a8865ae7f126c84b3cd4602fa137f2c93 files/digest-PEAR-Mail_Mime-1.3.1-r1 63
-SHA256 a8ae0c4194ab14b30ac93ddec3b4d7c005a25af76508905ceab32964d9b414d6 files/digest-PEAR-Mail_Mime-1.3.1-r1 63
-MD5 34b376f52ca199fffb4e52b83169574a metadata.xml 156
-RMD160 a3a59cdc3ac33d711123b2d7e2b1deb2984aa101 metadata.xml 156
-SHA256 f6d70434415ff7294f2a64e7870f32318c5fab9153fe63a58841b12d897da6ba metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD9kbUJrHF4yAQTrARAuKzAKCoTJ/SFsR6SEWJav7nDkp4vWD09QCgh1Dy
-FyXb/klo5wPtvYe8/t0/EPk=
-=1rCz
------END PGP SIGNATURE-----
+MD5 68ce3e0adfcf1474da3481708f3a6203 files/digest-PEAR-Mail_Mime-1.2.1-r1 235
+RMD160 f460ca04a196680621bfd9cdcf32e61627d66717 files/digest-PEAR-Mail_Mime-1.2.1-r1 235
+SHA256 deec7f2a558e0aa422386d684eecf7461dfcc6d8798dca4ae1430257f9ddb5b4 files/digest-PEAR-Mail_Mime-1.2.1-r1 235
+MD5 69e8a92c43d7d72655dc34f26f4c3719 files/digest-PEAR-Mail_Mime-1.3.0 235
+RMD160 93f0177678ae91ff7d1891820a9a4b10e6941c36 files/digest-PEAR-Mail_Mime-1.3.0 235
+SHA256 eb4524b9dfdf0ed4f0e4a3b33edfb1e43257fe05112401131898d0c2ebb67704 files/digest-PEAR-Mail_Mime-1.3.0 235
+MD5 922b511b5afa492754effcbdb53ce88d files/digest-PEAR-Mail_Mime-1.3.1 235
+RMD160 6f388665f4a1c387f8dfb7660cc2dfbe03ce63af files/digest-PEAR-Mail_Mime-1.3.1 235
+SHA256 a69780ddf8f6e9659bea5c35f97bdf14591dfb723c89689c1fec8a19e2d8ed0e files/digest-PEAR-Mail_Mime-1.3.1 235
+MD5 922b511b5afa492754effcbdb53ce88d files/digest-PEAR-Mail_Mime-1.3.1-r1 235
+RMD160 6f388665f4a1c387f8dfb7660cc2dfbe03ce63af files/digest-PEAR-Mail_Mime-1.3.1-r1 235
+SHA256 a69780ddf8f6e9659bea5c35f97bdf14591dfb723c89689c1fec8a19e2d8ed0e files/digest-PEAR-Mail_Mime-1.3.1-r1 235
+MD5 922b511b5afa492754effcbdb53ce88d files/digest-PEAR-Mail_Mime-1.3.1-r2 235
+RMD160 6f388665f4a1c387f8dfb7660cc2dfbe03ce63af files/digest-PEAR-Mail_Mime-1.3.1-r2 235
+SHA256 a69780ddf8f6e9659bea5c35f97bdf14591dfb723c89689c1fec8a19e2d8ed0e files/digest-PEAR-Mail_Mime-1.3.1-r2 235
+MD5 cecd93c09e8e9937c74d3c75c5344103 files/php-pass-by-reference-fix.patch 2640
+RMD160 3c5eefed0e9de352b60f17b583ea3db1c8302c20 files/php-pass-by-reference-fix.patch 2640
+SHA256 bb9c77b3c8adf1279a86f87186912b801384fc5892375c6bc79a62257ed1d761 files/php-pass-by-reference-fix.patch 2640
+MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
+RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
+SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 metadata.xml 157
diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.3.1-r2.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.3.1-r2.ebuild
new file mode 100644
index 000000000000..b25ab8015142
--- /dev/null
+++ b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.3.1-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.3.1-r2.ebuild,v 1.1 2006/03/09 20:45:49 chtekk Exp $
+
+inherit php-pear-r1 eutils
+
+DESCRIPTION="Provides classes to deal with creation and manipulation of mime messages"
+
+LICENSE="PHP"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+
+	# Fix DOS encodings
+	edos2unix *
+
+	# Fix bug #125451
+	epatch "${FILESDIR}/php-pass-by-reference-fix.patch"
+}
diff --git a/dev-php/PEAR-Mail_Mime/files/digest-PEAR-Mail_Mime-1.2.1-r1 b/dev-php/PEAR-Mail_Mime/files/digest-PEAR-Mail_Mime-1.2.1-r1
index a37401760d07..20771a0cff01 100644
--- a/dev-php/PEAR-Mail_Mime/files/digest-PEAR-Mail_Mime-1.2.1-r1
+++ b/dev-php/PEAR-Mail_Mime/files/digest-PEAR-Mail_Mime-1.2.1-r1
@@ -1 +1,3 @@
 MD5 667f631d9b128ef559bf97b9cd182c48 Mail_Mime-1.2.1.tgz 15268
+RMD160 ed11865e261a64e7e76097c448de58b21ce9dcca Mail_Mime-1.2.1.tgz 15268
+SHA256 25f66736379b8851dbe6f9bf8e9bba5230f93bda86f5ec53d4bd56911aa777b3 Mail_Mime-1.2.1.tgz 15268
diff --git a/dev-php/PEAR-Mail_Mime/files/digest-PEAR-Mail_Mime-1.3.0 b/dev-php/PEAR-Mail_Mime/files/digest-PEAR-Mail_Mime-1.3.0
index 11996365c1f3..8ea4c36ab574 100644
--- a/dev-php/PEAR-Mail_Mime/files/digest-PEAR-Mail_Mime-1.3.0
+++ b/dev-php/PEAR-Mail_Mime/files/digest-PEAR-Mail_Mime-1.3.0
@@ -1 +1,3 @@
 MD5 c437e93e5bdd59ff393673ca273a2868 Mail_Mime-1.3.0.tgz 16417
+RMD160 794507f1dc3e0d16beab6e0fc512d8ebb963992b Mail_Mime-1.3.0.tgz 16417
+SHA256 885ad545c55dd313053f639a46a7a3b51a217144d8dd9bc99ddca61f5a57db6c Mail_Mime-1.3.0.tgz 16417
diff --git a/dev-php/PEAR-Mail_Mime/files/digest-PEAR-Mail_Mime-1.3.1 b/dev-php/PEAR-Mail_Mime/files/digest-PEAR-Mail_Mime-1.3.1
index d63f56238bbb..36a829103a8f 100644
--- a/dev-php/PEAR-Mail_Mime/files/digest-PEAR-Mail_Mime-1.3.1
+++ b/dev-php/PEAR-Mail_Mime/files/digest-PEAR-Mail_Mime-1.3.1
@@ -1 +1,3 @@
 MD5 0012fd2406597e60083bc4bce751cef2 Mail_Mime-1.3.1.tgz 16481
+RMD160 d918979f1167aca81cbdf48f8ae3792be6e5c379 Mail_Mime-1.3.1.tgz 16481
+SHA256 cc576d0a4c813df00cca2d39b848beba5748cf5801ed7c2a6358c1e9c230be04 Mail_Mime-1.3.1.tgz 16481
diff --git a/dev-php/PEAR-Mail_Mime/files/digest-PEAR-Mail_Mime-1.3.1-r1 b/dev-php/PEAR-Mail_Mime/files/digest-PEAR-Mail_Mime-1.3.1-r1
index d63f56238bbb..36a829103a8f 100644
--- a/dev-php/PEAR-Mail_Mime/files/digest-PEAR-Mail_Mime-1.3.1-r1
+++ b/dev-php/PEAR-Mail_Mime/files/digest-PEAR-Mail_Mime-1.3.1-r1
@@ -1 +1,3 @@
 MD5 0012fd2406597e60083bc4bce751cef2 Mail_Mime-1.3.1.tgz 16481
+RMD160 d918979f1167aca81cbdf48f8ae3792be6e5c379 Mail_Mime-1.3.1.tgz 16481
+SHA256 cc576d0a4c813df00cca2d39b848beba5748cf5801ed7c2a6358c1e9c230be04 Mail_Mime-1.3.1.tgz 16481
diff --git a/dev-php/PEAR-Mail_Mime/files/digest-PEAR-Mail_Mime-1.3.1-r2 b/dev-php/PEAR-Mail_Mime/files/digest-PEAR-Mail_Mime-1.3.1-r2
new file mode 100644
index 000000000000..36a829103a8f
--- /dev/null
+++ b/dev-php/PEAR-Mail_Mime/files/digest-PEAR-Mail_Mime-1.3.1-r2
@@ -0,0 +1,3 @@
+MD5 0012fd2406597e60083bc4bce751cef2 Mail_Mime-1.3.1.tgz 16481
+RMD160 d918979f1167aca81cbdf48f8ae3792be6e5c379 Mail_Mime-1.3.1.tgz 16481
+SHA256 cc576d0a4c813df00cca2d39b848beba5748cf5801ed7c2a6358c1e9c230be04 Mail_Mime-1.3.1.tgz 16481
diff --git a/dev-php/PEAR-Mail_Mime/files/php-pass-by-reference-fix.patch b/dev-php/PEAR-Mail_Mime/files/php-pass-by-reference-fix.patch
new file mode 100644
index 000000000000..677e67117a3c
--- /dev/null
+++ b/dev-php/PEAR-Mail_Mime/files/php-pass-by-reference-fix.patch
@@ -0,0 +1,76 @@
+--- mime.php	2005-07-13 22:49:04.000000000 +0200
++++ mime.php	2006-03-07 12:22:41.000000000 +0100
+@@ -309,7 +309,7 @@
+      * @return object  The text mimePart object
+      * @access private
+      */
+-    function &_addTextPart(&$obj, $text)
++    function _addTextPart(&$obj, $text)
+     {
+         $params['content_type'] = 'text/plain';
+         $params['encoding']     = $this->_build_params['text_encoding'];
+@@ -330,7 +330,7 @@
+      * @return object  The html mimePart object
+      * @access private
+      */
+-    function &_addHtmlPart(&$obj)
++    function _addHtmlPart(&$obj)
+     {
+         $params['content_type'] = 'text/html';
+         $params['encoding']     = $this->_build_params['html_encoding'];
+@@ -350,7 +350,7 @@
+      * @return object  The multipart/mixed mimePart object
+      * @access private
+      */
+-    function &_addMixedPart()
++    function _addMixedPart()
+     {
+         $params['content_type'] = 'multipart/mixed';
+         return new Mail_mimePart('', $params);
+@@ -366,7 +366,7 @@
+      * @return object  The multipart/mixed mimePart object
+      * @access private
+      */
+-    function &_addAlternativePart(&$obj)
++    function _addAlternativePart(&$obj)
+     {
+         $params['content_type'] = 'multipart/alternative';
+         if (is_object($obj)) {
+@@ -386,7 +386,7 @@
+      * @return object  The multipart/mixed mimePart object
+      * @access private
+      */
+-    function &_addRelatedPart(&$obj)
++    function _addRelatedPart(&$obj)
+     {
+         $params['content_type'] = 'multipart/related';
+         if (is_object($obj)) {
+@@ -405,7 +405,7 @@
+      * @return object  The image mimePart object
+      * @access private
+      */
+-    function &_addHtmlImagePart(&$obj, $value)
++    function _addHtmlImagePart(&$obj, $value)
+     {
+         $params['content_type'] = $value['c_type'];
+         $params['encoding']     = 'base64';
+@@ -424,7 +424,7 @@
+      * @return object  The image mimePart object
+      * @access private
+      */
+-    function &_addAttachmentPart(&$obj, $value)
++    function _addAttachmentPart(&$obj, $value)
+     {
+         $params['content_type'] = $value['c_type'];
+         $params['encoding']     = $value['encoding'];
+--- mimePart.php	2004-12-11 00:08:26.000000000 +0100
++++ mimePart.php	2006-03-07 12:22:41.000000000 +0100
+@@ -261,7 +261,7 @@
+      *         otherwise you will not be able to add further subparts.
+      * @access public
+      */
+-    function &addSubPart($body, $params)
++    function addSubPart($body, $params)
+     {
+         $this->_subparts[] = new Mail_mimePart($body, $params);
+         return $this->_subparts[count($this->_subparts) - 1];
diff --git a/dev-php/PEAR-Mail_Mime/metadata.xml b/dev-php/PEAR-Mail_Mime/metadata.xml
index 40dbb4c4bbaf..fd3dbe39fa64 100644
--- a/dev-php/PEAR-Mail_Mime/metadata.xml
+++ b/dev-php/PEAR-Mail_Mime/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+	<herd>php</herd>
 </pkgmetadata>