version bump

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

4 files changed, 191 insertions, 16 deletions

diff --git a/games-kids/gcompris/ChangeLog b/games-kids/gcompris/ChangeLog
index 2db5908da3db..82236ebb4a48 100644
--- a/games-kids/gcompris/ChangeLog
+++ b/games-kids/gcompris/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-kids/gcompris
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.95 2013/10/26 20:49:32 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.96 2013/11/12 16:26:08 mr_bones_ Exp $
+
+*gcompris-13.11 (12 Nov 2013)
+
+  12 Nov 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/gcompris-13.11-build.patch, +gcompris-13.11.ebuild:
+  version bump
 
 *gcompris-12.11-r1 (26 Oct 2013)
 
diff --git a/games-kids/gcompris/Manifest b/games-kids/gcompris/Manifest
index 1db74cf3ab9f..f4063f31ae65 100644
--- a/games-kids/gcompris/Manifest
+++ b/games-kids/gcompris/Manifest
@@ -1,21 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gcompris-12.11-build.patch 4287 SHA256 5dc68273de5a8a998d39c70110a80bea2870b941f133c86f8323dc19c09f3dd9 SHA512 54564c502b29f955b406e2652335d72a8fd6162ab0837a9f29cfe01c60583a87a1ec53e325ed7a70a7d1538413d01aa5d6336d00ad6b1a9b6897cae0edddba44 WHIRLPOOL 7f20d717a777c62fdb5f790356d0f8a8c183f9496fee350000ad1310b98b738ff71eff8c8d4b17b3cccd7874f79277e9da93f84c2a7bd3e24bba4feea8ce964b
 AUX gcompris-12.11-underlinking.patch 444 SHA256 734387cb438ab31d6735cec3718c7249c58e5906f588b113efa92a22ec8745c8 SHA512 a051ad5775d417804ca47885a6d0d07f11e053afcc670c8d4c75e37841ace308bfb54772ac6399e2b8cc84000c26a294e40aef97c7f0123a451dd48a22e52138 WHIRLPOOL 7ba523ccbd6f6544842b24f33ad563b85e543070bd004936a4ddc836201ee824e2cd49466ae3019c34ba8a5fc8a3c5893afc0e7a6f24bc3f83c67de291cc14c0
+AUX gcompris-13.11-build.patch 3270 SHA256 0b76fe744a8f5b3cd25a504ca4168268a295c623ae6b73424b977bf5dce8cc9a SHA512 01d1027a831950f903a30e7f31c6b3a79bd4e8fd5ad35252f9809e74d6f8a2b504c2d770bf332d0ba16937e926e1e410188e31c61d78cfc6c904b9e7c5ff48d4 WHIRLPOOL cf0c1f8b9edcc86c5d613ae022fed7da58d402a42e5b5f49b864f149a4e24192720c02e5a83f6ebee3a75b9b317e3ab828f2759b2ba4b7fa803454e090ffbfea
 DIST gcompris-12.11.tar.bz2 167528452 SHA256 97b688497963cc907e3d91f844483fb006a07b22010528dafb09ae5380523b20 SHA512 f60e9c3a5e4d781fb550b628d46f6af582a1a7de67271699b6f2abdc905250efca31d444b4cf3aa63044f7183fc8139d68849850738098d766bf5ff3fcc08916 WHIRLPOOL 9a0888b510dd5f23864f30fd1eb10ab8c140ce75f745c5705a28a72d41780259e726c74183e828fd6a04ad4caf3321ae7afc0322909e03a6b8b1a7faf93a329b
