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

From:	Sam James <sam@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/
Date:	Fri, 13 May 2022 20:04:16
Message-Id:	`1652472215.54d6b965bc03481d743a874991ce4072a3a7d37b.sam@gentoo`

1

commit:     54d6b965bc03481d743a874991ce4072a3a7d37b

2

Author:     Thomas Bracht Laumann Jespersen <t <AT> laumann <DOT> xyz>

3

AuthorDate: Wed Apr 20 20:13:02 2022 +0000

4

Commit:     Sam James <sam <AT> gentoo <DOT> org>

5

CommitDate: Fri May 13 20:03:35 2022 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54d6b965

7

8

net-nds/openldap: [QA] eend without argument

9

10

Remove the lone eend, and change the ebegin to einfo.

11

12

Signed-off-by: Thomas Bracht Laumann Jespersen <t <AT> laumann.xyz>

13

Signed-off-by: Sam James <sam <AT> gentoo.org>

14

15

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

16

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

17

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

18

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

19

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

20

 5 files changed, 5 insertions(+), 10 deletions(-)

21

22

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

23

index 6071ea4e4bfc..5ec8d89d34fe 100644

24

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

25

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

26

@@ -749,7 +749,7 @@ multilib_src_install() {

27

 		configfile="${ED}"/etc/openldap/slapd.conf

28

29

 		# populate with built backends

30

-		ebegin "populate config with built backends"

31

+		einfo "populate config with built backends"

32

 		for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do

33

 			einfo "Adding $(basename ${x})"

34

 			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die

35

@@ -758,7 +758,6 @@ multilib_src_install() {

36

 		use prefix || fowners root:ldap /etc/openldap/slapd.conf

37

 		fperms 0640 /etc/openldap/slapd.conf

38

 		cp "${configfile}" "${configfile}".default || die

39

-		eend

40

41

 		# install our own init scripts and systemd unit files

42

 		einfo "Install init scripts"

43

44

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

45

index 8ecc781450b2..dda39f5339c0 100644

46

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

47

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

48

@@ -749,7 +749,7 @@ multilib_src_install() {

49

 		configfile="${ED}"/etc/openldap/slapd.conf

50

51

 		# populate with built backends

52

-		ebegin "populate config with built backends"

53

+		einfo "populate config with built backends"

54

 		for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do

55

 			einfo "Adding $(basename ${x})"

56

 			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die

57

@@ -758,7 +758,6 @@ multilib_src_install() {

58

 		use prefix || fowners root:ldap /etc/openldap/slapd.conf

59

 		fperms 0640 /etc/openldap/slapd.conf

60

 		cp "${configfile}" "${configfile}".default || die

61

-		eend

62

63

 		# install our own init scripts and systemd unit files

64

 		einfo "Install init scripts"

65

66

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

67

index 25141776f10a..0aca184d6849 100644

68

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

69

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

70

@@ -749,7 +749,7 @@ multilib_src_install() {

71

 		configfile="${ED}"/etc/openldap/slapd.conf

72

73

 		# populate with built backends

74

-		ebegin "populate config with built backends"

75

+		einfo "populate config with built backends"

76

 		for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do

77

 			einfo "Adding $(basename ${x})"

78

 			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die

79

@@ -758,7 +758,6 @@ multilib_src_install() {

80

 		use prefix || fowners root:ldap /etc/openldap/slapd.conf

81

 		fperms 0640 /etc/openldap/slapd.conf

82

 		cp "${configfile}" "${configfile}".default || die

83

-		eend

84

85

 		# install our own init scripts and systemd unit files

86

 		einfo "Install init scripts"

87

88

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

89

index 53daba349ce5..8304dd4e70f1 100644

90

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

91

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

92

@@ -681,7 +681,7 @@ multilib_src_install() {

93

 		configfile="${ED}"/etc/openldap/slapd.conf

94

95

 		# populate with built backends

96

-		ebegin "populate config with built backends"

97

+		einfo "populate config with built backends"

98

 		for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do

99

 			einfo "Adding $(basename ${x})"

100

 			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die

101

@@ -690,7 +690,6 @@ multilib_src_install() {

102

 		use prefix || fowners root:ldap /etc/openldap/slapd.conf

103

 		fperms 0640 /etc/openldap/slapd.conf

104

 		cp "${configfile}" "${configfile}".default || die

105

-		eend

106

107

 		# install our own init scripts and systemd unit files

108

 		einfo "Install init scripts"

109

110

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

111

index 2bb87baa4aa0..1223fd163d99 100644

112

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

113

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

114

@@ -648,7 +648,7 @@ multilib_src_install() {

115

 		configfile="${ED}"/etc/openldap/slapd.conf

116

117

 		# populate with built backends

118

-		ebegin "populate config with built backends"

119

+		einfo "populate config with built backends"

120

 		for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do

121

 			einfo "Adding $(basename ${x})"

122

 			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die

123

@@ -657,7 +657,6 @@ multilib_src_install() {

124

 		use prefix || fowners root:ldap /etc/openldap/slapd.conf

125

 		fperms 0640 /etc/openldap/slapd.conf

126

 		cp "${configfile}" "${configfile}".default || die

127

-		eend $?

128

129

 		# install our own init scripts and systemd unit files

130

 		einfo "Install init scripts"

1	commit: 54d6b965bc03481d743a874991ce4072a3a7d37b
2	Author: Thomas Bracht Laumann Jespersen <t <AT> laumann <DOT> xyz>
3	AuthorDate: Wed Apr 20 20:13:02 2022 +0000
4	Commit: Sam James <sam <AT> gentoo <DOT> org>
5	CommitDate: Fri May 13 20:03:35 2022 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54d6b965
7
8	net-nds/openldap: [QA] eend without argument
9
10	Remove the lone eend, and change the ebegin to einfo.
11
12	Signed-off-by: Thomas Bracht Laumann Jespersen <t <AT> laumann.xyz>
13	Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15	net-nds/openldap/openldap-2.4.57-r2.ebuild \| 3 +--
16	net-nds/openldap/openldap-2.4.58-r2.ebuild \| 3 +--
17	net-nds/openldap/openldap-2.4.59-r2.ebuild \| 3 +--
18	net-nds/openldap/openldap-2.5.4-r1.ebuild \| 3 +--
19	net-nds/openldap/openldap-2.6.1-r1.ebuild \| 3 +--
20	5 files changed, 5 insertions(+), 10 deletions(-)
21
22	diff --git a/net-nds/openldap/openldap-2.4.57-r2.ebuild b/net-nds/openldap/openldap-2.4.57-r2.ebuild
23	index 6071ea4e4bfc..5ec8d89d34fe 100644
24	--- a/net-nds/openldap/openldap-2.4.57-r2.ebuild
25	+++ b/net-nds/openldap/openldap-2.4.57-r2.ebuild
26	@@ -749,7 +749,7 @@ multilib_src_install() {
27	configfile="${ED}"/etc/openldap/slapd.conf
28
29	# populate with built backends
30	- ebegin "populate config with built backends"
31	+ einfo "populate config with built backends"
32	for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do
33	einfo "Adding $(basename ${x})"
34	sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" \|\| die
35	@@ -758,7 +758,6 @@ multilib_src_install() {
36	use prefix \|\| fowners root:ldap /etc/openldap/slapd.conf
37	fperms 0640 /etc/openldap/slapd.conf
38	cp "${configfile}" "${configfile}".default \|\| die
39	- eend
40
41	# install our own init scripts and systemd unit files
42	einfo "Install init scripts"
43
44	diff --git a/net-nds/openldap/openldap-2.4.58-r2.ebuild b/net-nds/openldap/openldap-2.4.58-r2.ebuild
45	index 8ecc781450b2..dda39f5339c0 100644
46	--- a/net-nds/openldap/openldap-2.4.58-r2.ebuild
47	+++ b/net-nds/openldap/openldap-2.4.58-r2.ebuild
48	@@ -749,7 +749,7 @@ multilib_src_install() {
49	configfile="${ED}"/etc/openldap/slapd.conf
50
51	# populate with built backends
52	- ebegin "populate config with built backends"
53	+ einfo "populate config with built backends"
54	for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do
55	einfo "Adding $(basename ${x})"
56	sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" \|\| die
57	@@ -758,7 +758,6 @@ multilib_src_install() {
58	use prefix \|\| fowners root:ldap /etc/openldap/slapd.conf
59	fperms 0640 /etc/openldap/slapd.conf
60	cp "${configfile}" "${configfile}".default \|\| die
61	- eend
62
63	# install our own init scripts and systemd unit files
64	einfo "Install init scripts"
65
66	diff --git a/net-nds/openldap/openldap-2.4.59-r2.ebuild b/net-nds/openldap/openldap-2.4.59-r2.ebuild
67	index 25141776f10a..0aca184d6849 100644
68	--- a/net-nds/openldap/openldap-2.4.59-r2.ebuild
69	+++ b/net-nds/openldap/openldap-2.4.59-r2.ebuild
70	@@ -749,7 +749,7 @@ multilib_src_install() {
71	configfile="${ED}"/etc/openldap/slapd.conf
72
73	# populate with built backends
74	- ebegin "populate config with built backends"
75	+ einfo "populate config with built backends"
76	for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do
77	einfo "Adding $(basename ${x})"
78	sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" \|\| die
79	@@ -758,7 +758,6 @@ multilib_src_install() {
80	use prefix \|\| fowners root:ldap /etc/openldap/slapd.conf
81	fperms 0640 /etc/openldap/slapd.conf
82	cp "${configfile}" "${configfile}".default \|\| die
83	- eend
84
85	# install our own init scripts and systemd unit files
86	einfo "Install init scripts"
87
88	diff --git a/net-nds/openldap/openldap-2.5.4-r1.ebuild b/net-nds/openldap/openldap-2.5.4-r1.ebuild
89	index 53daba349ce5..8304dd4e70f1 100644
90	--- a/net-nds/openldap/openldap-2.5.4-r1.ebuild
91	+++ b/net-nds/openldap/openldap-2.5.4-r1.ebuild
92	@@ -681,7 +681,7 @@ multilib_src_install() {
93	configfile="${ED}"/etc/openldap/slapd.conf
94
95	# populate with built backends
96	- ebegin "populate config with built backends"
97	+ einfo "populate config with built backends"
98	for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do
99	einfo "Adding $(basename ${x})"
100	sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" \|\| die
101	@@ -690,7 +690,6 @@ multilib_src_install() {
102	use prefix \|\| fowners root:ldap /etc/openldap/slapd.conf
103	fperms 0640 /etc/openldap/slapd.conf
104	cp "${configfile}" "${configfile}".default \|\| die
105	- eend
106
107	# install our own init scripts and systemd unit files
108	einfo "Install init scripts"
109
110	diff --git a/net-nds/openldap/openldap-2.6.1-r1.ebuild b/net-nds/openldap/openldap-2.6.1-r1.ebuild
111	index 2bb87baa4aa0..1223fd163d99 100644
112	--- a/net-nds/openldap/openldap-2.6.1-r1.ebuild
113	+++ b/net-nds/openldap/openldap-2.6.1-r1.ebuild
114	@@ -648,7 +648,7 @@ multilib_src_install() {
115	configfile="${ED}"/etc/openldap/slapd.conf
116
117	# populate with built backends
118	- ebegin "populate config with built backends"
119	+ einfo "populate config with built backends"
120	for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do
121	einfo "Adding $(basename ${x})"
122	sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" \|\| die
123	@@ -657,7 +657,6 @@ multilib_src_install() {
124	use prefix \|\| fowners root:ldap /etc/openldap/slapd.conf
125	fperms 0640 /etc/openldap/slapd.conf
126	cp "${configfile}" "${configfile}".default \|\| die
127	- eend $?
128
129	# install our own init scripts and systemd unit files
130	einfo "Install init scripts"

Gentoo Archives: gentoo-commits