[gentoo-commits] repo/gentoo:master commit in: sys-devel/binutils/ - gentoo-commits

From:	Mike Frysinger <vapier@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: sys-devel/binutils/
Date:	Thu, 06 Jan 2022 19:22:31
Message-Id:	`1641496901.7d7571d5d819862e37b48a88bca847a757399398.vapier@gentoo`

1

commit:     7d7571d5d819862e37b48a88bca847a757399398

2

Author:     Mike Frysinger <vapier <AT> chromium <DOT> org>

3

AuthorDate: Thu Jan  6 19:13:13 2022 +0000

4

Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>

5

CommitDate: Thu Jan  6 19:21:41 2022 +0000

6

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

7

8

sys-devel/binutils: use simpler shell test

9

10

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

11

12

 sys-devel/binutils/binutils-2.32-r2.ebuild    | 2 +-

13

 sys-devel/binutils/binutils-2.33.1-r1.ebuild  | 2 +-

14

 sys-devel/binutils/binutils-2.34-r2.ebuild    | 2 +-

15

 sys-devel/binutils/binutils-2.35.2.ebuild     | 2 +-

16

 sys-devel/binutils/binutils-2.36.1-r2.ebuild  | 2 +-

17

 sys-devel/binutils/binutils-2.37_p1-r1.ebuild | 2 +-

18

 sys-devel/binutils/binutils-2.37_p1.ebuild    | 2 +-

19

 sys-devel/binutils/binutils-9999.ebuild       | 2 +-

20

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

21

22

diff --git a/sys-devel/binutils/binutils-2.32-r2.ebuild b/sys-devel/binutils/binutils-2.32-r2.ebuild

23

index 0af482adee3a..40db4705c2a9 100644

24

--- a/sys-devel/binutils/binutils-2.32-r2.ebuild

25

+++ b/sys-devel/binutils/binutils-2.32-r2.ebuild

26

@@ -97,7 +97,7 @@ src_unpack() {

27

}

28

