From 29aabba0ea759c6a2864ff5631735b67ee38e5e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Feb 2020 18:44:56 +0000 Subject: gentoo resync : 05.02.2020 --- games-action/Manifest.gz | Bin 13807 -> 13637 bytes games-action/accelerator3d/Manifest | 5 -- .../accelerator3d/accelerator3d-0.1.1-r3.ebuild | 47 ------------------ .../files/accelerator3d-0.1.1-gentoo-paths.patch | 53 --------------------- .../files/accelerator3d-0.1.1-gllightmodel.patch | 11 ----- games-action/accelerator3d/metadata.xml | 11 ----- games-action/xblast/Manifest | 3 +- .../xblast/files/xblast-2.10.4-gcc-10.patch | 22 +++++++++ games-action/xblast/xblast-2.10.4-r1.ebuild | 6 ++- 9 files changed, 29 insertions(+), 129 deletions(-) delete mode 100644 games-action/accelerator3d/Manifest delete mode 100644 games-action/accelerator3d/accelerator3d-0.1.1-r3.ebuild delete mode 100644 games-action/accelerator3d/files/accelerator3d-0.1.1-gentoo-paths.patch delete mode 100644 games-action/accelerator3d/files/accelerator3d-0.1.1-gllightmodel.patch delete mode 100644 games-action/accelerator3d/metadata.xml create mode 100644 games-action/xblast/files/xblast-2.10.4-gcc-10.patch (limited to 'games-action') diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz index 75182544aac8..f2efe591f32c 100644 Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ diff --git a/games-action/accelerator3d/Manifest b/games-action/accelerator3d/Manifest deleted file mode 100644 index d8c99bf9d899..000000000000 --- a/games-action/accelerator3d/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX accelerator3d-0.1.1-gentoo-paths.patch 3073 BLAKE2B 1b9621992e022838f9319d839b0f765b69d6ac6086dd99127c5398718b1507db0039a414e65bb3a19c0d8898ea0cfa762e41271424def05dcd984e5eb481be6a SHA512 176b46b537c65319cc611159fc6dda6b6d21858c101d491a54c28099522d9a5a06fd6d07b84b70c1d8bfd30c591a61ad3a5e3d72ce5415760f18c828c42f1e56 -AUX accelerator3d-0.1.1-gllightmodel.patch 574 BLAKE2B 524d7fae81db0382f5ca29ad055fecac9a55d4aeea900c1559fb0fe0ba3af2485eb8f891348f13345aa7ec1df4a6a66080c9a5091eb8c0341f88b37ec64c2c54 SHA512 e6364093194560e1834ea52b943bb01f5b1e2990ed5b087c30a1c756a7f44857bfdff908ade0f67c1c8047cff82f2c7e4b660968cdf82a90012f00c2ccef5e7b -DIST accelerator-0.1.1.tar.bz2 1183838 BLAKE2B 8c7b888e4eadc0a1ed63745904db94757cfa73557664e0b2a7f7c8960990eb82991be9b1b42cb0d60f3af113867a2a02fb9304bd97f7658fec7d86efe5747c34 SHA512 f4321beb5f5b61c10d0b275321641ec173636267ae08cf88f7a2ecaaf0799cfe6593cbc7343c8ebfa72853c59773841295b1aca9a0ac0ef510de390107aa01da -EBUILD accelerator3d-0.1.1-r3.ebuild 1048 BLAKE2B ecdc1302663698dc2161eec64b15ffecddf50f293914c543038c2fc13b619a2b5c370abf546c937f6cd6e1981b79b6dd4bf93a720e846952d666af0ed271ad0d SHA512 a9cfca319ac5ae6d047bdece8dba0e3c83463911499fc75f6eca704b896696dc04f8bd4d27bbfdd150e3e85967d0bdcf39d4ccdab144d8dc7bc5687bb1ab5a82 -MISC metadata.xml 336 BLAKE2B 0a097a131cf597dadb452521435b8bbf48ebc783dd45159dabfdd3ea68a15cb279307788cd54b577335f6d99c378583b85190802b7baacfc9918929c619f245b SHA512 a5f747c0ca0e4a9b14d09981181248de38c92175f80c96ad368f04033c4782e0ae0ae84af6604ee8ba0d6e438d395e4101a62fc5eefcfbef0cd003e78978c51c diff --git a/games-action/accelerator3d/accelerator3d-0.1.1-r3.ebuild b/games-action/accelerator3d/accelerator3d-0.1.1-r3.ebuild deleted file mode 100644 index 2013913e62fc..000000000000 --- a/games-action/accelerator3d/accelerator3d-0.1.1-r3.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -inherit desktop python-r1 - -DESCRIPTION="Fast-paced, 3D, first-person shoot/dodge-'em-up, in the vain of Tempest or n2o" -HOMEPAGE="http://accelerator3d.sourceforge.net/" -SRC_URI="mirror://sourceforge/accelerator3d/accelerator-${PV}.tar.bz2" - -LICENSE="Artistic" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS}" -RDEPEND="${DEPEND} - dev-python/pygame[${PYTHON_USEDEP}] - dev-python/pyode[${PYTHON_USEDEP}] - dev-python/pyopengl[${PYTHON_USEDEP}]" - -S=${WORKDIR}/${PN} - -PATCHES=( - "${FILESDIR}"/${P}-gentoo-paths.patch - "${FILESDIR}"/${P}-gllightmodel.patch -) - -src_prepare() { - default - - sed -i \ - -e "s:@GENTOO_DATADIR@:${EPREFIX}/usr/share/${PN}:" \ - accelerator.py || die -} - -src_install() { - python_foreach_impl python_newscript accelerator.py accelerator - - insinto /usr/share/${PN} - doins -r gfx/. snd/. - einstalldocs - make_desktop_entry accelerator -} diff --git a/games-action/accelerator3d/files/accelerator3d-0.1.1-gentoo-paths.patch b/games-action/accelerator3d/files/accelerator3d-0.1.1-gentoo-paths.patch deleted file mode 100644 index 526fa678fdbc..000000000000 --- a/games-action/accelerator3d/files/accelerator3d-0.1.1-gentoo-paths.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- a/accelerator.py 2006-04-18 21:51:28.000000000 +0200 -+++ b/accelerator.py 2006-04-18 22:07:28.000000000 +0200 -@@ -72,7 +72,7 @@ - # default parameters on it (min/mag filters, wrapping). - def __init__(self,texfile,mipmap = False): - global activeTexture -- filename = os.path.join('gfx',texfile) -+ filename = os.path.join('@GENTOO_DATADIR@',texfile) - image = pygame.image.load(filename) - data = pygame.image.tostring(image,'RGBX') - self.__texref = glGenTextures(1) -@@ -599,8 +599,8 @@ - for i in xrange(len(self.__menu[j][0])): - font.addString(self.__menu[j][0][i]) - if (soundon): -- self.__browsesound = pygame.mixer.Sound(os.path.join('snd','menu_browse.wav')) -- self.__selectsound = pygame.mixer.Sound(os.path.join('snd','menu_select.wav')) -+ self.__browsesound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@','menu_browse.wav')) -+ self.__selectsound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@','menu_select.wav')) - - def doLoop(self): - global elapsed, z_increment, font -@@ -792,19 +792,19 @@ - - # sound! - if soundon: -- self.__shootsound = pygame.mixer.Sound(os.path.join('snd','shoot.wav')) -- self.__cluonsound = pygame.mixer.Sound(os.path.join('snd','cluon.wav')) -- self.__bogonsound = pygame.mixer.Sound(os.path.join('snd','bogon.wav')) -- self.__shipdeadsound = pygame.mixer.Sound(os.path.join('snd','ship_explode.wav')) -- self.__shocksound = pygame.mixer.Sound(os.path.join('snd','electricshock.wav')) -- self.__thudsound = pygame.mixer.Sound(os.path.join('snd','thud.wav')) -- self.__enginesound = pygame.mixer.Sound(os.path.join('snd','engine.wav')) -- self.__chargesound = pygame.mixer.Sound(os.path.join('snd','neon.wav')) -+ self.__shootsound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@','shoot.wav')) -+ self.__cluonsound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@','cluon.wav')) -+ self.__bogonsound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@','bogon.wav')) -+ self.__shipdeadsound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@','ship_explode.wav')) -+ self.__shocksound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@','electricshock.wav')) -+ self.__thudsound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@','thud.wav')) -+ self.__enginesound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@','engine.wav')) -+ self.__chargesound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@','neon.wav')) - self.__chargeplaying = False -- self.__scrapesound = pygame.mixer.Sound(os.path.join('snd','scrape.wav')) -+ self.__scrapesound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@','scrape.wav')) - self.__scrapeplaying = False -- self.__slamsound = pygame.mixer.Sound(os.path.join('snd','slam.wav')) -- self.__phlogsound = pygame.mixer.Sound(os.path.join('snd','phlogiston.wav')) -+ self.__slamsound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@','slam.wav')) -+ self.__phlogsound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@','phlogiston.wav')) - - # reserve channel 0 for bullet sounds - pygame.mixer.set_reserved(2) diff --git a/games-action/accelerator3d/files/accelerator3d-0.1.1-gllightmodel.patch b/games-action/accelerator3d/files/accelerator3d-0.1.1-gllightmodel.patch deleted file mode 100644 index 31d0a8b5b4c5..000000000000 --- a/games-action/accelerator3d/files/accelerator3d-0.1.1-gllightmodel.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/accelerator.py -+++ b/accelerator.py -@@ -274,7 +274,7 @@ - glColorMaterial(GL_FRONT,GL_AMBIENT_AND_DIFFUSE) - glMaterialfv(GL_FRONT,GL_SHININESS,128) - glMaterialfv(GL_FRONT,GL_SPECULAR,(0.5,0.5,0.5,1)) -- glLightModel(GL_LIGHT_MODEL_COLOR_CONTROL_EXT,GL_SEPARATE_SPECULAR_COLOR_EXT) # GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR -+ glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL_EXT,GL_SEPARATE_SPECULAR_COLOR_EXT) # GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR - glEnable(GL_LINE_SMOOTH) - glEnable(GL_NORMALIZE) - #glPolygonMode(GL_FRONT,GL_LINE) diff --git a/games-action/accelerator3d/metadata.xml b/games-action/accelerator3d/metadata.xml deleted file mode 100644 index eaa5ae72c1f2..000000000000 --- a/games-action/accelerator3d/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - games@gentoo.org - Gentoo Games Project - - - accelerator3d - - diff --git a/games-action/xblast/Manifest b/games-action/xblast/Manifest index 2a57f286f8ba..f0165347464c 100644 --- a/games-action/xblast/Manifest +++ b/games-action/xblast/Manifest @@ -1,8 +1,9 @@ +AUX xblast-2.10.4-gcc-10.patch 567 BLAKE2B b93f4a9c5d529c7c49b7f926e5b23ed2141e4c7c4d147130d3994bcbeb980fac856c30ff15544901a2cdea01dbb30130acb275f329e8a538f4358d3c0bf729d6 SHA512 0377312515d8323540795f0c5bac47eb0883be534df68ee2f22166f5ad1d88f1515b95460e0b7432ea7f7cdccadb2966db864a4f723e41fd8506cb95530a0251 DIST images-2005-01-06.tar.gz 860830 BLAKE2B 193c748178f8e24fa5b3b00918344cfc9939ff07f537f27d0bde6dafd5720fdef9ecc7884364ca6e3fd77297689a07640f5feeb1ca4309afc3237c8db30569ea SHA512 7254acc664997af5dae8c906a7b90570103c17295e463e8c313f5531810734241fa6485625a7a48a4859f92dbbf2b94332348a1bc85c8930ad6688e5f56be588 DIST levels-2005-01-06.tar.gz 283353 BLAKE2B fcb380f6a61b656e30b72efa3a567f1ffae6de8f819e5e7e13840ee28c904de3f435976b9f40e6baa711b05f84bdafd8aaed1e87f551570b3dd0077b8ec9c000 SHA512 ece07564fbdf6c21b3b65f3345929c65612f3bf8ed17d4d78e1fe1e2c25f83eb174a086c66fcb891c173f56a24625f8a53623beaaea7013e536f577380680031 DIST models-2005-01-06.tar.gz 1738564 BLAKE2B 7dfd87e47bf4555d6f01c59e83d1a341513eec61c591166bb2583865c6723b44b2ebf1c9ed9267874e2bb9a2c6cc492c2ac4e870301f13668c1719bd16848fa5 SHA512 20925bf6b0a5bde43df6bab86078e6b7e550a79d1695e3d076254deb3ba556f2c09afa5847c0b3a12f09f3b4386df2da8256cad09c0ea07d9937b98e0c3438b8 DIST musics-2005-01-06.tar.gz 5317575 BLAKE2B 583d33535c5e80f691e9be7545038ca5dee602a1522f7749ffde0cbd9691378c9bb06c783548482eb26a61f74e3ad3cfac9166382d0644bd450eca1af0f08ed3 SHA512 885591cf5f32d76bc5bae150b24592c8eccd6f33afa5d40570429371b328671c3902c565446dae24bf949ac67b681e39e46e8d4ea737f52c66d467c09a210ede DIST sounds.tar.gz 1612625 BLAKE2B eb1ce96370dfafd254ef50334bd6e296045da6825773704d95f5778e854da4c1460fc0a24ae6c3e0c2c3784723fbce4198dfd7331ca9c18ab0324fef6ef6f3f1 SHA512 69518766ce1cc1bef543964acb077de51c361f1a880ebc11bd0d381fe082af0e013d116aad606a18c94855a08c5a2892cb5d0d5a259b081119bb8d355a94e2b2 DIST xblast-2.10.4.tar.gz 684965 BLAKE2B e9709f539705b9e14831fa036c540877d0d55ce8c975048c8eac0abbf2e391e36b37e4c119118d73f5bf5e888f3fbef4c1dba361b3ba1874909644f948c57613 SHA512 6b3be0d41d18cf8da721030fa87c00ffed81d29706a20dd254a07b9cc8af79bd09f63ebb7f575c1665b77b9f58f29bec74b84f27fd2106d704c2fe2d5513a835 -EBUILD xblast-2.10.4-r1.ebuild 1502 BLAKE2B ac7176dc595c8ccf528d4f6f1081b3a93e8a62de501a6bfbbde057320808922457e089c3cf17bea6ceec4744f2ad17e445eb96b2f588bb5eec6b1f12de349669 SHA512 d9150e8a8f0d067cb77f9079f84b80f88f5854e48658c8381a52856f170fb0d28b9427a5ae8432b583a5646a35ea303ab811cccc6b0f4995fd08553994f42224 +EBUILD xblast-2.10.4-r1.ebuild 1545 BLAKE2B 3c288f4707e28258e62a195cb00c25e3168b908342b0aacf533a6049fec74bad9624265ef0527b9154c37db794d66b07b5279dd61eb359f40e22c392f26794c1 SHA512 ef688c58dd792d99702dfd1a38f09c861345ceb91aa84017362b7860a60572512fee775c8c7abdb5438d831365286d7d560a6fd03eb7e58ff5db8f4f7144d20b MISC metadata.xml 329 BLAKE2B 66da783ba5a7a3e13a073e0de391ded501a39c26cf4e3cf47a13fec1f36fcc0305efe5a5524d8814bf23a0424d38358820fe554f5f78af50a72cdc125bb80712 SHA512 6afab2e751e3e0a5a2199915dc2ae3149af070ee43ca200c88514ad783b0801f0e22c1c7a4026079af36d3a9b3deb016f2f57e93867d8a8e989660e744f56744 diff --git a/games-action/xblast/files/xblast-2.10.4-gcc-10.patch b/games-action/xblast/files/xblast-2.10.4-gcc-10.patch new file mode 100644 index 000000000000..01d6da9bd13e --- /dev/null +++ b/games-action/xblast/files/xblast-2.10.4-gcc-10.patch @@ -0,0 +1,22 @@ +--- a/cfg_control.h ++++ b/cfg_control.h +@@ -29,7 +29,7 @@ + #define NUM_KEYB_CONTROLS 2 + + /* constant assignment of control to event type */ +-const XBEventCode keyEventType[NUM_KEYB_CONTROLS]; ++extern const XBEventCode keyEventType[NUM_KEYB_CONTROLS]; + + /* ingame controls for editing*/ + typedef struct +--- a/network.h ++++ b/network.h +@@ -105,7 +105,7 @@ typedef enum + #define TEAM_UNDEF 252 + + /* team color assignment */ +-const XBColor teamColors[NUM_XBTS]; ++extern const XBColor teamColors[NUM_XBTS]; + + /* results of game config receive/create */ + typedef enum diff --git a/games-action/xblast/xblast-2.10.4-r1.ebuild b/games-action/xblast/xblast-2.10.4-r1.ebuild index 72666813a3c4..3da27dd600ac 100644 --- a/games-action/xblast/xblast-2.10.4-r1.ebuild +++ b/games-action/xblast/xblast-2.10.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -32,6 +32,10 @@ RDEPEND=" DEPEND="${RDEPEND} x11-libs/libXt" +PATCHES=( + "${FILESDIR}"/${P}-gcc-10.patch +) + src_prepare() { default -- cgit v1.2.3