[gentoo-dev] [PATCH 4/7] x11-proto/xcb-proto: drop autotools-utils - gentoo-dev

From:	Mike Gilbert <floppym@g.o>
To:	gentoo-dev@l.g.o
Cc:	x11@g.o
Subject:	[gentoo-dev] [PATCH 4/7] x11-proto/xcb-proto: drop autotools-utils
Date:	Sun, 17 Apr 2016 14:16:01
Message-Id:	`1460902427-5759-5-git-send-email-floppym@gentoo.org`
In Reply to:	[gentoo-dev] [PATCH 0/7] Dropping autotools-utils from xorg-2 by Mike Gilbert

1

Package-Manager: portage-2.2.28_p3

2

---

3

 x11-proto/xcb-proto/xcb-proto-1.10.ebuild   | 19 +++++--------------

4

 x11-proto/xcb-proto/xcb-proto-1.11.ebuild   | 19 +++++--------------

5

 x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild | 19 +++++--------------

6

 x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild | 19 +++++--------------

7

 4 files changed, 20 insertions(+), 56 deletions(-)

8

9

diff --git a/x11-proto/xcb-proto/xcb-proto-1.10.ebuild b/x11-proto/xcb-proto/xcb-proto-1.10.ebuild

10

index f0ecc7a..e78ab72 100644

11

--- a/x11-proto/xcb-proto/xcb-proto-1.10.ebuild

12

+++ b/x11-proto/xcb-proto/xcb-proto-1.10.ebuild

13

@@ -1,4 +1,4 @@

14

-# Copyright 1999-2015 Gentoo Foundation

15

+# Copyright 1999-2016 Gentoo Foundation

16

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

17

 # $Id$

18

19

@@ -30,19 +30,11 @@ src_configure() {

20

}

21

22

 multilib_src_configure() {

23

-	autotools-utils_src_configure

24

+	ECONF_SOURCE="${S}"

25

+	econf

26

27

 	if multilib_is_native_abi; then

28

-		python_foreach_impl autotools-utils_src_configure

29

-	fi

30

-}

31

-

32

-multilib_src_compile() {

33

-	default

34

-

35

-	if multilib_is_native_abi; then

36

-		python_foreach_impl autotools-utils_src_compile -C xcbgen \

37

-			top_builddir="${BUILD_DIR}"

38

+		python_foreach_impl run_in_build_dir econf

39

fi

40

}

41

42

@@ -58,7 +50,6 @@ multilib_src_install() {

43

 	default

44

45

 	if multilib_is_native_abi; then

46

-		python_foreach_impl autotools-utils_src_install -C xcbgen \

47

-			top_builddir="${BUILD_DIR}"

48

+		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install -C xcbgen

49

fi

50

}

51

diff --git a/x11-proto/xcb-proto/xcb-proto-1.11.ebuild b/x11-proto/xcb-proto/xcb-proto-1.11.ebuild

52

index 60a5a88..0f10a99 100644

53

--- a/x11-proto/xcb-proto/xcb-proto-1.11.ebuild

54

+++ b/x11-proto/xcb-proto/xcb-proto-1.11.ebuild

55

@@ -1,4 +1,4 @@

56

-# Copyright 1999-2015 Gentoo Foundation

57

+# Copyright 1999-2016 Gentoo Foundation

58

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

59

 # $Id$

60

61

@@ -30,19 +30,11 @@ src_configure() {

62

}

63

64

 multilib_src_configure() {

65

-	autotools-utils_src_configure

66

+	ECONF_SOURCE="${S}"

67

+	econf

68

69

 	if multilib_is_native_abi; then

70

-		python_foreach_impl autotools-utils_src_configure

71

-	fi

72

-}

73

-

74

-multilib_src_compile() {

75

-	default

76

-

77

-	if multilib_is_native_abi; then

78

-		python_foreach_impl autotools-utils_src_compile -C xcbgen \

79

-			top_builddir="${BUILD_DIR}"

80

+		python_foreach_impl run_in_build_dir econf

81

fi

82

}

83

84

@@ -58,7 +50,6 @@ multilib_src_install() {

85

 	default

86

87

 	if multilib_is_native_abi; then

88

-		python_foreach_impl autotools-utils_src_install -C xcbgen \

89

-			top_builddir="${BUILD_DIR}"

90

+		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install -C xcbgen

91

fi

92

}

93

diff --git a/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild b/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild

94

index 5239a6f..ad3a52a 100644

95

--- a/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild

96

+++ b/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild

97

@@ -1,4 +1,4 @@

98

