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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Ionen Wolkens" <ionen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/files/, games-engines/odamex/
Date: Fri, 18 Jun 2021 14:00:07 +0000 (UTC)	[thread overview]
Message-ID: <1624024645.4296144fa2e60ce0bb43b4bfc7ffa63c842b201c.ionen@gentoo> (raw)

commit:     4296144fa2e60ce0bb43b4bfc7ffa63c842b201c
Author:     William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Fri Jun 18 13:42:22 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jun 18 13:57:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4296144f

games-engines/odamex: Drop version 0.9.0

Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21301
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-engines/odamex/Manifest                      |  1 -
 ...x-0.9.0-Set-IMPORTED_LOCATION-for-jsoncpp.patch | 24 -------
 games-engines/odamex/odamex-0.9.0.ebuild           | 79 ----------------------
 3 files changed, 104 deletions(-)

diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index b41a58384ff..adc0097ca0d 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,3 +1,2 @@
-DIST odamex-0.9.0.tar.bz2 6644055 BLAKE2B 656a469665783e0a5aa1a39792454a7ec34843b7fa11539f5504463701b5485eed0b5fabcd4f9f39eef3bdad9062f657c0b1d6147bcd41defa4142b51b4096a4 SHA512 f86e61afd5fdd9be6db03554e07fa140fdcc61747ce9312706af2cada8ec88705647abdfff4f221d8cfbd4a53b991e08edf4cbf0025cf6e5a74d2213fc662855
 DIST odamex-0.9.2.tar.bz2 6657974 BLAKE2B 60bf542806fe9d66711b45211f646607875621b014175fa3c4b9948c1c02d45af36d4a324349f22f4a7a4e11c13f48f2b96c731a9bb5f18c9d43111c56676f18 SHA512 69fb2ecc1d642c9c90da7503712aba628c753534ee56003945e4d267dc38bca0136d155a75695e483b0b4ec739aa331fca8c7493263b39a2521e8abcb378b5e4
 DIST odamex-0.9.3.tar.bz2 6658459 BLAKE2B 1afe34400d2875ac196d5c189a35eb402fce0de90ded496aafcc98d2847ac7cdb10f07261c977a69e2442876897c0931813ddaf1954de2a871af6ca9d9317895 SHA512 114afe22f5651c87cedd7677055286ef9d222de790d9578669fdb5a20b471b273bd427c0dd103a64bcf7c285477776b6fa608b4086f78b4cd8271c33c87afcc3

diff --git a/games-engines/odamex/files/odamex-0.9.0-Set-IMPORTED_LOCATION-for-jsoncpp.patch b/games-engines/odamex/files/odamex-0.9.0-Set-IMPORTED_LOCATION-for-jsoncpp.patch
deleted file mode 100644
index 654085d1d25..00000000000
--- a/games-engines/odamex/files/odamex-0.9.0-Set-IMPORTED_LOCATION-for-jsoncpp.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 3707d8ebad7a4a0664ca4d5a5a5bef4a276af6a2 Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray <vilhelm.gray@gmail.com>
-Date: Mon, 29 Mar 2021 20:30:10 +0900
-Subject: [PATCH] Set IMPORTED_LOCATION for jsoncpp
-
----
- libraries/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
-index 2ffe95a5..a7dcb83b 100644
---- a/libraries/CMakeLists.txt
-+++ b/libraries/CMakeLists.txt
-@@ -172,6 +172,7 @@ if(BUILD_SERVER)
-     INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/local/include"
-     IMPORTED_LOCATION_DEBUG ${JSONCPP_LIBRARY_DEBUG}
-     IMPORTED_LOCATION_RELEASE ${JSONCPP_LIBRARY_RELEASE}
-+    IMPORTED_LOCATION ${JSONCPP_LIBRARY_RELEASE}
-     MAP_IMPORTED_CONFIG_MINSIZEREL Release
-     MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release)
- endif()
--- 
-2.31.0
-

diff --git a/games-engines/odamex/odamex-0.9.0.ebuild b/games-engines/odamex/odamex-0.9.0.ebuild
deleted file mode 100644
index dc97bd284d1..00000000000
--- a/games-engines/odamex/odamex-0.9.0.ebuild
+++ /dev/null
@@ -1,79 +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
-		odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-		portmidi? ( media-libs/portmidi )
-		X? ( x11-libs/libX11 )
-	)
-	server? (
-		dev-libs/jsoncpp:=
-		upnp? ( net-libs/miniupnpc:= )
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="games-util/deutex"
-
-S="${WORKDIR}/${PN}-src-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-Unbundle-miniupnpc.patch"
-	"${FILESDIR}/${P}-Set-IMPORTED_LOCATION-for-jsoncpp.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
-}

next             reply	other threads:[~2021-06-18 14:00 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-18 14:00 Ionen Wolkens [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-06-17 20:49 [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/files/, games-engines/odamex/ James Le Cuirot
2024-12-02 13:00 Pacho Ramos
2024-09-16 21:31 James Le Cuirot
2024-05-12 16:23 James Le Cuirot
2023-10-21  8:16 James Le Cuirot
2022-06-17 22:50 Sam James
2022-03-20 13:32 James Le Cuirot
2022-03-04 22:49 James Le Cuirot
2021-03-31  7:40 Joonas Niilola
2019-09-09 22:08 James Le Cuirot
2018-04-29 13:06 Pacho Ramos
2015-11-03 15:46 Michael Sterrett

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:b41a58384f dfblob:adc0097ca0 dfblob:654085d1d2
dfblob:dc97bd284d )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/files/, games-engines/odamex/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1624024645.4296144fa2e60ce0bb43b4bfc7ffa63c842b201c.ionen@gentoo \
    --to=ionen@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox