From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1274985-garchives=archives.gentoo.org@lists.gentoo.org>
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 A9CAE13835A
for <garchives@archives.gentoo.org>; Sun, 25 Apr 2021 19:13:52 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 0E3C2E08E8;
Sun, 25 Apr 2021 19:13:52 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 EAB9FE08E8
for <gentoo-commits@lists.gentoo.org>; Sun, 25 Apr 2021 19:13:51 +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 C9C5C33E6A3
for <gentoo-commits@lists.gentoo.org>; Sun, 25 Apr 2021 19:13:50 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id A651C72D
for <gentoo-commits@lists.gentoo.org>; Sun, 25 Apr 2021 19:13:47 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1619378011.e97bb8a8a1c7d14bf1f42cd397b8065c8a9c9849.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/darkplaces/
X-VCS-Repository: repo/gentoo
X-VCS-Files: games-fps/darkplaces/darkplaces-20140513-r1.ebuild
X-VCS-Directories: games-fps/darkplaces/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: e97bb8a8a1c7d14bf1f42cd397b8065c8a9c9849
X-VCS-Branch: master
Date: Sun, 25 Apr 2021 19:13:47 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 8aaaaf86-8f5f-4b0c-9d41-36ca26d2ef4f
X-Archives-Hash: c246f5d19310c7766cd1849905267463
commit: e97bb8a8a1c7d14bf1f42cd397b8065c8a9c9849
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 25 19:04:12 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 19:13:31 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e97bb8a8
games-fps/darkplaces: fix pre-stripped files, respecting CC
Can't reproduce CFLAGS issue right now.
Closes: https://bugs.gentoo.org/739194
Closes: https://bugs.gentoo.org/739200
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-fps/darkplaces/darkplaces-20140513-r1.ebuild | 23 +++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/games-fps/darkplaces/darkplaces-20140513-r1.ebuild b/games-fps/darkplaces/darkplaces-20140513-r1.ebuild
index c0fafee1498..171eaa03f68 100644
--- a/games-fps/darkplaces/darkplaces-20140513-r1.ebuild
+++ b/games-fps/darkplaces/darkplaces-20140513-r1.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit eutils flag-o-matic unpacker
+EAPI=7
+
+inherit desktop flag-o-matic wrapper unpacker
# Latest versions are in http://icculus.org/twilight/darkplaces/files/
MY_PV="${PV/_beta/beta}"
@@ -18,6 +19,7 @@ SRC_URI="http://icculus.org/twilight/${PN}/files/${MY_ENGINE}
lights? (
http://www.fuhquake.net/files/extras/${MY_LIGHTS}
http://www.kgbsyndicate.com/romi/id1.pk3 )"
+S="${WORKDIR}/${PN}"
LICENSE="GPL-2"
SLOT="0"
@@ -60,14 +62,17 @@ DEPEND="lights? ( || (
!opengl? ( !sdl? ( !dedicated? (
${UIRDEPEND}
${UIDEPEND} ) ) )
- virtual/pkgconfig
+"
+BDEPEND="
app-arch/unzip
+ virtual/pkgconfig
"
-S="${WORKDIR}/${PN}"
dir="/usr/share/quake1"
-opengl_client() { use opengl || ( ! use dedicated && ! use sdl ) }
+opengl_client() {
+ use opengl || ( ! use dedicated && ! use sdl )
+}
src_unpack() {
if use lights ; then
@@ -76,6 +81,7 @@ src_unpack() {
mv *.lit maps/ || die
mv ReadMe.txt rtlights.txt
fi
+
unpack "${MY_ENGINE}"
unpack ./${PN}*.zip
}
@@ -115,6 +121,12 @@ src_prepare() {
src_compile() {
local opts="DP_FS_BASEDIR=\"${dir}\" DP_LINK_TO_LIBJPEG=1"
+ # Protect against people choosing a strip implementation
+ # bug #739194
+ opts+="STRIP=true"
+
+ tc-export CC
+
# Preferred sound is alsa
local sound_api="NULL"
use oss && sound_api="OSS"
@@ -168,6 +180,7 @@ src_install() {
if use lights ; then
insinto "${dir}"/id1
doins -r "${WORKDIR}"/{cubemaps,maps}
+
if use demo ; then
# Set up symlinks, for the demo levels to include the lights
local d