[gentoo-commits] repo/gentoo:master commit in: dev-python/pyside6/ - gentoo-commits

From:	Andrew Ammerlaan <andrewammerlaan@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-python/pyside6/
Date:	Mon, 07 Nov 2022 10:18:36
Message-Id:	`1667816301.b8a399ce9af99c64552948177956db3d82bdc3d7.andrewammerlaan@gentoo`

1

commit:     b8a399ce9af99c64552948177956db3d82bdc3d7

2

Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>

3

AuthorDate: Mon Nov  7 10:16:52 2022 +0000

4

Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>

5

CommitDate: Mon Nov  7 10:18:21 2022 +0000

6

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

7

8

dev-python/pyside6: further restrict dependencies on qt packages

9

10

6.3.2 for example fails to build with qt 6.4.0

11

12

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

13

14

 ...yside6-6.3.2.ebuild => pyside6-6.3.2-r1.ebuild} | 36 +++++++++----------

15

 dev-python/pyside6/pyside6-6.4.0.ebuild            | 40 +++++++++++-----------

16

 2 files changed, 38 insertions(+), 38 deletions(-)

17

18

diff --git a/dev-python/pyside6/pyside6-6.3.2.ebuild b/dev-python/pyside6/pyside6-6.3.2-r1.ebuild

19

similarity index 89%

20

rename from dev-python/pyside6/pyside6-6.3.2.ebuild

21

rename to dev-python/pyside6/pyside6-6.3.2-r1.ebuild

22

index 6f0f4f03a176..50a3f9039937 100644

23

--- a/dev-python/pyside6/pyside6-6.3.2.ebuild

24

+++ b/dev-python/pyside6/pyside6-6.3.2-r1.ebuild

25

@@ -71,28 +71,28 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}

26

 RESTRICT="test"

27

28

 # Minimal supported version of Qt.

29

-QT_PV="$(ver_cut 1-2):6"

30

+QT_PV="$(ver_cut 1-2)*:6"

31

32

 RDEPEND="${PYTHON_DEPS}

33

-	>=dev-python/shiboken6-${PV}[${PYTHON_USEDEP}]

34

-	>=dev-qt/qtbase-${QT_PV}[dbus?,opengl?,gles2-only=,sql?,network?,concurrent?,widgets?,xml(+)?]

35

-	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )

36

-	gui? ( >=dev-qt/qtbase-${QT_PV}[gui,jpeg] )

37

-	help? ( >=dev-qt/qttools-${QT_PV}[assistant] )

38

-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[qml(+)?,gles2-only(-)=,widgets(+)?] )

39

-	positioning? ( >=dev-qt/qtpositioning-${QT_PV}[qml(+)?] )

40

-	printsupport? ( >=dev-qt/qtbase-${QT_PV}[gui,widgets] )

41

-	qml? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )

42

-	quick3d? ( >=dev-qt/qtquick3d-${QT_PV} )

43

-	serialport? ( >=dev-qt/qtserialport-${QT_PV} )

44

-	svg? ( >=dev-qt/qtsvg-${QT_PV} )

45

-	testlib? ( >=dev-qt/qtbase-${QT_PV}[gui] )

46

-	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV}[qml(+)?] )

47

-	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] )

48

-	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )

49

+	~dev-python/shiboken6-${PV}[${PYTHON_USEDEP}]

50

+	=dev-qt/qtbase-${QT_PV}[dbus?,opengl?,gles2-only=,sql?,network?,concurrent?,widgets?,xml(+)?]

51

+	designer? ( =dev-qt/qttools-${QT_PV}[designer] )

52

+	gui? ( =dev-qt/qtbase-${QT_PV}[gui,jpeg] )

53

+	help? ( =dev-qt/qttools-${QT_PV}[assistant] )

54

+	multimedia? ( =dev-qt/qtmultimedia-${QT_PV}[qml(+)?,gles2-only(-)=,widgets(+)?] )

55

+	positioning? ( =dev-qt/qtpositioning-${QT_PV}[qml(+)?] )

56

+	printsupport? ( =dev-qt/qtbase-${QT_PV}[gui,widgets] )

57

+	qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] )

58

+	quick3d? ( =dev-qt/qtquick3d-${QT_PV} )

59

+	serialport? ( =dev-qt/qtserialport-${QT_PV} )

60

