Re-add file without cvs keyword expansion, took patch from bug 280372 again. Solves bug 292693

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

3 files changed, 127 insertions, 3 deletions

diff --git a/net-im/skysentials/ChangeLog b/net-im/skysentials/ChangeLog
index 16b4072aa1fb..07787fe766da 100644
--- a/net-im/skysentials/ChangeLog
+++ b/net-im/skysentials/ChangeLog
@@ -1,6 +1,11 @@
 # 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.3 2009/09/20 17:46:26 darkside Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/skysentials/ChangeLog,v 1.4 2010/01/06 15:13:33 darkside Exp $
+
+  06 Jan 2010; Jeremy Olexa <darkside@gentoo.org>
+  +files/skysentials-1.0.1-python26.patch:
+  Re-add file without cvs keyword expansion, took patch from bug 280372
+  again. Solves bug 292693
 
   20 Sep 2009; Jeremy Olexa <darkside@gentoo.org>
   files/skysentials-1.0.1-python26.patch:
diff --git a/net-im/skysentials/Manifest b/net-im/skysentials/Manifest
index fbd31ce20dc6..ea7a4555283e 100644
--- a/net-im/skysentials/Manifest
+++ b/net-im/skysentials/Manifest
@@ -1,4 +1,5 @@
+AUX skysentials-1.0.1-python26.patch 2578 RMD160 4c65645ca06e79b20856285ce3dedc8ffc081ce7 SHA1 0e4df16abb181fb8dda73fce74edb64cadc086ab SHA256 058254a7ff1eb3436d4fef9e40e91b1a93c08e7d2f671c77bdf07777c6f79f9b
 DIST skysentials-1.0.1.tar.gz 7379 RMD160 86dedf20b03c6ef4f75021476b2358a6d1bf30cf SHA1 f1a59c2828b904a492dc2507187b4ef0bdeb0f79 SHA256 70cf543a7d8bbf3d3bff1dc2a787a6c9c91a2baf6f6f5b43646d643c670629f5
 EBUILD skysentials-1.0.1-r1.ebuild 1297 RMD160 ed8e4c5339fe51629fa745e84e79b56e019f1f16 SHA1 c3d127dbbeda0ce27624c5a48fb9b24327912933 SHA256 be8d9a5f5d15687d6968b2e0e2329bb8568f6b70cb7fba03d8ead21dd899441b
-MISC ChangeLog 750 RMD160 910e4975d21bcdd918611ac9fcc5e9d94c905aef SHA1 58b9ea2fb97ec96569f8fc667fd34881097c52b9 SHA256 bf1f6fb60570931350167e9348e86b2b56f99fba6ab8e3dad45fb71ab0722ed0
+MISC ChangeLog 943 RMD160 188e7970556d6acb240aa2991d1be58e68bc2881 SHA1 3a2c0f98d04aaad3a0a90a9bb2ab23953a7caff8 SHA256 26888ab621d05843ec03b213977aa325d25ff507e8d9ae5729639fa016f83073
 MISC metadata.xml 224 RMD160 ef4cc3054936a3572ec992bcceee2519eddcba46 SHA1 3b0afde57f521aa4f834fed82806e79be3530c3e SHA256 fc3ff3b3ec6fac6a93feff4a2692f42f8abd9e7b5741d81a272a820d40092b73
diff --git a/net-im/skysentials/files/skysentials-1.0.1-python26.patch b/net-im/skysentials/files/skysentials-1.0.1-python26.patch
new file mode 100644
index 000000000000..09561170b68f
--- /dev/null
+++ b/net-im/skysentials/files/skysentials-1.0.1-python26.patch
@@ -0,0 +1,118 @@
+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 @@
++#Skype4Py
++import Skype4Py
+ import gtk
+ import gobject
+ import sys
+ import re
+ import string
+ 
+-#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
+@@ -1,3 +1,5 @@
++#Skype4Py
++import Skype4Py
+ import gtk
+ import gobject
+ import sys
+@@ -7,8 +9,7 @@
+ 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 @@
++#Skype4Py
++import Skype4Py
+ import gtk
+ import gobject
+ import sys
+ import re
+ import string
+ 
+-#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
+@@ -1,3 +1,5 @@
++#Skype4Py
++import Skype4Py
+ import gtk
+ import gobject
+ import sys
+@@ -5,8 +7,7 @@
+ 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 @@
+-#!/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
+ # $Id: skysentials.py 141 2007-11-22 17:42:53Z pkolmann $
+ 
++#Skype4Py
++import Skype4Py
+ import gtk
+ import gobject
+ import sys
+ import re
+ import string
+ 
+-#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
+@@ -1,3 +1,5 @@
++#Skype4Py
++import Skype4Py
+ import gtk
+ import gobject
+ import sys
+@@ -5,8 +7,7 @@
+ import string
+ import time
+ 
+-#Skype4Py
+-import Skype4Py
++
+ 
+ REV="$Rev: 69 $"
+