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 87CE213835A for ; Fri, 20 Nov 2020 13:26:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B20ADE082B; Fri, 20 Nov 2020 13:26:15 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 9C89DE0833 for ; Fri, 20 Nov 2020 13:26:15 +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 B5C0B33BE0D for ; Fri, 20 Nov 2020 13:26:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 82BD4466 for ; Fri, 20 Nov 2020 13:26:11 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1605878740.a5f166a894d84d28516da74fb9164ccac4b94617.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-roguelike/stone-soup/files/gitless.patch games-roguelike/stone-soup/files/pyyaml-safe-load.patch X-VCS-Directories: games-roguelike/stone-soup/files/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: a5f166a894d84d28516da74fb9164ccac4b94617 X-VCS-Branch: master Date: Fri, 20 Nov 2020 13:26:11 +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: c7a97d1c-cf32-42a3-a547-9f4a4d45196e X-Archives-Hash: 4498df91dc770728c4facb60d550833f commit: a5f166a894d84d28516da74fb9164ccac4b94617 Author: Michael Mair-Keimberger gmail com> AuthorDate: Mon Nov 16 08:00:45 2020 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Fri Nov 20 13:25:40 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5f166a8 games-roguelike/stone-soup: remove unused patches Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/18278 Signed-off-by: Aaron Bauman gentoo.org> games-roguelike/stone-soup/files/gitless.patch | 13 ------------- games-roguelike/stone-soup/files/pyyaml-safe-load.patch | 11 ----------- 2 files changed, 24 deletions(-) diff --git a/games-roguelike/stone-soup/files/gitless.patch b/games-roguelike/stone-soup/files/gitless.patch deleted file mode 100644 index 3aaeb747009..00000000000 --- a/games-roguelike/stone-soup/files/gitless.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- /Makefile 2019-04-15 19:34:40.604288477 -0500 -+++ /Makefile 2019-04-15 19:36:25.249286603 -0500 -@@ -1149,9 +1149,8 @@ - - LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??))) - SRC_PKG_BASE := stone_soup --SRC_VERSION := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null || cat util/release_ver) -+SRC_VERSION := $(shell cat util/release_ver) - MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|sed -r 's/-.*//;s/^([^.]+\.[^.]+).*/\1/') --RECENT_TAG := $(shell git describe --abbrev=0 --tags $(MERGE_BASE)) - - export SRC_VERSION - diff --git a/games-roguelike/stone-soup/files/pyyaml-safe-load.patch b/games-roguelike/stone-soup/files/pyyaml-safe-load.patch deleted file mode 100644 index dfbcdc96e1a..00000000000 --- a/games-roguelike/stone-soup/files/pyyaml-safe-load.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /util/species-gen.py 2019-04-18 23:19:07.444170831 -0500 -+++ /util/species-gen.py 2019-04-18 23:20:19.958169533 -0500 -@@ -417,7 +417,7 @@ - continue - f_path = os.path.join(args.datadir, f_name) - try: -- species_spec = yaml.load(open(f_path)) -+ species_spec = yaml.safe_load(open(f_path)) - except yaml.YAMLError as e: - print("Failed to load %s: %s" % (f_name, e)) - sys.exit(1)