version bump

(Portage version: 2.1.10.11/cvs/Linux i686)

9 files changed, 49 insertions, 603 deletions

diff --git a/games-kids/gcompris/ChangeLog b/games-kids/gcompris/ChangeLog
index ea0a24efedf2..813c5890787c 100644
--- a/games-kids/gcompris/ChangeLog
+++ b/games-kids/gcompris/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for games-kids/gcompris
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.67 2011/10/20 22:32:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.68 2011/11/04 18:04:45 mr_bones_ Exp $
+
+*gcompris-11.09 (04 Nov 2011)
+
+  04 Nov 2011; Michael Sterrett <mr_bones_@gentoo.org> -gcompris-8.4.12.ebuild,
+  -files/gcompris-8.4.12-build.patch, -gcompris-9.2.2.ebuild,
+  -files/gcompris-9.2.2-build.patch, -files/gcompris-9.2.2-gtk2.22.patch,
+  -gcompris-9.6.ebuild, files/gcompris-9.6.1-build.patch,
+  -files/gcompris-9.6-build.patch, +gcompris-11.09.ebuild,
+  +files/gcompris-11.09-build.patch:
+  version bump
 
   20 Oct 2011; Pacho Ramos <pacho@gentoo.org> gcompris-9.6.1.ebuild:
   Drop DEPRECATED flags, bug #387817
diff --git a/games-kids/gcompris/files/gcompris-9.6-build.patch b/games-kids/gcompris/files/gcompris-11.09-build.patch
index fe3ef6abc581..07be210e0a50 100644
--- a/games-kids/gcompris/files/gcompris-9.6-build.patch
+++ b/games-kids/gcompris/files/gcompris-11.09-build.patch
@@ -1,6 +1,5 @@
-diff -ru gcompris-9.5.orig/Makefile.am gcompris-9.5/Makefile.am
---- gcompris-9.5.orig/Makefile.am	2010-04-05 08:57:18.000000000 -0400
-+++ gcompris-9.5/Makefile.am	2011-01-06 12:15:53.891564989 -0500
+--- gcompris-9.5.orig/Makefile.am
++++ gcompris-9.5/Makefile.am
 @@ -17,7 +17,7 @@
  # endif
  
@@ -19,9 +18,8 @@ diff -ru gcompris-9.5.orig/Makefile.am gcompris-9.5/Makefile.am
  Applications_in_files = gcompris.desktop.in gcompris-edit.desktop.in
  Applications_DATA = gcompris.desktop gcompris-edit.desktop
  endif
-diff -ru gcompris-9.5.orig/configure.ac gcompris-9.5/configure.ac
---- gcompris-9.5.orig/configure.ac	2010-12-06 15:26:21.000000000 -0500
-+++ gcompris-9.5/configure.ac	2011-01-06 12:19:29.657036163 -0500
+--- gcompris-9.5.orig/configure.ac
++++ gcompris-9.5/configure.ac
 @@ -203,10 +203,8 @@
            USE_DEBUG="$enableval", USE_DEBUG="no")
  if test "x$USE_DEBUG" == "xyes" ; then
