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