commit: 8c55b63e1bb623ebf3dfa7ff90d0bef94a805466 Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org> AuthorDate: Fri Oct 12 16:56:43 2018 +0000 Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org> CommitDate: Fri Oct 12 16:56:56 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c55b63e
games-kids/gcompris: remove old Closes: https://bugs.gentoo.org/629176 Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 games-kids/gcompris/Manifest | 1 - .../gcompris/files/gcompris-15.10-build.patch | 81 ------------------- games-kids/gcompris/gcompris-15.10-r1.ebuild | 93 ---------------------- 3 files changed, 175 deletions(-) diff --git a/games-kids/gcompris/Manifest b/games-kids/gcompris/Manifest index 86d591ccd99..83be08b77ac 100644 --- a/games-kids/gcompris/Manifest +++ b/games-kids/gcompris/Manifest @@ -1,2 +1 @@ -DIST gcompris-15.10.tar.bz2 279959562 BLAKE2B f8c9287a881a98bacf9b057e518597552a2f84f8bb9143684c1f7ba8f7803589c44b383c17af5b21715f4c71c78456540c5334cea4247380d28abd161b5ae756 SHA512 1915a6934f3111e871be2777ed88c8d15a3ddb85f0c16d92333b6ebcba0cbbe526e51e84ecc576021cd807a5d69bb9570dba481ddc925da9d4dd35a0075380fc DIST gcompris-qt-0.91.tar.xz 70681140 BLAKE2B 6f392eb5065afe8239ef99ba12d0fdcdedc9e0bb4ec16fd9acfa17c6597b495cf7153095fc4fb07c0eb9f7e0aae1f51888157c84b846cfd0112ab2a3465e3ecf SHA512 bc4515acc5c58869997e44c0c3c38d2904f34a7a5efede1ee7aefcbd1ae5907fe00b29a3ecf8e5e46396031736d10df64523e280dfffe3bac2df7e34fe9a8eda diff --git a/games-kids/gcompris/files/gcompris-15.10-build.patch b/games-kids/gcompris/files/gcompris-15.10-build.patch deleted file mode 100644 index 077d1f6baf1..00000000000 --- a/games-kids/gcompris/files/gcompris-15.10-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-15.10-r1.ebuild b/games-kids/gcompris/gcompris-15.10-r1.ebuild deleted file mode 100644 index 6d417a86f54..00000000000 --- a/games-kids/gcompris/gcompris-15.10-r1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite,threads" - -inherit autotools eutils python-single-r1 - -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 ~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-alsa:0.10 - media-plugins/gst-plugins-ogg:0.10 - media-plugins/gst-plugins-vorbis:0.10 ) - !gstreamer? ( - media-libs/sdl-mixer - media-libs/libsdl:0 ) - dev-db/sqlite:3 - dev-libs/libxml2 - dev-libs/popt - dev-python/pygtk[${PYTHON_USEDEP}] - virtual/libintl - ${PYTHON_DEPS}" -DEPEND="${RDEPEND} - app-text/texi2html - dev-perl/XML-Parser - gnome-base/gnome-common - sys-apps/texinfo - sys-devel/gettext - virtual/pkgconfig" -RDEPEND="${RDEPEND} - media-gfx/tuxpaint - sci-electronics/gnucap" - -PATCHES=( - "${FILESDIR}"/${P}-build.patch -) - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - default - - # Drop DEPRECATED flags, bug #387817 - sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \ - src/gcompris/Makefile.am || die - - 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="/usr/bin/gcompris-gnuchess" \ - econf \ - --datarootdir="/usr/share" \ - --datadir="/usr/share" \ - --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 -}
