[gentoo-commits] repo/gentoo:master commit in: net-print/hplip/ - gentoo-commits

From:	"Michał Górny" <mgorny@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: net-print/hplip/
Date:	Sun, 09 Feb 2020 16:34:43
Message-Id:	`1581266056.3fd146ede028edfb103f117e53e6ef2dfc73a792.mgorny@gentoo`

1

commit:     3fd146ede028edfb103f117e53e6ef2dfc73a792

2

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

3

AuthorDate: Fri Feb  7 17:32:56 2020 +0000

4

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

5

CommitDate: Sun Feb  9 16:34:16 2020 +0000

6

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

7

8

net-print/hplip: Switch to PYTHON_MULTI_USEDEP API

9

10

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

11

12

 ...plip-3.18.12.ebuild => hplip-3.18.12-r1.ebuild} | 36 ++++++++++++----------

13

 net-print/hplip/hplip-3.19.11.ebuild               | 36 ++++++++++++----------

14

 ...plip-3.19.12.ebuild => hplip-3.19.12-r1.ebuild} | 36 ++++++++++++----------

15

 3 files changed, 57 insertions(+), 51 deletions(-)

16

17

diff --git a/net-print/hplip/hplip-3.18.12.ebuild b/net-print/hplip/hplip-3.18.12-r1.ebuild

18

similarity index 91%

19

rename from net-print/hplip/hplip-3.18.12.ebuild

20

rename to net-print/hplip/hplip-3.18.12-r1.ebuild

21

index b28c7ba4201..6c7b5ccefb0 100644

22

--- a/net-print/hplip/hplip-3.18.12.ebuild

23

+++ b/net-print/hplip/hplip-3.18.12-r1.ebuild

24

@@ -49,26 +49,28 @@ RDEPEND="

25

 	${COMMON_DEPEND}

26

 	app-text/ghostscript-gpl

27

 	!minimal? (

28

-		>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]

29

-		$(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*')

30

-		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')

31

-		fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )

32

+		$(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]' 'python2*')

33

+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' 'python3*')

34

 		kernel_linux? ( virtual/udev )

35

-		qt5? (

36

-			>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}]

37

-			libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] )

38

-		)

39

-		scanner? (

40

-			>=dev-python/reportlab-3.2[${PYTHON_USEDEP}]

41

-			>=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]

42

-			X? (

43

-				|| (

44

-					kde? ( kde-misc/skanlite )

45

-					media-gfx/xsane

46

-					media-gfx/sane-frontends

47

+		$(python_gen_cond_dep '

48

+			>=dev-python/dbus-python-1.2.0-r1[${PYTHON_MULTI_USEDEP}]

49

+			fax? ( dev-python/reportlab[${PYTHON_MULTI_USEDEP}] )

50

+			qt5? (

51

+				>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_MULTI_USEDEP}]

52

+				libnotify? ( dev-python/notify2[${PYTHON_MULTI_USEDEP}] )

53

+			)

54

+			scanner? (

55

+				>=dev-python/reportlab-3.2[${PYTHON_MULTI_USEDEP}]

56

+				>=dev-python/pillow-3.1.1[${PYTHON_MULTI_USEDEP}]

57

+				X? (

58

+					|| (

59

+						kde? ( kde-misc/skanlite )

60

+						media-gfx/xsane

61

+						media-gfx/sane-frontends

62

+					)

63

)

64

)

65

-		)

66

+		')

67

)

68

 	policykit? ( sys-auth/polkit )

69

"

70

71

diff --git a/net-print/hplip/hplip-3.19.11.ebuild b/net-print/hplip/hplip-3.19.11.ebuild

72

index 83e3e5a4611..0d2eb10db37 100644

73

--- a/net-print/hplip/hplip-3.19.11.ebuild

74

+++ b/net-print/hplip/hplip-3.19.11.ebuild

75

@@ -49,26 +49,28 @@ RDEPEND="

76

 	${COMMON_DEPEND}

77

 	app-text/ghostscript-gpl

78

 	!minimal? (

79

-		>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]

80

-		$(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*')

81

-		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')

82

-		fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )

83

+		$(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]' 'python2*')

84

+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' 'python3*')

85

 		kernel_linux? ( virtual/udev )

86

-		qt5? (

87

-			>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}]

88

-			libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] )

89

-		)

90

-		scanner? (

91

-			>=dev-python/reportlab-3.2[${PYTHON_USEDEP}]

92

-			>=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]

93

-			X? (

94

-				|| (

95

-					kde? ( kde-misc/skanlite )

96

-					media-gfx/xsane

97

-					media-gfx/sane-frontends

98

+		$(python_gen_cond_dep '

99

+			>=dev-python/dbus-python-1.2.0-r1[${PYTHON_MULTI_USEDEP}]

100

+			fax? ( dev-python/reportlab[${PYTHON_MULTI_USEDEP}] )

101

+			qt5? (

102

+				>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_MULTI_USEDEP}]

103

+				libnotify? ( dev-python/notify2[${PYTHON_MULTI_USEDEP}] )

104

+			)

105

+			scanner? (

106

+				>=dev-python/reportlab-3.2[${PYTHON_MULTI_USEDEP}]

107

+				>=dev-python/pillow-3.1.1[${PYTHON_MULTI_USEDEP}]

108

+				X? (

109

+					|| (

110

+						kde? ( kde-misc/skanlite )

111

+						media-gfx/xsane

112

+						media-gfx/sane-frontends

113

+					)

114

)

115

)

116

-		)

