[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-vanilla/ - gentoo-commits

From:	Ionen Wolkens <ionen@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-vanilla/
Date:	Sat, 21 May 2022 04:09:40
Message-Id:	`1653105925.44e077c5adb80720cca52fe9cdcd886a9015e940.ionen@gentoo`

1

commit:     44e077c5adb80720cca52fe9cdcd886a9015e940

2

Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>

3

AuthorDate: Sat May 21 04:05:21 2022 +0000

4

Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>

5

CommitDate: Sat May 21 04:05:25 2022 +0000

6

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

7

8

app-emulation/wine-vanilla: don't pull toolchain with USE=-mingw

9

10

Oversight due to copying from other ebuilds which always need it.

11

12

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

13

14

 app-emulation/wine-vanilla/wine-vanilla-6.0.2.ebuild  | 4 ++--

15

 app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild | 2 +-

16

 app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild    | 4 ++--

17

 app-emulation/wine-vanilla/wine-vanilla-7.5-r1.ebuild | 2 +-

18

 app-emulation/wine-vanilla/wine-vanilla-7.6-r1.ebuild | 2 +-

19

 app-emulation/wine-vanilla/wine-vanilla-7.7.ebuild    | 2 +-

20

 app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild    | 2 +-

21

 app-emulation/wine-vanilla/wine-vanilla-9999.ebuild   | 2 +-

22

 8 files changed, 10 insertions(+), 10 deletions(-)

23

24

diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.0.2.ebuild

25

index 807ee258f16e..824f7ec80c90 100644

26

--- a/app-emulation/wine-vanilla/wine-vanilla-6.0.2.ebuild

27

+++ b/app-emulation/wine-vanilla/wine-vanilla-6.0.2.ebuild

28

@@ -129,8 +129,8 @@ DEPEND="${COMMON_DEPEND}

29

 	virtual/pkgconfig

30

 	virtual/yacc

31

 	X? ( x11-base/xorg-proto )

32

-	xinerama? ( x11-base/xorg-proto )

33

-	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"

34

+	mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )

35

+	xinerama? ( x11-base/xorg-proto )"

36

37

 # These use a non-standard "Wine" category, which is provided by

38

 # /etc/xdg/applications-merged/wine.menu

39

40

diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild

41

index 65ad27032112..2465210cbcdc 100644

42

--- a/app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild

43

+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild

44

@@ -51,7 +51,7 @@ RESTRICT="test"

45

 BDEPEND="sys-devel/flex

46

 	virtual/yacc

47

 	virtual/pkgconfig

48

-	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"

49

+	mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )"

50

51

 COMMON_DEPEND="

52

 	X? (

53

54

diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild

55

index d1b64ae6c268..fe58b813af6d 100644

56

--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild

57

+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild

58

@@ -122,8 +122,8 @@ DEPEND="${COMMON_DEPEND}

59

 	virtual/pkgconfig

60

 	virtual/yacc

61

 	X? ( x11-base/xorg-proto )

62

-	xinerama? ( x11-base/xorg-proto )

63

-	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"

64

+	mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )

65

+	xinerama? ( x11-base/xorg-proto )"

66

67

 # These use a non-standard "Wine" category, which is provided by

68

 # /etc/xdg/applications-merged/wine.menu

69

70

diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.5-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.5-r1.ebuild

71

index 0d667bb08b98..6702e4de1493 100644

72

--- a/app-emulation/wine-vanilla/wine-vanilla-7.5-r1.ebuild

73

+++ b/app-emulation/wine-vanilla/wine-vanilla-7.5-r1.ebuild

74

@@ -51,7 +51,7 @@ RESTRICT="test"

75

 BDEPEND="sys-devel/flex

76

 	virtual/yacc

77

 	virtual/pkgconfig

78

-	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"

79

+	mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )"

80

81

 COMMON_DEPEND="

82

 	X? (

83

84

diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.6-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.6-r1.ebuild

85

index c097218912e6..80752f7676fe 100644

86

--- a/app-emulation/wine-vanilla/wine-vanilla-7.6-r1.ebuild

87

+++ b/app-emulation/wine-vanilla/wine-vanilla-7.6-r1.ebuild

88

@@ -51,7 +51,7 @@ RESTRICT="test"

89

 BDEPEND="sys-devel/flex

90

 	virtual/yacc

91

 	virtual/pkgconfig

92

-	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"

93

+	mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )"

94

95

 COMMON_DEPEND="

96

 	X? (

97

98

diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.7.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.7.ebuild

99

index c097218912e6..80752f7676fe 100644

100

--- a/app-emulation/wine-vanilla/wine-vanilla-7.7.ebuild

101

+++ b/app-emulation/wine-vanilla/wine-vanilla-7.7.ebuild

102

@@ -51,7 +51,7 @@ RESTRICT="test"

103

 BDEPEND="sys-devel/flex

104

 	virtual/yacc

105

 	virtual/pkgconfig

106

-	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"

107

+	mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )"

108

109

 COMMON_DEPEND="

110

 	X? (

111

112

diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild

113

index 6793bf6d1852..40974d38a1ce 100644

114

--- a/app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild

115

+++ b/app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild

116

@@ -50,7 +50,7 @@ RESTRICT="test"

117

 BDEPEND="sys-devel/flex

118

 	virtual/yacc

119

 	virtual/pkgconfig

120

-	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"

121

+	mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )"

122

123

 COMMON_DEPEND="

124

 	X? (

125

126

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild

127

index 6793bf6d1852..40974d38a1ce 100644

128

--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild

129

+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild

130

@@ -50,7 +50,7 @@ RESTRICT="test"

131

 BDEPEND="sys-devel/flex

132

 	virtual/yacc

133

 	virtual/pkgconfig

134

-	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"

135

+	mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )"

