version bump

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27.8 i686

4 files changed, 223 insertions, 3 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/Manifest b/games-kids/gcompris/Manifest
index b9ff5ab81151..c2cba8ad90c7 100644
--- a/games-kids/gcompris/Manifest
+++ b/games-kids/gcompris/Manifest
@@ -1,8 +1,11 @@
 AUX gcompris-8.4.5-build.patch 5212 RMD160 286b2f45252715f604d25d70df3e752364881eee SHA1 888c0bc21665ba934ab276c7ae058ccafe963e37 SHA256 003d0d81ab28bf55f8d3cb8d1ca54cc318c987e6f468ccc823be70706342d806
 AUX gcompris-8.4.5-redhat.patch 509 RMD160 fe397f33eeb2a982fc4fd6e7b4a00e0c538e737b SHA1 aaa5e256ca820c0609a047e2f861e5d749474dd0 SHA256 af5925467eb2f2c3d7050ade5c997af2645a880408f5dd2bbd15f077c3071e35
+AUX gcompris-8.4.8-build.patch 5212 RMD160 286b2f45252715f604d25d70df3e752364881eee SHA1 888c0bc21665ba934ab276c7ae058ccafe963e37 SHA256 003d0d81ab28bf55f8d3cb8d1ca54cc318c987e6f468ccc823be70706342d806
 DIST gcompris-6.5.3.tar.gz 43519786 RMD160 7e17a5ad1c2a7f2236b6cf730a7eddadc38281be SHA1 0bcf89cac9c464fcd3cb2dc82b46f49d862f3c1f SHA256 78bc8932160ccd1db78d5431675034a3b0bbe695371276ca01fe6ae49d35ffa1
 DIST gcompris-8.4.5.tar.gz 87273887 RMD160 a367cbb2e099149483a043bda1ab300b8ab5e543 SHA1 50f8e1156907cbfdfa50be2fdc90754771eb6623 SHA256 f5ed7876271b8ba5892945ba6cf573210768d97c94327a39e7b6cc4dc9bd5e5d
+DIST gcompris-8.4.8.tar.gz 104137003 RMD160 7f56a6ef2d452c3f6c6d30919be559875d83876d SHA1 8281d9e7c4adadffba838e782c8002d93f685414 SHA256 967e13124037d42be83b4dd80edb9ffdb518eef86a0cd5f0541b529b8c480e21
 EBUILD gcompris-6.5.3-r1.ebuild 1577 RMD160 ceeb3585669cd63e0071b0f6ef6f92d545518cfa SHA1 fc9d05c639874978a6cf18881390a27162f4d9bc SHA256 7504452c3ad33d7d4d53f6ea945f5223d277e659ff50ba56e9b65472af4b92b7
 EBUILD gcompris-8.4.5.ebuild 1901 RMD160 c0fa4cf9f20dc1e5ef2d1f4b6c2c70817349dc24 SHA1 3a89a78be16def687e9a5e1378a1834f987fadc1 SHA256 f09451ce1dcf048189eed5a837699bed6d48feb1b74fd81aaeba73a99516f2d2
-MISC ChangeLog 6285 RMD160 9f8c50c962d1e093193372ded2973e81d183b7d9 SHA1 eaf18b03b20ff2cdaf5b43ebacaa5945a4029ceb SHA256 11e0ba455ba483fb41b7953418b8b25fca01a7ee5859dd3bdb3cd4269615d6bd
+EBUILD gcompris-8.4.8.ebuild 1890 RMD160 0bf05ac8d0bc971a5dff4ab7e2658f7b296ec1f5 SHA1 65a0310551fd583e8218d6c0aa0baba5f3c4c742 SHA256 81791529a981f6f05e9f63192867e024fc07f4e7ca81baad679d980e4f93b8aa
+MISC ChangeLog 6448 RMD160 a39cd582c451e99c03078ac14ee73228bb373118 SHA1 1280e98d81335d45d57c52bc52da77dbbc04168b SHA256 0063240af36b1c5c661f97a39fa64c528f8af2a2da59aa7090cf8f060814f390
 MISC metadata.xml 256 RMD160 570feef44e7d62ff41eb94fd83a54d9adcfe9a1d SHA1 2719c80bf2b8c87e73d7cd147cd617d8bb85c4d8 SHA256 4d42cbbf92befa58671d7062d6b3be70d9e72f5e24745f94b93f59bd74ae6254
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
+}