From 64e107b9b6058580ff0432107eb37cefb0b2a7d8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 22 Oct 2018 11:09:47 +0100 Subject: gentoo resync : 22.10.2018 --- games-kids/Manifest.gz | Bin 1727 -> 1724 bytes games-kids/gcompris/Manifest | 7 +- .../gcompris/files/gcompris-15.10-build.patch | 81 ------------------ games-kids/gcompris/gcompris-0.91.ebuild | 44 ++++++++++ games-kids/gcompris/gcompris-15.10-r1.ebuild | 93 --------------------- games-kids/gcompris/metadata.xml | 4 + 6 files changed, 51 insertions(+), 178 deletions(-) delete mode 100644 games-kids/gcompris/files/gcompris-15.10-build.patch create mode 100644 games-kids/gcompris/gcompris-0.91.ebuild delete mode 100644 games-kids/gcompris/gcompris-15.10-r1.ebuild (limited to 'games-kids') diff --git a/games-kids/Manifest.gz b/games-kids/Manifest.gz index 26ca77a3e1a7..d2c15dafa48d 100644 Binary files a/games-kids/Manifest.gz and b/games-kids/Manifest.gz differ diff --git a/games-kids/gcompris/Manifest b/games-kids/gcompris/Manifest index c8a06f4e783d..0ddd581838b0 100644 --- a/games-kids/gcompris/Manifest +++ b/games-kids/gcompris/Manifest @@ -1,4 +1,3 @@ -AUX gcompris-15.10-build.patch 2824 BLAKE2B e0d0974e06f344f7d53f37cd88b2e9200e963ede7cf128b6194527358883808a58d80478c2d9a878a7eed0ec594fa2fd87c72f0c3025d275aa5bb445c7d11457 SHA512 521eb3f79424b7b7678984d9175cd4c20ec15c541ac52f012fba426163c284a6c6ccae622f05ef4ef7da0d5bcf16ddfc8cc9b5ad2d48aeca9a7f7a112209929d -DIST gcompris-15.10.tar.bz2 279959562 BLAKE2B f8c9287a881a98bacf9b057e518597552a2f84f8bb9143684c1f7ba8f7803589c44b383c17af5b21715f4c71c78456540c5334cea4247380d28abd161b5ae756 SHA512 1915a6934f3111e871be2777ed88c8d15a3ddb85f0c16d92333b6ebcba0cbbe526e51e84ecc576021cd807a5d69bb9570dba481ddc925da9d4dd35a0075380fc -EBUILD gcompris-15.10-r1.ebuild 1991 BLAKE2B e026f977e1dc8d1fdfff89b0921c7581606216ccfd38157985fae43bfd82a5cee6d4429cf01a8254cbae39a51aabb78109cd5953c6b9cc787a3680504c9492ff SHA512 23980183bd8d221af17d61de9ab4471abbd1a64d5f157cb21aef94357d880919c7534f3a97a8565897a9a1019f880ff34d598a3a5398d0ca9c01119cdce49a69 -MISC metadata.xml 259 BLAKE2B de713fcef8fdf70397a1488db3be1d10415e1177b400921c0017b69bcfb1849bb5eaef32ca00118ff25391d52d2071af70c83b6357fbf5199e4745d34e9994e1 SHA512 8516e2364a64325b483a394a14c52e32b029beccd05586623e5dba0b861970722c3709070c8fd4b80a23f0a84b74a475485b0f2b05f44fae6f27f163714aef68 +DIST gcompris-qt-0.91.tar.xz 70681140 BLAKE2B 6f392eb5065afe8239ef99ba12d0fdcdedc9e0bb4ec16fd9acfa17c6597b495cf7153095fc4fb07c0eb9f7e0aae1f51888157c84b846cfd0112ab2a3465e3ecf SHA512 bc4515acc5c58869997e44c0c3c38d2904f34a7a5efede1ee7aefcbd1ae5907fe00b29a3ecf8e5e46396031736d10df64523e280dfffe3bac2df7e34fe9a8eda +EBUILD gcompris-0.91.ebuild 872 BLAKE2B 62cf0d6619ad3331d6b4664b9e5e174b42d7f1633b2b82aa013b7893bf20d8ebb7198248d5b26fa83cc8f59ffe5df0b294e2d4e3494e2b6a26358bbbc3634477 SHA512 781ef9cd2265b21f8bba65a7fb59aee13d860418746af94eb625f32d519c46992d1f4dc86a958bd5bd481fafa348d601cb209d21e2ce085b2755ccc1c0a18fb4 +MISC metadata.xml 373 BLAKE2B e6b271517e9384b607e1f768c1e8cf6378b58ab96e1be1be147c3f592fd99faee60fa5ed40aae8da80a1e44d890ee382aad028b7218e16b1a230752e60c95a6c SHA512 c06e790af93664b0d322361afc0879311d8d201044c47db404ff752157797132f138382b1399cd1ee14d2b37aa92fb7791b9a218830fd1fe73dd1763147e8dc4 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 077d1f6baf1a..000000000000 --- 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-0.91.ebuild b/games-kids/gcompris/gcompris-0.91.ebuild new file mode 100644 index 000000000000..052f974c10bb --- /dev/null +++ b/games-kids/gcompris/gcompris-0.91.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils desktop + +DESCRIPTION="full featured educational application for children from 2 to 10" +HOMEPAGE="https://gcompris.net/" +SRC_URI="http://gcompris.net/download/qt/src/gcompris-qt-${PV}.tar.xz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +S="${WORKDIR}/${PN}-qt-${PV}" + +RDEPEND=" + dev-qt/qtcore + dev-qt/qtgraphicaleffects + dev-qt/qtgui + dev-qt/qtmultimedia[qml] + dev-qt/qtnetwork + dev-qt/qtquickcontrols + dev-qt/qtsensors[qml] + dev-qt/qtsvg + dev-qt/qtxml + dev-qt/qtxmlpatterns" +DEPEND="${RDEPEND} + dev-qt/linguist-tools" + +src_configure() { + local mycmakeargs=( + # TODO: add box2d support + -DQML_BOX2D_MODULE=disabled + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + domenu org.kde.gcompris.desktop +} 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 6d417a86f543..000000000000 --- 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 -} diff --git a/games-kids/gcompris/metadata.xml b/games-kids/gcompris/metadata.xml index c040f7c7d3e0..d7ee581b071f 100644 --- a/games-kids/gcompris/metadata.xml +++ b/games-kids/gcompris/metadata.xml @@ -1,6 +1,10 @@ + + vdupras@gentoo.org + Virgil Dupras + games@gentoo.org Gentoo Games Project -- cgit v1.2.3