gentoo resync : 16.09.2021

4 files changed, 86 insertions, 2 deletions

diff --git a/games-action/nighthawk/Manifest b/games-action/nighthawk/Manifest
index b3eb487525dc..00c0a2e1c86b 100644
--- a/games-action/nighthawk/Manifest
+++ b/games-action/nighthawk/Manifest
@@ -1,5 +1,8 @@
 AUX nighthawk-2.2-gcc42.patch 670 BLAKE2B a5d0b38983e0ed434f13225f213bc64142629b4d7189fb1665271c45129f1a4e3086210911310c7cd09362328030f2242179e4e1c3e07b87cf21475ecdddee9b SHA512 f23188baa922881b36c45900e34bcaaa04b9c9752c52c13d5c03454e46853aae6c5f50375e87785b4d9866a0156b697b9dbfac0eb4f54aaa92fec5c5185686b1
+AUX nighthawk-4.0-cmake.patch 938 BLAKE2B 8392d2368a709f51687fa007118e7b7e34c80fa3fbfc7e122ee65b6b680c5320d0860e369b48ad4b94e2621c780bd6d41bce86fd72fe30c7459087703279f2dc SHA512 9e02369e1e218e44544cfe5bfbe5f6ceceed62098e09c1fd4ffaca09cdd87d644a2957045447206926e0a6d0250163b4c16513618a0964534c995ed093dd58ea
 AUX nighthawk.patch 1235 BLAKE2B 644abc5e0910550f6dfd103ba02aee064ee4c63b2161fa3443ec5abf5da64350e43ab79b2d6cff65a00ca963c96bf456eb374bdc874cec45df9e0180dd697cb0 SHA512 6362d1188c857f5b1236b5ca9e04e00d8eb85eb1a7e2efaa588c1b8cdcfd11f61a914e0db8f5bffd377c495b1464e7060c79d9205abbe84bfa24112c4be4e237
 DIST nighthawk-2.2-1.tar.gz 1079706 BLAKE2B 38b9e2fe6f9fe4b373ddae05f0277eea1dd65f921f99e0f728ca47630378ad865117846945ba5c708cef7120dbda8c5c1ac5a032738d974f2687be34fe561556 SHA512 dca5d0c01ed651dee0c29b939c832ae343ca70ff0eb7779e7c13007881cf75d96cadafbbac6b431cd473ce9b9e1347dd4ba90502627059439b5a9a557cbc3fcf
+DIST nighthawk-4.0.tar.xz 3212124 BLAKE2B ccd8d97ac03e6d984bdb56cad49ceabb7e6f61dd182d359e1410ff081e3fc456d2a844bc513238d6b10ba8c479661fb890a6c1e41815b7ac6f8f7f761209feb2 SHA512 f1d10026df3a2ab274b81c4e8f28c79c2ba21d6ccab59b217308b076fc7ed3ef4fa5f2b895b72902f72a652c950faa15e43f2e7c91bfc0e2c988ef1aee6859a6
 EBUILD nighthawk-2.2-r1.ebuild 614 BLAKE2B 21ed1d82be90a6b378521f25b9441936c683bb72a6e893ad9e97a61b2ee0a0516e39064e588c03660c22c7dc82448dc41127e826b9111271a82ecf2339ef9eef SHA512 f83933b6464b23625ec8395a1b2c2fc45b2229addc2a88c8fe8c9630e45b4ec85ef0cd59a0bc242e2966158e091e4a9e7ca8fc17505d2a8ed8eab3694b3245ec
