[gentoo-commits] repo/gentoo:master commit in: dev-db/postgresql/ - gentoo-commits

From:	David Seifert <soap@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-db/postgresql/
Date:	Wed, 05 Jan 2022 10:28:14
Message-Id:	`1641378480.5248467c6990b4574b2bff82fa29d09364afdae2.soap@gentoo`

1

commit:     5248467c6990b4574b2bff82fa29d09364afdae2

2

Author:     David Seifert <soap <AT> gentoo <DOT> org>

3

AuthorDate: Wed Jan  5 10:28:00 2022 +0000

4

Commit:     David Seifert <soap <AT> gentoo <DOT> org>

5

CommitDate: Wed Jan  5 10:28:00 2022 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5248467c

7

8

dev-db/postgresql: remove elibc_NetBSD/elibc_OpenBSD

9

10

Signed-off-by: David Seifert <soap <AT> gentoo.org>

11

12

 dev-db/postgresql/postgresql-10.19.ebuild  | 6 +-----

13

 dev-db/postgresql/postgresql-11.14.ebuild  | 6 +-----

14

 dev-db/postgresql/postgresql-12.9.ebuild   | 6 +-----

15

 dev-db/postgresql/postgresql-13.5.ebuild   | 6 +-----

16

 dev-db/postgresql/postgresql-14.1.ebuild   | 6 +-----

17

 dev-db/postgresql/postgresql-9.6.24.ebuild | 6 +-----

18

 dev-db/postgresql/postgresql-9999.ebuild   | 6 +-----

19

 7 files changed, 7 insertions(+), 35 deletions(-)

20

21

diff --git a/dev-db/postgresql/postgresql-10.19.ebuild b/dev-db/postgresql/postgresql-10.19.ebuild

22

index 8a3921037477..df3f68c9aec9 100644

23

--- a/dev-db/postgresql/postgresql-10.19.ebuild

24

+++ b/dev-db/postgresql/postgresql-10.19.ebuild

25

@@ -51,7 +51,6 @@ zlib? ( sys-libs/zlib )

26

 # supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,

27

 # the libc includes UUID functions.

28

 UTIL_LINUX_LIBC=( elibc_{glibc,musl} )

29

-BSD_LIBC=( elibc_{Net,Open}BSD )

30

31

 nest_usedep() {

32

 	local front back

33

@@ -66,7 +65,7 @@ nest_usedep() {

34

 CDEPEND+="

35

 uuid? (

36

 	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}

37

-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)

38

+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)

39

)"

40

41

 DEPEND="${CDEPEND}

42

@@ -131,9 +130,6 @@ src_configure() {

43

 		for i in ${UTIL_LINUX_LIBC[@]}; do

44

 			use ${i} && uuid_config="--with-uuid=e2fs"

45

 		done

46

-		for i in ${BSD_LIBC[@]}; do

47

-			use ${i} && uuid_config="--with-uuid=bsd"

48

-		done

49

 		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"

50

fi

51

52

53

diff --git a/dev-db/postgresql/postgresql-11.14.ebuild b/dev-db/postgresql/postgresql-11.14.ebuild

54

index e0c2d013217f..0614243cb8c4 100644

55

--- a/dev-db/postgresql/postgresql-11.14.ebuild

56

+++ b/dev-db/postgresql/postgresql-11.14.ebuild

57

@@ -54,7 +54,6 @@ zlib? ( sys-libs/zlib )

58

 # supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,

59

 # the libc includes UUID functions.

60

 UTIL_LINUX_LIBC=( elibc_{glibc,musl} )

61

-BSD_LIBC=( elibc_{Net,Open}BSD )

62

63

 nest_usedep() {

64

 	local front back

65

@@ -69,7 +68,7 @@ nest_usedep() {

66

 CDEPEND+="

67

 uuid? (

68

 	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}

69

-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)

70

+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)

71

)"

72

73

 DEPEND="${CDEPEND}

74

