Drop already applied patch.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

4 files changed, 21 insertions, 40 deletions

diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index 1f2fd4c31bb1..fc96a65bf3a1 100644
--- a/sci-misc/boinc/ChangeLog
+++ b/sci-misc/boinc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-misc/boinc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.105 2011/11/04 14:01:11 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.106 2011/11/04 19:22:44 scarabeus Exp $
+
+  04 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/6.12.26-libnotify-0.7.patch, boinc-6.12.42.ebuild:
+  Drop already applied patch.
 
 *boinc-6.12.42 (04 Nov 2011)
 
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index 1f173d04f202..c837e731c0c6 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -2,28 +2,27 @@
 Hash: SHA1
 
 AUX 6.12.26-fix_subdirs.patch 1042 RMD160 567805fcc0d88a53fb051e7e00d0ef179522b689 SHA1 c11069357e2af66f89eea602233ac8dcf529de71 SHA256 a424a53df0f3154bd4ae305493ef512646e882944349c5e1e98d305f614c685d
-AUX 6.12.26-libnotify-0.7.patch 745 RMD160 1e084a3e85cbff42568786119feec11f5f99b926 SHA1 fcba9cbd9df6a69a4e634e0c093b7203e34d6804 SHA256 948337c2489030cfdda1f30b8cffbe4e38b9e8865e70cfcf1747338008b9a56c
 AUX boinc.conf 376 RMD160 af3ad95f091f00982c5e761e67f885d00a080634 SHA1 dc4054c55858c1b6c8679e88449507c3f59b19a5 SHA256 286f5f11e54a73b41ebf1e35aae1db4c2c3e249a3bfce755ced84c8c1b361cc9
 AUX boinc.init 2624 RMD160 70b356f65dc8e42fc4edf9c5b0c2604ab7421b64 SHA1 bcdd050f5288ad3fbe67e0558dfb048667f14d92 SHA256 b69aaaee4817ab285f2efff23e4137ed817b514a053ae85757fabcfc82dc420d
 AUX generate_tarball.sh 3414 RMD160 ac7a0611303e1ed9a84817f94403059bcad097ed SHA1 0b4912213e3cb0bd25f51d57f0f60b7a9bf542e8 SHA256 c0cd0631ffa19ed5937fdda32527e76f7495a2e5b740adb0fbe3c936fab03bb9
 DIST boinc-6.12.42.tar.xz 10750668 RMD160 91cc999aba01f4a2cea0f70b31941ece64e17c4d SHA1 72d271fdf4f87e8c8615298954ffbb5b4bd8fca1 SHA256 83908a34c300aedf43f76349d55be4aa4e690e7e14eadcdf2680fd4b0e4e0207
