version bump
authorMichael Sterrett <mr_bones_@gentoo.org>
Thu, 12 Mar 2015 19:30:46 +0000 (19:30 +0000)
committerMichael Sterrett <mr_bones_@gentoo.org>
Thu, 12 Mar 2015 19:30:46 +0000 (19:30 +0000)
Package-Manager: portage-2.2.14/cvs/Linux x86_64

games-kids/gcompris/ChangeLog
games-kids/gcompris/Manifest
games-kids/gcompris/files/gcompris-15.02-build.patch [new file with mode: 0644]
games-kids/gcompris/gcompris-15.02.ebuild [new file with mode: 0644]

index a87603dbcd143b1534f9daa7dd5587158c2a094f..423bc3dd7d7db0d95ad4b5481f31a77ea1ee83cf 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for games-kids/gcompris
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.107 2015/03/12 19:07:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.108 2015/03/12 19:30:39 mr_bones_ Exp $
+
+*gcompris-15.02 (12 Mar 2015)
+
+  12 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/gcompris-15.02-build.patch, +gcompris-15.02.ebuild:
+  version bump
 
   12 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org>
   -files/gcompris-13.11-build.patch, -gcompris-13.11.ebuild:
index 3e7e5d7fa3ae88fb34efcc76e499997422e2a6aa..53ba52c7212656ce1ee5982a9ebe047c180ef614 100644 (file)
@@ -1,5 +1,8 @@
 AUX gcompris-14.12-build.patch 2824 SHA256 df4213b104a3e35c8c6219e3b920a31c3a4f103fbcd9bd9fc68b5737938cf834 SHA512 521eb3f79424b7b7678984d9175cd4c20ec15c541ac52f012fba426163c284a6c6ccae622f05ef4ef7da0d5bcf16ddfc8cc9b5ad2d48aeca9a7f7a112209929d WHIRLPOOL 27afea1cf8294a8e8e3c2417d0b0fcd289bc46c397ee18ebc8b081601ea632ac3a7175efc1a56d11288577f94115d4c2ee71075ad85b4dbb240f02c6b08988b2
+AUX gcompris-15.02-build.patch 2824 SHA256 df4213b104a3e35c8c6219e3b920a31c3a4f103fbcd9bd9fc68b5737938cf834 SHA512 521eb3f79424b7b7678984d9175cd4c20ec15c541ac52f012fba426163c284a6c6ccae622f05ef4ef7da0d5bcf16ddfc8cc9b5ad2d48aeca9a7f7a112209929d WHIRLPOOL 27afea1cf8294a8e8e3c2417d0b0fcd289bc46c397ee18ebc8b081601ea632ac3a7175efc1a56d11288577f94115d4c2ee71075ad85b4dbb240f02c6b08988b2
 DIST gcompris-14.12.tar.bz2 272767636 SHA256 bf0beafb03c0f4ffe05bbfcda54b91a5e8a034b5d813cb4492d6f59a21f9cdcf SHA512 b0948fcf303b335a231318dd57ef84d83cda7839e82542e5c4b9e794745561c24d64e7e76a96c63d1b0eb5a44377f2bf05b1d89f3bcab75dd2c32075e2ba5258 WHIRLPOOL 0d49a59e5fddd5e24e6e593ad53d99c7a8714b6b48dd2e3f776600366f61886c4ea15428f056cb8ae69e26024a88f3264814f80ce9e11e9d82d4f9d0adb8b056