@@ -68,9 +66,8 @@ diff -ru gcompris-9.5.orig/configure.ac gcompris-9.5/configure.ac
    if test x$GNUCHESS = xno; then
      AC_MSG_ERROR(Couldn't find gnuchess, please install the gnuchess package version 5 or above)
    fi
-diff -ru gcompris-9.5.orig/docs/C/Makefile.am gcompris-9.5/docs/C/Makefile.am
---- gcompris-9.5.orig/docs/C/Makefile.am	2009-08-30 12:24:49.000000000 -0400
-+++ gcompris-9.5/docs/C/Makefile.am	2011-01-06 12:19:44.308216363 -0500
+--- gcompris-9.5.orig/docs/C/Makefile.am
++++ gcompris-9.5/docs/C/Makefile.am
 @@ -10,7 +10,7 @@
  	     overview.dia \
  	     $(man_MANS)
@@ -80,9 +77,8 @@ diff -ru gcompris-9.5.orig/docs/C/Makefile.am gcompris-9.5/docs/C/Makefile.am
  
  all: $(doc)
  
-diff -ru gcompris-9.5.orig/docs/eu/Makefile.am gcompris-9.5/docs/eu/Makefile.am
---- gcompris-9.5.orig/docs/eu/Makefile.am	2010-03-23 18:21:41.000000000 -0400
-+++ gcompris-9.5/docs/eu/Makefile.am	2011-01-06 12:19:54.444265564 -0500
+--- gcompris-9.5.orig/docs/eu/Makefile.am
++++ gcompris-9.5/docs/eu/Makefile.am
 @@ -8,7 +8,7 @@
  	     overview.dia \
  	     gcompris.texi
@@ -92,9 +88,8 @@ diff -ru gcompris-9.5.orig/docs/eu/Makefile.am gcompris-9.5/docs/eu/Makefile.am
  
  all: $(doc)
  
-diff -ru gcompris-9.5.orig/docs/fr/Makefile.am gcompris-9.5/docs/fr/Makefile.am
---- gcompris-9.5.orig/docs/fr/Makefile.am	2010-03-23 18:21:41.000000000 -0400
-+++ gcompris-9.5/docs/fr/Makefile.am	2011-01-06 12:19:59.760242448 -0500
+--- gcompris-9.5.orig/docs/fr/Makefile.am
++++ gcompris-9.5/docs/fr/Makefile.am
 @@ -8,7 +8,7 @@
  	     overview.dia \
  	     gcompris.texi
@@ -104,9 +99,8 @@ diff -ru gcompris-9.5.orig/docs/fr/Makefile.am gcompris-9.5/docs/fr/Makefile.am
  
  all: $(doc)
  
-diff -ru gcompris-9.5.orig/po/Makefile.in.in gcompris-9.5/po/Makefile.in.in
---- gcompris-9.5.orig/po/Makefile.in.in	2010-12-06 15:29:45.000000000 -0500
-+++ gcompris-9.5/po/Makefile.in.in	2011-01-06 12:20:28.901633920 -0500
+--- gcompris-9.5.orig/po/Makefile.in.in
++++ gcompris-9.5/po/Makefile.in.in
 @@ -34,7 +34,7 @@
  datarootdir = @datarootdir@
  libdir = @libdir@
@@ -116,9 +110,8 @@ diff -ru gcompris-9.5.orig/po/Makefile.in.in gcompris-9.5/po/Makefile.in.in
  subdir = po
  install_sh = @install_sh@
  # Automake >= 1.8 provides @mkdir_p@.
-diff -ru gcompris-9.5.orig/src/gcompris/gcompris.c gcompris-9.5/src/gcompris/gcompris.c
---- gcompris-9.5.orig/src/gcompris/gcompris.c	2010-12-05 13:08:35.000000000 -0500
-+++ gcompris-9.5/src/gcompris/gcompris.c	2011-01-06 12:21:01.535353344 -0500
+--- gcompris-9.5.orig/src/gcompris/gcompris.c
++++ gcompris-9.5/src/gcompris/gcompris.c
 @@ -1308,7 +1308,7 @@
      properties->package_plugin_dir = g_strconcat(pkg_clib_dir, "/gcompris", NULL);
      properties->package_python_plugin_dir = g_strconcat(pkg_data_dir, "/gcompris/python",
diff --git a/games-kids/gcompris/files/gcompris-8.4.12-build.patch b/games-kids/gcompris/files/gcompris-8.4.12-build.patch
deleted file mode 100644
index 5615c9e7d633..000000000000
--- a/games-kids/gcompris/files/gcompris-8.4.12-build.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-diff -ru gcompris-8.4.12.orig/Makefile.am gcompris-8.4.12/Makefile.am
---- gcompris-8.4.12.orig/Makefile.am	2008-12-14 15:30:56.000000000 -0500
-+++ gcompris-8.4.12/Makefile.am	2009-05-31 01:04:35.000000000 -0400
-@@ -17,7 +17,7 @@
- endif
- 
- 
--icondir=$(datadir)/pixmaps
-+icondir=/usr/share/pixmaps
- icon_DATA = gcompris.png gcompris-edit.png
- 
- if BUILD_MINGW32
-@@ -25,7 +25,7 @@
- Applications_in_files =
- Applications_DATA =
- else
--Applicationsdir = $(datadir)/applications/
-+Applicationsdir = /usr/share/applications
- Applications_in_files = gcompris.desktop.in gcompris-edit.desktop.in
- Applications_DATA = gcompris.desktop gcompris-edit.desktop
- endif
-diff -ru gcompris-8.4.12.orig/configure.in gcompris-8.4.12/configure.in
---- gcompris-8.4.12.orig/configure.in	2009-03-29 06:35:55.000000000 -0400
-+++ gcompris-8.4.12/configure.in	2009-05-31 01:09:09.000000000 -0400
-@@ -146,6 +146,14 @@
- AC_SUBST(XML_CFLAGS)
- AC_SUBST(XML_LIBS)
- 
-+PKG_CHECK_MODULES(LIBGNOMECANVAS, libgnomecanvas-2.0)
-+AC_SUBST(LIBGNOMECANVAS_CFLAGS)
-+AC_SUBST(LIBGNOMECANVAS_LIBS)
-+
-+PKG_CHECK_MODULES(LIBART_LGPL, libart-2.0)
-+AC_SUBST(LIBART_LGPL_CFLAGS)
-+AC_SUBST(LIBART_LGPL_LIBS)
-+
- dnl Freetype2 flags (needed for libgnomecanvas)
- PKG_CHECK_MODULES(FT2, freetype2)
- AC_SUBST(FT2_CFLAGS)
-@@ -225,10 +233,8 @@
-           USE_DEBUG="$enableval", USE_DEBUG="no")
- if test "x$USE_DEBUG" == "xyes" ; then
-     AC_DEFINE_UNQUOTED(DEBUG, 1, "Enable debug messages.")
--    CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -Werror -g"
--else
--    CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -Werror"
- fi
-+CFLAGS="$CFLAGS $OSX_CFLAGS -Wall"
- 
- dnl WIN32 Specifics
- AC_MSG_CHECKING([for native Win32])
-@@ -297,25 +303,25 @@
- if test "x$platform_win32" = "xno" ; then
- 
-   dnl Set PACKAGE_LOCALE_DIR in config.h.
--  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${myprefix}/${DATADIRNAME}/locale", [GCompris locale directory])
-+  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "/usr/share/locale", [GCompris locale directory])
- 
-   dnl Set PACKAGE_DATA_DIR
-   PACKAGE_DATA_DIR="boards"
-   AC_SUBST(PACKAGE_DATA_DIR)
--  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${myprefix}/${DATADIRNAME}", [GCompris data directory])
-+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}", [GCompris data directory])
- 
-   dnl Set PACKAGE_HELP_DIR
--  PACKAGE_HELP_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/help"
-+  PACKAGE_HELP_DIR="${datadir}/${PACKAGE}/help"
-   AC_SUBST(PACKAGE_HELP_DIR)
- 
-   dnl Plugin Directory
-   my_libdir=`eval echo "${libdir}"`
--  AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${my_libdir}", [Gcompris plugins directory])
-+  AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${libdir}", [Gcompris plugins directory])
-   plugindir=$libdir/gcompris
-   AC_SUBST(plugindir)
- 
-   dnl Python plugin Directory
--  PYTHON_PLUGIN_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/python"
-+  PYTHON_PLUGIN_DIR="${datadir}/${PACKAGE}/python"
-   AC_SUBST(PYTHON_PLUGIN_DIR)
- 
-   dnl System GCompris config directory
-@@ -545,8 +551,6 @@
- src/boards/python/gcompris/utils/Makefile
- src/boards/python/connect4p/Makefile
- src/boards/python/admin/Makefile
--src/libart_lgpl/Makefile
--src/libgnomecanvas/Makefile
- po/Makefile.in
- docs/Makefile
- docs/C/Makefile
-diff -ru gcompris-8.4.12.orig/docs/C/Makefile.am gcompris-8.4.12/docs/C/Makefile.am
---- gcompris-8.4.12.orig/docs/C/Makefile.am	2008-03-12 16:26:23.000000000 -0400
-+++ gcompris-8.4.12/docs/C/Makefile.am	2009-05-31 01:09:44.000000000 -0400
-@@ -10,7 +10,7 @@
- 	     overview.dia \
- 	     $(man_MANS)
- 
--gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/C
-+gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/C
- 
- all: $(doc)
- 
-diff -ru gcompris-8.4.12.orig/docs/eu/Makefile.am gcompris-8.4.12/docs/eu/Makefile.am
---- gcompris-8.4.12.orig/docs/eu/Makefile.am	2008-10-28 17:36:12.000000000 -0400
-+++ gcompris-8.4.12/docs/eu/Makefile.am	2009-05-31 01:10:09.000000000 -0400
-@@ -8,7 +8,7 @@
- 	     overview.dia \
- 	     gcompris.texi
- 
--gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/eu
-+gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/eu
- 
- all: $(doc)
- 
-diff -ru gcompris-8.4.12.orig/docs/fr/Makefile.am gcompris-8.4.12/docs/fr/Makefile.am
---- gcompris-8.4.12.orig/docs/fr/Makefile.am	2008-10-28 17:35:25.000000000 -0400
-+++ gcompris-8.4.12/docs/fr/Makefile.am	2009-05-31 01:10:17.000000000 -0400
-@@ -8,7 +8,7 @@
- 	     overview.dia \
- 	     gcompris.texi
- 
--gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/fr
-+gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/fr
- 
- all: $(doc)
- 
-diff -ru gcompris-8.4.12.orig/po/Makefile.in.in gcompris-8.4.12/po/Makefile.in.in
---- gcompris-8.4.12.orig/po/Makefile.in.in	2009-03-29 06:39:29.000000000 -0400
-+++ gcompris-8.4.12/po/Makefile.in.in	2009-05-31 01:10:51.000000000 -0400
-@@ -34,7 +34,7 @@
- datarootdir = @datarootdir@
- libdir = @libdir@
- DATADIRNAME = @DATADIRNAME@
--itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+itlocaledir = /usr/share/locale
- subdir = po
- install_sh = @install_sh@
- # Automake >= 1.8 provides @mkdir_p@.
-diff -ru gcompris-8.4.12.orig/src/Makefile.am gcompris-8.4.12/src/Makefile.am
---- gcompris-8.4.12.orig/src/Makefile.am	2007-05-22 16:15:05.000000000 -0400
-+++ gcompris-8.4.12/src/Makefile.am	2009-05-31 01:11:02.000000000 -0400
-@@ -1,3 +1,3 @@
- ## Process this file with automake to produce Makefile.in
- 
--SUBDIRS = libart_lgpl libgnomecanvas gcompris boards
-+SUBDIRS = gcompris boards
-diff -ru gcompris-8.4.12.orig/src/boards/Makefile.am gcompris-8.4.12/src/boards/Makefile.am
---- gcompris-8.4.12.orig/src/boards/Makefile.am	2009-03-16 17:59:02.000000000 -0400
-+++ gcompris-8.4.12/src/boards/Makefile.am	2009-05-31 01:12:45.000000000 -0400
-@@ -80,6 +80,8 @@
- 	-I$(top_srcdir)/src \
- 	$(GCOMPRIS_CFLAGS) \
- 	$(XML_CFLAGS) \
-+	$(LIBART_LGPL_CFLAGS) \
-+	$(LIBGNOMECANVAS_CFLAGS) \
- 	$(PYTHON_CFLAGS) \
- 	$(PYGTK_CFLAGS) \
- 	$(sqlite_cflags) \
-@@ -110,7 +112,7 @@
- libclockgame_la_SOURCES = clockgame.c
- 
- 
--libshapegame_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS)
-+libshapegame_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS) $(LIBART_LGPL_LIBS) $(LIBGNOMECANVAS_LIBS)
- libshapegame_la_LIBADD =
- libshapegame_la_SOURCES = shapegame.c
- 
-@@ -154,12 +156,12 @@
- libmemory_la_SOURCES = memory.c
- 
- 
--libimageid_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS)
-+libimageid_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS) $(LIBART_LGPL_LIBS) $(LIBGNOMECANVAS_LIBS)
- libimageid_la_LIBADD =
- libimageid_la_SOURCES = imageid.c
- 
- 
--libmissingletter_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS)
-+libmissingletter_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS) $(LIBART_LGPL_LIBS) $(LIBGNOMECANVAS_LIBS)
- libmissingletter_la_LIBADD =
- libmissingletter_la_SOURCES = missingletter.c missingletter_config.c
- 
-@@ -208,7 +210,7 @@
- libcanal_lock_la_LIBADD =
- libcanal_lock_la_SOURCES = canal_lock.c
- 
--libadvanced_colors_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS)
-+libadvanced_colors_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS) $(LIBART_LGPL_LIBS) $(LIBGNOMECANVAS_LIBS)
- libadvanced_colors_la_LIBADD =
- libadvanced_colors_la_SOURCES = advanced_colors.c
- 
-@@ -216,7 +218,7 @@
- libsuperbrain_la_LIBADD =
- libsuperbrain_la_SOURCES = superbrain.c
- 
--libread_colors_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS)
-+libread_colors_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS) $(LIBART_LGPL_LIBS) $(LIBGNOMECANVAS_LIBS)
- libread_colors_la_LIBADD =
- libread_colors_la_SOURCES = read_colors.c
- 
-diff -ru gcompris-8.4.12.orig/src/gcompris/Makefile.am gcompris-8.4.12/src/gcompris/Makefile.am
---- gcompris-8.4.12.orig/src/gcompris/Makefile.am	2009-02-04 18:26:53.000000000 -0500
-+++ gcompris-8.4.12/src/gcompris/Makefile.am	2009-05-31 01:13:41.000000000 -0400
-@@ -51,6 +51,8 @@
- 	$(GCOMPRIS_CFLAGS) \
- 	$(GNOME_INCLUDEDIR) \
- 	$(XML_CFLAGS) \
-+	$(LIBART_LGPL_CFLAGS) \
-+	$(LIBGNOMECANVAS_CFLAGS) \
- 	-DGNOME_DISABLE_DEPRECATED \
-         $(sqlite_cflags) \
- 	$(GNET_CFLAGS) \
-@@ -120,12 +122,11 @@
- 	wordlist.h
- 
- gcompris_LDFLAGS = \
--	-export-dynamic $(top_builddir)/src/libgnomecanvas/libgnomecanvas-2.a \
--	$(top_builddir)/src/libart_lgpl/libart_lgpl_2.a
-+	-export-dynamic
- 
- 
- gcompris_LDADD = \
--	$(GCOMPRIS_LIBS) $(sqlite_ldadd) $(XML_LIBS) $(GNET_LIBS) \
-+	$(GCOMPRIS_LIBS) $(sqlite_ldadd) $(XML_LIBS) $(GNET_LIBS) $(LIBART_LGPL_LIBS) $(LIBGNOMECANVAS_LIBS) \
-         $(INTLLIBS) $(NSBUNDLE_LDFLAGS) $(XF86VM_LIBS)
- 
- EXTRA_DIST = \
-diff -ru gcompris-8.4.12.orig/src/gcompris/gcompris.c gcompris-8.4.12/src/gcompris/gcompris.c
---- gcompris-8.4.12.orig/src/gcompris/gcompris.c	2009-02-19 16:51:20.000000000 -0500
-+++ gcompris-8.4.12/src/gcompris/gcompris.c	2009-05-31 01:14:27.000000000 -0400
-@@ -1158,7 +1158,7 @@
-       properties->package_locale_dir = gbr_find_locale_dir(PACKAGE_LOCALE_DIR);
-       properties->package_plugin_dir = g_strconcat(pkg_clib_dir, "/gcompris", NULL);
-       properties->package_python_plugin_dir = g_strconcat(pkg_data_dir, "/gcompris/python", NULL);
--      properties->system_icon_dir = g_strconcat(pkg_data_dir, "/pixmaps", NULL);
-+      properties->system_icon_dir = g_strconcat("/usr/share", "/pixmaps", NULL);
-       g_free(pkg_data_dir);
-       g_free(pkg_clib_dir);
-     }
diff --git a/games-kids/gcompris/files/gcompris-9.2.2-build.patch b/games-kids/gcompris/files/gcompris-9.2.2-build.patch
deleted file mode 100644
index 7105143b8638..000000000000
--- a/games-kids/gcompris/files/gcompris-9.2.2-build.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -ur gcompris-9.2.orig//Makefile.am gcompris-9.2//Makefile.am
---- gcompris-9.2.orig//Makefile.am	2010-01-18 14:35:41.000000000 -0700
-+++ gcompris-9.2//Makefile.am	2010-03-21 17:31:18.314740265 -0600
-@@ -17,7 +17,7 @@
- endif
- 
- 
--icondir=$(datadir)/pixmaps
-+icondir=/usr/share/pixmaps
- icon_DATA = gcompris.png gcompris-edit.png
- 
- if BUILD_MINGW32
-@@ -25,7 +25,7 @@
- Applications_in_files =
- Applications_DATA =
- else
--Applicationsdir = $(datadir)/applications/
-+Applicationsdir = /usr/share/applications/
- Applications_in_files = gcompris.desktop.in gcompris-edit.desktop.in
- Applications_DATA = gcompris.desktop gcompris-edit.desktop
- endif
-diff -ur gcompris-9.2.orig//configure.ac gcompris-9.2//configure.ac
---- gcompris-9.2.orig//configure.ac	2010-02-13 10:00:00.000000000 -0700
-+++ gcompris-9.2//configure.ac	2010-03-21 17:31:18.350739972 -0600
-@@ -217,10 +217,8 @@
-           USE_DEBUG="$enableval", USE_DEBUG="no")
- if test "x$USE_DEBUG" == "xyes" ; then
-     AC_DEFINE_UNQUOTED(DEBUG, 1, "Enable debug messages.")
--    CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -Werror -g"
--else
--    CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -Werror"
- fi
-+CFLAGS="$CFLAGS $OSX_CFLAGS -Wall"
- 
- dnl WIN32 Specifics
- AC_MSG_CHECKING([for Win32 platform in general])
-@@ -284,25 +282,25 @@
- if test "x$platform_win32" = "xno" ; then
- 
-   dnl Set PACKAGE_LOCALE_DIR in config.h.
--  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${myprefix}/${DATADIRNAME}/locale", [GCompris locale directory])
-+  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "/usr/share/locale", [GCompris locale directory])
- 
-   dnl Set PACKAGE_DATA_DIR
-   PACKAGE_DATA_DIR="boards"
-   AC_SUBST(PACKAGE_DATA_DIR)
--  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${myprefix}/${DATADIRNAME}", [GCompris data directory])
-+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}", [GCompris data directory])
- 
-   dnl Set PACKAGE_HELP_DIR
--  PACKAGE_HELP_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/help"
-+  PACKAGE_HELP_DIR="${datadir}/${PACKAGE}/help"
-   AC_SUBST(PACKAGE_HELP_DIR)
- 
-   dnl Plugin Directory
-   my_libdir=`eval echo "${libdir}"`
--  AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${my_libdir}", [Gcompris plugins directory])
-+  AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${libdir}", [Gcompris plugins directory])
-   plugindir=$libdir/gcompris
-   AC_SUBST(plugindir)
- 
-   dnl Python plugin Directory
--  PYTHON_PLUGIN_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/python"
-+  PYTHON_PLUGIN_DIR="${datadir}/${PACKAGE}/python"
-   AC_SUBST(PYTHON_PLUGIN_DIR)
- 
-   dnl System GCompris config directory
-diff -ur gcompris-9.2.orig//docs/C/Makefile.am gcompris-9.2//docs/C/Makefile.am
---- gcompris-9.2.orig//docs/C/Makefile.am	2009-08-30 10:24:49.000000000 -0600
-+++ gcompris-9.2//docs/C/Makefile.am	2010-03-21 17:31:18.350739972 -0600
-@@ -10,7 +10,7 @@
- 	     overview.dia \
- 	     $(man_MANS)
- 
--gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/C
-+gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/C
- 
- all: $(doc)
- 
-diff -ur gcompris-9.2.orig//docs/eu/Makefile.am gcompris-9.2//docs/eu/Makefile.am
---- gcompris-9.2.orig//docs/eu/Makefile.am	2010-01-18 14:35:41.000000000 -0700
-+++ gcompris-9.2//docs/eu/Makefile.am	2010-03-21 17:31:18.350739972 -0600
-@@ -8,7 +8,7 @@
- 	     overview.dia \
- 	     gcompris.texi
- 
--gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/eu
-+gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/eu
- 
- all: $(doc)
- 
-diff -ur gcompris-9.2.orig//docs/fr/Makefile.am gcompris-9.2//docs/fr/Makefile.am
---- gcompris-9.2.orig//docs/fr/Makefile.am	2010-01-18 14:35:41.000000000 -0700
-+++ gcompris-9.2//docs/fr/Makefile.am	2010-03-21 17:31:18.354741636 -0600
-@@ -8,7 +8,7 @@
- 	     overview.dia \
- 	     gcompris.texi
- 
--gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/fr
-+gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/fr
- 
- all: $(doc)
- 
-diff -ur gcompris-9.2.orig//po/Makefile.in.in gcompris-9.2//po/Makefile.in.in
---- gcompris-9.2.orig//po/Makefile.in.in	2010-01-24 15:46:55.000000000 -0700
-+++ gcompris-9.2//po/Makefile.in.in	2010-03-21 17:31:18.354741636 -0600
-@@ -34,7 +34,7 @@
- datarootdir = @datarootdir@
- libdir = @libdir@
- DATADIRNAME = @DATADIRNAME@
--itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+itlocaledir = /usr/share/locale
- subdir = po
- install_sh = @install_sh@
- # Automake >= 1.8 provides @mkdir_p@.
-diff -ur gcompris-9.2.orig//src/gcompris/gcompris.c gcompris-9.2//src/gcompris/gcompris.c
---- gcompris-9.2.orig//src/gcompris/gcompris.c	2010-02-13 06:38:20.000000000 -0700
-+++ gcompris-9.2//src/gcompris/gcompris.c	2010-03-21 17:31:18.362744045 -0600
-@@ -1216,7 +1216,7 @@
-     properties->package_plugin_dir = g_strconcat(pkg_clib_dir, "/gcompris", NULL);
-     properties->package_python_plugin_dir = g_strconcat(pkg_data_dir, "/gcompris/python",
- 							NULL);
--    properties->system_icon_dir = g_strconcat(pkg_data_dir, "/pixmaps", NULL);
-+    properties->system_icon_dir = g_strconcat("/usr/share", "/pixmaps", NULL);
-     properties->menu_dir = g_strdup(properties->package_data_dir);
-     g_free(pkg_data_dir);
-     g_free(pkg_clib_dir);
diff --git a/games-kids/gcompris/files/gcompris-9.2.2-gtk2.22.patch b/games-kids/gcompris/files/gcompris-9.2.2-gtk2.22.patch
deleted file mode 100644
index 662662f9d85b..000000000000
--- a/games-kids/gcompris/files/gcompris-9.2.2-gtk2.22.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/goocanvas/src/Makefile.am.old	2010-10-21 12:29:13.000000000 +0200
-+++ src/goocanvas/src/Makefile.am	2010-10-21 12:30:14.000000000 +0200
-@@ -3,7 +3,6 @@
- INCLUDES = \
- 	-DG_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED \
- 	-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
--	-DGTK_DISABLE_DEPRECATED \
- 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- 	-DG_LOG_DOMAIN=\"GooCanvas\" \
diff --git a/games-kids/gcompris/files/gcompris-9.6.1-build.patch b/games-kids/gcompris/files/gcompris-9.6.1-build.patch
index fe3ef6abc581..07be210e0a50 100644
--- a/games-kids/gcompris/files/gcompris-9.6.1-build.patch
+++ b/games-kids/gcompris/files/gcompris-9.6.1-build.patch
@@ -1,6 +1,5 @@
-diff -ru gcompris-9.5.orig/Makefile.am gcompris-9.5/Makefile.am
---- gcompris-9.5.orig/Makefile.am	2010-04-05 08:57:18.000000000 -0400
-+++ gcompris-9.5/Makefile.am	2011-01-06 12:15:53.891564989 -0500
+--- gcompris-9.5.orig/Makefile.am
++++ gcompris-9.5/Makefile.am
 @@ -17,7 +17,7 @@
  # endif
  
