Make patch actually apply

Package-Manager: portage-2.1.3.6

5 files changed, 35 insertions, 57 deletions

diff --git a/gnome-base/orbit/ChangeLog b/gnome-base/orbit/ChangeLog
index c9bd82fd150a..783cd4c936bd 100644
--- a/gnome-base/orbit/ChangeLog
+++ b/gnome-base/orbit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/orbit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.101 2007/08/14 20:38:33 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.102 2007/08/21 23:32:00 dang Exp $
+
+*orbit-2.14.8-r2 (21 Aug 2007)
+
+  21 Aug 2007; Daniel Gryniewicz <dang@gentoo.org>
+  files/orbit-2.14.8-fix_races.patch, -orbit-2.14.8-r1.ebuild,
+  +orbit-2.14.8-r2.ebuild:
+  Make patch actually apply
 
 *orbit-2.14.8-r1 (14 Aug 2007)
 
diff --git a/gnome-base/orbit/Manifest b/gnome-base/orbit/Manifest
index b467aaa94852..3403aa35400a 100644
--- a/gnome-base/orbit/Manifest
+++ b/gnome-base/orbit/Manifest
@@ -1,7 +1,10 @@
-AUX orbit-2.14.8-fix_races.patch 5760 RMD160 45b624088ab4c777724c5ca12aace88e4c8f9962 SHA1 6cb10d2ebd950654d0eef3e7f353a2be4f48993a SHA256 2be1bb04df396a3806305b699746679d6785c2e8d5ed013e2bb6be33db1e8e2d
-MD5 542062dceabd3829d864beca6791e6b6 files/orbit-2.14.8-fix_races.patch 5760
-RMD160 45b624088ab4c777724c5ca12aace88e4c8f9962 files/orbit-2.14.8-fix_races.patch 5760
-SHA256 2be1bb04df396a3806305b699746679d6785c2e8d5ed013e2bb6be33db1e8e2d files/orbit-2.14.8-fix_races.patch 5760
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX orbit-2.14.8-fix_races.patch 4266 RMD160 ff4fb138383fed88b66f5fac00a1f78ef69ed166 SHA1 abb8d66cd9b305445bcdbfe2d96d323c77de1cc7 SHA256 565ab3e4e7c23d8d7fc0d2239ec0fe89e2b5d3f114afbe822b8edbbb548e4dc2
+MD5 ffc0b9f944a454b965df798b40a43d9d files/orbit-2.14.8-fix_races.patch 4266
+RMD160 ff4fb138383fed88b66f5fac00a1f78ef69ed166 files/orbit-2.14.8-fix_races.patch 4266
+SHA256 565ab3e4e7c23d8d7fc0d2239ec0fe89e2b5d3f114afbe822b8edbbb548e4dc2 files/orbit-2.14.8-fix_races.patch 4266
 DIST ORBit2-2.14.2.tar.bz2 706622 RMD160 c308cd5e42a17134f3cc0f5888f8f4f07b06a4c3 SHA1 4e5b83b3852488a49d93eca44a3e4e9f8d5c4c50 SHA256 5db7e046569f66a26c0bb0aa4c40f12ac57da293f469eb373044853996d4e2d0
 DIST ORBit2-2.14.7.tar.bz2 729469 RMD160 4ac003754c037ec8bb151bb344db31c0888a852c SHA1 d5b2e63d02d4dcf0ab7b0ee48021b365c273102e SHA256 751b76344462748b1ac79b739ce2e0251fe985c6c8d65a0b9f3246e4ab1dd6fa
 DIST ORBit2-2.14.8.tar.bz2 742448 RMD160 512259accfcc939873046d04ae2d482f145e71ec SHA1 9f9c99a356045debcdb2286a65d25790de184415 SHA256 608bd76fe2adc811612ea3e28579d042c715d5a6dba73f1eca7ff52495b40455
@@ -13,14 +16,14 @@ EBUILD orbit-2.14.7.ebuild 1168 RMD160 56273f9e675998e6f92e6954661db20e76ae196e
 MD5 40c2f09f108466f0989605335a3f5470 orbit-2.14.7.ebuild 1168
 RMD160 56273f9e675998e6f92e6954661db20e76ae196e orbit-2.14.7.ebuild 1168
 SHA256 fe519d027e4acf6aa6c44ef648ea56d26071a5379e8510a3c12616530208b241 orbit-2.14.7.ebuild 1168