+DIST gcompris-15.02.tar.bz2 272847496 SHA256 c3e2f84f459d747b853b0424e366d0ce7b1f4ef00d660cdde5084712cf5c3ad4 SHA512 468ca9a3a4cfff78e34206c40e6aebfc79ba087dd1e87f96a8b9b2ae1149550791be16ca0776f11e6768dd4acb3caaae9e763ac9d941f1f09c7a3464e829e7af WHIRLPOOL 5b38bf16e061d9770e66573c81e4b3b0617d3cf2e0679919a06b628ff622d4b0e8585115b4084e51e674c57cf1f2a36472e3e66283a9ee3f78423eac998b5a24
 EBUILD gcompris-14.12.ebuild 2135 SHA256 c4473aa55495038cdd7e7b7330bdac5441d1e61eca0390553ec4233647ef48b0 SHA512 262edf463cd6a7e9a9425f2bcdb1e2b38d50416c3e3da07bd732646c4a90bd018c42b9b2cad8ba5e1c2978ef76ab6932414469017b0ce9993a1bffaa189444d1 WHIRLPOOL 16727eb2107ef0c862be86e49df5e3e83386240a6196fc391edeef9439df6990eb32abcbe47d11a52451b9d2a849d05b529d8c1fff7c5e691affe67d5f2f9442
-MISC ChangeLog 15506 SHA256 ebad38155cf2853c577944c749e26ae0a3d516169c15d448ccc2045953be7fdb SHA512 08aa6954bd7923e6c116b79583db12f216262d3b92c7f75d0b02ca98533ac7683f1c50ceaaa6b6d805d50509be9e20b394d69a6d43be3a278853ffdcfbe125f1 WHIRLPOOL badffa2743fdcf69972220f2299d06cb53db23da397c679d685b3862ddff2ba1a19960643054b7bb264fd883682e2c945e183127c8fa8de3d7228eac6a5185ba
+EBUILD gcompris-15.02.ebuild 2144 SHA256 de5ebc3bcf961c9ab107454923395c3fe62c3ca836126cb6c623238b5004bf06 SHA512 25f55cf046f4b1e41c346f68608aa377b77fde030d38d5aa989d344a6465823cc7c9e39e8e797d809218f1e75c91cf5862d734b1cabee24a7ee69a1e7d99b86a WHIRLPOOL c6ca56852781a62a9ca6e61730a2a19a57e2846dfa7f88878a2652bd968a9414c23bf0b24b3b6df076e0f7b020c6b64cea2b4eee515d87dc46a34a873324b1f0
+MISC ChangeLog 15669 SHA256 b899d7179df91351c0e39bda23a1d10a0f95d7fc75629b457271960463c762b6 SHA512 5897aec27679bb06cc4ee34be51a00d5e35077b90d7facf9a8a6ffce9a4d666e22687f8b323f624dc27daca7056afdbba87f79ba2e28e33ce82a9ae3aa14646a WHIRLPOOL ade586b638422b4ec694ed4383cd018dda95d8ac0b5b4b8477b1090f1778246459c28caa1e43bb1ae227c541c49202df77f9ef0bb1f58d50c103a80f60e582ea
 MISC metadata.xml 160 SHA256 5ac0a3647e8149d52ce55d391cf1680ac52d6f0330be21c3bca4790b971b5e5d SHA512 e5ae2b384aa96a402995bf0e8b4c29d38d57f1ebc44eeca71d7eda9a29431b7737c3c3a5df053e868a21c21abb457658344e7fb7c2102d4625a160273048c2db WHIRLPOOL b626c8afedc54ba9adb429cb53f860c0165702b1cea15f5c84c4e458cc94f28755ec66c5b73d9ecc155c1de70c82e1d79ba859c2124d0a78437681f2786e1246
diff --git a/games-kids/gcompris/files/gcompris-15.02-build.patch b/games-kids/gcompris/files/gcompris-15.02-build.patch
new file mode 100644 (file)
index 0000000..077d1f6
--- /dev/null
@@ -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-15.02.ebuild b/games-kids/gcompris/gcompris-15.02.ebuild
new file mode 100644 (file)
index 0000000..55971a0
--- /dev/null
@@ -0,0 +1,89 @@
+# 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-15.02.ebuild,v 1.1 2015/03/12 19:30:39 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 || 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_install() {
+       default
+       prune_libtool_files --modules
+       prepgamesdirs
+}