@@ -19,9 +18,8 @@ diff -ru gcompris-9.5.orig/Makefile.am gcompris-9.5/Makefile.am
  Applications_in_files = gcompris.desktop.in gcompris-edit.desktop.in
  Applications_DATA = gcompris.desktop gcompris-edit.desktop
  endif
-diff -ru gcompris-9.5.orig/configure.ac gcompris-9.5/configure.ac
---- gcompris-9.5.orig/configure.ac	2010-12-06 15:26:21.000000000 -0500
-+++ gcompris-9.5/configure.ac	2011-01-06 12:19:29.657036163 -0500
+--- gcompris-9.5.orig/configure.ac
++++ gcompris-9.5/configure.ac
 @@ -203,10 +203,8 @@
            USE_DEBUG="$enableval", USE_DEBUG="no")
  if test "x$USE_DEBUG" == "xyes" ; then
@@ -68,9 +66,8 @@ diff -ru gcompris-9.5.orig/configure.ac gcompris-9.5/configure.ac
    if test x$GNUCHESS = xno; then
      AC_MSG_ERROR(Couldn't find gnuchess, please install the gnuchess package version 5 or above)
    fi
-diff -ru gcompris-9.5.orig/docs/C/Makefile.am gcompris-9.5/docs/C/Makefile.am
---- gcompris-9.5.orig/docs/C/Makefile.am	2009-08-30 12:24:49.000000000 -0400
-+++ gcompris-9.5/docs/C/Makefile.am	2011-01-06 12:19:44.308216363 -0500
+--- gcompris-9.5.orig/docs/C/Makefile.am
++++ gcompris-9.5/docs/C/Makefile.am
 @@ -10,7 +10,7 @@
  	     overview.dia \
  	     $(man_MANS)
@@ -80,9 +77,8 @@ diff -ru gcompris-9.5.orig/docs/C/Makefile.am gcompris-9.5/docs/C/Makefile.am
  
  all: $(doc)
  
-diff -ru gcompris-9.5.orig/docs/eu/Makefile.am gcompris-9.5/docs/eu/Makefile.am
---- gcompris-9.5.orig/docs/eu/Makefile.am	2010-03-23 18:21:41.000000000 -0400
-+++ gcompris-9.5/docs/eu/Makefile.am	2011-01-06 12:19:54.444265564 -0500
+--- gcompris-9.5.orig/docs/eu/Makefile.am
++++ gcompris-9.5/docs/eu/Makefile.am
 @@ -8,7 +8,7 @@
  	     overview.dia \
  	     gcompris.texi
@@ -92,9 +88,8 @@ diff -ru gcompris-9.5.orig/docs/eu/Makefile.am gcompris-9.5/docs/eu/Makefile.am
  
  all: $(doc)
  
-diff -ru gcompris-9.5.orig/docs/fr/Makefile.am gcompris-9.5/docs/fr/Makefile.am
---- gcompris-9.5.orig/docs/fr/Makefile.am	2010-03-23 18:21:41.000000000 -0400
-+++ gcompris-9.5/docs/fr/Makefile.am	2011-01-06 12:19:59.760242448 -0500
+--- gcompris-9.5.orig/docs/fr/Makefile.am
++++ gcompris-9.5/docs/fr/Makefile.am
 @@ -8,7 +8,7 @@
  	     overview.dia \
  	     gcompris.texi
@@ -104,9 +99,8 @@ diff -ru gcompris-9.5.orig/docs/fr/Makefile.am gcompris-9.5/docs/fr/Makefile.am
  
  all: $(doc)
  
-diff -ru gcompris-9.5.orig/po/Makefile.in.in gcompris-9.5/po/Makefile.in.in
---- gcompris-9.5.orig/po/Makefile.in.in	2010-12-06 15:29:45.000000000 -0500
-+++ gcompris-9.5/po/Makefile.in.in	2011-01-06 12:20:28.901633920 -0500
+--- gcompris-9.5.orig/po/Makefile.in.in
++++ gcompris-9.5/po/Makefile.in.in
 @@ -34,7 +34,7 @@
  datarootdir = @datarootdir@
  libdir = @libdir@
@@ -116,9 +110,8 @@ diff -ru gcompris-9.5.orig/po/Makefile.in.in gcompris-9.5/po/Makefile.in.in
  subdir = po
  install_sh = @install_sh@
  # Automake >= 1.8 provides @mkdir_p@.
-diff -ru gcompris-9.5.orig/src/gcompris/gcompris.c gcompris-9.5/src/gcompris/gcompris.c
---- gcompris-9.5.orig/src/gcompris/gcompris.c	2010-12-05 13:08:35.000000000 -0500
-+++ gcompris-9.5/src/gcompris/gcompris.c	2011-01-06 12:21:01.535353344 -0500
+--- gcompris-9.5.orig/src/gcompris/gcompris.c
++++ gcompris-9.5/src/gcompris/gcompris.c
 @@ -1308,7 +1308,7 @@
      properties->package_plugin_dir = g_strconcat(pkg_clib_dir, "/gcompris", NULL);
      properties->package_python_plugin_dir = g_strconcat(pkg_data_dir, "/gcompris/python",
diff --git a/games-kids/gcompris/gcompris-9.6.ebuild b/games-kids/gcompris/gcompris-11.09.ebuild
index 471c845f33f8..61eeab5086ea 100644
--- a/games-kids/gcompris/gcompris-9.6.ebuild
+++ b/games-kids/gcompris/gcompris-11.09.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/games-kids/gcompris/gcompris-9.6.ebuild,v 1.3 2011/04/21 10:25:48 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-11.09.ebuild,v 1.1 2011/11/04 18:04:45 mr_bones_ Exp $
 
 EAPI=2
 
@@ -8,15 +8,15 @@ PYTHON_DEPEND="python? 2:2.6"
 PYTHON_USE_WITH_OPT="python"
 PYTHON_USE_WITH="sqlite threads"
 
-inherit autotools eutils python versionator games
+inherit autotools eutils python games
 
 DESCRIPTION="full featured educational application for children from 2 to 10"
 HOMEPAGE="http://gcompris.net/"
-SRC_URI="mirror://sourceforge/gcompris/${PN}-$(replace_version_separator 2 -).tar.gz"
+SRC_URI="mirror://sourceforge/gcompris/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="gnet python"
 
 RDEPEND="x11-libs/gtk+:2
@@ -45,8 +45,6 @@ RDEPEND="${RDEPEND}
 	media-gfx/tuxpaint
 	sci-electronics/gnucap"
 
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
-
 pkg_setup() {
 	if use python; then
 		python_set_active_version 2
@@ -56,6 +54,12 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Drop DEPRECATED flags, bug #387817
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+		src/gcompris/Makefile.am src/gcompris/Makefile.in \
+		src/goocanvas/src/Makefile.am src/goocanvas/src/Makefile.in \
+		|| die
+
 	epatch "${FILESDIR}"/${P}-build.patch
 	cp /usr/share/gettext/config.rpath .
 	eautoreconf
diff --git a/games-kids/gcompris/gcompris-8.4.12.ebuild b/games-kids/gcompris/gcompris-8.4.12.ebuild
deleted file mode 100644
index 9767b72e9ba1..000000000000
--- a/games-kids/gcompris/gcompris-8.4.12.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-8.4.12.ebuild,v 1.4 2010/06/16 02:08:07 arfrever Exp $
-
-EAPI=2
-inherit autotools eutils python games
-
-DESCRIPTION="full featured educational application for children from 2 to 10"
-HOMEPAGE="http://gcompris.net/"
-SRC_URI="mirror://sourceforge/gcompris/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug gnet python sqlite"
-
-RDEPEND="x11-libs/gtk+:2
-	media-libs/gstreamer:0.10
-	media-libs/gst-plugins-good
-	media-plugins/gst-plugins-ogg
-	media-plugins/gst-plugins-vorbis
-	media-libs/libart_lgpl
-	>=gnome-base/libgnomecanvas-2.3.6
-	media-libs/sdl-mixer
-	media-libs/libsdl
-	dev-libs/libxml2
-	dev-libs/popt
-	virtual/libintl
-	games-board/gnuchess
-	gnet? ( net-libs/gnet:2 )
-	python? (
-		dev-lang/python[threads]
-		dev-python/pygtk
-		sqlite? ( dev-python/pysqlite:2 )
-	)
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}
-	dev-perl/XML-Parser
-	sys-devel/gettext
-	sys-apps/texinfo
-	app-text/texi2html
-	dev-util/pkgconfig"
-RDEPEND="${RDEPEND}
-	media-gfx/tuxpaint
-	sci-electronics/gnucap"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-	cp /usr/share/gettext/config.rpath .
-	eautoreconf
-}
-
-src_configure() {
-	GNUCHESS="${GAMES_BINDIR}"/gnuchess \
-	egamesconf \
-		--disable-dependency-tracking \
-		--datarootdir="${GAMES_DATADIR}" \
-		--datadir="${GAMES_DATADIR}" \
-		--localedir=/usr/share/locale \
-		--infodir=/usr/share/info \
-		--enable-xf86vidmode \
-		$(use_with python python "$(PYTHON -a)") \
-		$(use_enable debug) \
-		$(use_enable gnet) \
-		$(use_enable sqlite)
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	prepgamesdirs
-}
diff --git a/games-kids/gcompris/gcompris-9.2.2.ebuild b/games-kids/gcompris/gcompris-9.2.2.ebuild
deleted file mode 100644
index e82a03df6ed7..000000000000
--- a/games-kids/gcompris/gcompris-9.2.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-9.2.2.ebuild,v 1.8 2010/10/21 11:43:36 tupone Exp $
-
-EAPI=2
-
-PYTHON_DEPEND="python? 2:2.6"
-PYTHON_USE_WITH_OPT="python"
-PYTHON_USE_WITH="sqlite threads"
-
-inherit autotools eutils python versionator games
-
-DESCRIPTION="full featured educational application for children from 2 to 10"
-HOMEPAGE="http://gcompris.net/"
-SRC_URI="mirror://sourceforge/gcompris/${PN}-$(replace_version_separator 2 -).tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug gnet python"
-
-RDEPEND="x11-libs/gtk+:2
-	media-libs/gstreamer:0.10
-	media-libs/gst-plugins-good
-	media-plugins/gst-plugins-ogg
-	media-plugins/gst-plugins-vorbis
-	media-libs/sdl-mixer
-	media-libs/libsdl
-	dev-libs/libxml2
-	dev-libs/popt
-	virtual/libintl
-	games-board/gnuchess
-	dev-db/sqlite:3
-	gnet? ( net-libs/gnet:2 )
-	python? ( dev-python/pygtk )"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	dev-perl/XML-Parser
-	sys-devel/gettext
-	sys-apps/texinfo
-	app-text/texi2html
-	dev-util/pkgconfig"
-RDEPEND="${RDEPEND}
-	media-gfx/tuxpaint
-	sci-electronics/gnucap"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-	games_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-gtk2.22.patch
-	cp /usr/share/gettext/config.rpath .
-	if has_version '>=x11-libs/gtk+-2.20:2' ; then
-		sed -i \
-			-e 's:GTK_WIDGET_REALIZED:gtk_widget_get_realized:g'    \
-			-e 's:GTK_WIDGET_VISIBLE:gtk_widget_get_visible:g'      \
-			-e 's:GTK_WIDGET_DRAWABLE:gtk_widget_is_drawable:g'     \
-			-e 's:GTK_WIDGET_HAS_FOCUS:gtk_widget_has_focus:g'      \
-			-e 's:GTK_WIDGET_HAS_FOCUS:gtk_widget_has_focus:g'      \
-			-e 's:GTK_WIDGET_MAPPED:gtk_widget_get_mapped:g'        \
-			./src/goocanvas/src/goocanvaswidget.c \
-			./src/goocanvas/src/goocanvas.c \
-			./src/goocanvas/src/goocanvasatk.c \
-			|| die 'sed failed'
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	GNUCHESS="${GAMES_BINDIR}"/gnuchess \
-	egamesconf \
-		--disable-dependency-tracking \
-		--datarootdir="${GAMES_DATADIR}" \
-		--datadir="${GAMES_DATADIR}" \
-		--localedir=/usr/share/locale \
-		--infodir=/usr/share/info \
-		$(use_with python python "$(PYTHON -a)") \
-		$(use_enable debug) \
-		$(use_enable gnet) \
-		--enable-sqlite \
-		--enable-py-build-only
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	prepgamesdirs
-}