117

+		')

118

)

119

 	policykit? ( sys-auth/polkit )

120

"

121

122

diff --git a/net-print/hplip/hplip-3.19.12.ebuild b/net-print/hplip/hplip-3.19.12-r1.ebuild

123

similarity index 91%

124

rename from net-print/hplip/hplip-3.19.12.ebuild

125

rename to net-print/hplip/hplip-3.19.12-r1.ebuild

126

index 83e3e5a4611..0d2eb10db37 100644

127

--- a/net-print/hplip/hplip-3.19.12.ebuild

128

+++ b/net-print/hplip/hplip-3.19.12-r1.ebuild

129

@@ -49,26 +49,28 @@ RDEPEND="

130

 	${COMMON_DEPEND}

131

 	app-text/ghostscript-gpl

132

 	!minimal? (

133

-		>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]

134

-		$(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*')

135

-		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')

136

-		fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )

137

+		$(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]' 'python2*')

138

+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' 'python3*')

139

 		kernel_linux? ( virtual/udev )

140

-		qt5? (

141

-			>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}]

142

-			libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] )

143

-		)

144

-		scanner? (

145

-			>=dev-python/reportlab-3.2[${PYTHON_USEDEP}]

146

-			>=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]

147

-			X? (

148

-				|| (

149

-					kde? ( kde-misc/skanlite )

150

-					media-gfx/xsane

151

-					media-gfx/sane-frontends

152

+		$(python_gen_cond_dep '

153

+			>=dev-python/dbus-python-1.2.0-r1[${PYTHON_MULTI_USEDEP}]

154

+			fax? ( dev-python/reportlab[${PYTHON_MULTI_USEDEP}] )

155

+			qt5? (

156

+				>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_MULTI_USEDEP}]

157

+				libnotify? ( dev-python/notify2[${PYTHON_MULTI_USEDEP}] )

158

+			)

159

+			scanner? (

160

+				>=dev-python/reportlab-3.2[${PYTHON_MULTI_USEDEP}]

161

+				>=dev-python/pillow-3.1.1[${PYTHON_MULTI_USEDEP}]

162

+				X? (

163

+					|| (

164

+						kde? ( kde-misc/skanlite )

165

+						media-gfx/xsane

166

+						media-gfx/sane-frontends

167

+					)

168

)

169

)

170

-		)

171

+		')

172

)

173

 	policykit? ( sys-auth/polkit )

174

"

