[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/ - gentoo-commits

From:	Mike Gilbert <floppym@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/
Date:	Thu, 21 Sep 2017 21:06:12
Message-Id:	`1506027836.11f24667f843745a0a81b124d29d1e7b1bf91333.floppym@gentoo`

1

commit:     11f24667f843745a0a81b124d29d1e7b1bf91333

2

Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>

3

AuthorDate: Thu Sep 21 05:19:30 2017 +0000

4

Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>

5

CommitDate: Thu Sep 21 21:03:56 2017 +0000

6

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

7

8

sys-process/criu: Depend on || ( dev-python/protobuf-python dev-libs/protobuf[python] ).

9

10

 sys-process/criu/criu-2.10.ebuild   | 5 ++++-

11

 sys-process/criu/criu-2.11.1.ebuild | 5 ++++-

12

 sys-process/criu/criu-2.11.ebuild   | 5 ++++-

13

 sys-process/criu/criu-2.12.1.ebuild | 5 ++++-

14

 sys-process/criu/criu-2.12.ebuild   | 5 ++++-

15

 sys-process/criu/criu-2.5.ebuild    | 5 ++++-

16

 sys-process/criu/criu-3.4.ebuild    | 5 ++++-

17

 7 files changed, 28 insertions(+), 7 deletions(-)

18

19

diff --git a/sys-process/criu/criu-2.10.ebuild b/sys-process/criu/criu-2.10.ebuild

20

index fd0c92becf6..8478ddd0274 100644

21

--- a/sys-process/criu/criu-2.10.ebuild

22

+++ b/sys-process/criu/criu-2.10.ebuild

23

@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}

24

 	app-text/xmlto"

25

 RDEPEND="${RDEPEND}

26

 	python? (

27

-		dev-libs/protobuf[python,${PYTHON_USEDEP}]

28

+		|| (

29

+			dev-python/protobuf-python[${PYTHON_USEDEP}]

30

+			dev-libs/protobuf[python,${PYTHON_USEDEP}]

31

+		)

32

 		dev-python/ipaddr[${PYTHON_USEDEP}]

33

)"

34

35

36

diff --git a/sys-process/criu/criu-2.11.1.ebuild b/sys-process/criu/criu-2.11.1.ebuild

37

index fd0c92becf6..8478ddd0274 100644

38

--- a/sys-process/criu/criu-2.11.1.ebuild

39

+++ b/sys-process/criu/criu-2.11.1.ebuild

40

@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}

41

 	app-text/xmlto"

42

 RDEPEND="${RDEPEND}

43

 	python? (

44

-		dev-libs/protobuf[python,${PYTHON_USEDEP}]

45

+		|| (

46

+			dev-python/protobuf-python[${PYTHON_USEDEP}]

47

+			dev-libs/protobuf[python,${PYTHON_USEDEP}]

48

+		)

49

 		dev-python/ipaddr[${PYTHON_USEDEP}]

50

)"

51

52

53

diff --git a/sys-process/criu/criu-2.11.ebuild b/sys-process/criu/criu-2.11.ebuild

54

index fd0c92becf6..8478ddd0274 100644

55

--- a/sys-process/criu/criu-2.11.ebuild

56

+++ b/sys-process/criu/criu-2.11.ebuild

57

@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}

58

 	app-text/xmlto"

59

 RDEPEND="${RDEPEND}

60

 	python? (

61

-		dev-libs/protobuf[python,${PYTHON_USEDEP}]

62

+		|| (

63

+			dev-python/protobuf-python[${PYTHON_USEDEP}]

64

+			dev-libs/protobuf[python,${PYTHON_USEDEP}]

65

+		)

66

 		dev-python/ipaddr[${PYTHON_USEDEP}]

67

)"

68

69

70

diff --git a/sys-process/criu/criu-2.12.1.ebuild b/sys-process/criu/criu-2.12.1.ebuild

71

index 76b63750a52..dcaf87f2ca3 100644

72

--- a/sys-process/criu/criu-2.12.1.ebuild

73

+++ b/sys-process/criu/criu-2.12.1.ebuild

74

@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}

75

 	app-text/xmlto"

76

 RDEPEND="${RDEPEND}

77

 	python? (

78

-		dev-libs/protobuf[python,${PYTHON_USEDEP}]

79

+		|| (

80

+			dev-python/protobuf-python[${PYTHON_USEDEP}]

81

+			dev-libs/protobuf[python,${PYTHON_USEDEP}]

82

+		)

83

 		dev-python/ipaddr[${PYTHON_USEDEP}]

84

)"

85

86

87

diff --git a/sys-process/criu/criu-2.12.ebuild b/sys-process/criu/criu-2.12.ebuild

88

index fd0c92becf6..8478ddd0274 100644

89

--- a/sys-process/criu/criu-2.12.ebuild

90

+++ b/sys-process/criu/criu-2.12.ebuild

91

@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}

92

 	app-text/xmlto"

93

 RDEPEND="${RDEPEND}

94

 	python? (

95

-		dev-libs/protobuf[python,${PYTHON_USEDEP}]

96

+		|| (

97

+			dev-python/protobuf-python[${PYTHON_USEDEP}]

98

+			dev-libs/protobuf[python,${PYTHON_USEDEP}]

99

+		)

100

 		dev-python/ipaddr[${PYTHON_USEDEP}]

101

)"

102

103

104

diff --git a/sys-process/criu/criu-2.5.ebuild b/sys-process/criu/criu-2.5.ebuild

105

index ed448fa13e2..c234bdc1508 100644

106

--- a/sys-process/criu/criu-2.5.ebuild

107

+++ b/sys-process/criu/criu-2.5.ebuild

108

@@ -27,7 +27,10 @@ DEPEND="${RDEPEND}

109

 	app-text/xmlto"

110

 RDEPEND="${RDEPEND}

111

 	python? (

112

-		dev-libs/protobuf[python,${PYTHON_USEDEP}]

113

+		|| (

114

+			dev-python/protobuf-python[${PYTHON_USEDEP}]

115

+			dev-libs/protobuf[python,${PYTHON_USEDEP}]

116

+		)

117

 		dev-python/ipaddr[${PYTHON_USEDEP}]

118

)"

119

120

121

diff --git a/sys-process/criu/criu-3.4.ebuild b/sys-process/criu/criu-3.4.ebuild

122

index 982954a66c3..2aec9b89b4a 100644

123

--- a/sys-process/criu/criu-3.4.ebuild

124

+++ b/sys-process/criu/criu-3.4.ebuild

125

@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}

126

 	app-text/xmlto"

127

 RDEPEND="${RDEPEND}

128

 	python? (

129

-		dev-libs/protobuf[python,${PYTHON_USEDEP}]

130

+		|| (

131

+			dev-python/protobuf-python[${PYTHON_USEDEP}]

132

+			dev-libs/protobuf[python,${PYTHON_USEDEP}]

133

+		)

134

 		dev-python/ipaddr[${PYTHON_USEDEP}]

135

)"

