From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- games-util/lutris/Manifest | 7 ++- games-util/lutris/files/lutris-0.5.4-gtk.patch | 29 ++++++++++ games-util/lutris/lutris-0.5.3.ebuild | 6 +- games-util/lutris/lutris-0.5.4-r1.ebuild | 79 ++++++++++++++++++++++++++ games-util/lutris/lutris-0.5.4.ebuild | 77 ------------------------- games-util/lutris/lutris-9999.ebuild | 6 +- 6 files changed, 118 insertions(+), 86 deletions(-) create mode 100644 games-util/lutris/files/lutris-0.5.4-gtk.patch create mode 100644 games-util/lutris/lutris-0.5.4-r1.ebuild delete mode 100644 games-util/lutris/lutris-0.5.4.ebuild (limited to 'games-util/lutris') diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest index 5cc0aa36ca99..ab36550c55c2 100644 --- a/games-util/lutris/Manifest +++ b/games-util/lutris/Manifest @@ -1,6 +1,7 @@ +AUX lutris-0.5.4-gtk.patch 1259 BLAKE2B 32556fbb9ce674f783508c740f9cb9f06a0165286f42e5e080d668864d9a840c74765c8602c47e8b7a90d33374cb04d85d9f2498a0919171d146abb82ef7f31b SHA512 7028157b550c9d13a98e843d75c27bdb8c2cb2bf9591df5f102b412ebfefe693e95b847b0ba43c032ef9d84881b4143f2d2ecc32fd61e164bd49e5da5c5cd5a9 DIST lutris_0.5.3.tar.xz 1821184 BLAKE2B cf4d1fee654202c88d98414ab7d9efbb76d77887007b8a66ee62313b3c672a7e515777fc360a6faca84c3d7f324503e81846b5c413011a4f961df6753467cf7a SHA512 85ae405d711f86c0b610030464030748b0deaa5f858dee72f31fab0268ea1428aaa2c1af7cf3acc17e6d455dae5d870203224ff8c99f1b3b48d753de7c86574e DIST lutris_0.5.4.tar.xz 1843880 BLAKE2B f286d62df3bf5a5eadd634d2d177a5b69b5fa5d897e70f58a19be4148609e56ba33c29ce4218ae833dbdf9dded1e9be869f9ed4d84ba2b435a09981219d74438 SHA512 81669f2021063229bad78ebc49b54075058266716279695c53c43a5a06a8c1d4e5a9dcbcb20a1becfe0d243aa6e812f5a30b4d90f418d4cffcff18daefb09c50 -EBUILD lutris-0.5.3.ebuild 1691 BLAKE2B 9ca99687ddb869955c77e970a0bbf1fdc27f72aa13bded6c409e47b87ede99c494df98a19b3e9ef9c607b803fc7773bc4eeff1e054a23ccdd97fefa9e22910d4 SHA512 78745b8917664d6d1b1aae98dbbf333cc6a7cd984ffb04d16da590f98844c2a244f10e7e23ffd135531882dbc6e8f2abb37704023fa328256591afa99214a475 -EBUILD lutris-0.5.4.ebuild 1691 BLAKE2B 9ca99687ddb869955c77e970a0bbf1fdc27f72aa13bded6c409e47b87ede99c494df98a19b3e9ef9c607b803fc7773bc4eeff1e054a23ccdd97fefa9e22910d4 SHA512 78745b8917664d6d1b1aae98dbbf333cc6a7cd984ffb04d16da590f98844c2a244f10e7e23ffd135531882dbc6e8f2abb37704023fa328256591afa99214a475 -EBUILD lutris-9999.ebuild 1691 BLAKE2B 9ca99687ddb869955c77e970a0bbf1fdc27f72aa13bded6c409e47b87ede99c494df98a19b3e9ef9c607b803fc7773bc4eeff1e054a23ccdd97fefa9e22910d4 SHA512 78745b8917664d6d1b1aae98dbbf333cc6a7cd984ffb04d16da590f98844c2a244f10e7e23ffd135531882dbc6e8f2abb37704023fa328256591afa99214a475 +EBUILD lutris-0.5.3.ebuild 1691 BLAKE2B 648a49e5334456ebb193bd52df11c570bd73c67295569efd8f64fea87b5f96e173133939393229094b42d45cadb91ac677419e7da68f94cdb357a0154e12f73b SHA512 e35273edc1f49852dfa3526852997e0ca4fb6004260891480773cebdb8a09994eccfa9c8aa112e6fecd58b0805175348b0422c8056b79464f6aff47166f2455c +EBUILD lutris-0.5.4-r1.ebuild 1733 BLAKE2B 422b817e46728f91d3f29d174805ab1f9b67507f01b212f4cd718693233442916b14601674a0a810198664dbb38b576a92d301aaadf5efdc595b0a51a6e7cdd8 SHA512 9ab2a5639c616eed52fcc6b4f4c44b21d636ee69f26b513bf5d8c00b1e76ca2ea5893fddfe0c52bdcc014e2c55e27807ef803fdee9264920fbdbd44da64de099 +EBUILD lutris-9999.ebuild 1691 BLAKE2B 648a49e5334456ebb193bd52df11c570bd73c67295569efd8f64fea87b5f96e173133939393229094b42d45cadb91ac677419e7da68f94cdb357a0154e12f73b SHA512 e35273edc1f49852dfa3526852997e0ca4fb6004260891480773cebdb8a09994eccfa9c8aa112e6fecd58b0805175348b0422c8056b79464f6aff47166f2455c MISC metadata.xml 661 BLAKE2B 8b05694fe3755a3b2b1546c1392bccb408d99f430c361e6058702107d665b13e0d36834d37c2a31ab7065290363e6af7712fcf4b36542222b59e47b508b7d1ef SHA512 e5d7a7023e9aa025d8d526457ba61ec9d9ceadf472d3f04f6b799cb3c130543e4300a56ce1830c163650f0554e2a87d705152b3771bb4f7fd9edeba3db16b9a7 diff --git a/games-util/lutris/files/lutris-0.5.4-gtk.patch b/games-util/lutris/files/lutris-0.5.4-gtk.patch new file mode 100644 index 000000000000..a2c5d71d9982 --- /dev/null +++ b/games-util/lutris/files/lutris-0.5.4-gtk.patch @@ -0,0 +1,29 @@ +From a97150b78954e176cb0f825f0c201f54d5da613e Mon Sep 17 00:00:00 2001 +From: Stefan Strogin +Date: Tue, 31 Dec 2019 03:22:26 +0200 +Subject: [PATCH] Call the correct method for creating TreeModelSort (Closes + #2554) + +Upstream-Status: Accepted +[https://github.com/lutris/lutris/commit/a99b17f00dfc4cdab80c237752cc3167d64194eb] +Signed-off-by: Stefan Strogin +--- + lutris/gui/views/store.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lutris/gui/views/store.py b/lutris/gui/views/store.py +index ba331313..4d5f372e 100644 +--- a/lutris/gui/views/store.py ++++ b/lutris/gui/views/store.py +@@ -130,7 +130,7 @@ class GameStore(GObject.Object): + self.prevent_sort_update = False # prevent recursion with signals + self.modelfilter = self.store.filter_new() + self.modelfilter.set_visible_func(self.filter_view) +- self.modelsort = Gtk.TreeModelSort.sort_new_with_model(self.modelfilter) ++ self.modelsort = Gtk.TreeModelSort.new_with_model(self.modelfilter) + self.modelsort.connect("sort-column-changed", self.on_sort_column_changed) + self.modelsort.set_sort_func(sort_col, sort_func, sort_col) + self.sort_view(sort_key, sort_ascending) +-- +2.24.1 + diff --git a/games-util/lutris/lutris-0.5.3.ebuild b/games-util/lutris/lutris-0.5.3.ebuild index 7eb0bd47ed17..4398b03d15de 100644 --- a/games-util/lutris/lutris-0.5.3.ebuild +++ b/games-util/lutris/lutris-0.5.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{5,6,7} ) +PYTHON_COMPAT=( python3_{6,7} ) PYTHON_REQ_USE="sqlite,threads(+)" inherit distutils-r1 virtualx xdg @@ -38,7 +38,7 @@ RDEPEND=" dev-python/python-evdev[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] - gnome-base/gnome-desktop[introspection] + gnome-base/gnome-desktop:3[introspection] media-sound/fluid-soundfont net-libs/libsoup net-libs/webkit-gtk:4[introspection] diff --git a/games-util/lutris/lutris-0.5.4-r1.ebuild b/games-util/lutris/lutris-0.5.4-r1.ebuild new file mode 100644 index 000000000000..c6f225494ee9 --- /dev/null +++ b/games-util/lutris/lutris-0.5.4-r1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_REQ_USE="sqlite,threads(+)" + +inherit distutils-r1 virtualx xdg + +DESCRIPTION="An open source gaming platform for GNU/Linux" +HOMEPAGE="https://lutris.net/" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/lutris/lutris.git" + inherit git-r3 +else + SRC_URI="https://lutris.net/releases/${P/-/_}.tar.xz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${PN}" +fi + +LICENSE="GPL-3" +SLOT="0" + +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( dev-python/nose[${PYTHON_USEDEP}] ) +" +RDEPEND=" + app-arch/cabextract + app-arch/p7zip + app-arch/unrar + app-arch/unzip + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/python-evdev[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + gnome-base/gnome-desktop:3[introspection] + media-sound/fluid-soundfont + net-libs/libsoup + net-libs/webkit-gtk:4[introspection] + x11-apps/mesa-progs + x11-apps/xgamma + x11-apps/xrandr + x11-libs/gtk+:3[introspection] + x11-libs/libnotify +" + +PATCHES=( "${FILESDIR}/${P}-gtk.patch" ) + +python_install_all() { + local DOCS=( AUTHORS README.rst docs/installers.rst ) + distutils-r1_python_install_all +} + +python_test() { + virtx nosetests -v +} + +pkg_preinst() { + xdg_pkg_preinst +} + +pkg_postinst() { + xdg_pkg_postinst + + # Quote README.rst + elog "Lutris installations are fully automated through scripts, which can" + elog "be written in either JSON or YAML. The scripting syntax is described" + elog "in ${EROOT}/usr/share/doc/${PF}/installers.rst.bz2, and is also" + elog "available online at lutris.net." +} + +pkg_postrm() { + xdg_pkg_postrm +} diff --git a/games-util/lutris/lutris-0.5.4.ebuild b/games-util/lutris/lutris-0.5.4.ebuild deleted file mode 100644 index 7eb0bd47ed17..000000000000 --- a/games-util/lutris/lutris-0.5.4.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{5,6,7} ) -PYTHON_REQ_USE="sqlite,threads(+)" - -inherit distutils-r1 virtualx xdg - -DESCRIPTION="An open source gaming platform for GNU/Linux" -HOMEPAGE="https://lutris.net/" - -if [[ ${PV} == *9999* ]] ; then - EGIT_REPO_URI="https://github.com/lutris/lutris.git" - inherit git-r3 -else - SRC_URI="https://lutris.net/releases/${P/-/_}.tar.xz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${PN}" -fi - -LICENSE="GPL-3" -SLOT="0" - -RESTRICT="!test? ( test )" - -BDEPEND=" - test? ( dev-python/nose[${PYTHON_USEDEP}] ) -" -RDEPEND=" - app-arch/cabextract - app-arch/p7zip - app-arch/unrar - app-arch/unzip - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/python-evdev[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - gnome-base/gnome-desktop[introspection] - media-sound/fluid-soundfont - net-libs/libsoup - net-libs/webkit-gtk:4[introspection] - x11-apps/mesa-progs - x11-apps/xgamma - x11-apps/xrandr - x11-libs/gtk+:3[introspection] - x11-libs/libnotify -" - -python_install_all() { - local DOCS=( AUTHORS README.rst docs/installers.rst ) - distutils-r1_python_install_all -} - -python_test() { - virtx nosetests -v -} - -pkg_preinst() { - xdg_pkg_preinst -} - -pkg_postinst() { - xdg_pkg_postinst - - # Quote README.rst - elog "Lutris installations are fully automated through scripts, which can" - elog "be written in either JSON or YAML. The scripting syntax is described" - elog "in ${EROOT}/usr/share/doc/${PF}/installers.rst.bz2, and is also" - elog "available online at lutris.net." -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-9999.ebuild index 7eb0bd47ed17..4398b03d15de 100644 --- a/games-util/lutris/lutris-9999.ebuild +++ b/games-util/lutris/lutris-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{5,6,7} ) +PYTHON_COMPAT=( python3_{6,7} ) PYTHON_REQ_USE="sqlite,threads(+)" inherit distutils-r1 virtualx xdg @@ -38,7 +38,7 @@ RDEPEND=" dev-python/python-evdev[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] - gnome-base/gnome-desktop[introspection] + gnome-base/gnome-desktop:3[introspection] media-sound/fluid-soundfont net-libs/libsoup net-libs/webkit-gtk:4[introspection] -- cgit v1.2.3