version bump - build patch update from Denis Dupeyron (bug #190541)

Package-Manager: portage-2.1.3.9

5 files changed, 230 insertions, 5 deletions

diff --git a/games-kids/gcompris/ChangeLog b/games-kids/gcompris/ChangeLog
index bf5d6a1ffeaf..337661c064e8 100644
--- a/games-kids/gcompris/ChangeLog
+++ b/games-kids/gcompris/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-kids/gcompris
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.33 2007/03/10 10:54:19 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.34 2007/10/08 00:46:01 mr_bones_ Exp $
+
+*gcompris-8.4 (08 Oct 2007)
+
+  08 Oct 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/gcompris-8.4-build.patch, +gcompris-8.4.ebuild:
+  version bump - build patch update from Denis Dupeyron (bug #190541)
 
 *gcompris-8.2.2 (10 Mar 2007)
 
diff --git a/games-kids/gcompris/Manifest b/games-kids/gcompris/Manifest
index b35575fafc01..fff458e1a944 100644
--- a/games-kids/gcompris/Manifest
+++ b/games-kids/gcompris/Manifest
@@ -2,8 +2,13 @@ AUX gcompris-8.2.2-build.patch 4019 RMD160 09da5c67e43685da0e8b5021fd8f54016fdcf
 MD5 83735d47a6bfcc6bd648f0b268becefd files/gcompris-8.2.2-build.patch 4019
 RMD160 09da5c67e43685da0e8b5021fd8f54016fdcf330 files/gcompris-8.2.2-build.patch 4019
 SHA256 3e40b4e5ae11fa036285b2107e4b48045e70e5abc11a60a17fd2d5e24793e29b files/gcompris-8.2.2-build.patch 4019
+AUX gcompris-8.4-build.patch 5212 RMD160 286b2f45252715f604d25d70df3e752364881eee SHA1 888c0bc21665ba934ab276c7ae058ccafe963e37 SHA256 003d0d81ab28bf55f8d3cb8d1ca54cc318c987e6f468ccc823be70706342d806
+MD5 82974cac3dede17c6cf1278e5b4bbd91 files/gcompris-8.4-build.patch 5212
+RMD160 286b2f45252715f604d25d70df3e752364881eee files/gcompris-8.4-build.patch 5212
+SHA256 003d0d81ab28bf55f8d3cb8d1ca54cc318c987e6f468ccc823be70706342d806 files/gcompris-8.4-build.patch 5212
 DIST gcompris-6.5.3.tar.gz 43519786 RMD160 7e17a5ad1c2a7f2236b6cf730a7eddadc38281be SHA1 0bcf89cac9c464fcd3cb2dc82b46f49d862f3c1f SHA256 78bc8932160ccd1db78d5431675034a3b0bbe695371276ca01fe6ae49d35ffa1
 DIST gcompris-8.2.2.tar.gz 79037459 RMD160 5baf13fe72dd7810e3da160ea4ccaa37912dc092 SHA1 26cf33262311c292df5931a1d15fe4c06709d7b8 SHA256 4d5e6fc993ef0be753782c0fc0b35277e8369d25db83108db313437b55cea44d
+DIST gcompris-8.4.tar.gz 80870841 RMD160 60912fbcdf0bb4bcc8f57533a42a46307e307db5 SHA1 e05e28be3f4be6e2d6a075ed19b86e82cf872d26 SHA256 121697ba5a3f152c4ea5ba1a1e151b771186992245e45c93821c8401d909be06
 EBUILD gcompris-6.5.3-r1.ebuild 1575 RMD160 ef05347516707c5d09799b2983d87e7bbb9a2504 SHA1 b0dc633672cb3376b543d126e24878c4eef9d288 SHA256 e00f7e39ccc7872fd6c9c93589d6640f9dba0503d262be323530464404fabc96
 MD5 958932f039845f5b9391681f170cea6c gcompris-6.5.3-r1.ebuild 1575
 RMD160 ef05347516707c5d09799b2983d87e7bbb9a2504 gcompris-6.5.3-r1.ebuild 1575
@@ -12,10 +17,14 @@ EBUILD gcompris-8.2.2.ebuild 1608 RMD160 4da6b1ba68cd9f1e38e93a7e63dd6c28df38e98
 MD5 c5c6b3c13a64ed798749b6acfdd079e6 gcompris-8.2.2.ebuild 1608
 RMD160 4da6b1ba68cd9f1e38e93a7e63dd6c28df38e981 gcompris-8.2.2.ebuild 1608
 SHA256 d1aaf2675deff5d13983bfa5ce28448262d37d4d7bfe2bf4c6910ea33c895733 gcompris-8.2.2.ebuild 1608
-MISC ChangeLog 4824 RMD160 e468a9fdda4829ae2212feaec02db70a86b586b0 SHA1 11d6dc6b1b58ceaf89aaa95c6cadf3c139aa9e1f SHA256 411c1028fc9b04e0ce9fdb5bcf9803abf6393d05571b3ef326e3001057bcd0cb
-MD5 b4b5476c074d0bddc6e94cd778db9f02 ChangeLog 4824
-RMD160 e468a9fdda4829ae2212feaec02db70a86b586b0 ChangeLog 4824
-SHA256 411c1028fc9b04e0ce9fdb5bcf9803abf6393d05571b3ef326e3001057bcd0cb ChangeLog 4824
+EBUILD gcompris-8.4.ebuild 1755 RMD160 55c3b52d70f12ce065d00b06be956d12b9e6c47d SHA1 5fb69acf96e803a60352dbdaa3f28c51176e4398 SHA256 ccbe2db48b6e798040c7cefbf36cb51c0093a3bbee4041e26855a56860da94f4
+MD5 8b29e72041eccd25629afd55409f7057 gcompris-8.4.ebuild 1755
+RMD160 55c3b52d70f12ce065d00b06be956d12b9e6c47d gcompris-8.4.ebuild 1755
+SHA256 ccbe2db48b6e798040c7cefbf36cb51c0093a3bbee4041e26855a56860da94f4 gcompris-8.4.ebuild 1755
+MISC ChangeLog 5041 RMD160 7d7df3114b01fdbd62d8e637e4a7f97c59f50a0b SHA1 3a6c0cd87b63623a5abe198743f950db28ac3a25 SHA256 b87d423661e1aacf23921e29ebe05bb63109c7e715bc4db25945cb2a3a9e97e8
+MD5 534cdaa95ddbad9a274f16f00feb219f ChangeLog 5041
+RMD160 7d7df3114b01fdbd62d8e637e4a7f97c59f50a0b ChangeLog 5041
+SHA256 b87d423661e1aacf23921e29ebe05bb63109c7e715bc4db25945cb2a3a9e97e8 ChangeLog 5041
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -26,3 +35,6 @@ SHA256 8b740648bc2fa23cf97996558d05b7dc8f152c64e872fbc0dfb3c6f3bb7da5d9 files/di
 MD5 b9ba3ed48c01bfda2787a4d13fde95f6 files/digest-gcompris-8.2.2 250
 RMD160 e3fe2ded9a0c2433156c4edf07f3136070c9f771 files/digest-gcompris-8.2.2 250
 SHA256 5558936b86573c2da6e5346cca7e3d75ee094894b2b853bbba7ea2cd08629d5e files/digest-gcompris-8.2.2 250
+MD5 c75c5318a3fb43462f654f44cd01d8e8 files/digest-gcompris-8.4 244
+RMD160 0354ed3354174c2324d7db1f119445c0e855a0c9 files/digest-gcompris-8.4 244
+SHA256 9f1b65fe2360d6c02fb530ea40cdee46a1ecf1f8dd57d065bcbf28ed9d4aad94 files/digest-gcompris-8.4 244
diff --git a/games-kids/gcompris/files/digest-gcompris-8.4 b/games-kids/gcompris/files/digest-gcompris-8.4
new file mode 100644
index 000000000000..561dd89e90a3
--- /dev/null
+++ b/games-kids/gcompris/files/digest-gcompris-8.4
@@ -0,0 +1,3 @@
+MD5 33e5882945f43232953478c93eacf0e6 gcompris-8.4.tar.gz 80870841
+RMD160 60912fbcdf0bb4bcc8f57533a42a46307e307db5 gcompris-8.4.tar.gz 80870841
+SHA256 121697ba5a3f152c4ea5ba1a1e151b771186992245e45c93821c8401d909be06 gcompris-8.4.tar.gz 80870841
diff --git a/games-kids/gcompris/files/gcompris-8.4-build.patch b/games-kids/gcompris/files/gcompris-8.4-build.patch
new file mode 100644
index 000000000000..b7e8f4f7fb6c
--- /dev/null
+++ b/games-kids/gcompris/files/gcompris-8.4-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.ebuild b/games-kids/gcompris/gcompris-8.4.ebuild
new file mode 100644
index 000000000000..bf923cb4a931
--- /dev/null
+++ b/games-kids/gcompris/gcompris-8.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-8.4.ebuild,v 1.1 2007/10/08 00:46:01 mr_bones_ Exp $
+
+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*
+	>=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-python/gnome-python
+		dev-python/pygtk
+		dev-python/pyxml
+		>=dev-python/pysqlite-2
+	)
+	sqlite? ( dev-db/sqlite )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	sys-apps/texinfo
+	app-text/texi2html
+	dev-util/pkgconfig"
+RDEPEND="${RDEPEND}
+	media-gfx/tuxpaint
+	sci-electronics/gnucap"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.patch
+	cp /usr/share/gettext/config.rpath .
+	eautoreconf
+}
+
+src_compile() {
+	python_version
+	GNUCHESS="${GAMES_BINDIR}"/gnuchess \
+	egamesconf \
+		--datarootdir="${GAMES_DATADIR}" \
+		--datadir="${GAMES_DATADIR}" \
+		--localedir=/usr/share/locale \
+		--infodir=/usr/share/info \
+		--disable-dependency-tracking \
+		--enable-xf86vidmode \
+		--disable-cairo \
+		$(use_with python python /usr/bin/python${PYVER}) \
+		$(use_enable debug) \
+		$(use_enable gnet) \
+		$(use_enable sqlite) \
+		|| die
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+	prepgamesdirs
+}