1	commit: 11f24667f843745a0a81b124d29d1e7b1bf91333
2	Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3	AuthorDate: Thu Sep 21 05:19:30 2017 +0000
4	Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5	CommitDate: Thu Sep 21 21:03:56 2017 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11f24667
7
8	sys-process/criu: Depend on \|\| ( dev-python/protobuf-python dev-libs/protobuf[python] ).
9
10	sys-process/criu/criu-2.10.ebuild \| 5 ++++-
11	sys-process/criu/criu-2.11.1.ebuild \| 5 ++++-
12	sys-process/criu/criu-2.11.ebuild \| 5 ++++-
13	sys-process/criu/criu-2.12.1.ebuild \| 5 ++++-
14	sys-process/criu/criu-2.12.ebuild \| 5 ++++-
15	sys-process/criu/criu-2.5.ebuild \| 5 ++++-
16	sys-process/criu/criu-3.4.ebuild \| 5 ++++-
17	7 files changed, 28 insertions(+), 7 deletions(-)
18
19	diff --git a/sys-process/criu/criu-2.10.ebuild b/sys-process/criu/criu-2.10.ebuild
20	index fd0c92becf6..8478ddd0274 100644
21	--- a/sys-process/criu/criu-2.10.ebuild
22	+++ b/sys-process/criu/criu-2.10.ebuild
23	@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}
24	app-text/xmlto"
25	RDEPEND="${RDEPEND}
26	python? (
27	- dev-libs/protobuf[python,${PYTHON_USEDEP}]
28	+ \|\| (
29	+ dev-python/protobuf-python[${PYTHON_USEDEP}]
30	+ dev-libs/protobuf[python,${PYTHON_USEDEP}]
31	+ )
32	dev-python/ipaddr[${PYTHON_USEDEP}]
33	)"
34
35
36	diff --git a/sys-process/criu/criu-2.11.1.ebuild b/sys-process/criu/criu-2.11.1.ebuild
37	index fd0c92becf6..8478ddd0274 100644
38	--- a/sys-process/criu/criu-2.11.1.ebuild
39	+++ b/sys-process/criu/criu-2.11.1.ebuild
40	@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}
41	app-text/xmlto"
42	RDEPEND="${RDEPEND}
43	python? (
44	- dev-libs/protobuf[python,${PYTHON_USEDEP}]
45	+ \|\| (
46	+ dev-python/protobuf-python[${PYTHON_USEDEP}]
47	+ dev-libs/protobuf[python,${PYTHON_USEDEP}]
48	+ )
49	dev-python/ipaddr[${PYTHON_USEDEP}]
50	)"
51
52
53	diff --git a/sys-process/criu/criu-2.11.ebuild b/sys-process/criu/criu-2.11.ebuild
54	index fd0c92becf6..8478ddd0274 100644
55	--- a/sys-process/criu/criu-2.11.ebuild
56	+++ b/sys-process/criu/criu-2.11.ebuild
57	@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}
58	app-text/xmlto"
59	RDEPEND="${RDEPEND}
60	python? (
61	- dev-libs/protobuf[python,${PYTHON_USEDEP}]
62	+ \|\| (
63	+ dev-python/protobuf-python[${PYTHON_USEDEP}]
64	+ dev-libs/protobuf[python,${PYTHON_USEDEP}]
65	+ )
66	dev-python/ipaddr[${PYTHON_USEDEP}]
67	)"
68
69
70	diff --git a/sys-process/criu/criu-2.12.1.ebuild b/sys-process/criu/criu-2.12.1.ebuild
71	index 76b63750a52..dcaf87f2ca3 100644
72	--- a/sys-process/criu/criu-2.12.1.ebuild
73	+++ b/sys-process/criu/criu-2.12.1.ebuild
74	@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}
75	app-text/xmlto"
76	RDEPEND="${RDEPEND}
77	python? (
78	- dev-libs/protobuf[python,${PYTHON_USEDEP}]
79	+ \|\| (
80	+ dev-python/protobuf-python[${PYTHON_USEDEP}]
81	+ dev-libs/protobuf[python,${PYTHON_USEDEP}]
82	+ )
83	dev-python/ipaddr[${PYTHON_USEDEP}]
84	)"
85
86
87	diff --git a/sys-process/criu/criu-2.12.ebuild b/sys-process/criu/criu-2.12.ebuild
88	index fd0c92becf6..8478ddd0274 100644
89	--- a/sys-process/criu/criu-2.12.ebuild
90	+++ b/sys-process/criu/criu-2.12.ebuild
91	@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}
92	app-text/xmlto"
93	RDEPEND="${RDEPEND}
94	python? (
95	- dev-libs/protobuf[python,${PYTHON_USEDEP}]
96	+ \|\| (
97	+ dev-python/protobuf-python[${PYTHON_USEDEP}]
98	+ dev-libs/protobuf[python,${PYTHON_USEDEP}]
99	+ )
100	dev-python/ipaddr[${PYTHON_USEDEP}]
101	)"
102
103
104	diff --git a/sys-process/criu/criu-2.5.ebuild b/sys-process/criu/criu-2.5.ebuild
105	index ed448fa13e2..c234bdc1508 100644
106	--- a/sys-process/criu/criu-2.5.ebuild
107	+++ b/sys-process/criu/criu-2.5.ebuild
108	@@ -27,7 +27,10 @@ DEPEND="${RDEPEND}
109	app-text/xmlto"
110	RDEPEND="${RDEPEND}
111	python? (
112	- dev-libs/protobuf[python,${PYTHON_USEDEP}]
113	+ \|\| (
114	+ dev-python/protobuf-python[${PYTHON_USEDEP}]
115	+ dev-libs/protobuf[python,${PYTHON_USEDEP}]
116	+ )
117	dev-python/ipaddr[${PYTHON_USEDEP}]
118	)"
119
120
121	diff --git a/sys-process/criu/criu-3.4.ebuild b/sys-process/criu/criu-3.4.ebuild
122	index 982954a66c3..2aec9b89b4a 100644
123	--- a/sys-process/criu/criu-3.4.ebuild
124	+++ b/sys-process/criu/criu-3.4.ebuild
125	@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}
126	app-text/xmlto"
127	RDEPEND="${RDEPEND}
128	python? (
129	- dev-libs/protobuf[python,${PYTHON_USEDEP}]
130	+ \|\| (
131	+ dev-python/protobuf-python[${PYTHON_USEDEP}]
132	+ dev-libs/protobuf[python,${PYTHON_USEDEP}]
133	+ )
134	dev-python/ipaddr[${PYTHON_USEDEP}]
135	)"

Gentoo Archives: gentoo-commits