Fix installation with to-do.py mentioned twice in Makefile.am. Fix compilation with dev-libs/glib >= 2.31 by including only <glib.h> directly.

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

4 files changed, 185 insertions, 3 deletions

diff --git a/gnome-extra/avant-window-navigator-extras/ChangeLog b/gnome-extra/avant-window-navigator-extras/ChangeLog
index 336e16436d38..3f4299d42838 100644
--- a/gnome-extra/avant-window-navigator-extras/ChangeLog
+++ b/gnome-extra/avant-window-navigator-extras/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/avant-window-navigator-extras
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator-extras/ChangeLog,v 1.30 2012/04/01 04:44:21 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator-extras/ChangeLog,v 1.31 2012/04/15 10:54:12 ssuominen Exp $
+
+  15 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+  avant-window-navigator-extras-0.4.0.ebuild,
+  +files/avant-window-navigator-extras-0.4.0-glib-2.31.patch,
+  +files/avant-window-navigator-extras-0.4.0-to-do.py.patch:
+  Fix installation with to-do.py mentioned twice in Makefile.am. Fix
+  compilation with dev-libs/glib >= 2.31 by including only <glib.h> directly.
 
   01 Apr 2012; Mike Gilbert <floppym@gentoo.org>
   avant-window-navigator-extras-0.4.0.ebuild:
diff --git a/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.4.0.ebuild b/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.4.0.ebuild
index 0bef82437c9e..3164469800ae 100644
--- a/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.4.0.ebuild
+++ b/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.4.0.ebuild,v 1.5 2012/04/01 04:44:21 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.4.0.ebuild,v 1.6 2012/04/15 10:54:12 ssuominen Exp $
 
 EAPI=4
 
@@ -85,7 +85,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+	epatch \
+		"${FILESDIR}"/${P}-libnotify-0.7.patch \
+		"${FILESDIR}"/${P}-glib-2.31.patch \
+		"${FILESDIR}"/${P}-to-do.py.patch
 
 	>py-compile
 