136

137

 COMMON_DEPEND="

138

 	X? (

1	commit: 44e077c5adb80720cca52fe9cdcd886a9015e940
2	Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3	AuthorDate: Sat May 21 04:05:21 2022 +0000
4	Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5	CommitDate: Sat May 21 04:05:25 2022 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44e077c5
7
8	app-emulation/wine-vanilla: don't pull toolchain with USE=-mingw
9
10	Oversight due to copying from other ebuilds which always need it.
11
12	Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
13
14	app-emulation/wine-vanilla/wine-vanilla-6.0.2.ebuild \| 4 ++--
15	app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild \| 2 +-
16	app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild \| 4 ++--
17	app-emulation/wine-vanilla/wine-vanilla-7.5-r1.ebuild \| 2 +-
18	app-emulation/wine-vanilla/wine-vanilla-7.6-r1.ebuild \| 2 +-
19	app-emulation/wine-vanilla/wine-vanilla-7.7.ebuild \| 2 +-
20	app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild \| 2 +-
21	app-emulation/wine-vanilla/wine-vanilla-9999.ebuild \| 2 +-
22	8 files changed, 10 insertions(+), 10 deletions(-)
23
24	diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.0.2.ebuild
25	index 807ee258f16e..824f7ec80c90 100644
26	--- a/app-emulation/wine-vanilla/wine-vanilla-6.0.2.ebuild
27	+++ b/app-emulation/wine-vanilla/wine-vanilla-6.0.2.ebuild
28	@@ -129,8 +129,8 @@ DEPEND="${COMMON_DEPEND}
29	virtual/pkgconfig
30	virtual/yacc
31	X? ( x11-base/xorg-proto )
32	- xinerama? ( x11-base/xorg-proto )
33	- !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
34	+ mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )
35	+ xinerama? ( x11-base/xorg-proto )"
36
37	# These use a non-standard "Wine" category, which is provided by
38	# /etc/xdg/applications-merged/wine.menu
39
40	diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild
41	index 65ad27032112..2465210cbcdc 100644
42	--- a/app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild
43	+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild
44	@@ -51,7 +51,7 @@ RESTRICT="test"
45	BDEPEND="sys-devel/flex
46	virtual/yacc
47	virtual/pkgconfig
48	- !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
49	+ mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )"
50
51	COMMON_DEPEND="
52	X? (
53
54	diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild
55	index d1b64ae6c268..fe58b813af6d 100644
56	--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild
57	+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild
58	@@ -122,8 +122,8 @@ DEPEND="${COMMON_DEPEND}
59	virtual/pkgconfig
60	virtual/yacc
61	X? ( x11-base/xorg-proto )
62	- xinerama? ( x11-base/xorg-proto )
63	- !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
64	+ mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )
65	+ xinerama? ( x11-base/xorg-proto )"
66
67	# These use a non-standard "Wine" category, which is provided by
68	# /etc/xdg/applications-merged/wine.menu
69
70	diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.5-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.5-r1.ebuild
71	index 0d667bb08b98..6702e4de1493 100644
72	--- a/app-emulation/wine-vanilla/wine-vanilla-7.5-r1.ebuild
73	+++ b/app-emulation/wine-vanilla/wine-vanilla-7.5-r1.ebuild
74	@@ -51,7 +51,7 @@ RESTRICT="test"
75	BDEPEND="sys-devel/flex
76	virtual/yacc
77	virtual/pkgconfig
78	- !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
79	+ mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )"
80
81	COMMON_DEPEND="
82	X? (
83
84	diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.6-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.6-r1.ebuild
85	index c097218912e6..80752f7676fe 100644
86	--- a/app-emulation/wine-vanilla/wine-vanilla-7.6-r1.ebuild
87	+++ b/app-emulation/wine-vanilla/wine-vanilla-7.6-r1.ebuild
88	@@ -51,7 +51,7 @@ RESTRICT="test"
89	BDEPEND="sys-devel/flex
90	virtual/yacc
91	virtual/pkgconfig
92	- !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
93	+ mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )"
94
95	COMMON_DEPEND="
96	X? (
97
98	diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.7.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.7.ebuild
99	index c097218912e6..80752f7676fe 100644
100	--- a/app-emulation/wine-vanilla/wine-vanilla-7.7.ebuild
101	+++ b/app-emulation/wine-vanilla/wine-vanilla-7.7.ebuild
102	@@ -51,7 +51,7 @@ RESTRICT="test"
103	BDEPEND="sys-devel/flex
104	virtual/yacc
105	virtual/pkgconfig
106	- !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
107	+ mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )"
108
109	COMMON_DEPEND="
110	X? (
111
112	diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild
113	index 6793bf6d1852..40974d38a1ce 100644
114	--- a/app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild
115	+++ b/app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild
116	@@ -50,7 +50,7 @@ RESTRICT="test"
117	BDEPEND="sys-devel/flex
118	virtual/yacc
119	virtual/pkgconfig
120	- !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
121	+ mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )"
122
123	COMMON_DEPEND="
124	X? (
125
126	diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
127	index 6793bf6d1852..40974d38a1ce 100644
128	--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
129	+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
130	@@ -50,7 +50,7 @@ RESTRICT="test"
131	BDEPEND="sys-devel/flex
132	virtual/yacc
133	virtual/pkgconfig
134	- !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
135	+ mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )"
136
137	COMMON_DEPEND="
138	X? (

Gentoo Archives: gentoo-commits