-# Copyright 1999-2015 Gentoo Foundation

99

+# Copyright 1999-2016 Gentoo Foundation

100

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

101

 # $Id$

102

103

@@ -28,19 +28,11 @@ src_configure() {

104

}

105

106

 multilib_src_configure() {

107

-	autotools-utils_src_configure

108

+	ECONF_SOURCE="${S}"

109

+	econf

110

111

 	if multilib_is_native_abi; then

112

-		python_foreach_impl autotools-utils_src_configure

113

-	fi

114

-}

115

-

116

-multilib_src_compile() {

117

-	default

118

-

119

-	if multilib_is_native_abi; then

120

-		python_foreach_impl autotools-utils_src_compile -C xcbgen \

121

-			top_builddir="${BUILD_DIR}"

122

+		python_foreach_impl run_in_build_dir econf

123

fi

124

}

125

126

@@ -48,8 +40,7 @@ multilib_src_install() {

127

 	default

128

129

 	if multilib_is_native_abi; then

130

-		python_foreach_impl autotools-utils_src_install -C xcbgen \

131

-			top_builddir="${BUILD_DIR}"

132

+		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install -C xcbgen

133

fi

134

}

135

136

diff --git a/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild b/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild

137

index 308ca6d..9992acf 100644

138

--- a/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild

139

+++ b/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild

140

@@ -1,4 +1,4 @@

141

-# Copyright 1999-2015 Gentoo Foundation

142

+# Copyright 1999-2016 Gentoo Foundation

143

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

144

 # $Id$

145

146

@@ -37,19 +37,11 @@ src_configure() {

147

}

148

149

 multilib_src_configure() {

150

-	autotools-utils_src_configure

151

+	ECONF_SOURCE="${S}"

152

+	econf

153

154

 	if multilib_is_native_abi; then

155

-		python_foreach_impl autotools-utils_src_configure

156

-	fi

157

-}

158

-

159

-multilib_src_compile() {

160

-	default

161

-

162

-	if multilib_is_native_abi; then

163

-		python_foreach_impl autotools-utils_src_compile -C xcbgen \

164

-			top_builddir="${BUILD_DIR}"

165

+		python_foreach_impl run_in_build_dir econf

166

fi

167

}

168

169

@@ -57,7 +49,6 @@ multilib_src_install() {

170

 	default

171

172

 	if multilib_is_native_abi; then

173

-		python_foreach_impl autotools-utils_src_install -C xcbgen \

174

-			top_builddir="${BUILD_DIR}"

175

+		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install -C xcbgen

176

fi

177

}

178

--

179

2.8.1

