1 |
commit: 4b5ca9b70f6db6c3d0716003f5b2f0b1148f556e |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 21 01:08:59 2017 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 21 01:09:11 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b5ca9b7 |
7 |
|
8 |
x11-base/xorg-server: Drop old 1.18 versions |
9 |
|
10 |
Gentoo-Bug: https://bugs.gentoo.org/611350 |
11 |
|
12 |
x11-base/xorg-server/Manifest | 1 - |
13 |
x11-base/xorg-server/xorg-server-1.18.4.ebuild | 244 ------------------------- |
14 |
2 files changed, 245 deletions(-) |
15 |
|
16 |
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest |
17 |
index 1f92e828ea2..a5e86d57c25 100644 |
18 |
--- a/x11-base/xorg-server/Manifest |
19 |
+++ b/x11-base/xorg-server/Manifest |
20 |
@@ -2,7 +2,6 @@ DIST xorg-server-1.12-cve-2014-8091..8103.patches.tar.xz 14832 SHA256 a98fd1589e |
21 |
DIST xorg-server-1.12.4.tar.bz2 5444761 SHA256 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7 SHA512 70997e8ba4f948829c158e52924753c5691a783dd14e5a86fdce4fc601638dd4e0b281590876b0315a303bf8d5195bdf43ede7113d1d569415a41ab03d938d85 WHIRLPOOL bfee61329ca85ecedb991ca933de6e3a1e94e34a04d9a723a0e9c90a36e067824701c38e8a0034498ed28dfca82eb653d1e1ab5c0223020f5da69cbbf80bbf98 |
22 |
DIST xorg-server-1.15.2.tar.bz2 5551426 SHA256 3c0585607c654ded836da43a45a75492fc13454ff4149704fb08dac39f051163 SHA512 5fcbf0012af309f80e1db206e05d7861796146d765cd17f3963fde6da7f43f0e57d63dbbdbf2c554612a557aa4dee623ef62f7ca7d007834aafd7a46ca7bb1d6 WHIRLPOOL 22cdbad68462f9bac32b13be958df496411ca72fe47435ec7e3ebb470b121ba4b4a0e023913f31a92113c5a56bc4be660dfec5086bc1fb72a617d2cdeaa8adf1 |
23 |
DIST xorg-server-1.16-cve-2014-8091..8103.patches.tar.xz 27892 SHA256 47d8c9bb79c829389e7599aef1110d43afbc5bf744dbcf73d8f3cf01796d287a SHA512 f8b55c009166883b3e6ec2c8c7a2ff4ed61df6970afcc4f0efb9efa36741af194456a368d4b1c7ba9345ef973fb139a48eb50cb5a7ebc144b43749b9ffdb1f7b WHIRLPOOL 2f8b26c018f4ad4cf780ed7dcb0b844de64e7a612adc30c622d1956dfcee710086ffcc837ff0a64cdcc14d47720d82d8797374488bf0b52d77ca63adf6806885 |
24 |
-DIST xorg-server-1.18.4.tar.bz2 6009508 SHA256 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 SHA512 2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b WHIRLPOOL f9ba5ffb49e6ac7ca20d64d27712a0a8f10c6560256a20e9f944d6438dc5f5eebe53daf6af110084da67a622e92874969047518e72ff181de0d64d83030d629f |
25 |
DIST xorg-server-1.19.2.tar.bz2 5969543 SHA256 4f8ab9f4a1a885fe7550080555381b34b82858582559e8e3c4da96e3a85884bb SHA512 258c5d615efda28170bf0fd4a19e24fd2cefe086d5ef1aada7a407b8dc2ddaa7d74ad0245e0b13155a3e6d30c65fedf054326e191b6dfe800aae881664d63f16 WHIRLPOOL 6ffca7dc695d9551efecbf9061e40862a187f16afba113467640a506c7becdb2e37d7fe042cbfe08af8ba9f2e8f538fd50460ef46a34452796436de15fa463fd |
26 |
DIST xorg-server-1.19.3.tar.bz2 6050221 SHA256 677a8166e03474719238dfe396ce673c4234735464d6dadf2959b600d20e5a98 SHA512 b988897418399e1361fdcca9465a781f55f8f6fbfdc5a59edfaee9046a0c6ad7a76f348d88b6004ce3d3fb3966b4c5af0b854f6549c32b2b8d7a43758809f669 WHIRLPOOL acbac6db7ba0aff8d0b906e52a783b38b1ce43a342159becb2fc696e34274c98e546e9712d59cf3360ad745555416e6be89575523285e1ca3954f9e60a5cf079 |
27 |
DIST xorg-server-1.19.4.tar.bz2 5962834 SHA256 aa758acea91deaf1f95069ddc5ea3818e13675fb14fef40ad1b3d0b2bf03c9a8 SHA512 ff80934e42a7dd2d437e947fe02c74c3b25bdbb3002b7005191d52272d5eae8cb3a83377fa32f40000011be88405830e796f6bd3b914bd7fc163ea8ece76226b WHIRLPOOL 75d82daf7fa87b70182ed5d81fe785b4909b82f838530c0318444bc05ccb2a4073f4bebb2a8dd0d283dfbb5d1498dc98a9098176eff16c7a31b801bd179e3c00 |
28 |
|
29 |
diff --git a/x11-base/xorg-server/xorg-server-1.18.4.ebuild b/x11-base/xorg-server/xorg-server-1.18.4.ebuild |
30 |
deleted file mode 100644 |
31 |
index 71b0bd02cf3..00000000000 |
32 |
--- a/x11-base/xorg-server/xorg-server-1.18.4.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,244 +0,0 @@ |
35 |
-# Copyright 1999-2017 Gentoo Foundation |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=5 |
39 |
- |
40 |
-XORG_DOC=doc |
41 |
-inherit xorg-2 multilib versionator flag-o-matic |
42 |
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git" |
43 |
- |
44 |
-DESCRIPTION="X.Org X servers" |
45 |
-SLOT="0/${PV}" |
46 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
47 |
- |
48 |
-IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb" |
49 |
-IUSE="${IUSE_SERVERS} glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind wayland" |
50 |
- |
51 |
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
52 |
- !libressl? ( dev-libs/openssl:0= ) |
53 |
- libressl? ( dev-libs/libressl ) |
54 |
- >=x11-apps/iceauth-1.0.2 |
55 |
- >=x11-apps/rgb-1.0.3 |
56 |
- >=x11-apps/xauth-1.0.3 |
57 |
- x11-apps/xkbcomp |
58 |
- >=x11-libs/libdrm-2.4.46 |
59 |
- >=x11-libs/libpciaccess-0.12.901 |
60 |
- >=x11-libs/libXau-1.0.4 |
61 |
- >=x11-libs/libXdmcp-1.0.2 |
62 |
- >=x11-libs/libXfont-1.4.2 |
63 |
- >=x11-libs/libxkbfile-1.0.4 |
64 |
- >=x11-libs/libxshmfence-1.1 |
65 |
- >=x11-libs/pixman-0.27.2 |
66 |
- >=x11-libs/xtrans-1.3.5 |
67 |
- >=x11-misc/xbitmaps-1.0.1 |
68 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
69 |
- dmx? ( |
70 |
- x11-libs/libXt |
71 |
- >=x11-libs/libdmx-1.0.99.1 |
72 |
- >=x11-libs/libX11-1.1.5 |
73 |
- >=x11-libs/libXaw-1.0.4 |
74 |
- >=x11-libs/libXext-1.0.99.4 |
75 |
- >=x11-libs/libXfixes-5.0 |
76 |
- >=x11-libs/libXi-1.2.99.1 |
77 |
- >=x11-libs/libXmu-1.0.3 |
78 |
- x11-libs/libXrender |
79 |
- >=x11-libs/libXres-1.0.3 |
80 |
- >=x11-libs/libXtst-1.0.99.2 |
81 |
- ) |
82 |
- glamor? ( |
83 |
- media-libs/libepoxy[X] |
84 |
- >=media-libs/mesa-10.3.4-r1[egl,gbm] |
85 |
- !x11-libs/glamor |
86 |
- ) |
87 |
- kdrive? ( |
88 |
- >=x11-libs/libXext-1.0.5 |
89 |
- x11-libs/libXv |
90 |
- ) |
91 |
- xephyr? ( |
92 |
- x11-libs/libxcb |
93 |
- x11-libs/xcb-util |
94 |
- x11-libs/xcb-util-image |
95 |
- x11-libs/xcb-util-keysyms |
96 |
- x11-libs/xcb-util-renderutil |
97 |
- x11-libs/xcb-util-wm |
98 |
- ) |
99 |
- xnest? ( |
100 |
- x11-libs/xcb-util-keysyms |
101 |
- ) |
102 |
- !minimal? ( |
103 |
- >=x11-libs/libX11-1.1.5 |
104 |
- >=x11-libs/libXext-1.0.5 |
105 |
- >=media-libs/mesa-10.3.4-r1 |
106 |
- ) |
107 |
- tslib? ( >=x11-libs/tslib-1.0 ) |
108 |
- udev? ( >=virtual/udev-150 ) |
109 |
- unwind? ( sys-libs/libunwind ) |
110 |
- wayland? ( |
111 |
- >=dev-libs/wayland-1.3.0 |
112 |
- media-libs/libepoxy |
113 |
- ) |
114 |
- >=x11-apps/xinit-1.3.3-r1 |
115 |
- systemd? ( |
116 |
- sys-apps/dbus |
117 |
- sys-apps/systemd |
118 |
- )" |
119 |
- |
120 |
-DEPEND="${CDEPEND} |
121 |
- sys-devel/flex |
122 |
- >=x11-proto/bigreqsproto-1.1.0 |
123 |
- >=x11-proto/compositeproto-0.4 |
124 |
- >=x11-proto/damageproto-1.1 |
125 |
- >=x11-proto/fixesproto-5.0 |
126 |
- >=x11-proto/fontsproto-2.1.3 |
127 |
- >=x11-proto/glproto-1.4.17-r1 |
128 |
- >=x11-proto/inputproto-2.3 |
129 |
- >=x11-proto/kbproto-1.0.3 |
130 |
- >=x11-proto/randrproto-1.5.0 |
131 |
- >=x11-proto/recordproto-1.13.99.1 |
132 |
- >=x11-proto/renderproto-0.11 |
133 |
- >=x11-proto/resourceproto-1.2.0 |
134 |
- >=x11-proto/scrnsaverproto-1.1 |
135 |
- >=x11-proto/trapproto-3.4.3 |
136 |
- >=x11-proto/videoproto-2.2.2 |
137 |
- >=x11-proto/xcmiscproto-1.2.0 |
138 |
- >=x11-proto/xextproto-7.2.99.901 |
139 |
- >=x11-proto/xf86dgaproto-2.0.99.1 |
140 |
- >=x11-proto/xf86rushproto-1.1.2 |
141 |
- >=x11-proto/xf86vidmodeproto-2.2.99.1 |
142 |
- >=x11-proto/xineramaproto-1.1.3 |
143 |
- >=x11-proto/xproto-7.0.28 |
144 |
- >=x11-proto/presentproto-1.0 |
145 |
- >=x11-proto/dri2proto-2.8 |
146 |
- >=x11-proto/dri3proto-1.0 |
147 |
- dmx? ( |
148 |
- >=x11-proto/dmxproto-2.2.99.1 |
149 |
- doc? ( |
150 |
- || ( |
151 |
- www-client/links |
152 |
- www-client/lynx |
153 |
- www-client/w3m |
154 |
- ) |
155 |
- ) |
156 |
- ) |
157 |
- !minimal? ( |
158 |
- >=x11-proto/xf86driproto-2.1.0 |
159 |
- )" |
160 |
- |
161 |
-RDEPEND="${CDEPEND} |
162 |
- selinux? ( sec-policy/selinux-xserver ) |
163 |
- !x11-drivers/xf86-video-modesetting |
164 |
-" |
165 |
- |
166 |
-PDEPEND=" |
167 |
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
168 |
- |
169 |
-REQUIRED_USE="!minimal? ( |
170 |
- || ( ${IUSE_SERVERS} ) |
171 |
- ) |
172 |
- xephyr? ( kdrive )" |
173 |
- |
174 |
-#UPSTREAMED_PATCHES=( |
175 |
-# "${WORKDIR}/patches/" |
176 |
-#) |
177 |
- |
178 |
-PATCHES=( |
179 |
- "${UPSTREAMED_PATCHES[@]}" |
180 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
181 |
- # needed for new eselect-opengl, bug #541232 |
182 |
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
183 |
- "${FILESDIR}"/${PN}-1.18-sysmacros.patch #580044 |
184 |
-) |
185 |
- |
186 |
-pkg_pretend() { |
187 |
- # older gcc is not supported |
188 |
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
189 |
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
190 |
-} |
191 |
- |
192 |
-src_configure() { |
193 |
- # localstatedir is used for the log location; we need to override the default |
194 |
- # from ebuild.sh |
195 |
- # sysconfdir is used for the xorg.conf location; same applies |
196 |
- # NOTE: fop is used for doc generating; and I have no idea if Gentoo |
197 |
- # package it somewhere |
198 |
- XORG_CONFIGURE_OPTIONS=( |
199 |
- $(use_enable ipv6) |
200 |
- $(use_enable dmx) |
201 |
- $(use_enable glamor) |
202 |
- $(use_enable kdrive) |
203 |
- $(use_enable kdrive kdrive-kbd) |
204 |
- $(use_enable kdrive kdrive-mouse) |
205 |
- $(use_enable kdrive kdrive-evdev) |
206 |
- $(use_enable suid install-setuid) |
207 |
- $(use_enable tslib) |
208 |
- $(use_enable unwind libunwind) |
209 |
- $(use_enable wayland xwayland) |
210 |
- $(use_enable !minimal record) |
211 |
- $(use_enable !minimal xfree86-utils) |
212 |
- $(use_enable !minimal dri) |
213 |
- $(use_enable !minimal dri2) |
214 |
- $(use_enable !minimal glx) |
215 |
- $(use_enable xephyr) |
216 |
- $(use_enable xnest) |
217 |
- $(use_enable xorg) |
218 |
- $(use_enable xvfb) |
219 |
- $(use_enable udev config-udev) |
220 |
- $(use_with doc doxygen) |
221 |
- $(use_with doc xmlto) |
222 |
- $(use_with systemd systemd-daemon) |
223 |
- $(use_enable systemd systemd-logind) |
224 |
- --enable-libdrm |
225 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
226 |
- --localstatedir="${EPREFIX}"/var |
227 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
228 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
229 |
- --disable-config-hal |
230 |
- --disable-linux-acpi |
231 |
- --without-dtrace |
232 |
- --without-fop |
233 |
- --with-os-vendor=Gentoo |
234 |
- --with-sha1=libcrypto |
235 |
- ) |
236 |
- |
237 |
- xorg-2_src_configure |
238 |
-} |
239 |
- |
240 |
-src_install() { |
241 |
- xorg-2_src_install |
242 |
- |
243 |
- server_based_install |
244 |
- |
245 |
- if ! use minimal && use xorg; then |
246 |
- # Install xorg.conf.example into docs |
247 |
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
248 |
- fi |
249 |
- |
250 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
251 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
252 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
253 |
- |
254 |
- # install the @x11-module-rebuild set for Portage |
255 |
- insinto /usr/share/portage/config/sets |
256 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
257 |
-} |
258 |
- |
259 |
-pkg_postinst() { |
260 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
261 |
- eselect opengl set xorg-x11 --use-old |
262 |
-} |
263 |
- |
264 |
-pkg_postrm() { |
265 |
- # Get rid of module dir to ensure opengl-update works properly |
266 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
267 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
268 |
- fi |
269 |
-} |
270 |
- |
271 |
-server_based_install() { |
272 |
- if ! use xorg; then |
273 |
- rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
274 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
275 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
276 |
- "${ED}"/usr/share/man/man1/Xserver.1x |
277 |
- fi |
278 |
-} |