+DIST gcompris-13.11.tar.bz2 264431313 SHA256 418dad2c8f0fc90e16e97ab67b6700e3af5f33ae05d83f28f3b1117183f88c57 SHA512 c74abb948559944cb8552ee8d3f760d598b04e9962f3650fb356775df568a27f5f9436fec9fc1348af1d0802434337494a0be909ffc7adfa6873e74dcbc9cbee WHIRLPOOL d25e3d3e4504e05a43ec95457c7ac6a194738e07339c9372619f76332aefa2efc9d82e2d3583cb72e113a2f3126bca96655fc0f62a61ce86133c66a9a8405bf0
 EBUILD gcompris-12.11-r1.ebuild 2401 SHA256 f84b70f544617bb546151123f989990a9d2b27bd615fd19a52193387a20d1073 SHA512 e9dff727cca671bc077b2849c55ae37a9b3e2241bcae1ed5be981303309917ada44c55d6e00c85586141910df01ea485bcc2fb35ce226037d9ea6ed2239de673 WHIRLPOOL 89e0f3845e0ae27703b8cf4413463403e7bf3dc82834a035ecfc90a1a212d59c13413b8ba01b36475fca03dbcf0f0bbfb19440c3679f9c407c42ab9e53470228
 EBUILD gcompris-12.11.ebuild 2336 SHA256 dba0f72fa03e9d592bcd6ddf7642548fc267aed890661b335e91993c8e8e2700 SHA512 e3dcc9ab7f135d4c471e57e7fdfdf4fe1b6e27ecbe4f7024d96084671491b3d9e75d1c774c3ecbc45f9d9df8bf369f26fb800ae800e9eeded9b8cdf651943e62 WHIRLPOOL cc43e8c1184689575d8e9011b38c65975888bcf542ca9b4838166e3e190d67c05d678533b6e763ea964fd36c7670a4c3a6e40bdd24482b1a9e21271ae19197ec
