[gentoo-commits] repo/proj/guru:dev commit in: games-fps/etlegacy/files/, games-fps/etlegacy/

[gentoo-commits] repo/proj/guru:dev commit in: games-fps/etlegacy/files/, games-fps/etlegacy/

[Duje Mihanović]

commit:     7c4739012b364f80dd602c98d1d69a1a77ee0155
Author:     Duje Mihanović <duje.mihanovic <AT> skole <DOT> hr>
AuthorDate: Sat May 21 11:12:29 2022 +0000
Commit:     Duje Mihanović <duje.mihanovic <AT> skole <DOT> hr>
CommitDate: Sat May 21 11:12:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7c473901

games-fps/etlegacy: add 2.80.2, drop 2.79.0

Signed-off-by: Duje Mihanović <duje.mihanovic <AT> skole.hr>

 games-fps/etlegacy/Manifest                        |  2 +-
 ...legacy-2.79.0.ebuild => etlegacy-2.80.2.ebuild} |  4 ---
 .../etlegacy/files/cmake-add-DOCDIR-variable.patch | 39 ----------------------
 3 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/games-fps/etlegacy/Manifest b/games-fps/etlegacy/Manifest
index 5ace5ac2b..223eeff92 100644
--- a/games-fps/etlegacy/Manifest
+++ b/games-fps/etlegacy/Manifest
@@ -1,2 +1,2 @@
 DIST et260b.x86_full.zip 275647724 BLAKE2B ea52d1859e78c6da5a16bd3598c2b649e9f79596be93fe35858a1174b0d63ef94eaecdb24b8f749d7dc39b1a70dd38557d455238cbc4b857ed7083369fe47262 SHA512 7a9639c7a67c6c058ae1c85ca1e04e74526194a8a676eaccffa1984869251cc058f0cb79b96604ec087492003d14f7f3e96c8ebe7e527959ae47d4d25645d3e1
-DIST etlegacy-2.79.0.tar.gz 15306188 BLAKE2B e659fbef7f968cf3a4fd4cc8be3e241305ac39e4cf8366af209bef589b26a7fe11e65f0759efa11344036427d8b6603a4facff3780d65bc2080c1e63b381ba86 SHA512 04891156910ccc8e67bb946d0229dde9f05fd1307404d5e9134e3e912a41540c77600872c4ef0234cb4add98b60ff7b20f2cb412a0226941521e3541d5be1a12
+DIST etlegacy-2.80.2.tar.gz 15332562 BLAKE2B 8e32c6a054b02a3a08ce9f5f16df7dcd8f8a819ba2abf4cbcdfc712f2f1475f9d1a226ed5ef7d33d5b8288a38d135613c55ab08caa36a2d6ec78b5d4a4cb9d3d SHA512 b9dd87388bfaeea1ec0805518ae988d91bde2e7ee3a1909581c63d6b3d2412c0d2079aca3fb3ab4420f24cb0d480a6d153179451b88ad22a43d68a4ad4e27a04

diff --git a/games-fps/etlegacy/etlegacy-2.79.0.ebuild b/games-fps/etlegacy/etlegacy-2.80.2.ebuild
similarity index 98%
rename from games-fps/etlegacy/etlegacy-2.79.0.ebuild
rename to games-fps/etlegacy/etlegacy-2.80.2.ebuild
index e8378388e..1722ef99c 100644
--- a/games-fps/etlegacy/etlegacy-2.79.0.ebuild
+++ b/games-fps/etlegacy/etlegacy-2.80.2.ebuild
@@ -71,10 +71,6 @@ BDEPEND="$(unpacker_src_uri_depends)"
 
 S="${WORKDIR}/${P/_rc/rc}"
 
-PATCHES=(
-	"${FILESDIR}/cmake-add-DOCDIR-variable.patch"
-)
-
 src_unpack() {
 	if [[ "${PV}" = 9999 ]] ; then
 		git-r3_src_unpack

diff --git a/games-fps/etlegacy/files/cmake-add-DOCDIR-variable.patch b/games-fps/etlegacy/files/cmake-add-DOCDIR-variable.patch
deleted file mode 100644
index d14f9803b..000000000
--- a/games-fps/etlegacy/files/cmake-add-DOCDIR-variable.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 00d836686675f6495dfb91564f75c60c9e88edea Mon Sep 17 00:00:00 2001
-From: Florian Schmaus <flo@geekplace.eu>
-Date: Sun, 5 Dec 2021 12:48:42 +0100
-Subject: [PATCH] cmake: add DOCDIR variable
-
-Some distributions, e.g. Gentoo, require a particular naming scheme
-for /usr/share/doc. In case of Gentoo, the package version is also
-included, so it would be for example /usr/share/doc/etlegacy-2.78.1.
----
- cmake/ETLInstall.cmake | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/cmake/ETLInstall.cmake b/cmake/ETLInstall.cmake
-index c0455aa9e111..5ecea9e67e59 100644
---- a/cmake/ETLInstall.cmake
-+++ b/cmake/ETLInstall.cmake
-@@ -2,6 +2,10 @@
- # Install
- #-----------------------------------------------------------------
- 
-+if(NOT DOCDIR)
-+	set(DOCDIR "${INSTALL_DEFAULT_SHAREDIR}/doc/etlegacy")
-+endif()
-+
- # description file - see FS_GetModList
- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/misc/description.txt"
- 	DESTINATION "${INSTALL_DEFAULT_MODDIR}/${MODNAME}"
-@@ -45,7 +49,7 @@ if(UNIX AND NOT APPLE)
- 		DESTINATION "${INSTALL_DEFAULT_SHAREDIR}/man/man6"
- 	)
- 	install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/docs/INSTALL.txt"
--		DESTINATION "${INSTALL_DEFAULT_SHAREDIR}/doc/etlegacy"
-+		DESTINATION "${DOCDIR}"
- 	)
- 	install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.txt"
- 		DESTINATION "${INSTALL_DEFAULT_SHAREDIR}/licenses/etlegacy"
--- 
-2.32.0
-