[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/ - gentoo-commits

From:	Sam James <sam@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/
Date:	Sun, 31 Oct 2021 00:24:39
Message-Id:	`1635639867.6e1ee1fe7b66f5d88509ad7332dc0e1e21a7f101.sam@gentoo`

1

commit:     6e1ee1fe7b66f5d88509ad7332dc0e1e21a7f101

2

Author:     Sam James <sam <AT> gentoo <DOT> org>

3

AuthorDate: Sun Oct 31 00:23:59 2021 +0000

4

Commit:     Sam James <sam <AT> gentoo <DOT> org>

5

CommitDate: Sun Oct 31 00:24:27 2021 +0000

6

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

7

8

x11-wm/mutter: drop obsolete xorg-server[wayland] dependency

9

10

libxcvt has been stable for a while and this ends up leading

11

to confusing blockers anyway.

12

13

Bug: https://bugs.gentoo.org/814335

14

Signed-off-by: Sam James <sam <AT> gentoo.org>

15

16

 x11-wm/mutter/{mutter-40.3-r2.ebuild => mutter-40.3-r3.ebuild} | 5 +----

17

 x11-wm/mutter/{mutter-40.4-r1.ebuild => mutter-40.4-r2.ebuild} | 5 +----

18

 x11-wm/mutter/{mutter-40.5-r2.ebuild => mutter-40.5-r4.ebuild} | 5 +----

19

 x11-wm/mutter/{mutter-40.5-r3.ebuild => mutter-40.5-r5.ebuild} | 7 ++-----

20

 x11-wm/mutter/{mutter-41.0-r2.ebuild => mutter-41.0-r3.ebuild} | 7 ++-----

21

 5 files changed, 7 insertions(+), 22 deletions(-)

22

23

diff --git a/x11-wm/mutter/mutter-40.3-r2.ebuild b/x11-wm/mutter/mutter-40.3-r3.ebuild

24

similarity index 98%

25

rename from x11-wm/mutter/mutter-40.3-r2.ebuild

26

rename to x11-wm/mutter/mutter-40.3-r3.ebuild

27

index 958a2dbcd10..aa5fa3a39ec 100644

28

--- a/x11-wm/mutter/mutter-40.3-r2.ebuild

29

+++ b/x11-wm/mutter/mutter-40.3-r3.ebuild

30

@@ -92,10 +92,7 @@ BDEPEND="

31

 	test? ( app-text/docbook-xml-dtd:4.5 )

32

 	wayland? (

33

 		>=sys-kernel/linux-headers-4.4

34

-		|| (

35

-			x11-libs/libxcvt

36

-			<x11-base/xorg-server-1.20.11-r3[xorg,-minimal]

37

-		)

38

+		x11-libs/libxcvt

39

)

40

"

41

42

43

diff --git a/x11-wm/mutter/mutter-40.4-r1.ebuild b/x11-wm/mutter/mutter-40.4-r2.ebuild

44

similarity index 98%

45

rename from x11-wm/mutter/mutter-40.4-r1.ebuild

46

rename to x11-wm/mutter/mutter-40.4-r2.ebuild

47

index f5f38992218..1d2f1214d2f 100644

48

--- a/x11-wm/mutter/mutter-40.4-r1.ebuild

49

+++ b/x11-wm/mutter/mutter-40.4-r2.ebuild

50

@@ -92,10 +92,7 @@ BDEPEND="

51

 	test? ( app-text/docbook-xml-dtd:4.5 )

52

 	wayland? (

53

 		>=sys-kernel/linux-headers-4.4

54

-		|| (

55

-			x11-libs/libxcvt

56

-			<x11-base/xorg-server-1.20.11-r3[xorg,-minimal]

57

-		)

58

+		x11-libs/libxcvt

59

)

60

"

61

62

63

diff --git a/x11-wm/mutter/mutter-40.5-r2.ebuild b/x11-wm/mutter/mutter-40.5-r4.ebuild

64

similarity index 98%

65

rename from x11-wm/mutter/mutter-40.5-r2.ebuild

66

rename to x11-wm/mutter/mutter-40.5-r4.ebuild

67

index f127e4c4b82..4d648da9d7b 100644

68

--- a/x11-wm/mutter/mutter-40.5-r2.ebuild

69

+++ b/x11-wm/mutter/mutter-40.5-r4.ebuild

70

@@ -92,10 +92,7 @@ BDEPEND="

71

 	test? ( app-text/docbook-xml-dtd:4.5 )

72

 	wayland? (

73

 		>=sys-kernel/linux-headers-4.4

74

-		|| (

75

-			x11-libs/libxcvt

76

-			<x11-base/xorg-server-1.20.11-r3[xorg,-minimal]

77

-		)

78

+		x11-libs/libxcvt

79

)

80

"

81

82

83

diff --git a/x11-wm/mutter/mutter-40.5-r3.ebuild b/x11-wm/mutter/mutter-40.5-r5.ebuild

84

similarity index 96%

85

rename from x11-wm/mutter/mutter-40.5-r3.ebuild

86

rename to x11-wm/mutter/mutter-40.5-r5.ebuild

87

index d32054f34f8..ff038d79078 100644

88

--- a/x11-wm/mutter/mutter-40.5-r3.ebuild

89

+++ b/x11-wm/mutter/mutter-40.5-r5.ebuild

90

@@ -6,7 +6,7 @@ inherit gnome.org gnome2-utils meson udev virtualx xdg

91

92

 DESCRIPTION="GNOME compositing window manager based on Clutter"

93

 HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"

94

-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"

95

+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-r1-patchset.tar.xz"

96

97

 LICENSE="GPL-2+"

98

 SLOT="0/8" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot

99

@@ -93,10 +93,7 @@ BDEPEND="

100

 	test? ( app-text/docbook-xml-dtd:4.5 )

101

 	wayland? (

102

 		>=sys-kernel/linux-headers-4.4

103

-		|| (

104

-			x11-libs/libxcvt

105

-			<x11-base/xorg-server-1.20.11-r3[xorg,-minimal]

106

-		)

107

+		x11-libs/libxcvt

108

)

109

"

110

111

112

diff --git a/x11-wm/mutter/mutter-41.0-r2.ebuild b/x11-wm/mutter/mutter-41.0-r3.ebuild

113

similarity index 96%

114

rename from x11-wm/mutter/mutter-41.0-r2.ebuild

115

rename to x11-wm/mutter/mutter-41.0-r3.ebuild

116

index bdc55adffa3..7eff393ac61 100644

117

--- a/x11-wm/mutter/mutter-41.0-r2.ebuild

118

+++ b/x11-wm/mutter/mutter-41.0-r3.ebuild

119

@@ -6,7 +6,7 @@ inherit gnome.org gnome2-utils meson udev xdg

120

121

 DESCRIPTION="GNOME compositing window manager based on Clutter"

122

 HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"

123

-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"

124

+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-r1-patchset.tar.xz"

125

126

 LICENSE="GPL-2+"

127

 SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot

128

@@ -96,10 +96,7 @@ BDEPEND="

129

)