-MISC ChangeLog 13929 SHA256 4a15594da1affc2f7c8f6ca8de01aa5403d8ef4fbd5f935bac939bd37efc8a76 SHA512 4626f6c3417fe0c8b0d008b57bcb6849b113f96d38e42743d13cc8c6f06efcc46ae3f99eeb0e4eaecf9cd8b338b2d51fae3ba3db4f9cba741df2fb01e3a78e21 WHIRLPOOL d62260181774b657e2c3a46895786eb7a099f928a5f33e86ce45bec79ae21ea42aa617733b00eecbda68ceb6d15af3b890549b30e350eed34c536fc87447c556
+EBUILD gcompris-13.11.ebuild 2344 SHA256 473bfa00bcd2c60ad62e16576f7c03206ae53bdf844a3f02386cda96009d93bb SHA512 e6155c6c423884811439292cbeb6e5d28081b0b0093800e8b17a479f19b0698f4427c10303cef344f7e6337cead06b3f94afdfa40f98c5e19572c59d061d4137 WHIRLPOOL 40cdeb92289c10b06ca893b6f59a9c8765be1c197d49c0e1f1fa9d15837fe5e5f0948c05c83e88a2bcdec0128b36bf408b2b7d9250ae1389e3625bd0ad287de1
+MISC ChangeLog 14093 SHA256 a18b12cfd6e0e780bb69c2406672d835216c66e1323b6b74d1e73ece96389087 SHA512 9a5e7d95f977a0b9636c9d16f89adc1ff459e01769e7ae456cc6e20de28a859f414cbf3fc7f7fb8b891a4e554ca964814cc62eba3dc131c5d7710f425110346a WHIRLPOOL d7a954928580e62021841ef1785194a73de7568ace8c446465605a82cc9257928ad481e08b4f8a3e4305cb9716e74d9a7008df42c47e4ecfbbbf3e88c9e277d2
 MISC metadata.xml 160 SHA256 5ac0a3647e8149d52ce55d391cf1680ac52d6f0330be21c3bca4790b971b5e5d SHA512 e5ae2b384aa96a402995bf0e8b4c29d38d57f1ebc44eeca71d7eda9a29431b7737c3c3a5df053e868a21c21abb457658344e7fb7c2102d4625a160273048c2db WHIRLPOOL b626c8afedc54ba9adb429cb53f860c0165702b1cea15f5c84c4e458cc94f28755ec66c5b73d9ecc155c1de70c82e1d79ba859c2124d0a78437681f2786e1246
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQEcBAEBCAAGBQJSbCriAAoJEFpvPKfnPDWznqgH/Al8qAXjyP1nQKakLLWbVyy7
-vWnn3euEXSQGbpHdm2Q2lfWz3MtjnBSk0DaghhZT0AnuA9EVKNqBo19WgXKBmgz+
-J/dr6wocbuJQ5YB6EB6z+3xy3nrLaCO5RPAiYApvUWEGMBeKuTHTasrSyKP1n9JQ
-YVjQGOyKaRuvO+lI5djMayqXS/vBAe8CsZd1ZV/kTe0aEab8aCBbCAQBLjOjmFI9
-ll4qwKq3ZdW37mDI1QRRy1/iAcm2agqa17bPcxECyprl6Q9423r6+214FJ8pCyaa
-FvuwiZ5w3Eb8Faf0mw+MlaCJFY5Bn1CsFA/T/NjhrI/6wL9nANajMtHPpp7cslc=
-=Ehyp
------END PGP SIGNATURE-----
diff --git a/games-kids/gcompris/files/gcompris-13.11-build.patch b/games-kids/gcompris/files/gcompris-13.11-build.patch
new file mode 100644
index 000000000000..60b3ab5345bc
--- /dev/null
+++ b/games-kids/gcompris/files/gcompris-13.11-build.patch
@@ -0,0 +1,84 @@
+diff -ru gcompris-13.11.orig/Makefile.am gcompris-13.11/Makefile.am
+--- gcompris-13.11.orig/Makefile.am	2013-08-31 05:21:59.000000000 -0400
++++ gcompris-13.11/Makefile.am	2013-11-05 18:37:58.851772740 -0500
+@@ -7,7 +7,7 @@
+ # endif
+ 
+ 
+-icondir=$(datadir)/pixmaps
++icondir=/usr/share/pixmaps
+ icon_DATA = gcompris.png gcompris-edit.png
+ 
+ if BUILD_MINGW32
+@@ -15,7 +15,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-13.11.orig/configure.ac gcompris-13.11/configure.ac
+--- gcompris-13.11.orig/configure.ac	2013-11-03 18:13:54.000000000 -0500
++++ gcompris-13.11/configure.ac	2013-11-05 18:44:21.210250234 -0500
+@@ -57,7 +57,8 @@
+   gtk+-2.0 >= $GTK_REQUIRED \
+   librsvg-2.0 >= $LIBRSVG_REQUIRED \
+   libxml-2.0 >= $LIBXML_REQUIRED \
+-  gthread-2.0 )
++  gthread-2.0 \
++  gmodule-2.0 )
+ 
+ AC_SUBST(GCOMPRIS_CFLAGS)
+ AC_SUBST(GCOMPRIS_LIBS)
+@@ -204,10 +205,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,
+@@ -336,21 +335,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
+diff -ru gcompris-13.11.orig/src/gcompris/gcompris.c gcompris-13.11/src/gcompris/gcompris.c
+--- gcompris-13.11.orig/src/gcompris/gcompris.c	2013-10-02 18:13:32.000000000 -0400
++++ gcompris-13.11/src/gcompris/gcompris.c	2013-11-05 18:43:42.907603900 -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-13.11.ebuild b/games-kids/gcompris/gcompris-13.11.ebuild
new file mode 100644
index 000000000000..87e8de0af216
--- /dev/null
+++ b/games-kids/gcompris/gcompris-13.11.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-13.11.ebuild,v 1.1 2013/11/12 16:26:08 mr_bones_ Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_6 python2_7 )
+PYTHON_REQ_USE="sqlite,threads"
+
+inherit autotools eutils python-single-r1 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"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+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:0 )
+	dev-libs/libxml2
+	dev-libs/popt
+	virtual/libintl
+	dev-db/sqlite:3
+	dev-python/pygtk[${PYTHON_USEDEP}]"
+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-single-r1_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}/gcompris-gnuchess" \
+	egamesconf \
+		--datarootdir="${GAMES_DATADIR}" \
+		--datadir="${GAMES_DATADIR}" \
+		--localedir=/usr/share/locale \
+		--infodir=/usr/share/info \
+		--with-python="${PYTHON}" \
+		$(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
+}