From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- games-util/Manifest.gz | Bin 7060 -> 7233 bytes games-util/eureka/Manifest | 4 + games-util/eureka/eureka-1.27b.ebuild | 54 ++++++++++++++ games-util/eureka/files/eureka-Makefile.patch | 74 +++++++++++++++++++ games-util/eureka/metadata.xml | 11 +++ games-util/pyfa/Manifest | 4 +- games-util/pyfa/pyfa-2.20.3.ebuild | 101 ++++++++++++++++++++++++++ games-util/pyfa/pyfa-9999.ebuild | 11 +-- 8 files changed, 253 insertions(+), 6 deletions(-) create mode 100644 games-util/eureka/Manifest create mode 100644 games-util/eureka/eureka-1.27b.ebuild create mode 100644 games-util/eureka/files/eureka-Makefile.patch create mode 100644 games-util/eureka/metadata.xml create mode 100644 games-util/pyfa/pyfa-2.20.3.ebuild (limited to 'games-util') diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz index 03f504d52303..c3b034f2ebbb 100644 Binary files a/games-util/Manifest.gz and b/games-util/Manifest.gz differ diff --git a/games-util/eureka/Manifest b/games-util/eureka/Manifest new file mode 100644 index 000000000000..c5c942d3a179 --- /dev/null +++ b/games-util/eureka/Manifest @@ -0,0 +1,4 @@ +AUX eureka-Makefile.patch 2160 BLAKE2B 117678a7c675db817dac7ac4611391057a556bc6d7f38a8d8d97030010c7fae127462d701c3d1b430bb8b005e57dff2e858d0cbe03d893746e827532ae83a6b0 SHA512 65dee332d60eefbcd044853559af4b077ccc14f8e28cce4a02d70d1044ed4730f5edd1a35a9bf3a7ac3850f8a9d4378af80819195d66386040714ed688c58237 +DIST eureka-1.27b-source.tar.gz 1159366 BLAKE2B 00410b0cd53c907983241bf94c631c3068015e29ac947d092048a5701a4e0102d66d99134731b152a1310473dd30513e1fdc89bde82a5ede47185419575c9dd2 SHA512 4b2ce44a99acbe1b9dd2cf31ee5c3307f5f667422ba18bee8c3f9858e9244ee05c48e96b5afa4cdf65dfd079bca19a5693b6d123b5563549d1f84ca03137eb5e +EBUILD eureka-1.27b.ebuild 871 BLAKE2B 39420517d9b18eb35b93162621b57a302e86bb5e104c7461b2442fc078133d3a59632c5c45b29b645a56a6b8e7ca9cede96ef57de4cbcfa185c7cebf7760fa59 SHA512 2eb4bb6bd5f2bfb80e89321af4bba2f8d5f6a86fec312e3f0baba1aafa6d4a1204b94dd89f8439498b840fbe1164bc9f6d3b5fb509b3b752009d0dd75c447eb0 +MISC metadata.xml 336 BLAKE2B 7975793f7e44e1d4bac71dab7c7c74da68883929d0f034824d54d2f695f063892440af4c644e0093a304239845fb87af1caed3eecb64502f3525b24936eee1f9 SHA512 7295c72efea5de9dffc5e2d1fd0718844a83978265074a2d084510719ff912768779ef5d0ccc0e4e00bd06d6faa44daa4ad9ae6b85e78efedc0d411bac2ad718 diff --git a/games-util/eureka/eureka-1.27b.ebuild b/games-util/eureka/eureka-1.27b.ebuild new file mode 100644 index 000000000000..c88c2adcca1f --- /dev/null +++ b/games-util/eureka/eureka-1.27b.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop toolchain-funcs xdg + +DESCRIPTION="Graphical map editor for games using the DOOM engine" +HOMEPAGE="http://eureka-editor.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}-editor/Eureka/${PV%[a-z]}/${P}-source.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+opengl" + +DEPEND=" + sys-libs/zlib + x11-libs/fltk:1[opengl?] + opengl? ( + media-libs/glu + virtual/opengl + ) +" + +RDEPEND=" + ${DEPEND} +" + +S="${WORKDIR}/${P}-source" + +PATCHES=( + "${FILESDIR}"/${PN}-Makefile.patch +) + +DOCS=( + AUTHORS.txt + CHANGES.txt + README.txt + TODO.txt +) + +src_compile() { + emake \ + CXX="$(tc-getCXX)" \ + OPENGL="$(usex opengl 1 0)" +} + +src_install() { + emake install PREFIX="${ED}/usr" + einstalldocs + + doicon -s 32 misc/${PN}.xpm + domenu misc/${PN}.desktop +} diff --git a/games-util/eureka/files/eureka-Makefile.patch b/games-util/eureka/files/eureka-Makefile.patch new file mode 100644 index 000000000000..567f5476c037 --- /dev/null +++ b/games-util/eureka/files/eureka-Makefile.patch @@ -0,0 +1,74 @@ +From faf9c604becc44135d6c5a7c8427982e203a327f Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Fri, 8 May 2020 11:26:18 +0100 +Subject: [PATCH 1/2] Allow software rendering to be easily chosen over OpenGL + with OPENGL=0 + +--- + Makefile | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) + +diff --git a/Makefile b/Makefile +index ebbd53a4..adabaa92 100644 +--- a/Makefile ++++ b/Makefile +@@ -26,19 +26,26 @@ CPPFLAGS ?= + LDFLAGS ?= $(OPTIMISE) + LIBS ?= + ++# set this to 0 to use software rendering instead of OpenGL ++OPENGL = 1 ++ + # general things needed by Eureka + CXXFLAGS += $(CXX_DIALECT) +-LIBS += -lGLU -lGL + LIBS += -lz -lm ++FLTK_CONFIG_FLAGS = + +-# add this for software rendering, remove '--use-gl' below, remove -lGL and -lGLU from LIBS +-# CXXFLAGS += -DNO_OPENGL ++ifeq ($(OPENGL),1) ++LIBS += -lGLU -lGL ++FLTK_CONFIG_FLAGS += --use-gl ++else ++CXXFLAGS += -DNO_OPENGL ++endif + + # FLTK flags (this assumes a system-wide FLTK installation) + FLTK_CONFIG ?= fltk-config + +-CXXFLAGS += $(shell $(FLTK_CONFIG) --use-images --use-gl --cxxflags) +-LDFLAGS += $(shell $(FLTK_CONFIG) --use-images --use-gl --ldflags) ++CXXFLAGS += $(shell $(FLTK_CONFIG) --use-images --cxxflags $(FLTK_CONFIG_FLAGS)) ++LDFLAGS += $(shell $(FLTK_CONFIG) --use-images --ldflags $(FLTK_CONFIG_FLAGS)) + + # NOTE: the following is commented out since it does not work as expected. + # the --libs option gives us static libraries, but --ldflags option +-- +2.26.2 + +From decee12e317e58128420771392b77c44a7c81122 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Fri, 8 May 2020 11:27:49 +0100 +Subject: [PATCH 2/2] Ensure bin directory is present before installing binary + +It might not be when using DESTDIR. +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index adabaa92..424ad4b5 100644 +--- a/Makefile ++++ b/Makefile +@@ -158,6 +158,7 @@ stripped: all + INSTALL_DIR=$(DESTDIR)$(PREFIX)/share/eureka + + install: all ++ install -d $(DESTDIR)$(PREFIX)/bin + install -m 755 $(PROGRAM) $(DESTDIR)$(PREFIX)/bin/ + install -d $(INSTALL_DIR)/games + install -d $(INSTALL_DIR)/common +-- +2.26.2 + diff --git a/games-util/eureka/metadata.xml b/games-util/eureka/metadata.xml new file mode 100644 index 000000000000..d122d0e0090e --- /dev/null +++ b/games-util/eureka/metadata.xml @@ -0,0 +1,11 @@ + + + + + games@gentoo.org + Gentoo Games Project + + + eureka-editor + + diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest index 445d603e303c..aba03e49da66 100644 --- a/games-util/pyfa/Manifest +++ b/games-util/pyfa/Manifest @@ -5,9 +5,11 @@ DIST pyfa-2.17.0.tar.gz 12348275 BLAKE2B fd670a6d34760285561ed07e82c3c54eb9a74ca DIST pyfa-2.19.0.tar.gz 11822419 BLAKE2B 7aaa9d8fc7de7ab9fb246bdf1dd61aa4aac6035d37cc6ecf9e32b03e67baada7d3dc765d02a7d9ed75f5933ccd76f92c4ae79c822c0562f8658dd1b52dfdba4d SHA512 5083f125cfd7f5d32e76029a836089cb79c5c6c93397712d37054518ed9bd77092d0c610cecdb1d0afce40753276431cdec72699ffc04088162158b55c04bac8 DIST pyfa-2.20.1.tar.gz 11834967 BLAKE2B 6caf4abb5ff543aa0dc4747a853775a03e20fe8fce5f174d791429ad021ecf955895e108127182f1872f23ccad862892a1afa2e22af27aafd198100604993d62 SHA512 6e6e04f9cd6e3dd127d51c666cf88eb700cc783b02d0b31220196925bc64bb1d88ea2c6a36bc45d71ba62cc53074bd509b46edd175f02e7b1fc736af13ce41ef DIST pyfa-2.20.2.tar.gz 11835308 BLAKE2B 3482ba068720ca735a5f794ede38dffda61ff571552c57a268263820b5b9085c6059be64c739d4ce67a9c95a1c4ba44136cb6aaa2ee7454514924e8c2de7e128 SHA512 14066b81ae77e600367255fa9ba079192f79a8d01d0194b894ba616d7a225e58141b9c2b980e99bfdf17403e665d1968e62a805f845c5065f8ed47de7950e44c +DIST pyfa-2.20.3.tar.gz 11835182 BLAKE2B 0a298f565317a4a8894fda64dc01175080bf2d6b3d118168f0015dee5988742ddca4170faa72565e5b08bbb66752668e081b142e8d8d19b5fea019dc874e5306 SHA512 0971da1b3f6db6c8e4a0d5b24c5a7f267bbf10531ea0cf98263e779c86cbea419a783088f37a7f5d2b18b7f498f525d5c80724ebaf2cff1ae1e5290e2fac5704 EBUILD pyfa-2.17.0.ebuild 2786 BLAKE2B 2504240e044dac7512c17b6f776a0f3aaf96c662e5a5927f12193e62ee6db614e66f8e7fcd592f1b91429ec77684f3c1770b825fe9c5e0121e33dc94e73bdff2 SHA512 25067ab2c303fc14640291184735387509f65f16a55f819d7f0270ad8ff039ab50d45044235330ee7c0652ec9154fadf19e9f7cd426c821987ceb49e38d3bda9 EBUILD pyfa-2.19.0.ebuild 2781 BLAKE2B bb6b40555f93f98accc153b9be2c3eba2bcaab6b3f35629110e61f91f5f2475a3a217a69e3f976031410e2aa87f0efaf22807b69b065567bb791dfa2c94198d9 SHA512 96cf37416bf74db7dddaedb0e02d06aa471cb80a7fcd3329be8afdd9be79b709d9616c587d80c0951c8e584194df14bc0acfa4af94d063c4257dec2de861da10 EBUILD pyfa-2.20.1.ebuild 2781 BLAKE2B bb6b40555f93f98accc153b9be2c3eba2bcaab6b3f35629110e61f91f5f2475a3a217a69e3f976031410e2aa87f0efaf22807b69b065567bb791dfa2c94198d9 SHA512 96cf37416bf74db7dddaedb0e02d06aa471cb80a7fcd3329be8afdd9be79b709d9616c587d80c0951c8e584194df14bc0acfa4af94d063c4257dec2de861da10 EBUILD pyfa-2.20.2.ebuild 2781 BLAKE2B bb6b40555f93f98accc153b9be2c3eba2bcaab6b3f35629110e61f91f5f2475a3a217a69e3f976031410e2aa87f0efaf22807b69b065567bb791dfa2c94198d9 SHA512 96cf37416bf74db7dddaedb0e02d06aa471cb80a7fcd3329be8afdd9be79b709d9616c587d80c0951c8e584194df14bc0acfa4af94d063c4257dec2de861da10 -EBUILD pyfa-9999.ebuild 2786 BLAKE2B 2504240e044dac7512c17b6f776a0f3aaf96c662e5a5927f12193e62ee6db614e66f8e7fcd592f1b91429ec77684f3c1770b825fe9c5e0121e33dc94e73bdff2 SHA512 25067ab2c303fc14640291184735387509f65f16a55f819d7f0270ad8ff039ab50d45044235330ee7c0652ec9154fadf19e9f7cd426c821987ceb49e38d3bda9 +EBUILD pyfa-2.20.3.ebuild 2779 BLAKE2B 595cf7f51ce45295cbafef1c04a3723d0169559ec2ebbb859438cf37b748fecba045efcbd2100d3b25d91a183534cddbd2eeab842ab3a4044c0b482944426a84 SHA512 8f6f75ab154529c62947732a8d829d6a5d1210209f98e9e41683b23a8ec36a6461e5b339c0f6cdec2c198dc55b52e0c84aabe3b630c19a03db1e9b6785970eed +EBUILD pyfa-9999.ebuild 2779 BLAKE2B 595cf7f51ce45295cbafef1c04a3723d0169559ec2ebbb859438cf37b748fecba045efcbd2100d3b25d91a183534cddbd2eeab842ab3a4044c0b482944426a84 SHA512 8f6f75ab154529c62947732a8d829d6a5d1210209f98e9e41683b23a8ec36a6461e5b339c0f6cdec2c198dc55b52e0c84aabe3b630c19a03db1e9b6785970eed MISC metadata.xml 744 BLAKE2B b87f7086163bc63184cbc2ccae8d5db50dd7133d70dd1c737b8c7c180c3069550eb0eb4e216133236d62edfa066fcb7eded8702e16b17360230434a366d5d8ea SHA512 d52dc69cc53d2c6a6fffa3c8c097c74f6d6657d0cbb135bdb5bd9fb9e13a56c7b13deed6eec55d7a88617392543ea2a3a2a29d7c35140765a0f8a04b84b919c6 diff --git a/games-util/pyfa/pyfa-2.20.3.ebuild b/games-util/pyfa/pyfa-2.20.3.ebuild new file mode 100644 index 000000000000..254447e150c8 --- /dev/null +++ b/games-util/pyfa/pyfa-2.20.3.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,7,8} ) +PYTHON_REQ_USE="sqlite" + +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/pyfa/pyfa-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild index 145ca005c0d1..254447e150c8 100644 --- a/games-util/pyfa/pyfa-9999.ebuild +++ b/games-util/pyfa/pyfa-9999.ebuild @@ -2,8 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python3_6 ) -PYTHON_REQ_USE="sqlite,threads" + +PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_REQ_USE="sqlite" inherit desktop eutils python-single-r1 xdg-utils @@ -18,9 +19,9 @@ if [[ ${PV} = 9999 ]]; then else SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" - S=${WORKDIR}/Pyfa-${PV} + S="${WORKDIR}/Pyfa-${PV}" fi -IUSE="" + REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="mirror bindist" @@ -49,7 +50,7 @@ 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 -- cgit v1.2.3