[gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/ - gentoo-commits

From:	"Robin H. Johnson" <robbat2@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/
Date:	Wed, 08 Feb 2017 23:38:29
Message-Id:	`1486597100.224ac572445499be78cf3ad2dbbc791568d1458f.robbat2@gentoo`

1

commit:     224ac572445499be78cf3ad2dbbc791568d1458f

2

Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>

3

AuthorDate: Wed Feb  8 23:37:55 2017 +0000

4

Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>

5

CommitDate: Wed Feb  8 23:38:20 2017 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=224ac572

7

8

net-nds/openldap: allow override of BDB slot during build.

9

10

Package-Manager: portage-2.3.2

11

12

 net-nds/openldap/openldap-2.4.40-r2.ebuild | 3 ++-

13

 net-nds/openldap/openldap-2.4.40-r4.ebuild | 3 ++-

14

 net-nds/openldap/openldap-2.4.42-r1.ebuild | 3 ++-

15

 net-nds/openldap/openldap-2.4.42.ebuild    | 3 ++-

16

 net-nds/openldap/openldap-2.4.43-r1.ebuild | 3 ++-

17

 net-nds/openldap/openldap-2.4.43.ebuild    | 3 ++-

18

 net-nds/openldap/openldap-2.4.44-r1.ebuild | 3 ++-

19

 net-nds/openldap/openldap-2.4.44.ebuild    | 3 ++-

20

 8 files changed, 16 insertions(+), 8 deletions(-)

21

22

diff --git a/net-nds/openldap/openldap-2.4.40-r2.ebuild b/net-nds/openldap/openldap-2.4.40-r2.ebuild

23

index ee565280fe..2b1bd80466 100644

24

--- a/net-nds/openldap/openldap-2.4.40-r2.ebuild

25

+++ b/net-nds/openldap/openldap-2.4.40-r2.ebuild

26

@@ -34,7 +34,8 @@ REQUIRED_USE="cxx? ( sasl )"

27

 # always list newer first

28

 # Do not add any AGPL-3 BDB here!

29

 # See bug 525110, comment 15.

30

-BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4'

31

+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.

32

+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"

33

 BDB_PKGS=''

34

 for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done

35

36

37

diff --git a/net-nds/openldap/openldap-2.4.40-r4.ebuild b/net-nds/openldap/openldap-2.4.40-r4.ebuild

38

index 7db8c17d09..f0cf71b4cb 100644

39

--- a/net-nds/openldap/openldap-2.4.40-r4.ebuild

40

+++ b/net-nds/openldap/openldap-2.4.40-r4.ebuild

41

@@ -34,7 +34,8 @@ REQUIRED_USE="cxx? ( sasl )"

42

 # always list newer first

43

 # Do not add any AGPL-3 BDB here!

44

 # See bug 525110, comment 15.

45

-BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4'

46

+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.

47

+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"

48

 BDB_PKGS=''

49

 for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done

50

51

52

diff --git a/net-nds/openldap/openldap-2.4.42-r1.ebuild b/net-nds/openldap/openldap-2.4.42-r1.ebuild

53

index 22b73afd2e..2b8a56f637 100644

54

--- a/net-nds/openldap/openldap-2.4.42-r1.ebuild

55

+++ b/net-nds/openldap/openldap-2.4.42-r1.ebuild

56

@@ -35,7 +35,8 @@ REQUIRED_USE="cxx? ( sasl )

57

 # always list newer first

58

 # Do not add any AGPL-3 BDB here!

59

 # See bug 525110, comment 15.

60

-BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4'

61

+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.

62

+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"

63

 BDB_PKGS=''

64

 for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done

65

66

67

diff --git a/net-nds/openldap/openldap-2.4.42.ebuild b/net-nds/openldap/openldap-2.4.42.ebuild

68

index 19ad134306..e3e20faa16 100644

69

--- a/net-nds/openldap/openldap-2.4.42.ebuild

70

+++ b/net-nds/openldap/openldap-2.4.42.ebuild

71

@@ -34,7 +34,8 @@ REQUIRED_USE="cxx? ( sasl )"

72

 # always list newer first

73

 # Do not add any AGPL-3 BDB here!

74

 # See bug 525110, comment 15.

75

-BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4'

76

+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.

77

+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"

78

 BDB_PKGS=''

79

 for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done

80

81

82

diff --git a/net-nds/openldap/openldap-2.4.43-r1.ebuild b/net-nds/openldap/openldap-2.4.43-r1.ebuild

83

index 165b543fcf..c10ab6232b 100644

84

--- a/net-nds/openldap/openldap-2.4.43-r1.ebuild

85

+++ b/net-nds/openldap/openldap-2.4.43-r1.ebuild

86

@@ -35,7 +35,8 @@ REQUIRED_USE="cxx? ( sasl )

87

 # always list newer first

88

 # Do not add any AGPL-3 BDB here!

89

 # See bug 525110, comment 15.

90

-BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4'

91

+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.

92

+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"

93

 BDB_PKGS=''

94

 for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done

95

96

97

diff --git a/net-nds/openldap/openldap-2.4.43.ebuild b/net-nds/openldap/openldap-2.4.43.ebuild

98

index baeab80882..d16b8b3c75 100644

99

--- a/net-nds/openldap/openldap-2.4.43.ebuild

100

+++ b/net-nds/openldap/openldap-2.4.43.ebuild

101

@@ -35,7 +35,8 @@ REQUIRED_USE="cxx? ( sasl )

102

 # always list newer first

103

 # Do not add any AGPL-3 BDB here!

104

 # See bug 525110, comment 15.

105

-BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4'

106

+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.

107

+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"

108

 BDB_PKGS=''

109

 for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done

110

111

112

diff --git a/net-nds/openldap/openldap-2.4.44-r1.ebuild b/net-nds/openldap/openldap-2.4.44-r1.ebuild

113

index 7e7c7a09df..b4cce18283 100644

114

--- a/net-nds/openldap/openldap-2.4.44-r1.ebuild

115

+++ b/net-nds/openldap/openldap-2.4.44-r1.ebuild

116

@@ -36,7 +36,8 @@ REQUIRED_USE="cxx? ( sasl )

117

 # always list newer first

118

 # Do not add any AGPL-3 BDB here!

119

 # See bug 525110, comment 15.

120

-BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4'

121

+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.

122

+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"

123

 BDB_PKGS=''

124

 for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done

125

126

127

diff --git a/net-nds/openldap/openldap-2.4.44.ebuild b/net-nds/openldap/openldap-2.4.44.ebuild

128

index 0b553596b3..560b602b6a 100644

129

--- a/net-nds/openldap/openldap-2.4.44.ebuild

130

+++ b/net-nds/openldap/openldap-2.4.44.ebuild

131

@@ -35,7 +35,8 @@ REQUIRED_USE="cxx? ( sasl )

132

 # always list newer first

133

 # Do not add any AGPL-3 BDB here!

134

 # See bug 525110, comment 15.

135

-BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4'

136

+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.

137

+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"

138

 BDB_PKGS=''

139

 for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done

1	commit: 224ac572445499be78cf3ad2dbbc791568d1458f
2	Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
3	AuthorDate: Wed Feb 8 23:37:55 2017 +0000
4	Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5	CommitDate: Wed Feb 8 23:38:20 2017 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=224ac572
7
8	net-nds/openldap: allow override of BDB slot during build.
9
10	Package-Manager: portage-2.3.2
11
12	net-nds/openldap/openldap-2.4.40-r2.ebuild \| 3 ++-
13	net-nds/openldap/openldap-2.4.40-r4.ebuild \| 3 ++-
14	net-nds/openldap/openldap-2.4.42-r1.ebuild \| 3 ++-
15	net-nds/openldap/openldap-2.4.42.ebuild \| 3 ++-
16	net-nds/openldap/openldap-2.4.43-r1.ebuild \| 3 ++-
17	net-nds/openldap/openldap-2.4.43.ebuild \| 3 ++-
18	net-nds/openldap/openldap-2.4.44-r1.ebuild \| 3 ++-
19	net-nds/openldap/openldap-2.4.44.ebuild \| 3 ++-
20	8 files changed, 16 insertions(+), 8 deletions(-)
21
22	diff --git a/net-nds/openldap/openldap-2.4.40-r2.ebuild b/net-nds/openldap/openldap-2.4.40-r2.ebuild
23	index ee565280fe..2b1bd80466 100644
24	--- a/net-nds/openldap/openldap-2.4.40-r2.ebuild
25	+++ b/net-nds/openldap/openldap-2.4.40-r2.ebuild
26	@@ -34,7 +34,8 @@ REQUIRED_USE="cxx? ( sasl )"
27	# always list newer first
28	# Do not add any AGPL-3 BDB here!
29	# See bug 525110, comment 15.
30	-BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4'
31	+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.
32	+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
33	BDB_PKGS=''
34	for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
35
36
37	diff --git a/net-nds/openldap/openldap-2.4.40-r4.ebuild b/net-nds/openldap/openldap-2.4.40-r4.ebuild
38	index 7db8c17d09..f0cf71b4cb 100644
39	--- a/net-nds/openldap/openldap-2.4.40-r4.ebuild
40	+++ b/net-nds/openldap/openldap-2.4.40-r4.ebuild
41	@@ -34,7 +34,8 @@ REQUIRED_USE="cxx? ( sasl )"
42	# always list newer first
43	# Do not add any AGPL-3 BDB here!
44	# See bug 525110, comment 15.
45	-BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4'
46	+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.
47	+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
48	BDB_PKGS=''
49	for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
50
51
52	diff --git a/net-nds/openldap/openldap-2.4.42-r1.ebuild b/net-nds/openldap/openldap-2.4.42-r1.ebuild
53	index 22b73afd2e..2b8a56f637 100644
54	--- a/net-nds/openldap/openldap-2.4.42-r1.ebuild
55	+++ b/net-nds/openldap/openldap-2.4.42-r1.ebuild
56	@@ -35,7 +35,8 @@ REQUIRED_USE="cxx? ( sasl )
57	# always list newer first
58	# Do not add any AGPL-3 BDB here!
59	# See bug 525110, comment 15.
60	-BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4'
61	+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.
62	+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
63	BDB_PKGS=''
64	for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
65
66
67	diff --git a/net-nds/openldap/openldap-2.4.42.ebuild b/net-nds/openldap/openldap-2.4.42.ebuild
68	index 19ad134306..e3e20faa16 100644
69	--- a/net-nds/openldap/openldap-2.4.42.ebuild
70	+++ b/net-nds/openldap/openldap-2.4.42.ebuild
71	@@ -34,7 +34,8 @@ REQUIRED_USE="cxx? ( sasl )"
72	# always list newer first
73	# Do not add any AGPL-3 BDB here!
74	# See bug 525110, comment 15.
75	-BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4'
76	+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.
77	+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
78	BDB_PKGS=''
79	for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
80
81
82	diff --git a/net-nds/openldap/openldap-2.4.43-r1.ebuild b/net-nds/openldap/openldap-2.4.43-r1.ebuild
83	index 165b543fcf..c10ab6232b 100644
84	--- a/net-nds/openldap/openldap-2.4.43-r1.ebuild
85	+++ b/net-nds/openldap/openldap-2.4.43-r1.ebuild
86	@@ -35,7 +35,8 @@ REQUIRED_USE="cxx? ( sasl )
87	# always list newer first
88	# Do not add any AGPL-3 BDB here!
89	# See bug 525110, comment 15.
90	-BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4'
91	+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.
92	+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
93	BDB_PKGS=''
94	for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
95
96
97	diff --git a/net-nds/openldap/openldap-2.4.43.ebuild b/net-nds/openldap/openldap-2.4.43.ebuild
98	index baeab80882..d16b8b3c75 100644
99	--- a/net-nds/openldap/openldap-2.4.43.ebuild
100	+++ b/net-nds/openldap/openldap-2.4.43.ebuild
101	@@ -35,7 +35,8 @@ REQUIRED_USE="cxx? ( sasl )
102	# always list newer first
103	# Do not add any AGPL-3 BDB here!
104	# See bug 525110, comment 15.
105	-BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4'
106	+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.
107	+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
108	BDB_PKGS=''
109	for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
110
111
112	diff --git a/net-nds/openldap/openldap-2.4.44-r1.ebuild b/net-nds/openldap/openldap-2.4.44-r1.ebuild
113	index 7e7c7a09df..b4cce18283 100644
114	--- a/net-nds/openldap/openldap-2.4.44-r1.ebuild
115	+++ b/net-nds/openldap/openldap-2.4.44-r1.ebuild
116	@@ -36,7 +36,8 @@ REQUIRED_USE="cxx? ( sasl )
117	# always list newer first
118	# Do not add any AGPL-3 BDB here!
119	# See bug 525110, comment 15.
120	-BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4'
121	+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.
122	+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
123	BDB_PKGS=''
124	for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
125
126
127	diff --git a/net-nds/openldap/openldap-2.4.44.ebuild b/net-nds/openldap/openldap-2.4.44.ebuild
128	index 0b553596b3..560b602b6a 100644
129	--- a/net-nds/openldap/openldap-2.4.44.ebuild
130	+++ b/net-nds/openldap/openldap-2.4.44.ebuild
131	@@ -35,7 +35,8 @@ REQUIRED_USE="cxx? ( sasl )
132	# always list newer first
133	# Do not add any AGPL-3 BDB here!
134	# See bug 525110, comment 15.
135	-BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4'
136	+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.
137	+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
138	BDB_PKGS=''
139	for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done

Gentoo Archives: gentoo-commits