Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-rpg/rpg-cli/files/, games-rpg/rpg-cli/
Date: Tue, 27 Sep 2022 14:01:21
Message-Id: 1664287244.3d73eda1242af1d583389cb84c8f46700d0e2eaa.andrewammerlaan@gentoo
1 commit: 3d73eda1242af1d583389cb84c8f46700d0e2eaa
2 Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
3 AuthorDate: Sun Sep 25 01:58:24 2022 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 27 14:00:44 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d73eda1
7
8 games-rpg/rpg-cli: drop 1.0.0
9
10 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
11 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
12
13 games-rpg/rpg-cli/Manifest | 1 -
14 games-rpg/rpg-cli/files/rpg-cli-1.0.0-clap.patch | 20 ----
15 .../rpg-cli/files/rpg-cli-1.0.0-into_values.patch | 21 -----
16 games-rpg/rpg-cli/rpg-cli-1.0.0.ebuild | 104 ---------------------
17 4 files changed, 146 deletions(-)
18
19 diff --git a/games-rpg/rpg-cli/Manifest b/games-rpg/rpg-cli/Manifest
20 index aadbad2d619b..7573338e3e3f 100644
21 --- a/games-rpg/rpg-cli/Manifest
22 +++ b/games-rpg/rpg-cli/Manifest
23 @@ -38,7 +38,6 @@ DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39
24 DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350a5c6e14064fea7685d49746b4b77215dbb8374fa7a6cbc2cfd79fb553513d6e551acf64586d8303f7d4f3a0 SHA512 582bb44b81c27e698eb57c6f06444b8a7c9d3f7ee73f4e14be8004c4bfd3bbfd9795c69f7294b5e87107e86b90fa3e91ad080964474af81c92705d356e43fbb5
25 DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
26 DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
27 -DIST rpg-cli-1.0.0.tar.gz 439707 BLAKE2B 0319bd8aa3f7084507762290565fa9456dd4799c8a6a2ca9c4f68b9f6e1e2eb6ec2e2ad20a2bd79d30fdbc400fb5699b4958cef0ace85ba9936dc449e447e011 SHA512 798d6926446e09ff81b12e9e1e181270e1b529a6fcb4ad26f6857c7ee6fbb6a47ec4690bd944a74c57c519acfb9b2eb2eb3ae97fe5f41f45ebfc7444f34e3500
28 DIST rpg-cli-1.0.1.tar.gz 440220 BLAKE2B b00836491ea19f28b373e8d4e427f944f5f72b1841063bd75b59600d619dbcc45598da38f03e714020420e431cad3055541c56bff2bf4e207678b49614b6b492 SHA512 bc255daf4f1bfae68c5d0fe5dec79d86ea6f2d59384537836a99063bfdcae4219d40c859904c50e60b4a025736520c0eb6468ca520a3abce5b506407e6b4bbe3
29 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
30 DIST serde-1.0.127.crate 75162 BLAKE2B 7472c9328b4398bb25bd71febe9483e6255b309d98d2655babe5d16933c5b92a71cb75df8aec3abaff84082bffdc44a549673d30a3cb68888d17157e58b32be0 SHA512 dc2b9c0a71028853bc05b4bdb3db1e9e753dfc588ebcff5dccc42d05252fe250b797e10b4d574f161fe11747c9740e93a47a2eba2b4ffd6ecf1992dfadbdd2ef
31
32 diff --git a/games-rpg/rpg-cli/files/rpg-cli-1.0.0-clap.patch b/games-rpg/rpg-cli/files/rpg-cli-1.0.0-clap.patch
33 deleted file mode 100644
34 index 780ff8b40e8a..000000000000
35 --- a/games-rpg/rpg-cli/files/rpg-cli-1.0.0-clap.patch
36 +++ /dev/null
37 @@ -1,20 +0,0 @@
38 -Fix build
39 -
40 -error[E0658]: arbitrary expressions in key-value attributes are unstable
41 - --> /mnt/portagetmp/portage/games-rpg/rpg-cli-1.0.0/work/cargo_home/gentoo/clap-3.0.0-beta.4/src/lib.rs:8:10
42 - |
43 -8 | #![doc = include_str!("../README.md")]
44 - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
45 - |
46 - = note: see issue #78835 <https://github.com/rust-lang/rust/issues/78835> for more information
47 -
48 ---- a/src/lib.rs
49 -+++ b/src/lib.rs
50 -@@ -5,7 +5,6 @@
51 -
52 - #![doc(html_logo_url = "https://clap.rs/images/media/clap.png")]
53 - #![doc(html_root_url = "https://docs.rs/clap/3.0.0-beta.4")]
54 --#![doc = include_str!("../README.md")]
55 - //! <https://github.com/clap-rs/clap>
56 - #![crate_type = "lib"]
57 - #![deny(
58
59 diff --git a/games-rpg/rpg-cli/files/rpg-cli-1.0.0-into_values.patch b/games-rpg/rpg-cli/files/rpg-cli-1.0.0-into_values.patch
60 deleted file mode 100644
61 index 9130df5c42be..000000000000
62 --- a/games-rpg/rpg-cli/files/rpg-cli-1.0.0-into_values.patch
63 +++ /dev/null
64 @@ -1,21 +0,0 @@
65 -Fix build with <rust-1.54
66 -
67 -error[E0658]: use of unstable library feature 'map_into_keys_values'
68 - --> src/item/chest.rs:111:51
69 - |
70 -111 | let mut items: Vec<Box<dyn Item>> = items.into_values().flatten().collect();
71 - | ^^^^^^^^^^^
72 - |
73 - = note: see issue #75294 <https://github.com/rust-lang/rust/issues/75294> for more information
74 -
75 ---- a/src/item/chest.rs
76 -+++ b/src/item/chest.rs
77 -@@ -108,7 +108,7 @@ impl Chest {
78 - /// Remove the gold, items and equipment from a hero and return them as a new chest.
79 - pub fn drop(game: &mut game::Game) -> Self {
80 - let items: HashMap<Key, Vec<Box<dyn Item>>> = game.inventory.drain().collect();
81 -- let mut items: Vec<Box<dyn Item>> = items.into_values().flatten().collect();
82 -+ let mut items: Vec<Box<dyn Item>> = items.into_iter().map(|(_, v)| v).flatten().collect();
83 - let sword = game.player.sword.take();
84 - let shield = game.player.shield.take();
85 -
86
87 diff --git a/games-rpg/rpg-cli/rpg-cli-1.0.0.ebuild b/games-rpg/rpg-cli/rpg-cli-1.0.0.ebuild
88 deleted file mode 100644
89 index f76184070253..000000000000
90 --- a/games-rpg/rpg-cli/rpg-cli-1.0.0.ebuild
91 +++ /dev/null
92 @@ -1,104 +0,0 @@
93 -# Copyright 2021 Gentoo Authors
94 -# Distributed under the terms of the GNU General Public License v2
95 -
96 -# Auto-Generated by cargo-ebuild 0.3.2
97 -
98 -EAPI=7
99 -
100 -CRATES="
101 - anyhow-1.0.43
102 - atty-0.2.14
103 - autocfg-1.0.1
104 - bincode-1.3.3
105 - bitflags-1.3.2
106 - cfg-if-1.0.0
107 - clap-3.0.0-beta.4
108 - clap_derive-3.0.0-beta.4
109 - colored-2.0.0
110 - ctor-0.1.20
111 - dirs-3.0.2
112 - dirs-sys-0.3.6
113 - dtoa-0.4.8
114 - dunce-1.0.2
115 - erased-serde-0.3.16
116 - getrandom-0.2.3
117 - ghost-0.1.2
118 - hashbrown-0.11.2
119 - heck-0.3.3
120 - hermit-abi-0.1.19
121 - indexmap-1.7.0
122 - inventory-0.1.10
123 - inventory-impl-0.1.10
124 - itoa-0.4.7
125 - lazy_static-1.4.0
126 - libc-0.2.99
127 - linked-hash-map-0.5.4
128 - once_cell-1.8.0
129 - os_str_bytes-3.1.0
130 - ppv-lite86-0.2.10
131 - proc-macro-error-1.0.4
132 - proc-macro-error-attr-1.0.4
133 - proc-macro2-1.0.28
134 - quote-1.0.9
135 - rand-0.8.4
136 - rand_chacha-0.3.1
137 - rand_core-0.6.3
138 - rand_hc-0.3.1
139 - redox_syscall-0.2.10
140 - redox_users-0.4.0
141 - ryu-1.0.5
142 - serde-1.0.127
143 - serde_derive-1.0.127
144 - serde_json-1.0.66
145 - serde_yaml-0.8.18
146 - strsim-0.10.0
147 - strum-0.21.0
148 - strum_macros-0.21.1
149 - syn-1.0.75
150 - termcolor-1.1.2
151 - textwrap-0.14.2
152 - typetag-0.1.7
153 - typetag-impl-0.1.7
154 - unicode-segmentation-1.8.0
155 - unicode-width-0.1.8
156 - unicode-xid-0.2.2
157 - vec_map-0.8.2
158 - version_check-0.9.3
159 - wasi-0.10.2+wasi-snapshot-preview1
160 - winapi-0.3.9
161 - winapi-i686-pc-windows-gnu-0.4.0
162 - winapi-util-0.1.5
163 - winapi-x86_64-pc-windows-gnu-0.4.0
164 - yaml-rust-0.4.5
165 -"
166 -
167 -inherit cargo
168 -
169 -DESCRIPTION="Terminal game, your filesystem as a dungeon"
170 -HOMEPAGE="https://github.com/facundoolano/rpg-cli"
171 -SRC_URI="https://github.com/facundoolano/rpg-cli/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
172 - $(cargo_crate_uris ${CRATES})"
173 -
174 -LICENSE="Apache-2.0 MIT"
175 -SLOT="0"
176 -KEYWORDS="~amd64 ~ppc64"
177 -
178 -QA_FLAGS_IGNORED="usr/bin/rpg-cli"
179 -
180 -PATCHES=(
181 - "${FILESDIR}"/rpg-cli-1.0.0-into_values.patch
182 -)
183 -
184 -src_prepare() {
185 - default
186 -
187 - pushd "${WORKDIR}/cargo_home/gentoo/clap-3.0.0-beta.4" > /dev/null || die
188 - eapply "${FILESDIR}"/rpg-cli-1.0.0-clap.patch
189 - popd > /dev/null || die
190 -}
191 -
192 -src_install() {
193 - cargo_src_install
194 - dodoc README.md
195 - newdoc shell/README.md README-shell.md
196 -}