diff options
| -rw-r--r-- | games-kids/gcompris/ChangeLog | 6 | ||||
| -rw-r--r-- | games-kids/gcompris/Manifest | 25 | ||||
| -rw-r--r-- | games-kids/gcompris/files/gcompris-13.11-build.patch | 81 | ||||
| -rw-r--r-- | games-kids/gcompris/gcompris-13.11.ebuild | 96 |
4 files changed, 6 insertions, 202 deletions
diff --git a/games-kids/gcompris/ChangeLog b/games-kids/gcompris/ChangeLog index 2ff88ca8af27..a87603dbcd14 100644 --- a/games-kids/gcompris/ChangeLog +++ b/games-kids/gcompris/ChangeLog @@ -1,6 +1,10 @@ # 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.106 2015/02/25 15:54:55 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.107 2015/03/12 19:07:54 mr_bones_ Exp $ + + 12 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org> + -files/gcompris-13.11-build.patch, -gcompris-13.11.ebuild: + old 25 Feb 2015; Agostino Sarubbo <ago@gentoo.org> gcompris-14.12.ebuild: Stable for x86, wrt bug #540436 diff --git a/games-kids/gcompris/Manifest b/games-kids/gcompris/Manifest index 0fe2163c786c..3e7e5d7fa3ae 100644 --- a/games-kids/gcompris/Manifest +++ b/games-kids/gcompris/Manifest @@ -1,28 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX gcompris-13.11-build.patch 2824 SHA256 df4213b104a3e35c8c6219e3b920a31c3a4f103fbcd9bd9fc68b5737938cf834 SHA512 521eb3f79424b7b7678984d9175cd4c20ec15c541ac52f012fba426163c284a6c6ccae622f05ef4ef7da0d5bcf16ddfc8cc9b5ad2d48aeca9a7f7a112209929d WHIRLPOOL 27afea1cf8294a8e8e3c2417d0b0fcd289bc46c397ee18ebc8b081601ea632ac3a7175efc1a56d11288577f94115d4c2ee71075ad85b4dbb240f02c6b08988b2 AUX gcompris-14.12-build.patch 2824 SHA256 df4213b104a3e35c8c6219e3b920a31c3a4f103fbcd9bd9fc68b5737938cf834 SHA512 521eb3f79424b7b7678984d9175cd4c20ec15c541ac52f012fba426163c284a6c6ccae622f05ef4ef7da0d5bcf16ddfc8cc9b5ad2d48aeca9a7f7a112209929d WHIRLPOOL 27afea1cf8294a8e8e3c2417d0b0fcd289bc46c397ee18ebc8b081601ea632ac3a7175efc1a56d11288577f94115d4c2ee71075ad85b4dbb240f02c6b08988b2 -DIST gcompris-13.11.tar.bz2 264431313 SHA256 418dad2c8f0fc90e16e97ab67b6700e3af5f33ae05d83f28f3b1117183f88c57 SHA512 c74abb948559944cb8552ee8d3f760d598b04e9962f3650fb356775df568a27f5f9436fec9fc1348af1d0802434337494a0be909ffc7adfa6873e74dcbc9cbee WHIRLPOOL d25e3d3e4504e05a43ec95457c7ac6a194738e07339c9372619f76332aefa2efc9d82e2d3583cb72e113a2f3126bca96655fc0f62a61ce86133c66a9a8405bf0 DIST gcompris-14.12.tar.bz2 272767636 SHA256 bf0beafb03c0f4ffe05bbfcda54b91a5e8a034b5d813cb4492d6f59a21f9cdcf SHA512 b0948fcf303b335a231318dd57ef84d83cda7839e82542e5c4b9e794745561c24d64e7e76a96c63d1b0eb5a44377f2bf05b1d89f3bcab75dd2c32075e2ba5258 WHIRLPOOL 0d49a59e5fddd5e24e6e593ad53d99c7a8714b6b48dd2e3f776600366f61886c4ea15428f056cb8ae69e26024a88f3264814f80ce9e11e9d82d4f9d0adb8b056 -EBUILD gcompris-13.11.ebuild 2334 SHA256 e06ccc4e0ab0f77a14054411fbcce477b33af1bf80d06698811817d992b13c3c SHA512 532ec03edf1d2d0226db94a6be7ff321959137248c3a28654b794ccd3e101c3410233d85cc08c5af66dbada51a9f0036cc91986c05cad1614b2b5482f151e0c9 WHIRLPOOL c4c13e289f25477ab08b804f013d54034dbc40662a30b6d1c2f5e0e15d238ba30954ab057438af4a5bdcff50379640a112a4ae2f1db8d268115021470ec40907 EBUILD gcompris-14.12.ebuild 2135 SHA256 c4473aa55495038cdd7e7b7330bdac5441d1e61eca0390553ec4233647ef48b0 SHA512 262edf463cd6a7e9a9425f2bcdb1e2b38d50416c3e3da07bd732646c4a90bd018c42b9b2cad8ba5e1c2978ef76ab6932414469017b0ce9993a1bffaa189444d1 WHIRLPOOL 16727eb2107ef0c862be86e49df5e3e83386240a6196fc391edeef9439df6990eb32abcbe47d11a52451b9d2a849d05b529d8c1fff7c5e691affe67d5f2f9442 -MISC ChangeLog 15377 SHA256 d63f932eb629705e82b98d40b515e68e2d28d689e6797207d58af5779bf85ef2 SHA512 c081c707dc954e57032e1990876eb3754cff84e629b20c3c38a326d464716c1875bff7e3126ee78ef9d25e2a32b07d631213f2c51a0987f0980352e2860bbdb4 WHIRLPOOL 386dd9d7f16ea51adbdb575c56bfc5e3371621acc75f0fc183c64f5a24f0ac8526cfc88a6b7210370fa1a8d2203ccfc1e02b8023ff2e530ae7a31af015ab8a14 +MISC ChangeLog 15506 SHA256 ebad38155cf2853c577944c749e26ae0a3d516169c15d448ccc2045953be7fdb SHA512 08aa6954bd7923e6c116b79583db12f216262d3b92c7f75d0b02ca98533ac7683f1c50ceaaa6b6d805d50509be9e20b394d69a6d43be3a278853ffdcfbe125f1 WHIRLPOOL badffa2743fdcf69972220f2299d06cb53db23da397c679d685b3862ddff2ba1a19960643054b7bb264fd883682e2c945e183127c8fa8de3d7228eac6a5185ba MISC metadata.xml 160 SHA256 5ac0a3647e8149d52ce55d391cf1680ac52d6f0330be21c3bca4790b971b5e5d SHA512 e5ae2b384aa96a402995bf0e8b4c29d38d57f1ebc44eeca71d7eda9a29431b7737c3c3a5df053e868a21c21abb457658344e7fb7c2102d4625a160273048c2db WHIRLPOOL b626c8afedc54ba9adb429cb53f860c0165702b1cea15f5c84c4e458cc94f28755ec66c5b73d9ecc155c1de70c82e1d79ba859c2124d0a78437681f2786e1246 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJU7fBQAAoJELp701BxlEWfn5IP/j/6f3UsyxLuzWTxcJ/44oHy -K8BaLxZtceLx6hMHUhMzQqLsEVzcGhusw259iYyX4Ad5bekAsL4nFLa1+YAC2ZJX -D7VQ/NJcQLM1EDamB/0zs4xD7VcX8iskhCg7xjYg44r0ZiC15Xvn4G1xjNdHr8XF -3YbvUunlP/t11tsS/029quglPrJb4nMcwDb3ZDGgH1lHOe2heEdoEGzpCMKAgpW2 -f4onoQcZMB/sOw2l3SZFBMmzd1Mj2FGYd+iVm5uqsT+DZQyh4qNbk2GMlJMnS7II -dNIEO5yvfU1nfqWdMpiLVm/WE/4aLP+5OMU94lQtQyAPfk5kMhl7SMWVeYbJuUNq -wSTMuUHvRpqaSrENnHvEFdbYcz4NEIRQ0J03EG9Ds3FjjKd9QDyjmj9sUbzdTd5W -XevKWDh2XW99cNFtrSF1oCZNzF2sSEbGu3J3HQkcp+C2pg7oID++AdLJSk2iWA7m -fQi39+3l4y4K8YjNjnXZQYKqbMo2rtA0bDuwXnl62eiDhabMBehpJ8jQOC97gf6J -7Gg1ZJLxSOZvCxTODq6UmsqZ3nuPrFW2kUA1HMex+8yweJ47iBX4z9ve/7dKtUjy -gWIb0vsThpTqcp3ZYcR9zrql5lsSu/QGik5fwjvwWsbWm6mau0rfQjNcrvhQMS1+ -YVsnknYhQM0CeSFcWcOJ -=/dGC ------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 deleted file mode 100644 index 077d1f6baf1a..000000000000 --- a/games-kids/gcompris/files/gcompris-13.11-build.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- 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 deleted file mode 100644 index cd65d479aa90..000000000000 --- a/games-kids/gcompris/gcompris-13.11.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# 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.6 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="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 -} |