From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EC999138334 for ; Sat, 19 Oct 2019 22:24:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 130CFE08AC; Sat, 19 Oct 2019 22:24:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DB494E08AC for ; Sat, 19 Oct 2019 22:24:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 85DA334C06C for ; Sat, 19 Oct 2019 22:24:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B3F79773 for ; Sat, 19 Oct 2019 22:24:50 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1571523729.5ecbed8544680aa105f16e8408ae1a2082686916.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/openarena/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-fps/openarena/metadata.xml games-fps/openarena/openarena-0.8.8-r1.ebuild X-VCS-Directories: games-fps/openarena/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 5ecbed8544680aa105f16e8408ae1a2082686916 X-VCS-Branch: master Date: Sat, 19 Oct 2019 22:24:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8c99e068-4db2-4a1b-a253-b19391f0970b X-Archives-Hash: 8e7a4bbb92ee521e0ae8fad25fb58744 commit: 5ecbed8544680aa105f16e8408ae1a2082686916 Author: Alexey Sokolov google com> AuthorDate: Fri Oct 18 23:51:16 2019 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Sat Oct 19 22:22:09 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ecbed85 games-fps/openarena: support building only a server Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Alexey Sokolov google.com> Closes: https://github.com/gentoo/gentoo/pull/13336 Signed-off-by: James Le Cuirot gentoo.org> games-fps/openarena/metadata.xml | 3 +++ games-fps/openarena/openarena-0.8.8-r1.ebuild | 39 +++++++++++++++------------ 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/games-fps/openarena/metadata.xml b/games-fps/openarena/metadata.xml index fb6c4d02068..ec45d585b91 100644 --- a/games-fps/openarena/metadata.xml +++ b/games-fps/openarena/metadata.xml @@ -5,6 +5,9 @@ games@gentoo.org Gentoo Games Project + + Build OpenArena client + oarena diff --git a/games-fps/openarena/openarena-0.8.8-r1.ebuild b/games-fps/openarena/openarena-0.8.8-r1.ebuild index 7440f19e8ec..f9a04f80a0b 100644 --- a/games-fps/openarena/openarena-0.8.8-r1.ebuild +++ b/games-fps/openarena/openarena-0.8.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,21 +12,23 @@ SRC_URI="mirror://sourceforge/oarena/${P}.zip LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="+curl +openal +vorbis" +IUSE="+client +curl +openal +vorbis" RDEPEND=" - media-libs/libsdl[joystick,opengl,video] - media-libs/speex - media-libs/speexdsp - virtual/jpeg:0 - virtual/opengl - x11-libs/libXext - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - curl? ( net-misc/curl ) - openal? ( media-libs/openal ) - vorbis? ( media-libs/libvorbis ) + client? ( + media-libs/libsdl[joystick,opengl,video] + media-libs/speex + media-libs/speexdsp + virtual/jpeg:0 + virtual/opengl + x11-libs/libXext + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + curl? ( net-misc/curl ) + openal? ( media-libs/openal ) + vorbis? ( media-libs/libvorbis ) + ) " DEPEND="${RDEPEND} app-arch/unzip @@ -52,6 +54,7 @@ src_compile() { # also build always server and use smp by default myopts="USE_INTERNAL_SPEEX=0 USE_VOIP=1 USE_MUMBLE=0 BUILD_SERVER=1 BUILD_CLIENT_SMP=1 USE_LOCAL_HEADERS=0" + use client || myopts="${myopts} BUILD_CLIENT=0" use curl || myopts="${myopts} USE_CURL=0" use openal || myopts="${myopts} USE_OPENAL=0" use vorbis || myopts="${myopts} USE_CODEC_VORBIS=0" @@ -67,7 +70,7 @@ src_compile() { src_install() { cd "${MY_S}"/"${BUILD_DIR}" - newbin openarena-smp.* "${PN}" + use client && newbin openarena-smp.* "${PN}" newbin oa_ded.* "${PN}-ded" cd "${S}" @@ -75,6 +78,8 @@ src_install() { doins -r baseoa missionpack dodoc CHANGES CREDITS LINUXNOTES README - newicon "${MY_S}"/misc/quake3.png ${PN}.png - make_desktop_entry ${PN} "OpenArena" + if use client; then + newicon "${MY_S}"/misc/quake3.png ${PN}.png + make_desktop_entry ${PN} "OpenArena" + fi }