diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2015-03-12 19:07:54 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2015-03-12 19:07:54 +0000 |
commit | e1d75adc7d613d24d8f19dd4c7358900ead00fae (patch) | |
tree | d31e1c2538d9dee6fc2b3e569c05848d3cb632ca /games-kids | |
parent | EAPI=5 (diff) | |
download | gentoo-2-e1d75adc7d613d24d8f19dd4c7358900ead00fae.tar.gz gentoo-2-e1d75adc7d613d24d8f19dd4c7358900ead00fae.tar.bz2 gentoo-2-e1d75adc7d613d24d8f19dd4c7358900ead00fae.zip |
old
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'games-kids')
-rw-r--r-- | games-kids/gcompris/ChangeLog | 6 | ||||
-rw-r--r-- | games-kids/gcompris/files/gcompris-13.11-build.patch | 81 | ||||
-rw-r--r-- | games-kids/gcompris/gcompris-13.11.ebuild | 96 |
3 files changed, 5 insertions, 178 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/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 -} |