version bump

(Portage version: 2.1.6.4/cvs/Linux 2.6.27.8 i686)

3 files changed, 219 insertions, 2 deletions

diff --git a/games-kids/gcompris/ChangeLog b/games-kids/gcompris/ChangeLog
index 7f497fcb5422..5d7d0c5a5f46 100644
--- a/games-kids/gcompris/ChangeLog
+++ b/games-kids/gcompris/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-kids/gcompris
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.42 2008/08/04 15:28:55 mr_bones_ Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.43 2009/01/05 23:36:06 mr_bones_ Exp $
+
+*gcompris-8.4.8 (05 Jan 2009)
+
+  05 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/gcompris-8.4.8-build.patch, +gcompris-8.4.8.ebuild:
+  version bump
 
   04 Aug 2008; Michael Sterrett <mr_bones_@gentoo.org>
   gcompris-8.4.5.ebuild:
diff --git a/games-kids/gcompris/files/gcompris-8.4.8-build.patch b/games-kids/gcompris/files/gcompris-8.4.8-build.patch
new file mode 100644
index 000000000000..b7e8f4f7fb6c
--- /dev/null
+++ b/games-kids/gcompris/files/gcompris-8.4.8-build.patch
@@ -0,0 +1,132 @@
+diff -Ndur gcompris-8.3.3.orig/configure.in gcompris-8.3.3.patched/configure.in
+--- gcompris-8.3.3.orig/configure.in	2007-08-16 01:09:34.000000000 +0200
++++ gcompris-8.3.3.patched/configure.in	2007-08-22 07:51:31.000000000 +0200
+@@ -258,10 +258,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])
+@@ -330,25 +328,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 -Ndur gcompris-8.3.3.orig/docs/C/Makefile.am gcompris-8.3.3.patched/docs/C/Makefile.am
+--- gcompris-8.3.3.orig/docs/C/Makefile.am	2007-06-17 21:23:54.000000000 +0200
++++ gcompris-8.3.3.patched/docs/C/Makefile.am	2007-08-22 07:35:21.000000000 +0200
+@@ -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 -Ndur gcompris-8.3.3.orig/docs/eu/Makefile.am gcompris-8.3.3.patched/docs/eu/Makefile.am
+--- gcompris-8.3.3.orig/docs/eu/Makefile.am	2007-06-17 21:23:55.000000000 +0200
++++ gcompris-8.3.3.patched/docs/eu/Makefile.am	2007-08-22 07:35:21.000000000 +0200
+@@ -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 -Ndur gcompris-8.3.3.orig/docs/fr/Makefile.am gcompris-8.3.3.patched/docs/fr/Makefile.am
+--- gcompris-8.3.3.orig/docs/fr/Makefile.am	2007-06-17 21:23:55.000000000 +0200
++++ gcompris-8.3.3.patched/docs/fr/Makefile.am	2007-08-22 07:35:21.000000000 +0200
+@@ -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 -Ndur gcompris-8.3.3.orig/Makefile.am gcompris-8.3.3.patched/Makefile.am
+--- gcompris-8.3.3.orig/Makefile.am	2007-06-17 21:27:17.000000000 +0200
++++ gcompris-8.3.3.patched/Makefile.am	2007-08-22 07:59:08.000000000 +0200
+@@ -17,7 +17,7 @@
+ endif
+ 
+ 
+-icondir=$(datadir)/pixmaps
++icondir=/usr/share/pixmaps
+ icon_DATA = gcompris.png gcompris-edit.png
+ 
+ if BUILD_MINGW32
+@@ -29,12 +29,10 @@
+ Menu_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
+ 
+-Menudir=$(prefix)/lib/menu
+-Menu_DATA=gcompris
+ endif
+ 
+ @INTLTOOL_DESKTOP_RULE@
+diff -Ndur gcompris-8.3.3.orig/po/Makefile.in.in gcompris-8.3.3.patched/po/Makefile.in.in
+--- gcompris-8.3.3.orig/po/Makefile.in.in	2007-03-05 11:52:19.000000000 +0100
++++ gcompris-8.3.3.patched/po/Makefile.in.in	2007-08-22 07:35:21.000000000 +0200
+@@ -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 -Ndur gcompris-8.3.3.orig/src/gcompris/gcompris.c gcompris-8.3.3.patched/src/gcompris/gcompris.c
+--- gcompris-8.3.3.orig/src/gcompris/gcompris.c	2007-06-19 00:19:49.000000000 +0200
++++ gcompris-8.3.3.patched/src/gcompris/gcompris.c	2007-08-22 07:35:21.000000000 +0200
+@@ -1120,7 +1120,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/gcompris-8.4.8.ebuild b/games-kids/gcompris/gcompris-8.4.8.ebuild
new file mode 100644
index 000000000000..cad0474f2510
--- /dev/null
+++ b/games-kids/gcompris/gcompris-8.4.8.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-8.4.8.ebuild,v 1.1 2009/01/05 23:36:06 mr_bones_ 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-2"
+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
+	>=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/gnome-python
+		dev-python/pygtk
+		dev-python/pyxml
+		dev-python/pysqlite:2
+	)
+	sqlite? ( dev-db/sqlite:3 )"
+DEPEND="${RDEPEND}
+	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() {
+	python_version
+	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 /usr/bin/python${PYVER}) \
+		$(use_enable debug) \
+		$(use_enable gnet) \
+		$(use_enable sqlite) \
+		|| die
+}
+
+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
+}