[gentoo-commits] repo/gentoo:master commit in: dev-lang/yasm/ - gentoo-commits

From:	Mike Gilbert <floppym@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-lang/yasm/
Date:	Tue, 18 Aug 2020 14:53:27
Message-Id:	`1597762372.0be5422b1aa70798c1856edb9b3a62ca5dda2b07.floppym@gentoo`

1

commit:     0be5422b1aa70798c1856edb9b3a62ca5dda2b07

2

Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>

3

AuthorDate: Tue Aug 18 14:48:03 2020 +0000

4

Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>

5

CommitDate: Tue Aug 18 14:52:52 2020 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0be5422b

7

8

dev-lang/yasm: drop python support

9

10

Bug: https://bugs.gentoo.org/702364

11

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

12

13

 .../{yasm-9999.ebuild => yasm-1.3.0-r1.ebuild}     | 30 +++++++---------------

14

 dev-lang/yasm/yasm-9999.ebuild                     | 30 +++++++---------------

15

 2 files changed, 18 insertions(+), 42 deletions(-)

16

17

diff --git a/dev-lang/yasm/yasm-9999.ebuild b/dev-lang/yasm/yasm-1.3.0-r1.ebuild

18

similarity index 59%

19

copy from dev-lang/yasm/yasm-9999.ebuild

20

copy to dev-lang/yasm/yasm-1.3.0-r1.ebuild

21

index ccd86bc0090..ffd88e2bc66 100644

22

--- a/dev-lang/yasm/yasm-9999.ebuild

23

+++ b/dev-lang/yasm/yasm-1.3.0-r1.ebuild

24

@@ -2,16 +2,15 @@

25

 # Distributed under the terms of the GNU General Public License v2

26

27

 EAPI=7

28

-PYTHON_COMPAT=( python2_7 )

29

30

-inherit python-single-r1 toolchain-funcs

31

+inherit toolchain-funcs

32

33

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

34

 	EGIT_REPO_URI="https://github.com/yasm/yasm.git"

35

 	inherit autotools git-r3

36

 else

37

 	SRC_URI="http://www.tortall.net/projects/yasm/releases/${P}.tar.gz"

38

-	KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"

39

+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"

40

fi

41

42

 DESCRIPTION="An assembler for x86 and x86_64 instruction sets"

43

@@ -19,52 +18,41 @@ HOMEPAGE="http://yasm.tortall.net/"

44

45

 LICENSE="BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )"

46

 SLOT="0"

47

-IUSE="nls python"

48

-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

49

+IUSE="nls"

50

51

 BDEPEND="

52

 	nls? ( sys-devel/gettext )

53

-	python? (

54

-		${PYTHON_DEPS}

55

-		$(python_gen_cond_dep '>=dev-python/cython-0.14[${PYTHON_USEDEP}]')

56

-	)

57

"

58

 DEPEND="

59

 	nls? ( virtual/libintl )

60

"

61

 RDEPEND="${DEPEND}

62

-	python? ( ${PYTHON_DEPS} )

63

"

64

65

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

66

 	BDEPEND+="

67

 		app-text/xmlto

68

 		app-text/docbook-xml-dtd:4.1.2

69

+		dev-lang/python

70

"

71

fi

72

73

-pkg_setup() {

74

-	: # Avoid python-single-r1_pkg_setup

75

-}

76

-

77

 src_prepare() {

78

 	default

79

80

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

81

 		eautoreconf

82

-		./modules/arch/x86/gen_x86_insn.py || die

83

+		python modules/arch/x86/gen_x86_insn.py || die

84

fi

85

}

86