diff --git a/gnome-extra/avant-window-navigator-extras/files/avant-window-navigator-extras-0.4.0-glib-2.31.patch b/gnome-extra/avant-window-navigator-extras/files/avant-window-navigator-extras-0.4.0-glib-2.31.patch
new file mode 100644
index 000000000000..71c5bd9e50d2
--- /dev/null
+++ b/gnome-extra/avant-window-navigator-extras/files/avant-window-navigator-extras-0.4.0-glib-2.31.patch
@@ -0,0 +1,150 @@
+--- applets/maintained/awnterm/keybinder.h
++++ applets/maintained/awnterm/keybinder.h
+@@ -24,7 +24,7 @@
+ #ifndef __AWN_KEY_BINDER_H__
+ #define __AWN_KEY_BINDER_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+--- applets/maintained/notification-daemon/daemon.h
++++ applets/maintained/notification-daemon/daemon.h
+@@ -31,8 +31,6 @@
+ 
+ #include <libawn/awn-applet.h>
+ #include <libawn/awn-applet-simple.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
+ 
+ #include <libawn/awn-dialog.h>
+ #include <libawn/awn-cairo-utils.h>
+--- applets/maintained/notification-daemon/engines.c
++++ applets/maintained/notification-daemon/engines.c
+@@ -38,9 +38,6 @@
+ 
+ 
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
+-
+ #include <libawn/awn-dialog.h>
+ #include <libawn/awn-applet-simple.h>
+ #include <libawn/awn-cairo-utils.h>
+--- applets/unmaintained/awnsystemmonitor/awnsystemmonitor.h
++++ applets/unmaintained/awnsystemmonitor/awnsystemmonitor.h
+@@ -25,7 +25,7 @@
+ //#include <libawn/awn-title.h>
+ #include <libawn/awn-tooltip.h>
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <glibtop/cpu.h>
+ #include <gconf/gconf-client.h>
+ 
+--- applets/unmaintained/awnsystemmonitor/awntop_cairo_component.c
++++ applets/unmaintained/awnsystemmonitor/awntop_cairo_component.c
+@@ -43,8 +43,6 @@
+ 
+ 
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include <libawn/awn-dialog.h>
+--- applets/unmaintained/awnsystemmonitor/cpu_component.c
++++ applets/unmaintained/awnsystemmonitor/cpu_component.c
+@@ -18,8 +18,6 @@
+  */
+ 
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include <libawn/awn-dialog.h>
+--- applets/unmaintained/awnsystemmonitor/cpumetergconf.c
++++ applets/unmaintained/awnsystemmonitor/cpumetergconf.c
+@@ -20,13 +20,10 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ #include <string.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include "cairo-utils.h"
+--- applets/unmaintained/awnsystemmonitor/dashboard.h
++++ applets/unmaintained/awnsystemmonitor/dashboard.h
+@@ -23,8 +23,6 @@
+ 
+ 
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include <libawn/awn-dialog.h>
+--- applets/unmaintained/awnsystemmonitor/date_time_component.c
++++ applets/unmaintained/awnsystemmonitor/date_time_component.c
+@@ -19,8 +19,6 @@
+ 
+ 
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include <libawn/awn-dialog.h>
+--- applets/unmaintained/awnsystemmonitor/loadavg_component.c
++++ applets/unmaintained/awnsystemmonitor/loadavg_component.c
+@@ -19,8 +19,6 @@
+ 
+ #include <glibtop/loadavg.h>
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include <libawn/awn-dialog.h>
+--- applets/unmaintained/awnsystemmonitor/sysmem_component.c
++++ applets/unmaintained/awnsystemmonitor/sysmem_component.c
+@@ -19,8 +19,6 @@
+ 
+ #include <glibtop/mem.h>
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include <libawn/awn-dialog.h>
+--- applets/unmaintained/awnsystemmonitor/uptime_component.c
++++ applets/unmaintained/awnsystemmonitor/uptime_component.c
+@@ -1,7 +1,5 @@
+ 
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include <libawn/awn-dialog.h>
+--- applets/unmaintained/main-menu/applet.c
++++ applets/unmaintained/main-menu/applet.c
+@@ -23,8 +23,7 @@
+ 
+ #include <string.h>
+ 
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ #include <libdesktop-agnostic/fdo.h>
diff --git a/gnome-extra/avant-window-navigator-extras/files/avant-window-navigator-extras-0.4.0-to-do.py.patch b/gnome-extra/avant-window-navigator-extras/files/avant-window-navigator-extras-0.4.0-to-do.py.patch
new file mode 100644
index 000000000000..0bd77d74bc4a
--- /dev/null
+++ b/gnome-extra/avant-window-navigator-extras/files/avant-window-navigator-extras-0.4.0-to-do.py.patch
@@ -0,0 +1,22 @@
+/usr/bin/install: cannot create regular file ‘/var/tmp/portage/gnome-extra/avant-window-navigator-extras-0.4.0/image//usr/share/avant-window-navigator/applets/to-do/to-do.py’: File exists
+
+--- applets/maintained/to-do/Makefile.am
++++ applets/maintained/to-do/Makefile.am
+@@ -5,7 +5,6 @@
+ include $(top_srcdir)/Makefile.schemas
+ 
+ dist_applet_DATA =			\
+-	to-do.py	\
+ 	settings.py	\
+ 	icon.py	\
+ 	prefs.py	\
+--- applets/maintained/to-do/Makefile.in
++++ applets/maintained/to-do/Makefile.in
+@@ -327,7 +327,6 @@
+ @GCONF_SCHEMAS_INSTALL_TRUE@gconfschemasdir = @GCONF_SCHEMA_FILE_DIR@
+ @GCONF_SCHEMAS_INSTALL_TRUE@gconfschemas_DATA = $(schema_DATA:.schema-ini=.schemas)
+ dist_applet_DATA = \
+-	to-do.py	\
+ 	settings.py	\
+ 	icon.py	\
+ 	prefs.py	\