[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/, app-emulation/qemu/files/ - gentoo-commits

From:	Matthias Maier <tamiko@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/, app-emulation/qemu/files/
Date:	Thu, 23 Sep 2021 02:08:34
Message-Id:	`1632362902.197fa637eb382e4abb3b33379d093bea2f33d708.tamiko@gentoo`

1

commit:     197fa637eb382e4abb3b33379d093bea2f33d708

2

Author:     John Helmert III <ajak <AT> gentoo <DOT> org>

3

AuthorDate: Mon Sep 20 00:49:43 2021 +0000

4

Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>

5

CommitDate: Thu Sep 23 02:08:22 2021 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=197fa637

7

8

app-emulation/qemu: bump to 6.1.0

9

10

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

11

Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

12

Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

13

14

 app-emulation/qemu/Manifest                        |  1 +

15

 app-emulation/qemu/files/qemu-6.1.0-strings.patch  | 26 ++++++++++++++++++++++

16

 .../qemu/{qemu-9999.ebuild => qemu-6.1.0.ebuild}   | 21 +++++++++--------

17

 app-emulation/qemu/qemu-9999.ebuild                | 21 +++++++++--------

18

 4 files changed, 47 insertions(+), 22 deletions(-)

19

20

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest

21

index 4e6705f4885..6a6dd677a0e 100644

22

--- a/app-emulation/qemu/Manifest

23

+++ b/app-emulation/qemu/Manifest

24

@@ -1 +1,2 @@

25

 DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 7746329d3e13782b7c346ce4052cc517cfc65cd9b2d514d199e4d5b8570ca79566ec04b0c114db2e97c84e68eb551e0d4cdce1b14b91a88fe08d2a5f682c1418 SHA512 ee3ff00aebec4d8891d2ff6dabe4e667e510b2a4fe3f6190aa34673a91ea32dcd2db2e9bf94c2f1bf05aa79788f17cfbbedc6027c0988ea08a92587b79ee05e4

26

+DIST qemu-6.1.0.tar.xz 111258808 BLAKE2B 412eecf6d39debd6089b26d3b22e5d25c6c8c30d2eaf31b17c25cc2b3a1b10794a30218dfb151c78801aa295255aa974b297f1fe05b93f14334f203c2af5ccee SHA512 3378ae21c75b77ee6a759827f1fcf7b2a50a0fef07e3b0e89117108022a8d8655fa977e4d65596f4f24f7c735c6594d44b0c6f69732ea4465e88a7406b1d5d3c

27

28

diff --git a/app-emulation/qemu/files/qemu-6.1.0-strings.patch b/app-emulation/qemu/files/qemu-6.1.0-strings.patch

29

new file mode 100644

30

index 00000000000..2efe7b29330

31

--- /dev/null

32

+++ b/app-emulation/qemu/files/qemu-6.1.0-strings.patch

33

@@ -0,0 +1,26 @@

34

+Forward-ported from original patch for 5.2.0.

35

+

36

+diff --git a/configure b/configure

37

+index da2501489f..4660ee3ee5 100755

38

+--- a/configure

39

++++ b/configure

40

+@@ -516,6 +516,7 @@ ld="${LD-${cross_prefix}ld}"

41

+ ranlib="${RANLIB-${cross_prefix}ranlib}"

42

+ nm="${NM-${cross_prefix}nm}"

43

+ strip="${STRIP-${cross_prefix}strip}"

44

++strings="${STRINGS-${cross_prefix}strings}"

45

+ windres="${WINDRES-${cross_prefix}windres}"

46

+ pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}"

47