87

 src_configure() {

88

-	use python && python_setup

89

-

90

 	local myconf=(

91

-		CC_FOR_BUILD=$(tc-getBUILD_CC) \

92

-		CCLD_FOR_BUILD=$(tc-getBUILD_CC) \

93

+		CC_FOR_BUILD="$(tc-getBUILD_CC)"

94

+		CCLD_FOR_BUILD="$(tc-getBUILD_CC)"

95

 		--disable-warnerror

96

-		$(use_enable python)

97

-		$(use_enable python python-bindings)

98

+		--disable-python

99

+		--disable-python-bindings

100

 		$(use_enable nls)

101

)

102

103

104

diff --git a/dev-lang/yasm/yasm-9999.ebuild b/dev-lang/yasm/yasm-9999.ebuild

105

index ccd86bc0090..ffd88e2bc66 100644

106

--- a/dev-lang/yasm/yasm-9999.ebuild

107

+++ b/dev-lang/yasm/yasm-9999.ebuild

108

@@ -2,16 +2,15 @@

109

 # Distributed under the terms of the GNU General Public License v2

110

111

 EAPI=7

112

-PYTHON_COMPAT=( python2_7 )

113

114

-inherit python-single-r1 toolchain-funcs

115

+inherit toolchain-funcs

116

117

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

118

 	EGIT_REPO_URI="https://github.com/yasm/yasm.git"

119

 	inherit autotools git-r3

120

 else

121

 	SRC_URI="http://www.tortall.net/projects/yasm/releases/${P}.tar.gz"

122

-	KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"

123

+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"

124

fi

125

126

 DESCRIPTION="An assembler for x86 and x86_64 instruction sets"

127

@@ -19,52 +18,41 @@ HOMEPAGE="http://yasm.tortall.net/"

128

129

 LICENSE="BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )"

130

 SLOT="0"

131

-IUSE="nls python"

132

-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

133

+IUSE="nls"

134

135

 BDEPEND="

136

 	nls? ( sys-devel/gettext )

137

-	python? (

138

-		${PYTHON_DEPS}

139

-		$(python_gen_cond_dep '>=dev-python/cython-0.14[${PYTHON_USEDEP}]')

140

-	)

141

"

142

 DEPEND="

143

 	nls? ( virtual/libintl )

144

"

145

 RDEPEND="${DEPEND}

146

-	python? ( ${PYTHON_DEPS} )

147

"

148

149

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

150

 	BDEPEND+="

151

 		app-text/xmlto

152

 		app-text/docbook-xml-dtd:4.1.2

153

+		dev-lang/python

154

"

155

fi

156

157

-pkg_setup() {

158

-	: # Avoid python-single-r1_pkg_setup

159

-}

160

-

161

 src_prepare() {

162

 	default

163

164

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

165

 		eautoreconf

166

-		./modules/arch/x86/gen_x86_insn.py || die

167

+		python modules/arch/x86/gen_x86_insn.py || die

168

fi

169

}

170

171

 src_configure() {

172

-	use python && python_setup

173

-

174

 	local myconf=(

175

-		CC_FOR_BUILD=$(tc-getBUILD_CC) \

176

-		CCLD_FOR_BUILD=$(tc-getBUILD_CC) \

177

+		CC_FOR_BUILD="$(tc-getBUILD_CC)"

178

+		CCLD_FOR_BUILD="$(tc-getBUILD_CC)"

179

 		--disable-warnerror

180

-		$(use_enable python)

181

-		$(use_enable python python-bindings)

182

+		--disable-python

183

+		--disable-python-bindings

184

 		$(use_enable nls)

185

)

1	commit: 0be5422b1aa70798c1856edb9b3a62ca5dda2b07
2	Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3	AuthorDate: Tue Aug 18 14:48:03 2020 +0000
4	Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5	CommitDate: Tue Aug 18 14:52:52 2020 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0be5422b
7
8	dev-lang/yasm: drop python support
9
10	Bug: https://bugs.gentoo.org/702364
11	Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
12
13	.../{yasm-9999.ebuild => yasm-1.3.0-r1.ebuild} \| 30 +++++++---------------
14	dev-lang/yasm/yasm-9999.ebuild \| 30 +++++++---------------
15	2 files changed, 18 insertions(+), 42 deletions(-)
16
17	diff --git a/dev-lang/yasm/yasm-9999.ebuild b/dev-lang/yasm/yasm-1.3.0-r1.ebuild
18	similarity index 59%
19	copy from dev-lang/yasm/yasm-9999.ebuild
20	copy to dev-lang/yasm/yasm-1.3.0-r1.ebuild
21	index ccd86bc0090..ffd88e2bc66 100644
22	--- a/dev-lang/yasm/yasm-9999.ebuild
23	+++ b/dev-lang/yasm/yasm-1.3.0-r1.ebuild
24	@@ -2,16 +2,15 @@
25	# Distributed under the terms of the GNU General Public License v2
26
27	EAPI=7
28	-PYTHON_COMPAT=( python2_7 )
29
30	-inherit python-single-r1 toolchain-funcs
31	+inherit toolchain-funcs
32
33	if [[ ${PV} == 9999* ]] ; then
34	EGIT_REPO_URI="https://github.com/yasm/yasm.git"
35	inherit autotools git-r3
36	else
37	SRC_URI="http://www.tortall.net/projects/yasm/releases/${P}.tar.gz"
38	- KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
39	+ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
40	fi
41
42	DESCRIPTION="An assembler for x86 and x86_64 instruction sets"
43	@@ -19,52 +18,41 @@ HOMEPAGE="http://yasm.tortall.net/"
44
45	LICENSE="BSD-2 BSD \|\| ( Artistic GPL-2 LGPL-2 )"
46	SLOT="0"
47	-IUSE="nls python"
48	-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
49	+IUSE="nls"
50
51	BDEPEND="
52	nls? ( sys-devel/gettext )
53	- python? (
54	- ${PYTHON_DEPS}
55	- $(python_gen_cond_dep '>=dev-python/cython-0.14[${PYTHON_USEDEP}]')
56	- )
57	"
58	DEPEND="
59	nls? ( virtual/libintl )
60	"
61	RDEPEND="${DEPEND}
62	- python? ( ${PYTHON_DEPS} )
63	"
64
65	if [[ ${PV} == 9999* ]]; then
66	BDEPEND+="
67	app-text/xmlto
68	app-text/docbook-xml-dtd:4.1.2
69	+ dev-lang/python
70	"
71	fi
72
73	-pkg_setup() {
74	- : # Avoid python-single-r1_pkg_setup
75	-}
76	-
77	src_prepare() {
78	default
79
80	if [[ ${PV} == 9999* ]]; then
81	eautoreconf
82	- ./modules/arch/x86/gen_x86_insn.py \|\| die
83	+ python modules/arch/x86/gen_x86_insn.py \|\| die
84	fi
85	}
86
87	src_configure() {
88	- use python && python_setup
89	-
90	local myconf=(
91	- CC_FOR_BUILD=$(tc-getBUILD_CC) \
92	- CCLD_FOR_BUILD=$(tc-getBUILD_CC) \
93	+ CC_FOR_BUILD="$(tc-getBUILD_CC)"
94	+ CCLD_FOR_BUILD="$(tc-getBUILD_CC)"
95	--disable-warnerror
96	- $(use_enable python)
97	- $(use_enable python python-bindings)
98	+ --disable-python
99	+ --disable-python-bindings
100	$(use_enable nls)
101	)
102
103
104	diff --git a/dev-lang/yasm/yasm-9999.ebuild b/dev-lang/yasm/yasm-9999.ebuild
105	index ccd86bc0090..ffd88e2bc66 100644
106	--- a/dev-lang/yasm/yasm-9999.ebuild
107	+++ b/dev-lang/yasm/yasm-9999.ebuild
108	@@ -2,16 +2,15 @@
109	# Distributed under the terms of the GNU General Public License v2
110
111	EAPI=7
112	-PYTHON_COMPAT=( python2_7 )
113
114	-inherit python-single-r1 toolchain-funcs
115	+inherit toolchain-funcs
116
117	if [[ ${PV} == 9999* ]] ; then
118	EGIT_REPO_URI="https://github.com/yasm/yasm.git"
119	inherit autotools git-r3
120	else
121	SRC_URI="http://www.tortall.net/projects/yasm/releases/${P}.tar.gz"
122	- KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
123	+ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
124	fi
125
126	DESCRIPTION="An assembler for x86 and x86_64 instruction sets"
127	@@ -19,52 +18,41 @@ HOMEPAGE="http://yasm.tortall.net/"
128
129	LICENSE="BSD-2 BSD \|\| ( Artistic GPL-2 LGPL-2 )"
130	SLOT="0"
131	-IUSE="nls python"
132	-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
133	+IUSE="nls"
134
135	BDEPEND="
136	nls? ( sys-devel/gettext )
137	- python? (
138	- ${PYTHON_DEPS}
139	- $(python_gen_cond_dep '>=dev-python/cython-0.14[${PYTHON_USEDEP}]')
140	- )
141	"
142	DEPEND="
143	nls? ( virtual/libintl )
144	"
145	RDEPEND="${DEPEND}
146	- python? ( ${PYTHON_DEPS} )
147	"
148
149	if [[ ${PV} == 9999* ]]; then
150	BDEPEND+="
151	app-text/xmlto
152	app-text/docbook-xml-dtd:4.1.2
153	+ dev-lang/python
154	"
155	fi
156
157	-pkg_setup() {
158	- : # Avoid python-single-r1_pkg_setup
159	-}
160	-
161	src_prepare() {
162	default
163
164	if [[ ${PV} == 9999* ]]; then
165	eautoreconf
166	- ./modules/arch/x86/gen_x86_insn.py \|\| die
167	+ python modules/arch/x86/gen_x86_insn.py \|\| die
168	fi
169	}
170
171	src_configure() {
172	- use python && python_setup
173	-
174	local myconf=(
175	- CC_FOR_BUILD=$(tc-getBUILD_CC) \
176	- CCLD_FOR_BUILD=$(tc-getBUILD_CC) \
177	+ CC_FOR_BUILD="$(tc-getBUILD_CC)"
178	+ CCLD_FOR_BUILD="$(tc-getBUILD_CC)"
179	--disable-warnerror
180	- $(use_enable python)
181	- $(use_enable python python-bindings)
182	+ --disable-python
183	+ --disable-python-bindings
184	$(use_enable nls)
185	)

Gentoo Archives: gentoo-commits