-EBUILD orbit-2.14.8-r1.ebuild 1222 RMD160 5b7a3aca2e9d3fb7eef05d7bb474f138b276cb5c SHA1 564f5e18df35bfa779f113afc2ad073fb3f7fc9d SHA256 c87f9948548d1970438f8ab0de409ca6b3b0e0e4a531ae0850e2578ccd83fffd
-MD5 e67d0d8154d4afd51da3d4ce8f180986 orbit-2.14.8-r1.ebuild 1222
-RMD160 5b7a3aca2e9d3fb7eef05d7bb474f138b276cb5c orbit-2.14.8-r1.ebuild 1222
-SHA256 c87f9948548d1970438f8ab0de409ca6b3b0e0e4a531ae0850e2578ccd83fffd orbit-2.14.8-r1.ebuild 1222
-MISC ChangeLog 12023 RMD160 faa3b5fe7f9c666e95b9ee328f3f39e2e69a78aa SHA1 447a73f42de6587d4350f93a06db6bb32fa6f455 SHA256 40df8a7f7b3a9cb8f718fa9efaedf76fe1a3a6f113753422d050592bf3ec7f93
-MD5 592a464593ca7666d9fcdffd258474f4 ChangeLog 12023
-RMD160 faa3b5fe7f9c666e95b9ee328f3f39e2e69a78aa ChangeLog 12023
-SHA256 40df8a7f7b3a9cb8f718fa9efaedf76fe1a3a6f113753422d050592bf3ec7f93 ChangeLog 12023
+EBUILD orbit-2.14.8-r2.ebuild 1230 RMD160 1340de1d1c736f69ff2e0747ba808c8b93e24b2f SHA1 0cc63f1622746b356ed16ccbdbf210d1e22cc1b8 SHA256 1a90d5f0da7006bdb222bb05792a53f1ef9d29d7676433bf852abd845dc3a2ba
+MD5 e533317320dcee116c899f992d9d49cd orbit-2.14.8-r2.ebuild 1230
+RMD160 1340de1d1c736f69ff2e0747ba808c8b93e24b2f orbit-2.14.8-r2.ebuild 1230
+SHA256 1a90d5f0da7006bdb222bb05792a53f1ef9d29d7676433bf852abd845dc3a2ba orbit-2.14.8-r2.ebuild 1230
+MISC ChangeLog 12226 RMD160 a751f7734309e8494477926078755a4bacf17614 SHA1 98deb5a38787a25f91144319959bef3bd98ff84a SHA256 e9bd2c4f597da2ca0f09ff3bbf4b2cc891b87d91aa1e49b067ec70163294b921
+MD5 9c6df8a843e82cea0a97d0a6978bd866 ChangeLog 12226
+RMD160 a751f7734309e8494477926078755a4bacf17614 ChangeLog 12226
+SHA256 e9bd2c4f597da2ca0f09ff3bbf4b2cc891b87d91aa1e49b067ec70163294b921 ChangeLog 12226
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -31,6 +34,13 @@ SHA256 c1633362d0c85835c7efaad86ea81484139c6007f21a0abf9790b5d328173caf files/di
 MD5 9713760132c0cd8a4b06b7419bddf084 files/digest-orbit-2.14.7 244
 RMD160 33f13161ce1a8a79da5e983598a885e70f65a5a8 files/digest-orbit-2.14.7 244
 SHA256 4a5ad05c7fe1b938c9ff44b005d04db1655803e46c79b67f49527dda27c6a438 files/digest-orbit-2.14.7 244
