From 61af1efe96cf1037982d2fc90af0749b5ec5a0c6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 11 Oct 2024 04:04:15 +0100 Subject: gentoo auto-resync : 11:10:2024 - 04:04:14 --- dev-games/tiled/Manifest | 5 +- dev-games/tiled/files/tiled-1.11.0-python.patch | 55 ------------------- dev-games/tiled/tiled-1.11.0.ebuild | 1 - dev-games/tiled/tiled-1.8.6.ebuild | 73 ------------------------- 4 files changed, 1 insertion(+), 133 deletions(-) delete mode 100644 dev-games/tiled/files/tiled-1.11.0-python.patch delete mode 100644 dev-games/tiled/tiled-1.8.6.ebuild (limited to 'dev-games/tiled') diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest index df307e62f282..c12e0d5fe297 100644 --- a/dev-games/tiled/Manifest +++ b/dev-games/tiled/Manifest @@ -1,6 +1,3 @@ -AUX tiled-1.11.0-python.patch 2156 BLAKE2B 0a6686c1694ccfce7c114618e783f214f2d3c6c22e444793e6fbf3de9d74f7a278fe5779796a2d7e255e6af525f7973206b730a879eec33c3da7d5881da58be7 SHA512 2b7fcaeddcd0d8495942be03fb8e75d5cf8dbeeb54cdc2079597de8ce1e282254436b31697cf1159d5b2f4dfd32b2a7166aa41456189d6545d2c44de63697112 DIST tiled-1.11.0.tar.gz 17458724 BLAKE2B 3e7ea2ce4a61aa31d60487bf4cd68efb9307be0a753ee1571b9d2a90dff5299fdbbfd432c38eddafbea98cd6a1c59aa338c9ab5337e923e3178456a720e24ed4 SHA512 59e7ff38bedb0b897b40b2d3f6231004970de843e3700ef8adfaf78ab9b15c57e291ec27d409ba61094871b84f27238defb33bef5b23e838736f515ec1addf5d -DIST tiled-1.8.6.tar.gz 17053221 BLAKE2B a226ff9861ebfa3980176fac2b23c7fff8ac6db585444c5d5c21afff2301298e1eaa74179970bfaeb07c62074c706378040c520d5f0155b030f9e2025c51abb0 SHA512 f77ff46fbb707d8c02499f168e5748f39081fa780fb9a5b1ea04603b09cd71280d76034cab28b23fc30280bd856121e473c992c9c39d7c46fc97d5fbfbe4191d -EBUILD tiled-1.11.0.ebuild 2202 BLAKE2B 3d1e355939624a920bf16bf67e5970a231ba8d83dd4ec26fae88c39530abc7423f6564300985cb64e392741ef29ea02ddf49408ae5e98a4fdfc28b65dad1c3e4 SHA512 e89898512b408df01667d6470e9195d355bb78c8d2171a09c27c61a4f93ec8b10ae167c0c91ccc6cc7b00622814b01e2004d7c1369aeb655853ccf8b54aafc72 -EBUILD tiled-1.8.6.ebuild 1428 BLAKE2B 1f6e4358ed7c07c34e599c55e8b3f243b58116ddd993d4e17d24d24bacbea7c416de3d4f4bff867bf1a1b7c16129216b3b862f6ba90b25debd25f629a9e834a9 SHA512 14e48dc91b99b6aaf4883de5f36d172e41eeed4c59882ed0bd649c24eb6ce48695560edf83cf1d3c1d6ab59e2265eca8d2530f2affded2be7c38fb14642645b2 +EBUILD tiled-1.11.0.ebuild 2161 BLAKE2B ddbaae857870123f3cd62c30875baa67444aa47301362f42ccb4ad5e0d01717dde36669dd7824b6ef7fd3d0329930330646ce17c2a1f2b5fb78741a198e1d733 SHA512 14c226895b6598483eabe30b5a9b2c6c404719c3fe7c35fb8955f1bbd61b58aa71456cacb71d8e42be0ee581735f22043eff75da9769825b4ec6901c7f3158b7 MISC metadata.xml 575 BLAKE2B 67eae166f5a7e6f93eb2f550a259d642ff5372de2bc19c82eaaceacf6255378f81541c92b5200df3c2d3206baf008b06de1cebdb7380f9fd48a77a96f2248b3d SHA512 25c2670f6f3b08cf951641ea50b7f62c528b192e850ea5923c5092349d750166c73979a7d54ad5a3ba40c62778cdcfde9d555e0af4c7def99075aa8921339b10 diff --git a/dev-games/tiled/files/tiled-1.11.0-python.patch b/dev-games/tiled/files/tiled-1.11.0-python.patch deleted file mode 100644 index f5407045e019..000000000000 --- a/dev-games/tiled/files/tiled-1.11.0-python.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/qbs/imports/PythonProbe.qbs b/qbs/imports/PythonProbe.qbs -index 52eae7fc..93b4270c 100644 ---- a/qbs/imports/PythonProbe.qbs -+++ b/qbs/imports/PythonProbe.qbs -@@ -7,7 +7,6 @@ import qbs.Utilities - Probe { - id: pythonDllProbe - -- property string pythonDir: pythonInstallDir // Input - property string buildVariant: qbs.buildVariant // Input - property string minVersion: "3.5" // Input - property string fileNamePrefix // Output -@@ -17,18 +16,9 @@ Probe { - console.warn(msg + " The Python plugin will not be available."); - } - -- if (!pythonDir) { -- printWarning("PYTHONHOME not set."); -- return; -- } -- if (!File.exists(pythonDir)) { -- printWarning("The provided Python installation directory '" + pythonDir -- + "' does not exist."); -- return; -- } - var p = new Process(); - try { -- var pythonFilePath = FileInfo.joinPaths(pythonDir, "python.exe"); -+ var pythonFilePath = "python"; - p.exec(pythonFilePath, ["--version"], true); - var output = p.readStdOut().trim(); - var magicPrefix = "Python "; -@@ -45,9 +35,7 @@ Probe { - return; - } - if (Utilities.versionCompare(versionNumberString, minVersion) < 0) { -- printWarning("The Python installation at '" + pythonDir -- + "' has version " + versionNumberString + ", but " + minVersion + " or higher " -- + "is required."); -+ printWarning("The Python installation has version " + versionNumberString + ", but " + minVersion + " or higher " + "is required."); - return; - } - found = true; -diff --git a/src/plugins/python/python.qbs b/src/plugins/python/python.qbs -index f1c959d3..8c43af9c 100644 ---- a/src/plugins/python/python.qbs -+++ b/src/plugins/python/python.qbs -@@ -28,7 +28,6 @@ TiledPlugin { - - PythonProbe { - id: pythonDllProbe -- pythonDir: Environment.getEnv("PYTHONHOME") - minVersion: "3.8" - } - diff --git a/dev-games/tiled/tiled-1.11.0.ebuild b/dev-games/tiled/tiled-1.11.0.ebuild index 373917dcb8ee..66a5a4df0232 100644 --- a/dev-games/tiled/tiled-1.11.0.ebuild +++ b/dev-games/tiled/tiled-1.11.0.ebuild @@ -49,7 +49,6 @@ qbs_format_flags() { src_configure() { if use python; then - eapply "${FILESDIR}"/${P}-python.patch QBS_PRODUCTS="${QBS_PRODUCTS},python" fi if ! use minimal; then diff --git a/dev-games/tiled/tiled-1.8.6.ebuild b/dev-games/tiled/tiled-1.8.6.ebuild deleted file mode 100644 index 44e23d47cbd4..000000000000 --- a/dev-games/tiled/tiled-1.8.6.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit python-single-r1 qmake-utils xdg-utils - -DESCRIPTION="A general purpose tile map editor" -HOMEPAGE="https://www.mapeditor.org/" -SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz" - -LICENSE="BSD BSD-2 GPL-2+" -SLOT="0" -KEYWORDS="amd64" -IUSE="examples python" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - app-arch/zstd:= - >=dev-qt/qtcore-5.15:5 - >=dev-qt/qtdbus-5.15:5 - >=dev-qt/qtdeclarative-5.15:5 - >=dev-qt/qtgui-5.15:5 - >=dev-qt/qtnetwork-5.15:5 - >=dev-qt/qtwidgets-5.15:5 - sys-libs/zlib - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" - -DOCS=( AUTHORS COPYING NEWS.md README.md ) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - eqmake5 \ - LIBDIR="/usr/$(get_libdir)" \ - PREFIX="/usr" \ - SYSTEM_ZSTD="yes" \ - DISABLE_PYTHON_PLUGIN="$(usex !python)" \ - USE_FHS_PLUGIN_PATH="true" -} - -src_install() { - emake INSTALL_ROOT="${D}" install - - einstalldocs - - if use examples ; then - docompress -x /usr/share/doc/${PF}/examples - dodoc -r examples - fi -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} -- cgit v1.2.3