Rebase patch on root directory. Bug #146663

Package-Manager: portage-2.1.1_rc1-r6

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index dc421f9a6de9cdb74528af281f081391df3f72fc..f6ef4872a60774ed787c723aefc08d367dcd0d48 100644 (file)
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.193 2006/09/07 04:12:13 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.194 2006/09/07 18:12:05 dang Exp $
+
+  07 Sep 2006; Daniel Gryniewicz <dang@gentoo.org>
+  +files/nautilus-2.16.0-idl_include.patch, nautilus-2.16.0.ebuild:
+  Rebase patch on root directory.  Bug #146663
 
 *nautilus-2.16.0 (07 Sep 2006)
 

diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 2270e04d945e3605b8ed490d861eb5117ac1d95e..1f78118f47d602f26ef07a9c79f14b3dde980179 100644 (file)
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -41,6 +41,10 @@ AUX nautilus-2.14-idl_include.patch 384 RMD160 0b040794d5b90baf662ff9d5fbdd8ab31
 MD5 51f1e68a3c1b45c4b2188200398960f0 files/nautilus-2.14-idl_include.patch 384
 RMD160 0b040794d5b90baf662ff9d5fbdd8ab3168af5e4 files/nautilus-2.14-idl_include.patch 384
 SHA256 f82e430fd9366e8d2306b586df90efc721f0cf17ea51987b747849c85f6b0116 files/nautilus-2.14-idl_include.patch 384
+AUX nautilus-2.16.0-idl_include.patch 575 RMD160 8ee41c84f597683e2d34eea5acdb43f5592d3262 SHA1 738a2e9bb13aab07ed256e37af3ddc10fa2dfe0e SHA256 07cd75e4cf1c34c5fcd3f4d2257ae1d9c578cb2c2f014e69280e511de28862f0
+MD5 c496549444ef2727f6c0555b590ef4fe files/nautilus-2.16.0-idl_include.patch 575
+RMD160 8ee41c84f597683e2d34eea5acdb43f5592d3262 files/nautilus-2.16.0-idl_include.patch 575
+SHA256 07cd75e4cf1c34c5fcd3f4d2257ae1d9c578cb2c2f014e69280e511de28862f0 files/nautilus-2.16.0-idl_include.patch 575
 AUX nautilus-2.9.90-icon_view_gst.patch 8136 RMD160 adc024c514ce2dd2af2962caa8941fce250ab2b1 SHA1 ca768f9ba16908d487abbdbc941082a58a528ed9 SHA256 b6e7eef6e3ff11a9e3490e371ec06a9cd24b9251b7cad7262204071ff67a8a31
 MD5 76cc1af40c4dc75ce99179ae9b25a2cd files/nautilus-2.9.90-icon_view_gst.patch 8136
 RMD160 adc024c514ce2dd2af2962caa8941fce250ab2b1 files/nautilus-2.9.90-icon_view_gst.patch 8136
@@ -66,14 +70,14 @@ EBUILD nautilus-2.14.1.ebuild 2049 RMD160 e13e74a96d02803518963c595d949456a1cb35
 MD5 a8e0a5550ad603c273fa6797137d83bc nautilus-2.14.1.ebuild 2049
 RMD160 e13e74a96d02803518963c595d949456a1cb3593 nautilus-2.14.1.ebuild 2049
 SHA256 c7d26ad71e320419905bcccca81067f9d913d434fe203f69e378eb7c2c21b5c3 nautilus-2.14.1.ebuild 2049
-EBUILD nautilus-2.16.0.ebuild 2032 RMD160 f8048ac1ade186a88d6c0c20cad8aa9161290c4e SHA1 a01e522504f0e18f51b869c8ff0240981d34ac1f SHA256 4a09d1c90e968c631ffd3cab0517248902a351732020ffc021fc9acc0c87c564
-MD5 65d68bef3e7322b834a6bab468ad4a0b nautilus-2.16.0.ebuild 2032
-RMD160 f8048ac1ade186a88d6c0c20cad8aa9161290c4e nautilus-2.16.0.ebuild 2032
-SHA256 4a09d1c90e968c631ffd3cab0517248902a351732020ffc021fc9acc0c87c564 nautilus-2.16.0.ebuild 2032
-MISC ChangeLog 25860 RMD160 41a972be79a3ca787f8873e7be37dbda49c591a7 SHA1 b61242e4fe02d9face8a052926507e5e1ef0c8a3 SHA256 de83c6d1e3c1ebd4d30861967632f6dd888f3b1e4c6cabacb91c289aa0b295dc
-MD5 f17ff5580ac50df2a84c71406f0913c3 ChangeLog 25860
-RMD160 41a972be79a3ca787f8873e7be37dbda49c591a7 ChangeLog 25860
-SHA256 de83c6d1e3c1ebd4d30861967632f6dd888f3b1e4c6cabacb91c289aa0b295dc ChangeLog 25860
+EBUILD nautilus-2.16.0.ebuild 2034 RMD160 a44eb28a887a2520db3167e6b3ae5474fa772205 SHA1 b61bf64fc3a99153098ab010440bd256f79aeb42 SHA256 b273156b71673d0703e989d5de7ca59616530a0ce18522a6ec77eeb669ecc169
+MD5 d96531c4513351334e4ad85de4c354e9 nautilus-2.16.0.ebuild 2034
+RMD160 a44eb28a887a2520db3167e6b3ae5474fa772205 nautilus-2.16.0.ebuild 2034
+SHA256 b273156b71673d0703e989d5de7ca59616530a0ce18522a6ec77eeb669ecc169 nautilus-2.16.0.ebuild 2034
+MISC ChangeLog 26027 RMD160 d0e5529941bb2b7715628aca87dad5ccf57b7f95 SHA1 491d325e29e57efaf2501cb9750c2044f4e8624d SHA256 48ebc936ac5b9f69fda8d5cf8631bf7fc501bbc70f720a2197b83bfa20f3e938
+MD5 decc641a4899e5c536335ec8bbf56e76 ChangeLog 26027
+RMD160 d0e5529941bb2b7715628aca87dad5ccf57b7f95 ChangeLog 26027
+SHA256 48ebc936ac5b9f69fda8d5cf8631bf7fc501bbc70f720a2197b83bfa20f3e938 ChangeLog 26027
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -96,7 +100,7 @@ SHA256 3b25c0143386e96ff4db364d9586df731bf8c5b6ad5ee430cef16addb4b41a9c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFE/5wkomPajV0RnrERAsgjAJ9eZeFTccbVUi6ab9Y/Lmo4Vf/R9gCeP2Q8
-4fFvFpneTsT+5xzgdXplbsQ=
-=UQWN
+iD8DBQFFAGD8omPajV0RnrERAo32AJ4tOFr2fvyetyFZJZBb1ZI+I9F9pgCdEQaZ
+FfuH0jjvm7m8qB5Cd1WnQTI=
+=k6To
 -----END PGP SIGNATURE-----

diff --git a/gnome-base/nautilus/files/nautilus-2.16.0-idl_include.patch b/gnome-base/nautilus/files/nautilus-2.16.0-idl_include.patch
new file mode 100644 (file)
index 0000000..27d7507
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.16.0-idl_include.patch
@@ -0,0 +1,12 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN nautilus-2.16.0.orig/src/nautilus-shell-interface.idl nautilus-2.16.0/src/nautilus-shell-interface.idl
+--- nautilus-2.16.0.orig/src/nautilus-shell-interface.idl      2006-07-21 13:18:59.000000000 -0400
++++ nautilus-2.16.0/src/nautilus-shell-interface.idl   2006-09-07 14:08:49.000000000 -0400
+@@ -5,7 +5,7 @@
+ 
+ #include <Bonobo.idl>
+ /* For URI define */
+-#include <../libnautilus-private/nautilus-metafile-server.idl>
++#include <libnautilus-private/nautilus-metafile-server.idl>
+ 
+ module Nautilus {
+       typedef sequence<URI> URIList;

diff --git a/gnome-base/nautilus/nautilus-2.16.0.ebuild b/gnome-base/nautilus/nautilus-2.16.0.ebuild
index 537b930489d0188f32d1132f7670fcffa4321ced..084bbf0b5e7072d16b057971801a6c75592c92a3 100644 (file)
--- a/gnome-base/nautilus/nautilus-2.16.0.ebuild
+++ b/gnome-base/nautilus/nautilus-2.16.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.16.0.ebuild,v 1.1 2006/09/07 04:12:13 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.16.0.ebuild,v 1.2 2006/09/07 18:12:05 dang Exp $
 
 inherit virtualx gnome2 eutils
 
@@ -72,5 +72,5 @@ src_unpack() {
        gnome2_src_unpack
 
        # fix relative include path breaking libIDL (#129366)
-       epatch ${FILESDIR}/${PN}-2.14-idl_include.patch
+       epatch ${FILESDIR}/${PN}-2.16.0-idl_include.patch
 }