Fixed broken patches

(Portage version: 2.0.51.22-r2)

4 files changed, 21 insertions, 63 deletions

diff --git a/www-apps/tikiwiki/ChangeLog b/www-apps/tikiwiki/ChangeLog
index 9a2a05af69b4..dee2a4f99e75 100644
--- a/www-apps/tikiwiki/ChangeLog
+++ b/www-apps/tikiwiki/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/tikiwiki
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.13 2005/08/21 16:40:31 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.14 2005/08/21 19:03:41 rl03 Exp $
+
+  21 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/xmlrpc2-1.8.5.patch,
+  files/xmlrpc2-1.9.0.patch:
+  Fixed broken patches
 
 *tikiwiki-1.9.0-r1 (21 Aug 2005)
 *tikiwiki-1.8.5-r2 (21 Aug 2005)
diff --git a/www-apps/tikiwiki/Manifest b/www-apps/tikiwiki/Manifest
index 9325fe7fec60..b409fd0f3ccb 100644
--- a/www-apps/tikiwiki/Manifest
+++ b/www-apps/tikiwiki/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 9428e2c5313b6733e9476a441c3eb576 tikiwiki-1.8.5-r1.ebuild 2339
 MD5 3df178d3364ec7a6fd53340327e0cd3b tikiwiki-1.9.0.ebuild 2590
 MD5 99b47adaab8cbfdb8c4134bcc79e0c8e tikiwiki-1.9.0-r1.ebuild 2585
@@ -13,12 +10,5 @@ MD5 6366ec5badc9e0d9d20befdf8052c73a files/digest-tikiwiki-1.8.5-r2 68
 MD5 b0e0921fd97e18c1e6746aacc75f87fa files/tikiwiki-1.8.5-xmlrpc.patch 1093
 MD5 28eb632d3d2985010cc05afcd084acd4 files/digest-tikiwiki-1.9.0-r1 68
 MD5 28eb632d3d2985010cc05afcd084acd4 files/digest-tikiwiki-1.9.0 68
-MD5 fc197be3ba9b71ed00cf261cc1ae7704 files/xmlrpc2-1.9.0.patch 3618
-MD5 6f0655e02b480fb7a32ac97e5ca2bd6b files/xmlrpc2-1.8.5.patch 3618
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDCK6VEzitwsaoONoRAnZ1AKDD9vh01HJdmDz5pLFbiAlgV92PtACg0QRR
-kj0ler8NMsoJaJGvQ5r+vL8=
-=ocXL
------END PGP SIGNATURE-----
+MD5 f9b53d80344d059dda253d001af38c8c files/xmlrpc2-1.9.0.patch 2587
+MD5 b0640c9b04a5e76a0a888afbe7860c41 files/xmlrpc2-1.8.5.patch 2587
diff --git a/www-apps/tikiwiki/files/xmlrpc2-1.8.5.patch b/www-apps/tikiwiki/files/xmlrpc2-1.8.5.patch
index abbe3979c506..33d753c76669 100644
--- a/www-apps/tikiwiki/files/xmlrpc2-1.8.5.patch
+++ b/www-apps/tikiwiki/files/xmlrpc2-1.8.5.patch
@@ -1,24 +1,6 @@
-===================================================================
-RCS file: /cvsroot/tikiwiki/tiki/commxmlrpc.php,v
-retrieving revision 1.10.2.4
-retrieving revision 1.10.2.5
-diff -u -r1.10.2.4 -r1.10.2.5
---- tikiwiki/tiki/commxmlrpc.php	2005/01/01 00:04:43	1.10.2.4
-+++ tikiwiki/tiki/commxmlrpc.php	2005/08/18 21:39:19	1.10.2.5
-@@ -1,19 +1,18 @@
- <?php
- 
--// $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/files/xmlrpc2-1.8.5.patch,v 1.1 2005/08/21 16:40:31 rl03 Exp $
-+// $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/files/xmlrpc2-1.8.5.patch,v 1.1 2005/08/21 16:40:31 rl03 Exp $
- 
- // Copyright (c) 2002-2005, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
- // All Rights Reserved. See copyright.txt for details and a complete list of authors.
- // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
- 
--# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/files/xmlrpc2-1.8.5.patch,v 1.1 2005/08/21 16:40:31 rl03 Exp $
-+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/files/xmlrpc2-1.8.5.patch,v 1.1 2005/08/21 16:40:31 rl03 Exp $
- include_once("lib/init/initlib.php");
- include_once ('db/tiki-db.php');
+--- commxmlrpc.php.old	2005-08-21 14:56:36.000000000 -0400
++++ commxmlrpc.php	2005-08-21 14:57:10.000000000 -0400
+@@ -10,8 +10,7 @@
  
  include_once ('lib/tikilib.php');
  include_once ('lib/userslib.php');
@@ -28,7 +10,7 @@ diff -u -r1.10.2.4 -r1.10.2.5
  include_once ('lib/commcenter/commlib.php');
  
  $tikilib = new Tikilib($dbTiki);