-MD5 ba7923ba96ef915407f7cc7fc3b087be files/digest-orbit-2.14.8-r1 244
-RMD160 15b2c821bbb8b10d67cd4eeb33978fe436330149 files/digest-orbit-2.14.8-r1 244
-SHA256 1d8516aa2515f2a54057451e3bdba73ac8d37f56011acdca69854e28f8a7453d files/digest-orbit-2.14.8-r1 244
+MD5 ba7923ba96ef915407f7cc7fc3b087be files/digest-orbit-2.14.8-r2 244
+RMD160 15b2c821bbb8b10d67cd4eeb33978fe436330149 files/digest-orbit-2.14.8-r2 244
+SHA256 1d8516aa2515f2a54057451e3bdba73ac8d37f56011acdca69854e28f8a7453d files/digest-orbit-2.14.8-r2 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.6 (GNU/Linux)
+
+iD8DBQFGy3YmomPajV0RnrERArvWAJ4iGdxCkYkHeZP1Ydo4iPAgbD+u2gCeJ+A6
+noSsFuSVRBN1nyG8lCYk9Z4=
+=G5Cl
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/orbit/files/digest-orbit-2.14.8-r1 b/gnome-base/orbit/files/digest-orbit-2.14.8-r2
index 0abebba8948c..0abebba8948c 100644
--- a/gnome-base/orbit/files/digest-orbit-2.14.8-r1
+++ b/gnome-base/orbit/files/digest-orbit-2.14.8-r2
diff --git a/gnome-base/orbit/files/orbit-2.14.8-fix_races.patch b/gnome-base/orbit/files/orbit-2.14.8-fix_races.patch
index d135b63b50c1..51ada5c2f7a2 100644
--- a/gnome-base/orbit/files/orbit-2.14.8-fix_races.patch
+++ b/gnome-base/orbit/files/orbit-2.14.8-fix_races.patch
@@ -136,42 +136,3 @@ Index: linc2/src/linc-connection.c
  
  #ifdef CONNECTION_DEBUG
  	cnx->priv->total_read_bytes = 0;
-Index: linc2/ChangeLog
-===================================================================
---- linc2/ChangeLog	(revision 2016)
-+++ linc2/ChangeLog	(working copy)
-@@ -1,3 +1,11 @@
-+2007-08-14  Jules Colding  <colding@omesc.com>
-+
-+	* src/linc-connection.c (link_connection_init): Initialize new
-+	data member in connection struct
-+
-+	* include/linc/linc-connection.h (struct): Add void member 
-+	to hold a GIOPThread*
-+
- 2007-08-07  Tor Lillqvist  <tml@novell.com>
- 
- 	* src/linc-connection.c (link_connection_from_fd_T): Ifdef
-Index: ChangeLog
-===================================================================
---- ChangeLog	(revision 2016)
-+++ ChangeLog	(working copy)
-@@ -1,3 +1,18 @@
-+2007-08-14  Jules Colding  <colding@omesc.com>
-+
-+	* src/orb/GIOP/giop-send-buffer.c (giop_send_buffer_write): Do
-+	not enter giop_timeout_add() if a timeout is already present. This 
-+	check is not thread safe, but the additional check in giop_timeout_add()
-+	is.
-+
-+	* src/orb/GIOP/giop-recv-buffer.c (giop_timeout_add): Fix
-+	race when creating the timeout mutex.
-+	Do not depend on the dynamically created "struct timeout_thread_data". 
-+	The right thing to do is to pass the connection directly and add an 
-+	additional member to the LincConnection	to hold the GIOPThread.
-+	(giop_timeout): Correct to use new input data (LincConnection*).
-+	(giop_recv_buffer_get): Fix memory leak.
-+
- 2007-08-07  Tor Lillqvist  <tml@novell.com>
- 
- 	* test/timeout_impl.c (impl_Timeout_ping): Use g_usleep() instead
diff --git a/gnome-base/orbit/orbit-2.14.8-r1.ebuild b/gnome-base/orbit/orbit-2.14.8-r2.ebuild
index 51daa747e04f..31785e027ebc 100644
--- a/gnome-base/orbit/orbit-2.14.8-r1.ebuild
+++ b/gnome-base/orbit/orbit-2.14.8-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.8-r1.ebuild,v 1.1 2007/08/14 20:38:33 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.8-r2.ebuild,v 1.1 2007/08/21 23:32:00 dang Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 MY_P="ORBit2-${PV}"
 PVP=(${PV//[-\._]/ })