version bump (bug #445051)

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

4 files changed, 215 insertions, 16 deletions

diff --git a/games-kids/gcompris/ChangeLog b/games-kids/gcompris/ChangeLog
index 2203f67e5a4a..6e9ed45c513c 100644
--- a/games-kids/gcompris/ChangeLog
+++ b/games-kids/gcompris/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-kids/gcompris
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.86 2012/11/07 20:14:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.87 2012/11/29 20:01:19 mr_bones_ Exp $
+
+*gcompris-12.11 (29 Nov 2012)
+
+  29 Nov 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/gcompris-12.11-build.patch, +gcompris-12.11.ebuild:
+  version bump (bug #445051)
 
   07 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   gcompris-12.05.ebuild:
diff --git a/games-kids/gcompris/Manifest b/games-kids/gcompris/Manifest
index cfc54b0da182..48020a4c6b63 100644
--- a/games-kids/gcompris/Manifest
+++ b/games-kids/gcompris/Manifest
@@ -1,19 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gcompris-12.05-build.patch 4273 SHA256 b863a732cbf5bd3f026c1e0ae3fd58000f79549edf5f27f0de106160b0890c27 SHA512 42e95d83871b2e9ce8f47eccdf501d1af587306162115efa1f0bf35a61f29b8e00d308a94bcae0794ea75f7ab019a9a83d9edb02cc56ff506f8ab703bd346136 WHIRLPOOL d5163900398670a5f40da489b6475f3567d0cb703584d7a5a7802d61cf733f3dc481815f50b652e221ab4badd8e9c68e3009c8fa38b91575d41a16f78fffc6db
+AUX gcompris-12.11-build.patch 4287 SHA256 5dc68273de5a8a998d39c70110a80bea2870b941f133c86f8323dc19c09f3dd9 SHA512 54564c502b29f955b406e2652335d72a8fd6162ab0837a9f29cfe01c60583a87a1ec53e325ed7a70a7d1538413d01aa5d6336d00ad6b1a9b6897cae0edddba44 WHIRLPOOL 7f20d717a777c62fdb5f790356d0f8a8c183f9496fee350000ad1310b98b738ff71eff8c8d4b17b3cccd7874f79277e9da93f84c2a7bd3e24bba4feea8ce964b
 DIST gcompris-12.05.tar.bz2 152545527 SHA256 a4e9b9d04fd405c4b9ddc30f84a5f521f7ad1966c5f66c3e873bb84269ef55d0 SHA512 65ecc6746e02adcc7158dff61f236b5b776a0032bb9c30d24cc41388f242f59a98d5e14c41aa27299c711ebf1569323b846a648ccb5e5b64c58440dac3fee77a WHIRLPOOL cc0ba912efbfd4be5dbb7125bf4594b7270715bfea15b0e20ee7697acb84876741931f167c53c9d4b822480662f405c77f045c199084733164da1275789b2e4a
+DIST gcompris-12.11.tar.bz2 167528452 SHA256 97b688497963cc907e3d91f844483fb006a07b22010528dafb09ae5380523b20 SHA512 f60e9c3a5e4d781fb550b628d46f6af582a1a7de67271699b6f2abdc905250efca31d444b4cf3aa63044f7183fc8139d68849850738098d766bf5ff3fcc08916 WHIRLPOOL 9a0888b510dd5f23864f30fd1eb10ab8c140ce75f745c5705a28a72d41780259e726c74183e828fd6a04ad4caf3321ae7afc0322909e03a6b8b1a7faf93a329b
 EBUILD gcompris-12.05.ebuild 2374 SHA256 54beb23fd955d2330c286796cf97181e22e31c4cdae2c4ad656539a6e5cfc4e0 SHA512 eeab1f03330164114772959b33f79ccd42357e1d35cf27b59a6ff60c13e33cdfcdde1f15df2b06e72520911f5c1aaf3fac952cb990780ce74a651c1e8ea8fd63 WHIRLPOOL 3a92b0a2b7ff2de561e67ad00cf5a7f1c768a106762c50b2c176f1bd5b7e57982049591e69230efe9321a4fb7eedd33ae70fad32d190a5ca28cebcda16cd2980
-MISC ChangeLog 12816 SHA256 6297ea241010238b26e97bb7758ba37c20148b32a80edb03cd657efd4b0f664e SHA512 5245f3ef97f2b312a23a834cba729a21a4a00ecd8b0aa797292a85141b04f313a84e99679a45fdeb20482a4583c531c365eed958c4725710881818bd9cda7b4d WHIRLPOOL cfc855e488a708fe307032c78c118a76dbc001445741a825ccfeefd309fa62b26aaf49406baa0136c325fdae4ae5a531b38a52959d2e5499aed421610792bc24
+EBUILD gcompris-12.11.ebuild 2296 SHA256 93a712d1801f08f6956e56448c4c900df32a43999485c48ffe1cec53d3be6f1b SHA512 d3be9d74ad70665d2c580a9383927d5f770910bcbb90b7cebe9941cce2aea4fab0c90b2c4cd7bee66961115770ebeafec55688579221be0cfcc46b667e7ecc9f WHIRLPOOL 5bbeca5b8422104dc717085520c1d6ad7bdd2b3c0eccaf8e38c0605d8e0459052ec25de27ff2db7323f9677018b2ebbbc0d7d842b6a6e4f9a5d83578692059e1
+MISC ChangeLog 12993 SHA256 eb8fbce4e611fe8cb023da64c3e4c211490b82f983037e2bde3acd5acf73997b SHA512 d264e00b7a4b6a380cd5da54e06a8577697ff7ebc967b009b746fafcd5904d72554e31ef53eebedf5f7df3572536ea8c3e00bf831caefca55625b9b49659233c WHIRLPOOL 11ee9bfe0296192ba388a454986ce723e562081ec65c561f310acfd56ff0c7bc722bad6b654bd4fe12859e4370111a09f2a5a529cc9047e5d85630153015d106
 MISC metadata.xml 256 SHA256 4d42cbbf92befa58671d7062d6b3be70d9e72f5e24745f94b93f59bd74ae6254 SHA512 75b73342197d34f6a4b77728ceb8371062b6808b3d9c8a2b6500fe000b04155b722c5dbddcbc1f14d48d07ae2454cb1c0934cb7628db0d7db3ac2eebf12a3421 WHIRLPOOL f3f15efa43561035966de1a90e156ee4ab7de13f601b193e30db57b64dbd6bbb05441a7a5407ca957c62f909b5565c1bb777ed88a1550eac71ce17a1d0f316f2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQmsE8AAoJEJ0WA1zPCt1hi2oH/RNwdXzHf4nEgA4MqdmF1qM4
-lsB1y8B+Xu17TmrZR7xkqMinbYAhJ3uUDXgEya9iXHkuff5I1ldB7I/SumU49Zgf
-Vmf/nFaEZ9h/NiDHlk/Xx1GRoZj7oAUXgg4FavSpTcFJo75MTeAmzJv1n2PEmS+x
-PIggNTXSGWWbTiZtA7YleorUcTLll91B5HKBzztL/mREv7MjjlPlUx5bpvqPgg9A
-WfkxG1z5nvh6J3/SWXyga8CMkYjwh4WJpaJ5ZHMeVZhMQ7qqQIXl+HW4HzPEBVcZ
-4TwZqWlbAwOcZJVKfhXliaFaDZYVCj4aOiiDFhtjy0Gjzdb2IifYScup8cv4Z4k=
-=uPRh
------END PGP SIGNATURE-----
diff --git a/games-kids/gcompris/files/gcompris-12.11-build.patch b/games-kids/gcompris/files/gcompris-12.11-build.patch
new file mode 100644
index 000000000000..02432de06474
--- /dev/null
+++ b/games-kids/gcompris/files/gcompris-12.11-build.patch
@@ -0,0 +1,107 @@
+diff -ru gcompris-12.11.orig/Makefile.am gcompris-12.11/Makefile.am
+--- gcompris-12.11.orig/Makefile.am	2012-05-29 13:39:35.000000000 -0400
++++ gcompris-12.11/Makefile.am	2012-11-28 15:13:10.438931729 -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-12.11.orig/configure.ac gcompris-12.11/configure.ac
+--- gcompris-12.11.orig/configure.ac	2012-11-18 11:18:29.000000000 -0500
++++ gcompris-12.11/configure.ac	2012-11-28 15:16:34.904426137 -0500
+@@ -204,10 +204,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 -g"
+-else
+-    CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -O2"
+ fi
++CFLAGS="$CFLAGS $OSX_CFLAGS -Wall"
+ 
+ dnl disable activation code
+ AC_ARG_ENABLE(disable-activation-code,
+@@ -345,21 +343,21 @@
+   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
+@@ -367,7 +365,7 @@
+ 
+   dnl Test for gnuchess
+   if test x$build_gnuchess = xno; then
+-    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])
+   else
+     GNUCHESS="gcompris-gnuchess"
+   fi
+diff -ru gcompris-12.11.orig/docs/C/Makefile.am gcompris-12.11/docs/C/Makefile.am
+--- gcompris-12.11.orig/docs/C/Makefile.am	2012-09-16 09:25:23.000000000 -0400
++++ gcompris-12.11/docs/C/Makefile.am	2012-11-28 15:17:02.551410995 -0500
+@@ -6,7 +6,7 @@
+ 
+ EXTRA_DIST = $(man_MANS)
+ 
+-gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/C
++gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/C
+ 
+ # Info documentation is outdated and useless
+ #all: $(doc)
+diff -ru gcompris-12.11.orig/docs/fr/Makefile.am gcompris-12.11/docs/fr/Makefile.am
+--- gcompris-12.11.orig/docs/fr/Makefile.am	2012-09-16 09:25:23.000000000 -0400
++++ gcompris-12.11/docs/fr/Makefile.am	2012-11-28 15:17:19.767778814 -0500
+@@ -6,7 +6,7 @@
+ #EXTRA_DIST = topic.dat \
+ #	     gcompris.texi
+ 
+-gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/fr
++gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/fr
+ 
+ #all: $(doc)
+ 
+diff -ru gcompris-12.11.orig/src/gcompris/gcompris.c gcompris-12.11/src/gcompris/gcompris.c
+--- gcompris-12.11.orig/src/gcompris/gcompris.c	2012-10-26 19:24:09.000000000 -0400
++++ gcompris-12.11/src/gcompris/gcompris.c	2012-11-28 15:18:48.644514899 -0500
+@@ -1322,7 +1322,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-12.11.ebuild b/games-kids/gcompris/gcompris-12.11.ebuild
new file mode 100644
index 000000000000..1596b7eef1d4
--- /dev/null
+++ b/games-kids/gcompris/gcompris-12.11.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-12.11.ebuild,v 1.1 2012/11/29 20:01:19 mr_bones_ Exp $
+
+EAPI=5
+PYTHON_DEPEND="2:2.6"
+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.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gstreamer"
+
+RDEPEND="x11-libs/gtk+:2
+	gnome-base/librsvg[gtk]
+	gstreamer? (
+		media-libs/gstreamer:0.10
+		media-libs/gst-plugins-good:0.10
+		media-plugins/gst-plugins-ogg:0.10
+		media-plugins/gst-plugins-alsa:0.10
+		media-plugins/gst-plugins-vorbis:0.10 )
+	!gstreamer? (
+		media-libs/sdl-mixer
+		media-libs/libsdl )
+	dev-libs/libxml2
+	dev-libs/popt
+	virtual/libintl
+	games-board/gnuchess
+	dev-db/sqlite:3
+	dev-python/pygtk"
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	dev-perl/XML-Parser
+	sys-devel/gettext
+	sys-apps/texinfo
+	app-text/texi2html
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	media-gfx/tuxpaint
+	sci-electronics/gnucap"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+	games_pkg_setup
+}
+
+src_prepare() {
+	# Drop DEPRECATED flags, bug #387817
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+		src/gcompris/Makefile.am src/gcompris/Makefile.in \
+		src/goocanvas/src/Makefile.am src/goocanvas/src/Makefile.in \
+		|| die
+
+	epatch "${FILESDIR}"/${P}-build.patch
+	cp /usr/share/gettext/config.rpath .
+	eautoreconf
+	sed -i \
+		-e 's#^itlocaledir =.*$#itlocaledir = @localedir@#' \
+		po/Makefile.in.in || die
+
+	# Fix desktop files
+	sed -i \
+		-e '/Encoding/d' \
+		gcompris.desktop.in \
+		gcompris-edit.desktop.in || die
+}
+
+src_configure() {
+	GNUCHESS="${GAMES_BINDIR}"/gnuchess \
+	egamesconf \
+		--datarootdir="${GAMES_DATADIR}" \
+		--datadir="${GAMES_DATADIR}" \
+		--localedir=/usr/share/locale \
+		--infodir=/usr/share/info \
+		--with-python="$(PYTHON -a)" \
+		$(use_enable !gstreamer sdlmixer) \
+		--enable-sqlite \
+		--enable-py-build-only
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	prune_libtool_files --modules
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+	prepgamesdirs
+}