-MISC metadata.xml 333 BLAKE2B a7d3bbfb68e4cd24addfeb880b896f12d2ff4bbf72701943f5a91078eaccf24bb2b9a05125389c1d1bdf3cb2b34a3e367ffde7c028e34bbdfd870dad5ab19558 SHA512 336358437939bf16817128792faf057aaf920f5530ca57ba425b9ac67ed0599ebfb2b1a21faecf1836f89be85a9a0b2751287ba625b4a4606c669c2192116ad4
+EBUILD nighthawk-4.0.ebuild 1077 BLAKE2B dc15f8f6dcdd73fa36e492bd7f878e8cb681dcd12cd411b41943adf2c6da710614bce191dc0169b34ec91edb68a24153a342c0decd436b12912cd9df1c133031 SHA512 a95bcecd3243d083f714b714164fcea9dcb70e3f7baf4b773d4b45754d79903dd36b4bcec4648b02fd506abe3be6fa96f6b2b54a21162edb662de57b86052fe0
+MISC metadata.xml 334 BLAKE2B 1bc8093b8dce38b89654d081249100a78ad90bfdaf422fe56ec693f1d3678fbcbe2db40ca18f2dfcb35f79c4bad2f5c2672a5094586615e6326b1961bb057049 SHA512 582f9e65780f1c6f77c0714543bc17cfd49f9d0154487a99da137177812455a457c524fb3744e5b876156c98b1ed65b264ed675e51eb0cf921b9f1d077e8b49e
diff --git a/games-action/nighthawk/files/nighthawk-4.0-cmake.patch b/games-action/nighthawk/files/nighthawk-4.0-cmake.patch
new file mode 100644
index 000000000000..83722b1e621b
--- /dev/null
+++ b/games-action/nighthawk/files/nighthawk-4.0-cmake.patch
@@ -0,0 +1,25 @@
+Fix OpenGL underlink, man dir, and skip installing in $HOME.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -111,5 +111,6 @@
+ # Check for OpenGL and GLU
+ #
+-pkg_check_modules (OPENGL glu)
++set(OpenGL_GL_PREFERENCE GLVND)
++find_package(OpenGL)
+ if (NOT OPENGL_FOUND)
+ 	message(FATAL_ERROR "OpenGL/GLU devel library not installed.")
+@@ -277,5 +278,5 @@
+ # Install nighthawk in games section of man page tree (iaw "man man")
+ #
+-install(FILES man/nighthawk.6 DESTINATION man/man6)
++install(FILES man/nighthawk.6 DESTINATION share/man/man6)
+ 
+ # From investigation work and a strong recommendation by GCB (aka wotnot),
+@@ -287,5 +288,5 @@
+ # risk that install will break on future distributions. JN, 08NOV20
+ #
+-if (UNIX AND NOT APPLE)
++if (0)
+ 	install(FILES ${CMAKE_BINARY_DIR}/nighthawk.desktop DESTINATION ${HOME_PATH}/Desktop)
+ 	install(CODE "execute_process(COMMAND chown ${USERNAME}.${USERNAME} ${HOME_PATH}/Desktop/nighthawk.desktop)")
diff --git a/games-action/nighthawk/metadata.xml b/games-action/nighthawk/metadata.xml
index e90f5a7f5e60..fdfba35afd7d 100644
--- a/games-action/nighthawk/metadata.xml
+++ b/games-action/nighthawk/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>games@gentoo.org</email>
diff --git a/games-action/nighthawk/nighthawk-4.0.ebuild b/games-action/nighthawk/nighthawk-4.0.ebuild
new file mode 100644
index 000000000000..7eb832117342
--- /dev/null
+++ b/games-action/nighthawk/nighthawk-4.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop
+
+DESCRIPTION="Tribute to Paradroid by Andrew Braybrook"
+HOMEPAGE="https://night-hawk.sourceforge.io/"
+SRC_URI="mirror://sourceforge/night-hawk/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	acct-group/gamestat
+	media-libs/freeglut
+	media-libs/libglvnd
+	media-libs/libpng:=
+	media-libs/libvorbis
+	media-libs/openal
+	virtual/glu"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i '/SCORES_PATH/s|/var/tmp|${EPREFIX}/var/games|' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=( -DBUILD_NED=yes )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	dodoc WHATS_NEW
+
+	dodir /var/games
+	> ${ED}/var/games/${PN}.scores || die
+
+	fowners :gamestat /usr/bin/${PN} /var/games/${PN}.scores
+	fperms g+s /usr/bin/${PN}
+	fperms 660 /var/games/${PN}.scores
+
+	newicon data/xpm/v4/nighthawk_desktop_icon.png ${PN}.png
+	make_desktop_entry ${PN} ${PN^}
+}