1 |
commit: 73144922ba1464d460692f59b0b36d29b93fc047 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 26 00:00:24 2017 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 26 00:04:08 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73144922 |
7 |
|
8 |
x11-base/xorg-server: Drop versions depending on <eselect-opengl-1.3.0. |
9 |
|
10 |
x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild | 252 --------------------- |
11 |
x11-base/xorg-server/xorg-server-1.15.2-r2.ebuild | 261 ---------------------- |
12 |
x11-base/xorg-server/xorg-server-1.16.4.ebuild | 258 --------------------- |
13 |
3 files changed, 771 deletions(-) |
14 |
|
15 |
diff --git a/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild b/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild |
16 |
deleted file mode 100644 |
17 |
index 35a77f1..00000000 |
18 |
--- a/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild |
19 |
+++ /dev/null |
20 |
@@ -1,252 +0,0 @@ |
21 |
-# Copyright 1999-2016 Gentoo Foundation |
22 |
-# Distributed under the terms of the GNU General Public License v2 |
23 |
-# $Id$ |
24 |
- |
25 |
-EAPI=5 |
26 |
- |
27 |
-XORG_DOC=doc |
28 |
-inherit xorg-2 multilib versionator flag-o-matic |
29 |
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" |
30 |
- |
31 |
-DESCRIPTION="X.Org X servers" |
32 |
-SLOT="0/${PV}" |
33 |
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" |
34 |
- |
35 |
-SRC_URI="${SRC_URI} mirror://gentoo/${PN}-1.12-cve-2014-8091..8103.patches.tar.xz" |
36 |
- |
37 |
-IUSE_SERVERS="dmx kdrive xnest xorg xvfb" |
38 |
-IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev" |
39 |
- |
40 |
-RDEPEND=">=app-eselect/eselect-opengl-1.0.8 |
41 |
- dev-libs/openssl:0= |
42 |
- media-libs/freetype |
43 |
- >=x11-apps/iceauth-1.0.2 |
44 |
- >=x11-apps/rgb-1.0.3 |
45 |
- >=x11-apps/xauth-1.0.3 |
46 |
- x11-apps/xkbcomp |
47 |
- >=x11-libs/libpciaccess-0.12.901 |
48 |
- >=x11-libs/libXau-1.0.4 |
49 |
- >=x11-libs/libXdmcp-1.0.2 |
50 |
- >=x11-libs/libXfont-1.4.2 |
51 |
- <x11-libs/libXfont-1.5.0 |
52 |
- >=x11-libs/libxkbfile-1.0.4 |
53 |
- >=x11-libs/pixman-0.21.8 |
54 |
- >=x11-libs/xtrans-1.2.2 |
55 |
- >=x11-misc/xbitmaps-1.0.1 |
56 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
57 |
- dmx? ( |
58 |
- x11-libs/libXt |
59 |
- >=x11-libs/libdmx-1.0.99.1 |
60 |
- >=x11-libs/libX11-1.1.5 |
61 |
- >=x11-libs/libXaw-1.0.4 |
62 |
- >=x11-libs/libXext-1.0.99.4 |
63 |
- >=x11-libs/libXfixes-5.0 |
64 |
- >=x11-libs/libXi-1.2.99.1 |
65 |
- >=x11-libs/libXmu-1.0.3 |
66 |
- x11-libs/libXrender |
67 |
- >=x11-libs/libXres-1.0.3 |
68 |
- >=x11-libs/libXtst-1.0.99.2 |
69 |
- ) |
70 |
- kdrive? ( |
71 |
- >=x11-libs/libXext-1.0.5 |
72 |
- x11-libs/libXv |
73 |
- ) |
74 |
- !minimal? ( |
75 |
- >=x11-libs/libX11-1.1.5 |
76 |
- >=x11-libs/libXext-1.0.5 |
77 |
- >=media-libs/mesa-7.8_rc[nptl=] |
78 |
- ) |
79 |
- tslib? ( >=x11-libs/tslib-1.0 ) |
80 |
- udev? ( >=virtual/udev-150 ) |
81 |
- >=x11-apps/xinit-1.3 |
82 |
- selinux? ( sec-policy/selinux-xserver )" |
83 |
- |
84 |
-DEPEND="${RDEPEND} |
85 |
- sys-devel/flex |
86 |
- >=x11-proto/bigreqsproto-1.1.0 |
87 |
- >=x11-proto/compositeproto-0.4 |
88 |
- >=x11-proto/damageproto-1.1 |
89 |
- >=x11-proto/fixesproto-5.0 |
90 |
- >=x11-proto/fontsproto-2.0.2 |
91 |
- <x11-proto/fontsproto-2.1.3 |
92 |
- >=x11-proto/glproto-1.4.14 |
93 |
- >=x11-proto/inputproto-2.1.99.3 |
94 |
- >=x11-proto/kbproto-1.0.3 |
95 |
- >=x11-proto/randrproto-1.2.99.3 |
96 |
- >=x11-proto/recordproto-1.13.99.1 |
97 |
- >=x11-proto/renderproto-0.11 |
98 |
- >=x11-proto/resourceproto-1.0.2 |
99 |
- >=x11-proto/scrnsaverproto-1.1 |
100 |
- >=x11-proto/trapproto-3.4.3 |
101 |
- >=x11-proto/videoproto-2.2.2 |
102 |
- >=x11-proto/xcmiscproto-1.2.0 |
103 |
- >=x11-proto/xextproto-7.1.99 |
104 |
- >=x11-proto/xf86dgaproto-2.0.99.1 |
105 |
- >=x11-proto/xf86rushproto-1.1.2 |
106 |
- >=x11-proto/xf86vidmodeproto-2.2.99.1 |
107 |
- >=x11-proto/xineramaproto-1.1.3 |
108 |
- >=x11-proto/xproto-7.0.22 |
109 |
- dmx? ( |
110 |
- >=x11-proto/dmxproto-2.2.99.1 |
111 |
- doc? ( |
112 |
- || ( |
113 |
- www-client/links |
114 |
- www-client/lynx |
115 |
- www-client/w3m |
116 |
- ) |
117 |
- ) |
118 |
- ) |
119 |
- !minimal? ( |
120 |
- >=x11-proto/xf86driproto-2.1.0 |
121 |
- >=x11-proto/dri2proto-2.6 |
122 |
- >=x11-libs/libdrm-2.4.20 |
123 |
- )" |
124 |
- |
125 |
-PDEPEND=" |
126 |
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
127 |
- |
128 |
-REQUIRED_USE="!minimal? ( |
129 |
- || ( ${IUSE_SERVERS} ) |
130 |
- )" |
131 |
- |
132 |
-# Security patches taken from Debian from their 1.12 package |
133 |
-UPSTREAMED_PATCHES=( |
134 |
- "${WORKDIR}"/patches/${PN}-1.12-cve-2014-8091..8103.patch |
135 |
-) |
136 |
- |
137 |
-PATCHES=( |
138 |
- "${UPSTREAMED_PATCHES[@]}" |
139 |
- "${FILESDIR}"/${PN}-1.12-disable-acpi.patch |
140 |
- "${FILESDIR}"/${PN}-1.12-cve-2013-1940.patch |
141 |
- "${FILESDIR}"/${PN}-1.12-cve-2013-4396.patch |
142 |
- "${FILESDIR}"/${PN}-1.17-cve-2015-0255-0.patch |
143 |
- "${FILESDIR}"/${PN}-1.17-cve-2015-0255-1.patch |
144 |
- "${FILESDIR}"/${PN}-1.12-cve-2015-3418.patch |
145 |
-) |
146 |
- |
147 |
-pkg_pretend() { |
148 |
- # older gcc is not supported |
149 |
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
150 |
- die "Sorry, but gcc earlier than 4.0 wont work for xorg-server." |
151 |
-} |
152 |
- |
153 |
-src_configure() { |
154 |
- # localstatedir is used for the log location; we need to override the default |
155 |
- # from ebuild.sh |
156 |
- # sysconfdir is used for the xorg.conf location; same applies |
157 |
- # --enable-install-setuid needed because sparcs default off |
158 |
- # NOTE: fop is used for doc generating ; and i have no idea if gentoo |
159 |
- # package it somewhere |
160 |
- XORG_CONFIGURE_OPTIONS=( |
161 |
- $(use_enable ipv6) |
162 |
- $(use_enable dmx) |
163 |
- $(use_enable kdrive) |
164 |
- $(use_enable kdrive kdrive-kbd) |
165 |
- $(use_enable kdrive kdrive-mouse) |
166 |
- $(use_enable kdrive kdrive-evdev) |
167 |
- $(use_enable tslib) |
168 |
- $(use_enable !minimal record) |
169 |
- $(use_enable !minimal xfree86-utils) |
170 |
- $(use_enable !minimal install-libxf86config) |
171 |
- $(use_enable !minimal dri) |
172 |
- $(use_enable !minimal dri2) |
173 |
- $(use_enable !minimal glx) |
174 |
- $(use_enable xnest) |
175 |
- $(use_enable xorg) |
176 |
- $(use_enable xvfb) |
177 |
- $(use_enable nptl glx-tls) |
178 |
- $(use_enable udev config-udev) |
179 |
- $(use_with doc doxygen) |
180 |
- $(use_with doc xmlto) |
181 |
- --sysconfdir=/etc/X11 |
182 |
- --localstatedir=/var |
183 |
- --enable-install-setuid |
184 |
- --with-fontrootdir=/usr/share/fonts |
185 |
- --with-xkb-output=/var/lib/xkb |
186 |
- --disable-config-hal |
187 |
- --without-dtrace |
188 |
- --without-fop |
189 |
- --with-os-vendor=Gentoo |
190 |
- ) |
191 |
- |
192 |
- # Xorg-server requires includes from OS mesa which are not visible for |
193 |
- # users of binary drivers. |
194 |
- mkdir -p "${T}/mesa-symlinks/GL" |
195 |
- for i in gl glx glxmd glxproto glxtokens; do |
196 |
- ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die |
197 |
- done |
198 |
- for i in glext glxext; do |
199 |
- ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die |
200 |
- done |
201 |
- append-cppflags "-I${T}/mesa-symlinks" |
202 |
- |
203 |
- xorg-2_src_configure |
204 |
-} |
205 |
- |
206 |
-src_install() { |
207 |
- xorg-2_src_install |
208 |
- |
209 |
- dynamic_libgl_install |
210 |
- |
211 |
- server_based_install |
212 |
- |
213 |
- if ! use minimal && use xorg; then |
214 |
- # Install xorg.conf.example into docs |
215 |
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
216 |
- fi |
217 |
- |
218 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
219 |
- newinitd "${FILESDIR}"/xdm.initd-9 xdm |
220 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
221 |
- |
222 |
- # install the @x11-module-rebuild set for Portage |
223 |
- insinto /usr/share/portage/config/sets |
224 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
225 |
-} |
226 |
- |
227 |
-pkg_postinst() { |
228 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
229 |
- eselect opengl set xorg-x11 --use-old |
230 |
- |
231 |
- if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then |
232 |
- ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)" |
233 |
- ewarn "because the ABI changed. If you cannot start X because" |
234 |
- ewarn "of module version mismatch errors, this is your problem." |
235 |
- |
236 |
- echo |
237 |
- ewarn "You can generate a list of all installed packages in the x11-drivers" |
238 |
- ewarn "category using this command:" |
239 |
- ewarn " emerge portage-utils; qlist -I -C x11-drivers/" |
240 |
- ewarn "or using sets from portage-2.2:" |
241 |
- ewarn " emerge @x11-module-rebuild" |
242 |
- fi |
243 |
-} |
244 |
- |
245 |
-pkg_postrm() { |
246 |
- # Get rid of module dir to ensure opengl-update works properly |
247 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
248 |
- rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules |
249 |
- fi |
250 |
-} |
251 |
- |
252 |
-dynamic_libgl_install() { |
253 |
- # next section is to setup the dynamic libGL stuff |
254 |
- ebegin "Moving GL files for dynamic switching" |
255 |
- dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions |
256 |
- local x="" |
257 |
- for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do |
258 |
- if [ -f ${x} -o -L ${x} ]; then |
259 |
- mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions |
260 |
- fi |
261 |
- done |
262 |
- eend 0 |
263 |
-} |
264 |
- |
265 |
-server_based_install() { |
266 |
- if ! use xorg; then |
267 |
- rm "${D}"/usr/share/man/man1/Xserver.1x \ |
268 |
- "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
269 |
- "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
270 |
- "${D}"/usr/share/man/man1/Xserver.1x |
271 |
- fi |
272 |
-} |
273 |
|
274 |
diff --git a/x11-base/xorg-server/xorg-server-1.15.2-r2.ebuild b/x11-base/xorg-server/xorg-server-1.15.2-r2.ebuild |
275 |
deleted file mode 100644 |
276 |
index d9598b4..00000000 |
277 |
--- a/x11-base/xorg-server/xorg-server-1.15.2-r2.ebuild |
278 |
+++ /dev/null |
279 |
@@ -1,261 +0,0 @@ |
280 |
-# Copyright 1999-2016 Gentoo Foundation |
281 |
-# Distributed under the terms of the GNU General Public License v2 |
282 |
-# $Id$ |
283 |
- |
284 |
-EAPI=5 |
285 |
- |
286 |
-XORG_EAUTORECONF=yes |
287 |
-XORG_DOC=doc |
288 |
-inherit xorg-2 multilib versionator flag-o-matic |
289 |
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" |
290 |
- |
291 |
-DESCRIPTION="X.Org X servers" |
292 |
-SLOT="0/${PV}" |
293 |
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
294 |
- |
295 |
-SRC_URI="${SRC_URI} mirror://gentoo/${PN}-1.16-cve-2014-8091..8103.patches.tar.xz" |
296 |
- |
297 |
-IUSE_SERVERS="dmx kdrive xnest xorg xvfb" |
298 |
-IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev unwind" |
299 |
- |
300 |
-CDEPEND=">=app-eselect/eselect-opengl-1.0.8 |
301 |
- dev-libs/openssl:0= |
302 |
- media-libs/freetype |
303 |
- >=x11-apps/iceauth-1.0.2 |
304 |
- >=x11-apps/rgb-1.0.3 |
305 |
- >=x11-apps/xauth-1.0.3 |
306 |
- x11-apps/xkbcomp |
307 |
- >=x11-libs/libdrm-2.4.20 |
308 |
- >=x11-libs/libpciaccess-0.12.901 |
309 |
- >=x11-libs/libXau-1.0.4 |
310 |
- >=x11-libs/libXdmcp-1.0.2 |
311 |
- >=x11-libs/libXfont-1.4.2 |
312 |
- <x11-libs/libXfont-1.5.0 |
313 |
- >=x11-libs/libxkbfile-1.0.4 |
314 |
- >=x11-libs/libxshmfence-1.1 |
315 |
- >=x11-libs/pixman-0.27.2 |
316 |
- >=x11-libs/xtrans-1.3.2 |
317 |
- >=x11-misc/xbitmaps-1.0.1 |
318 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
319 |
- dmx? ( |
320 |
- x11-libs/libXt |
321 |
- >=x11-libs/libdmx-1.0.99.1 |
322 |
- >=x11-libs/libX11-1.1.5 |
323 |
- >=x11-libs/libXaw-1.0.4 |
324 |
- >=x11-libs/libXext-1.0.99.4 |
325 |
- >=x11-libs/libXfixes-5.0 |
326 |
- >=x11-libs/libXi-1.2.99.1 |
327 |
- >=x11-libs/libXmu-1.0.3 |
328 |
- x11-libs/libXrender |
329 |
- >=x11-libs/libXres-1.0.3 |
330 |
- >=x11-libs/libXtst-1.0.99.2 |
331 |
- ) |
332 |
- kdrive? ( |
333 |
- >=x11-libs/libXext-1.0.5 |
334 |
- x11-libs/libXv |
335 |
- ) |
336 |
- !minimal? ( |
337 |
- >=x11-libs/libX11-1.1.5 |
338 |
- >=x11-libs/libXext-1.0.5 |
339 |
- >=media-libs/mesa-9.2.0[nptl=] |
340 |
- ) |
341 |
- tslib? ( >=x11-libs/tslib-1.0 ) |
342 |
- udev? ( >=virtual/udev-150 ) |
343 |
- unwind? ( sys-libs/libunwind ) |
344 |
- >=x11-apps/xinit-1.3" |
345 |
- |
346 |
-DEPEND="${CDEPEND} |
347 |
- sys-devel/flex |
348 |
- >=x11-proto/bigreqsproto-1.1.0 |
349 |
- >=x11-proto/compositeproto-0.4 |
350 |
- >=x11-proto/damageproto-1.1 |
351 |
- >=x11-proto/fixesproto-5.0 |
352 |
- >=x11-proto/fontsproto-2.0.2 |
353 |
- <x11-proto/fontsproto-2.1.3 |
354 |
- >=x11-proto/glproto-1.4.17 |
355 |
- >=x11-proto/inputproto-2.2.99.1 |
356 |
- >=x11-proto/kbproto-1.0.3 |
357 |
- >=x11-proto/randrproto-1.4.0 |
358 |
- >=x11-proto/recordproto-1.13.99.1 |
359 |
- >=x11-proto/renderproto-0.11 |
360 |
- >=x11-proto/resourceproto-1.2.0 |
361 |
- >=x11-proto/scrnsaverproto-1.1 |
362 |
- >=x11-proto/trapproto-3.4.3 |
363 |
- >=x11-proto/videoproto-2.2.2 |
364 |
- >=x11-proto/xcmiscproto-1.2.0 |
365 |
- >=x11-proto/xextproto-7.2.99.901 |
366 |
- >=x11-proto/xf86dgaproto-2.0.99.1 |
367 |
- >=x11-proto/xf86rushproto-1.1.2 |
368 |
- >=x11-proto/xf86vidmodeproto-2.2.99.1 |
369 |
- >=x11-proto/xineramaproto-1.1.3 |
370 |
- >=x11-proto/xproto-7.0.22 |
371 |
- >=x11-proto/presentproto-1.0 |
372 |
- >=x11-proto/dri3proto-1.0 |
373 |
- dmx? ( |
374 |
- >=x11-proto/dmxproto-2.2.99.1 |
375 |
- doc? ( |
376 |
- || ( |
377 |
- www-client/links |
378 |
- www-client/lynx |
379 |
- www-client/w3m |
380 |
- ) |
381 |
- ) |
382 |
- ) |
383 |
- !minimal? ( |
384 |
- >=x11-proto/xf86driproto-2.1.0 |
385 |
- >=x11-proto/dri2proto-2.8 |
386 |
- )" |
387 |
- |
388 |
-RDEPEND="${CDEPEND} |
389 |
- selinux? ( sec-policy/selinux-xserver ) |
390 |
-" |
391 |
- |
392 |
-PDEPEND=" |
393 |
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
394 |
- |
395 |
-REQUIRED_USE="!minimal? ( |
396 |
- || ( ${IUSE_SERVERS} ) |
397 |
- )" |
398 |
- |
399 |
-pkg_pretend() { |
400 |
- # older gcc is not supported |
401 |
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
402 |
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
403 |
-} |
404 |
- |
405 |
-src_prepare() { |
406 |
- UPSTREAMED_PATCHES=( |
407 |
- "${WORKDIR}"/patches/*.patch |
408 |
- ) |
409 |
- PATCHES=( |
410 |
- "${UPSTREAMED_PATCHES[@]}" |
411 |
- "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch |
412 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
413 |
- "${FILESDIR}"/${PN}-1.17-cve-2015-0255-0.patch |
414 |
- "${FILESDIR}"/${PN}-1.17-cve-2015-0255-1.patch |
415 |
- |
416 |
- ) |
417 |
- xorg-2_src_prepare |
418 |
-} |
419 |
- |
420 |
-src_configure() { |
421 |
- # localstatedir is used for the log location; we need to override the default |
422 |
- # from ebuild.sh |
423 |
- # sysconfdir is used for the xorg.conf location; same applies |
424 |
- # NOTE: fop is used for doc generating ; and i have no idea if gentoo |
425 |
- # package it somewhere |
426 |
- XORG_CONFIGURE_OPTIONS=( |
427 |
- $(use_enable ipv6) |
428 |
- $(use_enable dmx) |
429 |
- $(use_enable kdrive) |
430 |
- $(use_enable kdrive kdrive-kbd) |
431 |
- $(use_enable kdrive kdrive-mouse) |
432 |
- $(use_enable kdrive kdrive-evdev) |
433 |
- $(use_enable suid install-setuid) |
434 |
- $(use_enable tslib) |
435 |
- $(use_enable unwind libunwind) |
436 |
- $(use_enable !minimal record) |
437 |
- $(use_enable !minimal xfree86-utils) |
438 |
- $(use_enable !minimal install-libxf86config) |
439 |
- $(use_enable !minimal dri) |
440 |
- $(use_enable !minimal dri2) |
441 |
- $(use_enable !minimal glx) |
442 |
- $(use_enable xnest) |
443 |
- $(use_enable xorg) |
444 |
- $(use_enable xvfb) |
445 |
- $(use_enable nptl glx-tls) |
446 |
- $(use_enable udev config-udev) |
447 |
- $(use_with doc doxygen) |
448 |
- $(use_with doc xmlto) |
449 |
- --enable-libdrm |
450 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
451 |
- --localstatedir="${EPREFIX}"/var |
452 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
453 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
454 |
- --disable-config-hal |
455 |
- --disable-linux-acpi |
456 |
- --without-dtrace |
457 |
- --without-fop |
458 |
- --with-os-vendor=Gentoo |
459 |
- --with-sha1=libcrypto |
460 |
- ) |
461 |
- |
462 |
- # Xorg-server requires includes from OS mesa which are not visible for |
463 |
- # users of binary drivers. |
464 |
- mkdir -p "${T}/mesa-symlinks/GL" |
465 |
- for i in gl glx glxmd glxproto glxtokens; do |
466 |
- ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die |
467 |
- done |
468 |
- for i in glext glxext; do |
469 |
- ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die |
470 |
- done |
471 |
- append-cppflags "-I${T}/mesa-symlinks" |
472 |
- |
473 |
- xorg-2_src_configure |
474 |
-} |
475 |
- |
476 |
-src_install() { |
477 |
- xorg-2_src_install |
478 |
- |
479 |
- dynamic_libgl_install |
480 |
- |
481 |
- server_based_install |
482 |
- |
483 |
- if ! use minimal && use xorg; then |
484 |
- # Install xorg.conf.example into docs |
485 |
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
486 |
- fi |
487 |
- |
488 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
489 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
490 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
491 |
- |
492 |
- # install the @x11-module-rebuild set for Portage |
493 |
- insinto /usr/share/portage/config/sets |
494 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
495 |
-} |
496 |
- |
497 |
-pkg_postinst() { |
498 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
499 |
- eselect opengl set xorg-x11 --use-old |
500 |
- |
501 |
- if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then |
502 |
- ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)" |
503 |
- ewarn "because the ABI changed. If you cannot start X because" |
504 |
- ewarn "of module version mismatch errors, this is your problem." |
505 |
- |
506 |
- echo |
507 |
- ewarn "You can rebuild all installed packages in the x11-drivers" |
508 |
- ewarn "category using this command:" |
509 |
- ewarn " emerge @x11-module-rebuild" |
510 |
- fi |
511 |
-} |
512 |
- |
513 |
-pkg_postrm() { |
514 |
- # Get rid of module dir to ensure opengl-update works properly |
515 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
516 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
517 |
- fi |
518 |
-} |
519 |
- |
520 |
-dynamic_libgl_install() { |
521 |
- # next section is to setup the dynamic libGL stuff |
522 |
- ebegin "Moving GL files for dynamic switching" |
523 |
- dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions |
524 |
- local x="" |
525 |
- for x in "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do |
526 |
- if [ -f ${x} -o -L ${x} ]; then |
527 |
- mv -f ${x} "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/extensions |
528 |
- fi |
529 |
- done |
530 |
- eend 0 |
531 |
-} |
532 |
- |
533 |
-server_based_install() { |
534 |
- if ! use xorg; then |
535 |
- rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
536 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
537 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
538 |
- "${ED}"/usr/share/man/man1/Xserver.1x |
539 |
- fi |
540 |
-} |
541 |
|
542 |
diff --git a/x11-base/xorg-server/xorg-server-1.16.4.ebuild b/x11-base/xorg-server/xorg-server-1.16.4.ebuild |
543 |
deleted file mode 100644 |
544 |
index def322f..00000000 |
545 |
--- a/x11-base/xorg-server/xorg-server-1.16.4.ebuild |
546 |
+++ /dev/null |
547 |
@@ -1,258 +0,0 @@ |
548 |
-# Copyright 1999-2016 Gentoo Foundation |
549 |
-# Distributed under the terms of the GNU General Public License v2 |
550 |
-# $Id$ |
551 |
- |
552 |
-EAPI=5 |
553 |
- |
554 |
-XORG_DOC=doc |
555 |
-inherit xorg-2 multilib versionator flag-o-matic |
556 |
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" |
557 |
- |
558 |
-DESCRIPTION="X.Org X servers" |
559 |
-SLOT="0/1.16.1" |
560 |
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
561 |
- |
562 |
-IUSE_SERVERS="dmx kdrive xnest xorg xvfb" |
563 |
-IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland" |
564 |
- |
565 |
-CDEPEND=">=app-eselect/eselect-opengl-1.0.8 |
566 |
- !>=app-eselect/eselect-opengl-1.3.0 |
567 |
- dev-libs/openssl:0= |
568 |
- media-libs/freetype |
569 |
- >=x11-apps/iceauth-1.0.2 |
570 |
- >=x11-apps/rgb-1.0.3 |
571 |
- >=x11-apps/xauth-1.0.3 |
572 |
- x11-apps/xkbcomp |
573 |
- >=x11-libs/libdrm-2.4.20 |
574 |
- >=x11-libs/libpciaccess-0.12.901 |
575 |
- >=x11-libs/libXau-1.0.4 |
576 |
- >=x11-libs/libXdmcp-1.0.2 |
577 |
- >=x11-libs/libXfont-1.4.2 |
578 |
- >=x11-libs/libxkbfile-1.0.4 |
579 |
- >=x11-libs/libxshmfence-1.1 |
580 |
- >=x11-libs/pixman-0.27.2 |
581 |
- >=x11-libs/xtrans-1.3.3 |
582 |
- >=x11-misc/xbitmaps-1.0.1 |
583 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
584 |
- dmx? ( |
585 |
- x11-libs/libXt |
586 |
- >=x11-libs/libdmx-1.0.99.1 |
587 |
- >=x11-libs/libX11-1.1.5 |
588 |
- >=x11-libs/libXaw-1.0.4 |
589 |
- >=x11-libs/libXext-1.0.99.4 |
590 |
- >=x11-libs/libXfixes-5.0 |
591 |
- >=x11-libs/libXi-1.2.99.1 |
592 |
- >=x11-libs/libXmu-1.0.3 |
593 |
- x11-libs/libXrender |
594 |
- >=x11-libs/libXres-1.0.3 |
595 |
- >=x11-libs/libXtst-1.0.99.2 |
596 |
- ) |
597 |
- glamor? ( |
598 |
- media-libs/libepoxy |
599 |
- media-libs/mesa[egl,gbm] |
600 |
- !x11-libs/glamor |
601 |
- ) |
602 |
- kdrive? ( |
603 |
- >=x11-libs/libXext-1.0.5 |
604 |
- x11-libs/libXv |
605 |
- ) |
606 |
- !minimal? ( |
607 |
- >=x11-libs/libX11-1.1.5 |
608 |
- >=x11-libs/libXext-1.0.5 |
609 |
- >=media-libs/mesa-9.2.0[nptl=] |
610 |
- ) |
611 |
- tslib? ( >=x11-libs/tslib-1.0 ) |
612 |
- udev? ( >=virtual/udev-150 ) |
613 |
- unwind? ( sys-libs/libunwind ) |
614 |
- wayland? ( |
615 |
- >=dev-libs/wayland-1.3.0 |
616 |
- media-libs/libepoxy |
617 |
- ) |
618 |
- >=x11-apps/xinit-1.3 |
619 |
- systemd? ( |
620 |
- sys-apps/dbus |
621 |
- <sys-apps/systemd-230 |
622 |
- )" |
623 |
- |
624 |
-DEPEND="${CDEPEND} |
625 |
- sys-devel/flex |
626 |
- >=x11-proto/bigreqsproto-1.1.0 |
627 |
- >=x11-proto/compositeproto-0.4 |
628 |
- >=x11-proto/damageproto-1.1 |
629 |
- >=x11-proto/fixesproto-5.0 |
630 |
- >=x11-proto/fontsproto-2.1.3 |
631 |
- >=x11-proto/glproto-1.4.17 |
632 |
- >=x11-proto/inputproto-2.2.99.1 |
633 |
- >=x11-proto/kbproto-1.0.3 |
634 |
- >=x11-proto/randrproto-1.4.0 |
635 |
- >=x11-proto/recordproto-1.13.99.1 |
636 |
- >=x11-proto/renderproto-0.11 |
637 |
- >=x11-proto/resourceproto-1.2.0 |
638 |
- >=x11-proto/scrnsaverproto-1.1 |
639 |
- >=x11-proto/trapproto-3.4.3 |
640 |
- >=x11-proto/videoproto-2.2.2 |
641 |
- >=x11-proto/xcmiscproto-1.2.0 |
642 |
- >=x11-proto/xextproto-7.2.99.901 |
643 |
- >=x11-proto/xf86dgaproto-2.0.99.1 |
644 |
- >=x11-proto/xf86rushproto-1.1.2 |
645 |
- >=x11-proto/xf86vidmodeproto-2.2.99.1 |
646 |
- >=x11-proto/xineramaproto-1.1.3 |
647 |
- >=x11-proto/xproto-7.0.26 |
648 |
- >=x11-proto/presentproto-1.0 |
649 |
- >=x11-proto/dri3proto-1.0 |
650 |
- dmx? ( |
651 |
- >=x11-proto/dmxproto-2.2.99.1 |
652 |
- doc? ( |
653 |
- || ( |
654 |
- www-client/links |
655 |
- www-client/lynx |
656 |
- www-client/w3m |
657 |
- ) |
658 |
- ) |
659 |
- ) |
660 |
- !minimal? ( |
661 |
- >=x11-proto/xf86driproto-2.1.0 |
662 |
- >=x11-proto/dri2proto-2.8 |
663 |
- )" |
664 |
- |
665 |
-RDEPEND="${CDEPEND} |
666 |
- selinux? ( sec-policy/selinux-xserver ) |
667 |
-" |
668 |
- |
669 |
-PDEPEND=" |
670 |
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
671 |
- |
672 |
-REQUIRED_USE="!minimal? ( |
673 |
- || ( ${IUSE_SERVERS} ) |
674 |
- )" |
675 |
- |
676 |
-#UPSTREAMED_PATCHES=( |
677 |
-# "${WORKDIR}/patches/" |
678 |
-#) |
679 |
- |
680 |
-PATCHES=( |
681 |
- "${UPSTREAMED_PATCHES[@]}" |
682 |
- "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch |
683 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
684 |
-) |
685 |
- |
686 |
-pkg_pretend() { |
687 |
- # older gcc is not supported |
688 |
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
689 |
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
690 |
-} |
691 |
- |
692 |
-src_configure() { |
693 |
- # localstatedir is used for the log location; we need to override the default |
694 |
- # from ebuild.sh |
695 |
- # sysconfdir is used for the xorg.conf location; same applies |
696 |
- # NOTE: fop is used for doc generating ; and i have no idea if gentoo |
697 |
- # package it somewhere |
698 |
- XORG_CONFIGURE_OPTIONS=( |
699 |
- $(use_enable ipv6) |
700 |
- $(use_enable dmx) |
701 |
- $(use_enable glamor) |
702 |
- $(use_enable kdrive) |
703 |
- $(use_enable kdrive kdrive-kbd) |
704 |
- $(use_enable kdrive kdrive-mouse) |
705 |
- $(use_enable kdrive kdrive-evdev) |
706 |
- $(use_enable suid install-setuid) |
707 |
- $(use_enable tslib) |
708 |
- $(use_enable unwind libunwind) |
709 |
- $(use_enable wayland xwayland) |
710 |
- $(use_enable !minimal record) |
711 |
- $(use_enable !minimal xfree86-utils) |
712 |
- $(use_enable !minimal install-libxf86config) |
713 |
- $(use_enable !minimal dri) |
714 |
- $(use_enable !minimal dri2) |
715 |
- $(use_enable !minimal glx) |
716 |
- $(use_enable xnest) |
717 |
- $(use_enable xorg) |
718 |
- $(use_enable xvfb) |
719 |
- $(use_enable nptl glx-tls) |
720 |
- $(use_enable udev config-udev) |
721 |
- $(use_with doc doxygen) |
722 |
- $(use_with doc xmlto) |
723 |
- $(use_with systemd systemd-daemon) |
724 |
- $(use_enable systemd systemd-logind) |
725 |
- --enable-libdrm |
726 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
727 |
- --localstatedir="${EPREFIX}"/var |
728 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
729 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
730 |
- --disable-config-hal |
731 |
- --disable-linux-acpi |
732 |
- --without-dtrace |
733 |
- --without-fop |
734 |
- --with-os-vendor=Gentoo |
735 |
- --with-sha1=libcrypto |
736 |
- ) |
737 |
- |
738 |
- # Xorg-server requires includes from OS mesa which are not visible for |
739 |
- # users of binary drivers. |
740 |
- mkdir -p "${T}/mesa-symlinks/GL" |
741 |
- for i in gl glx glxmd glxproto glxtokens; do |
742 |
- ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die |
743 |
- done |
744 |
- for i in glext glxext; do |
745 |
- ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die |
746 |
- done |
747 |
- append-cppflags "-I${T}/mesa-symlinks" |
748 |
- |
749 |
- xorg-2_src_configure |
750 |
-} |
751 |
- |
752 |
-src_install() { |
753 |
- xorg-2_src_install |
754 |
- |
755 |
- dynamic_libgl_install |
756 |
- |
757 |
- server_based_install |
758 |
- |
759 |
- if ! use minimal && use xorg; then |
760 |
- # Install xorg.conf.example into docs |
761 |
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
762 |
- fi |
763 |
- |
764 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
765 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
766 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
767 |
- |
768 |
- # install the @x11-module-rebuild set for Portage |
769 |
- insinto /usr/share/portage/config/sets |
770 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
771 |
-} |
772 |
- |
773 |
-pkg_postinst() { |
774 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
775 |
- eselect opengl set xorg-x11 --use-old |
776 |
-} |
777 |
- |
778 |
-pkg_postrm() { |
779 |
- # Get rid of module dir to ensure opengl-update works properly |
780 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
781 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
782 |
- fi |
783 |
-} |
784 |
- |
785 |
-dynamic_libgl_install() { |
786 |
- # next section is to setup the dynamic libGL stuff |
787 |
- ebegin "Moving GL files for dynamic switching" |
788 |
- dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions |
789 |
- local x="" |
790 |
- for x in "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do |
791 |
- if [ -f ${x} -o -L ${x} ]; then |
792 |
- mv -f ${x} "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/extensions |
793 |
- fi |
794 |
- done |
795 |
- eend 0 |
796 |
-} |
797 |
- |
798 |
-server_based_install() { |
799 |
- if ! use xorg; then |
800 |
- rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
801 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
802 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
803 |
- "${ED}"/usr/share/man/man1/Xserver.1x |
804 |
- fi |
805 |
-} |