-@@ -28,7 +27,7 @@
+@@ -26,7 +25,7 @@
  	"sendArticle" => array("function" => "sendArticle")
  );
  
@@ -37,7 +19,7 @@ diff -u -r1.10.2.4 -r1.10.2.5
  
  /* Validates the user and returns user information */
  function sendPage($params) {
-@@ -51,18 +50,18 @@
+@@ -49,18 +48,18 @@
  	$description = $pp->scalarval();
  	// 
  	if (!$userlib->validate_user($username, $password, '', '')) {
@@ -59,7 +41,7 @@ diff -u -r1.10.2.4 -r1.10.2.5
  }
  
  function sendArticle($params) {
-@@ -116,12 +115,12 @@
+@@ -114,12 +113,12 @@
  
  	// 
  	if (!$userlib->validate_user($username, $password, '', '')) {
@@ -74,7 +56,7 @@ diff -u -r1.10.2.4 -r1.10.2.5
  	}
  
  	// Store the page in the tiki_received_pages_table
-@@ -134,7 +133,7 @@
+@@ -132,7 +131,7 @@
  	$commlib->receive_article($site, $username, $title, $authorName, $size, $use_image, $image_name, $image_type, $image_size,
  		$image_x, $image_y, $image_data, $publishDate, $expireDate, $created, $heading, $body, $hash, $author, $type, $rating);
  
diff --git a/www-apps/tikiwiki/files/xmlrpc2-1.9.0.patch b/www-apps/tikiwiki/files/xmlrpc2-1.9.0.patch
index 009cfe8fd457..9b0e2302e152 100644
--- a/www-apps/tikiwiki/files/xmlrpc2-1.9.0.patch
+++ b/www-apps/tikiwiki/files/xmlrpc2-1.9.0.patch
@@ -1,24 +1,6 @@
-===================================================================
-RCS file: /cvsroot/tikiwiki/tiki/commxmlrpc.php,v
-retrieving revision 1.14.2.1
-retrieving revision 1.14.2.2
-diff -u -r1.14.2.1 -r1.14.2.2
---- tikiwiki/tiki/commxmlrpc.php	2005/01/01 00:11:21	1.14.2.1
-+++ tikiwiki/tiki/commxmlrpc.php	2005/08/18 09:13:33	1.14.2.2
-@@ -1,19 +1,18 @@
- <?php
- 
--// $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/files/xmlrpc2-1.9.0.patch,v 1.1 2005/08/21 16:40:31 rl03 Exp $
-+// $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/files/xmlrpc2-1.9.0.patch,v 1.1 2005/08/21 16:40:31 rl03 Exp $
- 
- // Copyright (c) 2002-2005, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
- // All Rights Reserved. See copyright.txt for details and a complete list of authors.
- // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
- 
--# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/files/xmlrpc2-1.9.0.patch,v 1.1 2005/08/21 16:40:31 rl03 Exp $
-+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/files/xmlrpc2-1.9.0.patch,v 1.1 2005/08/21 16:40:31 rl03 Exp $
- include_once("lib/init/initlib.php");
- include_once ('db/tiki-db.php');
+--- commxmlrpc.php.old	2005-08-21 15:01:21.000000000 -0400
++++ commxmlrpc.php	2005-08-21 15:01:57.000000000 -0400
+@@ -10,8 +10,7 @@
  
  include_once ('lib/tikilib.php');
  include_once ('lib/userslib.php');
@@ -28,7 +10,7 @@ diff -u -r1.14.2.1 -r1.14.2.2
  include_once ('lib/commcenter/commlib.php');
  
  $tikilib = new Tikilib($dbTiki);
-@@ -28,7 +27,7 @@
+@@ -26,7 +25,7 @@
  	"sendArticle" => array("function" => "sendArticle")
  );
  
@@ -37,7 +19,7 @@ diff -u -r1.14.2.1 -r1.14.2.2
  
  /* Validates the user and returns user information */
  function sendPage($params) {
-@@ -51,18 +50,18 @@
+@@ -49,18 +48,18 @@
  	$description = $pp->scalarval();
  	// 
  	if (!$userlib->validate_user($username, $password, '', '')) {
@@ -59,7 +41,7 @@ diff -u -r1.14.2.1 -r1.14.2.2
  }
  
  function sendArticle($params) {
-@@ -116,12 +115,12 @@
+@@ -114,12 +113,12 @@
  
  	// 
  	if (!$userlib->validate_user($username, $password, '', '')) {
@@ -74,7 +56,7 @@ diff -u -r1.14.2.1 -r1.14.2.2
  	}
  
  	// Store the page in the tiki_received_pages_table
-@@ -134,7 +133,7 @@
+@@ -132,7 +131,7 @@
  	$commlib->receive_article($site, $username, $title, $authorName, $size, $use_image, $image_name, $image_type, $image_size,
  		$image_x, $image_y, $image_data, $publishDate, $expireDate, $created, $heading, $body, $hash, $author, $type, $rating);