[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtgui/, dev-qt/qtmultimedia/ - gentoo-commits

From:	Matt Turner <mattst88@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtgui/, dev-qt/qtmultimedia/
Date:	Fri, 27 Apr 2018 01:15:02
Message-Id:	`1524791081.8cb3aa13ac7ac5657ab80e8bfef7fed5048df57f.mattst88@gentoo`

1

commit:     8cb3aa13ac7ac5657ab80e8bfef7fed5048df57f

2

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

3

AuthorDate: Thu Apr 26 19:34:51 2018 +0000

4

Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>

5

CommitDate: Fri Apr 27 01:04:41 2018 +0000

6

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

7

8

dev-qt/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto).

9

10

 dev-qt/qtgui/qtgui-4.8.7.ebuild                      | 9 ++-------

11

 dev-qt/qtmultimedia/qtmultimedia-5.11.0_beta4.ebuild | 2 +-

12

 dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild        | 4 ++--

13

 dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild     | 2 +-

14

 dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild        | 2 +-

15

 dev-qt/qtmultimedia/qtmultimedia-5.9.5.ebuild        | 2 +-

16

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

17

18

diff --git a/dev-qt/qtgui/qtgui-4.8.7.ebuild b/dev-qt/qtgui/qtgui-4.8.7.ebuild

19

index cb2eede7312..8a347270222 100644

20

--- a/dev-qt/qtgui/qtgui-4.8.7.ebuild

21

+++ b/dev-qt/qtgui/qtgui-4.8.7.ebuild

22

@@ -1,4 +1,4 @@

23

-# Copyright 1999-2017 Gentoo Foundation

24

+# Copyright 1999-2018 Gentoo Foundation

25

 # Distributed under the terms of the GNU General Public License v2

26

27

 EAPI=5

28

@@ -53,12 +53,7 @@ RDEPEND="

29

 	!<dev-qt/qthelp-4.8.5:4

30

"

31

 DEPEND="${RDEPEND}

32

-	!aqua? (

33

-		>=x11-proto/inputproto-2.2-r1[${MULTILIB_USEDEP}]

34

-		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]

35

-		xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] )

36

-		xv? ( >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}] )

37

-	)

38

+	!aqua? ( x11-base/xorg-proto )

39

"

40

 PDEPEND="

41

 	qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )

42

43

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.11.0_beta4.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.11.0_beta4.ebuild

44

index 598421b6701..04cc34da1d1 100644

45

--- a/dev-qt/qtmultimedia/qtmultimedia-5.11.0_beta4.ebuild

46

+++ b/dev-qt/qtmultimedia/qtmultimedia-5.11.0_beta4.ebuild

47

@@ -35,7 +35,7 @@ RDEPEND="

48

)

49

"

50

 DEPEND="${RDEPEND}

51

-	gstreamer? ( x11-proto/videoproto )

52

+	gstreamer? ( x11-base/xorg-proto )

53

"

54

55

 src_prepare() {

56

57

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild

58

index 255a5e8a152..5c2c8c28042 100644

59

--- a/dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild

60

+++ b/dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild

61

@@ -1,4 +1,4 @@

62

-# Copyright 1999-2017 Gentoo Foundation

63

+# Copyright 1999-2018 Gentoo Foundation

64

 # Distributed under the terms of the GNU General Public License v2

65

66

 EAPI=6

67

@@ -35,7 +35,7 @@ RDEPEND="

68

)

69

"

70

 DEPEND="${RDEPEND}

71

-	gstreamer? ( x11-proto/videoproto )

72

+	gstreamer? ( x11-base/xorg-proto )

73

"

74

75

 src_prepare() {

76

77

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild

78

index b026b99070d..07c0609fcc7 100644

79

--- a/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild

80

+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild

81

@@ -35,7 +35,7 @@ RDEPEND="

82

)

83

"

84

 DEPEND="${RDEPEND}

85

-	gstreamer? ( x11-proto/videoproto )

86

+	gstreamer? ( x11-base/xorg-proto )

87

"

88

89

 src_prepare() {

90

91

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild

92

index a3c48dc046a..ccc57e3e45a 100644

93

--- a/dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild

94

+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild

95

@@ -35,7 +35,7 @@ RDEPEND="

96

)

97

"

98

 DEPEND="${RDEPEND}

99

-	gstreamer? ( x11-proto/videoproto )

100

+	gstreamer? ( x11-base/xorg-proto )

101

"

102

103

 src_prepare() {

104

105

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.5.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.5.ebuild

106

index 598421b6701..04cc34da1d1 100644

107

--- a/dev-qt/qtmultimedia/qtmultimedia-5.9.5.ebuild

108

+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9.5.ebuild

109

@@ -35,7 +35,7 @@ RDEPEND="

110

)

111

"

112

 DEPEND="${RDEPEND}

113

