[gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/ - gentoo-commits

From:	"Michał Górny" <mgorny@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/
Date:	Sun, 26 Aug 2018 09:39:48
Message-Id:	`1535274313.7ab2aa6670197fcd97244b359ca98d8ab847e3ba.mgorny@gentoo`

1

commit:     7ab2aa6670197fcd97244b359ca98d8ab847e3ba

2

Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>

3

AuthorDate: Sun Aug 26 09:05:13 2018 +0000

4

Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>

5

CommitDate: Sun Aug 26 09:05:13 2018 +0000

6

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

7

8

dev-lang/scala: Remove support for non-existent deps

9

10

 dev-lang/scala/scala-2.11.1-r2.ebuild | 4 ++--

11

 dev-lang/scala/scala-2.11.11.ebuild   | 4 ++--

12

 dev-lang/scala/scala-2.11.2-r2.ebuild | 4 ++--

13

 dev-lang/scala/scala-2.11.4-r1.ebuild | 4 ++--

14

 dev-lang/scala/scala-2.11.4-r2.ebuild | 4 ++--

15

 dev-lang/scala/scala-2.11.6-r1.ebuild | 4 ++--

16

 dev-lang/scala/scala-2.11.7-r1.ebuild | 4 ++--

17

 dev-lang/scala/scala-2.11.8.ebuild    | 4 ++--

18

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

19

20

diff --git a/dev-lang/scala/scala-2.11.1-r2.ebuild b/dev-lang/scala/scala-2.11.1-r2.ebuild

21

index e2bdb4138ba..3c4def15b54 100644

22

--- a/dev-lang/scala/scala-2.11.1-r2.ebuild

23

+++ b/dev-lang/scala/scala-2.11.1-r2.ebuild

24

@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0

25

26

 DEPEND="${COMMON_DEP}

27

 	!binary? (

28

-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )

29

+		=virtual/jdk-1.8*

30

 		dev-java/ant-core:0

31

 		dev-java/ant-contrib:0

32

 		dev-java/ant-nodeps:0

33

 		media-gfx/graphviz

34

)

35

 	binary? (

36

-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )

37

+		=virtual/jdk-1.8*

38

)

39

 	app-arch/xz-utils:0"

40

41

42

diff --git a/dev-lang/scala/scala-2.11.11.ebuild b/dev-lang/scala/scala-2.11.11.ebuild

43

index 40bafa3a7db..563b35b0521 100644

44

--- a/dev-lang/scala/scala-2.11.11.ebuild

45

+++ b/dev-lang/scala/scala-2.11.11.ebuild

46

@@ -73,14 +73,14 @@ COMMON_DEP="dev-java/ant-core:0

47

48

 DEPEND="${COMMON_DEP}

49

 	!binary? (

50

-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )

51

+		=virtual/jdk-1.8*

52

 		dev-java/ant-core:0

53

 		dev-java/ant-contrib:0

54

 		dev-java/ant-nodeps:0

55

 		media-gfx/graphviz

56

)

57

 	binary? (

58

-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )

59

+		=virtual/jdk-1.8*

60

)

61

 	app-arch/xz-utils:0"

62

63

64

diff --git a/dev-lang/scala/scala-2.11.2-r2.ebuild b/dev-lang/scala/scala-2.11.2-r2.ebuild

65

index 200cda5accd..443769b797d 100644

66

--- a/dev-lang/scala/scala-2.11.2-r2.ebuild

67

+++ b/dev-lang/scala/scala-2.11.2-r2.ebuild

68

@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0

69

70

 DEPEND="${COMMON_DEP}

71

 	!binary? (

72

-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )

73

+		=virtual/jdk-1.8*

74

 		dev-java/ant-core:0

75

 		dev-java/ant-contrib:0

76

 		dev-java/ant-nodeps:0

77

 		media-gfx/graphviz

78

)

79

 	binary? (

80

-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )

81

+		=virtual/jdk-1.8*

82

)

83

 	app-arch/xz-utils:0"

84

85

86

diff --git a/dev-lang/scala/scala-2.11.4-r1.ebuild b/dev-lang/scala/scala-2.11.4-r1.ebuild