1	commit: 3fd146ede028edfb103f117e53e6ef2dfc73a792
2	Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3	AuthorDate: Fri Feb 7 17:32:56 2020 +0000
4	Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5	CommitDate: Sun Feb 9 16:34:16 2020 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fd146ed
7
8	net-print/hplip: Switch to PYTHON_MULTI_USEDEP API
9
10	Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12	...plip-3.18.12.ebuild => hplip-3.18.12-r1.ebuild} \| 36 ++++++++++++----------
13	net-print/hplip/hplip-3.19.11.ebuild \| 36 ++++++++++++----------
14	...plip-3.19.12.ebuild => hplip-3.19.12-r1.ebuild} \| 36 ++++++++++++----------
15	3 files changed, 57 insertions(+), 51 deletions(-)
16
17	diff --git a/net-print/hplip/hplip-3.18.12.ebuild b/net-print/hplip/hplip-3.18.12-r1.ebuild
18	similarity index 91%
19	rename from net-print/hplip/hplip-3.18.12.ebuild
20	rename to net-print/hplip/hplip-3.18.12-r1.ebuild
21	index b28c7ba4201..6c7b5ccefb0 100644
22	--- a/net-print/hplip/hplip-3.18.12.ebuild
23	+++ b/net-print/hplip/hplip-3.18.12-r1.ebuild
24	@@ -49,26 +49,28 @@ RDEPEND="
25	${COMMON_DEPEND}
26	app-text/ghostscript-gpl
27	!minimal? (
28	- >=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
29	- $(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*')
30	- $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
31	- fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
32	+ $(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]' 'python2*')
33	+ $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' 'python3*')
34	kernel_linux? ( virtual/udev )
35	- qt5? (
36	- >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}]
37	- libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] )
38	- )
39	- scanner? (
40	- >=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
41	- >=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
42	- X? (
43	- \|\| (
44	- kde? ( kde-misc/skanlite )
45	- media-gfx/xsane
46	- media-gfx/sane-frontends
47	+ $(python_gen_cond_dep '
48	+ >=dev-python/dbus-python-1.2.0-r1[${PYTHON_MULTI_USEDEP}]
49	+ fax? ( dev-python/reportlab[${PYTHON_MULTI_USEDEP}] )
50	+ qt5? (
51	+ >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_MULTI_USEDEP}]
52	+ libnotify? ( dev-python/notify2[${PYTHON_MULTI_USEDEP}] )
53	+ )
54	+ scanner? (
55	+ >=dev-python/reportlab-3.2[${PYTHON_MULTI_USEDEP}]
56	+ >=dev-python/pillow-3.1.1[${PYTHON_MULTI_USEDEP}]
57	+ X? (
58	+ \|\| (
59	+ kde? ( kde-misc/skanlite )
60	+ media-gfx/xsane
61	+ media-gfx/sane-frontends
62	+ )
63	)
64	)
65	- )
66	+ ')
67	)
68	policykit? ( sys-auth/polkit )
69	"
70
71	diff --git a/net-print/hplip/hplip-3.19.11.ebuild b/net-print/hplip/hplip-3.19.11.ebuild
72	index 83e3e5a4611..0d2eb10db37 100644
73	--- a/net-print/hplip/hplip-3.19.11.ebuild
74	+++ b/net-print/hplip/hplip-3.19.11.ebuild
75	@@ -49,26 +49,28 @@ RDEPEND="
76	${COMMON_DEPEND}
77	app-text/ghostscript-gpl
78	!minimal? (
79	- >=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
80	- $(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*')
81	- $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
82	- fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
83	+ $(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]' 'python2*')
84	+ $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' 'python3*')
85	kernel_linux? ( virtual/udev )
86	- qt5? (
87	- >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}]
88	- libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] )
89	- )
90	- scanner? (
91	- >=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
92	- >=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
93	- X? (
94	- \|\| (
95	- kde? ( kde-misc/skanlite )
96	- media-gfx/xsane
97	- media-gfx/sane-frontends
98	+ $(python_gen_cond_dep '
99	+ >=dev-python/dbus-python-1.2.0-r1[${PYTHON_MULTI_USEDEP}]
100	+ fax? ( dev-python/reportlab[${PYTHON_MULTI_USEDEP}] )
101	+ qt5? (
102	+ >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_MULTI_USEDEP}]
103	+ libnotify? ( dev-python/notify2[${PYTHON_MULTI_USEDEP}] )
104	+ )
105	+ scanner? (
106	+ >=dev-python/reportlab-3.2[${PYTHON_MULTI_USEDEP}]
107	+ >=dev-python/pillow-3.1.1[${PYTHON_MULTI_USEDEP}]
108	+ X? (
109	+ \|\| (
110	+ kde? ( kde-misc/skanlite )
111	+ media-gfx/xsane
112	+ media-gfx/sane-frontends
113	+ )
114	)
115	)
116	- )
117	+ ')
118	)
119	policykit? ( sys-auth/polkit )
120	"
121
122	diff --git a/net-print/hplip/hplip-3.19.12.ebuild b/net-print/hplip/hplip-3.19.12-r1.ebuild
123	similarity index 91%
124	rename from net-print/hplip/hplip-3.19.12.ebuild
125	rename to net-print/hplip/hplip-3.19.12-r1.ebuild
126	index 83e3e5a4611..0d2eb10db37 100644
127	--- a/net-print/hplip/hplip-3.19.12.ebuild
128	+++ b/net-print/hplip/hplip-3.19.12-r1.ebuild
129	@@ -49,26 +49,28 @@ RDEPEND="
130	${COMMON_DEPEND}
131	app-text/ghostscript-gpl
132	!minimal? (
133	- >=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
134	- $(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*')
135	- $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
136	- fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
137	+ $(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]' 'python2*')
138	+ $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' 'python3*')
139	kernel_linux? ( virtual/udev )
140	- qt5? (
141	- >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}]
142	- libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] )
143	- )
144	- scanner? (
145	- >=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
146	- >=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
147	- X? (
148	- \|\| (
149	- kde? ( kde-misc/skanlite )
150	- media-gfx/xsane
151	- media-gfx/sane-frontends
152	+ $(python_gen_cond_dep '
153	+ >=dev-python/dbus-python-1.2.0-r1[${PYTHON_MULTI_USEDEP}]
154	+ fax? ( dev-python/reportlab[${PYTHON_MULTI_USEDEP}] )
155	+ qt5? (
156	+ >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_MULTI_USEDEP}]
157	+ libnotify? ( dev-python/notify2[${PYTHON_MULTI_USEDEP}] )
158	+ )
159	+ scanner? (
160	+ >=dev-python/reportlab-3.2[${PYTHON_MULTI_USEDEP}]
161	+ >=dev-python/pillow-3.1.1[${PYTHON_MULTI_USEDEP}]
162	+ X? (
163	+ \|\| (
164	+ kde? ( kde-misc/skanlite )
165	+ media-gfx/xsane
166	+ media-gfx/sane-frontends
167	+ )
168	)
169	)
170	- )
171	+ ')
172	)
173	policykit? ( sys-auth/polkit )
174	"

Gentoo Archives: gentoo-commits