+	svg? ( =dev-qt/qtsvg-${QT_PV} )

61

+	testlib? ( =dev-qt/qtbase-${QT_PV}[gui] )

62

+	webchannel? ( =dev-qt/qtwebchannel-${QT_PV}[qml(+)?] )

63

+	webengine? ( =dev-qt/qtwebengine-${QT_PV}[widgets?] )

64

+	websockets? ( =dev-qt/qtwebsockets-${QT_PV} )

65

"

66

 DEPEND="${RDEPEND}

67

-	test? ( >=dev-qt/qtbase-${QT_PV}[gui] )

68

+	test? ( =dev-qt/qtbase-${QT_PV}[gui] )

69

"

70

 # testlib is toggled by the gui flag on qtbase

71

72

73

diff --git a/dev-python/pyside6/pyside6-6.4.0.ebuild b/dev-python/pyside6/pyside6-6.4.0.ebuild

74

index d1d803dcf7e3..c388bbd9a358 100644

75

--- a/dev-python/pyside6/pyside6-6.4.0.ebuild

76

+++ b/dev-python/pyside6/pyside6-6.4.0.ebuild

77

@@ -75,33 +75,33 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}

78

 RESTRICT="test"

79

80

 # Minimal supported version of Qt.

81

-QT_PV="$(ver_cut 1-2):6"

82

+QT_PV="$(ver_cut 1-2)*:6"

83

84

 RDEPEND="${PYTHON_DEPS}

85

-	>=dev-python/shiboken6-${PV}[${PYTHON_USEDEP}]

86

-	>=dev-qt/qtbase-${QT_PV}[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?]

87

-	charts? ( >=dev-qt/qtcharts-${QT_PV} )

88

-	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )

89

+	~dev-python/shiboken6-${PV}[${PYTHON_USEDEP}]

90

+	=dev-qt/qtbase-${QT_PV}[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?]

91

+	charts? ( =dev-qt/qtcharts-${QT_PV} )

92

+	designer? ( =dev-qt/qttools-${QT_PV}[designer] )

93

 	gui? (

94

-		>=dev-qt/qtbase-${QT_PV}[gui,jpeg]

95

+		=dev-qt/qtbase-${QT_PV}[gui,jpeg]

96

 		x11-libs/libxkbcommon

97

)

98

-	help? ( >=dev-qt/qttools-${QT_PV}[assistant] )

99

-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[qml(+)?,gles2-only(-)=,widgets(+)?] )

100

-	network-auth? ( >=dev-qt/qtnetworkauth-${QT_PV} )

101

-	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )

102

-	printsupport? ( >=dev-qt/qtbase-${QT_PV}[gui,widgets] )

103

-	qml? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )

104

-	quick3d? ( >=dev-qt/qtquick3d-${QT_PV} )

105

-	serialport? ( >=dev-qt/qtserialport-${QT_PV} )

106

-	svg? ( >=dev-qt/qtsvg-${QT_PV} )

107

-	testlib? ( >=dev-qt/qtbase-${QT_PV}[gui] )

108

-	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )

109

-	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] )

110

-	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )

111

+	help? ( =dev-qt/qttools-${QT_PV}[assistant] )

112

+	multimedia? ( =dev-qt/qtmultimedia-${QT_PV}[qml(+)?,gles2-only(-)=,widgets(+)?] )

113

+	network-auth? ( =dev-qt/qtnetworkauth-${QT_PV} )

114

+	positioning? ( =dev-qt/qtpositioning-${QT_PV} )

115

+	printsupport? ( =dev-qt/qtbase-${QT_PV}[gui,widgets] )

116

+	qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] )

117

+	quick3d? ( =dev-qt/qtquick3d-${QT_PV} )

118

+	serialport? ( =dev-qt/qtserialport-${QT_PV} )

119

+	svg? ( =dev-qt/qtsvg-${QT_PV} )

120

+	testlib? ( =dev-qt/qtbase-${QT_PV}[gui] )

121

+	webchannel? ( =dev-qt/qtwebchannel-${QT_PV} )

122

+	webengine? ( =dev-qt/qtwebengine-${QT_PV}[widgets?] )

123

+	websockets? ( =dev-qt/qtwebsockets-${QT_PV} )

124

"

125

 DEPEND="${RDEPEND}

126

