gentoo resync : 16.09.2021

4 files changed, 4 insertions, 84 deletions

diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 075d35002067..3a18f0779f1e 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,6 +1,4 @@
 AUX odamex-0.9.0-Unbundle-miniupnpc.patch 2765 BLAKE2B f1a7307c82d6ab9ee17524d0384ec7b54ee51a1ee611a89cad9cdd3e8a98b448327a85242f71f0432ec266cbb8b24b893a0ca86dd62b994bc1320ef4157dc9f6 SHA512 a310ede1fc3340e6ee28ea0925da828dae517d7f9f83d015b744e0b3185ed82fa737f0a1d6c73ab000edf87a4467910ab14aa3a6bb34dc7c157535bd8270173c
-DIST odamex-0.9.3.tar.bz2 6658459 BLAKE2B 1afe34400d2875ac196d5c189a35eb402fce0de90ded496aafcc98d2847ac7cdb10f07261c977a69e2442876897c0931813ddaf1954de2a871af6ca9d9317895 SHA512 114afe22f5651c87cedd7677055286ef9d222de790d9578669fdb5a20b471b273bd427c0dd103a64bcf7c285477776b6fa608b4086f78b4cd8271c33c87afcc3
-DIST odamex-0.9.4.tar.bz2 6659835 BLAKE2B df6602c05e911a979e9de168bc08be13ac154106ac6d11f3dbf1c50ce6ccdc10f099ff6caf024e45136e5f6be53eb7db7a7cda89d5b37c0507f37fdae033f2bd SHA512 5488c4245aaf02a6e82714cd137fb6b26da0de808c137506b2575d9bad8025f46ba4d2e063de93a78e86806bbf7950651ec19697dee9b41b11c3aa2963b44e50
-EBUILD odamex-0.9.3.ebuild 1779 BLAKE2B 51a20fbcb38a36737b4cb0ad84ab30240da396e597d3c7bc6339c86df6ccbf3e2cabbd9b1155d366b064a5745e29a232eace583d0c0c2b3264d28305b78e409f SHA512 0b366a7024835787d546caa4f3855466205b2e7c47f5d13aad5c1f518d7a09b7e9f7e55cb77f0dd9280e96d1a71f273078cef6e763cd795ec7630ae17a25cfee
-EBUILD odamex-0.9.4.ebuild 1779 BLAKE2B 51a20fbcb38a36737b4cb0ad84ab30240da396e597d3c7bc6339c86df6ccbf3e2cabbd9b1155d366b064a5745e29a232eace583d0c0c2b3264d28305b78e409f SHA512 0b366a7024835787d546caa4f3855466205b2e7c47f5d13aad5c1f518d7a09b7e9f7e55cb77f0dd9280e96d1a71f273078cef6e763cd795ec7630ae17a25cfee
-MISC metadata.xml 1560 BLAKE2B 9005fa7ad7cf0c111c7f1843320a325ab2859e125a7fe173585a41efa0c255b7cb547af627bb574e4276052ccc4797d0de214cacf8aa39b9e14576f326f8ba30 SHA512 da4fc9f0f98577b4e221649b6dca286cc00037cd2579d4adafc98bc00b0761ac5f553018394ea8509784754c4adf86963c1098db555aca0b01d62c1bc9efb843
+DIST odamex-0.9.5.tar.bz2 6659528 BLAKE2B 6f6052aff5a1e0c9a54c417113b67a91044d05ebf13d8ab5fb01132f9bb90b1c97392e881b8bff8baee4621c8e53abbb360fc8c7e6de8ff53d45ee55f73c48ec SHA512 70a0deb5e5b5902620f8fe692dc8507f9f19d7d6afabb4e2efbc25dc6879d469aa250dc55bb165db83a4288af9d5adda72ce3823a3db6dd9ccb83f5c684d3ac8
+EBUILD odamex-0.9.5.ebuild 1779 BLAKE2B 51a20fbcb38a36737b4cb0ad84ab30240da396e597d3c7bc6339c86df6ccbf3e2cabbd9b1155d366b064a5745e29a232eace583d0c0c2b3264d28305b78e409f SHA512 0b366a7024835787d546caa4f3855466205b2e7c47f5d13aad5c1f518d7a09b7e9f7e55cb77f0dd9280e96d1a71f273078cef6e763cd795ec7630ae17a25cfee
+MISC metadata.xml 1561 BLAKE2B f9bb5e3ab12423041b6f2277ba2faaaf219a40ae29dee9c935a4741deab9caad5821adc6fd376ce7f4a91945fb50b651f78cca8567b217112fbfe3a9e4002e89 SHA512 d12235228ebe55962bea2cd0b846e89c521bd217a828c46e99adc700f9a2cc9ebb201cff3c47d2b83e2cecc9d188018e6e48e71f23bd557db3a705589f2bc23a
diff --git a/games-engines/odamex/metadata.xml b/games-engines/odamex/metadata.xml
index ac392af534dc..59df9d30675e 100644
--- a/games-engines/odamex/metadata.xml
+++ b/games-engines/odamex/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="person" proxied="yes">
 		<email>vilhelm.gray@gmail.com</email>
diff --git a/games-engines/odamex/odamex-0.9.4.ebuild b/games-engines/odamex/odamex-0.9.4.ebuild
deleted file mode 100644
index 2a6cc608b6d8..000000000000
--- a/games-engines/odamex/odamex-0.9.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 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
-		net-misc/curl
-		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.9.0-Unbundle-miniupnpc.patch"
-)
-
-src_prepare() {
-	rm -r libraries/libminiupnpc || die
-	hprefixify common/d_main.cpp
-
-	use odalaunch && setup-wxwidgets
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)
-		-DUSE_INTERNAL_LIBS=0
-		-DBUILD_CLIENT=$(usex client)
-		-DBUILD_LAUNCHER=$(usex odalaunch)
-		-DBUILD_MASTER=$(usex master)
-		-DBUILD_SERVER=$(usex server)
-		-DBUILD_OR_FAIL=1
-		-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
-}
diff --git a/games-engines/odamex/odamex-0.9.3.ebuild b/games-engines/odamex/odamex-0.9.5.ebuild
index 2a6cc608b6d8..2a6cc608b6d8 100644
--- a/games-engines/odamex/odamex-0.9.3.ebuild
+++ b/games-engines/odamex/odamex-0.9.5.ebuild