@@ -127,9 +126,6 @@ src_configure() {

75

 		for i in ${UTIL_LINUX_LIBC[@]}; do

76

 			use ${i} && uuid_config="--with-uuid=e2fs"

77

 		done

78

-		for i in ${BSD_LIBC[@]}; do

79

-			use ${i} && uuid_config="--with-uuid=bsd"

80

-		done

81

 		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"

82

fi

83

84

85

diff --git a/dev-db/postgresql/postgresql-12.9.ebuild b/dev-db/postgresql/postgresql-12.9.ebuild

86

index 1e4fa882aada..f3837a3f0404 100644

87

--- a/dev-db/postgresql/postgresql-12.9.ebuild

88

+++ b/dev-db/postgresql/postgresql-12.9.ebuild

89

@@ -54,7 +54,6 @@ zlib? ( sys-libs/zlib )

90

 # supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,

91

 # the libc includes UUID functions.

92

 UTIL_LINUX_LIBC=( elibc_{glibc,musl} )

93

-BSD_LIBC=( elibc_{Net,Open}BSD )

94

95

 nest_usedep() {

96

 	local front back

97

@@ -69,7 +68,7 @@ nest_usedep() {

98

 CDEPEND+="

99

 uuid? (

100

 	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}

101

-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)

102

+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)

103

)"

104

105

 DEPEND="${CDEPEND}

106

@@ -127,9 +126,6 @@ src_configure() {

107

 		for i in ${UTIL_LINUX_LIBC[@]}; do

108

 			use ${i} && uuid_config="--with-uuid=e2fs"

109

 		done

110

-		for i in ${BSD_LIBC[@]}; do

111

-			use ${i} && uuid_config="--with-uuid=bsd"

112

-		done

113

 		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"

114

fi

115

116

117

diff --git a/dev-db/postgresql/postgresql-13.5.ebuild b/dev-db/postgresql/postgresql-13.5.ebuild

118

index 85510a53ff54..5f6ce9b239e3 100644

119

--- a/dev-db/postgresql/postgresql-13.5.ebuild

120

+++ b/dev-db/postgresql/postgresql-13.5.ebuild

121

@@ -54,7 +54,6 @@ zlib? ( sys-libs/zlib )

122

 # supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,

123

 # the libc includes UUID functions.

124

 UTIL_LINUX_LIBC=( elibc_{glibc,musl} )

125

-BSD_LIBC=( elibc_{Net,Open}BSD )

126

127

 nest_usedep() {

128

 	local front back

129

@@ -69,7 +68,7 @@ nest_usedep() {

130

 CDEPEND+="

131

 uuid? (

132

 	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}

133

-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)

134

+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)

135

)"

136

137

 DEPEND="${CDEPEND}

138

@@ -129,9 +128,6 @@ src_configure() {

139

 		for i in ${UTIL_LINUX_LIBC[@]}; do

140

 			use ${i} && uuid_config="--with-uuid=e2fs"

141

 		done

142

-		for i in ${BSD_LIBC[@]}; do

143

-			use ${i} && uuid_config="--with-uuid=bsd"

144

-		done

145

 		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"

146

fi

147

148

149

diff --git a/dev-db/postgresql/postgresql-14.1.ebuild b/dev-db/postgresql/postgresql-14.1.ebuild

150

index a173e1e9ef7a..5dff65601bf4 100644

151

--- a/dev-db/postgresql/postgresql-14.1.ebuild

152

+++ b/dev-db/postgresql/postgresql-14.1.ebuild

153

@@ -55,7 +55,6 @@ zlib? ( sys-libs/zlib )

154

 # supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,

155

 # the libc includes UUID functions.

156

 UTIL_LINUX_LIBC=( elibc_{glibc,musl} )

157

-BSD_LIBC=( elibc_{Net,Open}BSD )

158

159

 nest_usedep() {

160

 	local front back

161

@@ -70,7 +69,7 @@ nest_usedep() {

162

 CDEPEND+="

163

 uuid? (

164

 	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}

165

-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)

166

+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)

167

)"

168

169

 DEPEND="${CDEPEND}

170