-	gstreamer? ( x11-proto/videoproto )

114

+	gstreamer? ( x11-base/xorg-proto )

115

"

116

117

 src_prepare() {

1	commit: 8cb3aa13ac7ac5657ab80e8bfef7fed5048df57f
2	Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3	AuthorDate: Thu Apr 26 19:34:51 2018 +0000
4	Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5	CommitDate: Fri Apr 27 01:04:41 2018 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cb3aa13
7
8	dev-qt/: Update dependencies (x11-proto/ -> x11-base/xorg-proto).
9
10	dev-qt/qtgui/qtgui-4.8.7.ebuild \| 9 ++-------
11	dev-qt/qtmultimedia/qtmultimedia-5.11.0_beta4.ebuild \| 2 +-
12	dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild \| 4 ++--
13	dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild \| 2 +-
14	dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild \| 2 +-
15	dev-qt/qtmultimedia/qtmultimedia-5.9.5.ebuild \| 2 +-
16	6 files changed, 8 insertions(+), 13 deletions(-)
17
18	diff --git a/dev-qt/qtgui/qtgui-4.8.7.ebuild b/dev-qt/qtgui/qtgui-4.8.7.ebuild
19	index cb2eede7312..8a347270222 100644
20	--- a/dev-qt/qtgui/qtgui-4.8.7.ebuild
21	+++ b/dev-qt/qtgui/qtgui-4.8.7.ebuild
22	@@ -1,4 +1,4 @@
23	-# Copyright 1999-2017 Gentoo Foundation
24	+# Copyright 1999-2018 Gentoo Foundation
25	# Distributed under the terms of the GNU General Public License v2
26
27	EAPI=5
28	@@ -53,12 +53,7 @@ RDEPEND="
29	!<dev-qt/qthelp-4.8.5:4
30	"
31	DEPEND="${RDEPEND}
32	- !aqua? (
33	- >=x11-proto/inputproto-2.2-r1[${MULTILIB_USEDEP}]
34	- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
35	- xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] )
36	- xv? ( >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}] )
37	- )
38	+ !aqua? ( x11-base/xorg-proto )
39	"
40	PDEPEND="
41	qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
42
43	diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.11.0_beta4.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.11.0_beta4.ebuild
44	index 598421b6701..04cc34da1d1 100644
45	--- a/dev-qt/qtmultimedia/qtmultimedia-5.11.0_beta4.ebuild
46	+++ b/dev-qt/qtmultimedia/qtmultimedia-5.11.0_beta4.ebuild
47	@@ -35,7 +35,7 @@ RDEPEND="
48	)
49	"
50	DEPEND="${RDEPEND}
51	- gstreamer? ( x11-proto/videoproto )
52	+ gstreamer? ( x11-base/xorg-proto )
53	"
54
55	src_prepare() {
56
57	diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild
58	index 255a5e8a152..5c2c8c28042 100644
59	--- a/dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild
60	+++ b/dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild
61	@@ -1,4 +1,4 @@
62	-# Copyright 1999-2017 Gentoo Foundation
63	+# Copyright 1999-2018 Gentoo Foundation
64	# Distributed under the terms of the GNU General Public License v2
65
66	EAPI=6
67	@@ -35,7 +35,7 @@ RDEPEND="
68	)
69	"
70	DEPEND="${RDEPEND}
71	- gstreamer? ( x11-proto/videoproto )
72	+ gstreamer? ( x11-base/xorg-proto )
73	"
74
75	src_prepare() {
76
77	diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild
78	index b026b99070d..07c0609fcc7 100644
79	--- a/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild
80	+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild
81	@@ -35,7 +35,7 @@ RDEPEND="
82	)
83	"
84	DEPEND="${RDEPEND}
85	- gstreamer? ( x11-proto/videoproto )
86	+ gstreamer? ( x11-base/xorg-proto )
87	"
88
89	src_prepare() {
90
91	diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild
92	index a3c48dc046a..ccc57e3e45a 100644
93	--- a/dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild
94	+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild
95	@@ -35,7 +35,7 @@ RDEPEND="
96	)
97	"
98	DEPEND="${RDEPEND}
99	- gstreamer? ( x11-proto/videoproto )
100	+ gstreamer? ( x11-base/xorg-proto )
101	"
102
103	src_prepare() {
104
105	diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.5.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.5.ebuild
106	index 598421b6701..04cc34da1d1 100644
107	--- a/dev-qt/qtmultimedia/qtmultimedia-5.9.5.ebuild
108	+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9.5.ebuild
109	@@ -35,7 +35,7 @@ RDEPEND="
110	)
111	"
112	DEPEND="${RDEPEND}
113	- gstreamer? ( x11-proto/videoproto )
114	+ gstreamer? ( x11-base/xorg-proto )
115	"
116
117	src_prepare() {

Gentoo Archives: gentoo-commits