-EBUILD boinc-6.12.42.ebuild 3699 RMD160 02ad835a8c615f1d51d06c110acdd656daa6c5f3 SHA1 96fc09661937a50c7f3314222a7b647525fc7f6e SHA256 259ff752239a21aff800ae4b2f3a7056ce99f63e23dbf487c2a8e02c6c0f22af
-MISC ChangeLog 19307 RMD160 0c42e1916a72bf5f0e53b15452c25b2302412be4 SHA1 1fa1a03af11fdb14ebf1e2e153b3467b4a8a85ab SHA256 486bf209eb58b5c4bc4b4c131f549488721df76e914ef52c3f75149c587d861d
+EBUILD boinc-6.12.42.ebuild 3656 RMD160 77081dd43bdac7bce92fae31c1b05ade283d0d80 SHA1 3645f4963dd8390d1f2bffe105186fded39b4aa2 SHA256 ede56e9ca52cd7cff725dd7587a73429f13e702e0c3c302b2e0aa75bce51e0e6
+MISC ChangeLog 19453 RMD160 0f78e570af05b7d393a2716c4b44c30ff350988c SHA1 3eeee00e019a0b8fc776303aa1a487146efa9284 SHA256 9369c638c14cc4eeae9f74d604fec48f23320456042db6944d179ea82b4b7313
 MISC metadata.xml 574 RMD160 97ce5bcbca5607c119a2d0484fc228a870594ac7 SHA1 ddf921ef095def89299edfcd0350082de356366a SHA256 76e1da0a34c62e7a78db5b796b64af9da51bf31c159498c147c8d0546be79571
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOs/BIAAoJEOSiRoyO7jvo9Z8P/Ao8wrJax27IJM8UsxmxnMFb
-vkNP8N98DSNpMunRGS0/vJ87k0N2lVGwiDr9jYrLB/r6iwcA2p3s4zhzj75dPlbO
-3bgEoPPZvEKSTV/6n28FVVUY5k4xh81MscwuVHSw3fAG2/GNP6PUab2adXFKOvD6
-IyLtdYnz22SdG0WeSO7DjcKKt17P9wiEMajNj16ybRH7P0oN4VkyoQo1yxi9bkU7
-K2wHi31AK4MddNh7dnH+1MA9C3J7L3u9QfsktsJlOeriQ+zjb9zdvxR9yZ9tcmS4
-gRgk0L70Ml/a3bk6tl0ZFKmhMdSywP6Iha1EuQLkL5jnS1mPze4ZyM8+ybLzLXsr
-W4JVPmBDoRkyEC0EVrbk7Sjl+9hFgwZH/E4zv5CEizEE2020jc0lke0ERhrhbTBM
-9mkhBkygf+KTy6UKhdhpmtvD2DtbCKAraJpeSIQQxam4sU1flyVhPIXMI96EvHZH
-953u6DE6pB/N35JjumDm8W+5hejehOkBJ0g1C8plz7oGVM1nb/FFQh7/cDnNgjWp
-rw/lDQdFbWwgjT8WIv0MTsrZDpplTqgXSMCuR/qg4rxousEuuVtHFKrwOBGjCvnm
-CJCGd7RjxDSfYEuS6qaptUx4FCaY21U+5a5QP0DmrPN53N2PGdls7aGTM940qjlv
-0T8wWbSNF5BNDz1vWKr/
-=HNUk
+iQIcBAEBAgAGBQJOtDt4AAoJEOSiRoyO7jvoOzkP/2sKf7/zByxfh7EagzrpH6L7
+cb6KKChCL7Dsoq7D14V1Akh3n/N6ngc0AixsFnitOZYAOLBXgVZ+mZ4ebpvvr7/q
+HtwX2u4rdCn4wE2UsRqJgdU7uGcO+RN0orxCiwVQhUw90QhzLLBymY7hPYgaTabv
+Qp7LCd/a+isRZXZoO7rv6EASkWFfN0Y2NuvkGoyj3NDs8aaCPMfCxSXlyA9gnqmi
+oWq+WyaAZXx4q7aVA/q2Oo+9gvOSKVI2HIWbG8i9DtO8xD0t+9g8eE89Dis2gOBH
+iTUYL3C5+WHbofF0WBNnWhiqD5lxWP7fkaGgFFsCBPkoEPSQHjVEIgSHwTLNJNbG
+D75K93TZepVJtyaYoybW6CfqYa0TqLUP4GzjImIPQFOzZTqBW6NecaHlQ8actALn
+fQ3X+7FzuxxHBXPNFyQM8r8Z8c16+Vem4eAqk6RLZmjHzwM4gVsEWe8S0ncc+8Qt
+nbzkY6URHsd8XuQTcAS7GdXsvSJX8c4uFs4sXL6sOWw6v4w+1XtX1tHTaHK7c+V2
+GDWnAF3/6saA+UKlIJZKtCR9fdrl9MUNHiOtQZwv7TijJsamk4Ay92zL3kWg2QfW
+Uv/Bp6bg+5/fRaRMhftUQ2q06wy3x+YUHAXoVo6bIPmBOEG/R33d7ZcfxVFhKxvw
+MN2B+S5dxXcwJT7pnfck
+=FhY0
 -----END PGP SIGNATURE-----
diff --git a/sci-misc/boinc/boinc-6.12.42.ebuild b/sci-misc/boinc/boinc-6.12.42.ebuild
index ac4eb124aa42..5c1ea2907520 100644
--- a/sci-misc/boinc/boinc-6.12.42.ebuild
+++ b/sci-misc/boinc/boinc-6.12.42.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.12.42.ebuild,v 1.1 2011/11/04 14:01:11 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.12.42.ebuild,v 1.2 2011/11/04 19:22:44 scarabeus Exp $
 
 EAPI=4
 
@@ -45,7 +45,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/6.12.26-fix_subdirs.patch"
-	"${FILESDIR}/6.12.26-libnotify-0.7.patch"
 )
 
 AUTOTOOLS_IN_SOURCE_BUILD=1
diff --git a/sci-misc/boinc/files/6.12.26-libnotify-0.7.patch b/sci-misc/boinc/files/6.12.26-libnotify-0.7.patch
deleted file mode 100644
index da6e729fc6fc..000000000000
--- a/sci-misc/boinc/files/6.12.26-libnotify-0.7.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN boinc-6.12.26.old/clientgui/gtk/taskbarex.cpp boinc-6.12.26/clientgui/gtk/taskbarex.cpp
---- boinc-6.12.26.old/clientgui/gtk/taskbarex.cpp	2011-05-22 09:40:36.314052737 +0200
-+++ boinc-6.12.26/clientgui/gtk/taskbarex.cpp	2011-05-22 11:20:06.838410909 +0200
-@@ -226,12 +226,11 @@
- 

-     if (!g_pNotification)

-     {

--        g_pNotification = 

--            notify_notification_new_with_status_icon(

--                title.mb_str(),

--                message.mb_str(),

--                desired_icon,

--                g_pStatusIcon

-+        g_pNotification =

-+			notify_notification_new(

-+				title.mb_str(),

-+				message.mb_str(),

-+				gtk_status_icon_get_icon_name(g_pStatusIcon)

-         );

- 

-         g_signal_connect(