@@ -128,9 +127,6 @@ src_configure() {

171

 		for i in ${UTIL_LINUX_LIBC[@]}; do

172

 			use ${i} && uuid_config="--with-uuid=e2fs"

173

 		done

174

-		for i in ${BSD_LIBC[@]}; do

175

-			use ${i} && uuid_config="--with-uuid=bsd"

176

-		done

177

 		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"

178

fi

179

180

181

diff --git a/dev-db/postgresql/postgresql-9.6.24.ebuild b/dev-db/postgresql/postgresql-9.6.24.ebuild

182

index 1073956aceb8..8310ab4b524f 100644

183

--- a/dev-db/postgresql/postgresql-9.6.24.ebuild

184

+++ b/dev-db/postgresql/postgresql-9.6.24.ebuild

185

@@ -50,7 +50,6 @@ zlib? ( sys-libs/zlib )

186

 # supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,

187

 # the libc includes UUID functions.

188

 UTIL_LINUX_LIBC=( elibc_{glibc,musl} )

189

-BSD_LIBC=( elibc_{Net,Open}BSD )

190

191

 nest_usedep() {

192

 	local front back

193

@@ -65,7 +64,7 @@ nest_usedep() {

194

 CDEPEND+="

195

 uuid? (

196

 	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}

197

-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)

198

+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)

199

)"

200

201

 DEPEND="${CDEPEND}

202

@@ -126,9 +125,6 @@ src_configure() {

203

 		for i in ${UTIL_LINUX_LIBC[@]}; do

204

 			use ${i} && uuid_config="--with-uuid=e2fs"

205

 		done

206

-		for i in ${BSD_LIBC[@]}; do

207

-			use ${i} && uuid_config="--with-uuid=bsd"

208

-		done

209

 		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"

210

fi

211

212

213

diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild

214

index 049b5d38001e..c922ae2da90f 100644

215

--- a/dev-db/postgresql/postgresql-9999.ebuild

216

+++ b/dev-db/postgresql/postgresql-9999.ebuild

217

@@ -54,7 +54,6 @@ zlib? ( sys-libs/zlib )

218

 # supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,

219

 # the libc includes UUID functions.

220

 UTIL_LINUX_LIBC=( elibc_{glibc,musl} )

221

-BSD_LIBC=( elibc_{Net,Open}BSD )

222

223

 nest_usedep() {

224

 	local front back

225

@@ -69,7 +68,7 @@ nest_usedep() {

226

 CDEPEND+="

227

 uuid? (

228

 	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}

229

-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)

230

+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)

231

)"

232

233

 DEPEND="${CDEPEND}

234

