[gentoo-commits] proj/kde:master commit in: kde-base/systemsettings/, kde-base/systemsettings/files/ - gentoo-commits

From:	Michael Palimaka <kensington@×××××××××××.net>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/kde:master commit in: kde-base/systemsettings/, kde-base/systemsettings/files/
Date:	Wed, 02 May 2012 16:50:41
Message-Id:	`1335976884.b89d72e69460a641b8f92a11fb1717c68cd02323.kensington@gentoo`

1

commit:     b89d72e69460a641b8f92a11fb1717c68cd02323

2

Author:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>

3

AuthorDate: Wed May  2 16:41:24 2012 +0000

4

Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>

5

CommitDate: Wed May  2 16:41:24 2012 +0000

6

URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b89d72e6

7

8

[kde-base/systemsettings] Remove unused xinerama use flag and patch.

9

10

(Portage version: 2.1.10.57/git/Linux x86_64, unsigned Manifest commit)

11

12

---

13

 ...emsettings-4.4.2-xinerama_cmake_automagic.patch |   18 ------------------

14

 .../systemsettings/systemsettings-4.8.3.ebuild     |    9 +--------

15

 .../systemsettings-4.8.49.9999.ebuild              |    9 +--------

16

 kde-base/systemsettings/systemsettings-9999.ebuild |    9 +--------

17

 4 files changed, 3 insertions(+), 42 deletions(-)

18

19

diff --git a/kde-base/systemsettings/files/systemsettings-4.4.2-xinerama_cmake_automagic.patch b/kde-base/systemsettings/files/systemsettings-4.4.2-xinerama_cmake_automagic.patch

20

deleted file mode 100644

21

index 5596f41..0000000

22

--- a/kde-base/systemsettings/files/systemsettings-4.4.2-xinerama_cmake_automagic.patch

23

+++ /dev/null

24

@@ -1,18 +0,0 @@

25

-diff -r -u kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake kdebase-workspace-4.4.2/ConfigureChecks.cmake

26

---- kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake	2009-11-21 10:44:36.000000000 +0100

27

-+++ kdebase-workspace-4.4.2/ConfigureChecks.cmake	2010-04-02 00:04:32.000000000 +0200

28

-@@ -71,7 +71,14 @@

29

- macro_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR) # many uses

30

- macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE) # kwin

31

- macro_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # klipper, kicker, kwin

32

-+

33

-+if(NOT WITH_X11_Xinerama)

34

-+  set(X11_Xinerama_FOUND FALSE)

35

-+  MESSAGE(STATUS "Disabling Xinerama as requested on commandline.")

36

-+endif(NOT WITH_X11_Xinerama)

37

-+

38

- macro_bool_to_01(X11_Xinerama_FOUND HAVE_XINERAMA)

39

-+

40

- macro_bool_to_01(X11_Xrandr_FOUND HAVE_XRANDR) # kwin

41

- macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER) # kcontrol/style, kicker

42

- macro_bool_to_01(X11_xf86misc_FOUND HAVE_XF86MISC) # kdesktop and kcontrol/lock

43

44

diff --git a/kde-base/systemsettings/systemsettings-4.8.3.ebuild b/kde-base/systemsettings/systemsettings-4.8.3.ebuild

45

index 9ebd70a..6548761 100644

46

--- a/kde-base/systemsettings/systemsettings-4.8.3.ebuild

47

+++ b/kde-base/systemsettings/systemsettings-4.8.3.ebuild

48

@@ -11,7 +11,7 @@ VIRTUALX_REQUIRED="test"

49

 inherit kde4-meta

50

51

 DESCRIPTION="System settings utility"

52

-IUSE="debug gtk +usb xinerama"

53

+IUSE="debug gtk +usb"

54

 KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"

55

56

 COMMONDEPEND="

57

@@ -28,12 +28,10 @@ COMMONDEPEND="

58

 	x11-libs/libXtst

59

 	opengl? ( virtual/opengl )

60

 	usb? ( =virtual/libusb-0* )

61

-	xinerama? ( x11-libs/libXinerama )

62

"

63

 DEPEND="${COMMONDEPEND}

64

 	x11-proto/kbproto

65

 	x11-proto/xextproto

66

-	xinerama? ( x11-proto/xineramaproto )

