[gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/, games-engines/odamex/files/

[James Le Cuirot]

commit:     da21ab625d36f9b941853ed243a8327be3986703
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat May 29 14:53:53 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat May 29 14:53:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da21ab62

games-engines/odamex: Drop old 0.8.3

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-engines/odamex/Manifest                      |  1 -
 .../odamex/files/odamex-0.8.1-miniupnpc.patch      | 48 --------------
 ...1-on-odalaunch-target-for-wx-3.0.4-and-up.patch | 29 ---------
 games-engines/odamex/odamex-0.8.3.ebuild           | 76 ----------------------
 4 files changed, 154 deletions(-)

diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 41281f1f859..e1f1a52559b 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,3 +1,2 @@
-DIST odamex-0.8.3.tar.bz2 8532510 BLAKE2B 751d65dfe07a4c4c0cb5ff360e76a1291cf4ba289c459f15a0c277aca4d15b1e0989e1606cdc4e0f0bec56d6ae437027046302f5c55efb3b835a42df512fb18f SHA512 01a875973d43c87dde7953464e0e3c37fa088b00b6cc0ecbef1a8b3b9a87257ab24ef4e3c224ebcbc0e38cd3139c7adc56b12a03ae2528b66d6498bb8d84d720
 DIST odamex-0.9.0.tar.bz2 6644055 BLAKE2B 656a469665783e0a5aa1a39792454a7ec34843b7fa11539f5504463701b5485eed0b5fabcd4f9f39eef3bdad9062f657c0b1d6147bcd41defa4142b51b4096a4 SHA512 f86e61afd5fdd9be6db03554e07fa140fdcc61747ce9312706af2cada8ec88705647abdfff4f221d8cfbd4a53b991e08edf4cbf0025cf6e5a74d2213fc662855
 DIST odamex-0.9.2.tar.bz2 6657974 BLAKE2B 60bf542806fe9d66711b45211f646607875621b014175fa3c4b9948c1c02d45af36d4a324349f22f4a7a4e11c13f48f2b96c731a9bb5f18c9d43111c56676f18 SHA512 69fb2ecc1d642c9c90da7503712aba628c753534ee56003945e4d267dc38bca0136d155a75695e483b0b4ec739aa331fca8c7493263b39a2521e8abcb378b5e4

diff --git a/games-engines/odamex/files/odamex-0.8.1-miniupnpc.patch b/games-engines/odamex/files/odamex-0.8.1-miniupnpc.patch
deleted file mode 100644
index 5fca5815162..00000000000
--- a/games-engines/odamex/files/odamex-0.8.1-miniupnpc.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 656306d3e68f7f1f1441f03e1765530f34ea2611 Mon Sep 17 00:00:00 2001
-From: Julian Ospald <hasufell@g.o>
-Date: Thu, 27 Mar 2014 21:16:02 +0000
-Subject: [PATCH] unbundle miniupnpc
-
----
- CMakeLists.txt        | 1 -
- server/CMakeLists.txt | 5 ++---
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0cafdbd5..00e033a9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -124,7 +124,6 @@ if (USE_MINIUPNP)
-   set(UPNPC_BUILD_TESTS OFF CACHE INTERNAL "" FORCE)
-   set(UPNPC_INSTALL OFF CACHE INTERNAL "" FORCE)
-   mark_as_advanced(FORCE UPNPC_INSTALL)
--  add_subdirectory(libraries/libminiupnpc)
- endif()
- 
- # Subdirectories for Odamex projects
-diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
-index d8e57257..5badceef 100644
---- a/server/CMakeLists.txt
-+++ b/server/CMakeLists.txt
-@@ -35,8 +35,7 @@ set(JSONCPP_SOURCE ${JSONCPP_DIR}/jsoncpp.cpp)
- 
- # MiniUPnPc
- if (USE_MINIUPNP)
--  set(MINIUPNPC_DIR ../libraries/libminiupnpc)
--  set(MINIUPNPC_STATIC_LIBRARIES upnpc-static)
-+  set(MINIUPNPC_DIR /usr/include/miniupnpc)
- endif()
- 
- # git describe
-@@ -74,7 +73,7 @@ add_executable(odasrv
-   ${SERVER_WIN32_HEADERS} ${SERVER_WIN32_RESOURCES})
- 
- if (USE_MINIUPNP)
--  target_link_libraries(odasrv ${MINIUPNPC_STATIC_LIBRARIES})
-+  target_link_libraries(odasrv -lminiupnpc)
- endif()
- 
- if(WIN32)
--- 
-2.23.0
-

diff --git a/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch b/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch
deleted file mode 100644
index 935d43466c4..00000000000
--- a/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9e3ae8538475e6f15757ce51e214f5cd29f223e7 Mon Sep 17 00:00:00 2001
-From: Michael Wood <mwoodj@××××××××××.org>
-Date: Tue, 25 Aug 2020 02:34:37 -0500
-Subject: [PATCH] Use C++11 on odalaunch target for wx 3.0.4 and up
-
-This addresses bug #1311. wxWidgets 3.0.4 requires C++11 support.
----
- odalaunch/CMakeLists.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/odalaunch/CMakeLists.txt b/odalaunch/CMakeLists.txt
-index f68a4d4d..4abbe0d8 100644
---- a/odalaunch/CMakeLists.txt
-+++ b/odalaunch/CMakeLists.txt
-@@ -32,6 +32,11 @@ endif()
- 
- # Odalaunch target
- if(wxWidgets_FOUND)
-+  # wxWidgets 3.0.4 requires C++11
-+  if(wxWidgets_VERSION_STRING VERSION_GREATER 3.0.3)
-+    set(CMAKE_CXX_STANDARD 11)
-+  endif()
-+
-   add_custom_command(
-     OUTPUT ${XRCRES_HEADER}
-     COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/res
--- 
-2.28.0
-

diff --git a/games-engines/odamex/odamex-0.8.3.ebuild b/games-engines/odamex/odamex-0.8.3.ebuild
deleted file mode 100644
index ff1b1912857..00000000000
--- a/games-engines/odamex/odamex-0.8.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-inherit cmake desktop prefix wxwidgets xdg
-
-DESCRIPTION="Online multiplayer free software engine for DOOM"
-HOMEPAGE="https://odamex.net/"
-SRC_URI="mirror://sourceforge/${PN}/Odamex/${PV}/${PN}-src-${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2+ MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+client master +odalaunch portmidi server upnp X"
-REQUIRED_USE="|| ( client master server )"
-
-RDEPEND="
-	client? (
-		media-libs/libpng:0=
-		media-libs/libsdl2[joystick,sound,video]
-		media-libs/sdl2-mixer
-		odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-		portmidi? ( media-libs/portmidi )
-		X? ( x11-libs/libX11 )
-	)
-	server? (
-		upnp? ( net-libs/miniupnpc:= )
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="games-util/deutex"
-
-S="${WORKDIR}/${PN}-src-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.1-miniupnpc.patch"
-	"${FILESDIR}/${P}-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch"
-)
-
-src_prepare() {
-	rm -r libraries/libminiupnpc wad/odamex.wad || die
-	hprefixify common/d_main.cpp
-
-	use odalaunch && setup-wxwidgets
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)
-		-DBUILD_CLIENT=$(usex client)
-		-DBUILD_MASTER=$(usex master)
-		-DBUILD_ODALAUNCH=$(usex odalaunch)
-		-DBUILD_SERVER=$(usex server)
-		-DENABLE_PORTMIDI=$(usex portmidi)
-		-DUSE_MINIUPNP=$(usex upnp)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	if use client ; then
-		newicon -s 128 "${S}/media/icon_${PN}_128.png" "${PN}.png"
-		make_desktop_entry "${PN}" "Odamex"
-
-		if use odalaunch ; then
-			newicon -s 128 "${S}/media/icon_odalaunch_128.png" "odalaunch.png"
-			make_desktop_entry odalaunch "Odamex Launcher" odalaunch
-		fi
-	fi
-
-	cmake_src_install
-}