[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/ - gentoo-commits

From:	Lars Wendler <polynomial-c@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: app-shells/bash/
Date:	Sun, 29 Nov 2020 19:11:44
Message-Id:	`1606677095.ba04c1e8c19c6e32fbb04705db227aeed983e8d9.polynomial-c@gentoo`

1

commit:     ba04c1e8c19c6e32fbb04705db227aeed983e8d9

2

Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>

3

AuthorDate: Sun Nov 29 19:03:55 2020 +0000

4

Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>

5

CommitDate: Sun Nov 29 19:11:35 2020 +0000

6

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

7

8

app-shells/bash: Backport system-readline sed fixes

9

10

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

11

Package-Manager: Portage-3.0.11, Repoman-3.0.2

12

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

13

14

 app-shells/bash/bash-2.05b_p13.ebuild  | 2 +-

15

 app-shells/bash/bash-3.0_p22.ebuild    | 2 +-

16

 app-shells/bash/bash-3.1_p23.ebuild    | 2 +-

17

 app-shells/bash/bash-3.2_p57.ebuild    | 2 +-

18

 app-shells/bash/bash-4.0_p44.ebuild    | 2 +-

19

 app-shells/bash/bash-4.1_p17.ebuild    | 2 +-

20

 app-shells/bash/bash-4.2_p53.ebuild    | 2 +-

21

 app-shells/bash/bash-4.3_p48-r2.ebuild | 2 +-

22

 app-shells/bash/bash-4.4_p23-r2.ebuild | 2 +-

23

 app-shells/bash/bash-5.0_p18.ebuild    | 2 +-

24

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

25

26

diff --git a/app-shells/bash/bash-2.05b_p13.ebuild b/app-shells/bash/bash-2.05b_p13.ebuild

27

index 9c9eb79db32..9c9e3fec805 100644

28

--- a/app-shells/bash/bash-2.05b_p13.ebuild

29

+++ b/app-shells/bash/bash-2.05b_p13.ebuild

30

@@ -76,7 +76,7 @@ src_prepare() {

31

 	# Clean out local libs so we know we use system ones

32

 	rm -rf lib/{readline,termcap}/* || die

33

 	touch lib/{readline,termcap}/Makefile.in || die # for config.status

34

-	sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die

35

+	sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die

36

37

 	default

38

}

39

40

diff --git a/app-shells/bash/bash-3.0_p22.ebuild b/app-shells/bash/bash-3.0_p22.ebuild

41

index 6437d45fb53..d6a10f4002e 100644

42

--- a/app-shells/bash/bash-3.0_p22.ebuild

43

+++ b/app-shells/bash/bash-3.0_p22.ebuild

44

@@ -79,7 +79,7 @@ src_prepare() {

45

 	# Clean out local libs so we know we use system ones

46

 	rm -rf lib/{readline,termcap}/* || die

47

 	touch lib/{readline,termcap}/Makefile.in || die # for config.status

48

-	sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die

49

+	sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die

50

51

 	default

52

}

53

54

diff --git a/app-shells/bash/bash-3.1_p23.ebuild b/app-shells/bash/bash-3.1_p23.ebuild

55

index ad1a7e46c42..cf6a8d6a93c 100644

56

--- a/app-shells/bash/bash-3.1_p23.ebuild

57

+++ b/app-shells/bash/bash-3.1_p23.ebuild

58

@@ -76,7 +76,7 @@ src_prepare() {

59

 	# Clean out local libs so we know we use system ones

60

 	rm -rf lib/{readline,termcap}/* || die

61

 	touch lib/{readline,termcap}/Makefile.in || die # for config.status

62

-	sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die

63

+	sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die

64

65

 	default

66

}

67

68

diff --git a/app-shells/bash/bash-3.2_p57.ebuild b/app-shells/bash/bash-3.2_p57.ebuild

69

index f555e3f03de..2a5bfa279ff 100644

70

--- a/app-shells/bash/bash-3.2_p57.ebuild

71

+++ b/app-shells/bash/bash-3.2_p57.ebuild

72

@@ -78,7 +78,7 @@ src_prepare() {

73

 	# Clean out local libs so we know we use system ones

74

 	rm -rf lib/{readline,termcap}/* || die

75

 	touch lib/{readline,termcap}/Makefile.in || die # for config.status

76

-	sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die

77

+	sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die

78

79

 	default

80

}

81

82

diff --git a/app-shells/bash/bash-4.0_p44.ebuild b/app-shells/bash/bash-4.0_p44.ebuild

83

index 560929519b5..878f660af57 100644

84

--- a/app-shells/bash/bash-4.0_p44.ebuild

85

+++ b/app-shells/bash/bash-4.0_p44.ebuild

86

@@ -75,7 +75,7 @@ src_prepare() {

87

 	# Clean out local libs so we know we use system ones

88

 	rm -rf lib/{readline,termcap}/* || die

89

 	touch lib/{readline,termcap}/Makefile.in || die # for config.status

90

-	sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die

91

+	sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die

92

93

 	default

94

95

96

diff --git a/app-shells/bash/bash-4.1_p17.ebuild b/app-shells/bash/bash-4.1_p17.ebuild

97

index 9c68ac62d28..198646cc65f 100644

98

--- a/app-shells/bash/bash-4.1_p17.ebuild

99

+++ b/app-shells/bash/bash-4.1_p17.ebuild

100

@@ -71,7 +71,7 @@ src_prepare() {

101

 	# Clean out local libs so we know we use system ones

102

 	rm -rf lib/{readline,termcap}/* || die

103

 	touch lib/{readline,termcap}/Makefile.in || die # for config.status

104

-	sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die

105

+	sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die

106

107

 	default

108

109

110

diff --git a/app-shells/bash/bash-4.2_p53.ebuild b/app-shells/bash/bash-4.2_p53.ebuild

111

index 1e566e163ed..1ab928bd118 100644

112

--- a/app-shells/bash/bash-4.2_p53.ebuild

113

+++ b/app-shells/bash/bash-4.2_p53.ebuild

114

@@ -74,7 +74,7 @@ src_prepare() {

115

 	# Clean out local libs so we know we use system ones

116

 	rm -rf lib/{readline,termcap}/* || die

117

 	touch lib/{readline,termcap}/Makefile.in || die # for config.status

118

-	sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die

119

+	sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die

120

121

 	# Avoid regenerating docs after patches #407985

122

 	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die

123

124

diff --git a/app-shells/bash/bash-4.3_p48-r2.ebuild b/app-shells/bash/bash-4.3_p48-r2.ebuild

125

index d535737ea7e..bb767f76384 100644

126

--- a/app-shells/bash/bash-4.3_p48-r2.ebuild

127

+++ b/app-shells/bash/bash-4.3_p48-r2.ebuild

128

@@ -81,7 +81,7 @@ src_prepare() {

129

 	if [[ ${PV} != *_rc* ]] ; then

130

 		rm -rf lib/{readline,termcap}/* || die

131

 		touch lib/{readline,termcap}/Makefile.in || die # for config.status

132

-		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die

133

+		sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die

134

fi

135

136

 	# Avoid regenerating docs after patches #407985

137

138

diff --git a/app-shells/bash/bash-4.4_p23-r2.ebuild b/app-shells/bash/bash-4.4_p23-r2.ebuild

139

index 518e64ef49f..7e210e06b83 100644

140

--- a/app-shells/bash/bash-4.4_p23-r2.ebuild

141

+++ b/app-shells/bash/bash-4.4_p23-r2.ebuild

142

@@ -89,7 +89,7 @@ src_prepare() {

143

 	if is_release ; then

144

 		rm -rf lib/{readline,termcap}/* || die

145

 		touch lib/{readline,termcap}/Makefile.in || die # for config.status

146

-		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die

147

+		sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die

148

fi

149

150

 	# Prefixify hardcoded path names. No-op for non-prefix.

151

152

diff --git a/app-shells/bash/bash-5.0_p18.ebuild b/app-shells/bash/bash-5.0_p18.ebuild

153

index 37017ab2929..1b63b4bac05 100644

154

--- a/app-shells/bash/bash-5.0_p18.ebuild

155

+++ b/app-shells/bash/bash-5.0_p18.ebuild

156

@@ -92,7 +92,7 @@ src_prepare() {

157

 	if is_release ; then

158

 		rm -rf lib/{readline,termcap}/* || die

159

 		touch lib/{readline,termcap}/Makefile.in || die # for config.status

160

-		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die

161

+		sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die

162

fi

163

164

 	# Prefixify hardcoded path names. No-op for non-prefix.

1	commit: ba04c1e8c19c6e32fbb04705db227aeed983e8d9
2	Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3	AuthorDate: Sun Nov 29 19:03:55 2020 +0000
4	Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5	CommitDate: Sun Nov 29 19:11:35 2020 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba04c1e8
7
8	app-shells/bash: Backport system-readline sed fixes
9
10	Bug: https://bugs.gentoo.org/757519
11	Package-Manager: Portage-3.0.11, Repoman-3.0.2
12	Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
13
14	app-shells/bash/bash-2.05b_p13.ebuild \| 2 +-
15	app-shells/bash/bash-3.0_p22.ebuild \| 2 +-
16	app-shells/bash/bash-3.1_p23.ebuild \| 2 +-
17	app-shells/bash/bash-3.2_p57.ebuild \| 2 +-
18	app-shells/bash/bash-4.0_p44.ebuild \| 2 +-
19	app-shells/bash/bash-4.1_p17.ebuild \| 2 +-
20	app-shells/bash/bash-4.2_p53.ebuild \| 2 +-
21	app-shells/bash/bash-4.3_p48-r2.ebuild \| 2 +-
22	app-shells/bash/bash-4.4_p23-r2.ebuild \| 2 +-
23	app-shells/bash/bash-5.0_p18.ebuild \| 2 +-
24	10 files changed, 10 insertions(+), 10 deletions(-)
25
26	diff --git a/app-shells/bash/bash-2.05b_p13.ebuild b/app-shells/bash/bash-2.05b_p13.ebuild
27	index 9c9eb79db32..9c9e3fec805 100644
28	--- a/app-shells/bash/bash-2.05b_p13.ebuild
29	+++ b/app-shells/bash/bash-2.05b_p13.ebuild
30	@@ -76,7 +76,7 @@ src_prepare() {
31	# Clean out local libs so we know we use system ones
32	rm -rf lib/{readline,termcap}/* \|\| die
33	touch lib/{readline,termcap}/Makefile.in \|\| die # for config.status
34	- sed -ri -e 's:\$[(](RL\|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in \|\| die
35	+ sed -ri -e 's:\$[{(](RL\|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in \|\| die
36
37	default
38	}
39
40	diff --git a/app-shells/bash/bash-3.0_p22.ebuild b/app-shells/bash/bash-3.0_p22.ebuild
41	index 6437d45fb53..d6a10f4002e 100644
42	--- a/app-shells/bash/bash-3.0_p22.ebuild
43	+++ b/app-shells/bash/bash-3.0_p22.ebuild
44	@@ -79,7 +79,7 @@ src_prepare() {
45	# Clean out local libs so we know we use system ones
46	rm -rf lib/{readline,termcap}/* \|\| die
47	touch lib/{readline,termcap}/Makefile.in \|\| die # for config.status
48	- sed -ri -e 's:\$[(](RL\|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in \|\| die
49	+ sed -ri -e 's:\$[{(](RL\|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in \|\| die
50
51	default
52	}
53
54	diff --git a/app-shells/bash/bash-3.1_p23.ebuild b/app-shells/bash/bash-3.1_p23.ebuild
55	index ad1a7e46c42..cf6a8d6a93c 100644
56	--- a/app-shells/bash/bash-3.1_p23.ebuild
57	+++ b/app-shells/bash/bash-3.1_p23.ebuild
58	@@ -76,7 +76,7 @@ src_prepare() {
59	# Clean out local libs so we know we use system ones
60	rm -rf lib/{readline,termcap}/* \|\| die
61	touch lib/{readline,termcap}/Makefile.in \|\| die # for config.status
62	- sed -ri -e 's:\$[(](RL\|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in \|\| die
63	+ sed -ri -e 's:\$[{(](RL\|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in \|\| die
64
65	default
66	}
67
68	diff --git a/app-shells/bash/bash-3.2_p57.ebuild b/app-shells/bash/bash-3.2_p57.ebuild
69	index f555e3f03de..2a5bfa279ff 100644
70	--- a/app-shells/bash/bash-3.2_p57.ebuild
71	+++ b/app-shells/bash/bash-3.2_p57.ebuild
72	@@ -78,7 +78,7 @@ src_prepare() {
73	# Clean out local libs so we know we use system ones
74	rm -rf lib/{readline,termcap}/* \|\| die
75	touch lib/{readline,termcap}/Makefile.in \|\| die # for config.status
76	- sed -ri -e 's:\$[(](RL\|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in \|\| die
77	+ sed -ri -e 's:\$[{(](RL\|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in \|\| die
78
79	default
80	}
81
82	diff --git a/app-shells/bash/bash-4.0_p44.ebuild b/app-shells/bash/bash-4.0_p44.ebuild
83	index 560929519b5..878f660af57 100644
84	--- a/app-shells/bash/bash-4.0_p44.ebuild
85	+++ b/app-shells/bash/bash-4.0_p44.ebuild
86	@@ -75,7 +75,7 @@ src_prepare() {
87	# Clean out local libs so we know we use system ones
88	rm -rf lib/{readline,termcap}/* \|\| die
89	touch lib/{readline,termcap}/Makefile.in \|\| die # for config.status
90	- sed -ri -e 's:\$[(](RL\|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in \|\| die
91	+ sed -ri -e 's:\$[{(](RL\|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in \|\| die
92
93	default
94
95
96	diff --git a/app-shells/bash/bash-4.1_p17.ebuild b/app-shells/bash/bash-4.1_p17.ebuild
97	index 9c68ac62d28..198646cc65f 100644
98	--- a/app-shells/bash/bash-4.1_p17.ebuild
99	+++ b/app-shells/bash/bash-4.1_p17.ebuild
100	@@ -71,7 +71,7 @@ src_prepare() {
101	# Clean out local libs so we know we use system ones
102	rm -rf lib/{readline,termcap}/* \|\| die
103	touch lib/{readline,termcap}/Makefile.in \|\| die # for config.status
104	- sed -ri -e 's:\$[(](RL\|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in \|\| die
105	+ sed -ri -e 's:\$[{(](RL\|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in \|\| die
106
107	default
108
109
110	diff --git a/app-shells/bash/bash-4.2_p53.ebuild b/app-shells/bash/bash-4.2_p53.ebuild
111	index 1e566e163ed..1ab928bd118 100644
112	--- a/app-shells/bash/bash-4.2_p53.ebuild
113	+++ b/app-shells/bash/bash-4.2_p53.ebuild
114	@@ -74,7 +74,7 @@ src_prepare() {
115	# Clean out local libs so we know we use system ones
116	rm -rf lib/{readline,termcap}/* \|\| die
117	touch lib/{readline,termcap}/Makefile.in \|\| die # for config.status
118	- sed -ri -e 's:\$[(](RL\|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in \|\| die
119	+ sed -ri -e 's:\$[{(](RL\|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in \|\| die
120
121	# Avoid regenerating docs after patches #407985
122	sed -i -r '/^(HS\|RL)USER/s:=.*:=:' doc/Makefile.in \|\| die
123
124	diff --git a/app-shells/bash/bash-4.3_p48-r2.ebuild b/app-shells/bash/bash-4.3_p48-r2.ebuild
125	index d535737ea7e..bb767f76384 100644
126	--- a/app-shells/bash/bash-4.3_p48-r2.ebuild
127	+++ b/app-shells/bash/bash-4.3_p48-r2.ebuild
128	@@ -81,7 +81,7 @@ src_prepare() {
129	if [[ ${PV} != _rc ]] ; then
130	rm -rf lib/{readline,termcap}/* \|\| die
131	touch lib/{readline,termcap}/Makefile.in \|\| die # for config.status
132	- sed -ri -e 's:\$[(](RL\|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in \|\| die
133	+ sed -ri -e 's:\$[{(](RL\|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in \|\| die
134	fi
135
136	# Avoid regenerating docs after patches #407985
137
138	diff --git a/app-shells/bash/bash-4.4_p23-r2.ebuild b/app-shells/bash/bash-4.4_p23-r2.ebuild
139	index 518e64ef49f..7e210e06b83 100644
140	--- a/app-shells/bash/bash-4.4_p23-r2.ebuild
141	+++ b/app-shells/bash/bash-4.4_p23-r2.ebuild
142	@@ -89,7 +89,7 @@ src_prepare() {
143	if is_release ; then
144	rm -rf lib/{readline,termcap}/* \|\| die
145	touch lib/{readline,termcap}/Makefile.in \|\| die # for config.status
146	- sed -ri -e 's:\$[(](RL\|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in \|\| die
147	+ sed -ri -e 's:\$[{(](RL\|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in \|\| die
148	fi
149
150	# Prefixify hardcoded path names. No-op for non-prefix.
151
152	diff --git a/app-shells/bash/bash-5.0_p18.ebuild b/app-shells/bash/bash-5.0_p18.ebuild
153	index 37017ab2929..1b63b4bac05 100644
154	--- a/app-shells/bash/bash-5.0_p18.ebuild
155	+++ b/app-shells/bash/bash-5.0_p18.ebuild
156	@@ -92,7 +92,7 @@ src_prepare() {
157	if is_release ; then
158	rm -rf lib/{readline,termcap}/* \|\| die
159	touch lib/{readline,termcap}/Makefile.in \|\| die # for config.status
160	- sed -ri -e 's:\$[(](RL\|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in \|\| die
161	+ sed -ri -e 's:\$[{(](RL\|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in \|\| die
162	fi
163
164	# Prefixify hardcoded path names. No-op for non-prefix.

Gentoo Archives: gentoo-commits