87

index 5ff29fa215e..eacdf857425 100644

88

--- a/dev-lang/scala/scala-2.11.4-r1.ebuild

89

+++ b/dev-lang/scala/scala-2.11.4-r1.ebuild

90

@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0

91

92

 DEPEND="${COMMON_DEP}

93

 	!binary? (

94

-		|| ( =virtual/jdk-1.6* =virtual/jdk-1.7* =virtual/jdk-1.8* )

95

+		=virtual/jdk-1.8*

96

 		dev-java/ant-core:0

97

 		dev-java/ant-contrib:0

98

 		dev-java/ant-nodeps:0

99

 		media-gfx/graphviz

100

)

101

 	binary? (

102

-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )

103

+		=virtual/jdk-1.8*

104

)

105

 	app-arch/xz-utils:0"

106

107

108

diff --git a/dev-lang/scala/scala-2.11.4-r2.ebuild b/dev-lang/scala/scala-2.11.4-r2.ebuild

109

index 6015a9c1b7c..e9dd2fb848f 100644

110

--- a/dev-lang/scala/scala-2.11.4-r2.ebuild

111

+++ b/dev-lang/scala/scala-2.11.4-r2.ebuild

112

@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0

113

114

 DEPEND="${COMMON_DEP}

115

 	!binary? (

116

-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )

117

+		=virtual/jdk-1.8*

118

 		dev-java/ant-core:0

119

 		dev-java/ant-contrib:0

120

 		dev-java/ant-nodeps:0

121

 		media-gfx/graphviz

122

)

123

 	binary? (

124

-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )

125

+		=virtual/jdk-1.8*

126

)

127

 	app-arch/xz-utils:0"

128

129

130

diff --git a/dev-lang/scala/scala-2.11.6-r1.ebuild b/dev-lang/scala/scala-2.11.6-r1.ebuild

131

index b31e50091cd..50afdf2a1a2 100644

132

--- a/dev-lang/scala/scala-2.11.6-r1.ebuild

133

+++ b/dev-lang/scala/scala-2.11.6-r1.ebuild

134

@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0

135

136

 DEPEND="${COMMON_DEP}

137

 	!binary? (

138

-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )

139

+		=virtual/jdk-1.8*

140

 		dev-java/ant-core:0

141

 		dev-java/ant-contrib:0

142

 		dev-java/ant-nodeps:0

143

 		media-gfx/graphviz

144

)

145

 	binary? (

146

-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )

147

+		=virtual/jdk-1.8*

148

)

149

 	app-arch/xz-utils:0"

150

151

152

diff --git a/dev-lang/scala/scala-2.11.7-r1.ebuild b/dev-lang/scala/scala-2.11.7-r1.ebuild

153

index 25ec70aafff..1b9b10ab12b 100644

154

--- a/dev-lang/scala/scala-2.11.7-r1.ebuild

155

+++ b/dev-lang/scala/scala-2.11.7-r1.ebuild

156

@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0

157

158

 DEPEND="${COMMON_DEP}

159

 	!binary? (

160

-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )

161

+		=virtual/jdk-1.8*

162

 		dev-java/ant-core:0

163

 		dev-java/ant-contrib:0

164

 		dev-java/ant-nodeps:0

165

 		media-gfx/graphviz

166

)

167

 	binary? (

168

-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )

169

+		=virtual/jdk-1.8*

170

)

171

 	app-arch/xz-utils:0"

172

173

174

diff --git a/dev-lang/scala/scala-2.11.8.ebuild b/dev-lang/scala/scala-2.11.8.ebuild

175

index ae3518042cf..8ba79236888 100644

176

--- a/dev-lang/scala/scala-2.11.8.ebuild

177

+++ b/dev-lang/scala/scala-2.11.8.ebuild

178

@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0

179

180

 DEPEND="${COMMON_DEP}

181

 	!binary? (

182

-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )

183

+		=virtual/jdk-1.8*

184

 		dev-java/ant-core:0

185

 		dev-java/ant-contrib:0

186

 		dev-java/ant-nodeps:0