67

"

68

 RDEPEND="${COMMONDEPEND}

69

 	sys-libs/timezone-data

70

@@ -58,10 +56,6 @@ KMEXTRACTONLY="

71

72

 add_blocker kdeaccessibility-colorschemes '<4.6.50'

73

74

-PATCHES=(

75

-	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"

76

-)

77

-

78

 src_unpack() {

79

 	if use handbook; then

80

 		KMEXTRA+="

81

@@ -90,7 +84,6 @@ src_configure() {

82

 		-DWITH_GLIB2=ON -DWITH_GObject=ON

83

 		$(cmake-utils_use_with opengl OpenGL)

84

 		$(cmake-utils_use_with usb)

85

-		$(cmake-utils_use_with xinerama X11_Xinerama)

86

)

87

88

 	kde4-meta_src_configure

89

90

diff --git a/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild b/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild

91

index d7c9582..9400782 100644

92

--- a/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild

93

+++ b/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild

94

@@ -11,7 +11,7 @@ VIRTUALX_REQUIRED="test"

95

 inherit kde4-meta

96

97

 DESCRIPTION="System settings utility"

98

-IUSE="debug gtk +usb xinerama"

99

+IUSE="debug gtk +usb"

100

 KEYWORDS=""

101

102

 COMMONDEPEND="

103

@@ -28,12 +28,10 @@ COMMONDEPEND="

104

 	x11-libs/libXtst

105

 	opengl? ( virtual/opengl )

106

 	usb? ( =virtual/libusb-0* )

107

-	xinerama? ( x11-libs/libXinerama )

108

"

109

 DEPEND="${COMMONDEPEND}

110

 	x11-proto/kbproto

111

 	x11-proto/xextproto

112

-	xinerama? ( x11-proto/xineramaproto )

113

"

114

 RDEPEND="${COMMONDEPEND}

115

 	sys-libs/timezone-data

116

@@ -58,10 +56,6 @@ KMEXTRACTONLY="

117

118

 add_blocker kdeaccessibility-colorschemes '<4.6.50'

119

120

-PATCHES=(

121

-	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"

122

-)

123

-

124

 src_unpack() {

125

 	if use handbook; then

126

 		KMEXTRA+="

127

@@ -90,7 +84,6 @@ src_configure() {

128

 		-DWITH_GLIB2=ON -DWITH_GObject=ON

129

 		$(cmake-utils_use_with opengl OpenGL)

130

 		$(cmake-utils_use_with usb)

131

-		$(cmake-utils_use_with xinerama X11_Xinerama)

132

)

133

134

 	kde4-meta_src_configure

135

136

diff --git a/kde-base/systemsettings/systemsettings-9999.ebuild b/kde-base/systemsettings/systemsettings-9999.ebuild

137

index d7c9582..9400782 100644

138

--- a/kde-base/systemsettings/systemsettings-9999.ebuild

139

+++ b/kde-base/systemsettings/systemsettings-9999.ebuild

140

@@ -11,7 +11,7 @@ VIRTUALX_REQUIRED="test"

141

 inherit kde4-meta

142

143

 DESCRIPTION="System settings utility"

144

-IUSE="debug gtk +usb xinerama"

145

+IUSE="debug gtk +usb"

146

 KEYWORDS=""

147

148

 COMMONDEPEND="

149

@@ -28,12 +28,10 @@ COMMONDEPEND="

150

 	x11-libs/libXtst

151

 	opengl? ( virtual/opengl )

152

 	usb? ( =virtual/libusb-0* )

153

-	xinerama? ( x11-libs/libXinerama )

154

"

155

 DEPEND="${COMMONDEPEND}

156

 	x11-proto/kbproto

157

 	x11-proto/xextproto

158

-	xinerama? ( x11-proto/xineramaproto )

159

"

160

 RDEPEND="${COMMONDEPEND}

161

 	sys-libs/timezone-data

162

@@ -58,10 +56,6 @@ KMEXTRACTONLY="

163

164

 add_blocker kdeaccessibility-colorschemes '<4.6.50'

165

166

-PATCHES=(

167

-	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"

168

-)

169

-

170

 src_unpack() {

171

 	if use handbook; then

172

 		KMEXTRA+="

173

@@ -90,7 +84,6 @@ src_configure() {

174

 		-DWITH_GLIB2=ON -DWITH_GObject=ON

175

 		$(cmake-utils_use_with opengl OpenGL)

176

 		$(cmake-utils_use_with usb)

177

-		$(cmake-utils_use_with xinerama X11_Xinerama)

178

)

179

180

 	kde4-meta_src_configure

1	commit: b89d72e69460a641b8f92a11fb1717c68cd02323
2	Author: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
3	AuthorDate: Wed May 2 16:41:24 2012 +0000
4	Commit: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
5	CommitDate: Wed May 2 16:41:24 2012 +0000
6	URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b89d72e6
7
8	[kde-base/systemsettings] Remove unused xinerama use flag and patch.
9
10	(Portage version: 2.1.10.57/git/Linux x86_64, unsigned Manifest commit)
11
12	---
13	...emsettings-4.4.2-xinerama_cmake_automagic.patch \| 18 ------------------
14	.../systemsettings/systemsettings-4.8.3.ebuild \| 9 +--------
15	.../systemsettings-4.8.49.9999.ebuild \| 9 +--------
16	kde-base/systemsettings/systemsettings-9999.ebuild \| 9 +--------
17	4 files changed, 3 insertions(+), 42 deletions(-)
18
19	diff --git a/kde-base/systemsettings/files/systemsettings-4.4.2-xinerama_cmake_automagic.patch b/kde-base/systemsettings/files/systemsettings-4.4.2-xinerama_cmake_automagic.patch
20	deleted file mode 100644
21	index 5596f41..0000000
22	--- a/kde-base/systemsettings/files/systemsettings-4.4.2-xinerama_cmake_automagic.patch
23	+++ /dev/null
24	@@ -1,18 +0,0 @@
25	-diff -r -u kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake kdebase-workspace-4.4.2/ConfigureChecks.cmake
26	---- kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake 2009-11-21 10:44:36.000000000 +0100
27	-+++ kdebase-workspace-4.4.2/ConfigureChecks.cmake 2010-04-02 00:04:32.000000000 +0200
28	-@@ -71,7 +71,14 @@
29	- macro_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR) # many uses
30	- macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE) # kwin
31	- macro_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # klipper, kicker, kwin
32	-+
33	-+if(NOT WITH_X11_Xinerama)
34	-+ set(X11_Xinerama_FOUND FALSE)
35	-+ MESSAGE(STATUS "Disabling Xinerama as requested on commandline.")
36	-+endif(NOT WITH_X11_Xinerama)
37	-+
38	- macro_bool_to_01(X11_Xinerama_FOUND HAVE_XINERAMA)
39	-+
40	- macro_bool_to_01(X11_Xrandr_FOUND HAVE_XRANDR) # kwin
41	- macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER) # kcontrol/style, kicker
42	- macro_bool_to_01(X11_xf86misc_FOUND HAVE_XF86MISC) # kdesktop and kcontrol/lock
43
44	diff --git a/kde-base/systemsettings/systemsettings-4.8.3.ebuild b/kde-base/systemsettings/systemsettings-4.8.3.ebuild
45	index 9ebd70a..6548761 100644
46	--- a/kde-base/systemsettings/systemsettings-4.8.3.ebuild
47	+++ b/kde-base/systemsettings/systemsettings-4.8.3.ebuild
48	@@ -11,7 +11,7 @@ VIRTUALX_REQUIRED="test"
49	inherit kde4-meta
50
51	DESCRIPTION="System settings utility"
52	-IUSE="debug gtk +usb xinerama"
53	+IUSE="debug gtk +usb"
54	KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
55
56	COMMONDEPEND="
57	@@ -28,12 +28,10 @@ COMMONDEPEND="
58	x11-libs/libXtst
59	opengl? ( virtual/opengl )
60	usb? ( =virtual/libusb-0* )
61	- xinerama? ( x11-libs/libXinerama )
62	"
63	DEPEND="${COMMONDEPEND}
64	x11-proto/kbproto
65	x11-proto/xextproto
66	- xinerama? ( x11-proto/xineramaproto )
67	"
68	RDEPEND="${COMMONDEPEND}
69	sys-libs/timezone-data
70	@@ -58,10 +56,6 @@ KMEXTRACTONLY="
71
72	add_blocker kdeaccessibility-colorschemes '<4.6.50'
73
74	-PATCHES=(
75	- "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
76	-)
77	-
78	src_unpack() {
79	if use handbook; then
80	KMEXTRA+="
81	@@ -90,7 +84,6 @@ src_configure() {
82	-DWITH_GLIB2=ON -DWITH_GObject=ON
83	$(cmake-utils_use_with opengl OpenGL)
84	$(cmake-utils_use_with usb)
85	- $(cmake-utils_use_with xinerama X11_Xinerama)
86	)
87
88	kde4-meta_src_configure
89
90	diff --git a/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild b/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild
91	index d7c9582..9400782 100644
92	--- a/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild
93	+++ b/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild
94	@@ -11,7 +11,7 @@ VIRTUALX_REQUIRED="test"
95	inherit kde4-meta
96
97	DESCRIPTION="System settings utility"
98	-IUSE="debug gtk +usb xinerama"
99	+IUSE="debug gtk +usb"
100	KEYWORDS=""
101
102	COMMONDEPEND="
103	@@ -28,12 +28,10 @@ COMMONDEPEND="
104	x11-libs/libXtst
105	opengl? ( virtual/opengl )
106	usb? ( =virtual/libusb-0* )
107	- xinerama? ( x11-libs/libXinerama )
108	"
109	DEPEND="${COMMONDEPEND}
110	x11-proto/kbproto
111	x11-proto/xextproto
112	- xinerama? ( x11-proto/xineramaproto )
113	"
114	RDEPEND="${COMMONDEPEND}
115	sys-libs/timezone-data
116	@@ -58,10 +56,6 @@ KMEXTRACTONLY="
117
118	add_blocker kdeaccessibility-colorschemes '<4.6.50'
119
120	-PATCHES=(
121	- "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
122	-)
123	-
124	src_unpack() {
125	if use handbook; then
126	KMEXTRA+="
127	@@ -90,7 +84,6 @@ src_configure() {
128	-DWITH_GLIB2=ON -DWITH_GObject=ON
129	$(cmake-utils_use_with opengl OpenGL)
130	$(cmake-utils_use_with usb)
131	- $(cmake-utils_use_with xinerama X11_Xinerama)
132	)
133
134	kde4-meta_src_configure
135
136	diff --git a/kde-base/systemsettings/systemsettings-9999.ebuild b/kde-base/systemsettings/systemsettings-9999.ebuild
137	index d7c9582..9400782 100644
138	--- a/kde-base/systemsettings/systemsettings-9999.ebuild
139	+++ b/kde-base/systemsettings/systemsettings-9999.ebuild
140	@@ -11,7 +11,7 @@ VIRTUALX_REQUIRED="test"
141	inherit kde4-meta
142
143	DESCRIPTION="System settings utility"
144	-IUSE="debug gtk +usb xinerama"
145	+IUSE="debug gtk +usb"
146	KEYWORDS=""
147
148	COMMONDEPEND="
149	@@ -28,12 +28,10 @@ COMMONDEPEND="
150	x11-libs/libXtst
151	opengl? ( virtual/opengl )
152	usb? ( =virtual/libusb-0* )
153	- xinerama? ( x11-libs/libXinerama )
154	"
155	DEPEND="${COMMONDEPEND}
156	x11-proto/kbproto
157	x11-proto/xextproto
158	- xinerama? ( x11-proto/xineramaproto )
159	"
160	RDEPEND="${COMMONDEPEND}
161	sys-libs/timezone-data
162	@@ -58,10 +56,6 @@ KMEXTRACTONLY="
163
164	add_blocker kdeaccessibility-colorschemes '<4.6.50'
165
166	-PATCHES=(
167	- "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
168	-)
169	-
170	src_unpack() {
171	if use handbook; then
172	KMEXTRA+="
173	@@ -90,7 +84,6 @@ src_configure() {
174	-DWITH_GLIB2=ON -DWITH_GObject=ON
175	$(cmake-utils_use_with opengl OpenGL)
176	$(cmake-utils_use_with usb)
177	- $(cmake-utils_use_with xinerama X11_Xinerama)
178	)
179
180	kde4-meta_src_configure

Gentoo Archives: gentoo-commits