version bump

Package-Manager: portage-2.1.9.42/cvs/Linux i686

4 files changed, 226 insertions, 12 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/Manifest b/games-kids/gcompris/Manifest
index 0e5b5286e4e0..9e6d4c6a67ff 100644
--- a/games-kids/gcompris/Manifest
+++ b/games-kids/gcompris/Manifest
@@ -1,22 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gcompris-8.4.12-build.patch 9403 RMD160 c50b64ac6b24ac7747ab26650949693fb2f0c6a4 SHA1 97e557c716073e5392ce30a7719a25cd917e8793 SHA256 ab6796e44b9dfe6e6f80f11f2dce1deee5debf6011c3c5a82d2fdd80fc9901ac
 AUX gcompris-9.2.2-build.patch 5001 RMD160 0e8f39b8f6ff277fbebf556c8bc8a3225e9153a2 SHA1 7709aa163a9ec84eb8c128502b65fbb153e0fde8 SHA256 945c075efbb27ac641cf4446305bd642c9734df849af9e830c070fda36c96ba7
 AUX gcompris-9.2.2-gtk2.22.patch 454 RMD160 8384e61b014d8ba6e34df8e9365be804e75d029d SHA1 4ec93d010eb6e558a6a31d4ccf6cc984ec812ba5 SHA256 e72baa1d6753aba2d256f0b63f3effd84871f51ddb5f3b43899ff4b09c1fd439
 AUX gcompris-9.6-build.patch 5235 RMD160 358c9ea79a0f0af2ac8697c0509fb19af13734ef SHA1 e768c14c7fc6dd49fbe7b74a85a7e67f231166a4 SHA256 338690a62008395ce5855d76a2e7e77d22ca7166aabd5c1c05f217c1946dffcf
+AUX gcompris-9.6.1-build.patch 5235 RMD160 358c9ea79a0f0af2ac8697c0509fb19af13734ef SHA1 e768c14c7fc6dd49fbe7b74a85a7e67f231166a4 SHA256 338690a62008395ce5855d76a2e7e77d22ca7166aabd5c1c05f217c1946dffcf
 DIST gcompris-8.4.12.tar.gz 104355638 RMD160 f5d8129d4c37c97c1f15d0b7fb6865d3477b745e SHA1 55b6619d7e05fcfa0934c8564d8085d5aa880bbe SHA256 55025808dcb4afb3fa9ea8e232684e651da3ac2c673cb36592d6583ebec2d4c7
 DIST gcompris-9.2-2.tar.gz 123861044 RMD160 2c1571a7ad18f31f54f80b574e66d0e9dbe77ba4 SHA1 584b7b65de0278ebabf5ccebe3644c0575150337 SHA256 6390b56ad3f7394b81818ad2194c5e65bbd9626cb0c0d0e0838c15beb5c1bfc9
+DIST gcompris-9.6.1.tar.gz 145196483 RMD160 de8e3b530f97307fa6d745facf785204886b452d SHA1 b0a410ad87cdf087e5f238bcfc0ed87a0ce7ab5c SHA256 ffc3c127ff628c57f6a113bb1c568541bf4fc2f1e4242315d8a3fa7a5111f4e9
 DIST gcompris-9.6.tar.gz 145244612 RMD160 57c2848176bf4b4172f25a559ce7713383d7482e SHA1 275bc52512793bab00a09778176ca49087cd4098 SHA256 743f4a1afe3868460e8cb911644ba4c1c48ab882429299baca3d8b29a000705d
 EBUILD gcompris-8.4.12.ebuild 1859 RMD160 8ed7322a421d59b959ff10bbe3480eeaf678ae1c SHA1 21ad4dcec376068b79169a8c0f9e0dc6fee7e3d1 SHA256 529d0c6caeb0989fdf20ff3a25ed1bd716826722645e6dcfeb82160b20d47a7a
 EBUILD gcompris-9.2.2.ebuild 2647 RMD160 9100c3603592021b6b16209f68a271b467dda194 SHA1 2e98bf3193287f87016154e09790f139f41c3deb SHA256 6ecdc6f34007272208ed66b3323f8762f0e983dc1787363cfc67d68516821188
+EBUILD gcompris-9.6.1.ebuild 1989 RMD160 ea0f919e6531e3b4cf47705f2a6344b0de249299 SHA1 6c7ae5631851d8b8c45c02c0740dbcc8008e6b26 SHA256 627b4b15fb7505f4a2c48b56f90ad30421b434b95c91f9ad8e0907b40610c399
 EBUILD gcompris-9.6.ebuild 2085 RMD160 81704aa8792d5fc7f0332311e9aef01c46c0d554 SHA1 7558bf07493cb78da9f56d165d2a0f10e2bcb6ed SHA256 dc83e64a73c06f574bee8463086258b57e925f40f3f16fac87a3d4afe38d3d1a
-MISC ChangeLog 9194 RMD160 9fd537bca838ee7bc5858bdabd128e449357a8af SHA1 e4a8202c75480b9e69ec37e9314435e471d50d1e SHA256 5c7da845dac67d48f64c7fd6cef7c5d7967f3dec2ff03639c3fdbc74e9b17cf4
+MISC ChangeLog 9359 RMD160 4790d3bfd56fcbf885a3e15fa28514ae1383ac3a SHA1 0c0248a96b4cc33841a2231ca46611c1719d2d4a SHA256 c212dcf2076c9a70360ea7789de039f486e23253522b60f0706675302aae83ca
 MISC metadata.xml 256 RMD160 570feef44e7d62ff41eb94fd83a54d9adcfe9a1d SHA1 2719c80bf2b8c87e73d7cd147cd617d8bb85c4d8 SHA256 4d42cbbf92befa58671d7062d6b3be70d9e72f5e24745f94b93f59bd74ae6254
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk2Pj7cACgkQmWq1bYTyC0MnQwD/dogODwgv1BBECfMwrWYcAERX
-p2884WjdCcR2cRUndQ8BAJwZJvI9N8/iHiBuE78RbrST5IHX6H/dSj1D4dxIPPvP
-=TP2A
------END PGP SIGNATURE-----
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
+}