187

 		media-gfx/graphviz

188

)

189

 	binary? (

190

-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )

191

+		=virtual/jdk-1.8*

192

)

193

 	app-arch/xz-utils:0"

1	commit: 7ab2aa6670197fcd97244b359ca98d8ab847e3ba
2	Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3	AuthorDate: Sun Aug 26 09:05:13 2018 +0000
4	Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5	CommitDate: Sun Aug 26 09:05:13 2018 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ab2aa66
7
8	dev-lang/scala: Remove support for non-existent deps
9
10	dev-lang/scala/scala-2.11.1-r2.ebuild \| 4 ++--
11	dev-lang/scala/scala-2.11.11.ebuild \| 4 ++--
12	dev-lang/scala/scala-2.11.2-r2.ebuild \| 4 ++--
13	dev-lang/scala/scala-2.11.4-r1.ebuild \| 4 ++--
14	dev-lang/scala/scala-2.11.4-r2.ebuild \| 4 ++--
15	dev-lang/scala/scala-2.11.6-r1.ebuild \| 4 ++--
16	dev-lang/scala/scala-2.11.7-r1.ebuild \| 4 ++--
17	dev-lang/scala/scala-2.11.8.ebuild \| 4 ++--
18	8 files changed, 16 insertions(+), 16 deletions(-)
19
20	diff --git a/dev-lang/scala/scala-2.11.1-r2.ebuild b/dev-lang/scala/scala-2.11.1-r2.ebuild
21	index e2bdb4138ba..3c4def15b54 100644
22	--- a/dev-lang/scala/scala-2.11.1-r2.ebuild
23	+++ b/dev-lang/scala/scala-2.11.1-r2.ebuild
24	@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0
25
26	DEPEND="${COMMON_DEP}
27	!binary? (
28	- \|\| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
29	+ =virtual/jdk-1.8*
30	dev-java/ant-core:0
31	dev-java/ant-contrib:0
32	dev-java/ant-nodeps:0
33	media-gfx/graphviz
34	)
35	binary? (
36	- \|\| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
37	+ =virtual/jdk-1.8*
38	)
39	app-arch/xz-utils:0"
40
41
42	diff --git a/dev-lang/scala/scala-2.11.11.ebuild b/dev-lang/scala/scala-2.11.11.ebuild
43	index 40bafa3a7db..563b35b0521 100644
44	--- a/dev-lang/scala/scala-2.11.11.ebuild
45	+++ b/dev-lang/scala/scala-2.11.11.ebuild
46	@@ -73,14 +73,14 @@ COMMON_DEP="dev-java/ant-core:0
47
48	DEPEND="${COMMON_DEP}
49	!binary? (
50	- \|\| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
51	+ =virtual/jdk-1.8*
52	dev-java/ant-core:0
53	dev-java/ant-contrib:0
54	dev-java/ant-nodeps:0
55	media-gfx/graphviz
56	)
57	binary? (
58	- \|\| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
59	+ =virtual/jdk-1.8*
60	)
61	app-arch/xz-utils:0"
62
63
64	diff --git a/dev-lang/scala/scala-2.11.2-r2.ebuild b/dev-lang/scala/scala-2.11.2-r2.ebuild
65	index 200cda5accd..443769b797d 100644
66	--- a/dev-lang/scala/scala-2.11.2-r2.ebuild
67	+++ b/dev-lang/scala/scala-2.11.2-r2.ebuild
68	@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0
69
70	DEPEND="${COMMON_DEP}
71	!binary? (
72	- \|\| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
73	+ =virtual/jdk-1.8*
74	dev-java/ant-core:0
75	dev-java/ant-contrib:0
76	dev-java/ant-nodeps:0
77	media-gfx/graphviz
78	)
79	binary? (
80	- \|\| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
81	+ =virtual/jdk-1.8*
82	)
83	app-arch/xz-utils:0"
84
85
86	diff --git a/dev-lang/scala/scala-2.11.4-r1.ebuild b/dev-lang/scala/scala-2.11.4-r1.ebuild
87	index 5ff29fa215e..eacdf857425 100644
88	--- a/dev-lang/scala/scala-2.11.4-r1.ebuild
89	+++ b/dev-lang/scala/scala-2.11.4-r1.ebuild
90	@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0
91
92	DEPEND="${COMMON_DEP}
93	!binary? (
94	- \|\| ( =virtual/jdk-1.6* =virtual/jdk-1.7* =virtual/jdk-1.8* )
95	+ =virtual/jdk-1.8*
96	dev-java/ant-core:0
97	dev-java/ant-contrib:0
98	dev-java/ant-nodeps:0
99	media-gfx/graphviz
100	)
101	binary? (
102	- \|\| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
103	+ =virtual/jdk-1.8*
104	)
105	app-arch/xz-utils:0"
106
107
108	diff --git a/dev-lang/scala/scala-2.11.4-r2.ebuild b/dev-lang/scala/scala-2.11.4-r2.ebuild
109	index 6015a9c1b7c..e9dd2fb848f 100644
110	--- a/dev-lang/scala/scala-2.11.4-r2.ebuild
111	+++ b/dev-lang/scala/scala-2.11.4-r2.ebuild
112	@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0
113
114	DEPEND="${COMMON_DEP}
115	!binary? (
116	- \|\| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
117	+ =virtual/jdk-1.8*
118	dev-java/ant-core:0
119	dev-java/ant-contrib:0
120	dev-java/ant-nodeps:0
121	media-gfx/graphviz
122	)
123	binary? (
124	- \|\| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
125	+ =virtual/jdk-1.8*
126	)
127	app-arch/xz-utils:0"
128
129
130	diff --git a/dev-lang/scala/scala-2.11.6-r1.ebuild b/dev-lang/scala/scala-2.11.6-r1.ebuild
131	index b31e50091cd..50afdf2a1a2 100644
132	--- a/dev-lang/scala/scala-2.11.6-r1.ebuild
133	+++ b/dev-lang/scala/scala-2.11.6-r1.ebuild
134	@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0
135
136	DEPEND="${COMMON_DEP}
137	!binary? (
138	- \|\| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
139	+ =virtual/jdk-1.8*
140	dev-java/ant-core:0
141	dev-java/ant-contrib:0
142	dev-java/ant-nodeps:0
143	media-gfx/graphviz
144	)
145	binary? (
146	- \|\| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
147	+ =virtual/jdk-1.8*
148	)
149	app-arch/xz-utils:0"
150
151
152	diff --git a/dev-lang/scala/scala-2.11.7-r1.ebuild b/dev-lang/scala/scala-2.11.7-r1.ebuild
153	index 25ec70aafff..1b9b10ab12b 100644
154	--- a/dev-lang/scala/scala-2.11.7-r1.ebuild
155	+++ b/dev-lang/scala/scala-2.11.7-r1.ebuild
156	@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0
157
158	DEPEND="${COMMON_DEP}
159	!binary? (
160	- \|\| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
161	+ =virtual/jdk-1.8*
162	dev-java/ant-core:0
163	dev-java/ant-contrib:0
164	dev-java/ant-nodeps:0
165	media-gfx/graphviz
166	)
167	binary? (
168	- \|\| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
169	+ =virtual/jdk-1.8*
170	)
171	app-arch/xz-utils:0"
172
173
174	diff --git a/dev-lang/scala/scala-2.11.8.ebuild b/dev-lang/scala/scala-2.11.8.ebuild
175	index ae3518042cf..8ba79236888 100644
176	--- a/dev-lang/scala/scala-2.11.8.ebuild
177	+++ b/dev-lang/scala/scala-2.11.8.ebuild
178	@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0
179
180	DEPEND="${COMMON_DEP}
181	!binary? (
182	- \|\| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
183	+ =virtual/jdk-1.8*
184	dev-java/ant-core:0
185	dev-java/ant-contrib:0
186	dev-java/ant-nodeps:0
187	media-gfx/graphviz
188	)
189	binary? (
190	- \|\| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
191	+ =virtual/jdk-1.8*
192	)
193	app-arch/xz-utils:0"

Gentoo Archives: gentoo-commits