Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/
Date: Thu, 01 Nov 2018 21:06:23
Message-Id: 1541106366.13250b93dbaa6e3916731c45de336157fbb635a6.mattst88@gentoo
1 commit: 13250b93dbaa6e3916731c45de336157fbb635a6
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 1 19:11:28 2018 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 1 21:06:06 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13250b93
7
8 x11-base/xorg-server: Drop old versions
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 x11-base/xorg-server/Manifest | 2 -
13 x11-base/xorg-server/xorg-server-1.20.1.ebuild | 221 -------------------------
14 x11-base/xorg-server/xorg-server-1.20.2.ebuild | 221 -------------------------
15 3 files changed, 444 deletions(-)
16
17 diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
18 index 290c8d10b68..3bc38c0e6c1 100644
19 --- a/x11-base/xorg-server/Manifest
20 +++ b/x11-base/xorg-server/Manifest
21 @@ -1,4 +1,2 @@
22 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
23 -DIST xorg-server-1.20.1.tar.bz2 6103772 BLAKE2B ac71d603cef8efe814275b658d4a76e231eb0fda14dd6e7177509bf147feaf37657789d8fc83f8017435c84760d7be357f203a8346aac612a53083cf413f7d75 SHA512 ef2b93a61683c8ca8d1f14b771e70db65ba119a73db8a46e7cdbf2ac2243e3f4b2732068eb5aa5d7b76f460db995a3c04390870198a5210ec30df4360ad9f94b
24 -DIST xorg-server-1.20.2.tar.bz2 6204242 BLAKE2B 05333d12ca3ca2bca879410093fb193dc2476780b857cd22dcfb22d0dffe0e17afd161ee3a87030bd76ff4109fa1884768614f0bc26318d576f7c65b885aa425 SHA512 1c87d78b14529dd4b438ef038118c8540d1d17bdd58bf08ec5408a2ddbe8d0dda48033a9a9477cfc2c4c304dd1078fa40968a03c4d0cd3398359dd0fadb8e7c7
25 DIST xorg-server-1.20.3.tar.bz2 6205000 BLAKE2B 9fc8acf1812d0aa4800941dd1846060f91edf1e7ebc92b35e8c2028266d88d3ab3ba14e95f535e5ee41941f8e20769ee75723ba609f5653d4892f97bc5cf91c4 SHA512 ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba
26
27 diff --git a/x11-base/xorg-server/xorg-server-1.20.1.ebuild b/x11-base/xorg-server/xorg-server-1.20.1.ebuild
28 deleted file mode 100644
29 index e721825fa7e..00000000000
30 --- a/x11-base/xorg-server/xorg-server-1.20.1.ebuild
31 +++ /dev/null
32 @@ -1,221 +0,0 @@
33 -# Copyright 1999-2018 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=5
37 -
38 -XORG_EAUTORECONF=yes
39 -XORG_DOC=doc
40 -inherit xorg-2 multilib versionator flag-o-matic
41 -EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git"
42 -
43 -DESCRIPTION="X.Org X servers"
44 -SLOT="0/${PV}"
45 -if [[ ${PV} != 9999* ]]; then
46 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
47 -fi
48 -
49 -IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
50 -IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity"
51 -
52 -CDEPEND=">=app-eselect/eselect-opengl-1.3.0
53 - !libressl? ( dev-libs/openssl:0= )
54 - libressl? ( dev-libs/libressl:0= )
55 - >=x11-apps/iceauth-1.0.2
56 - >=x11-apps/rgb-1.0.3
57 - >=x11-apps/xauth-1.0.3
58 - x11-apps/xkbcomp
59 - >=x11-libs/libdrm-2.4.89
60 - >=x11-libs/libpciaccess-0.12.901
61 - >=x11-libs/libXau-1.0.4
62 - >=x11-libs/libXdmcp-1.0.2
63 - >=x11-libs/libXfont2-2.0.1
64 - >=x11-libs/libxkbfile-1.0.4
65 - >=x11-libs/libxshmfence-1.1
66 - >=x11-libs/pixman-0.27.2
67 - >=x11-libs/xtrans-1.3.5
68 - >=x11-misc/xbitmaps-1.0.1
69 - >=x11-misc/xkeyboard-config-2.4.1-r3
70 - dmx? (
71 - x11-libs/libXt
72 - >=x11-libs/libdmx-1.0.99.1
73 - >=x11-libs/libX11-1.1.5
74 - >=x11-libs/libXaw-1.0.4
75 - >=x11-libs/libXext-1.0.99.4
76 - >=x11-libs/libXfixes-5.0
77 - >=x11-libs/libXi-1.2.99.1
78 - >=x11-libs/libXmu-1.0.3
79 - x11-libs/libXrender
80 - >=x11-libs/libXres-1.0.3
81 - >=x11-libs/libXtst-1.0.99.2
82 - )
83 - glamor? (
84 - media-libs/libepoxy[X]
85 - >=media-libs/mesa-18[egl,gbm]
86 - !x11-libs/glamor
87 - )
88 - kdrive? (
89 - >=x11-libs/libXext-1.0.5
90 - x11-libs/libXv
91 - )
92 - xephyr? (
93 - x11-libs/libxcb[xkb]
94 - x11-libs/xcb-util
95 - x11-libs/xcb-util-image
96 - x11-libs/xcb-util-keysyms
97 - x11-libs/xcb-util-renderutil
98 - x11-libs/xcb-util-wm
99 - )
100 - !minimal? (
101 - >=x11-libs/libX11-1.1.5
102 - >=x11-libs/libXext-1.0.5
103 - >=media-libs/mesa-18
104 - )
105 - udev? ( virtual/libudev:= )
106 - unwind? ( sys-libs/libunwind )
107 - wayland? (
108 - >=dev-libs/wayland-1.3.0
109 - media-libs/libepoxy
110 - >=dev-libs/wayland-protocols-1.1
111 - )
112 - >=x11-apps/xinit-1.3.3-r1
113 - systemd? (
114 - sys-apps/dbus
115 - sys-apps/systemd
116 - )"
117 -
118 -DEPEND="${CDEPEND}
119 - sys-devel/flex
120 - >=x11-base/xorg-proto-2018.3
121 - dmx? (
122 - doc? (
123 - || (
124 - www-client/links
125 - www-client/lynx
126 - www-client/w3m
127 - )
128 - )
129 - )"
130 -
131 -RDEPEND="${CDEPEND}
132 - selinux? ( sec-policy/selinux-xserver )
133 - !x11-drivers/xf86-video-modesetting
134 -"
135 -
136 -PDEPEND="
137 - xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
138 -
139 -REQUIRED_USE="!minimal? (
140 - || ( ${IUSE_SERVERS} )
141 - )
142 - xephyr? ( kdrive )"
143 -
144 -UPSTREAMED_PATCHES=(
145 -)
146 -
147 -PATCHES=(
148 - "${UPSTREAMED_PATCHES[@]}"
149 - "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
150 - # needed for new eselect-opengl, bug #541232
151 - "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
152 -)
153 -
154 -pkg_pretend() {
155 - # older gcc is not supported
156 - [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
157 - die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
158 -}
159 -
160 -pkg_setup() {
161 - if use wayland && ! use glamor; then
162 - ewarn "glamor is necessary for acceleration under Xwayland."
163 - ewarn "Performance may be unacceptable without it."
164 - fi
165 -}
166 -
167 -src_configure() {
168 - # localstatedir is used for the log location; we need to override the default
169 - # from ebuild.sh
170 - # sysconfdir is used for the xorg.conf location; same applies
171 - # NOTE: fop is used for doc generating; and I have no idea if Gentoo
172 - # package it somewhere
173 - XORG_CONFIGURE_OPTIONS=(
174 - $(use_enable ipv6)
175 - $(use_enable debug)
176 - $(use_enable dmx)
177 - $(use_enable glamor)
178 - $(use_enable kdrive)
179 - $(use_enable unwind libunwind)
180 - $(use_enable wayland xwayland)
181 - $(use_enable !minimal record)
182 - $(use_enable !minimal xfree86-utils)
183 - $(use_enable !minimal dri)
184 - $(use_enable !minimal dri2)
185 - $(use_enable !minimal dri3)
186 - $(use_enable !minimal glx)
187 - $(use_enable xcsecurity)
188 - $(use_enable xephyr)
189 - $(use_enable xnest)
190 - $(use_enable xorg)
191 - $(use_enable xvfb)
192 - $(use_enable udev config-udev)
193 - $(use_with doc doxygen)
194 - $(use_with doc xmlto)
195 - $(use_with systemd systemd-daemon)
196 - $(use_enable systemd systemd-logind)
197 - $(use_enable systemd suid-wrapper)
198 - $(use_enable !systemd install-setuid)
199 - --enable-libdrm
200 - --sysconfdir="${EPREFIX}"/etc/X11
201 - --localstatedir="${EPREFIX}"/var
202 - --with-fontrootdir="${EPREFIX}"/usr/share/fonts
203 - --with-xkb-output="${EPREFIX}"/var/lib/xkb
204 - --disable-config-hal
205 - --disable-linux-acpi
206 - --without-dtrace
207 - --without-fop
208 - --with-os-vendor=Gentoo
209 - --with-sha1=libcrypto
210 - )
211 -
212 - xorg-2_src_configure
213 -}
214 -
215 -src_install() {
216 - xorg-2_src_install
217 -
218 - server_based_install
219 -
220 - if ! use minimal && use xorg; then
221 - # Install xorg.conf.example into docs
222 - dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
223 - fi
224 -
225 - newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
226 - newinitd "${FILESDIR}"/xdm.initd-11 xdm
227 - newconfd "${FILESDIR}"/xdm.confd-4 xdm
228 -
229 - # install the @x11-module-rebuild set for Portage
230 - insinto /usr/share/portage/config/sets
231 - newins "${FILESDIR}"/xorg-sets.conf xorg.conf
232 -}
233 -
234 -pkg_postinst() {
235 - # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
236 - eselect opengl set xorg-x11 --use-old
237 -}
238 -
239 -pkg_postrm() {
240 - # Get rid of module dir to ensure opengl-update works properly
241 - if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
242 - rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
243 - fi
244 -}
245 -
246 -server_based_install() {
247 - if ! use xorg; then
248 - rm "${ED}"/usr/share/man/man1/Xserver.1x \
249 - "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
250 - "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
251 - "${ED}"/usr/share/man/man1/Xserver.1x
252 - fi
253 -}
254
255 diff --git a/x11-base/xorg-server/xorg-server-1.20.2.ebuild b/x11-base/xorg-server/xorg-server-1.20.2.ebuild
256 deleted file mode 100644
257 index be5e57d8cb2..00000000000
258 --- a/x11-base/xorg-server/xorg-server-1.20.2.ebuild
259 +++ /dev/null
260 @@ -1,221 +0,0 @@
261 -# Copyright 1999-2018 Gentoo Authors
262 -# Distributed under the terms of the GNU General Public License v2
263 -
264 -EAPI=5
265 -
266 -XORG_EAUTORECONF=yes
267 -XORG_DOC=doc
268 -inherit xorg-2 multilib versionator flag-o-matic
269 -EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git"
270 -
271 -DESCRIPTION="X.Org X servers"
272 -SLOT="0/${PV}"
273 -if [[ ${PV} != 9999* ]]; then
274 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
275 -fi
276 -
277 -IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
278 -IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity"
279 -
280 -CDEPEND=">=app-eselect/eselect-opengl-1.3.0
281 - !libressl? ( dev-libs/openssl:0= )
282 - libressl? ( dev-libs/libressl:0= )
283 - >=x11-apps/iceauth-1.0.2
284 - >=x11-apps/rgb-1.0.3
285 - >=x11-apps/xauth-1.0.3
286 - x11-apps/xkbcomp
287 - >=x11-libs/libdrm-2.4.89
288 - >=x11-libs/libpciaccess-0.12.901
289 - >=x11-libs/libXau-1.0.4
290 - >=x11-libs/libXdmcp-1.0.2
291 - >=x11-libs/libXfont2-2.0.1
292 - >=x11-libs/libxkbfile-1.0.4
293 - >=x11-libs/libxshmfence-1.1
294 - >=x11-libs/pixman-0.27.2
295 - >=x11-libs/xtrans-1.3.5
296 - >=x11-misc/xbitmaps-1.0.1
297 - >=x11-misc/xkeyboard-config-2.4.1-r3
298 - dmx? (
299 - x11-libs/libXt
300 - >=x11-libs/libdmx-1.0.99.1
301 - >=x11-libs/libX11-1.1.5
302 - >=x11-libs/libXaw-1.0.4
303 - >=x11-libs/libXext-1.0.99.4
304 - >=x11-libs/libXfixes-5.0
305 - >=x11-libs/libXi-1.2.99.1
306 - >=x11-libs/libXmu-1.0.3
307 - x11-libs/libXrender
308 - >=x11-libs/libXres-1.0.3
309 - >=x11-libs/libXtst-1.0.99.2
310 - )
311 - glamor? (
312 - media-libs/libepoxy[X]
313 - >=media-libs/mesa-18[egl,gbm]
314 - !x11-libs/glamor
315 - )
316 - kdrive? (
317 - >=x11-libs/libXext-1.0.5
318 - x11-libs/libXv
319 - )
320 - xephyr? (
321 - x11-libs/libxcb[xkb]
322 - x11-libs/xcb-util
323 - x11-libs/xcb-util-image
324 - x11-libs/xcb-util-keysyms
325 - x11-libs/xcb-util-renderutil
326 - x11-libs/xcb-util-wm
327 - )
328 - !minimal? (
329 - >=x11-libs/libX11-1.1.5
330 - >=x11-libs/libXext-1.0.5
331 - >=media-libs/mesa-18
332 - )
333 - udev? ( virtual/libudev:= )
334 - unwind? ( sys-libs/libunwind )
335 - wayland? (
336 - >=dev-libs/wayland-1.3.0
337 - media-libs/libepoxy
338 - >=dev-libs/wayland-protocols-1.1
339 - )
340 - >=x11-apps/xinit-1.3.3-r1
341 - systemd? (
342 - sys-apps/dbus
343 - sys-apps/systemd
344 - )"
345 -
346 -DEPEND="${CDEPEND}
347 - sys-devel/flex
348 - >=x11-base/xorg-proto-2018.3
349 - dmx? (
350 - doc? (
351 - || (
352 - www-client/links
353 - www-client/lynx
354 - www-client/w3m
355 - )
356 - )
357 - )"
358 -
359 -RDEPEND="${CDEPEND}
360 - selinux? ( sec-policy/selinux-xserver )
361 - !x11-drivers/xf86-video-modesetting
362 -"
363 -
364 -PDEPEND="
365 - xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
366 -
367 -REQUIRED_USE="!minimal? (
368 - || ( ${IUSE_SERVERS} )
369 - )
370 - xephyr? ( kdrive )"
371 -
372 -UPSTREAMED_PATCHES=(
373 -)
374 -
375 -PATCHES=(
376 - "${UPSTREAMED_PATCHES[@]}"
377 - "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
378 - # needed for new eselect-opengl, bug #541232
379 - "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
380 -)
381 -
382 -pkg_pretend() {
383 - # older gcc is not supported
384 - [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
385 - die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
386 -}
387 -
388 -pkg_setup() {
389 - if use wayland && ! use glamor; then
390 - ewarn "glamor is necessary for acceleration under Xwayland."
391 - ewarn "Performance may be unacceptable without it."
392 - fi
393 -}
394 -
395 -src_configure() {
396 - # localstatedir is used for the log location; we need to override the default
397 - # from ebuild.sh
398 - # sysconfdir is used for the xorg.conf location; same applies
399 - # NOTE: fop is used for doc generating; and I have no idea if Gentoo
400 - # package it somewhere
401 - XORG_CONFIGURE_OPTIONS=(
402 - $(use_enable ipv6)
403 - $(use_enable debug)
404 - $(use_enable dmx)
405 - $(use_enable glamor)
406 - $(use_enable kdrive)
407 - $(use_enable unwind libunwind)
408 - $(use_enable wayland xwayland)
409 - $(use_enable !minimal record)
410 - $(use_enable !minimal xfree86-utils)
411 - $(use_enable !minimal dri)
412 - $(use_enable !minimal dri2)
413 - $(use_enable !minimal dri3)
414 - $(use_enable !minimal glx)
415 - $(use_enable xcsecurity)
416 - $(use_enable xephyr)
417 - $(use_enable xnest)
418 - $(use_enable xorg)
419 - $(use_enable xvfb)
420 - $(use_enable udev config-udev)
421 - $(use_with doc doxygen)
422 - $(use_with doc xmlto)
423 - $(use_with systemd systemd-daemon)
424 - $(use_enable systemd systemd-logind)
425 - $(use_enable systemd suid-wrapper)
426 - $(use_enable !systemd install-setuid)
427 - --enable-libdrm
428 - --sysconfdir="${EPREFIX}"/etc/X11
429 - --localstatedir="${EPREFIX}"/var
430 - --with-fontrootdir="${EPREFIX}"/usr/share/fonts
431 - --with-xkb-output="${EPREFIX}"/var/lib/xkb
432 - --disable-config-hal
433 - --disable-linux-acpi
434 - --without-dtrace
435 - --without-fop
436 - --with-os-vendor=Gentoo
437 - --with-sha1=libcrypto
438 - )
439 -
440 - xorg-2_src_configure
441 -}
442 -
443 -src_install() {
444 - xorg-2_src_install
445 -
446 - server_based_install
447 -
448 - if ! use minimal && use xorg; then
449 - # Install xorg.conf.example into docs
450 - dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
451 - fi
452 -
453 - newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
454 - newinitd "${FILESDIR}"/xdm.initd-11 xdm
455 - newconfd "${FILESDIR}"/xdm.confd-4 xdm
456 -
457 - # install the @x11-module-rebuild set for Portage
458 - insinto /usr/share/portage/config/sets
459 - newins "${FILESDIR}"/xorg-sets.conf xorg.conf
460 -}
461 -
462 -pkg_postinst() {
463 - # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
464 - eselect opengl set xorg-x11 --use-old
465 -}
466 -
467 -pkg_postrm() {
468 - # Get rid of module dir to ensure opengl-update works properly
469 - if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
470 - rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
471 - fi
472 -}
473 -
474 -server_based_install() {
475 - if ! use xorg; then
476 - rm "${ED}"/usr/share/man/man1/Xserver.1x \
477 - "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
478 - "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
479 - "${ED}"/usr/share/man/man1/Xserver.1x
480 - fi
481 -}