gentoo resync : 25.11.2020

3 files changed, 36 insertions, 18 deletions

diff --git a/games-fps/avp/Manifest b/games-fps/avp/Manifest
index 372a3bd1ee63..5f92d5f837e2 100644
--- a/games-fps/avp/Manifest
+++ b/games-fps/avp/Manifest
@@ -1,3 +1,4 @@
+AUX avp-20150214-fno-common.patch 458 BLAKE2B dcc21e9ff1b85497ec1d9434e153deb181d3d535629ad3caf0d0843a27921ebe43dc72b3fe6ce7235f456c246df9e1c6be1e251b65ae10bd0260a6e9e92b86de SHA512 bbd7791f386de34dee55f29c24ddab8e0ccf3094c1a1bb940b68fa85853010c8b12f40934356724d3678daf171393e288aa69405395560375dde05be314a33e6
 DIST avp-20150214.tar.gz 1718303 BLAKE2B cc328bdb8c35046d7bde587c7feff22e890c2c68c4890ef431ccd0b3acfbbd08c784164f59a0111a6d0b6ded63a8edfb026b17e92f74554b9a948426be8c8185 SHA512 c485a55ff455498bcf82bc17f2056d35d4c646bdf7809f4c326fc7063a9ce5db9e4893af67dff3f6bedb7d5f96e82f792d7f516044fdbab638113091a5505158
-EBUILD avp-20150214-r1.ebuild 853 BLAKE2B 4d36bc15b891a0a30a04b3ccdb077afa93d4594c9314b92d1522f643b124d598fb3c723934ceaa1c3458765c717167585e47838450a629713c9b57170920a354 SHA512 a4a61535565aca35c1460cd01730331862c2fe0395876961e7844995a2a5953ed8d86ff8b359b38558e824e3c05397dae505f8747f73ffaf1a121347c26812ea
+EBUILD avp-20150214-r1.ebuild 817 BLAKE2B 745002263b58ed7cd3b322b39d1ddefcf14c1be1ce658ed9e754ec692daf42639ac13d99c4320528af3d8680add247d95f45e136d33e3256455841058345c9ac SHA512 641e557a63ee8654682c836e97d77f39ee5f46813361eeb65cc09457a5b33f7d5b3836afb256878c690d6b499d17d788540ed93ac7ef3bbd67d4a8a2eb133849
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/avp/avp-20150214-r1.ebuild b/games-fps/avp/avp-20150214-r1.ebuild
index 7a41b588eaad..fb38321a71fb 100644
--- a/games-fps/avp/avp-20150214-r1.ebuild
+++ b/games-fps/avp/avp-20150214-r1.ebuild
@@ -1,8 +1,9 @@
-# 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 cmake-utils
+EAPI=7
+
+inherit cmake
 
 DESCRIPTION="Linux port of Aliens vs Predator"
 HOMEPAGE="http://www.icculus.org/avp/"
@@ -11,36 +12,30 @@ SRC_URI="http://www.icculus.org/avp/files/${P}.tar.gz"
 LICENSE="AvP"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+RESTRICT="bindist mirror"
 
 RDEPEND="
 	media-libs/libsdl[video,joystick,opengl]
 	media-libs/openal"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-CMAKE_BUILD_TYPE=Release
+PATCHES=( "${FILESDIR}"/avp-20150214-fno-common.patch )
 
 src_configure() {
 	local mycmakeargs=(
-		"-DCMAKE_VERBOSE_MAKEFILE=TRUE"
 		-DSDL_TYPE=SDL
 		-DOPENGL_TYPE=OPENGL
 	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
+	cmake_src_configure
 }
 
 src_install() {
-	dobin "${BUILD_DIR}/${PN}"
-	dodoc README
+	dobin "${BUILD_DIR}"/avp
+	einstalldocs
 }
 
 pkg_postinst() {
-	elog "Please follow the instructions in /usr/share/doc/${PF}"
+	elog "Please follow the instructions in ${EROOT}/usr/share/doc/${PF}"
 	elog "to install the rest of the game."
 }
diff --git a/games-fps/avp/files/avp-20150214-fno-common.patch b/games-fps/avp/files/avp-20150214-fno-common.patch
new file mode 100644
index 000000000000..0f25b1cf267f
--- /dev/null
+++ b/games-fps/avp/files/avp-20150214-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/src/avp/win95/d3d_render.cpp
++++ b/src/avp/win95/d3d_render.cpp
+@@ -2990,7 +2990,7 @@
+ //#define WATER_POLY_SCALE 256
+ int MeshXScale;
+ int MeshZScale;
+-int WaterFallBase;
++extern int WaterFallBase;
+ void PostLandscapeRendering(void)
+ {
+ 	extern int NumOnScreenBlocks;
+--- a/src/opengl.c
++++ b/src/opengl.c
+@@ -2796,7 +2796,7 @@
+ 
+ int MeshXScale;
+ int MeshZScale;
+-int WaterFallBase;
++extern int WaterFallBase;
+ 
+ int WaterXOrigin;
+ int WaterZOrigin;