From 493fd00a72486bac90e17f91556924e5afe99bb7 Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Tue, 28 Jan 2014 17:47:09 +0000 Subject: old (Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit) --- games-kids/gcompris/ChangeLog | 7 +- .../gcompris/files/gcompris-12.11-build.patch | 107 --------------------- .../files/gcompris-12.11-underlinking.patch | 18 ---- games-kids/gcompris/gcompris-12.11-r1.ebuild | 98 ------------------- games-kids/gcompris/gcompris-12.11.ebuild | 98 ------------------- 5 files changed, 6 insertions(+), 322 deletions(-) delete mode 100644 games-kids/gcompris/files/gcompris-12.11-build.patch delete mode 100644 games-kids/gcompris/files/gcompris-12.11-underlinking.patch delete mode 100644 games-kids/gcompris/gcompris-12.11-r1.ebuild delete mode 100644 games-kids/gcompris/gcompris-12.11.ebuild (limited to 'games-kids') diff --git a/games-kids/gcompris/ChangeLog b/games-kids/gcompris/ChangeLog index 2ece22f3d715..9eafab6813b8 100644 --- a/games-kids/gcompris/ChangeLog +++ b/games-kids/gcompris/ChangeLog @@ -1,6 +1,11 @@ # 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.99 2014/01/26 10:55:49 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.100 2014/01/28 17:47:08 mr_bones_ Exp $ + + 28 Jan 2014; Michael Sterrett + -files/gcompris-12.11-build.patch, -files/gcompris-12.11-underlinking.patch, + -gcompris-12.11-r1.ebuild, -gcompris-12.11.ebuild: + old 26 Jan 2014; Agostino Sarubbo gcompris-13.11.ebuild: Stable for x86, wrt bug #498266 diff --git a/games-kids/gcompris/files/gcompris-12.11-build.patch b/games-kids/gcompris/files/gcompris-12.11-build.patch deleted file mode 100644 index 02432de06474..000000000000 --- a/games-kids/gcompris/files/gcompris-12.11-build.patch +++ /dev/null @@ -1,107 +0,0 @@ -diff -ru gcompris-12.11.orig/Makefile.am gcompris-12.11/Makefile.am ---- gcompris-12.11.orig/Makefile.am 2012-05-29 13:39:35.000000000 -0400 -+++ gcompris-12.11/Makefile.am 2012-11-28 15:13:10.438931729 -0500 -@@ -17,7 +17,7 @@ - # endif - - --icondir=$(datadir)/pixmaps -+icondir=/usr/share/pixmaps - icon_DATA = gcompris.png gcompris-edit.png - - if BUILD_MINGW32 -@@ -25,7 +25,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-12.11.orig/configure.ac gcompris-12.11/configure.ac ---- gcompris-12.11.orig/configure.ac 2012-11-18 11:18:29.000000000 -0500 -+++ gcompris-12.11/configure.ac 2012-11-28 15:16:34.904426137 -0500 -@@ -204,10 +204,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, -@@ -345,21 +343,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 -@@ -367,7 +365,7 @@ - - dnl Test for gnuchess - if test x$build_gnuchess = xno; then -- AC_PATH_PROGS(GNUCHESS, gnuchess gnome-gnuchess, no, [/usr/bin:/usr/games:/usr/local/bin:$PATH]) -+ AC_PATH_PROGS(GNUCHESS, gnuchess gnome-gnuchess, no, [/usr/games/bin:/usr/bin:/usr/games:/usr/local/bin:$PATH]) - else - GNUCHESS="gcompris-gnuchess" - fi -diff -ru gcompris-12.11.orig/docs/C/Makefile.am gcompris-12.11/docs/C/Makefile.am ---- gcompris-12.11.orig/docs/C/Makefile.am 2012-09-16 09:25:23.000000000 -0400 -+++ gcompris-12.11/docs/C/Makefile.am 2012-11-28 15:17:02.551410995 -0500 -@@ -6,7 +6,7 @@ - - EXTRA_DIST = $(man_MANS) - --gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/C -+gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/C - - # Info documentation is outdated and useless - #all: $(doc) -diff -ru gcompris-12.11.orig/docs/fr/Makefile.am gcompris-12.11/docs/fr/Makefile.am ---- gcompris-12.11.orig/docs/fr/Makefile.am 2012-09-16 09:25:23.000000000 -0400 -+++ gcompris-12.11/docs/fr/Makefile.am 2012-11-28 15:17:19.767778814 -0500 -@@ -6,7 +6,7 @@ - #EXTRA_DIST = topic.dat \ - # gcompris.texi - --gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/fr -+gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/fr - - #all: $(doc) - -diff -ru gcompris-12.11.orig/src/gcompris/gcompris.c gcompris-12.11/src/gcompris/gcompris.c ---- gcompris-12.11.orig/src/gcompris/gcompris.c 2012-10-26 19:24:09.000000000 -0400 -+++ gcompris-12.11/src/gcompris/gcompris.c 2012-11-28 15:18:48.644514899 -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/files/gcompris-12.11-underlinking.patch b/games-kids/gcompris/files/gcompris-12.11-underlinking.patch deleted file mode 100644 index 2270ad27f466..000000000000 --- a/games-kids/gcompris/files/gcompris-12.11-underlinking.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Julian Ospald -Date: Sat Oct 26 19:40:23 UTC 2013 -Subject: fix underlinking - -https://bugs.gentoo.org/show_bug.cgi?id=488964 - ---- gcompris-12.11/configure.ac -+++ gcompris-12.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) diff --git a/games-kids/gcompris/gcompris-12.11-r1.ebuild b/games-kids/gcompris/gcompris-12.11-r1.ebuild deleted file mode 100644 index a51d1a0ba0e1..000000000000 --- a/games-kids/gcompris/gcompris-12.11-r1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# 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-12.11-r1.ebuild,v 1.1 2013/10/26 20:49:32 hasufell 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 - games-board/gnuchess - 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 \ - "${FILESDIR}"/${P}-underlinking.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}"/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 -} diff --git a/games-kids/gcompris/gcompris-12.11.ebuild b/games-kids/gcompris/gcompris-12.11.ebuild deleted file mode 100644 index 8f9b5a7ae34e..000000000000 --- a/games-kids/gcompris/gcompris-12.11.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# 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-12.11.ebuild,v 1.6 2013/10/26 20:04:23 hasufell Exp $ - -EAPI=5 -PYTHON_DEPEND="2:2.6" -PYTHON_USE_WITH="sqlite threads" - -inherit autotools eutils python 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" - -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 - games-board/gnuchess - dev-db/sqlite:3 - dev-python/pygtk" -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_set_active_version 2 - python_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 \ - "${FILESDIR}"/${P}-underlinking.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}"/gnuchess \ - egamesconf \ - --datarootdir="${GAMES_DATADIR}" \ - --datadir="${GAMES_DATADIR}" \ - --localedir=/usr/share/locale \ - --infodir=/usr/share/info \ - --with-python="$(PYTHON -a)" \ - $(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 -} -- cgit v1.2.3-65-gdbad