Fix patch, it didn't apply...

(Portage version: 2.1.6.13/cvs/Linux x86_64)

2 files changed, 43 insertions, 38 deletions

diff --git a/net-im/skysentials/ChangeLog b/net-im/skysentials/ChangeLog
index d998d8037376..16b4072aa1fb 100644
--- a/net-im/skysentials/ChangeLog
+++ b/net-im/skysentials/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/skysentials
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skysentials/ChangeLog,v 1.2 2009/08/20 02:39:20 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skysentials/ChangeLog,v 1.3 2009/09/20 17:46:26 darkside Exp $
+
+  20 Sep 2009; Jeremy Olexa <darkside@gentoo.org>
+  files/skysentials-1.0.1-python26.patch:
+  Fix patch, it didn't apply...
 
 *skysentials-1.0.1-r1 (20 Aug 2009)
 
diff --git a/net-im/skysentials/files/skysentials-1.0.1-python26.patch b/net-im/skysentials/files/skysentials-1.0.1-python26.patch
index 09561170b68f..d3ae7707e815 100644
--- a/net-im/skysentials/files/skysentials-1.0.1-python26.patch
+++ b/net-im/skysentials/files/skysentials-1.0.1-python26.patch
@@ -1,7 +1,7 @@
-diff -u skysentials.old/About.py skysentials.new/About.py
---- skysentials.old/About.py	2009-08-04 22:54:34.000000000 +0400
-+++ skysentials.new/About.py	2009-08-04 23:09:26.000000000 +0400
-@@ -1,11 +1,12 @@
+diff -ru skysentials-1.0.1.orig/About.py skysentials-1.0.1/About.py
+--- skysentials-1.0.1.orig/About.py	2009-09-20 12:37:59.427600789 -0500
++++ skysentials-1.0.1/About.py	2009-09-20 12:39:03.346597692 -0500
+@@ -1,12 +1,11 @@
 +#Skype4Py
 +import Skype4Py
  import gtk
@@ -12,33 +12,33 @@ diff -u skysentials.old/About.py skysentials.new/About.py
  
 -#Skype4Py
 -import Skype4Py
-+
- 
+-
  # for debugging
  import pdb
-diff -u skysentials.old/ListSMS.py skysentials.new/ListSMS.py
---- skysentials.old/ListSMS.py	2009-08-04 22:54:34.000000000 +0400
-+++ skysentials.new/ListSMS.py	2009-08-04 23:09:26.000000000 +0400
+ 
+diff -ru skysentials-1.0.1.orig/ListSMS.py skysentials-1.0.1/ListSMS.py
+--- skysentials-1.0.1.orig/ListSMS.py	2009-09-20 12:37:59.427600789 -0500
++++ skysentials-1.0.1/ListSMS.py	2009-09-20 12:39:23.364596973 -0500
 @@ -1,3 +1,5 @@
 +#Skype4Py
 +import Skype4Py
  import gtk
  import gobject
  import sys
-@@ -7,8 +9,7 @@
+@@ -7,9 +9,6 @@
  import datetime
  import threading
  
 -#Skype4Py
 -import Skype4Py
-+
- 
+-
  # for debugging
  import pdb
-diff -u skysentials.old/RegisterPhone.py skysentials.new/RegisterPhone.py
---- skysentials.old/RegisterPhone.py	2009-08-04 22:54:34.000000000 +0400
-+++ skysentials.new/RegisterPhone.py	2009-08-04 23:09:26.000000000 +0400
-@@ -1,11 +1,12 @@
+ 
+diff -ru skysentials-1.0.1.orig/RegisterPhone.py skysentials-1.0.1/RegisterPhone.py
+--- skysentials-1.0.1.orig/RegisterPhone.py	2009-09-20 12:37:59.427600789 -0500
++++ skysentials-1.0.1/RegisterPhone.py	2009-09-20 12:39:40.949560798 -0500
+@@ -1,12 +1,11 @@
 +#Skype4Py
 +import Skype4Py
  import gtk
@@ -49,38 +49,39 @@ diff -u skysentials.old/RegisterPhone.py skysentials.new/RegisterPhone.py
  
 -#Skype4Py
 -import Skype4Py
-+
- 
+-
  # for debugging
  import pdb
-diff -u skysentials.old/SendSMS.py skysentials.new/SendSMS.py
---- skysentials.old/SendSMS.py	2009-08-04 22:54:34.000000000 +0400
-+++ skysentials.new/SendSMS.py	2009-08-04 23:09:26.000000000 +0400
+ 
+diff -ru skysentials-1.0.1.orig/SendSMS.py skysentials-1.0.1/SendSMS.py
+--- skysentials-1.0.1.orig/SendSMS.py	2009-09-20 12:37:59.427600789 -0500
++++ skysentials-1.0.1/SendSMS.py	2009-09-20 12:40:01.199558316 -0500
 @@ -1,3 +1,5 @@
 +#Skype4Py
 +import Skype4Py
  import gtk
  import gobject
  import sys
-@@ -5,8 +7,7 @@
+@@ -5,9 +7,6 @@
  import string
  import time
  
 -#Skype4Py
 -import Skype4Py
-+
- 
+-
  # for debugging
  import pdb
-diff -u skysentials.old/skysentials.py skysentials.new/skysentials.py
---- skysentials.old/skysentials.py	2009-08-05 00:01:57.000000000 +0400
-+++ skysentials.new/skysentials.py	2009-08-04 23:09:26.000000000 +0400
-@@ -1,16 +1,18 @@
+ 
+diff -ru skysentials-1.0.1.orig/skysentials.py skysentials-1.0.1/skysentials.py
+--- skysentials-1.0.1.orig/skysentials.py	2009-09-20 12:37:59.427600789 -0500
++++ skysentials-1.0.1/skysentials.py	2009-09-20 12:41:04.118913077 -0500
+@@ -1,17 +1,18 @@
 -#!/usr/bin/python2.5
 +#!/usr/bin/python
  #
  # Written by Philipp Kolmann <philipp@kolmann.at>
-+# Modified by Mariusz Cielecki <xodeus@gmail.com> for compability with python2.6 and py-gtk2
++# Modified by Mariusz Cielecki <xodeus@gmail.com> for compability with python2.6
++# and py-gtk2
  # $Id: skysentials.py 141 2007-11-22 17:42:53Z pkolmann $
  
 +#Skype4Py
@@ -93,26 +94,26 @@ diff -u skysentials.old/skysentials.py skysentials.new/skysentials.py
  
 -#Skype4Py
 -import Skype4Py
-+
- 
+-
  # Local Classes
  import ListSMS
-diff -u skysentials.old/TransferCall.py skysentials.new/TransferCall.py
---- skysentials.old/TransferCall.py	2009-08-04 22:54:34.000000000 +0400
-+++ skysentials.new/TransferCall.py	2009-08-04 23:09:26.000000000 +0400
+ import RegisterPhone
+diff -ru skysentials-1.0.1.orig/TransferCall.py skysentials-1.0.1/TransferCall.py
+--- skysentials-1.0.1.orig/TransferCall.py	2009-09-20 12:37:59.427600789 -0500
++++ skysentials-1.0.1/TransferCall.py	2009-09-20 12:41:20.094904212 -0500
 @@ -1,3 +1,5 @@
 +#Skype4Py
 +import Skype4Py
  import gtk
  import gobject
  import sys
-@@ -5,8 +7,7 @@
+@@ -5,9 +7,6 @@
  import string
  import time
  
 -#Skype4Py
 -import Skype4Py
-+
- 
+-
  REV="$Rev: 69 $"
  
+ class TransferCall: