Clean up patch.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 12 insertions, 50 deletions

diff --git a/gnome-extra/avant-window-navigator/ChangeLog b/gnome-extra/avant-window-navigator/ChangeLog
index c3070d7a1685..13366299836c 100644
--- a/gnome-extra/avant-window-navigator/ChangeLog
+++ b/gnome-extra/avant-window-navigator/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/avant-window-navigator
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator/ChangeLog,v 1.40 2014/02/27 17:59:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator/ChangeLog,v 1.41 2014/05/21 14:01:32 jer Exp $
+
+  21 May 2014; Jeroen Roovers <jer@gentoo.org>
+  files/avant-window-navigator-0.4.0-underlinking.patch:
+  Clean up patch.
 
   27 Feb 2014; Samuli Suominen <ssuominen@gentoo.org>
   avant-window-navigator-0.4.0.ebuild:
diff --git a/gnome-extra/avant-window-navigator/Manifest b/gnome-extra/avant-window-navigator/Manifest
index 920cb204e8a3..cebe54d4a46c 100644
--- a/gnome-extra/avant-window-navigator/Manifest
+++ b/gnome-extra/avant-window-navigator/Manifest
@@ -1,19 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX avant-window-navigator-0.4.0-underlinking.patch 2772 SHA256 a29771db6992e0ac72506072a8589c2c934b30ebe97aed03a1c9e73b48383b9c SHA512 02b760abb92a2410035820c8a2ae3bac3f7e21207ece36487cd102211da7c5dac2723d0de0ccb8dc88ed8fe1681c31c7d93e430866349345ef068298a8ef08a2 WHIRLPOOL 3973fd72fa17143abc14e46dfbb01c54eb7a8d660f4df3f935506257af8514843c8cf9dcbb30580c50ebe78d311ab169cf3d48b49f5bd2fb5081315e1a0079e4
+AUX avant-window-navigator-0.4.0-underlinking.patch 225 SHA256 c44bce982819ee8e560e9785ef0f090c1423c94d4428206f70b466519001c296 SHA512 5620597bed26f89986f230415ac453f21c23287bbc643db446f6d0f4ee0440cbbac22b2223f6cc65c91ebcae60cc91d4bff88424078a3ccbdbfb94e05601719f WHIRLPOOL 7de714f77024d5b0927a175722a17154b52c9d63f6763291788ef37e99645b0ba0563b9bd63caeab999dcf4c41e2d2814024188a3fd2f5c0e4e3002ade47fa6f
 DIST avant-window-navigator-0.4.0.tar.gz 1556708 SHA256 f3432982c27fa1bb9c0074c9a95c4a7d7c564b15ec40b7572db6e8d885b59e30 SHA512 09fe318e6e93513ef58b6d33fd8daa1fa39de880ec2b43d66ecb91e2d2302937f688832e9ad82aca78fe4afe41e69d1b19e8915b0ac1d0e91a53e8055af14e2d WHIRLPOOL 0d0177a66a9014c923f0171c3792817bb15b3b507bb97a70866ebdbc26642c7b0494dd6dc87850a9346fab1d72ebd39ed0bc4b7026fa1c7df14f95356ebbfe6e
 EBUILD avant-window-navigator-0.4.0.ebuild 1832 SHA256 37b2cc2c8e3b8bf5624808d4fcec49c9f340e2300340e6a0f3d0c78a85061f14 SHA512 5c4c00c36e179d4c61151a20a5a4891ad79e9eb372d05e18c0480d077c78bc61ad04779926b33afa0d34a90ecb07cb4e35c1da608d65275bcd7db418a29dfeea WHIRLPOOL e6eec7da10065cf0630d5bba3488612ec1f781b5ab061530710e1ad826ed55115edf7f8599fbe2d503fe8fbbb105169fe6e2e5533c935cf17c89e4beaabdc96c
-MISC ChangeLog 7400 SHA256 72c028272c6e5b8e26de7682bf6c3cb8721c56b22d81dc05ae066370fa1e7b04 SHA512 1cf6fc48c8f60a6f6341aa0908e91cc5da0672d77b8acd1321569226d63af96760708c0f16c02b79ca70ce3b9871eda651b3e0a0260dd0f1f6f6480a295452fd WHIRLPOOL efa9d14fad6770adf4ec0307e5c4e8855af2734332e33fbfff117f81429ff36e59f24c7126ccc356e9eed081d291bb53a8225cd88b633845b49d294385f675b5
+MISC ChangeLog 7517 SHA256 c9b96f43992be432594bdf593cf4fb42a00ed8133992081c18411f5ea437f03e SHA512 ee72f6a1a0e3d8e889de92e1813ebf0ef3132ddbb77ff64eb89ae2e88afa46751e2681765992ad8eaf14f45eda6c30b395a9775234dd34776cb888ee568f2a87 WHIRLPOOL c33f20cef9acff0cda58ed1e23d16c7216db4741314c96ca4c46d0c8803e97114990f33c629c2b1d86e975d2f2525b9090b6f401192290cc622b75d5ba8f7b6d
 MISC metadata.xml 545 SHA256 eba832a6dc58fe1df49c2b0a80f8eb2dfe04ce7ffad928313a0b26489c74da7a SHA512 a4974bc4df54f2b6117450548d7defdfd6d50124a51407ae57497e2c34ca209311a7ad9cb3414f9b2bcf0317ddd82ca334800f8eb468ed0b38b4eb8d5fbece74 WHIRLPOOL a074330c83ef0e6514cb6ee1fec6f76fb9ee71c9b0a83e3cb782b1b96046a903e55392f5407a1b64105b4ce1dd9a75604979e9c0e2bd229cd4d673c101016d10
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTD3x3AAoJEEdUh39IaPFNQ2wH/ihMe+3bBmxma1Rda6pcdEB8
-hQfP8qK4FARoVaxQvlJ6sgCdMk3QJLSoDIHmIcc2LAn3Gy3FOYJYKswC8HCfrpjm
-XU8qgoW4bQGEn/VJLd61qXB8uGpuaM6+KIz9Ht+hkr3uW1aAVxqWCKPzGEbHuSG8
-vBAEoLi0zr1vPsqRgT688RCcxAOKWt+rXP8xEFK2IvzWFES65l/3K/Iae9zYGUn7
-9vAkouRHnZ9fl4EtVA3KjLIJI8liofJRZKMZG/R+AWCVHlVRPdFsb6evO5a3h4Hs
-lc6ltSu3bnxxIsu3t18FJaW/gAS5tit6zjFmOT84TKl1AEG/jQ/U9LY1GmQbsg4=
-=YLs9
+iEYEAREIAAYFAlN8sb4ACgkQVWmRsqeSphPFNQCdEavvEGMN9vNRaeNB4NW6VCqf
+apcAn3O3heXHtKoZ0iSjaY6pLNiKNWIe
+=1WRm
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/avant-window-navigator/files/avant-window-navigator-0.4.0-underlinking.patch b/gnome-extra/avant-window-navigator/files/avant-window-navigator-0.4.0-underlinking.patch
index d887d75fa50e..c0ab1923083a 100644
--- a/gnome-extra/avant-window-navigator/files/avant-window-navigator-0.4.0-underlinking.patch
+++ b/gnome-extra/avant-window-navigator/files/avant-window-navigator-0.4.0-underlinking.patch
@@ -1,43 +1,5 @@
-This is using gcc-4.8.x with GNU gold linker from binutils-2.24 with LDFLAGS="-Wl,--as-needed":
-
-LINK  avant-window-navigator
-awn-main.o:awn-main.c:function main: error: undefined reference to 'g_option_context_new'
-[ .. cut .. ]
-awn-app.o:awn-app.c:function dbus_glib_marshal_awn_app_BOOLEAN__POINTER_POINTER: error: undefined reference to 'g_value_peek_pointer'
-[ .. cut .. ]
-awn-applet-manager.o:awn-applet-manager.c:function awn_applet_manager_class_intern_init: error: undefined reference to 'g_type_class_peek_parent'
-[ .. cut .. ]
-awn-applet-proxy.o:awn-applet-proxy.c:function awn_applet_proxy_class_intern_init: error: undefined reference to 'g_type_class_peek_parent'
-[ .. cut .. ]
-awn-background.o:awn-background.c:function awn_background_class_intern_init: error: undefined reference to 'g_type_class_peek_parent'
-[ .. cut .. ]
-awn-background-flat.o:awn-background-flat.c:function awn_background_flat_get_shape_mask: error: undefined reference to 'cairo_save'
-[ .. cut .. ]
-awn-background-3d.o:awn-background-3d.c:function draw_rect_path: error: undefined reference to 'cairo_move_to'
-[ .. cut .. ]
-awn-background-curves.o:awn-background-curves.c:function draw_rect_path.isra.1: error: undefined reference to 'cairo_scale'
-[ .. cut .. ]
-awn-background-edgy.o:awn-background-edgy.c:function awn_background_edgy_align_changed: error: undefined reference to 'gtk_widget_hide'
-[ .. cut .. ]
-awn-background-floaty.o:awn-background-floaty.c:function awn_background_floaty_draw: error: undefined reference to 'gtk_widget_is_composited'
-[ .. cut .. ]
-awn-marshal.o:awn-marshal.c:function awn_marshal_BOOLEAN__VOID: error: undefined reference to 'g_value_set_boolean'
-[ .. cut .. ]
-awn-monitor.o:awn-monitor.c:function awn_monitor_class_intern_init: error: undefined reference to 'desktop_agnostic_config_client_get_type'
-[ .. cut .. ]
-awn-panel.o:awn-panel.c:function alpha_blend_start: error: undefined reference to 'g_timeout_add'
-[ .. cut .. ]
-awn-separator.o:awn-separator.c:function awn_separator_class_intern_init: error: undefined reference to 'desktop_agnostic_color_get_type'
-[ .. cut .. ]
-awn-throbber.o:awn-throbber.c:function awn_throbber_class_intern_init: error: undefined reference to 'desktop_agnostic_color_get_type'
-[ .. cut .. ]
-awn-ua-alignment.o:awn-ua-alignment.c:function awn_ua_alignment_class_intern_init: error: undefined reference to 'g_param_spec_string'
-[ .. cut .. ]
-xutils.o:xutils.c:function xutils_set_strut: error: undefined reference to 'gdk_window_object_get_type'
-collect2: error: ld returned 1 exit status
-  
---- src/Makefile.am
-+++ src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -16,6 +16,7 @@
  bin_PROGRAMS = avant-window-navigator