version bump

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

5 files changed, 195 insertions, 14 deletions

diff --git a/games-kids/gcompris/ChangeLog b/games-kids/gcompris/ChangeLog
index dffd30a646ef..2913c9db9ad5 100644
--- a/games-kids/gcompris/ChangeLog
+++ b/games-kids/gcompris/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-kids/gcompris
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.101 2014/02/15 22:06:43 mr_bones_ Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.102 2015/01/19 05:50:07 mr_bones_ Exp $
+
+*gcompris-14.12 (19 Jan 2015)
+
+  19 Jan 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/gcompris-14.12-build.patch, +gcompris-14.12.ebuild,
+  files/gcompris-13.11-build.patch, gcompris-13.11.ebuild:
+  version bump
 
   15 Feb 2014; Michael Sterrett <mr_bones_@gentoo.org> gcompris-13.11.ebuild:
   latest librsvg has dropped the gtk use flag (bug #501418)
diff --git a/games-kids/gcompris/files/gcompris-13.11-build.patch b/games-kids/gcompris/files/gcompris-13.11-build.patch
index 60b3ab5345bc..077d1f6baf1a 100644
--- a/games-kids/gcompris/files/gcompris-13.11-build.patch
+++ b/games-kids/gcompris/files/gcompris-13.11-build.patch
@@ -1,6 +1,5 @@
-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
+--- gcompris-13.11.orig/Makefile.am
++++ gcompris-13.11/Makefile.am
 @@ -7,7 +7,7 @@
  # endif
  
@@ -19,9 +18,8 @@ diff -ru gcompris-13.11.orig/Makefile.am gcompris-13.11/Makefile.am
  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
+--- gcompris-13.11.orig/configure.ac
++++ gcompris-13.11/configure.ac
 @@ -57,7 +57,8 @@
    gtk+-2.0 >= $GTK_REQUIRED \
    librsvg-2.0 >= $LIBRSVG_REQUIRED \
@@ -70,9 +68,8 @@ diff -ru gcompris-13.11.orig/configure.ac gcompris-13.11/configure.ac
    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
+--- gcompris-13.11.orig/src/gcompris/gcompris.c
++++ gcompris-13.11/src/gcompris/gcompris.c
 @@ -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",
diff --git a/games-kids/gcompris/files/gcompris-14.12-build.patch b/games-kids/gcompris/files/gcompris-14.12-build.patch
new file mode 100644
index 000000000000..077d1f6baf1a
--- /dev/null
+++ b/games-kids/gcompris/files/gcompris-14.12-build.patch
@@ -0,0 +1,81 @@
+--- gcompris-13.11.orig/Makefile.am
++++ gcompris-13.11/Makefile.am
+@@ -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
+--- gcompris-13.11.orig/configure.ac
++++ gcompris-13.11/configure.ac
+@@ -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
+--- gcompris-13.11.orig/src/gcompris/gcompris.c
++++ gcompris-13.11/src/gcompris/gcompris.c
+@@ -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
index a004337833eb..cd65d479aa90 100644
--- a/games-kids/gcompris/gcompris-13.11.ebuild
+++ b/games-kids/gcompris/gcompris-13.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.5 2014/02/15 22:06:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-13.11.ebuild,v 1.6 2015/01/19 05:50:07 mr_bones_ Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_6 python2_7 )
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite,threads"
 
 inherit autotools eutils python-single-r1 games
diff --git a/games-kids/gcompris/gcompris-14.12.ebuild b/games-kids/gcompris/gcompris-14.12.ebuild
new file mode 100644
index 000000000000..75bf60b7833a
--- /dev/null
+++ b/games-kids/gcompris/gcompris-14.12.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-14.12.ebuild,v 1.1 2015/01/19 05:50:07 mr_bones_ Exp $
+
+EAPI=5
+PYTHON_COMPAT=( 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="http://gcompris.net/download/${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
+}