-	test? ( >=dev-qt/qtbase-${QT_PV}[gui] )

127

+	test? ( =dev-qt/qtbase-${QT_PV}[gui] )

128

"

129

 # testlib is toggled by the gui flag on qtbase

1	commit: b8a399ce9af99c64552948177956db3d82bdc3d7
2	Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
3	AuthorDate: Mon Nov 7 10:16:52 2022 +0000
4	Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
5	CommitDate: Mon Nov 7 10:18:21 2022 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8a399ce
7
8	dev-python/pyside6: further restrict dependencies on qt packages
9
10	6.3.2 for example fails to build with qt 6.4.0
11
12	Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
13
14	...yside6-6.3.2.ebuild => pyside6-6.3.2-r1.ebuild} \| 36 +++++++++----------
15	dev-python/pyside6/pyside6-6.4.0.ebuild \| 40 +++++++++++-----------
16	2 files changed, 38 insertions(+), 38 deletions(-)
17
18	diff --git a/dev-python/pyside6/pyside6-6.3.2.ebuild b/dev-python/pyside6/pyside6-6.3.2-r1.ebuild
19	similarity index 89%
20	rename from dev-python/pyside6/pyside6-6.3.2.ebuild
21	rename to dev-python/pyside6/pyside6-6.3.2-r1.ebuild
22	index 6f0f4f03a176..50a3f9039937 100644
23	--- a/dev-python/pyside6/pyside6-6.3.2.ebuild
24	+++ b/dev-python/pyside6/pyside6-6.3.2-r1.ebuild
25	@@ -71,28 +71,28 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
26	RESTRICT="test"
27
28	# Minimal supported version of Qt.
29	-QT_PV="$(ver_cut 1-2):6"
30	+QT_PV="$(ver_cut 1-2)*:6"
31
32	RDEPEND="${PYTHON_DEPS}
33	- >=dev-python/shiboken6-${PV}[${PYTHON_USEDEP}]
34	- >=dev-qt/qtbase-${QT_PV}[dbus?,opengl?,gles2-only=,sql?,network?,concurrent?,widgets?,xml(+)?]
35	- designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
36	- gui? ( >=dev-qt/qtbase-${QT_PV}[gui,jpeg] )
37	- help? ( >=dev-qt/qttools-${QT_PV}[assistant] )
38	- multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[qml(+)?,gles2-only(-)=,widgets(+)?] )
39	- positioning? ( >=dev-qt/qtpositioning-${QT_PV}[qml(+)?] )
40	- printsupport? ( >=dev-qt/qtbase-${QT_PV}[gui,widgets] )
41	- qml? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
42	- quick3d? ( >=dev-qt/qtquick3d-${QT_PV} )
43	- serialport? ( >=dev-qt/qtserialport-${QT_PV} )
44	- svg? ( >=dev-qt/qtsvg-${QT_PV} )
45	- testlib? ( >=dev-qt/qtbase-${QT_PV}[gui] )
46	- webchannel? ( >=dev-qt/qtwebchannel-${QT_PV}[qml(+)?] )
47	- webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] )
48	- websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
49	+ ~dev-python/shiboken6-${PV}[${PYTHON_USEDEP}]
50	+ =dev-qt/qtbase-${QT_PV}[dbus?,opengl?,gles2-only=,sql?,network?,concurrent?,widgets?,xml(+)?]
51	+ designer? ( =dev-qt/qttools-${QT_PV}[designer] )
52	+ gui? ( =dev-qt/qtbase-${QT_PV}[gui,jpeg] )
53	+ help? ( =dev-qt/qttools-${QT_PV}[assistant] )
54	+ multimedia? ( =dev-qt/qtmultimedia-${QT_PV}[qml(+)?,gles2-only(-)=,widgets(+)?] )
55	+ positioning? ( =dev-qt/qtpositioning-${QT_PV}[qml(+)?] )
56	+ printsupport? ( =dev-qt/qtbase-${QT_PV}[gui,widgets] )
57	+ qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] )
58	+ quick3d? ( =dev-qt/qtquick3d-${QT_PV} )
59	+ serialport? ( =dev-qt/qtserialport-${QT_PV} )
60	+ svg? ( =dev-qt/qtsvg-${QT_PV} )
61	+ testlib? ( =dev-qt/qtbase-${QT_PV}[gui] )
62	+ webchannel? ( =dev-qt/qtwebchannel-${QT_PV}[qml(+)?] )
63	+ webengine? ( =dev-qt/qtwebengine-${QT_PV}[widgets?] )
64	+ websockets? ( =dev-qt/qtwebsockets-${QT_PV} )
65	"
66	DEPEND="${RDEPEND}
67	- test? ( >=dev-qt/qtbase-${QT_PV}[gui] )
68	+ test? ( =dev-qt/qtbase-${QT_PV}[gui] )
69	"
70	# testlib is toggled by the gui flag on qtbase
71
72
73	diff --git a/dev-python/pyside6/pyside6-6.4.0.ebuild b/dev-python/pyside6/pyside6-6.4.0.ebuild
74	index d1d803dcf7e3..c388bbd9a358 100644
75	--- a/dev-python/pyside6/pyside6-6.4.0.ebuild
76	+++ b/dev-python/pyside6/pyside6-6.4.0.ebuild
77	@@ -75,33 +75,33 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
78	RESTRICT="test"
79
80	# Minimal supported version of Qt.
81	-QT_PV="$(ver_cut 1-2):6"
82	+QT_PV="$(ver_cut 1-2)*:6"
83
84	RDEPEND="${PYTHON_DEPS}
85	- >=dev-python/shiboken6-${PV}[${PYTHON_USEDEP}]
86	- >=dev-qt/qtbase-${QT_PV}[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?]
87	- charts? ( >=dev-qt/qtcharts-${QT_PV} )
88	- designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
89	+ ~dev-python/shiboken6-${PV}[${PYTHON_USEDEP}]
90	+ =dev-qt/qtbase-${QT_PV}[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?]
91	+ charts? ( =dev-qt/qtcharts-${QT_PV} )
92	+ designer? ( =dev-qt/qttools-${QT_PV}[designer] )
93	gui? (
94	- >=dev-qt/qtbase-${QT_PV}[gui,jpeg]
95	+ =dev-qt/qtbase-${QT_PV}[gui,jpeg]
96	x11-libs/libxkbcommon
97	)
98	- help? ( >=dev-qt/qttools-${QT_PV}[assistant] )
99	- multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[qml(+)?,gles2-only(-)=,widgets(+)?] )
100	- network-auth? ( >=dev-qt/qtnetworkauth-${QT_PV} )
101	- positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
102	- printsupport? ( >=dev-qt/qtbase-${QT_PV}[gui,widgets] )
103	- qml? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
104	- quick3d? ( >=dev-qt/qtquick3d-${QT_PV} )
105	- serialport? ( >=dev-qt/qtserialport-${QT_PV} )
106	- svg? ( >=dev-qt/qtsvg-${QT_PV} )
107	- testlib? ( >=dev-qt/qtbase-${QT_PV}[gui] )
108	- webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
109	- webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] )
110	- websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
111	+ help? ( =dev-qt/qttools-${QT_PV}[assistant] )
112	+ multimedia? ( =dev-qt/qtmultimedia-${QT_PV}[qml(+)?,gles2-only(-)=,widgets(+)?] )
113	+ network-auth? ( =dev-qt/qtnetworkauth-${QT_PV} )
114	+ positioning? ( =dev-qt/qtpositioning-${QT_PV} )
115	+ printsupport? ( =dev-qt/qtbase-${QT_PV}[gui,widgets] )
116	+ qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] )
117	+ quick3d? ( =dev-qt/qtquick3d-${QT_PV} )
118	+ serialport? ( =dev-qt/qtserialport-${QT_PV} )
119	+ svg? ( =dev-qt/qtsvg-${QT_PV} )
120	+ testlib? ( =dev-qt/qtbase-${QT_PV}[gui] )
121	+ webchannel? ( =dev-qt/qtwebchannel-${QT_PV} )
122	+ webengine? ( =dev-qt/qtwebengine-${QT_PV}[widgets?] )
123	+ websockets? ( =dev-qt/qtwebsockets-${QT_PV} )
124	"
125	DEPEND="${RDEPEND}
126	- test? ( >=dev-qt/qtbase-${QT_PV}[gui] )
127	+ test? ( =dev-qt/qtbase-${QT_PV}[gui] )
128	"
129	# testlib is toggled by the gui flag on qtbase

Gentoo Archives: gentoo-commits