29

 src_prepare() {

30

-	if [[ ! -z ${PATCH_VER} ]] ; then

31

+	if [[ -n ${PATCH_VER} ]] ; then

32

 		# Use upstream patch to enable development mode

33

 		rm -v "${WORKDIR}/patch"/0000-Gentoo-Git-is-development.patch || die

34

35

36

diff --git a/sys-devel/binutils/binutils-2.33.1-r1.ebuild b/sys-devel/binutils/binutils-2.33.1-r1.ebuild

37

index 65720a202f5d..785ea17b6542 100644

38

--- a/sys-devel/binutils/binutils-2.33.1-r1.ebuild

39

+++ b/sys-devel/binutils/binutils-2.33.1-r1.ebuild

40

@@ -93,7 +93,7 @@ src_unpack() {

41

}

42

43

 src_prepare() {

44

-	if [[ ! -z ${PATCH_VER} ]] ; then

45

+	if [[ -n ${PATCH_VER} ]] ; then

46

 		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"

47

 		eapply "${WORKDIR}/patch"/*.patch

48

fi

49

50

diff --git a/sys-devel/binutils/binutils-2.34-r2.ebuild b/sys-devel/binutils/binutils-2.34-r2.ebuild

51

index e6087c134ba8..c61503139101 100644

52

--- a/sys-devel/binutils/binutils-2.34-r2.ebuild

53

+++ b/sys-devel/binutils/binutils-2.34-r2.ebuild

54

@@ -90,7 +90,7 @@ src_unpack() {

55

}

56

57

 src_prepare() {

58

-	if [[ ! -z ${PATCH_VER} ]] ; then

59

+	if [[ -n ${PATCH_VER} ]] ; then

60

 		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"

61

 		eapply "${WORKDIR}/patch"/*.patch

62

fi

63

64

diff --git a/sys-devel/binutils/binutils-2.35.2.ebuild b/sys-devel/binutils/binutils-2.35.2.ebuild

65

index f894e07dec7f..cdb4d4b87ec3 100644

66

--- a/sys-devel/binutils/binutils-2.35.2.ebuild

67

+++ b/sys-devel/binutils/binutils-2.35.2.ebuild

68

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

69

 		patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"

70

fi

71

72

-	if [[ ! -z ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then

73

+	if [[ -n ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then

74

 		if ! use vanilla; then

75

 			einfo "Applying binutils patchset ${patchsetname}"

76

 			eapply "${WORKDIR}/patch"

77

78

diff --git a/sys-devel/binutils/binutils-2.36.1-r2.ebuild b/sys-devel/binutils/binutils-2.36.1-r2.ebuild

79

index c1e7c2faf584..faa27e272c6c 100644

80

--- a/sys-devel/binutils/binutils-2.36.1-r2.ebuild

81

+++ b/sys-devel/binutils/binutils-2.36.1-r2.ebuild

82

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

83

 		patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"

84

fi

85

86

-	if [[ ! -z ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then

87

+	if [[ -n ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then

88

 		if ! use vanilla; then

89

 			einfo "Applying binutils patchset ${patchsetname}"

90

 			eapply "${WORKDIR}/patch"

91

92

diff --git a/sys-devel/binutils/binutils-2.37_p1-r1.ebuild b/sys-devel/binutils/binutils-2.37_p1-r1.ebuild

93

index 93c7ccdee616..2333d6b11deb 100644

94

--- a/sys-devel/binutils/binutils-2.37_p1-r1.ebuild

95

+++ b/sys-devel/binutils/binutils-2.37_p1-r1.ebuild

96

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

97

 		patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"

98

fi

99

100

-	if [[ ! -z ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then

101

+	if [[ -n ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then

102

 		if ! use vanilla; then

103

 			einfo "Applying binutils patchset ${patchsetname}"

104

 			eapply "${WORKDIR}/patch"

105

106

diff --git a/sys-devel/binutils/binutils-2.37_p1.ebuild b/sys-devel/binutils/binutils-2.37_p1.ebuild

107

index d9eb8d68712e..7bac92e076f5 100644

108

--- a/sys-devel/binutils/binutils-2.37_p1.ebuild

109

+++ b/sys-devel/binutils/binutils-2.37_p1.ebuild

110

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

111

 		patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"

112

fi

113

114

-	if [[ ! -z ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then

115

+	if [[ -n ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then

116

 		if ! use vanilla; then

117

 			einfo "Applying binutils patchset ${patchsetname}"

118

 			eapply "${WORKDIR}/patch"

119

120

diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild

121

index d3789f18d809..2609713b2a04 100644

122

--- a/sys-devel/binutils/binutils-9999.ebuild

123

+++ b/sys-devel/binutils/binutils-9999.ebuild

124

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

125

 		patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"

126

fi

127

128

-	if [[ ! -z ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then

129

+	if [[ -n ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then

130

 		if ! use vanilla; then

131

 			einfo "Applying binutils patchset ${patchsetname}"

132

 			eapply "${WORKDIR}/patch"

1	commit: 7d7571d5d819862e37b48a88bca847a757399398
2	Author: Mike Frysinger <vapier <AT> chromium <DOT> org>
3	AuthorDate: Thu Jan 6 19:13:13 2022 +0000
4	Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5	CommitDate: Thu Jan 6 19:21:41 2022 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d7571d5
7
8	sys-devel/binutils: use simpler shell test
9
10	Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
11
12	sys-devel/binutils/binutils-2.32-r2.ebuild \| 2 +-
13	sys-devel/binutils/binutils-2.33.1-r1.ebuild \| 2 +-
14	sys-devel/binutils/binutils-2.34-r2.ebuild \| 2 +-
15	sys-devel/binutils/binutils-2.35.2.ebuild \| 2 +-
16	sys-devel/binutils/binutils-2.36.1-r2.ebuild \| 2 +-
17	sys-devel/binutils/binutils-2.37_p1-r1.ebuild \| 2 +-
18	sys-devel/binutils/binutils-2.37_p1.ebuild \| 2 +-
19	sys-devel/binutils/binutils-9999.ebuild \| 2 +-
20	8 files changed, 8 insertions(+), 8 deletions(-)
21
22	diff --git a/sys-devel/binutils/binutils-2.32-r2.ebuild b/sys-devel/binutils/binutils-2.32-r2.ebuild
23	index 0af482adee3a..40db4705c2a9 100644
24	--- a/sys-devel/binutils/binutils-2.32-r2.ebuild
25	+++ b/sys-devel/binutils/binutils-2.32-r2.ebuild
26	@@ -97,7 +97,7 @@ src_unpack() {
27	}
28
29	src_prepare() {
30	- if [[ ! -z ${PATCH_VER} ]] ; then
31	+ if [[ -n ${PATCH_VER} ]] ; then
32	# Use upstream patch to enable development mode
33	rm -v "${WORKDIR}/patch"/0000-Gentoo-Git-is-development.patch \|\| die
34
35
36	diff --git a/sys-devel/binutils/binutils-2.33.1-r1.ebuild b/sys-devel/binutils/binutils-2.33.1-r1.ebuild
37	index 65720a202f5d..785ea17b6542 100644
38	--- a/sys-devel/binutils/binutils-2.33.1-r1.ebuild
39	+++ b/sys-devel/binutils/binutils-2.33.1-r1.ebuild
40	@@ -93,7 +93,7 @@ src_unpack() {
41	}
42
43	src_prepare() {
44	- if [[ ! -z ${PATCH_VER} ]] ; then
45	+ if [[ -n ${PATCH_VER} ]] ; then
46	einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
47	eapply "${WORKDIR}/patch"/*.patch
48	fi
49
50	diff --git a/sys-devel/binutils/binutils-2.34-r2.ebuild b/sys-devel/binutils/binutils-2.34-r2.ebuild
51	index e6087c134ba8..c61503139101 100644
52	--- a/sys-devel/binutils/binutils-2.34-r2.ebuild
53	+++ b/sys-devel/binutils/binutils-2.34-r2.ebuild
54	@@ -90,7 +90,7 @@ src_unpack() {
55	}
56
57	src_prepare() {
58	- if [[ ! -z ${PATCH_VER} ]] ; then
59	+ if [[ -n ${PATCH_VER} ]] ; then
60	einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
61	eapply "${WORKDIR}/patch"/*.patch
62	fi
63
64	diff --git a/sys-devel/binutils/binutils-2.35.2.ebuild b/sys-devel/binutils/binutils-2.35.2.ebuild
65	index f894e07dec7f..cdb4d4b87ec3 100644
66	--- a/sys-devel/binutils/binutils-2.35.2.ebuild
67	+++ b/sys-devel/binutils/binutils-2.35.2.ebuild
68	@@ -104,7 +104,7 @@ src_prepare() {
69	patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"
70	fi
71
72	- if [[ ! -z ${PATCH_VER} ]] \|\| [[ ${PV} == 9999* ]] ; then
73	+ if [[ -n ${PATCH_VER} ]] \|\| [[ ${PV} == 9999* ]] ; then
74	if ! use vanilla; then
75	einfo "Applying binutils patchset ${patchsetname}"
76	eapply "${WORKDIR}/patch"
77
78	diff --git a/sys-devel/binutils/binutils-2.36.1-r2.ebuild b/sys-devel/binutils/binutils-2.36.1-r2.ebuild
79	index c1e7c2faf584..faa27e272c6c 100644
80	--- a/sys-devel/binutils/binutils-2.36.1-r2.ebuild
81	+++ b/sys-devel/binutils/binutils-2.36.1-r2.ebuild
82	@@ -99,7 +99,7 @@ src_prepare() {
83	patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"
84	fi
85
86	- if [[ ! -z ${PATCH_VER} ]] \|\| [[ ${PV} == 9999* ]] ; then
87	+ if [[ -n ${PATCH_VER} ]] \|\| [[ ${PV} == 9999* ]] ; then
88	if ! use vanilla; then
89	einfo "Applying binutils patchset ${patchsetname}"
90	eapply "${WORKDIR}/patch"
91
92	diff --git a/sys-devel/binutils/binutils-2.37_p1-r1.ebuild b/sys-devel/binutils/binutils-2.37_p1-r1.ebuild
93	index 93c7ccdee616..2333d6b11deb 100644
94	--- a/sys-devel/binutils/binutils-2.37_p1-r1.ebuild
95	+++ b/sys-devel/binutils/binutils-2.37_p1-r1.ebuild
96	@@ -105,7 +105,7 @@ src_prepare() {
97	patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"
98	fi
99
100	- if [[ ! -z ${PATCH_VER} ]] \|\| [[ ${PV} == 9999* ]] ; then
101	+ if [[ -n ${PATCH_VER} ]] \|\| [[ ${PV} == 9999* ]] ; then
102	if ! use vanilla; then
103	einfo "Applying binutils patchset ${patchsetname}"
104	eapply "${WORKDIR}/patch"
105
106	diff --git a/sys-devel/binutils/binutils-2.37_p1.ebuild b/sys-devel/binutils/binutils-2.37_p1.ebuild
107	index d9eb8d68712e..7bac92e076f5 100644
108	--- a/sys-devel/binutils/binutils-2.37_p1.ebuild
109	+++ b/sys-devel/binutils/binutils-2.37_p1.ebuild
110	@@ -106,7 +106,7 @@ src_prepare() {
111	patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"
112	fi
113
114	- if [[ ! -z ${PATCH_VER} ]] \|\| [[ ${PV} == 9999* ]] ; then
115	+ if [[ -n ${PATCH_VER} ]] \|\| [[ ${PV} == 9999* ]] ; then
116	if ! use vanilla; then
117	einfo "Applying binutils patchset ${patchsetname}"
118	eapply "${WORKDIR}/patch"
119
120	diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
121	index d3789f18d809..2609713b2a04 100644
122	--- a/sys-devel/binutils/binutils-9999.ebuild
123	+++ b/sys-devel/binutils/binutils-9999.ebuild
124	@@ -106,7 +106,7 @@ src_prepare() {
125	patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"
126	fi
127
128	- if [[ ! -z ${PATCH_VER} ]] \|\| [[ ${PV} == 9999* ]] ; then
129	+ if [[ -n ${PATCH_VER} ]] \|\| [[ ${PV} == 9999* ]] ; then
130	if ! use vanilla; then
131	einfo "Applying binutils patchset ${patchsetname}"
132	eapply "${WORKDIR}/patch"

Gentoo Archives: gentoo-commits