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