version bump

(Portage version: 2.1.9.42/cvs/Linux i686)

3 files changed, 222 insertions, 1 deletions

diff --git a/games-kids/gcompris/ChangeLog b/games-kids/gcompris/ChangeLog
index 0a8ce547aa7d..2ecc0b1b7b50 100644
--- a/games-kids/gcompris/ChangeLog
+++ b/games-kids/gcompris/ChangeLog
@@ -1,6 +1,12 @@
 # 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.61 2011/03/27 19:28:22 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.62 2011/04/14 20:35:57 mr_bones_ Exp $
+
+*gcompris-9.6.1 (14 Apr 2011)
+
+  14 Apr 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  +gcompris-9.6.1.ebuild, +files/gcompris-9.6.1-build.patch:
+  version bump
 
   27 Mar 2011; Christoph Mende <angelos@gentoo.org> gcompris-9.6.ebuild:
   Stable on amd64 wrt bug #360727
diff --git a/games-kids/gcompris/files/gcompris-9.6.1-build.patch b/games-kids/gcompris/files/gcompris-9.6.1-build.patch
new file mode 100644
index 000000000000..fe3ef6abc581
--- /dev/null
+++ b/games-kids/gcompris/files/gcompris-9.6.1-build.patch
@@ -0,0 +1,130 @@
+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
+@@ -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-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
+@@ -203,10 +203,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 -O2"
+ fi
++CFLAGS="$CFLAGS $OSX_CFLAGS -Wall"
+ 
+ dnl disable activation code
+ AC_ARG_ENABLE(disable-activation-code,
+@@ -337,28 +335,28 @@
+   fi
+ else
+   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 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
+   AC_DEFINE_UNQUOTED(SYSTEM_CONFIG_DIR, "/etc", [System GCompris config directory])
+ 
+   dnl Test for gnuchess
+-  AC_PATH_PROGS(GNUCHESS, gnuchess gnome-gnuchess, no, [/usr/bin:/usr/games:/usr/local/bin:$PATH])
++  AC_PATH_PROGS(GNUCHESS, gnuchess gnome-gnuchess, no, [/usr/games/bin:/usr/bin:/usr/games:/usr/local/bin:$PATH])
+   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
+@@ -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-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
+@@ -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-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
+@@ -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-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
+@@ -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-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
+@@ -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",
+ 							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/gcompris-9.6.1.ebuild b/games-kids/gcompris/gcompris-9.6.1.ebuild
new file mode 100644
index 000000000000..dfefe55e1766
--- /dev/null
+++ b/games-kids/gcompris/gcompris-9.6.1.ebuild
@@ -0,0 +1,85 @@
+# 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.1.ebuild,v 1.1 2011/04/14 20:35:57 mr_bones_ Exp $
+
+EAPI=2
+
+PYTHON_DEPEND="python? 2:2.6"
+PYTHON_USE_WITH_OPT="python"
+PYTHON_USE_WITH="sqlite threads"
+
+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="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-alsa
+	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"
+
+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
+	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 \
+		$(use_with python python "$(PYTHON -a)") \
+		$(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"
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+	prepgamesdirs
+}