@@ -147,9 +146,6 @@ src_configure() {

235

 		for i in ${UTIL_LINUX_LIBC[@]}; do

236

 			use ${i} && uuid_config="--with-uuid=e2fs"

237

 		done

238

-		for i in ${BSD_LIBC[@]}; do

239

-			use ${i} && uuid_config="--with-uuid=bsd"

240

-		done

241

 		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"

242

fi

1	commit: 5248467c6990b4574b2bff82fa29d09364afdae2
2	Author: David Seifert <soap <AT> gentoo <DOT> org>
3	AuthorDate: Wed Jan 5 10:28:00 2022 +0000
4	Commit: David Seifert <soap <AT> gentoo <DOT> org>
5	CommitDate: Wed Jan 5 10:28:00 2022 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5248467c
7
8	dev-db/postgresql: remove elibc_NetBSD/elibc_OpenBSD
9
10	Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12	dev-db/postgresql/postgresql-10.19.ebuild \| 6 +-----
13	dev-db/postgresql/postgresql-11.14.ebuild \| 6 +-----
14	dev-db/postgresql/postgresql-12.9.ebuild \| 6 +-----
15	dev-db/postgresql/postgresql-13.5.ebuild \| 6 +-----
16	dev-db/postgresql/postgresql-14.1.ebuild \| 6 +-----
17	dev-db/postgresql/postgresql-9.6.24.ebuild \| 6 +-----
18	dev-db/postgresql/postgresql-9999.ebuild \| 6 +-----
19	7 files changed, 7 insertions(+), 35 deletions(-)
20
21	diff --git a/dev-db/postgresql/postgresql-10.19.ebuild b/dev-db/postgresql/postgresql-10.19.ebuild
22	index 8a3921037477..df3f68c9aec9 100644
23	--- a/dev-db/postgresql/postgresql-10.19.ebuild
24	+++ b/dev-db/postgresql/postgresql-10.19.ebuild
25	@@ -51,7 +51,6 @@ zlib? ( sys-libs/zlib )
26	# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
27	# the libc includes UUID functions.
28	UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
29	-BSD_LIBC=( elibc_{Net,Open}BSD )
30
31	nest_usedep() {
32	local front back
33	@@ -66,7 +65,7 @@ nest_usedep() {
34	CDEPEND+="
35	uuid? (
36	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
37	- $(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
38	+ $(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
39	)"
40
41	DEPEND="${CDEPEND}
42	@@ -131,9 +130,6 @@ src_configure() {
43	for i in ${UTIL_LINUX_LIBC[@]}; do
44	use ${i} && uuid_config="--with-uuid=e2fs"
45	done
46	- for i in ${BSD_LIBC[@]}; do
47	- use ${i} && uuid_config="--with-uuid=bsd"
48	- done
49	[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
50	fi
51
52
53	diff --git a/dev-db/postgresql/postgresql-11.14.ebuild b/dev-db/postgresql/postgresql-11.14.ebuild
54	index e0c2d013217f..0614243cb8c4 100644
55	--- a/dev-db/postgresql/postgresql-11.14.ebuild
56	+++ b/dev-db/postgresql/postgresql-11.14.ebuild
57	@@ -54,7 +54,6 @@ zlib? ( sys-libs/zlib )
58	# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
59	# the libc includes UUID functions.
60	UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
61	-BSD_LIBC=( elibc_{Net,Open}BSD )
62
63	nest_usedep() {
64	local front back
65	@@ -69,7 +68,7 @@ nest_usedep() {
66	CDEPEND+="
67	uuid? (
68	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
69	- $(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
70	+ $(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
71	)"
72
73	DEPEND="${CDEPEND}
74	@@ -127,9 +126,6 @@ src_configure() {
75	for i in ${UTIL_LINUX_LIBC[@]}; do
76	use ${i} && uuid_config="--with-uuid=e2fs"
77	done
78	- for i in ${BSD_LIBC[@]}; do
79	- use ${i} && uuid_config="--with-uuid=bsd"
80	- done
81	[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
82	fi
83
84
85	diff --git a/dev-db/postgresql/postgresql-12.9.ebuild b/dev-db/postgresql/postgresql-12.9.ebuild
86	index 1e4fa882aada..f3837a3f0404 100644
87	--- a/dev-db/postgresql/postgresql-12.9.ebuild
88	+++ b/dev-db/postgresql/postgresql-12.9.ebuild
89	@@ -54,7 +54,6 @@ zlib? ( sys-libs/zlib )
90	# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
91	# the libc includes UUID functions.
92	UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
93	-BSD_LIBC=( elibc_{Net,Open}BSD )
94
95	nest_usedep() {
96	local front back
97	@@ -69,7 +68,7 @@ nest_usedep() {
98	CDEPEND+="
99	uuid? (
100	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
101	- $(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
102	+ $(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
103	)"
104
105	DEPEND="${CDEPEND}
106	@@ -127,9 +126,6 @@ src_configure() {
107	for i in ${UTIL_LINUX_LIBC[@]}; do
108	use ${i} && uuid_config="--with-uuid=e2fs"
109	done
110	- for i in ${BSD_LIBC[@]}; do
111	- use ${i} && uuid_config="--with-uuid=bsd"
112	- done
113	[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
114	fi
115
116
117	diff --git a/dev-db/postgresql/postgresql-13.5.ebuild b/dev-db/postgresql/postgresql-13.5.ebuild
118	index 85510a53ff54..5f6ce9b239e3 100644
119	--- a/dev-db/postgresql/postgresql-13.5.ebuild
120	+++ b/dev-db/postgresql/postgresql-13.5.ebuild
121	@@ -54,7 +54,6 @@ zlib? ( sys-libs/zlib )
122	# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
123	# the libc includes UUID functions.
124	UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
125	-BSD_LIBC=( elibc_{Net,Open}BSD )
126
127	nest_usedep() {
128	local front back
129	@@ -69,7 +68,7 @@ nest_usedep() {
130	CDEPEND+="
131	uuid? (
132	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
133	- $(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
134	+ $(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
135	)"
136
137	DEPEND="${CDEPEND}
138	@@ -129,9 +128,6 @@ src_configure() {
139	for i in ${UTIL_LINUX_LIBC[@]}; do
140	use ${i} && uuid_config="--with-uuid=e2fs"
141	done
142	- for i in ${BSD_LIBC[@]}; do
143	- use ${i} && uuid_config="--with-uuid=bsd"
144	- done
145	[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
146	fi
147
148
149	diff --git a/dev-db/postgresql/postgresql-14.1.ebuild b/dev-db/postgresql/postgresql-14.1.ebuild
150	index a173e1e9ef7a..5dff65601bf4 100644
151	--- a/dev-db/postgresql/postgresql-14.1.ebuild
152	+++ b/dev-db/postgresql/postgresql-14.1.ebuild
153	@@ -55,7 +55,6 @@ zlib? ( sys-libs/zlib )
154	# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
155	# the libc includes UUID functions.
156	UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
157	-BSD_LIBC=( elibc_{Net,Open}BSD )
158
159	nest_usedep() {
160	local front back
161	@@ -70,7 +69,7 @@ nest_usedep() {
162	CDEPEND+="
163	uuid? (
164	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
165	- $(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
166	+ $(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
167	)"
168
169	DEPEND="${CDEPEND}
170	@@ -128,9 +127,6 @@ src_configure() {
171	for i in ${UTIL_LINUX_LIBC[@]}; do
172	use ${i} && uuid_config="--with-uuid=e2fs"
173	done
174	- for i in ${BSD_LIBC[@]}; do
175	- use ${i} && uuid_config="--with-uuid=bsd"
176	- done
177	[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
178	fi
179
180
181	diff --git a/dev-db/postgresql/postgresql-9.6.24.ebuild b/dev-db/postgresql/postgresql-9.6.24.ebuild
182	index 1073956aceb8..8310ab4b524f 100644
183	--- a/dev-db/postgresql/postgresql-9.6.24.ebuild
184	+++ b/dev-db/postgresql/postgresql-9.6.24.ebuild
185	@@ -50,7 +50,6 @@ zlib? ( sys-libs/zlib )
186	# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
187	# the libc includes UUID functions.
188	UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
189	-BSD_LIBC=( elibc_{Net,Open}BSD )
190
191	nest_usedep() {
192	local front back
193	@@ -65,7 +64,7 @@ nest_usedep() {
194	CDEPEND+="
195	uuid? (
196	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
197	- $(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
198	+ $(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
199	)"
200
201	DEPEND="${CDEPEND}
202	@@ -126,9 +125,6 @@ src_configure() {
203	for i in ${UTIL_LINUX_LIBC[@]}; do
204	use ${i} && uuid_config="--with-uuid=e2fs"
205	done
206	- for i in ${BSD_LIBC[@]}; do
207	- use ${i} && uuid_config="--with-uuid=bsd"
208	- done
209	[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
210	fi
211
212
213	diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
214	index 049b5d38001e..c922ae2da90f 100644
215	--- a/dev-db/postgresql/postgresql-9999.ebuild
216	+++ b/dev-db/postgresql/postgresql-9999.ebuild
217	@@ -54,7 +54,6 @@ zlib? ( sys-libs/zlib )
218	# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
219	# the libc includes UUID functions.
220	UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
221	-BSD_LIBC=( elibc_{Net,Open}BSD )
222
223	nest_usedep() {
224	local front back
225	@@ -69,7 +68,7 @@ nest_usedep() {
226	CDEPEND+="
227	uuid? (
228	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
229	- $(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
230	+ $(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
231	)"
232
233	DEPEND="${CDEPEND}
234	@@ -147,9 +146,6 @@ src_configure() {
235	for i in ${UTIL_LINUX_LIBC[@]}; do
236	use ${i} && uuid_config="--with-uuid=e2fs"
237	done
238	- for i in ${BSD_LIBC[@]}; do
239	- use ${i} && uuid_config="--with-uuid=bsd"
240	- done
241	[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
242	fi

Gentoo Archives: gentoo-commits