130

 	wayland? (

131

 		>=sys-kernel/linux-headers-4.4

132

-		|| (

133

-			x11-libs/libxcvt

134

-			<x11-base/xorg-server-1.20.11-r3[xorg,-minimal]

135

-		)

136

+		x11-libs/libxcvt

137

)

138

"

1	commit: 6e1ee1fe7b66f5d88509ad7332dc0e1e21a7f101
2	Author: Sam James <sam <AT> gentoo <DOT> org>
3	AuthorDate: Sun Oct 31 00:23:59 2021 +0000
4	Commit: Sam James <sam <AT> gentoo <DOT> org>
5	CommitDate: Sun Oct 31 00:24:27 2021 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e1ee1fe
7
8	x11-wm/mutter: drop obsolete xorg-server[wayland] dependency
9
10	libxcvt has been stable for a while and this ends up leading
11	to confusing blockers anyway.
12
13	Bug: https://bugs.gentoo.org/814335
14	Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16	x11-wm/mutter/{mutter-40.3-r2.ebuild => mutter-40.3-r3.ebuild} \| 5 +----
17	x11-wm/mutter/{mutter-40.4-r1.ebuild => mutter-40.4-r2.ebuild} \| 5 +----
18	x11-wm/mutter/{mutter-40.5-r2.ebuild => mutter-40.5-r4.ebuild} \| 5 +----
19	x11-wm/mutter/{mutter-40.5-r3.ebuild => mutter-40.5-r5.ebuild} \| 7 ++-----
20	x11-wm/mutter/{mutter-41.0-r2.ebuild => mutter-41.0-r3.ebuild} \| 7 ++-----
21	5 files changed, 7 insertions(+), 22 deletions(-)
22
23	diff --git a/x11-wm/mutter/mutter-40.3-r2.ebuild b/x11-wm/mutter/mutter-40.3-r3.ebuild
24	similarity index 98%
25	rename from x11-wm/mutter/mutter-40.3-r2.ebuild
26	rename to x11-wm/mutter/mutter-40.3-r3.ebuild
27	index 958a2dbcd10..aa5fa3a39ec 100644
28	--- a/x11-wm/mutter/mutter-40.3-r2.ebuild
29	+++ b/x11-wm/mutter/mutter-40.3-r3.ebuild
30	@@ -92,10 +92,7 @@ BDEPEND="
31	test? ( app-text/docbook-xml-dtd:4.5 )
32	wayland? (
33	>=sys-kernel/linux-headers-4.4
34	- \|\| (
35	- x11-libs/libxcvt
36	- <x11-base/xorg-server-1.20.11-r3[xorg,-minimal]
37	- )
38	+ x11-libs/libxcvt
39	)
40	"
41
42
43	diff --git a/x11-wm/mutter/mutter-40.4-r1.ebuild b/x11-wm/mutter/mutter-40.4-r2.ebuild
44	similarity index 98%
45	rename from x11-wm/mutter/mutter-40.4-r1.ebuild
46	rename to x11-wm/mutter/mutter-40.4-r2.ebuild
47	index f5f38992218..1d2f1214d2f 100644
48	--- a/x11-wm/mutter/mutter-40.4-r1.ebuild
49	+++ b/x11-wm/mutter/mutter-40.4-r2.ebuild
50	@@ -92,10 +92,7 @@ BDEPEND="
51	test? ( app-text/docbook-xml-dtd:4.5 )
52	wayland? (
53	>=sys-kernel/linux-headers-4.4
54	- \|\| (
55	- x11-libs/libxcvt
56	- <x11-base/xorg-server-1.20.11-r3[xorg,-minimal]
57	- )
58	+ x11-libs/libxcvt
59	)
60	"
61
62
63	diff --git a/x11-wm/mutter/mutter-40.5-r2.ebuild b/x11-wm/mutter/mutter-40.5-r4.ebuild
64	similarity index 98%
65	rename from x11-wm/mutter/mutter-40.5-r2.ebuild
66	rename to x11-wm/mutter/mutter-40.5-r4.ebuild
67	index f127e4c4b82..4d648da9d7b 100644
68	--- a/x11-wm/mutter/mutter-40.5-r2.ebuild
69	+++ b/x11-wm/mutter/mutter-40.5-r4.ebuild
70	@@ -92,10 +92,7 @@ BDEPEND="
71	test? ( app-text/docbook-xml-dtd:4.5 )
72	wayland? (
73	>=sys-kernel/linux-headers-4.4
74	- \|\| (
75	- x11-libs/libxcvt
76	- <x11-base/xorg-server-1.20.11-r3[xorg,-minimal]
77	- )
78	+ x11-libs/libxcvt
79	)
80	"
81
82
83	diff --git a/x11-wm/mutter/mutter-40.5-r3.ebuild b/x11-wm/mutter/mutter-40.5-r5.ebuild
84	similarity index 96%
85	rename from x11-wm/mutter/mutter-40.5-r3.ebuild
86	rename to x11-wm/mutter/mutter-40.5-r5.ebuild
87	index d32054f34f8..ff038d79078 100644
88	--- a/x11-wm/mutter/mutter-40.5-r3.ebuild
89	+++ b/x11-wm/mutter/mutter-40.5-r5.ebuild
90	@@ -6,7 +6,7 @@ inherit gnome.org gnome2-utils meson udev virtualx xdg
91
92	DESCRIPTION="GNOME compositing window manager based on Clutter"
93	HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
94	-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"
95	+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-r1-patchset.tar.xz"
96
97	LICENSE="GPL-2+"
98	SLOT="0/8" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
99	@@ -93,10 +93,7 @@ BDEPEND="
100	test? ( app-text/docbook-xml-dtd:4.5 )
101	wayland? (
102	>=sys-kernel/linux-headers-4.4
103	- \|\| (
104	- x11-libs/libxcvt
105	- <x11-base/xorg-server-1.20.11-r3[xorg,-minimal]
106	- )
107	+ x11-libs/libxcvt
108	)
109	"
110
111
112	diff --git a/x11-wm/mutter/mutter-41.0-r2.ebuild b/x11-wm/mutter/mutter-41.0-r3.ebuild
113	similarity index 96%
114	rename from x11-wm/mutter/mutter-41.0-r2.ebuild
115	rename to x11-wm/mutter/mutter-41.0-r3.ebuild
116	index bdc55adffa3..7eff393ac61 100644
117	--- a/x11-wm/mutter/mutter-41.0-r2.ebuild
118	+++ b/x11-wm/mutter/mutter-41.0-r3.ebuild
119	@@ -6,7 +6,7 @@ inherit gnome.org gnome2-utils meson udev xdg
120
121	DESCRIPTION="GNOME compositing window manager based on Clutter"
122	HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
123	-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"
124	+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-r1-patchset.tar.xz"
125
126	LICENSE="GPL-2+"
127	SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
128	@@ -96,10 +96,7 @@ BDEPEND="
129	)
130	wayland? (
131	>=sys-kernel/linux-headers-4.4
132	- \|\| (
133	- x11-libs/libxcvt
134	- <x11-base/xorg-server-1.20.11-r3[xorg,-minimal]
135	- )
136	+ x11-libs/libxcvt
137	)
138	"

Gentoo Archives: gentoo-commits