From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- games-util/Manifest.gz | Bin 7063 -> 7064 bytes games-util/lgogdownloader/Manifest | 7 +- games-util/lgogdownloader/files/jsoncpp.patch | 27 ---- .../lgogdownloader/lgogdownloader-3.5.ebuild | 44 ------- .../lgogdownloader/lgogdownloader-3.6.ebuild | 39 ++++++ .../lgogdownloader/lgogdownloader-9999.ebuild | 1 - games-util/pyfa/Manifest | 8 +- games-util/pyfa/metadata.xml | 3 - games-util/pyfa/pyfa-2.14.1.ebuild | 101 --------------- games-util/pyfa/pyfa-2.15.1-r1.ebuild | 100 --------------- games-util/pyfa/pyfa-2.19.0.ebuild | 101 +++++++++++++++ games-util/springlobby/Manifest | 2 + games-util/springlobby/springlobby-0.269.ebuild | 54 ++++++++ games-util/umodpack/Manifest | 3 +- games-util/umodpack/files/umodpack-fixes.patch | 138 +++++++++++++++++++++ games-util/umodpack/umodpack-0.5_beta16-r2.ebuild | 46 ------- games-util/umodpack/umodpack-0.5_beta16-r3.ebuild | 56 +++++++++ 17 files changed, 398 insertions(+), 332 deletions(-) delete mode 100644 games-util/lgogdownloader/files/jsoncpp.patch delete mode 100644 games-util/lgogdownloader/lgogdownloader-3.5.ebuild create mode 100644 games-util/lgogdownloader/lgogdownloader-3.6.ebuild delete mode 100644 games-util/pyfa/pyfa-2.14.1.ebuild delete mode 100644 games-util/pyfa/pyfa-2.15.1-r1.ebuild create mode 100644 games-util/pyfa/pyfa-2.19.0.ebuild create mode 100644 games-util/springlobby/springlobby-0.269.ebuild create mode 100644 games-util/umodpack/files/umodpack-fixes.patch delete mode 100644 games-util/umodpack/umodpack-0.5_beta16-r2.ebuild create mode 100644 games-util/umodpack/umodpack-0.5_beta16-r3.ebuild (limited to 'games-util') diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz index aff3aaf7bc0e..f0c0656bc25f 100644 Binary files a/games-util/Manifest.gz and b/games-util/Manifest.gz differ diff --git a/games-util/lgogdownloader/Manifest b/games-util/lgogdownloader/Manifest index e7364562cc3e..83d1200134df 100644 --- a/games-util/lgogdownloader/Manifest +++ b/games-util/lgogdownloader/Manifest @@ -1,5 +1,4 @@ -AUX jsoncpp.patch 775 BLAKE2B 42f6bc206487f272c20b1a665e58121a17e2b2047709b9e153d9c70375e02b71994ff0dbb6400b332a74d343c987dfbd08d0ab3b13903295c580903d6cc81083 SHA512 84ff324ad9e2eeb885f9523cf395cadcbe510d93d70b36609a27b5ea4e180b83dd4dda83f547f948e507594746a42ac43bdcfc0dc05c6b0cd9c92c9aeb205acb -DIST lgogdownloader-3.5.tar.gz 87061 BLAKE2B bde2a8f2c229c9bf62fe83650e81c950806a6c6b9e4f591f08931082f59a961f39c16b5c18c8787edd46555e257354e71e0f1d009de1881f4d25257b28725996 SHA512 e3ce9d4932f9cda362b1472bd5eb605b01d1e9214b79e2d88fa4c2f02b0d54082df68b2f197d714e71a72d57be746dbf0afed68b3316888fdfa6e02c31611ee0 -EBUILD lgogdownloader-3.5.ebuild 882 BLAKE2B 67ce600dc8174980d0de73287819f5d14723a82fdd249b5c4d68ee65f65aec127e314eecb68ccc4bf26ac1faeb1e7d0e18b880174cd2f1cc0fbc61110d8a48e1 SHA512 3e8611b040693e44fded38bd196fdaf8c646da9413a64692c90dbd24bbfc4aeda5f37f33a121394f4cecc6b8de47c41770b89a880745099df2897fc8cb63993a -EBUILD lgogdownloader-9999.ebuild 818 BLAKE2B 7878d55d83a8551012c5470114b32db492a6c689f8d9706b8f64fab786875fba9123abc1235b11fefe5925ad4ff5bd4aef15fd28fcf1ad18914cae2457b8491a SHA512 4fdf98eb21701cc70c8ad82694609db0f7ce0456085b751d47d990ddb577b2588b35f6ed266945bb298167a530215ba7244bced52a9fdef20edcf125276b662b +DIST lgogdownloader-3.6.tar.gz 85470 BLAKE2B 8dafbbbc0653629f5fda2a54f7f0609924d02e4266a018ebdc04abbdfa0ad97e9bdb1f33f5a1e8cb24695cf9c45c2abbbc4857f7eb8650dbc73feef9c6dd9f54 SHA512 e03b1f50a227aa9295071a309eaac4110592b1f50b8379298605d4995e83cde27039e3b3f074c6cd47f6e6971aafe756d619619b7e24f5960b8f271fa1081793 +EBUILD lgogdownloader-3.6.ebuild 818 BLAKE2B ba156c0b1cf76edead3ac903ebcc0f65fffe51b7b49b5885c6284aeefe5af555528de60ab7fa5775007d41ea69353baa2e0a2a04c5ebe537702dfc17b29d7db2 SHA512 b21a7f23db1aad57c617b40b22cb1949e9f9c99d6875e3040d386e356278aa2150a471757840590179d90bc550ead784ac0e9e810cecfe5400492a48404ab17f +EBUILD lgogdownloader-9999.ebuild 796 BLAKE2B f8c3efb3644e7e8a179db0311323c1254d774fade7857e4c7fbf2722e2cf4b920112de20eee9ad3b18e7b2b9bd2f4c86343e4498c396ff3fd135f896e34136ba SHA512 c811cf3af322e2817111134c77de6f20cab346b532a8b7759be2d3d2955ca803f4903045182642133f7a14c83a4cf0206bb1e6f027f86342ae2a0a8884359cb5 MISC metadata.xml 1097 BLAKE2B 029a2a56a669431f4128f2e3c375f66a03c91e101b4d18555cbff0d7e0840025b5cace7c7eae5a98f5c2a79d2ace2c0caf8824b6d29ccccd67de98fee188e924 SHA512 2dbc9390d544b0c5c215dcf6788ced1bcbf0de677dafbafa500725d4968b0ab733df82c4799c62cbe30fb058ffdc7332cb7bd1459f872093e777ce9e108ce720 diff --git a/games-util/lgogdownloader/files/jsoncpp.patch b/games-util/lgogdownloader/files/jsoncpp.patch deleted file mode 100644 index d865903129d6..000000000000 --- a/games-util/lgogdownloader/files/jsoncpp.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ff353126ecda61824cf866d3807c9ebada96282e Mon Sep 17 00:00:00 2001 -From: James Le Cuirot -Date: Wed, 20 Nov 2019 22:24:10 +0000 -Subject: [PATCH] Fix find_path for newer jsoncpp release - -features.h was renamed but allocator.h wasn't so the latter works with -both old and new versions. ---- - cmake/FindJsoncpp.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/FindJsoncpp.cmake b/cmake/FindJsoncpp.cmake -index 5731980..0c8e0fb 100644 ---- a/cmake/FindJsoncpp.cmake -+++ b/cmake/FindJsoncpp.cmake -@@ -10,7 +10,7 @@ pkg_check_modules(PC_JSONCPP REQUIRED jsoncpp) - - find_path(JSONCPP_INCLUDE_DIR - NAMES -- json/features.h -+ json/allocator.h - HINTS - ${PC_JSONCPP_INCLUDEDIR} - ${PC_JSONCPP_INCLUDEDIRS} --- -2.23.0 - diff --git a/games-util/lgogdownloader/lgogdownloader-3.5.ebuild b/games-util/lgogdownloader/lgogdownloader-3.5.ebuild deleted file mode 100644 index a9948879d367..000000000000 --- a/games-util/lgogdownloader/lgogdownloader-3.5.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Unofficial GOG.com downloader for Linux" -HOMEPAGE="https://sites.google.com/site/gogdownloader/" -SRC_URI="https://sites.google.com/site/gogdownloader/${P}.tar.gz" -LICENSE="WTFPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gui" - -RDEPEND=">=app-crypt/rhash-1.3.3-r2:0= - dev-cpp/htmlcxx:0= - dev-libs/boost:0= - >=dev-libs/jsoncpp-1.7:0= - dev-libs/tinyxml2:0= - net-libs/liboauth:0= - >=net-misc/curl-7.32:0=[ssl] - gui? ( dev-qt/qtwebengine:5=[widgets] )" - -DEPEND="${RDEPEND}" - -BDEPEND="sys-apps/help2man - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/jsoncpp.patch -) - -src_configure() { - local mycmakeargs=( - -DUSE_QT_GUI=$(usex gui) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - gunzip "${ED}"/usr/share/man/man1/${PN}.1.gz || die -} diff --git a/games-util/lgogdownloader/lgogdownloader-3.6.ebuild b/games-util/lgogdownloader/lgogdownloader-3.6.ebuild new file mode 100644 index 000000000000..fa94c0f4adca --- /dev/null +++ b/games-util/lgogdownloader/lgogdownloader-3.6.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Unofficial GOG.com downloader for Linux" +HOMEPAGE="https://sites.google.com/site/gogdownloader/" +SRC_URI="https://sites.google.com/site/gogdownloader/${P}.tar.gz" +LICENSE="WTFPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gui" + +RDEPEND=">=app-crypt/rhash-1.3.3-r2:0= + dev-cpp/htmlcxx:0= + dev-libs/boost:0= + >=dev-libs/jsoncpp-1.7:0= + dev-libs/tinyxml2:0= + >=net-misc/curl-7.32:0=[ssl] + gui? ( dev-qt/qtwebengine:5=[widgets] )" + +DEPEND="${RDEPEND}" + +BDEPEND="sys-apps/help2man + virtual/pkgconfig" + +src_configure() { + local mycmakeargs=( + -DUSE_QT_GUI=$(usex gui) + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + gunzip "${ED}"/usr/share/man/man1/${PN}.1.gz || die +} diff --git a/games-util/lgogdownloader/lgogdownloader-9999.ebuild b/games-util/lgogdownloader/lgogdownloader-9999.ebuild index 45cbec465be6..4ea44e56d155 100644 --- a/games-util/lgogdownloader/lgogdownloader-9999.ebuild +++ b/games-util/lgogdownloader/lgogdownloader-9999.ebuild @@ -17,7 +17,6 @@ RDEPEND=">=app-crypt/rhash-1.3.3-r2:0= dev-libs/boost:0= >=dev-libs/jsoncpp-1.7:0= dev-libs/tinyxml2:0= - net-libs/liboauth:0= >=net-misc/curl-7.32:0=[ssl] gui? ( dev-qt/qtwebengine:5=[widgets] )" diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest index d7d9d8ab1a4d..9596635d4465 100644 --- a/games-util/pyfa/Manifest +++ b/games-util/pyfa/Manifest @@ -1,11 +1,9 @@ AUX configforced-1.15.1.py 153 BLAKE2B 135edf54e69c985693bcdde747eba5e46f7ed1390a77e1a1d40c0a624f3605c3ec8dad2f3526cbd8f406ed39fc67d3b027b7e7e462bbfa48c5649c71f0692da6 SHA512 632576b9fbff3e93c26b6c2d4be74298aa8657affe82d2c5d571a645d733a7b96d5db6b89b819d3aec9ca68e4bef11e368f7c1cbac416e9bfed88a1025a46bfe AUX pyfa-2.9.3-import-pyfa.patch 666 BLAKE2B 13b67511a64be93335453b617e1fad56768c9c582da4ebbef36b4848aca225220e2057c0fab088a060cc2149aed961f2063a1a34326b71f0cf3bb411105a77a7 SHA512 a0174726777d82229dcd167b005e176012a9c4398f066f183bf0b8d59bd1854411e74bca1c3848396a8c50be327c8ec4e21dde6d56d045b2af4cd13a68e0cc99 AUX pyfa.desktop 155 BLAKE2B bccfc81c4bc7dd9099ac4bd11fdb0d5f8d72b53b5dc8a700147e7e5996b14aac9e4b46e2884a473ecc8d8b1f49305e66c46cbc7e6c5e43e93e5a3fa71c5efa08 SHA512 d62a44e4e724057581a360cc1eb10aa4c7a0c50cb1d95137e58ba14db17644c852da2582be8d508c50b7359e7f99dc893d78d15cb11c46967a9b7896ff667781 -DIST pyfa-2.14.1.tar.gz 14452477 BLAKE2B e4c688cff14eecaa71f86fb9e22f6a585a3136a4bd7df65c8dd65ed82c2aa9e530210134daaba25251df92dc55a7e538474b39c1d54e4bcb1817eac17791d517 SHA512 d3d3219fa37f44c81d85165c7e780261e149b47db147417ea26edaff448484ce565607aded714a4f44ca23b8c1586c8597ace856020c4c319cea6d39f353b140 -DIST pyfa-2.15.1.tar.gz 14516568 BLAKE2B ba3b1170f35681ab33bece447b4bdf563c8f964037dc6b35cbd23360f7e36c61dd9074e34b5648c7a04b59ad192f5babd75ce2a935940a52e62de8cc174f7e5b SHA512 2d8fcb8608e31c135b8dac7239afe0a5acb0d32fba1291ce6ebafe093ef232c08f0aa42d172ebac5beefb7dba47aad9eb3833c679e3d02edc9cc056739c7538b DIST pyfa-2.17.0.tar.gz 12348275 BLAKE2B fd670a6d34760285561ed07e82c3c54eb9a74cad732b24b89fab103fe8013608c18f27461bfac28a854df3ce7273fac1011752a8da2447b69432ad36709c08dd SHA512 d4af2c6a30deb8b205e5db55c25e1fa48dc74b964c9d85da69acca9bbd19764b77abc96ff42a2e99733d132253081a3e2c3de6ef787c162e392a9627ab62c529 -EBUILD pyfa-2.14.1.ebuild 2807 BLAKE2B 0ac7d54fa394babc6ce843b428786c76952f2ede30e38f691d33a6b60aeb2a20f1e1ef79b8de5e299db5f8761b6b8628044ab71cbbc330feb2a78e4b2d95305d SHA512 5fe53304f63f11edaab725003a8cf61e1143b7a15894f438b27ee129e5fae553a39c797d38ecde201143fb774aff5fb8ea40d0791fb293f4a6a6d8c1b720be63 -EBUILD pyfa-2.15.1-r1.ebuild 2786 BLAKE2B f581cab4f597f217540ece2b71c59bb0c29e90cdb10d451ff30d5d50bfdd59ada3b5cc808f41c3359ca600d6b20476ca91c74ccbec85716a581a6a9582639857 SHA512 3d12fcecbd06b437ddbab27a6610bf40e4d7058c14c58ef6d74103b8f54fd189866dd466bfe72c448f7d8e86490d33e1804b5bd30848105781fc88da6eafb3f4 +DIST pyfa-2.19.0.tar.gz 11822419 BLAKE2B 7aaa9d8fc7de7ab9fb246bdf1dd61aa4aac6035d37cc6ecf9e32b03e67baada7d3dc765d02a7d9ed75f5933ccd76f92c4ae79c822c0562f8658dd1b52dfdba4d SHA512 5083f125cfd7f5d32e76029a836089cb79c5c6c93397712d37054518ed9bd77092d0c610cecdb1d0afce40753276431cdec72699ffc04088162158b55c04bac8 EBUILD pyfa-2.17.0.ebuild 2786 BLAKE2B 2504240e044dac7512c17b6f776a0f3aaf96c662e5a5927f12193e62ee6db614e66f8e7fcd592f1b91429ec77684f3c1770b825fe9c5e0121e33dc94e73bdff2 SHA512 25067ab2c303fc14640291184735387509f65f16a55f819d7f0270ad8ff039ab50d45044235330ee7c0652ec9154fadf19e9f7cd426c821987ceb49e38d3bda9 +EBUILD pyfa-2.19.0.ebuild 2781 BLAKE2B bb6b40555f93f98accc153b9be2c3eba2bcaab6b3f35629110e61f91f5f2475a3a217a69e3f976031410e2aa87f0efaf22807b69b065567bb791dfa2c94198d9 SHA512 96cf37416bf74db7dddaedb0e02d06aa471cb80a7fcd3329be8afdd9be79b709d9616c587d80c0951c8e584194df14bc0acfa4af94d063c4257dec2de861da10 EBUILD pyfa-9999.ebuild 2786 BLAKE2B 2504240e044dac7512c17b6f776a0f3aaf96c662e5a5927f12193e62ee6db614e66f8e7fcd592f1b91429ec77684f3c1770b825fe9c5e0121e33dc94e73bdff2 SHA512 25067ab2c303fc14640291184735387509f65f16a55f819d7f0270ad8ff039ab50d45044235330ee7c0652ec9154fadf19e9f7cd426c821987ceb49e38d3bda9 -MISC metadata.xml 817 BLAKE2B 3756e4c4cd95064bfdfb74ffccbc1162b457e620cd4b99f1c4c04943443a83cec1a5642056f219dfc090c37a230dfadc07dacd0e6f2d7a9380804e951c1d8c86 SHA512 3323fe99b3a0768fddc07ae1ca23e099e8097717c382ec9a9cd2f63b293f6caf8d9164140548f2a4b2754e925d1e1302ba1a56c0320eb343f5a7ff0206d88811 +MISC metadata.xml 744 BLAKE2B b87f7086163bc63184cbc2ccae8d5db50dd7133d70dd1c737b8c7c180c3069550eb0eb4e216133236d62edfa066fcb7eded8702e16b17360230434a366d5d8ea SHA512 d52dc69cc53d2c6a6fffa3c8c097c74f6d6657d0cbb135bdb5bd9fb9e13a56c7b13deed6eec55d7a88617392543ea2a3a2a29d7c35140765a0f8a04b84b919c6 diff --git a/games-util/pyfa/metadata.xml b/games-util/pyfa/metadata.xml index c556f4ff0717..9633f2d9a69b 100644 --- a/games-util/pyfa/metadata.xml +++ b/games-util/pyfa/metadata.xml @@ -15,9 +15,6 @@ fittings for the EVE Online SciFi MMORPG. It provides many advanced features such as graphs and full calculations of any possible combination of modules, fits, etc. - - Enable support for graphs - pyfa-org/Pyfa diff --git a/games-util/pyfa/pyfa-2.14.1.ebuild b/games-util/pyfa/pyfa-2.14.1.ebuild deleted file mode 100644 index 51e160ed66cc..000000000000 --- a/games-util/pyfa/pyfa-2.14.1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=( python3_6 ) -PYTHON_REQ_USE="sqlite,threads" - -inherit desktop eutils python-single-r1 xdg-utils - -DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online" -HOMEPAGE="https://github.com/pyfa-org/Pyfa" - -LICENSE="GPL-3+ all-rights-reserved" -SLOT="0" -if [[ ${PV} = 9999 ]]; then - EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git" - inherit git-r3 -else - SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" - S=${WORKDIR}/Pyfa-${PV} -fi -IUSE="+graph" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="mirror bindist" - -DEPEND=" - $(python_gen_cond_dep ' - >=dev-python/cryptography-2.3[${PYTHON_MULTI_USEDEP}] - >=dev-python/logbook-1.0.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/pyyaml-5.1[${PYTHON_MULTI_USEDEP}] - >=dev-python/sqlalchemy-1.3.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/wxpython-4.0.4[webkit,${PYTHON_MULTI_USEDEP}] - ')" -RDEPEND="${DEPEND} - $(python_gen_cond_dep ' - >=dev-python/beautifulsoup-4.6.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/markdown2-2.3.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/packaging-16.8[${PYTHON_MULTI_USEDEP}] - dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] - >=dev-python/requests-2.0.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/roman-2.0.0[${PYTHON_MULTI_USEDEP}] - graph? ( - >=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_MULTI_USEDEP}] - dev-python/numpy[${PYTHON_MULTI_USEDEP}] ) - ') - ${PYTHON_DEPS}" -BDEPEND="app-arch/zip" - -PATCHES=( - # fix import path in the main script for systemwide installation - "${FILESDIR}/${PN}-2.9.3-import-pyfa.patch" - ) - -src_prepare() { - # get rid of CRLF line endings introduced in 1.1.10 so patches work - edos2unix config.py pyfa.py gui/bitmap_loader.py service/settings.py - - default - - # make python recognize pyfa as a package - touch __init__.py || die - - sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ - -e "s:%%EPREFIX%%:${EPREFIX}:" \ - "${FILESDIR}/configforced-1.15.1.py" > configforced.py || die - sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ - pyfa.py > pyfa || die -} - -src_install() { - python_moduleinto ${PN} - python_domodule eos gui service utils graphs - python_domodule config*.py __init__.py version.yml configforced.py db_update.py - python_doscript pyfa - - insinto /usr/share/${PN} - - einfo "Creating database ..." - python ./db_update.py || die - doins eve.db - - einfo "Compressing images ..." - pushd imgs > /dev/null || die - zip -r imgs.zip * || die "zip failed" - doins imgs.zip - popd > /dev/null || die - - dodoc README.md - doicon -s 32 imgs/gui/pyfa.png - newicon -s 64 imgs/gui/pyfa64.png pyfa.png - domenu "${FILESDIR}/${PN}.desktop" -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/games-util/pyfa/pyfa-2.15.1-r1.ebuild b/games-util/pyfa/pyfa-2.15.1-r1.ebuild deleted file mode 100644 index 5c6b262d499b..000000000000 --- a/games-util/pyfa/pyfa-2.15.1-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=( python3_6 ) -PYTHON_REQ_USE="sqlite,threads" - -inherit desktop eutils python-single-r1 xdg-utils - -DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online" -HOMEPAGE="https://github.com/pyfa-org/Pyfa" - -LICENSE="GPL-3+ all-rights-reserved" -SLOT="0" -if [[ ${PV} = 9999 ]]; then - EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git" - inherit git-r3 -else - SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" - S=${WORKDIR}/Pyfa-${PV} -fi -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="mirror bindist" - -DEPEND=" - $(python_gen_cond_dep ' - >=dev-python/cryptography-2.3[${PYTHON_MULTI_USEDEP}] - >=dev-python/logbook-1.0.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/pyyaml-5.1[${PYTHON_MULTI_USEDEP}] - >=dev-python/sqlalchemy-1.3.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/wxpython-4.0.4[webkit,${PYTHON_MULTI_USEDEP}] - ') - ${PYTHON_DEPS}" -RDEPEND="${DEPEND} - $(python_gen_cond_dep ' - >=dev-python/beautifulsoup-4.6.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/markdown2-2.3.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/packaging-16.8[${PYTHON_MULTI_USEDEP}] - dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] - >=dev-python/requests-2.0.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/roman-2.0.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_MULTI_USEDEP}] - dev-python/numpy[${PYTHON_MULTI_USEDEP}] - ')" -BDEPEND="app-arch/zip" - -PATCHES=( - # fix import path in the main script for systemwide installation - "${FILESDIR}/${PN}-2.9.3-import-pyfa.patch" - ) - -src_prepare() { - # get rid of CRLF line endings introduced in 1.1.10 so patches work - edos2unix config.py pyfa.py gui/bitmap_loader.py service/settings.py - - default - - # make python recognize pyfa as a package - touch __init__.py || die - - sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ - -e "s:%%EPREFIX%%:${EPREFIX}:" \ - "${FILESDIR}/configforced-1.15.1.py" > configforced.py || die - sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ - pyfa.py > pyfa || die -} - -src_install() { - python_moduleinto ${PN} - python_domodule eos gui service utils graphs - python_domodule config*.py __init__.py version.yml configforced.py db_update.py - python_doscript pyfa - - insinto /usr/share/${PN} - - einfo "Creating database ..." - python ./db_update.py || die - doins eve.db - - einfo "Compressing images ..." - pushd imgs > /dev/null || die - zip -r imgs.zip * || die "zip failed" - doins imgs.zip - popd > /dev/null || die - - dodoc README.md - doicon -s 32 imgs/gui/pyfa.png - newicon -s 64 imgs/gui/pyfa64.png pyfa.png - domenu "${FILESDIR}/${PN}.desktop" -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/games-util/pyfa/pyfa-2.19.0.ebuild b/games-util/pyfa/pyfa-2.19.0.ebuild new file mode 100644 index 000000000000..c1952e88595f --- /dev/null +++ b/games-util/pyfa/pyfa-2.19.0.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_6 ) +PYTHON_REQ_USE="sqlite,threads" + +inherit desktop eutils python-single-r1 xdg-utils + +DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online" +HOMEPAGE="https://github.com/pyfa-org/Pyfa" + +LICENSE="GPL-3+ all-rights-reserved" +SLOT="0" +if [[ ${PV} = 9999 ]]; then + EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git" + inherit git-r3 +else + SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/Pyfa-${PV}" +fi + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="mirror bindist" + +DEPEND=" + $(python_gen_cond_dep ' + >=dev-python/cryptography-2.3[${PYTHON_MULTI_USEDEP}] + >=dev-python/logbook-1.0.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/pyyaml-5.1[${PYTHON_MULTI_USEDEP}] + >=dev-python/sqlalchemy-1.3.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/wxpython-4.0.4[webkit,${PYTHON_MULTI_USEDEP}] + ') + ${PYTHON_DEPS}" +RDEPEND="${DEPEND} + $(python_gen_cond_dep ' + >=dev-python/beautifulsoup-4.6.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/markdown2-2.3.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/packaging-16.8[${PYTHON_MULTI_USEDEP}] + dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] + >=dev-python/requests-2.0.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/roman-2.0.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/matplotlib-3.1.2[wxwidgets,${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + ')" +BDEPEND="app-arch/zip" + +PATCHES=( + # fix import path in the main script for systemwide installation + "${FILESDIR}/${PN}-2.9.3-import-pyfa.patch" +) + +src_prepare() { + # get rid of CRLF line endings introduced in 1.1.10 so patches work + edos2unix config.py pyfa.py gui/bitmap_loader.py service/settings.py + + default + + # make python recognize pyfa as a package + touch __init__.py || die + + sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ + -e "s:%%EPREFIX%%:${EPREFIX}:" \ + "${FILESDIR}/configforced-1.15.1.py" > configforced.py || die + sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ + pyfa.py > pyfa || die +} + +src_install() { + python_moduleinto ${PN} + python_domodule eos gui service utils graphs + python_domodule config*.py __init__.py version.yml configforced.py db_update.py + python_doscript pyfa + + insinto /usr/share/${PN} + + einfo "Creating database ..." + python ./db_update.py || die + doins eve.db + + einfo "Compressing images ..." + pushd imgs > /dev/null || die + zip -r imgs.zip * || die "zip failed" + doins imgs.zip + popd > /dev/null || die + + dodoc README.md + doicon -s 32 imgs/gui/pyfa.png + newicon -s 64 imgs/gui/pyfa64.png pyfa.png + domenu "${FILESDIR}/${PN}.desktop" +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/games-util/springlobby/Manifest b/games-util/springlobby/Manifest index 03373294acef..962337ddae31 100644 --- a/games-util/springlobby/Manifest +++ b/games-util/springlobby/Manifest @@ -1,5 +1,7 @@ DIST springlobby-0.266.tar.bz2 2642384 BLAKE2B 93444df4e139a657dc5d87b0ea9e796bd025259663693de9dcb04760ee611674546170813d71406e94aa456834cc96c8bc811ee5cf65b0bd0199cf66b4a51a50 SHA512 dc1a5e408515cb82004bf66bc014ebdd451eaea07d3543094cec494beb6d87165bdc0ac3672d6474a13d1918b1405507ee97ead05b9f1663789416b072aa6d6b DIST springlobby-0.267.tar.bz2 2642229 BLAKE2B 591eddda344ea4ce4ed7cad433bd7d46c7b2e727d7f97c07541cc00c6991fb1a9a62e8980f6a0249e6a509e475fe300aeb040ff1886f2da77b176b52d196db90 SHA512 6127bd7377f9a843b23df6dae7a07af1122f6ec5fa13cd8d16c0c7a3cc84e1f7af2fb7df929f904ee0b4e3abf12ae1e525ffb39b2afa0215433209054cf0de5f +DIST springlobby-0.269.tar.bz2 4576001 BLAKE2B bd55b480c98d74bc83f99bf32148ef2be5e1f59e1539fdb432430d5e36e653e1c3d550bc7a3c996e5df029a19ea729d456f34ae3522a2a6385a0d646697e537c SHA512 32e9b5bfc72bcfccd1487621e6035e7338977f7262702cd39ec2c43734bff5b8757a97428d1207f8e6721dd450c1cddd68e43cea416503dd1987596e61e126e1 EBUILD springlobby-0.266.ebuild 1069 BLAKE2B 1c7652169a03cc51e5d7891ecf1d2fc9b7afa0d58b1c6b5fe94dd65992971d269a499b7951f689635a1e91e8f26e5e28c9f2e6fd4621ec1eb869b09ce12a04b0 SHA512 73cb9f0389d2a354ca7b6f620900f0798db6b94ae9aaffef9c47ea22b9843557795d9b8ae3ca1443ace21237fad463bec6cfce14400fd49df62d80b8bae04ad8 EBUILD springlobby-0.267.ebuild 1069 BLAKE2B 1c7652169a03cc51e5d7891ecf1d2fc9b7afa0d58b1c6b5fe94dd65992971d269a499b7951f689635a1e91e8f26e5e28c9f2e6fd4621ec1eb869b09ce12a04b0 SHA512 73cb9f0389d2a354ca7b6f620900f0798db6b94ae9aaffef9c47ea22b9843557795d9b8ae3ca1443ace21237fad463bec6cfce14400fd49df62d80b8bae04ad8 +EBUILD springlobby-0.269.ebuild 1049 BLAKE2B 5fdab39c6447599522bf3911c6fd83d31992384f244cbe3462c15bc9fb8bc254b4e29054afc9fefa722ae6add95706725bf1417a5fe59e693f83f6c4ce85ab02 SHA512 97cec0d40ea58ad54f35f5b33e61075b5772b855b705ace3d317548dbe8593f156d14d38b214052467b769aa8304453c8df5f064c66ba58feb6bd7067ca972b4 MISC metadata.xml 1168 BLAKE2B 52a394c332bed809d549cf76a750a35cb0c0bcb6af1cf2276d81958abafa6272e58d59d07762929ef05ccece16d5465d5c353dd71974b4ec2657ae99e3d607a5 SHA512 901e3865f60e798625d59085e38e191a256819e5aa0778210190ebc0a08f183b263c3391409079c499a2e2cb6740503371642f0c13eec1e59a8699060c00b59c diff --git a/games-util/springlobby/springlobby-0.269.ebuild b/games-util/springlobby/springlobby-0.269.ebuild new file mode 100644 index 000000000000..d35dc36a2bb7 --- /dev/null +++ b/games-util/springlobby/springlobby-0.269.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +WX_GTK_VER="3.0" +inherit cmake xdg-utils wxwidgets + +DESCRIPTION="The official lobby client for SpringRTS community games" +HOMEPAGE="https://springlobby.springrts.com" +SRC_URI="https://springlobby.springrts.com/dl/stable/${P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug +libnotify +nls +sound" + +RDEPEND=" + dev-libs/openssl:0= + net-misc/curl + sys-libs/zlib[minizip] + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/wxGTK:${WX_GTK_VER}[X] + libnotify? ( x11-libs/libnotify ) + sound? ( + media-libs/alure + media-libs/openal + ) +" + +DEPEND="${RDEPEND}" + +BDEPEND="nls? ( sys-devel/gettext )" + +src_configure() { + setup-wxwidgets + local mycmakeargs=( + -DOPTION_NOTIFY=$(usex libnotify) + -DOPTION_SOUND=$(usex sound) + -DOPTION_TRANSLATION_SUPPORT=$(usex nls) + -DAUX_VERSION="(Gentoo,${ARCH})" + ) + cmake_src_configure +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/games-util/umodpack/Manifest b/games-util/umodpack/Manifest index 88f4fb7cc9ba..a879c7200512 100644 --- a/games-util/umodpack/Manifest +++ b/games-util/umodpack/Manifest @@ -1,3 +1,4 @@ +AUX umodpack-fixes.patch 4206 BLAKE2B 905d5813a079b9cc7b7fab7e2cff2206bcca992873e04ea2b450fda2b3425561af1bd1b4dd23f8e0c55f8beb3345adacde5d67b063265333aabb9aa6121847a7 SHA512 cfd9864e310818af23955a85eae4c9ec481d6aeb788a006bb35c30501341f2fed56347935aba128b1578c68a95a9a98335a67a0298447cd235790aec16117423 DIST umodpack-0.5b16-allinone.tar.gz 3605080 BLAKE2B 718208835f318c85305f266a23f9fa5c2966031924d4d4e3a5cdee649afaee64ed5ac753e630ef6783a49581b932a44d8b0dafa3e97603eb1706190f3c7e10d5 SHA512 3678507c7aec30043f50f5519935e2d5eb7471b5e0692ba8b27c506bdd7a067fdb055e6731a6bffb04bb3008020c889f3486624a1466a77e0eab3e5139003ff0 -EBUILD umodpack-0.5_beta16-r2.ebuild 968 BLAKE2B 23eaa1f37092fd58f7b01f8f3c9549f7b5e80ec20be6910cc91e803896fc8b7bfd95372c3c6da02473ae27df2c973f72c35879d7f2dfb88b34acfdddf8a5e1fa SHA512 e97de8824e672d0a6812868133cee06b3452a35f595b88a0f9fea06f2fd7a96b0d557a7081cda9d16283855d1cc76b33eb6607a6dabb664989b7817950943b41 +EBUILD umodpack-0.5_beta16-r3.ebuild 1096 BLAKE2B 3852870eedf03fd1d24b4e6c528e0c312af7bd3ea24db631bb144de8d6371449838dcf3b554978082fc50c18fc1b9984e8da277eccc98dec1e14f6d966a08c22 SHA512 a243fd25b14841f8ca672990ac38444762787a18617959f264b6ec16304a3ea325b71fb947f3744c44522760a26926f875a3bf589d58f806258092efc0d2ed06 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/games-util/umodpack/files/umodpack-fixes.patch b/games-util/umodpack/files/umodpack-fixes.patch new file mode 100644 index 000000000000..13bcad6c9ea9 --- /dev/null +++ b/games-util/umodpack/files/umodpack-fixes.patch @@ -0,0 +1,138 @@ +diff -Naur a/Config-Ini-1.06/test.pl b/Config-Ini-1.06/test.pl +--- a/Config-Ini-1.06/test.pl 2020-04-05 21:08:14.033277147 +0100 ++++ b/Config-Ini-1.06/test.pl 2020-04-05 21:08:04.576074986 +0100 +@@ -11,9 +11,9 @@ + + ######################### End of black magic. + +-use POSIX qw(tmpnam); +-do { $tmpfile = tmpnam() } until open TMPFILE, ">$tmpfile"; +-print TMPFILE < 0); ++print $tmpfh <save; +-open TMPFILE, "<$tmpfile"; ++open $tmpfh, "<$tmpfile"; + undef $/; +-$wholefile = ; ++$wholefile = <$tmpfh>; + $/ = "\n"; +-close TMPFILE; ++close $tmpfh; + $shouldbe = <$tmpfile"; ++( $tmpfh, $tmpfile ) = tempfile(UNLINK => 0); + $ini->save($tmpfile); + + # test decoder +@@ -254,8 +254,8 @@ + unlink $tmpfile; + + # test comment delimiter +-do { $tmpfile = tmpnam() } until open TMPFILE, ">$tmpfile"; +-print TMPFILE < 0); ++print $tmpfh < '#'); + +diff -Naur a/Makefile.PL b/Makefile.PL +--- a/Makefile.PL 2001-01-18 16:20:37.000000000 +0000 ++++ b/Makefile.PL 2020-04-05 21:08:32.335668386 +0100 +@@ -11,7 +11,6 @@ + 'PREREQ_PM' => { + 'Config::Ini' => 1.06, + 'Archive::Zip' => 0.07, +- 'Tk' => 800.020, + }, +- 'EXE_FILES' => [qw(umod xumod)], ++ 'EXE_FILES' => [qw(umod)], + ); +diff -Naur a/umod b/umod +--- a/umod 2020-04-05 21:08:14.033277147 +0100 ++++ b/umod 2020-04-05 21:08:04.576074986 +0100 +@@ -17,7 +17,8 @@ + use FileHandle; + use File::Find; + use Getopt::Long; +-use POSIX qw(tmpnam SEEK_END); ++use POSIX qw(SEEK_END); ++use File::Temp qw(tempfile); + use strict; + + =pod +@@ -520,7 +521,7 @@ + if( $filename =~ /\.zip$/i ) { + + my( $tmpFile, $fh ); +- do { $tmpFile = tmpnam(); } until $fh = new FileHandle( $tmpFile, 'w' ); ++ ( $fh, $tmpFile ) = tempfile(UNLINK => 0); + + my( $zipFile ) = new Archive::Zip; + if( $zipFile->read( $filename ) != AZ_OK ) { +diff -Naur a/Umod.pm b/Umod.pm +--- a/Umod.pm 2020-04-05 21:08:14.033277147 +0100 ++++ b/Umod.pm 2020-04-05 21:08:04.576074986 +0100 +@@ -400,22 +400,22 @@ + if( $ini->exists( ['Setup', 'Requires'] ) ) { + foreach my $requirement ( $ini->get( ['Setup', 'Requires'], + -mapping => 'multiple' ) ) { +- my( %hash ); +- %hash->{product} = $ini->get( [$requirement, 'Product'], ++ my( $hash ); ++ $hash->{product} = $ini->get( [$requirement, 'Product'], + -mapping => 'single' ); +- %hash->{version} = $ini->get( [$requirement, 'Version'], ++ $hash->{version} = $ini->get( [$requirement, 'Version'], + -mapping => 'single' ); +- %hash->{localproduct} = $ini->get( [$requirement, 'LocalProduct'], ++ $hash->{localproduct} = $ini->get( [$requirement, 'LocalProduct'], + -mapping => 'single' ); +- %hash->{producturl} = $ini->get( [$requirement, 'ProductURL'], ++ $hash->{producturl} = $ini->get( [$requirement, 'ProductURL'], + -mapping => 'single' ); +- %hash->{versionurl} = $ini->get( [$requirement, 'VersionURL'], ++ $hash->{versionurl} = $ini->get( [$requirement, 'VersionURL'], + -mapping => 'single' ); +- %hash->{developer} = $ini->get( [$requirement, 'Developer'], ++ $hash->{developer} = $ini->get( [$requirement, 'Developer'], + -mapping => 'single' ); +- %hash->{developerurl} = $ini->get( [$requirement, 'DeveloperURL'], ++ $hash->{developerurl} = $ini->get( [$requirement, 'DeveloperURL'], + -mapping => 'single' ); +- push( @requirements, \%hash ); ++ push( @requirements, \$hash ); + } + } + diff --git a/games-util/umodpack/umodpack-0.5_beta16-r2.ebuild b/games-util/umodpack/umodpack-0.5_beta16-r2.ebuild deleted file mode 100644 index 772fe6487292..000000000000 --- a/games-util/umodpack/umodpack-0.5_beta16-r2.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit perl-module toolchain-funcs - -MY_P=${P/_beta/b} -DESCRIPTION="portable and useful [un]packer for Unreal Tournament's Umod files" -HOMEPAGE="http://www.oldunreal.com/wiki/index.php?title=UmodPack" -SRC_URI="mirror://gentoo/${MY_P}-allinone.tar.gz" - -LICENSE="Artistic" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="tk" - -DEPEND="virtual/perl-IO-Compress - dev-perl/Archive-Zip - dev-perl/Tie-IxHash - tk? ( dev-perl/Tk )" -RDEPEND=${DEPEND} - -S=${WORKDIR}/${MY_P} -SRC_TEST="do parallel" - -src_prepare() { - # remove the stupid perl modules since we already installed em - rm -rf {Archive-Zip,Compress-Zlib,Tie-IxHash,Tk}* || die -} - -src_compile() { - perl-module_src_compile - - cd umr-0.3 || die - emake DEBUG=0 CFLAGS="${CFLAGS}" CC="$(tc-getCC)" -} - -src_install() { - mydoc="Changes" - perl-module_src_install - dobin umod umr-0.3/umr - if use tk ; then - dobin xumod - fi -} diff --git a/games-util/umodpack/umodpack-0.5_beta16-r3.ebuild b/games-util/umodpack/umodpack-0.5_beta16-r3.ebuild new file mode 100644 index 000000000000..d87d9347c4f7 --- /dev/null +++ b/games-util/umodpack/umodpack-0.5_beta16-r3.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit perl-module toolchain-funcs + +MY_P="${P/_beta/b}" +DESCRIPTION="Portable (un)packer for Unreal Tournament's Umod files" +HOMEPAGE="http://www.oldunreal.com/wiki/index.php?title=UmodPack" +SRC_URI="mirror://gentoo/${MY_P}-allinone.tar.gz" + +LICENSE="Artistic" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="virtual/perl-IO-Compress + dev-perl/Archive-Zip + dev-perl/Tie-IxHash" + +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" +PATCHES=( "${FILESDIR}"/${PN}-fixes.patch ) +DIST_TEST="do" + +src_prepare() { + default + + # Remove bundled Perl modules. + rm -rf {Archive-Zip,Compress-Zlib,Tie-IxHash,Tk}* || die +} + +src_compile() { + perl-module_src_compile + + cd umr-* || die + emake DEBUG=0 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" +} + +src_test() { + local line + perl-module_src_test | while read line; do + cat <<< "${line}" + [[ ${line} =~ ^not\ ok\ [0-9] ]] && die "test failed" + done +} + +src_install() { + perl-module_src_install + + cd umr-* || die + dobin umr + newdoc README README-umr + newdoc TODO TODO-umr +} -- cgit v1.2.3