From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- games-util/Manifest.gz | Bin 7385 -> 7726 bytes games-util/atlas/Manifest | 6 +- .../atlas/atlas-0.5.1_beta_pre20160907.ebuild | 67 ----- .../atlas/atlas-0.6.1_beta_pre20181202.ebuild | 58 +++++ .../atlas-0.5.1_beta_pre20160907-jpeg-9.patch | 27 -- ....5.1_beta_pre20160907-simgear-compilation.patch | 273 --------------------- games-util/etswitch/Manifest | 3 +- games-util/etswitch/etswitch-0.1.14-r1.ebuild | 17 +- .../files/etswitch-0.1.14-fno-common.patch | 22 ++ games-util/fteqcc/Manifest | 5 +- games-util/fteqcc/files/fteqcc-2501-Makefile.patch | 61 +++++ .../fteqcc/files/fteqcc-2501-cleanup-source.patch | 205 +++++++++++++--- games-util/fteqcc/fteqcc-2501.ebuild | 31 ++- games-util/game-device-udev-rules/Manifest | 4 + .../files/60-game-input-20201121.rules | 3 + .../game-device-udev-rules-20201121.ebuild | 80 ++++++ games-util/game-device-udev-rules/metadata.xml | 12 + games-util/grfcodec/Manifest | 3 +- .../grfcodec/files/grfcodec-6.0.6-gcc10.patch | 12 + games-util/grfcodec/grfcodec-6.0.6.ebuild | 4 +- games-util/lutris/Manifest | 4 +- games-util/lutris/lutris-0.5.7.ebuild | 78 ------ games-util/lutris/lutris-0.5.8.ebuild | 78 ++++++ games-util/pyfa/Manifest | 10 +- games-util/pyfa/pyfa-2.24.1.ebuild | 100 -------- games-util/pyfa/pyfa-2.28.3.ebuild | 92 ------- games-util/pyfa/pyfa-2.30.0.ebuild | 92 +++++++ games-util/pyfa/pyfa-2.31.0.ebuild | 92 +++++++ games-util/pyfa/pyfa-9999.ebuild | 12 +- games-util/sc-controller/Manifest | 4 + .../sc-controller/files/status-icon-click.patch | 28 +++ games-util/sc-controller/metadata.xml | 11 + .../sc-controller/sc-controller-0.4.8.1.ebuild | 33 +++ games-util/wit/Manifest | 7 +- games-util/wit/files/wit-2.30a-no-exec-stack.patch | 9 - games-util/wit/files/wit-3.02a-fno-common.patch | 11 + games-util/wit/files/wit-3.02a-makefile.patch | 113 ++++++++- games-util/wit/files/wit-3.02a-no-exec-stack.patch | 9 + games-util/wit/wit-3.02a.ebuild | 25 +- games-util/xqf/Manifest | 5 +- games-util/xqf/files/xqf-1.0.6.2-fno-common.patch | 21 ++ games-util/xqf/files/xqf-1.0.6.2-underlink.patch | 24 +- games-util/xqf/xqf-1.0.6.2.ebuild | 31 +-- 43 files changed, 1002 insertions(+), 780 deletions(-) delete mode 100644 games-util/atlas/atlas-0.5.1_beta_pre20160907.ebuild create mode 100644 games-util/atlas/atlas-0.6.1_beta_pre20181202.ebuild delete mode 100644 games-util/atlas/files/atlas-0.5.1_beta_pre20160907-jpeg-9.patch delete mode 100644 games-util/atlas/files/atlas-0.5.1_beta_pre20160907-simgear-compilation.patch create mode 100644 games-util/etswitch/files/etswitch-0.1.14-fno-common.patch create mode 100644 games-util/fteqcc/files/fteqcc-2501-Makefile.patch create mode 100644 games-util/game-device-udev-rules/Manifest create mode 100644 games-util/game-device-udev-rules/files/60-game-input-20201121.rules create mode 100644 games-util/game-device-udev-rules/game-device-udev-rules-20201121.ebuild create mode 100644 games-util/game-device-udev-rules/metadata.xml create mode 100644 games-util/grfcodec/files/grfcodec-6.0.6-gcc10.patch delete mode 100644 games-util/lutris/lutris-0.5.7.ebuild create mode 100644 games-util/lutris/lutris-0.5.8.ebuild delete mode 100644 games-util/pyfa/pyfa-2.24.1.ebuild delete mode 100644 games-util/pyfa/pyfa-2.28.3.ebuild create mode 100644 games-util/pyfa/pyfa-2.30.0.ebuild create mode 100644 games-util/pyfa/pyfa-2.31.0.ebuild create mode 100644 games-util/sc-controller/Manifest create mode 100644 games-util/sc-controller/files/status-icon-click.patch create mode 100644 games-util/sc-controller/metadata.xml create mode 100644 games-util/sc-controller/sc-controller-0.4.8.1.ebuild delete mode 100644 games-util/wit/files/wit-2.30a-no-exec-stack.patch create mode 100644 games-util/wit/files/wit-3.02a-fno-common.patch create mode 100644 games-util/wit/files/wit-3.02a-no-exec-stack.patch create mode 100644 games-util/xqf/files/xqf-1.0.6.2-fno-common.patch (limited to 'games-util') diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz index 21730d8fb39c..ed972ae1cc89 100644 Binary files a/games-util/Manifest.gz and b/games-util/Manifest.gz differ diff --git a/games-util/atlas/Manifest b/games-util/atlas/Manifest index 45da21f48b9b..2708c477e2db 100644 --- a/games-util/atlas/Manifest +++ b/games-util/atlas/Manifest @@ -1,5 +1,3 @@ -AUX atlas-0.5.1_beta_pre20160907-jpeg-9.patch 746 BLAKE2B 686bf154fd43d68f42c97d65ce0c0207cf65a206e9f931f0b5280149768d07a589248209e8286e9b80387c1af6e9d0a8d86d0f2213d640c828daba0ed58243d1 SHA512 0291dd266d23f6a5963a5095dac79cd001e16449fbbb5f5b3113253f3d252932be915f7afc0e4efa52f0e65f9117c446dabe9850ca9d8550219657916c3efd7a -AUX atlas-0.5.1_beta_pre20160907-simgear-compilation.patch 8125 BLAKE2B f5b0b2e27e191ff32a6006b4d2d4f200d4a1a6f387adace607a9e421cf16c55a15d2182691d3bbb5994de9870176da80b520d8de70d2532a11b9febb9a10245a SHA512 871e576cb95565b658379d76c285067c820f591f97bd1826a11f396742651aa7e783f85b9278039ab4bd2c8e6f9f0268323185a8219408c8f01fa67db65f856f -DIST atlas-hgcode-e183e3b3a0412b504edcb3664445b3e04fd484a2.zip 530005 BLAKE2B 3069f743ee83a1892283eebe27698c6360a90f67a05999f3f5cab8b786d976a4cd15151cbe8c7c1165b43cfb9e3265868a5b55b9364a82c5f78b1fe5f69dffcc SHA512 5f4453c81b01451ce69f4f1340a7c34736be3a9ecf638aa340455d0bb0af7a5d1a7e05d0b51e8b75f5c3acef4787d208ace75d4c686e8be7eafb8f81c71df360 -EBUILD atlas-0.5.1_beta_pre20160907.ebuild 1443 BLAKE2B 8034a33614806f445fc145f2624beb89ff51be79e5184a116a9d56d5f4c4814fb03cdf617ef2021d370b1e0b62f34546573c0dc4018dc18906c1f3c9b357dc39 SHA512 eac7b8e723e26ae10d0bc624ed7c48929864e1ba9814b62bcc3a9a1303658902da5540a39c6dc43c2fc944a557c3c5f039ba76a481d66ab7c4d56b5fd82eb094 +DIST atlas-hgcode-d4e5360f8273823205d9dc066547f5077ffc13e2.zip 795465 BLAKE2B 2e3afa478bf791bd96233bfcf8cfbbc9ecb41458591bbf8262c4c720bc4393b8f3b0c023fdf7a5f98a9e68ae89bc478660521eb79fe7a2b8f9c0b156917754c2 SHA512 fbad07ee7f416506bff6c338bb53f05b3c59759df23eeb732c8e525f2a4d7622941d018871357c3367ce8dea81d6b38d8811f65b0678e8e0bf572d5757f4221d +EBUILD atlas-0.6.1_beta_pre20181202.ebuild 1269 BLAKE2B cdab8922997e0583cba1fb6c327c3a4d00332d3e5de6066c4bce7dc5214423264e1dfb0549d045372a245c429c4c3a2df6c366ca0cbc43096743e62750dededf SHA512 22c871423a868bfa7704b7ae61d10128878db4f4c411dc36b5eb0a6a122ce98075a782634ce76c542da7d4b5c3cf138612beb9674ae286816c7b88ac959410ac MISC metadata.xml 440 BLAKE2B b07c76b0e7d3866e8a6f6e7ef2d73ea39a29e81c57cab9e77945124bf3817182434b504e9ec5022c40a764ce8d63e034b59eb92829e982c28db4d849f006d912 SHA512 761058431181d1ca1367ef68e464e7ee1a19a69576b46768a652be280ce7d161bcdf8f5d8b993a7d8a7ababe4a8e436f11ff3ee4ad1661b50e8a8c6edbf62158 diff --git a/games-util/atlas/atlas-0.5.1_beta_pre20160907.ebuild b/games-util/atlas/atlas-0.5.1_beta_pre20160907.ebuild deleted file mode 100644 index 6ddeb4506b56..000000000000 --- a/games-util/atlas/atlas-0.5.1_beta_pre20160907.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -MY_PN=atlas-hgcode -MY_PV=e183e3b3a0412b504edcb3664445b3e04fd484a2 -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="Chart Program to use with Flightgear Flight Simulator" -HOMEPAGE="http://atlas.sourceforge.net/" -SRC_URI="https://dev.gentoo.org/~reavertm/${MY_P}.zip" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -COMMON_DEPEND=" - media-libs/freeglut - media-libs/glew:0= - media-libs/libpng:0= - net-misc/curl - sys-libs/zlib - virtual/glu - virtual/jpeg:0 - virtual/opengl -" -DEPEND="${COMMON_DEPEND} - >=dev-games/simgear-3.0.0 - media-libs/plib -" -RDEPEND="${COMMON_DEPEND} - >=games-simulation/flightgear-3.0.0 -" -BDEPEND="app-arch/unzip" - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}/${P}-simgear-compilation.patch" - "${FILESDIR}/${P}-jpeg-9.patch" -) - -src_prepare() { - default - - # -Wnarrowing failure, #612986 - sed -i -e 's|0x|(char)0x|g' src/tiles.h || die - - eautoreconf -} - -src_configure() { - econf \ - --datadir="${EPREFIX}"/usr/share/flightgear \ - --enable-simgear-shared \ - --with-fgbase="${EPREFIX}"/usr/share/flightgear -} - -pkg_postinst() { - elog "To run Atlas concurrently with FlightGear use the following:" - elog "Atlas --path=[path of map images] --udp=[port number]" - elog "and start fgfs with the following switch (or in .fgfsrc):" - elog "--nmea=socket,out,0.5,[host that you run Atlas on],[port number],udp" -} diff --git a/games-util/atlas/atlas-0.6.1_beta_pre20181202.ebuild b/games-util/atlas/atlas-0.6.1_beta_pre20181202.ebuild new file mode 100644 index 000000000000..6f986b280580 --- /dev/null +++ b/games-util/atlas/atlas-0.6.1_beta_pre20181202.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +MY_PN=atlas-hgcode +MY_PV=d4e5360f8273823205d9dc066547f5077ffc13e2 +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="Chart Program to use with Flightgear Flight Simulator" +HOMEPAGE="http://atlas.sourceforge.net/" +SRC_URI="https://dev.gentoo.org/~reavertm/${MY_P}.zip" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +COMMON_DEPEND=" + media-libs/freeglut + media-libs/glew:0= + media-libs/libpng:0= + net-misc/curl + sys-libs/zlib + virtual/glu + virtual/jpeg:0 + virtual/opengl +" +DEPEND="${COMMON_DEPEND} + >=dev-games/simgear-3.0.0 + media-libs/plib +" +RDEPEND="${COMMON_DEPEND} + >=games-simulation/flightgear-3.0.0 +" +BDEPEND="app-arch/unzip" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --datadir="${EPREFIX}"/usr/share/flightgear \ + --enable-simgear-shared \ + --with-fgbase="${EPREFIX}"/usr/share/flightgear +} + +pkg_postinst() { + elog "To run Atlas concurrently with FlightGear use the following:" + elog "Atlas --path=[path of map images] --udp=[port number]" + elog "and start fgfs with the following switch (or in .fgfsrc):" + elog "--nmea=socket,out,0.5,[host that you run Atlas on],[port number],udp" +} diff --git a/games-util/atlas/files/atlas-0.5.1_beta_pre20160907-jpeg-9.patch b/games-util/atlas/files/atlas-0.5.1_beta_pre20160907-jpeg-9.patch deleted file mode 100644 index 639ff8217546..000000000000 --- a/games-util/atlas/files/atlas-0.5.1_beta_pre20160907-jpeg-9.patch +++ /dev/null @@ -1,27 +0,0 @@ -Fix build with jpeg-9. Bug # 520908 - ---- a/src/Image.cxx 2018-02-07 03:19:18.538699623 +0100 -+++ b/src/Image.cxx 2018-02-07 03:20:15.105160934 +0100 -@@ -29,11 +29,12 @@ - - // Other libraries' include files - #include --#include - - // Our project's include files - #include "misc.hxx" - -+#include -+ - // This is a constant representing "Not an Elevation" - it is - // guaranteed to be less than any possible real elevation value. - static const float NanE = -std::numeric_limits::max(); -@@ -266,7 +267,7 @@ - cinfo.in_color_space = JCS_RGB; - - jpeg_set_defaults(&cinfo); -- jpeg_set_quality(&cinfo, quality, true); -+ jpeg_set_quality(&cinfo, quality, TRUE); - - jpeg_start_compress(&cinfo, TRUE); - diff --git a/games-util/atlas/files/atlas-0.5.1_beta_pre20160907-simgear-compilation.patch b/games-util/atlas/files/atlas-0.5.1_beta_pre20160907-simgear-compilation.patch deleted file mode 100644 index f6e4d58bf3b2..000000000000 --- a/games-util/atlas/files/atlas-0.5.1_beta_pre20160907-simgear-compilation.patch +++ /dev/null @@ -1,273 +0,0 @@ -diff -r e183e3b3a041 configure.ac ---- a/configure.ac Tue Sep 06 22:12:05 2016 -0700 -+++ b/configure.ac Sat Mar 18 05:09:04 2017 +0100 -@@ -10,6 +10,8 @@ - AC_PREREQ(2.52) - AM_INIT_AUTOMAKE - -+CXXFLAGS="-std=c++11" -+ - dnl Checks for programs. - AC_PROG_MAKE_SET - AC_PROG_CC -diff -r e183e3b3a041 src/FlightTrack.cxx ---- a/src/FlightTrack.cxx Tue Sep 06 22:12:05 2016 -0700 -+++ b/src/FlightTrack.cxx Sat Mar 18 05:09:04 2017 +0100 -@@ -81,7 +81,7 @@ - throw runtime_error("flight file open failure"); - } - -- _file.set(filePath); -+ _file = SGPath(filePath); - - _port = -1; - _device = ""; -@@ -101,7 +101,7 @@ - _input_channel = new SGSocket("", portStr.str(), "udp"); - _input_channel->open(SG_IO_IN); - -- _file.set(""); -+ _file = SGPath(); - - _port = port; - _device = ""; -@@ -123,7 +123,7 @@ - _input_channel = new SGSerial(device, baudStr.str()); - _input_channel->open(SG_IO_IN); - -- _file.set(""); -+ _file = SGPath(); - - _port = -1; - _device = device; -@@ -399,11 +399,11 @@ - return _name.str(); - } - --void FlightTrack::setFilePath(char *path) -+void FlightTrack::setFilePath(const char *path) - { - // EYE - check for existing name? overwriting? - // EYE - call this (and other accessors) from constructors? -- _file.set(path); -+ _file = SGPath(path); - // We count this as a change. - _version++; - _versionAtLastSave = 0; -diff -r e183e3b3a041 src/FlightTrack.hxx ---- a/src/FlightTrack.hxx Tue Sep 06 22:12:05 2016 -0700 -+++ b/src/FlightTrack.hxx Sat Mar 18 05:09:04 2017 +0100 -@@ -141,7 +141,7 @@ - const char *fileName(); // File name - const char *filePath(); // Full path, including file - const char *niceName(); // Nicely formatted name -- void setFilePath(char *path); -+ void setFilePath(const char *path); - void save(); - bool modified(); - -diff -r e183e3b3a041 src/Geographics.cxx ---- a/src/Geographics.cxx Tue Sep 06 22:12:05 2016 -0700 -+++ b/src/Geographics.cxx Sat Mar 18 05:09:04 2017 +0100 -@@ -25,6 +25,7 @@ - #include "Geographics.hxx" - - // C++ system files -+#include - #include - - // Our project's include files -@@ -431,11 +432,11 @@ - bool AtlasCoord::_geodValid() const - { - // Note: this has to agree with the value set in invalidate()! -- return !isnan(_geod.getLatitudeDeg()); -+ return !std::isnan(_geod.getLatitudeDeg()); - } - - bool AtlasCoord::_cartValid() const - { - // Note: this has to agree with the value set in invalidate()! -- return !isnan(_cart.x()); -+ return !std::isnan(_cart.x()); - } -diff -r e183e3b3a041 src/Map.cxx ---- a/src/Map.cxx Tue Sep 06 22:12:05 2016 -0700 -+++ b/src/Map.cxx Sat Mar 18 05:09:04 2017 +0100 -@@ -168,13 +168,13 @@ - bool parse_arg(char* arg) - { - if (strncmp(arg, "--fg-root=", 10) == 0) { -- fg_root.set(arg + 10); -+ fg_root = SGPath(arg + 10); - } else if (strncmp(arg, "--fg-scenery=", 13) == 0) { -- scenery.set(arg + 13); -+ scenery = SGPath(arg + 13); - } else if (strncmp(arg, "--atlas=", 8) == 0) { -- atlas.set(arg + 8); -+ atlas = SGPath(arg + 8); - } else if (strncmp(arg, "--palette=", 10) == 0) { -- palette.set(arg + 10); -+ palette = SGPath(arg + 10); - } else if (strcmp(arg, "--png") == 0) { - imageType = TileMapper::PNG; - } else if (strcmp(arg, "--jpeg") == 0) { -@@ -272,23 +272,14 @@ - // Read the FG_ROOT and FG_SCENERY environment variables before - // processing .atlasmaprc and command args, so that we can - // override them if necessary. -- char *env = getenv("FG_ROOT"); -- if (env == NULL) { -- // EYE - is it possible for this to not be defined? -- fg_root.set(FGBASE_DIR); -- } else { -- fg_root.set(env); -- } - -- env = getenv("FG_SCENERY"); -- if (env == NULL) { -- fg_scenery.set(fg_root.str() + "/Scenery"); -- } else { -- fg_scenery.set(env); -- } -+ // EYE - is it possible for this to not be defined? -+ fg_root = SGPath::fromEnv("FG_ROOT", SGPath(FGBASE_DIR)); -+ -+ fg_scenery = SGPath::fromEnv("FG_SCENERY", fg_root.str() + "/Scenery"); - - // Set a default palette. -- palette.set("default.ap"); -+ palette = SGPath("default.ap"); - - // Process ~/.atlasmaprc. - char* homedir = getenv("HOME"); -@@ -332,10 +323,10 @@ - // 'scenery'. We're done. - } else if (!fg_scenery.str().empty()) { - // From FG_SCENERY -- scenery.set(fg_scenery.str()); -+ scenery = SGPath(fg_scenery.str()); - } else if (!fg_root.str().empty()) { - // Default: $FG_ROOT/Scenery -- scenery.set(fg_root.str()); -+ scenery = SGPath(fg_root.str()); - scenery.append("Scenery"); - } else { - fprintf(stderr, "%s: No scenery directory specified.", appName); -@@ -356,7 +347,7 @@ - } else if (!fg_root.str().empty()) { - // EYE - make default $HOME/Atlas? - // Default: $FG_ROOT/Atlas -- atlas.set(fg_root.str()); -+ atlas = SGPath(fg_root.str()); - atlas.append("Atlas"); - } else { - fprintf(stderr, "%s: No map directory specified.", appName); -@@ -394,11 +385,11 @@ - SGPath palettePath; - palettePath.append(palette.str()); - if ((atlasPalette = loadPalette(palettePath.c_str())) == NULL) { -- palettePath.set(atlas.str()); -+ palettePath = SGPath(atlas.str()); - palettePath.append("Palettes"); - palettePath.append(palette.str()); - if ((atlasPalette = loadPalette(palettePath.c_str())) == NULL) { -- palettePath.set(fg_root.str()); -+ palettePath = SGPath(fg_root.str()); - palettePath.append("Atlas"); - palettePath.append("Palettes"); - palettePath.append(palette.str()); -diff -r e183e3b3a041 src/Preferences.cxx ---- a/src/Preferences.cxx Tue Sep 06 22:12:05 2016 -0700 -+++ b/src/Preferences.cxx Sat Mar 18 05:09:04 2017 +0100 -@@ -317,7 +317,7 @@ - { - string buf; - is >> buf; -- p.set(buf); -+ p = SGPath(buf); - - return is; - } -@@ -638,7 +638,7 @@ - // EYE - just get()? - SGPath p(fg_root.get(Pref::FACTORY)); - if (p.isNull()) { -- p.set(FGBASE_DIR); -+ p = SGPath(FGBASE_DIR); - } - p.append("Atlas"); - path.set(p, Pref::FACTORY); -@@ -770,10 +770,10 @@ - char* homedir = getenv("HOME"); - SGPath rcpath; - if (homedir != NULL) { -- rcpath.set(homedir); -+ rcpath = SGPath(homedir); - rcpath.append(atlasrc); - } else { -- rcpath.set(atlasrc); -+ rcpath = SGPath(atlasrc); - } - - ifstream rc(rcpath.c_str()); -@@ -946,7 +946,7 @@ - } - SGPath p; - while (optind < argc) { -- p.set(argv[optind++]); -+ p = SGPath(argv[optind++]); - flightFiles.push_back(p); - } - -diff -r e183e3b3a041 src/Scenery.cxx ---- a/src/Scenery.cxx Tue Sep 06 22:12:05 2016 -0700 -+++ b/src/Scenery.cxx Sat Mar 18 05:09:04 2017 +0100 -@@ -198,7 +198,7 @@ - data = (GLubyte *)loadJPEG(f.c_str(), &width, &height, &depth, - maximumElevation); - if (!data) { -- f.set(f.base()); -+ f = SGPath(f.base()); - f.concat(".png"); - data = (GLubyte *)loadPNG(f.c_str(), &width, &height, &depth, - maximumElevation); -diff -r e183e3b3a041 src/Subbucket.cxx ---- a/src/Subbucket.cxx Tue Sep 06 22:12:05 2016 -0700 -+++ b/src/Subbucket.cxx Sat Mar 18 05:09:04 2017 +0100 -@@ -346,10 +346,10 @@ - // http://wiki.flightgear.org/index.php/BTG_File_Format - - SGBinObject btg; -- if (!btg.read_bin(_path.c_str())) { -- // EYE - throw an error? -- // EYE - will the cache continue to call load() then? -- return false; -+ if (!btg.read_bin(SGPath(_path))) { -+ // EYE - throw an error? -+ // EYE - will the cache continue to call load() then? -+ return false; - } - - ////////////////////////////////////////////////////////////////////// -diff -r e183e3b3a041 src/Tiles.cxx ---- a/src/Tiles.cxx Tue Sep 06 22:12:05 2016 -0700 -+++ b/src/Tiles.cxx Sat Mar 18 05:09:04 2017 +0100 -@@ -464,7 +464,7 @@ - const SGPath& TileManager::mapPath(unsigned int level) - { - static SGPath result; -- result.set(_maps.str()); -+ result = SGPath(_maps.str()); - - char str[3]; - snprintf(str, 3, "%d", level); -@@ -821,7 +821,7 @@ - const SGPath& Tile::sceneryDir() - { - if (_sceneryIndex == TileManager::NaPI) { -- __sceneryPath = ""; -+ __sceneryPath = SGPath(); - } else { - __sceneryPath = _tm->sceneryPaths()[_sceneryIndex]; - __sceneryPath.append(chunk()->name()); diff --git a/games-util/etswitch/Manifest b/games-util/etswitch/Manifest index 57fb6c90efd9..1a5b0572f4b4 100644 --- a/games-util/etswitch/Manifest +++ b/games-util/etswitch/Manifest @@ -1,5 +1,6 @@ AUX etswitch-0.1.14-desktop-entry.patch 464 BLAKE2B 5058044958c26fdb6c062f3ea6d2a9d2d8a42421de016ab7c4d7263b638fb323d02771cd789bd57d35897b4a08a9e03031e0b6602edf241068d0574be72f2aa3 SHA512 aa21d15ce672f51903e8cd86df3d8794231037d8eb8cb97a8313dc6f3c7212b7bb89d8f78ecc249a589ad03b38ef41f5d346f41dc9f929d130eb83794b19b9ec +AUX etswitch-0.1.14-fno-common.patch 462 BLAKE2B db3d0f548546b4e6ac629b487285fc3ffd537f788b16adb5c38335b0bb6ab660217a97d3aaa0bfa52940b9b6841f868f3f2af6500b8c397773fe16752e721934 SHA512 3f14256c4dc884192868bc7ae4ff386eaacbbf9c4ebf8554a0f4eecd79602bdb59548d1f3b37a39bbc8be3bf0e083614a2793f9836c0feedf993ce717d528a46 AUX etswitch-0.1.14-glibc.patch 628 BLAKE2B e6a7228a90417cda917cd4218496643e6bb2fa6b41886b48cdbb17758591d6a5742f6f427ccb6dd75d78403d1d394bb5324fd63848260e35808ba5d232a4e2b9 SHA512 27249584033beb4cf81b37e387a814a7b213d4108f530bc21494196916fe395c15767e384c62257dd3abb1d04eb104c0863b7e2d80cfae4927912a836b181019 DIST etswitch-0.1.14.tar.gz 165811 BLAKE2B 3d52b9dbddec9ddba914cf8e3ecb5013b2b7eac0b9a655d1be60c01cb77639d8ca2906140fc3ecd097005aaef5b11bf4ddd2ac88a5d2e0ba26aac9f2f1593248 SHA512 15447e728b8c6783e663bb76dd64a03b57ecfea6845991f4deca73ee5c5b8c2f87e92d842a46948e48468898eb036f17cbaf365887ea30c1b724db9133f9620c -EBUILD etswitch-0.1.14-r1.ebuild 597 BLAKE2B ee3a7e7c2a51053cfd6abe75882253fa70ace235137ed9a2f756c6103cfc5e102451034fb5a6dcdd58c3d2084598b2be2fe49e1c8e5b01464968ca122c3a4210 SHA512 cd53988bc5ec85ff2882f458f6a349bad34712c6adf2be2a9cbe14c010270f889eacc22dca19f6adf82880092742334e2660ce7deecea829d108e7748035db52 +EBUILD etswitch-0.1.14-r1.ebuild 574 BLAKE2B 9d39e81d2f70388dc1f8f161e5ad243c02270d32b0c793ef1051766b9c5b1b93bdb48c64f1ea2ea360ea9c3c78b6d65c0fbaf0e6eefae75ee53b60f15aedfb5a SHA512 397752da0821dcd25ec6c286f6cc055ad5f477fbc8e8c41407bc80994721d0b7a2d6b515538a1bdd9634431c29fd39cc0ea76ee3c291615e528ce9e5c7083965 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254 diff --git a/games-util/etswitch/etswitch-0.1.14-r1.ebuild b/games-util/etswitch/etswitch-0.1.14-r1.ebuild index da46e7ba4978..61b5ce230018 100644 --- a/games-util/etswitch/etswitch-0.1.14-r1.ebuild +++ b/games-util/etswitch/etswitch-0.1.14-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="*nix minimizer for a few games" HOMEPAGE="http://hem.bredband.net/b400150/" @@ -10,9 +10,9 @@ SRC_URI="http://hem.bredband.net/b400150/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="x11-libs/libX11 +RDEPEND=" + x11-libs/libX11 x11-libs/libXxf86vm x11-libs/libXmu x11-libs/libXpm" @@ -21,10 +21,7 @@ DEPEND="${RDEPEND} x11-base/xorg-proto" PATCHES=( - "${FILESDIR}"/${P}-desktop-entry.patch - "${FILESDIR}"/${P}-glibc.patch + "${FILESDIR}"/${P}-desktop-entry.patch + "${FILESDIR}"/${P}-glibc.patch + "${FILESDIR}"/${P}-fno-common.patch ) - -src_configure() { - econf --datadir=/usr/share -} diff --git a/games-util/etswitch/files/etswitch-0.1.14-fno-common.patch b/games-util/etswitch/files/etswitch-0.1.14-fno-common.patch new file mode 100644 index 000000000000..f0bdebcb6a76 --- /dev/null +++ b/games-util/etswitch/files/etswitch-0.1.14-fno-common.patch @@ -0,0 +1,22 @@ +--- a/src/read_wid.c ++++ b/src/read_wid.c +@@ -62,6 +62,8 @@ + #include + extern int errno; + ++wid_info_struct *wid; ++ + /* + will try and read the wid file and malloc the game struct + if wid file is missing it will read the internal one +--- a/src/read_wid.h ++++ b/src/read_wid.h +@@ -38,7 +38,7 @@ + char *first_struct; + } wid_info_struct; + +-wid_info_struct *wid; /* global wid array */ ++extern wid_info_struct *wid; /* global wid array */ + + + diff --git a/games-util/fteqcc/Manifest b/games-util/fteqcc/Manifest index f615138f3b66..f112bac3f8bd 100644 --- a/games-util/fteqcc/Manifest +++ b/games-util/fteqcc/Manifest @@ -1,4 +1,5 @@ -AUX fteqcc-2501-cleanup-source.patch 2655 BLAKE2B 3c0af9e2663e9f18aee250f79b1315744fe8aaf818d3b7aaa590a6dbe2eaf62d44280507d5a4a4796b6ede78ed76c89f4153998cca4a0cca2f3b4553763f1db1 SHA512 978f3fc8238383ba63be4095fb7ebe30b0a6a0220b2d0f28033ab61ed23251de3757414fecdda2d987996094e3953797d0d89f3b4cc812c4ce7e15335f06035c +AUX fteqcc-2501-Makefile.patch 1742 BLAKE2B e744676a627626d078ed502a3e181abe13bc430164163b97a2f53487e881f38886dd7166c73ef3750174d2d49ab30b9b70cc40956d7b2d57789aee043c62d058 SHA512 75de8de81f7e071bf7734a38e8a150eb9ebe27e55b7a096f88f863e503e4f9f574a4b6d7c42a54c0044f0848e41a5a4814087ec3e6187793b06b1756dc28ada7 +AUX fteqcc-2501-cleanup-source.patch 5791 BLAKE2B 6db9e70087f06f0bb16ecd74f36874216bc8b6a5ae835e5ba5d5fb6b492ff84c332209c72c7a5bde79980c8aaaeec0ed3cd21913c73952dfb71d2cf402f8c6b6 SHA512 81e0d529a0e942da3de40a564c5d349eef9e5a18a44111acb77d7205ff5270a8175cf7bdb23c01d76b069ffc18cae39eb6e22a9c815e0f0b944826b11ac6ef85 DIST qclibsrc2501.zip 204047 BLAKE2B 3e9b6aeeaadf44adf8ea32c7f1f627082cc5e98f6ea84f339d44a6e34adda5dbf01add1fb2957866323ab93b8f07393bb79d94cf0d5819cc8b48376d68fefc0d SHA512 60740e55c470dcb8deb235b49b5e8bd56f3c932fd9290808224b4d0ff2d6d8eb95302fdd1c972f36c992ac046fdbbc6a34c6de2fc67e1e7de54f23fd10de89d7 -EBUILD fteqcc-2501.ebuild 770 BLAKE2B b88373414e91d51c179faa8bc2b872ededd31446d12d1028bf0e598478207635c8a87324330df9ad6483e218bf85f074d42d129eaf346ef2ad18b5d939752bb9 SHA512 3528807c8d81e5243f16ee5c605e4c780b3a1e1fdcba05d9c29e8a64e3dcfa8da613beb162855433be1a786e7d64b84bd7586acdf25cf49050cda904972ca888 +EBUILD fteqcc-2501.ebuild 614 BLAKE2B a956c79dbc0dd9064348f89602c5fd780142b40c20ec5fbd818c6c09c4d365d6a7729ffee55f472b2b7bd4bb5eb063065b034bb80d18ebc0064176d0c0a99bcc SHA512 c52924834aa61932ea357c7804a295a5dc0a2c3b7f131ec8bc88cc0c130c729d10c306920f6077f8a8ac42a29dde85e6d674feb4584bf837dc7b45f571c38882 MISC metadata.xml 328 BLAKE2B 3cf3ef53d251c16dbdf4dac64df6b6f61d39259def9e37191d28449b1eb733c89f1496a69eca590c536541e3763b5870880eec8f4b27e0a370d430c75dda9712 SHA512 9a114bb9f7d3e6d5995830c71662bc58b78bee8a1d104399b9f7a53efaf3410a6da94486e8a5a9a2b25677eb79327b1fad4b135c8ed63429e21fee500853a78f diff --git a/games-util/fteqcc/files/fteqcc-2501-Makefile.patch b/games-util/fteqcc/files/fteqcc-2501-Makefile.patch new file mode 100644 index 000000000000..cc70e9be4d8b --- /dev/null +++ b/games-util/fteqcc/files/fteqcc-2501-Makefile.patch @@ -0,0 +1,61 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,51 +1,19 @@ + QCC_OBJS=qccmain.o qcc_cmdlib.o qcc_pr_comp.o qcc_pr_lex.o comprout.o hash.o qcd_main.o + GTKGUI_OBJS=qcc_gtk.o qccguistuff.c + +-CC=gcc -Wall -DQCCONLY +- +-DO_CC=$(CC) $(BASE_CFLAGS) -o $@ -c $< $(CFLAGS) +- + all: qcc + +-BASE_CFLAGS=-ggdb +-CFLAGS = +- ++CFLAGS += -Wall ++CPPFLAGS += -DQCCONLY + + win_nocyg: $(QCC_OBJS) qccgui.c qccguistuff.c +- $(CC) $(BASE_CFLAGS) -o fteqcc.exe -O3 -s $(QCC_OBJS) -mno-cygwin -mwindows ++ $(CC) $(BASE_CFLAGS) -o fteqcc.exe $(QCC_OBJS) -mno-cygwin -mwindows + nocyg: $(QCC_OBJS) qccgui.c qccguistuff.c +- $(CC) $(BASE_CFLAGS) -o fteqcc.exe -O3 -s $(QCC_OBJS) -mno-cygwin ++ $(CC) $(BASE_CFLAGS) -o fteqcc.exe $(QCC_OBJS) -mno-cygwin + win: $(QCC_OBJS) qccgui.c qccguistuff.c +- $(CC) $(BASE_CFLAGS) -o fteqcc.exe -O3 -s $(QCC_OBJS) -mwindows ++ $(CC) $(BASE_CFLAGS) -o fteqcc.exe $(QCC_OBJS) -mwindows + qcc: $(QCC_OBJS) +- $(CC) $(BASE_CFLAGS) -o fteqcc.bin -O3 -s $(QCC_OBJS) +- +-qccmain.o: qccmain.c qcc.h +- $(DO_CC) +- +-qcc_cmdlib.o: qcc_cmdlib.c qcc.h +- $(DO_CC) +- +-qcc_pr_comp.o: qcc_pr_comp.c qcc.h +- $(DO_CC) +- +-qcc_pr_lex.o: qcc_pr_lex.c qcc.h +- $(DO_CC) +- +-comprout.o: comprout.c qcc.h +- $(DO_CC) +- +-hash.o: hash.c qcc.h +- $(DO_CC) +- +-qcd_main.o: qcd_main.c qcc.h +- $(DO_CC) +- +-qccguistuff.o: qccguistuff.c qcc.h +- $(DO_CC) +- +-qcc_gtk.o: qcc_gtk.c qcc.h +- $(DO_CC) `pkg-config --cflags gtk+-2.0` ++ $(CC) $(BASE_CFLAGS) $(LDFLAGS) -o fteqcc.bin $(QCC_OBJS) + + gtkgui: $(QCC_OBJS) $(GTKGUI_OBJS) +- $(CC) $(BASE_CFLAGS) -DQCCONLY -DUSEGUI -o fteqccgui.bin -O3 $(GTKGUI_OBJS) $(QCC_OBJS) `pkg-config --libs gtk+-2.0` ++ $(CC) $(CFLAGS) $(LDFLAGS) -DUSEGUI -o fteqccgui.bin $(GTKGUI_OBJS) $(QCC_OBJS) $(GTK_LIBS) diff --git a/games-util/fteqcc/files/fteqcc-2501-cleanup-source.patch b/games-util/fteqcc/files/fteqcc-2501-cleanup-source.patch index 35f3dcf100ae..be8cccb074b2 100644 --- a/games-util/fteqcc/files/fteqcc-2501-cleanup-source.patch +++ b/games-util/fteqcc/files/fteqcc-2501-cleanup-source.patch @@ -1,43 +1,5 @@ ---- qcc_pr_comp.c -+++ qcc_pr_comp.c -@@ -7322,7 +7322,7 @@ - QCC_def_t *def, *d; - QCC_function_t *f; - QCC_dfunction_t *df; -- int i; -+ int i = 0; - pbool shared=false; - pbool externfnc=false; - pbool isconstant = false; -@@ -8541,8 +8545,6 @@ - struct qcc_includechunk_s *oldcurrentchunk; - extern struct qcc_includechunk_s *currentchunk; - -- extern char qccmsourcedir[]; -- - ocompilingfile = compilingfile; - os_file = s_file; - os_file2 = s_file2; ---- hash.h -+++ hash.h -@@ -19,12 +19,12 @@ - int Hash_Key(char *name, int modulus); - void *Hash_Get(hashtable_t *table, char *name); - void *Hash_GetInsensative(hashtable_t *table, char *name); --void *Hash_GetKey(hashtable_t *table, int key); -+void *Hash_GetKey(hashtable_t *table, long key); - void *Hash_GetNext(hashtable_t *table, char *name, void *old); - void *Hash_GetNextInsensative(hashtable_t *table, char *name, void *old); - void *Hash_Add(hashtable_t *table, char *name, void *data, bucket_t *buck); - void *Hash_AddInsensative(hashtable_t *table, char *name, void *data, bucket_t *buck); - void Hash_Remove(hashtable_t *table, char *name); - void Hash_RemoveData(hashtable_t *table, char *name, void *data); --void Hash_RemoveKey(hashtable_t *table, int key); --void *Hash_AddKey(hashtable_t *table, int key, void *data, bucket_t *buck); -+void Hash_RemoveKey(hashtable_t *table, long key); -+void *Hash_AddKey(hashtable_t *table, long key, void *data, bucket_t *buck); ---- hash.c -+++ hash.c +--- a/hash.c ++++ b/hash.c @@ -68,7 +68,7 @@ } return NULL; @@ -91,3 +53,166 @@ { buck->next = buck->next->next; return; +--- a/hash.h ++++ b/hash.h +@@ -19,12 +19,12 @@ + int Hash_Key(char *name, int modulus); + void *Hash_Get(hashtable_t *table, char *name); + void *Hash_GetInsensative(hashtable_t *table, char *name); +-void *Hash_GetKey(hashtable_t *table, int key); ++void *Hash_GetKey(hashtable_t *table, long key); + void *Hash_GetNext(hashtable_t *table, char *name, void *old); + void *Hash_GetNextInsensative(hashtable_t *table, char *name, void *old); + void *Hash_Add(hashtable_t *table, char *name, void *data, bucket_t *buck); + void *Hash_AddInsensative(hashtable_t *table, char *name, void *data, bucket_t *buck); + void Hash_Remove(hashtable_t *table, char *name); + void Hash_RemoveData(hashtable_t *table, char *name, void *data); +-void Hash_RemoveKey(hashtable_t *table, int key); +-void *Hash_AddKey(hashtable_t *table, int key, void *data, bucket_t *buck); ++void Hash_RemoveKey(hashtable_t *table, long key); ++void *Hash_AddKey(hashtable_t *table, long key, void *data, bucket_t *buck); +--- a/qcc.h ++++ b/qcc.h +@@ -286,7 +286,7 @@ + #endif + + #ifdef WRITEASM +-FILE *asmfile; ++extern FILE *asmfile; + #endif + //============================================================================= + +@@ -830,23 +830,23 @@ + + typedef char PATHSTRING[MAX_DATA_PATH]; + +-PATHSTRING *precache_sounds; +-int *precache_sounds_block; +-int *precache_sounds_used; +-int numsounds; +- +-PATHSTRING *precache_textures; +-int *precache_textures_block; +-int numtextures; +- +-PATHSTRING *precache_models; +-int *precache_models_block; +-int *precache_models_used; +-int nummodels; +- +-PATHSTRING *precache_files; +-int *precache_files_block; +-int numfiles; ++extern PATHSTRING *precache_sounds; ++extern int *precache_sounds_block; ++extern int *precache_sounds_used; ++extern int numsounds; ++ ++extern PATHSTRING *precache_textures; ++extern int *precache_textures_block; ++extern int numtextures; ++ ++extern PATHSTRING *precache_models; ++extern int *precache_models_block; ++extern int *precache_models_used; ++extern int nummodels; ++ ++extern PATHSTRING *precache_files; ++extern int *precache_files_block; ++extern int numfiles; + + int QCC_CopyString (char *str); + +--- a/qccmain.c ++++ b/qccmain.c +@@ -2,6 +2,14 @@ + + #define PROGSUSED + #include "qcc.h" ++ ++#ifdef WRITEASM ++FILE *asmfile; ++#endif ++ ++int *precache_sounds_used; ++int *precache_models_used; ++ + int mkdir(const char *path); + + char QCC_copyright[1024]; +@@ -22,7 +30,7 @@ + void *FS_ReadToMem(char *fname, void *membuf, int *len); + void FS_CloseFromMem(void *mem); + +-struct qcc_includechunk_s *currentchunk; ++extern struct qcc_includechunk_s *currentchunk; + + unsigned int MAX_REGS; + +@@ -84,8 +92,8 @@ + hashtable_t compconstantstable; + hashtable_t globalstable; + hashtable_t localstable; +-hashtable_t floatconstdefstable; +-hashtable_t stringconstdefstable; ++extern hashtable_t floatconstdefstable; ++extern hashtable_t stringconstdefstable; + + pbool qccwarningdisabled[WARN_MAX]; + +@@ -1627,7 +1635,7 @@ + + #define PROGDEFS_MAX_SIZE 16384 + //write (to file buf) and add to the crc +-void inline Add(char *p, unsigned short *crc, char *file) ++void Add(char *p, unsigned short *crc, char *file) + { + char *s; + int i = strlen(file); +@@ -1643,7 +1651,7 @@ + #define ADD(p) Add(p, &crc, file) + //#define ADD(p) {char *s;int i = strlen(p);for(s=p;*s;s++,i++){QCC_CRC_ProcessByte(&crc, *s);file[i] = *s;}file[i]='\0';} + +-void inline Add3(char *p, unsigned short *crc, char *file) ++void Add3(char *p, unsigned short *crc, char *file) + { + char *s; + for(s=p;*s;s++) +@@ -3283,7 +3291,7 @@ + + + #ifdef QCCONLY +-progfuncs_t *progfuncs; ++extern progfuncs_t *progfuncs; + + /* + ============== +--- a/qcc_pr_comp.c ++++ b/qcc_pr_comp.c +@@ -733,7 +733,7 @@ + ============ + */ + QCC_def_t *QCC_PR_Statement ( QCC_opcode_t *op, QCC_def_t *var_a, QCC_def_t *var_b, QCC_dstatement_t **outstatement); +-int inline QCC_ShouldConvert(QCC_def_t *var, etype_t wanted) ++int QCC_ShouldConvert(QCC_def_t *var, etype_t wanted) + { + if (var->type->type == ev_integer && wanted == ev_function) + return 0; +@@ -7322,7 +7322,7 @@ + QCC_def_t *def, *d; + QCC_function_t *f; + QCC_dfunction_t *df; +- int i; ++ int i = 0; + pbool shared=false; + pbool externfnc=false; + pbool isconstant = false; +@@ -8541,8 +8541,6 @@ + struct qcc_includechunk_s *oldcurrentchunk; + extern struct qcc_includechunk_s *currentchunk; + +- extern char qccmsourcedir[]; +- + ocompilingfile = compilingfile; + os_file = s_file; + os_file2 = s_file2; diff --git a/games-util/fteqcc/fteqcc-2501.ebuild b/games-util/fteqcc/fteqcc-2501.ebuild index c03aa1ac4ee1..3791f964ea75 100644 --- a/games-util/fteqcc/fteqcc-2501.ebuild +++ b/games-util/fteqcc/fteqcc-2501.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils flag-o-matic +EAPI=7 + +inherit edos2unix toolchain-funcs DESCRIPTION="QC compiler" HOMEPAGE="http://fteqw.sourceforge.net/" @@ -11,28 +12,24 @@ SRC_URI="mirror://sourceforge/fteqw/qclibsrc${PV}.zip" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RESTRICT="test" -DEPEND="app-arch/unzip" -RDEPEND="" +BDEPEND="app-arch/unzip" + +S="${WORKDIR}" -S=${WORKDIR} +PATCHES=( + "${FILESDIR}"/${P}-cleanup-source.patch + "${FILESDIR}"/${P}-Makefile.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}-cleanup-source.patch - sed -i \ - -e '/^CC/d' \ - -e "s: -O3 : :g" \ - -e "s: -s : :g" \ - -e 's/-o fteqcc.bin/$(LDFLAGS) -o fteqcc.bin/' \ - Makefile || die "sed failed" + default edos2unix readme.txt - append-flags -DQCCONLY } -src_compile() { - emake BASE_CFLAGS="${CFLAGS} -Wall" +src_configure() { + tc-export CC } src_install() { diff --git a/games-util/game-device-udev-rules/Manifest b/games-util/game-device-udev-rules/Manifest new file mode 100644 index 000000000000..76a8c9ed940b --- /dev/null +++ b/games-util/game-device-udev-rules/Manifest @@ -0,0 +1,4 @@ +AUX 60-game-input-20201121.rules 112 BLAKE2B cf170168ccc322b65430a75660f29564011a9c4b787587f3c81d3c565ad9c696aca617a2782abbb59901bcea5f97e6dac5956dcfb431d296c30523ed6f9bc220 SHA512 833006ae0431e6084fab359c3f5efe76a35c2266ef81e544651e217a0d7e64d08ef4244f7b76463dfbfc0e0e6e20a3112669b8897ee240dd6b7ad48425eafadb +DIST steam-devices-442b412ae2c1e20d6aa09f04f0245f9281788a71.tar.gz 2132 BLAKE2B ee8b22d5d29886f4dff126af6f54487212b8758afe4fc4b080ccccccbbc7d7893cee05612386f72cccd7050d415fc07b5fb8c9e4ca19b115304970c4934d1df7 SHA512 efc5359aa9b2015092df1c06079790739d11c955478aa91fc08d077ad51df9cc1be5ec6bc8596a68501fc987ba1993d66af2482a444df42f62b88142d50e660c +EBUILD game-device-udev-rules-20201121.ebuild 1889 BLAKE2B 9b755f8eb0fd597ffd6674444758d2ed9e4ce07a590424fa4d92bb3acba3c7fe6c5eb412ab0a3290991478b25e88f3c57b95318da3af57c0717580ed7e5d3d0e SHA512 262b0589f110e23604a4371ad0259589e3519d5797e926b8927f71a1392344f4a517cd042e1eeb423c185649b4bbed0f0de057a1f929da162c753f3718ee4df7 +MISC metadata.xml 361 BLAKE2B e0daf215fc923f490f00c8170de858eddc62c908c9ff5f79323a69a465dc0dd6671127244ce8285a49dd3892a5e56f62bc4254bc927537198eb04efc4f88a325 SHA512 86e237b8c6a70569154bcc2cc7b3992da0982b8dbf5d9ad56e4fe11c304457e8b82205001deba4b5d9344b598453c719e78b38959816343f4365cb1d447a53d6 diff --git a/games-util/game-device-udev-rules/files/60-game-input-20201121.rules b/games-util/game-device-udev-rules/files/60-game-input-20201121.rules new file mode 100644 index 000000000000..04a6ce41f4a6 --- /dev/null +++ b/games-util/game-device-udev-rules/files/60-game-input-20201121.rules @@ -0,0 +1,3 @@ + +# Thrustmaster T-Wireless +KERNEL=="hidraw*", ATTRS{idVendor}=="044f", ATTRS{idProduct}=="d007", TAG+="uaccess" diff --git a/games-util/game-device-udev-rules/game-device-udev-rules-20201121.ebuild b/games-util/game-device-udev-rules/game-device-udev-rules-20201121.ebuild new file mode 100644 index 000000000000..4b228d828ccf --- /dev/null +++ b/games-util/game-device-udev-rules/game-device-udev-rules-20201121.ebuild @@ -0,0 +1,80 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit udev + +# Although this is mainly a tweaked version of Steam's udev rules, it +# also has its own rules and more may be added later so we version it +# independently. + +STEAM_COMMIT="442b412ae2c1e20d6aa09f04f0245f9281788a71" +MY_P="steam-devices-${STEAM_COMMIT}" + +DESCRIPTION="udev rules for various game hardware devices" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Games" +SRC_URI="https://github.com/ValveSoftware/steam-devices/archive/${STEAM_COMMIT}.tar.gz -> ${MY_P}.tar.gz" +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+acl elogind systemd" +REQUIRED_USE="acl? ( || ( elogind systemd ) )" + +RDEPEND=" + acl? ( + elogind? ( sys-auth/elogind[acl] ) + systemd? ( sys-apps/systemd[acl] ) + ) + !acl? ( + acct-group/input + ) + virtual/udev +" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + if ! use acl; then + elog "Users of game hardware devices must be added to the input group." + + if use elogind || use systemd; then + ewarn "It is highly recommended that you enable USE=acl on this package instead" + ewarn "when using elogind or systemd as this is more secure and just works." + fi + fi +} + +src_prepare() { + default + + local SRC DEST EXTRA + for SRC in 60-steam-{input,vr}.rules; do + DEST=${SRC//steam/game} + EXTRA=${FILESDIR}/${DEST/./-${PV}.} + + # Make changes in a copy. + cp -v "${SRC}" "${DEST}" || die + + # Append our additional rules. + if [[ -f ${EXTRA} ]]; then + cat "${EXTRA}" >> "${DEST}" || die + fi + + # Clear any existing mode settings. + sed -i 's/, *MODE="[0-9]*"//' "${DEST}" || die + + if ! use acl; then + # Replace uaccess tag with our group+mode if not using ACL. + sed -i 's/, *TAG+="uaccess"/, GROUP="input", MODE="0660"/' "${DEST}" || die + fi + done +} + +src_install() { + udev_dorules 60-game-{input,vr}.rules +} + +pkg_postinst() { + udev_reload +} diff --git a/games-util/game-device-udev-rules/metadata.xml b/games-util/game-device-udev-rules/metadata.xml new file mode 100644 index 000000000000..9a8e14a39d4a --- /dev/null +++ b/games-util/game-device-udev-rules/metadata.xml @@ -0,0 +1,12 @@ + + + + + chewi@gentoo.org + James Le Cuirot + + + games@gentoo.org + Gentoo Games Project + + diff --git a/games-util/grfcodec/Manifest b/games-util/grfcodec/Manifest index 76ae1902c91f..25fd6fe6bec6 100644 --- a/games-util/grfcodec/Manifest +++ b/games-util/grfcodec/Manifest @@ -1,3 +1,4 @@ +AUX grfcodec-6.0.6-gcc10.patch 507 BLAKE2B 7f09d9e6468f059780e1253a32431c88b8a980276b81f02b50c72a8650b05da1709d951cccc71daa7c6109b8ebb80450073cfc1057997cb7ffb008f964b7281d SHA512 27e4055efe874d7833d98feb45af84717120188a805307915f0f0a05adf696960a75662f0f1a67a46b0e0780f3d85646cb626b33559db77a925c20ef750fceb0 DIST grfcodec-6.0.6-source.tar.xz 166820 BLAKE2B ba81e31477fb15bb5273add4d993ee7de88cfd47fd8300743e97c4abd19b0daf736d78b5bafc82569ff110757131501c07d7365a4e7ffde8d3a7fcc2e277bada SHA512 543123c794bfdb5b6556f7a897bcd2f3bdd09be8ad6a4ff07b138e0cac62621a4801c732bb20099c1bb383ad5822fc4ade276d49acf2744c811edd10d7699480 -EBUILD grfcodec-6.0.6.ebuild 1066 BLAKE2B ca41f8822b55fba5dac610e2bb9efcd786b5ee9bda3084407953cbade5c450f383337ef11c354e44a4ebd7c42ef60ab55a614c94f204602c17c7d6bb7dcaaa08 SHA512 6ac4994f25b2cfe551e56d9d9d828797928ae3a205e440a743213a468cd697d15d7442af0313744a296fa6d1a4b37baf295f696b9434a4fa5dc8c9757c847921 +EBUILD grfcodec-6.0.6.ebuild 1112 BLAKE2B 0b32ca4b024654f95a314a6410ebc148464e3d03c6f1f1af55f73d74637c50aac98df096725e568e62f0b57ef702c280689588db1857cac371739532f09aad3c SHA512 00b18f346295bb9f2c81ba3f714ea462b7440b9db26738662453460165a50439ef0703aa5e1ba93fc94925d5acc5f1b7b577e74e5bea79d863663f71a576b6dd MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/games-util/grfcodec/files/grfcodec-6.0.6-gcc10.patch b/games-util/grfcodec/files/grfcodec-6.0.6-gcc10.patch new file mode 100644 index 000000000000..baf84a435f69 --- /dev/null +++ b/games-util/grfcodec/files/grfcodec-6.0.6-gcc10.patch @@ -0,0 +1,12 @@ +diff -Nrup a/src/command.cpp b/src/command.cpp +--- a/src/command.cpp 2015-05-09 04:59:46.000000000 -0600 ++++ b/src/command.cpp 2019-09-24 11:37:06.667911307 -0600 +@@ -303,7 +303,7 @@ bool parse_comment(const string&line){ + uint val=find_command(command_part,beaut),togglebit; + if(val!=(uint)-1&&val!=OFF)_commandState.beautifier=true; + switch(val){ +- case -1: ++ case -1u: + IssueMessage(0,COMMAND_INVALID_ARG,gen[BEAUTIFY].name); + return true; + case OFF:_commandState.beautifier=false;break; diff --git a/games-util/grfcodec/grfcodec-6.0.6.ebuild b/games-util/grfcodec/grfcodec-6.0.6.ebuild index ebfb9b894f6b..2c4927b37555 100644 --- a/games-util/grfcodec/grfcodec-6.0.6.ebuild +++ b/games-util/grfcodec/grfcodec-6.0.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -27,6 +27,8 @@ DEPEND=" dev-libs/boost " +PATCHES=("${FILESDIR}/${PN}-6.0.6-gcc10.patch") + src_prepare() { default diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest index 21b9b5aae3b6..c969a91adcc3 100644 --- a/games-util/lutris/Manifest +++ b/games-util/lutris/Manifest @@ -1,7 +1,7 @@ AUX lutris-0.5.7-copy_paste_fix.patch 1178 BLAKE2B fcb28456fb0ced4e7f53156bbaed799d7673c57e02d8dd04261ffc99f2b585819b920870af48806ba461d9a5130cf9aa3696dfa2615c7f54d54871a3abacbf6b SHA512 5d42c46b159962e1a77ba7c21d4ea47a8507548e6d62b516228b45cdd4d36abd4dd56cf81079edaf32f61c2a849f6d1491f2dc5b0dd7c7a817ba822499104317 DIST lutris_0.5.7.1.tar.xz 2145584 BLAKE2B eb766d5e36aca63af7af8f2e85f51b4e3e37b8372b13a59702c545a0c697fa5feb1403cd9589d22c2bdff6593f69ed39e1bcb7ecb28ecc24b7a77b09ed1b2f89 SHA512 9efff4d92ae4d9051a7253324047dfa57f463188ebdbcede5feba2c0268494e8fa7929d2ef30bfe85e52824bbb9c05b1f1688b6658376597cc4cc35c26a19da3 -DIST lutris_0.5.7.tar.xz 2133524 BLAKE2B d27191668f582a5cd50941ca227d6121f1bfdb4824c490dd54cc513fda523712af9480451b0e5503404aba8d083c94ce91b928ed3faf4e94ea9f0bbf28b764c1 SHA512 f751be82dd5550dc882932980a3a04a62f183e5f0dddc9939154025408da081392917834324875a80ae8b354906e04835c2df56c23f1d6d29cd9fbdc514e1c57 +DIST lutris_0.5.8.tar.xz 892740 BLAKE2B eaa8c71ade35392e701b3fd1d8ef2c0077e7fb7b96c3f037b5e4353d89b50b82e8a75fb2fb537e6ceeb9b6faaa5962e0ffe425f52820168b60eed742024610a4 SHA512 dcd963ff8b3c6d66fe79acc1e1c237196f7351d87bf1b4e5920201ecd7f1b2a80ac59f7151287e70e68c402c2b1b00e961d7314e6d5cbbbae0f4ca5fda562a0f EBUILD lutris-0.5.7.1.ebuild 1894 BLAKE2B 81f5eb0ba0b07676f2317fa52daabbed987707ab83921d797887834ded7b9a84187ee426ccab5c4baf7235424750844ecf4491e155542c78e2b14ad9bfa07ca6 SHA512 5845f01a0832c236b727af191f6ef55abf7ba08487d0b921b51a939001cd3245a0f5b9efdf235b7c59371b87c647ab61fa81380019a7faa916da3019f403222f -EBUILD lutris-0.5.7.ebuild 1735 BLAKE2B 5143d74bf601ca931d6e0e10c58d3f17899d85d60507c31495d768d1c940672f2f33136a808d1576370665a27da1ade4a8bab3b7b297191309631ae568eb960e SHA512 28644fd969ec62347a1c61c8583911e3d1e30ef14f6306c8b336eeb0e6b00011e850c9a68290ef8cb9259a4c154109068e162bbfaa4afab6807a4bfea00cbe0e +EBUILD lutris-0.5.8.ebuild 1833 BLAKE2B b9130c739bdd68f87f29a2f95bfc9acf60196cbd9279d128be8d13c2736ed1a6355e765ce34e0edb0db1b4d50ee985acd7f25ea4865f5d2891bca96538bd5b7c SHA512 3d29f3b8dd92c94d177dfa7e3789d31d14dcb3d8c8cbebb6f76a374f8f4761dae779563703d4d49e4ee0ddd6616dfed93d6fa3cf395392d811ee59f5b1dcc3ad EBUILD lutris-9999.ebuild 1833 BLAKE2B b9130c739bdd68f87f29a2f95bfc9acf60196cbd9279d128be8d13c2736ed1a6355e765ce34e0edb0db1b4d50ee985acd7f25ea4865f5d2891bca96538bd5b7c SHA512 3d29f3b8dd92c94d177dfa7e3789d31d14dcb3d8c8cbebb6f76a374f8f4761dae779563703d4d49e4ee0ddd6616dfed93d6fa3cf395392d811ee59f5b1dcc3ad MISC metadata.xml 661 BLAKE2B 8b05694fe3755a3b2b1546c1392bccb408d99f430c361e6058702107d665b13e0d36834d37c2a31ab7065290363e6af7712fcf4b36542222b59e47b508b7d1ef SHA512 e5d7a7023e9aa025d8d526457ba61ec9d9ceadf472d3f04f6b799cb3c130543e4300a56ce1830c163650f0554e2a87d705152b3771bb4f7fd9edeba3db16b9a7 diff --git a/games-util/lutris/lutris-0.5.7.ebuild b/games-util/lutris/lutris-0.5.7.ebuild deleted file mode 100644 index 11cbc20a4482..000000000000 --- a/games-util/lutris/lutris-0.5.7.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# 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,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/dbus-python[${PYTHON_USEDEP}] - 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 -" - -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.8.ebuild b/games-util/lutris/lutris-0.5.8.ebuild new file mode 100644 index 000000000000..4052ada5d976 --- /dev/null +++ b/games-util/lutris/lutris-0.5.8.ebuild @@ -0,0 +1,78 @@ +# 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,threads(+)" +DISTUTILS_SINGLE_IMPL="1" + +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? ( + $(python_gen_cond_dep ' + dev-python/nose[${PYTHON_USEDEP}] + ') + ) +" +RDEPEND=" + app-arch/cabextract + app-arch/p7zip + app-arch/unrar + app-arch/unzip + $(python_gen_cond_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + 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 +" + +python_install_all() { + local DOCS=( AUTHORS README.rst docs/installers.rst ) + distutils-r1_python_install_all + python_fix_shebang "${ED}"/usr/share/lutris/bin/lutris-wrapper #740048 +} + +python_test() { + virtx nosetests -v +} + +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." +} diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest index 7942c4e69ae6..de3d876030f8 100644 --- a/games-util/pyfa/Manifest +++ b/games-util/pyfa/Manifest @@ -1,9 +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.24.1.tar.gz 12648921 BLAKE2B 5715d81144df32cad83eb21d7f8800eb9773139e9305402a5096c585362fcabd0d705529a8887a8c8092637b8348d2a7e8a77e1f6eb362fd83ea39a86203ccb4 SHA512 ffe8a6e9c9c9b593516d9ba76ccb9e69788124132de642f45f5527468645d46f75e4c2388bb5f01788eb85f3e535ade110cfffc92c2943d96f477b5652528328 -DIST pyfa-2.28.3.tar.gz 12685191 BLAKE2B b73663479e39f8948de0ad0de3edb3a89b65bb5b6640332e8fed39f33b222fbc0f4b47487112b01895413fa751ee8dabcde2083a3f3a6b90fe0ad72b24165434 SHA512 7e432658eedb8dfbc9cd41d3ab7da3bf1d411e6935ad56434af1551eeae4de803f3d5447bff4fd5d569d20f1f3eca9acaa1ac22c163bec1ac7720807643b4187 -EBUILD pyfa-2.24.1.ebuild 2736 BLAKE2B 07514287b38574103cd7a544746ed6239200c5d87fb6a4bb01c54924d905e83d73845db97b9abbde2645d7624f74c79c4f059196f98074e01fc8ae6fdcf77e83 SHA512 52d49bc2495ace6ac45d1fd19950b196dd04f63376f3b02e4abec3a983bd7dc32e55192abc25d8ff8f6dcb645d214ee5faa81e858d3851e06aeda25bfd4d9270 -EBUILD pyfa-2.28.3.ebuild 2653 BLAKE2B 5948ed19d3c7d541f07f288c5c412218abaf89b18a602347b2432e86b7501aa773492f87ee3df380b323f516f91cc9f77da401124de0a562973bb7064f310d47 SHA512 c97653fbfd494abe3246d25eab0df846a7357a2f65a5ade6238aca0895f07a0555cc2c77e7b1144cd49c1c92523c7e5375bbdcc7d034ef574378d84921f19ec8 -EBUILD pyfa-9999.ebuild 2736 BLAKE2B 07514287b38574103cd7a544746ed6239200c5d87fb6a4bb01c54924d905e83d73845db97b9abbde2645d7624f74c79c4f059196f98074e01fc8ae6fdcf77e83 SHA512 52d49bc2495ace6ac45d1fd19950b196dd04f63376f3b02e4abec3a983bd7dc32e55192abc25d8ff8f6dcb645d214ee5faa81e858d3851e06aeda25bfd4d9270 +DIST pyfa-2.30.0.tar.gz 28042200 BLAKE2B b822e76979744c55673fec61b3c37eb27a500b031d1493724eec09a52d0bfa8f7815c1f03f3bc6da5233ceb2e6ff1b0217ad29201d6021545a944c7ee0342b68 SHA512 424c114b2ad869a950348811716865ed037abfa0ccd52194a920adcf05aee319e24c6f1fa3abb56193d02d1054986b9e4b0da5e49ffab38e488f0126e05d9669 +DIST pyfa-2.31.0.tar.gz 28138681 BLAKE2B a183fa073a34f0db1264aae980e36e28e90374153e372bcb14cf3a0c3e3c1ff95084f8c23a9710a169671d12ec830e3203d1eb072d1dfc1d9c1095e0422bccfb SHA512 813ca3f7f43b08ceceb1e607ddbc2ff0b47836823dde91787da2c3905fd9af2fdddfa582ec867dd4311f14f4180cc8ec993a49f0ed62b6ce68d4eed6060c3c5b +EBUILD pyfa-2.30.0.ebuild 2653 BLAKE2B 5948ed19d3c7d541f07f288c5c412218abaf89b18a602347b2432e86b7501aa773492f87ee3df380b323f516f91cc9f77da401124de0a562973bb7064f310d47 SHA512 c97653fbfd494abe3246d25eab0df846a7357a2f65a5ade6238aca0895f07a0555cc2c77e7b1144cd49c1c92523c7e5375bbdcc7d034ef574378d84921f19ec8 +EBUILD pyfa-2.31.0.ebuild 2653 BLAKE2B 5948ed19d3c7d541f07f288c5c412218abaf89b18a602347b2432e86b7501aa773492f87ee3df380b323f516f91cc9f77da401124de0a562973bb7064f310d47 SHA512 c97653fbfd494abe3246d25eab0df846a7357a2f65a5ade6238aca0895f07a0555cc2c77e7b1144cd49c1c92523c7e5375bbdcc7d034ef574378d84921f19ec8 +EBUILD pyfa-9999.ebuild 2653 BLAKE2B 5948ed19d3c7d541f07f288c5c412218abaf89b18a602347b2432e86b7501aa773492f87ee3df380b323f516f91cc9f77da401124de0a562973bb7064f310d47 SHA512 c97653fbfd494abe3246d25eab0df846a7357a2f65a5ade6238aca0895f07a0555cc2c77e7b1144cd49c1c92523c7e5375bbdcc7d034ef574378d84921f19ec8 MISC metadata.xml 744 BLAKE2B b87f7086163bc63184cbc2ccae8d5db50dd7133d70dd1c737b8c7c180c3069550eb0eb4e216133236d62edfa066fcb7eded8702e16b17360230434a366d5d8ea SHA512 d52dc69cc53d2c6a6fffa3c8c097c74f6d6657d0cbb135bdb5bd9fb9e13a56c7b13deed6eec55d7a88617392543ea2a3a2a29d7c35140765a0f8a04b84b919c6 diff --git a/games-util/pyfa/pyfa-2.24.1.ebuild b/games-util/pyfa/pyfa-2.24.1.ebuild deleted file mode 100644 index 00faae6993c0..000000000000 --- a/games-util/pyfa/pyfa-2.24.1.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,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.6[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.5[${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}] - ')" -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.28.3.ebuild b/games-util/pyfa/pyfa-2.28.3.ebuild deleted file mode 100644 index 50ffcdd37c25..000000000000 --- a/games-util/pyfa/pyfa-2.28.3.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# 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 edos2unix python-single-r1 xdg - -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.6[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.5[${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}] - ')" -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 ..." - ${EPYTHON} ./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" -} diff --git a/games-util/pyfa/pyfa-2.30.0.ebuild b/games-util/pyfa/pyfa-2.30.0.ebuild new file mode 100644 index 000000000000..50ffcdd37c25 --- /dev/null +++ b/games-util/pyfa/pyfa-2.30.0.ebuild @@ -0,0 +1,92 @@ +# 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 edos2unix python-single-r1 xdg + +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.6[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.5[${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}] + ')" +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 ..." + ${EPYTHON} ./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" +} diff --git a/games-util/pyfa/pyfa-2.31.0.ebuild b/games-util/pyfa/pyfa-2.31.0.ebuild new file mode 100644 index 000000000000..50ffcdd37c25 --- /dev/null +++ b/games-util/pyfa/pyfa-2.31.0.ebuild @@ -0,0 +1,92 @@ +# 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 edos2unix python-single-r1 xdg + +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.6[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.5[${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}] + ')" +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 ..." + ${EPYTHON} ./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" +} diff --git a/games-util/pyfa/pyfa-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild index 00faae6993c0..50ffcdd37c25 100644 --- a/games-util/pyfa/pyfa-9999.ebuild +++ b/games-util/pyfa/pyfa-9999.ebuild @@ -6,7 +6,7 @@ EAPI="7" PYTHON_COMPAT=( python3_{6,7,8} ) PYTHON_REQ_USE="sqlite" -inherit desktop eutils python-single-r1 xdg-utils +inherit desktop edos2unix python-single-r1 xdg DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online" HOMEPAGE="https://github.com/pyfa-org/Pyfa" @@ -76,7 +76,7 @@ src_install() { insinto /usr/share/${PN} einfo "Creating database ..." - python ./db_update.py || die + ${EPYTHON} ./db_update.py || die doins eve.db einfo "Compressing images ..." @@ -90,11 +90,3 @@ src_install() { 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/sc-controller/Manifest b/games-util/sc-controller/Manifest new file mode 100644 index 000000000000..0def8cd0d6fc --- /dev/null +++ b/games-util/sc-controller/Manifest @@ -0,0 +1,4 @@ +AUX status-icon-click.patch 765 BLAKE2B 2b9cc0b4e079c3b9fb38bcf903fed82eadd73c1b55ad1254c0224461b02a670e8f205f5bce9c6dbda774e7d0fe0759fc9277d50601d29fc3faa8e325f3a5443f SHA512 f9c79a4cb65f4d01a86ec27288b708386c9c8f896286f95fbe163cad5891b57d3bb1c5e58920ef25390084ff47af5249827bc4c5d68ea0e98ec20ae0f4af595f +DIST sc-controller-0.4.8.1.tar.gz 2520167 BLAKE2B 40c8e366519ec2a6d80b31c2b342fba2664fa35f3a889e222665f8f5cd4d59dd912804f6cdf4ecd844ab94075f5f45f88a61138ac1c0cb528652c9fd9b710afa SHA512 bc57bd381c71e94c0771ecdb08f95326d0c1478e25cdf3955b71c203abe6cb78091ca977deb8a1e954b5b1b65a6df487f8b8921920b1eb672aa6f1f5554a4847 +EBUILD sc-controller-0.4.8.1.ebuild 819 BLAKE2B 93a5ad0132346c313cd98bba3e1764912a519e52741665178e13b968b4d5d71f73973bb7e4e3101fac25eb4a846ad660183d7e81a81c9508315928625523316d SHA512 36cf68c0c2a4ce72458727456790db8aea2705b6eefe33c4f3fe60cae6ab73556f821f9ba6b53fe7a64316585440e27b0f7eab87294e74d537ed00f8537c15d5 +MISC metadata.xml 340 BLAKE2B 838cbda59dcb8298f68b7b5072693bc97d900f5cf34f3ebbd84bf04ba7ed2680ff8ca56551a2bfa196842a10fdaaaf66947a4cab69e3c71a0310047b198d5d7b SHA512 f582099529443464a07e3efdee885306e022a93067bbfa4526ed7baec82f7d5d9329866390aa7b9aa9ffdd3fbaa22031cec500aee5402cef36ad5946e79e3d14 diff --git a/games-util/sc-controller/files/status-icon-click.patch b/games-util/sc-controller/files/status-icon-click.patch new file mode 100644 index 000000000000..46b39553b483 --- /dev/null +++ b/games-util/sc-controller/files/status-icon-click.patch @@ -0,0 +1,28 @@ +From b1388d0e768f0bedd5704ffae9b13500ad325308 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Sat, 17 Oct 2020 21:36:49 +0100 +Subject: [PATCH] Fix TypeError when clicking on the status icon + +The error was: + + TypeError: GObject.emit() argument 1 must be str, not bytes +--- + scc/gui/statusicon.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scc/gui/statusicon.py b/scc/gui/statusicon.py +index 61ef9e96..83600492 100644 +--- a/scc/gui/statusicon.py ++++ b/scc/gui/statusicon.py +@@ -322,7 +322,7 @@ class StatusIconProxy(StatusIcon): + self._load_fallback() + + def _on_click(self, *args): +- self.emit(b"clicked") ++ self.emit("clicked") + + def _on_notify_active_gtk(self, *args): + if self._status_fb: +-- +2.26.2 + diff --git a/games-util/sc-controller/metadata.xml b/games-util/sc-controller/metadata.xml new file mode 100644 index 000000000000..e3a736ee87d1 --- /dev/null +++ b/games-util/sc-controller/metadata.xml @@ -0,0 +1,11 @@ + + + + + games@gentoo.org + Gentoo Games Project + + + Ryochan7/sc-controller + + diff --git a/games-util/sc-controller/sc-controller-0.4.8.1.ebuild b/games-util/sc-controller/sc-controller-0.4.8.1.ebuild new file mode 100644 index 000000000000..f5cb8a83901e --- /dev/null +++ b/games-util/sc-controller/sc-controller-0.4.8.1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_SETUPTOOLS=no +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit distutils-r1 xdg + +DESCRIPTION="User-mode driver and GTK-based GUI for Steam Controllers and others" +HOMEPAGE="https://github.com/Ryochan7/sc-controller/" +SRC_URI="https://github.com/Ryochan7/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="GPL-2 CC0-1.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+udev" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/pygobject[${PYTHON_USEDEP},cairo] + dev-python/pylibacl[${PYTHON_USEDEP}] + dev-python/python-evdev[${PYTHON_USEDEP}] + ') + gnome-base/librsvg + x11-libs/gtk+:3 + udev? ( games-util/game-device-udev-rules ) +" + +PATCHES=( + "${FILESDIR}"/status-icon-click.patch +) diff --git a/games-util/wit/Manifest b/games-util/wit/Manifest index 8c823969108b..1ab37b118bc8 100644 --- a/games-util/wit/Manifest +++ b/games-util/wit/Manifest @@ -1,5 +1,6 @@ -AUX wit-2.30a-no-exec-stack.patch 232 BLAKE2B 2af2bfe707d22b95f40f2f0e5675fef3e5a153615c327c1638e55651f1fa4cf61b2b868ff86ac899c64f1526f1093e044f32ca853ad0c11c5f505924ee8f1d4d SHA512 958f1fbeda1f29ad704d2eeb3c2a1281f71957fbbb07a7258e6e69af1552e13d135ed61864ef92b9a1334b91990f79366b5b235a8865c424414e46a9305762b0 -AUX wit-3.02a-makefile.patch 5701 BLAKE2B a943a39146fbd90e69ef743c591c053eedf64dad4abf42a36911070aa897679cf9470f5ec5d2b7a1b42f8f951b57821a13b69e6ca8eb01cc6b58c632deb32af3 SHA512 9dd7e293db40b6a3783aef289bce6f0dbf244fca6df8b18b465ab8424989ba60f32bfbda907bdf54e5dc3bac9f82b3bfd5e1866447880fd4299e0df270ee2d7f +AUX wit-3.02a-fno-common.patch 398 BLAKE2B b76eb5f5c5dcfff35006bcb5d9d2b56192600c5c443e4699e0ddbad3568ae6ac778638486bdec4cb5304cb79a279b5fd4c3b438a369210739267741082aa1e01 SHA512 e1ac2cee2a39f4f462d8399f79965daf7c08e5a24fb1821add9d1f5e8e66728df5289d16df4abc66ae8b26285b1fd1c78f13f3b3f3f86c24f12a49b58de5d158 +AUX wit-3.02a-makefile.patch 7803 BLAKE2B 1912c974b8e7f6a1e06d0cc14b56470db3422433888012b7bf212f32a3cc941b882cef55c5a85e8186d60c4bde705f5cbf023eb5be2264e31f56528fc99ffa4f SHA512 66f3c09416fe0a86648aef4cf76955d525c2c15bb0eea68e1d381eb578113a77a7446ca9e3c804e1734ca28e25e816e06995d1d2628142359ac9a4be79bff39e +AUX wit-3.02a-no-exec-stack.patch 232 BLAKE2B 2af2bfe707d22b95f40f2f0e5675fef3e5a153615c327c1638e55651f1fa4cf61b2b868ff86ac899c64f1526f1093e044f32ca853ad0c11c5f505924ee8f1d4d SHA512 958f1fbeda1f29ad704d2eeb3c2a1281f71957fbbb07a7258e6e69af1552e13d135ed61864ef92b9a1334b91990f79366b5b235a8865c424414e46a9305762b0 DIST wiimms-iso-tools.source-3.02a.tar.bz2 1645416 BLAKE2B 3ce99b779069d7b845bcf799ee481d63764ba36576adf4c28759e8eb9db9239c158457f84c8e34169b493de94d3c5e3324dc3c2cbd9a9a171ed1b57d2863eb78 SHA512 9bc8c8e078b2932d74a785732ec786ed5b6af86fa951f606a23052c31445e0b1637065858148fb050137f6252ae4ef77676877263513ef3bda33edb42bfed632 -EBUILD wit-3.02a.ebuild 856 BLAKE2B cb28fefd3e1d39dd288c0f23f0c345fe6eff6979808de685b8bc50f39d24d5ec27426155912443b6ee065fe6d8ecd0f933b854f0ae6c07d00653255583ebcfe5 SHA512 23c7596788d4dadeaca9228909157045112280bc3fe0cbc418d1fea46de825243a94ae386073d721fb718f995e2db4d871029223cb5a377722315008b7f81326 +EBUILD wit-3.02a.ebuild 944 BLAKE2B 7db45b804b2e7a3b02598fa11258c338ad6d2e65275a0ba6aa928b187e1b744f4f949be582705c938e8119c47fcb04be77fba71af2cc4ff70984ff294218dce0 SHA512 95097ba2502879e321e92e20db812ac4996b2b8c25cbe97aa723d51335529286dcd1fa418f20cf0e1d2e4e7f3adf9a7fead691e77beeace5bb71e9183fbe4f37 MISC metadata.xml 245 BLAKE2B aaa2ff40dc902a24a65d078bf0805049ba2f934fd668dd39f8bb57192976a37d3bfcdb068e04fac61a8e5f9ea31ddd5e913cbd27613f4945c022dcaec3352568 SHA512 1945d9e75b65266a6b60a5595ae5c381f2ab74c3deffa98480644b922a0d7de02df8dfc7d4716368271b4683c2699cf531ac2e9d4d6993ce31d5a82cf6dc4472 diff --git a/games-util/wit/files/wit-2.30a-no-exec-stack.patch b/games-util/wit/files/wit-2.30a-no-exec-stack.patch deleted file mode 100644 index db91b45cfcb1..000000000000 --- a/games-util/wit/files/wit-2.30a-no-exec-stack.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- wit-2.30a/src/crypto/ssl-asm.S -+++ wit-2.30a/src/crypto/ssl-asm.S -@@ -37,3 +37,6 @@ - #define WIT_INCLUDE_SSL_ASM - #include "ssl-asm.h" - -+#if defined(__linux__) && defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif diff --git a/games-util/wit/files/wit-3.02a-fno-common.patch b/games-util/wit/files/wit-3.02a-fno-common.patch new file mode 100644 index 000000000000..b930213f1567 --- /dev/null +++ b/games-util/wit/files/wit-3.02a-fno-common.patch @@ -0,0 +1,11 @@ +--- a/dclib/dclib-color.h ++++ b/dclib/dclib-color.h +@@ -535,7 +535,7 @@ + /////////////// color helpers /////////////// + /////////////////////////////////////////////////////////////////////////////// + +-u32 ColorTab_M0_M15[16]; // first 16 colors of "\e[m" ++extern u32 ColorTab_M0_M15[16]; // first 16 colors of "\e[m" + + // return a m256 index + u8 ConvertColorRGB3ToM256 ( u8 r, u8 g, u8 b ); diff --git a/games-util/wit/files/wit-3.02a-makefile.patch b/games-util/wit/files/wit-3.02a-makefile.patch index a0dea1405a6e..a0172d50f0f7 100644 --- a/games-util/wit/files/wit-3.02a-makefile.patch +++ b/games-util/wit/files/wit-3.02a-makefile.patch @@ -1,9 +1,21 @@ Don't link libdl into wfuse as it's unnecessary, use system bzip2, respect user CFLAGS, use pkgconfig to determine ncurses libs, and use verbose build output. ---- wiimms-iso-tools.source-3.02a/Makefile -+++ wiimms-iso-tools.source-3.02a/Makefile -@@ -171,7 +171,7 @@ +--- a/Makefile ++++ b/Makefile +@@ -111,11 +111,6 @@ + #------------------------------------------------------------------------------- + # compiler settings + +-PRE ?= +-CC = $(PRE)gcc +-CPP = $(PRE)g++ +-STRIP = $(PRE)strip +- + #------------------------------------------------------------------------------- + # files + +@@ -171,7 +166,7 @@ TOPT_wit := $(OPT_STATIC) TOPT_wwt := $(OPT_STATIC) TOPT_wdf := $(OPT_STATIC) @@ -12,7 +24,7 @@ CFLAGS, use pkgconfig to determine ncurses libs, and use verbose build output. #TOPT_ALL := $(TOPT_wit) $(TOPT_wwt) $(TOPT_wdf) $(TOPT_wfuse) -@@ -206,8 +206,8 @@ +@@ -206,8 +201,8 @@ endif # lib summary @@ -23,11 +35,12 @@ CFLAGS, use pkgconfig to determine ncurses libs, and use verbose build output. RM_FILES += $(foreach l,$(LIB_LIST),src/$(l)/*.{d,o}) -@@ -297,10 +297,8 @@ +@@ -297,10 +292,9 @@ DEFINES1 += -D_LZMA_PROB32=1 # LZMA option DEFINES = $(strip $(DEFINES1) $(MODE) $(XDEF)) -CFLAGS += -fomit-frame-pointer -fno-strict-aliasing -funroll-loops ++CFLAGS += -fno-strict-aliasing CFLAGS += -Wall -Wno-parentheses -Wno-unused-function -#CFLAGS += -O3 -Isrc/libwbfs -Isrc/lzma -Isrc -I$(UI) -I. -Iwork -CFLAGS += -O3 -Isrc/libwbfs -Isrc -I$(UI) -I. -Iwork @@ -35,16 +48,22 @@ CFLAGS, use pkgconfig to determine ncurses libs, and use verbose build output. ifeq ($(SYSTEM),cygwin) CFLAGS += -Wno-format-truncation else ifeq ($(SYSTEM),mac) -@@ -317,7 +315,7 @@ +@@ -311,13 +305,10 @@ + + DEPFLAGS += -MMD + +-LDFLAGS += -static-libgcc +-LDFLAGS := $(strip $(LDFLAGS)) +- ifeq ($(HAVE_ZLIB),1) LIBS += -lz endif -LIBS += -lm -lncurses $(XLIBS) -+LIBS += -lm $(shell pkg-config --libs ncurses) -lbz2 $(XLIBS) ++LIBS += -lm $(shell $(PKG_CONFIG) --libs ncurses) -lbz2 $(XLIBS) DISTRIB_RM = ./wit-v$(VERSION)-r DISTRIB_BASE = wit-v$(VERSION)-r$(REVISION_NEXT) -@@ -370,83 +368,70 @@ +@@ -370,83 +361,70 @@ # general rules $(ALL_TOOLS_X): %: %.o $(ALL_OBJECTS) $(TOBJ_ALL) Makefile | $(HELPER_TOOLS) @@ -144,7 +163,7 @@ CFLAGS, use pkgconfig to determine ncurses libs, and use verbose build output. # ############################################################################### -@@ -644,9 +629,8 @@ +@@ -644,9 +622,8 @@ .PHONY : gen-doc gen-doc: @@ -156,7 +175,16 @@ CFLAGS, use pkgconfig to determine ncurses libs, and use verbose build output. # #-------------------------- -@@ -764,8 +748,7 @@ +@@ -750,7 +727,7 @@ + + .PHONY : predef + predef: +- @gcc -E -dM none.c | sort ++ @$(CC) -E -dM none.c | sort + + # + #-------------------------- +@@ -764,8 +741,7 @@ #-------------------------- templates.sed: Makefile @@ -166,7 +194,7 @@ CFLAGS, use pkgconfig to determine ncurses libs, and use verbose build output. '/^~/ d;\n' \ 's|@.@@@|$(VERSION_NUM)|g;\n' \ 's|@@@@-@@-@@|$(DATE)|g;\n' \ -@@ -828,13 +811,12 @@ +@@ -828,13 +804,12 @@ .PHONY : test test: @@ -185,3 +213,66 @@ CFLAGS, use pkgconfig to determine ncurses libs, and use verbose build output. # #-------------------------- +--- a/makefiles-local/Makefile.local.i386 ++++ b/makefiles-local/Makefile.local.i386 +@@ -5,6 +5,3 @@ + # => copy Makefile.local to main directory and remove appropriate comments + + #------------------------------------------------------------------------------ +- +-#CFLAGS += -mtune=generic +-CFLAGS += -march=i686 +--- a/makefiles-local/Makefile.local.x86_64 ++++ b/makefiles-local/Makefile.local.x86_64 +@@ -5,6 +5,3 @@ + # => copy Makefile.local to main directory and remove appropriate comments + + #------------------------------------------------------------------------------ +- +-CFLAGS += -march=x86-64 +- +--- a/setup.sh ++++ b/setup.sh +@@ -118,6 +118,6 @@ + + ---EOT--- + +-gcc $xflags system.c -o system.tmp && ./system.tmp >>Makefile.setup ++${CC} $xflags system.c -o system.tmp && ./system.tmp >>Makefile.setup + rm -f system.tmp + +--- a/test-libwbfs/Makefile ++++ b/test-libwbfs/Makefile +@@ -7,11 +7,6 @@ + + SHELL = /bin/bash + +-PRE ?= +-CC = $(PRE)gcc +-CPP = $(PRE)g++ +-STRIP = $(PRE)strip +- + #------------------------------------------------------------------------------- + # files + +@@ -46,18 +41,14 @@ + DEFINES = -DLARGE_FILES -D_FILE_OFFSET_BITS=64 $(XDEF) + DEFINES := $(strip $(DEFINES)) + +-CFLAGS = -fomit-frame-pointer -fno-strict-aliasing ++CFLAGS += -fno-strict-aliasing + CFLAGS += -Wall -Wno-parentheses -Wno-unused-function +-CFLAGS += -O3 -I../src/libwbfs -I. ++CFLAGS += -I../src/libwbfs -I. + CFLAGS += $(XFLAGS) + CFLAGS := $(strip $(CFLAGS)) + + DEPFLAGS += -MMD + +-LDFLAGS += -static-libgcc +-#LDFLAGS += -static +-LDFLAGS := $(strip $(LDFLAGS)) +- + LIBS += $(XLIBS) + + # diff --git a/games-util/wit/files/wit-3.02a-no-exec-stack.patch b/games-util/wit/files/wit-3.02a-no-exec-stack.patch new file mode 100644 index 000000000000..db91b45cfcb1 --- /dev/null +++ b/games-util/wit/files/wit-3.02a-no-exec-stack.patch @@ -0,0 +1,9 @@ +--- wit-2.30a/src/crypto/ssl-asm.S ++++ wit-2.30a/src/crypto/ssl-asm.S +@@ -37,3 +37,6 @@ + #define WIT_INCLUDE_SSL_ASM + #include "ssl-asm.h" + ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif diff --git a/games-util/wit/wit-3.02a.ebuild b/games-util/wit/wit-3.02a.ebuild index 7d79724689d0..95c5351036aa 100644 --- a/games-util/wit/wit-3.02a.ebuild +++ b/games-util/wit/wit-3.02a.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,24 +19,31 @@ IUSE="+fuse +zlib" RDEPEND=" app-arch/bzip2:0= fuse? ( sys-fs/fuse:0= ) - zlib? ( sys-libs/zlib:0= ) -" + zlib? ( sys-libs/zlib:0= )" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -DOCS="doc/*.txt" +S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}"/${P}-makefile.patch - "${FILESDIR}"/${PN}-2.30a-no-exec-stack.patch + "${FILESDIR}"/${P}-no-exec-stack.patch + "${FILESDIR}"/${P}-fno-common.patch ) -S=${WORKDIR}/${MY_P} - -src_compile() { +src_configure() { export NO_FUSE=$(usex fuse 0 1) export NO_ZLIB=$(usex zlib 0 1) - emake INSTALL_PATH="${D}"/usr CC="$(tc-getCC)" + tc-export CC PKG_CONFIG +} + +src_compile() { + emake INSTALL_PATH="${ED}"/usr emake doc } + +src_install() { + default + dodoc doc/*.txt +} diff --git a/games-util/xqf/Manifest b/games-util/xqf/Manifest index 365be0d9f392..1b38285e4c5b 100644 --- a/games-util/xqf/Manifest +++ b/games-util/xqf/Manifest @@ -1,5 +1,6 @@ -AUX xqf-1.0.6.2-underlink.patch 300 BLAKE2B 24205c2328355fd9e5ee187c3c7e7a3b1875f8020f1afbd7ced7bf6b2f3c57ce1d3485cad6c2d23a70ee830e7cad2ec7060554bb70fb0dbfbe26bc2c339afb9b SHA512 e35c62bf83ccbaaf8ca775978acf33ed419c881158f607e44032a2329b88443512a65603d0797ede1be38edaa66de1318d7c8275f276cd5988d74ef7430b51de +AUX xqf-1.0.6.2-fno-common.patch 409 BLAKE2B af6a466239abd148b3e158fc761bd7411db1680dd898750068c2bb3b62ee7b25ebaf1ca16f9f058b1ebc2d6eb86325e7e13462b7ade37b6c5545ff3183932045 SHA512 5c9ab675685b4b4881031bfd64f3dbc2afef2b97a20e9b68683ede8f3fc93093ad324ea0210e87b2b39fd2e3c22cbb225dc4ab51be479d61df746c21bb5cb2a0 +AUX xqf-1.0.6.2-underlink.patch 589 BLAKE2B 67c27e6e5e93cf88d937da38c80ec0d00de8f51764eb9074359595f3cccb8a62c4ec7251ae915b68048a28dde05e6692b08b78473a27ee77581ac119df9fe46f SHA512 1f79d677f0d5ca755827adcbeadf9835ca219fe2d7bc0620489861dc44ce9033a73d111c291e25776ae02392a84044a64ed34ff59ccb49ff6125d5c195ff757c AUX xqf-1.0.6.2-zlib-1.2.5.1-compile-fix.patch 190 BLAKE2B 3c4a52c059392596c082c4ae3f4259073dc49fd5c94424ef80e4f22076e4b5473eabc60d763eabb3f73177155692db7d722d7ab8cf1f7acc9c285fdfc9d12390 SHA512 11677294d042d8303b72085867855e1795a9995e29f4b5145e415434c8c6188fa20e19c95f02d804a2b3e481f1f827cad9fa865d77f4f1f0880a3a66d69460d8 DIST xqf-1.0.6.2.tar.gz 595096 BLAKE2B 36c135c064ae61af12daa70e9c78fe2a377ebcaf91b0f36fac43865b6b0601f104d8b09bd84b9d9699afdab7f3d4d3a0e67f3251f20d6ce025e92db2302d21a8 SHA512 8706104dde0f93a89f9f69a4b8f40f5c4c8160a3bb7a99f7572448c0110a595503e430fdba741c50b22f7e92a08f1cf6abee06aaa23956e4e37b7bf894a66a9c -EBUILD xqf-1.0.6.2.ebuild 940 BLAKE2B e58e3632573416bd915657d88e44a850e03a45a02b16271c9bb8ef9a3eecc63b2a8e6f2e85367a4c846413aae4fde7b04d46e7374b10b54d8df10c1734ba0095 SHA512 77b887d3e70c340cf6e8f4d977c996f26976cf16576888fc0ac7bafab22283b512fb7ab5adb8e93f4c3d6a69d5a419d843a8f6fd7bb42fdf904a8a619b30ec18 +EBUILD xqf-1.0.6.2.ebuild 944 BLAKE2B b0788e7f93296faf3a3fb9dd97b12c13c447218ea29b0f66d6b12f0cf6da61b3ff42de51accfccbbe52a0587d853b668f82901ea56c23fdf7c68ee6f22b6b749 SHA512 900e62a72fe41f6f854c3a5804e323c6f054db784361555fb5becbc93cb22644689279a7d4cde3777424ad01283c27491ffd7df6dace60fa71c907c1b6ebbd60 MISC metadata.xml 373 BLAKE2B d2337bac8791a2a8985237089b723183ba428527db288b5f98e37499e0dde32503f09eca2fa6d320b354fe8507fb4cd98c12f866f77e2c0f85ee52739758fa05 SHA512 b904d8495fb9fd79c072f12570ef67cb28396ba215e0cbc70f184c64dcd1b1a7c028274bb7927acf8b7012ff55cb22564fa52252d6bc41e75e86d5562761539a diff --git a/games-util/xqf/files/xqf-1.0.6.2-fno-common.patch b/games-util/xqf/files/xqf-1.0.6.2-fno-common.patch new file mode 100644 index 000000000000..15147ac6d917 --- /dev/null +++ b/games-util/xqf/files/xqf-1.0.6.2-fno-common.patch @@ -0,0 +1,21 @@ +--- a/src/filter.c ++++ b/src/filter.c +@@ -88,6 +88,8 @@ + const char* filter_quick_get(void); + void filter_quick_unset (void); + ++unsigned int current_server_filter; ++ + /* /QUICK FILTER */ + + struct filter filters[FILTERS_TOTAL] = { +--- a/src/filter.h ++++ b/src/filter.h +@@ -89,7 +89,6 @@ + + extern GArray* server_filters; + +-unsigned int current_server_filter; + extern unsigned int current_server_filter; + + diff --git a/games-util/xqf/files/xqf-1.0.6.2-underlink.patch b/games-util/xqf/files/xqf-1.0.6.2-underlink.patch index fe93c7624675..0e3ba3ed22e4 100644 --- a/games-util/xqf/files/xqf-1.0.6.2-underlink.patch +++ b/games-util/xqf/files/xqf-1.0.6.2-underlink.patch @@ -1,5 +1,25 @@ ---- xqf-xqf-1.0.6.2/src/Makefile.am -+++ xqf-xqf-1.0.6.2/src/Makefile.am +--- a/configure.in ++++ b/configure.in +@@ -23,6 +23,7 @@ + AC_ISC_POSIX + AC_PROG_LN_S + AC_PROG_RANLIB ++AM_PROG_AR + + dnl Checks for header files. + AC_HEADER_STDC +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -21,6 +21,7 @@ + #src/rc.c + src/rcon.c + src/redial.c ++src/scripts.c + #src/server.c + #src/skin.c + #src/skin_pcx.c +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -41,6 +41,7 @@ $(GEOIP_LIB) \ $(PACKAGE_LIBS) \ diff --git a/games-util/xqf/xqf-1.0.6.2.ebuild b/games-util/xqf/xqf-1.0.6.2.ebuild index 5ea89476375a..9c9510182f86 100644 --- a/games-util/xqf/xqf-1.0.6.2.ebuild +++ b/games-util/xqf/xqf-1.0.6.2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils +EAPI=7 + +inherit autotools DESCRIPTION="A server browser for many FPS games (frontend for qstat)" HOMEPAGE="http://xqf.github.io/en/" @@ -13,26 +14,28 @@ SLOT="0" KEYWORDS="~amd64 ~hppa ~x86" IUSE="bzip2 geoip nls" -RDEPEND="x11-libs/gtk+:2 +RDEPEND=" + x11-libs/gdk-pixbuf-xlib + x11-libs/gtk+:2 >=games-util/qstat-2.11 nls? ( virtual/libintl ) geoip? ( dev-libs/geoip ) bzip2? ( app-arch/bzip2 )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig nls? ( sys-devel/gettext )" -S=${WORKDIR}/${PN}-${P} +S="${WORKDIR}/${PN}-${P}" -# bug #288853 -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-underlink.patch \ - "${FILESDIR}"/${P}-zlib-1.2.5.1-compile-fix.patch - sed -i \ - -e '/Icon/s/.png//' \ - xqf.desktop.in || die +PATCHES=( + "${FILESDIR}"/${P}-underlink.patch + "${FILESDIR}"/${P}-zlib-1.2.5.1-compile-fix.patch + "${FILESDIR}"/${P}-fno-common.patch +) +src_prepare() { + default mv configure.{in,ac} || die eautoreconf } -- cgit v1.2.3