[gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/ - gentoo-commits

From:	Erik Mackdanz <stasibear@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: games-roguelike/stone-soup/
Date:	Thu, 30 Dec 2021 15:43:57
Message-Id:	`1640879011.2aa8bfe8b2baece61b41e2b3b14798b41b6fbe6b.stasibear@gentoo`

1

commit:     2aa8bfe8b2baece61b41e2b3b14798b41b6fbe6b

2

Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>

3

AuthorDate: Thu Dec 30 15:43:31 2021 +0000

4

Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>

5

CommitDate: Thu Dec 30 15:43:31 2021 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aa8bfe8

7

8

games-roguelike/stone-soup: use system dev-cpp/catch for tests

9

10

... not the bundled one

11

12

Closes: https://bugs.gentoo.org/829950

13

Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>

14

Package-Manager: Portage-3.0.28, Repoman-3.0.3

15

16

 games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild        | 9 ++++++++-

17

 games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild          | 9 ++++++++-

18

 games-roguelike/stone-soup/stone-soup-0.27.1.ebuild             | 9 ++++++++-

19

 games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild | 9 ++++++++-

20

 4 files changed, 32 insertions(+), 4 deletions(-)

21

22

diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild

23

index de7a56e16eed..1d7ea744c044 100644

24

--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild

25

+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild

26

@@ -24,7 +24,7 @@ SRC_URI="

27

 # MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/

28

 LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"

29

 KEYWORDS="amd64 x86"

30

-IUSE="debug ncurses sound +tiles"

31

+IUSE="debug ncurses sound test +tiles"

32

33

 RDEPEND="

34

 	${LUA_DEPS}

35

@@ -51,6 +51,7 @@ DEPEND="${RDEPEND}

36

 	${PYTHON_DEPS}

37

 	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')

38

 	sys-devel/flex

39

+	test? ( dev-cpp/catch:0 )

40

 	tiles? (

41

 		media-gfx/pngcrush

42

 		sys-libs/ncurses:0

43

@@ -90,6 +91,12 @@ src_prepare() {

44

45

 	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \

46

 		|| die "Couldn't append slot to executable name"

47

+

48

+	# Replace bundled catch2 package with system implementation

49

+	# https://bugs.gentoo.org/829950

50

+	if use test; then

51

+		cp /usr/include/catch2/catch.hpp "${S}/catch2-tests" || die "Couldn't substitute system catch2"

52

+	fi

53

}

54

55

 src_compile() {

56

57

diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild

58

index 89e1c7c44b5b..dc9525094429 100644

59

--- a/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild

60

+++ b/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild

61

@@ -24,7 +24,7 @@ SRC_URI="

62

 # MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/

63

 LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"

64

 KEYWORDS="amd64 x86"

65

-IUSE="debug ncurses sound +tiles"

66

+IUSE="debug ncurses sound test +tiles"

67

68

 RDEPEND="

69

 	${LUA_DEPS}

70

@@ -51,6 +51,7 @@ DEPEND="${RDEPEND}

71

 	${PYTHON_DEPS}

72

 	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')

73

 	sys-devel/flex

74

+	test? ( dev-cpp/catch:0 )

75

 	tiles? (

76

 		media-gfx/pngcrush

77

 		sys-libs/ncurses:0

78

@@ -90,6 +91,12 @@ src_prepare() {

79

80

 	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \

81

 		|| die "Couldn't append slot to executable name"

82

+

83

+	# Replace bundled catch2 package with system implementation

84

+	# https://bugs.gentoo.org/829950

85

+	if use test; then

86

+		cp /usr/include/catch2/catch.hpp "${S}/catch2-tests" || die "Couldn't substitute system catch2"

87

+	fi

88

}

89

90

 src_compile() {

91

92

diff --git a/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild

93

index 2c294df13dba..29c7f43de73a 100644

94

--- a/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild

95

+++ b/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild

96

@@ -24,7 +24,7 @@ SRC_URI="

97

 # MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/

98

 LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"

99

 KEYWORDS="amd64 x86"

100

-IUSE="debug ncurses sound +tiles"

101

+IUSE="debug ncurses sound test +tiles"

102

103

 RDEPEND="

104

 	${LUA_DEPS}

105

@@ -51,6 +51,7 @@ DEPEND="${RDEPEND}

106

 	${PYTHON_DEPS}

107

 	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')

108

 	sys-devel/flex

109

+	test? ( dev-cpp/catch:0 )

110

 	tiles? (

111

 		media-gfx/pngcrush

112

 		sys-libs/ncurses:0

113

@@ -90,6 +91,12 @@ src_prepare() {

114

115

 	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \

116

 		|| die "Couldn't append slot to executable name"

117

+

118

+	# Replace bundled catch2 package with system implementation

119

+	# https://bugs.gentoo.org/829950

120

+	if use test; then

121

+		cp /usr/include/catch2/catch.hpp "${S}/catch2-tests" || die "Couldn't substitute system catch2"

122

+	fi

123

}

124

125

 src_compile() {

126

127

diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild

128

index 8a19eb39dc41..76eb66818392 100644

129

--- a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild

130

+++ b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild

131

@@ -38,7 +38,7 @@ fi

132

 # MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/

133

 LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"

134

 KEYWORDS="~amd64 ~x86"

135

-IUSE="debug ncurses sound +tiles"

136

+IUSE="debug ncurses sound test +tiles"

137

138

 S=${WORKDIR}/${MY_P}/source

139

 RDEPEND="

140

@@ -66,6 +66,7 @@ DEPEND="${RDEPEND}

141

 	${PYTHON_DEPS}

142

 	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')

143

 	sys-devel/flex

144

+	test? ( dev-cpp/catch:0 )

145

 	tiles? (

146

 		media-gfx/pngcrush

147

 		sys-libs/ncurses:0

148

@@ -109,6 +110,12 @@ src_prepare() {

149

 	if ! [ -f "${S}/util/release_ver" ]; then

150

 		echo "${SLOT}" >"${S}/util/release_ver" || die "Couldn't write release_ver"

151

fi

152

+

153

+	# Replace bundled catch2 package with system implementation

154

+	# https://bugs.gentoo.org/829950

155

+	if use test; then

156

+		cp /usr/include/catch2/catch.hpp "${S}/catch2-tests" || die "Couldn't substitute system catch2"

157

+	fi

158

}

159

160

 src_compile() {

1	commit: 2aa8bfe8b2baece61b41e2b3b14798b41b6fbe6b
2	Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
3	AuthorDate: Thu Dec 30 15:43:31 2021 +0000
4	Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
5	CommitDate: Thu Dec 30 15:43:31 2021 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aa8bfe8
7
8	games-roguelike/stone-soup: use system dev-cpp/catch for tests
9
10	... not the bundled one
11
12	Closes: https://bugs.gentoo.org/829950
13	Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
14	Package-Manager: Portage-3.0.28, Repoman-3.0.3
15
16	games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild \| 9 ++++++++-
17	games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild \| 9 ++++++++-
18	games-roguelike/stone-soup/stone-soup-0.27.1.ebuild \| 9 ++++++++-
19	games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild \| 9 ++++++++-
20	4 files changed, 32 insertions(+), 4 deletions(-)
21
22	diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild
23	index de7a56e16eed..1d7ea744c044 100644
24	--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild
25	+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild
26	@@ -24,7 +24,7 @@ SRC_URI="
27	# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
28	LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
29	KEYWORDS="amd64 x86"
30	-IUSE="debug ncurses sound +tiles"
31	+IUSE="debug ncurses sound test +tiles"
32
33	RDEPEND="
34	${LUA_DEPS}
35	@@ -51,6 +51,7 @@ DEPEND="${RDEPEND}
36	${PYTHON_DEPS}
37	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
38	sys-devel/flex
39	+ test? ( dev-cpp/catch:0 )
40	tiles? (
41	media-gfx/pngcrush
42	sys-libs/ncurses:0
43	@@ -90,6 +91,12 @@ src_prepare() {
44
45	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
46	\|\| die "Couldn't append slot to executable name"
47	+
48	+ # Replace bundled catch2 package with system implementation
49	+ # https://bugs.gentoo.org/829950
50	+ if use test; then
51	+ cp /usr/include/catch2/catch.hpp "${S}/catch2-tests" \|\| die "Couldn't substitute system catch2"
52	+ fi
53	}
54
55	src_compile() {
56
57	diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild
58	index 89e1c7c44b5b..dc9525094429 100644
59	--- a/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild
60	+++ b/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild
61	@@ -24,7 +24,7 @@ SRC_URI="
62	# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
63	LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
64	KEYWORDS="amd64 x86"
65	-IUSE="debug ncurses sound +tiles"
66	+IUSE="debug ncurses sound test +tiles"
67
68	RDEPEND="
69	${LUA_DEPS}
70	@@ -51,6 +51,7 @@ DEPEND="${RDEPEND}
71	${PYTHON_DEPS}
72	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
73	sys-devel/flex
74	+ test? ( dev-cpp/catch:0 )
75	tiles? (
76	media-gfx/pngcrush
77	sys-libs/ncurses:0
78	@@ -90,6 +91,12 @@ src_prepare() {
79
80	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
81	\|\| die "Couldn't append slot to executable name"
82	+
83	+ # Replace bundled catch2 package with system implementation
84	+ # https://bugs.gentoo.org/829950
85	+ if use test; then
86	+ cp /usr/include/catch2/catch.hpp "${S}/catch2-tests" \|\| die "Couldn't substitute system catch2"
87	+ fi
88	}
89
90	src_compile() {
91
92	diff --git a/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild
93	index 2c294df13dba..29c7f43de73a 100644
94	--- a/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild
95	+++ b/games-roguelike/stone-soup/stone-soup-0.27.1.ebuild
96	@@ -24,7 +24,7 @@ SRC_URI="
97	# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
98	LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
99	KEYWORDS="amd64 x86"
100	-IUSE="debug ncurses sound +tiles"
101	+IUSE="debug ncurses sound test +tiles"
102
103	RDEPEND="
104	${LUA_DEPS}
105	@@ -51,6 +51,7 @@ DEPEND="${RDEPEND}
106	${PYTHON_DEPS}
107	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
108	sys-devel/flex
109	+ test? ( dev-cpp/catch:0 )
110	tiles? (
111	media-gfx/pngcrush
112	sys-libs/ncurses:0
113	@@ -90,6 +91,12 @@ src_prepare() {
114
115	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
116	\|\| die "Couldn't append slot to executable name"
117	+
118	+ # Replace bundled catch2 package with system implementation
119	+ # https://bugs.gentoo.org/829950
120	+ if use test; then
121	+ cp /usr/include/catch2/catch.hpp "${S}/catch2-tests" \|\| die "Couldn't substitute system catch2"
122	+ fi
123	}
124
125	src_compile() {
126
127	diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild
128	index 8a19eb39dc41..76eb66818392 100644
129	--- a/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild
130	+++ b/games-roguelike/stone-soup/stone-soup-0.28.0_pre20211224.ebuild
131	@@ -38,7 +38,7 @@ fi
132	# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
133	LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
134	KEYWORDS="~amd64 ~x86"
135	-IUSE="debug ncurses sound +tiles"
136	+IUSE="debug ncurses sound test +tiles"
137
138	S=${WORKDIR}/${MY_P}/source
139	RDEPEND="
140	@@ -66,6 +66,7 @@ DEPEND="${RDEPEND}
141	${PYTHON_DEPS}
142	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
143	sys-devel/flex
144	+ test? ( dev-cpp/catch:0 )
145	tiles? (
146	media-gfx/pngcrush
147	sys-libs/ncurses:0
148	@@ -109,6 +110,12 @@ src_prepare() {
149	if ! [ -f "${S}/util/release_ver" ]; then
150	echo "${SLOT}" >"${S}/util/release_ver" \|\| die "Couldn't write release_ver"
151	fi
152	+
153	+ # Replace bundled catch2 package with system implementation
154	+ # https://bugs.gentoo.org/829950
155	+ if use test; then
156	+ cp /usr/include/catch2/catch.hpp "${S}/catch2-tests" \|\| die "Couldn't substitute system catch2"
157	+ fi
158	}
159
160	src_compile() {

Gentoo Archives: gentoo-commits