1	Package-Manager: portage-2.2.28_p3
2	---
3	x11-proto/xcb-proto/xcb-proto-1.10.ebuild \| 19 +++++--------------
4	x11-proto/xcb-proto/xcb-proto-1.11.ebuild \| 19 +++++--------------
5	x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild \| 19 +++++--------------
6	x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild \| 19 +++++--------------
7	4 files changed, 20 insertions(+), 56 deletions(-)
8
9	diff --git a/x11-proto/xcb-proto/xcb-proto-1.10.ebuild b/x11-proto/xcb-proto/xcb-proto-1.10.ebuild
10	index f0ecc7a..e78ab72 100644
11	--- a/x11-proto/xcb-proto/xcb-proto-1.10.ebuild
12	+++ b/x11-proto/xcb-proto/xcb-proto-1.10.ebuild
13	@@ -1,4 +1,4 @@
14	-# Copyright 1999-2015 Gentoo Foundation
15	+# Copyright 1999-2016 Gentoo Foundation
16	# Distributed under the terms of the GNU General Public License v2
17	# $Id$
18
19	@@ -30,19 +30,11 @@ src_configure() {
20	}
21
22	multilib_src_configure() {
23	- autotools-utils_src_configure
24	+ ECONF_SOURCE="${S}"
25	+ econf
26
27	if multilib_is_native_abi; then
28	- python_foreach_impl autotools-utils_src_configure
29	- fi
30	-}
31	-
32	-multilib_src_compile() {
33	- default
34	-
35	- if multilib_is_native_abi; then
36	- python_foreach_impl autotools-utils_src_compile -C xcbgen \
37	- top_builddir="${BUILD_DIR}"
38	+ python_foreach_impl run_in_build_dir econf
39	fi
40	}
41
42	@@ -58,7 +50,6 @@ multilib_src_install() {
43	default
44
45	if multilib_is_native_abi; then
46	- python_foreach_impl autotools-utils_src_install -C xcbgen \
47	- top_builddir="${BUILD_DIR}"
48	+ python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install -C xcbgen
49	fi
50	}
51	diff --git a/x11-proto/xcb-proto/xcb-proto-1.11.ebuild b/x11-proto/xcb-proto/xcb-proto-1.11.ebuild
52	index 60a5a88..0f10a99 100644
53	--- a/x11-proto/xcb-proto/xcb-proto-1.11.ebuild
54	+++ b/x11-proto/xcb-proto/xcb-proto-1.11.ebuild
55	@@ -1,4 +1,4 @@
56	-# Copyright 1999-2015 Gentoo Foundation
57	+# Copyright 1999-2016 Gentoo Foundation
58	# Distributed under the terms of the GNU General Public License v2
59	# $Id$
60
61	@@ -30,19 +30,11 @@ src_configure() {
62	}
63
64	multilib_src_configure() {
65	- autotools-utils_src_configure
66	+ ECONF_SOURCE="${S}"
67	+ econf
68
69	if multilib_is_native_abi; then
70	- python_foreach_impl autotools-utils_src_configure
71	- fi
72	-}
73	-
74	-multilib_src_compile() {
75	- default
76	-
77	- if multilib_is_native_abi; then
78	- python_foreach_impl autotools-utils_src_compile -C xcbgen \
79	- top_builddir="${BUILD_DIR}"
80	+ python_foreach_impl run_in_build_dir econf
81	fi
82	}
83
84	@@ -58,7 +50,6 @@ multilib_src_install() {
85	default
86
87	if multilib_is_native_abi; then
88	- python_foreach_impl autotools-utils_src_install -C xcbgen \
89	- top_builddir="${BUILD_DIR}"
90	+ python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install -C xcbgen
91	fi
92	}
93	diff --git a/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild b/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild
94	index 5239a6f..ad3a52a 100644
95	--- a/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild
96	+++ b/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild
97	@@ -1,4 +1,4 @@
98	-# Copyright 1999-2015 Gentoo Foundation
99	+# Copyright 1999-2016 Gentoo Foundation
100	# Distributed under the terms of the GNU General Public License v2
101	# $Id$
102
103	@@ -28,19 +28,11 @@ src_configure() {
104	}
105
106	multilib_src_configure() {
107	- autotools-utils_src_configure
108	+ ECONF_SOURCE="${S}"
109	+ econf
110
111	if multilib_is_native_abi; then
112	- python_foreach_impl autotools-utils_src_configure
113	- fi
114	-}
115	-
116	-multilib_src_compile() {
117	- default
118	-
119	- if multilib_is_native_abi; then
120	- python_foreach_impl autotools-utils_src_compile -C xcbgen \
121	- top_builddir="${BUILD_DIR}"
122	+ python_foreach_impl run_in_build_dir econf
123	fi
124	}
125
126	@@ -48,8 +40,7 @@ multilib_src_install() {
127	default
128
129	if multilib_is_native_abi; then
130	- python_foreach_impl autotools-utils_src_install -C xcbgen \
131	- top_builddir="${BUILD_DIR}"
132	+ python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install -C xcbgen
133	fi
134	}
135
136	diff --git a/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild b/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild
137	index 308ca6d..9992acf 100644
138	--- a/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild
139	+++ b/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild
140	@@ -1,4 +1,4 @@
141	-# Copyright 1999-2015 Gentoo Foundation
142	+# Copyright 1999-2016 Gentoo Foundation
143	# Distributed under the terms of the GNU General Public License v2
144	# $Id$
145
146	@@ -37,19 +37,11 @@ src_configure() {
147	}
148
149	multilib_src_configure() {
150	- autotools-utils_src_configure
151	+ ECONF_SOURCE="${S}"
152	+ econf
153
154	if multilib_is_native_abi; then
155	- python_foreach_impl autotools-utils_src_configure
156	- fi
157	-}
158	-
159	-multilib_src_compile() {
160	- default
161	-
162	- if multilib_is_native_abi; then
163	- python_foreach_impl autotools-utils_src_compile -C xcbgen \
164	- top_builddir="${BUILD_DIR}"
165	+ python_foreach_impl run_in_build_dir econf
166	fi
167	}
168
169	@@ -57,7 +49,6 @@ multilib_src_install() {
170	default
171
172	if multilib_is_native_abi; then
173	- python_foreach_impl autotools-utils_src_install -C xcbgen \
174	- top_builddir="${BUILD_DIR}"
175	+ python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install -C xcbgen
176	fi
177	}
178	--
179	2.8.1

Gentoo Archives: gentoo-dev