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-fps/nexuiz/Manifest | 2 +- games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'games-fps/nexuiz') diff --git a/games-fps/nexuiz/Manifest b/games-fps/nexuiz/Manifest index b8da8286d5bf..d016bd218d51 100644 --- a/games-fps/nexuiz/Manifest +++ b/games-fps/nexuiz/Manifest @@ -1,5 +1,5 @@ AUX nexuiz-2.5.2-libpng-1.4.patch 1607 BLAKE2B dbe06a42ecfc2fda130d2eb29a1cbefcf59631b7b5662e73ae8557cf90b7f3083369dc1d277529f09504e1cd74e17a7eee0d6176713b561ad608f9a2e03d9868 SHA512 38aa8fbd0765283c03c0bf6cc13362ed692f4776a12ad23ef582eb9c238fda6eea475284a662ba84d70eab7a7df71a0cb28b5b90f19c12d2594c3ba67f0851aa DIST nexmappack_r2.zip 113533483 BLAKE2B 32da18020e80835c0fea24280c4793fc33d017774311fb154ec438de97c46f58608cb83cdc8b27fd033c4086384b5bb3d5ffc9a8841618d7cc54401073cc7d8b SHA512 f7e2dd60530b58f3fc505cdf0d605208b6905136586107210031233cb870b1892bae59efc4fb38403a4f0fc5301321297d03107b38daa501cb90e5669455eac0 DIST nexuiz-252.zip 931253731 BLAKE2B 620d46cf90ef73cd0039721597d11b7a5924a6614f065d413339f6e01fff8396b49a576bd293f3f64882e51c05fd0dea190eb8c9fbef5ab57cdd26736ccffd4c SHA512 da661eb2ff1764fed1d5f5547b89e4f9aa47613d41a3999c0202d8858ec2b882e4ef0ec182a81d1bdb25dff2ef65aad6af132009884e3557206941a736c2a68c -EBUILD nexuiz-2.5.2-r1.ebuild 2532 BLAKE2B 2f7f9955e6970fa0b402421246edf312aa0984e5f91aa64618b482f24c8057f8125a50e78e65021fd4e8f79a09f38d3c02987e7a1882d6e9a95a1cfc43638fd7 SHA512 f4dc28ac428b31c352794d2a361cbb41d633cf82fbc1c00eccd520dbe77a7ca1ce84479f6a82d9b596f73ff3a48652ad6f26fade745b30b18faf051478bbd545 +EBUILD nexuiz-2.5.2-r1.ebuild 2553 BLAKE2B fcff261e4cababc230541c1d7ebf7ce4365f6ff1947d0aca0c6d9dab7c544ebcec914124abd5730118fb1b3ca1f2d876bef57167cbf6fc306fb0bf93a5c7a2f5 SHA512 26d1de723465413580cc5a0203ed1fa0d0cfc71171c26702780e1ddf45a3bdc429fb2dc90d948df6dfa2950f397a22f6bc56679d7d17a5487df94e7ca102b8fc MISC metadata.xml 416 BLAKE2B 5401c62409ae99347c0ed229edeb5af36b4200b1ba5e9cf35bf70674ac1119fe93bb22bb99f24a4b38b0dfced7d89a724f1985b119b237be1f49c566d27d797a SHA512 f07e139d436fba2f1ef78c41788f8e860258755de93cb8bb1b7f4315b6f9efa140013584f627cbb4cd1d46bb3071021f8d3cef2084e46a81fdd52d9d277ede34 diff --git a/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild b/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild index 2778fcff0c04..68bb3ae1edc8 100644 --- a/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild +++ b/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils +inherit desktop toolchain-funcs MY_PN=Nexuiz MY_P=${PN}-${PV//./} @@ -69,15 +69,14 @@ src_prepare() { # Make the game automatically look in the correct data directory sed -i \ - -e "/^CC=/d" \ - -e "s:-O2:${CFLAGS}:" \ - -e "/-lm/s:$: ${LDFLAGS}:" \ + -e 's:-O2:$(CFLAGS):' \ + -e '/-lm/s:$: $(LDFLAGS):' \ -e '/^STRIP/s/strip/true/' \ makefile.inc || die sed -i \ -e '1i DP_LINK_TO_LIBJPEG=1' \ - -e "s:ifdef DP_.*:DP_FS_BASEDIR=/usr/share/${PN}\n&:" \ + -e "s:ifdef DP_.*:DP_FS_BASEDIR=${EPREFIX}/usr/share/${PN}\n&:" \ makefile || die if ! use alsa ; then @@ -88,6 +87,7 @@ src_prepare() { } src_compile() { + tc-export CC if use opengl || ! use dedicated ; then emake cl-${PN} if use sdl ; then -- cgit v1.2.3