From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1269266-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 E172E1382C5
for <garchives@archives.gentoo.org>; Sat, 10 Apr 2021 13:31:15 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 43649E0872;
Sat, 10 Apr 2021 13:31:15 +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 72CF6E0872
for <gentoo-commits@lists.gentoo.org>; Sat, 10 Apr 2021 13:31:14 +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 0EB59340AB3
for <gentoo-commits@lists.gentoo.org>; Sat, 10 Apr 2021 13:31:11 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id BE76E4A8
for <gentoo-commits@lists.gentoo.org>; Sat, 10 Apr 2021 13:31:08 +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: <1618061436.131a8dee44f60292b93a83334c9f9c43d086de21.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/knights-demo/
X-VCS-Repository: repo/gentoo
X-VCS-Files: games-strategy/knights-demo/knights-demo-1.32-r2.ebuild
X-VCS-Directories: games-strategy/knights-demo/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 131a8dee44f60292b93a83334c9f9c43d086de21
X-VCS-Branch: master
Date: Sat, 10 Apr 2021 13:31:08 +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: 1316dc59-b944-4f43-88b1-81ce0df25195
X-Archives-Hash: 199e15a4316441636411c0edee8167fe
commit: 131a8dee44f60292b93a83334c9f9c43d086de21
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 10 13:00:53 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 10 13:30:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=131a8dee
games-strategy/knights-demo: EAPI 7, silence QA warnings for unused file
All the SONAME warnings were for a binary we don't really support. We install
it for some reason and I don't really want to meddle with it in case it
_somehow_ works for somebody.
Closes: https://bugs.gentoo.org/739366
Closes: https://bugs.gentoo.org/739372
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../knights-demo/knights-demo-1.32-r2.ebuild | 33 +++++++++++++++++-----
1 file changed, 26 insertions(+), 7 deletions(-)
diff --git a/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild b/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild
index d314a019ee7..0fab85fe334 100644
--- a/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild
+++ b/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild
@@ -1,20 +1,33 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit eutils unpacker
+EAPI=7
+
+inherit desktop unpacker wrapper
DESCRIPTION="Anglo-Saxon medieval army battles and resource management"
HOMEPAGE="http://www.linuxgamepublishing.com/info.php?id=knights"
# Unversioned upstream filename
SRC_URI="mirror://gentoo/${P}.run"
+S="${WORKDIR}"
LICENSE="knights-demo"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
RESTRICT="strip"
+# Deps for the .dynamic binary which we don't support but install anyway
+# TODO: wants gtk-1.2?!
+# TODO: wants libgrapple?
+DYNAMIC_DEPS="
+ dev-libs/glib
+ media-libs/libogg
+ media-libs/libsdl
+ media-libs/libvorbis
+ media-libs/sdl-mixer
+ media-libs/smpeg
+ sys-libs/zlib
+"
RDEPEND="
sys-libs/glibc
>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
@@ -23,13 +36,19 @@ RDEPEND="
>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
"
-S="${WORKDIR}"
+
+# RDEPEND+=" ${DYNAMIC_DEPS}"
+
+QA_FLAGS_IGNORED="
+ opt/knights-demo/knights-demo.dynamic
+ opt/knights-demo/knights-demo
+"
src_unpack() {
unpack_makeself ${P}.run
- mv -f data{,-temp}
+ mv -f data{,-temp} || die
unpack ./data-temp/data.tar.gz
- rm -rf data-temp lgp_* setup*
+ rm -rf data-temp lgp_* setup* || die
}
src_install() {