+ query_pkg_config() {

48

+@@ -2380,9 +2381,9 @@ int main(int argc, char *argv[])

49

+ EOF

50

+

51

+ if compile_prog ; then

52

+-    if strings -a $TMPE | grep -q BiGeNdIaN ; then

53

++    if $strings -a $TMPE | grep -q BiGeNdIaN ; then

54

+         bigendian="yes"

55

+-    elif strings -a $TMPE | grep -q LiTtLeEnDiAn ; then

56

++    elif $strings -a $TMPE | grep -q LiTtLeEnDiAn ; then

57

+         bigendian="no"

58

+     else

59

+         echo big/little test failed

60

61

diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-6.1.0.ebuild

62

similarity index 98%

63

copy from app-emulation/qemu/qemu-9999.ebuild

64

copy to app-emulation/qemu/qemu-6.1.0.ebuild

65

index 8aa463f41c8..d887f5b1537 100644

66

--- a/app-emulation/qemu/qemu-9999.ebuild

67

+++ b/app-emulation/qemu/qemu-6.1.0.ebuild

68

@@ -6,10 +6,10 @@ EAPI="7"

69

 PYTHON_COMPAT=( python3_{7,8,9,10} )

70

 PYTHON_REQ_USE="ncurses,readline"

71

72

-FIRMWARE_ABI_VERSION="6.0.0-r50"

73

+FIRMWARE_ABI_VERSION="6.1.0"

74

75

-inherit eutils linux-info toolchain-funcs multilib python-r1

76

-inherit udev fcaps readme.gentoo-r1 pax-utils xdg-utils

77

+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \

78

+		pax-utils xdg-utils

79

80

 if [[ ${PV} = *9999* ]]; then

81

 	EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"

82

@@ -75,11 +75,8 @@ COMMON_TARGETS="

83

 IUSE_SOFTMMU_TARGETS="

84

 	${COMMON_TARGETS}

85

avr

86

-	lm32

87

-	moxie

88

rx

89

 	tricore

90

-	unicore32

91

"

92

 IUSE_USER_TARGETS="

93

 	${COMMON_TARGETS}

94

@@ -243,7 +240,10 @@ BDEPEND="

95

 	dev-lang/perl

96

 	sys-apps/texinfo

97

 	virtual/pkgconfig

98

-	doc? ( dev-python/sphinx )

99

+	doc? (

100

+		dev-python/sphinx

101

+		dev-python/sphinx_rtd_theme

102

+	)

103

 	gtk? ( nls? ( sys-devel/gettext ) )

104

 	test? (

105

 		dev-libs/glib[utils]

106

@@ -273,10 +273,9 @@ RDEPEND="${CDEPEND}

107

108

 PATCHES=(

109

 	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch

110

-	"${FILESDIR}"/${PN}-5.2.0-strings.patch

111

-	"${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch

112

 	"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch

113

-	"${FILESDIR}"/${PN}-5.2.0-dce-locks.patch

114

+	"${FILESDIR}"/${PN}-6.0.0-make.patch

115

+	"${FILESDIR}"/${PN}-6.1.0-strings.patch

116

)

117

118

 QA_PREBUILT="

119

@@ -389,7 +388,7 @@ check_targets() {

120

 	local var=$1 mak=$2

121

 	local detected sorted

122

123

-	pushd "${S}"/default-configs/targets/ >/dev/null || die

124

+	pushd "${S}"/configs/targets/ >/dev/null || die

125

126

 	# Force C locale until glibc is updated. #564936

127

 	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))

128

129

diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild

130

index 8aa463f41c8..d887f5b1537 100644

131

--- a/app-emulation/qemu/qemu-9999.ebuild

132

+++ b/app-emulation/qemu/qemu-9999.ebuild

133

@@ -6,10 +6,10 @@ EAPI="7"

134

 PYTHON_COMPAT=( python3_{7,8,9,10} )

135

 PYTHON_REQ_USE="ncurses,readline"

136

137

-FIRMWARE_ABI_VERSION="6.0.0-r50"

138

+FIRMWARE_ABI_VERSION="6.1.0"

139

140

-inherit eutils linux-info toolchain-funcs multilib python-r1

141

-inherit udev fcaps readme.gentoo-r1 pax-utils xdg-utils

142

+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \

143

+		pax-utils xdg-utils

144

145

 if [[ ${PV} = *9999* ]]; then

146

 	EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"

147

@@ -75,11 +75,8 @@ COMMON_TARGETS="

148

 IUSE_SOFTMMU_TARGETS="

149

 	${COMMON_TARGETS}

150

avr

151

-	lm32

152

-	moxie

153

rx

154

 	tricore

155

-	unicore32

156

"

157

 IUSE_USER_TARGETS="

158

 	${COMMON_TARGETS}

159

@@ -243,7 +240,10 @@ BDEPEND="

160

 	dev-lang/perl

161

 	sys-apps/texinfo

162

 	virtual/pkgconfig

163

-	doc? ( dev-python/sphinx )

164

+	doc? (

165

+		dev-python/sphinx

166

+		dev-python/sphinx_rtd_theme

167

+	)

168

 	gtk? ( nls? ( sys-devel/gettext ) )

169

 	test? (

170

 		dev-libs/glib[utils]

171

@@ -273,10 +273,9 @@ RDEPEND="${CDEPEND}

172

173

 PATCHES=(

174

 	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch

175

-	"${FILESDIR}"/${PN}-5.2.0-strings.patch

176

-	"${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch

177

 	"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch

178

-	"${FILESDIR}"/${PN}-5.2.0-dce-locks.patch

179

+	"${FILESDIR}"/${PN}-6.0.0-make.patch

180

+	"${FILESDIR}"/${PN}-6.1.0-strings.patch

181

)

182

183

 QA_PREBUILT="

184

@@ -389,7 +388,7 @@ check_targets() {

185

 	local var=$1 mak=$2

186

 	local detected sorted

187

188

-	pushd "${S}"/default-configs/targets/ >/dev/null || die

189

+	pushd "${S}"/configs/targets/ >/dev/null || die

190

191

 	# Force C locale until glibc is updated. #564936

192

 	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))

1	commit: 197fa637eb382e4abb3b33379d093bea2f33d708
2	Author: John Helmert III <ajak <AT> gentoo <DOT> org>
3	AuthorDate: Mon Sep 20 00:49:43 2021 +0000
4	Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
5	CommitDate: Thu Sep 23 02:08:22 2021 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=197fa637
7
8	app-emulation/qemu: bump to 6.1.0
9
10	Closes: https://bugs.gentoo.org/804525
11	Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
12	Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
13
14	app-emulation/qemu/Manifest \| 1 +
15	app-emulation/qemu/files/qemu-6.1.0-strings.patch \| 26 ++++++++++++++++++++++
16	.../qemu/{qemu-9999.ebuild => qemu-6.1.0.ebuild} \| 21 +++++++++--------
17	app-emulation/qemu/qemu-9999.ebuild \| 21 +++++++++--------
18	4 files changed, 47 insertions(+), 22 deletions(-)
19
20	diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
21	index 4e6705f4885..6a6dd677a0e 100644
22	--- a/app-emulation/qemu/Manifest
23	+++ b/app-emulation/qemu/Manifest
24	@@ -1 +1,2 @@
25	DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 7746329d3e13782b7c346ce4052cc517cfc65cd9b2d514d199e4d5b8570ca79566ec04b0c114db2e97c84e68eb551e0d4cdce1b14b91a88fe08d2a5f682c1418 SHA512 ee3ff00aebec4d8891d2ff6dabe4e667e510b2a4fe3f6190aa34673a91ea32dcd2db2e9bf94c2f1bf05aa79788f17cfbbedc6027c0988ea08a92587b79ee05e4
26	+DIST qemu-6.1.0.tar.xz 111258808 BLAKE2B 412eecf6d39debd6089b26d3b22e5d25c6c8c30d2eaf31b17c25cc2b3a1b10794a30218dfb151c78801aa295255aa974b297f1fe05b93f14334f203c2af5ccee SHA512 3378ae21c75b77ee6a759827f1fcf7b2a50a0fef07e3b0e89117108022a8d8655fa977e4d65596f4f24f7c735c6594d44b0c6f69732ea4465e88a7406b1d5d3c
27
28	diff --git a/app-emulation/qemu/files/qemu-6.1.0-strings.patch b/app-emulation/qemu/files/qemu-6.1.0-strings.patch
29	new file mode 100644
30	index 00000000000..2efe7b29330
31	--- /dev/null
32	+++ b/app-emulation/qemu/files/qemu-6.1.0-strings.patch
33	@@ -0,0 +1,26 @@
34	+Forward-ported from original patch for 5.2.0.
35	+
36	+diff --git a/configure b/configure
37	+index da2501489f..4660ee3ee5 100755
38	+--- a/configure
39	++++ b/configure
40	+@@ -516,6 +516,7 @@ ld="${LD-${cross_prefix}ld}"
41	+ ranlib="${RANLIB-${cross_prefix}ranlib}"
42	+ nm="${NM-${cross_prefix}nm}"
43	+ strip="${STRIP-${cross_prefix}strip}"
44	++strings="${STRINGS-${cross_prefix}strings}"
45	+ windres="${WINDRES-${cross_prefix}windres}"
46	+ pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}"
47	+ query_pkg_config() {
48	+@@ -2380,9 +2381,9 @@ int main(int argc, char *argv[])
49	+ EOF
50	+
51	+ if compile_prog ; then
52	+- if strings -a $TMPE \| grep -q BiGeNdIaN ; then
53	++ if $strings -a $TMPE \| grep -q BiGeNdIaN ; then
54	+ bigendian="yes"
55	+- elif strings -a $TMPE \| grep -q LiTtLeEnDiAn ; then
56	++ elif $strings -a $TMPE \| grep -q LiTtLeEnDiAn ; then
57	+ bigendian="no"
58	+ else
59	+ echo big/little test failed
60
61	diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-6.1.0.ebuild
62	similarity index 98%
63	copy from app-emulation/qemu/qemu-9999.ebuild
64	copy to app-emulation/qemu/qemu-6.1.0.ebuild
65	index 8aa463f41c8..d887f5b1537 100644
66	--- a/app-emulation/qemu/qemu-9999.ebuild
67	+++ b/app-emulation/qemu/qemu-6.1.0.ebuild
68	@@ -6,10 +6,10 @@ EAPI="7"
69	PYTHON_COMPAT=( python3_{7,8,9,10} )
70	PYTHON_REQ_USE="ncurses,readline"
71
72	-FIRMWARE_ABI_VERSION="6.0.0-r50"
73	+FIRMWARE_ABI_VERSION="6.1.0"
74
75	-inherit eutils linux-info toolchain-funcs multilib python-r1
76	-inherit udev fcaps readme.gentoo-r1 pax-utils xdg-utils
77	+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
78	+ pax-utils xdg-utils
79
80	if [[ ${PV} = 9999 ]]; then
81	EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"
82	@@ -75,11 +75,8 @@ COMMON_TARGETS="
83	IUSE_SOFTMMU_TARGETS="
84	${COMMON_TARGETS}
85	avr
86	- lm32
87	- moxie
88	rx
89	tricore
90	- unicore32
91	"
92	IUSE_USER_TARGETS="
93	${COMMON_TARGETS}
94	@@ -243,7 +240,10 @@ BDEPEND="
95	dev-lang/perl
96	sys-apps/texinfo
97	virtual/pkgconfig
98	- doc? ( dev-python/sphinx )
99	+ doc? (
100	+ dev-python/sphinx
101	+ dev-python/sphinx_rtd_theme
102	+ )
103	gtk? ( nls? ( sys-devel/gettext ) )
104	test? (
105	dev-libs/glib[utils]
106	@@ -273,10 +273,9 @@ RDEPEND="${CDEPEND}
107
108	PATCHES=(
109	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
110	- "${FILESDIR}"/${PN}-5.2.0-strings.patch
111	- "${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch
112	"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
113	- "${FILESDIR}"/${PN}-5.2.0-dce-locks.patch
114	+ "${FILESDIR}"/${PN}-6.0.0-make.patch
115	+ "${FILESDIR}"/${PN}-6.1.0-strings.patch
116	)
117
118	QA_PREBUILT="
119	@@ -389,7 +388,7 @@ check_targets() {
120	local var=$1 mak=$2
121	local detected sorted
122
123	- pushd "${S}"/default-configs/targets/ >/dev/null \|\| die
124	+ pushd "${S}"/configs/targets/ >/dev/null \|\| die
125
126	# Force C locale until glibc is updated. #564936
127	detected=$(echo $(printf '%s\n' *-${mak}.mak \| sed "s:-${mak}.mak::" \| LC_COLLATE=C sort -u))
128
129	diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
130	index 8aa463f41c8..d887f5b1537 100644
131	--- a/app-emulation/qemu/qemu-9999.ebuild
132	+++ b/app-emulation/qemu/qemu-9999.ebuild
133	@@ -6,10 +6,10 @@ EAPI="7"
134	PYTHON_COMPAT=( python3_{7,8,9,10} )
135	PYTHON_REQ_USE="ncurses,readline"
136
137	-FIRMWARE_ABI_VERSION="6.0.0-r50"
138	+FIRMWARE_ABI_VERSION="6.1.0"
139
140	-inherit eutils linux-info toolchain-funcs multilib python-r1
141	-inherit udev fcaps readme.gentoo-r1 pax-utils xdg-utils
142	+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
143	+ pax-utils xdg-utils
144
145	if [[ ${PV} = 9999 ]]; then
146	EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"
147	@@ -75,11 +75,8 @@ COMMON_TARGETS="
148	IUSE_SOFTMMU_TARGETS="
149	${COMMON_TARGETS}
150	avr
151	- lm32
152	- moxie
153	rx
154	tricore
155	- unicore32
156	"
157	IUSE_USER_TARGETS="
158	${COMMON_TARGETS}
159	@@ -243,7 +240,10 @@ BDEPEND="
160	dev-lang/perl
161	sys-apps/texinfo
162	virtual/pkgconfig
163	- doc? ( dev-python/sphinx )
164	+ doc? (
165	+ dev-python/sphinx
166	+ dev-python/sphinx_rtd_theme
167	+ )
168	gtk? ( nls? ( sys-devel/gettext ) )
169	test? (
170	dev-libs/glib[utils]
171	@@ -273,10 +273,9 @@ RDEPEND="${CDEPEND}
172
173	PATCHES=(
174	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
175	- "${FILESDIR}"/${PN}-5.2.0-strings.patch
176	- "${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch
177	"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
178	- "${FILESDIR}"/${PN}-5.2.0-dce-locks.patch
179	+ "${FILESDIR}"/${PN}-6.0.0-make.patch
180	+ "${FILESDIR}"/${PN}-6.1.0-strings.patch
181	)
182
183	QA_PREBUILT="
184	@@ -389,7 +388,7 @@ check_targets() {
185	local var=$1 mak=$2
186	local detected sorted
187
188	- pushd "${S}"/default-configs/targets/ >/dev/null \|\| die
189	+ pushd "${S}"/configs/targets/ >/dev/null \|\| die
190
191	# Force C locale until glibc is updated. #564936
192	detected=$(echo $(printf '%s\n' *-${mak}.mak \| sed "s:-${mak}.mak::" \| LC_COLLATE=C sort -u))

Gentoo Archives: gentoo-commits