1 |
commit: 9cc3277d82031449b398d0405487df09d414d5f8 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 25 16:31:04 2017 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 25 16:40:22 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cc3277d |
7 |
|
8 |
x11-base/xorg-server: Drop old. |
9 |
|
10 |
x11-base/xorg-server/Manifest | 5 - |
11 |
x11-base/xorg-server/xorg-server-1.18.0.ebuild | 242 ------------------------ |
12 |
x11-base/xorg-server/xorg-server-1.18.1.ebuild | 242 ------------------------ |
13 |
x11-base/xorg-server/xorg-server-1.18.2.ebuild | 242 ------------------------ |
14 |
x11-base/xorg-server/xorg-server-1.18.3.ebuild | 242 ------------------------ |
15 |
x11-base/xorg-server/xorg-server-1.19.0.ebuild | 244 ------------------------- |
16 |
6 files changed, 1217 deletions(-) |
17 |
|
18 |
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest |
19 |
index d413e06..61e76ed 100644 |
20 |
--- a/x11-base/xorg-server/Manifest |
21 |
+++ b/x11-base/xorg-server/Manifest |
22 |
@@ -4,10 +4,5 @@ DIST xorg-server-1.15.2.tar.bz2 5551426 SHA256 3c0585607c654ded836da43a45a75492f |
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.16.4.tar.bz2 5817330 SHA256 abb6e1cc9213a9915a121f48576ff6739a0b8cdb3d32796f9a7743c9a6efc871 SHA512 f756fca65535aa921a85d8d8eb36ea2ba5b7af90a46d640b0ca76259a9abd9d323885087e11156528d95240937c70373045001ae20266a1b9e89909f007e9e74 WHIRLPOOL 63980a3e2b57d2860998344f21a6524598b3dc135c277e5a868e34b57ab5060681ae7137358b3ba8b9ca5fd622a91aeb06bd0ac9e3e5ce1f4dc55df2b2dc0e33 |
25 |
DIST xorg-server-1.17.4.tar.bz2 5791384 SHA256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 SHA512 4b8377b86ca88f27dcf59db2996b2ee620ce6f181a37dc47600365db588d48f2f3ca66a3149e7c856e686e5783b1cccb2ba0827aa7413299163dfca869f4d376 WHIRLPOOL c5baa1b01e57eac9e18bd1890c0a7e2246836524645057d5e05a1a19225d863645616aafaadbf9d083ffb672d47ea1934ad8323d813533e9519f0d92f9a1c6ab |
26 |
-DIST xorg-server-1.18.0.tar.bz2 5818703 SHA256 195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e SHA512 c7b1403e79e26ea96690f5634eb2fa424f9436a8a3c8a17779f71d254a813ae9b2ff1eb3dc8c6b4c37da125f3108ee86f6f5b1c27c1db6ab28eb6c8ee62e5768 WHIRLPOOL 439cfc2da70f3234facd4684e8ef5cea8b0b2d73251280de4a705bd31c2498df814c189f01ec057da3b810d994dc1e30e1faceec4b059ef428e137c8584450d9 |
27 |
-DIST xorg-server-1.18.1.tar.bz2 5846953 SHA256 85ec56dbeb89a951295cdf4f39bf38e515f900d35e06d4a8081b114d1520789d SHA512 4b2db85fe4386329b3d20fc53848556ce8dedeb9553d610afc45962d477c8e7ea887abb6c27ba2701160d15ddff9a500bfaae6deff9cf62a80452c4b18278429 WHIRLPOOL 8588631538c759331f352cb278f755ccd10bd69e22f637d358cabfc397eed656b419cfa628276d60548cf4b102f735f7079f00c069d1dccd43800fae0ab98bfc |
28 |
-DIST xorg-server-1.18.2.tar.bz2 5864615 SHA256 022142b07f6477d140dcc915902df326408a53ca3a352426a499f142b25d632d SHA512 c44a1b39150fff3ab673cb252d7b498c8c3bc5b3b2abfb6c358c64fadb9ef97789ac457d6acb8afaece29bbbe66399854fd2db13763cb40e7c63fb4237601da9 WHIRLPOOL 83dbcae14e3857ca244930e91cc5ba5f22e4284ace1447ffb086f5dd69526b878bb45bf3ef8451b27838dc20924e9e465fa8e586b6ba672a51dc051bc51abda1 |
29 |
-DIST xorg-server-1.18.3.tar.bz2 5867330 SHA256 ea739c22517cdbe2b5f7c0a5fd05fe8a10ac0629003e71c0c7862f4bb60142cd SHA512 9540b2fb69bf531b57e54af09b103c92c8d9d9cc4e6abe911f63b73b7c63eb6587eeae87927d7bdd7be83749785bf6b395891f85394e86ad2b01c182749f2171 WHIRLPOOL 8ddf040ff24a4668a460b323b6604347120868658d61b9b84853568f768f7f84267d7caf299c4fe306aeff0bc68d28613a51eaee5a2904bfd524e2aac7ff2e7a |
30 |
DIST xorg-server-1.18.4.tar.bz2 6009508 SHA256 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 SHA512 2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b WHIRLPOOL f9ba5ffb49e6ac7ca20d64d27712a0a8f10c6560256a20e9f944d6438dc5f5eebe53daf6af110084da67a622e92874969047518e72ff181de0d64d83030d629f |
31 |
-DIST xorg-server-1.19.0.tar.bz2 6051462 SHA256 149a708b50befc2d5a40b98d45ddd2ebe0beec018e6d0c663c43bad6210e4da3 SHA512 2431c5f0fe20684c7fa7bb08608853f45d1a6d94a9efe1b3dfbd6e67b77a29cfec9b480478bc96c5ceb1c877161af39cf10ddb7b9f471ed847e9ec72a067f591 WHIRLPOOL 73f0ef3b44d335420f01e730520d715f2f00935f55c414cab3204ae520badcb5beb949e32fc413b968d0f77c32d7b338fde3a521b44430101aad76ad30075f3f |
32 |
DIST xorg-server-1.19.1.tar.bz2 6041792 SHA256 79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb SHA512 37d413fdd96ce6b15ae20ca5028331498586044cfc7a6ab0acb99201b04063c69bcd06867f2dc33237b244ce2870a1c5a4be3cbe4560f2461894f46f8d5dbdd7 WHIRLPOOL 9fab4118e866e11a7742ba63d7f681490d43718a329416fb742e268fdf56f348bc9f1f2b5229fbaac98ce78f41fc1e9e5aa7587ee120fcccaba752ff4bac1555 |
33 |
|
34 |
diff --git a/x11-base/xorg-server/xorg-server-1.18.0.ebuild b/x11-base/xorg-server/xorg-server-1.18.0.ebuild |
35 |
deleted file mode 100644 |
36 |
index f72243f..00000000 |
37 |
--- a/x11-base/xorg-server/xorg-server-1.18.0.ebuild |
38 |
+++ /dev/null |
39 |
@@ -1,242 +0,0 @@ |
40 |
-# Copyright 1999-2016 Gentoo Foundation |
41 |
-# Distributed under the terms of the GNU General Public License v2 |
42 |
-# $Id$ |
43 |
- |
44 |
-EAPI=5 |
45 |
- |
46 |
-XORG_DOC=doc |
47 |
-inherit xorg-2 multilib versionator flag-o-matic |
48 |
-EGIT_REPO_URI="git://anongit.freedesktop.org/xorg/xserver" |
49 |
- |
50 |
-DESCRIPTION="X.Org X servers" |
51 |
-SLOT="0/${PV}" |
52 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
53 |
- |
54 |
-IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb" |
55 |
-IUSE="${IUSE_SERVERS} glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind wayland" |
56 |
- |
57 |
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
58 |
- !libressl? ( dev-libs/openssl:0= ) |
59 |
- libressl? ( dev-libs/libressl ) |
60 |
- media-libs/freetype |
61 |
- >=x11-apps/iceauth-1.0.2 |
62 |
- >=x11-apps/rgb-1.0.3 |
63 |
- >=x11-apps/xauth-1.0.3 |
64 |
- x11-apps/xkbcomp |
65 |
- >=x11-libs/libdrm-2.4.46 |
66 |
- >=x11-libs/libpciaccess-0.12.901 |
67 |
- >=x11-libs/libXau-1.0.4 |
68 |
- >=x11-libs/libXdmcp-1.0.2 |
69 |
- >=x11-libs/libXfont-1.4.2 |
70 |
- >=x11-libs/libxkbfile-1.0.4 |
71 |
- >=x11-libs/libxshmfence-1.1 |
72 |
- >=x11-libs/pixman-0.27.2 |
73 |
- >=x11-libs/xtrans-1.3.5 |
74 |
- >=x11-misc/xbitmaps-1.0.1 |
75 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
76 |
- dmx? ( |
77 |
- x11-libs/libXt |
78 |
- >=x11-libs/libdmx-1.0.99.1 |
79 |
- >=x11-libs/libX11-1.1.5 |
80 |
- >=x11-libs/libXaw-1.0.4 |
81 |
- >=x11-libs/libXext-1.0.99.4 |
82 |
- >=x11-libs/libXfixes-5.0 |
83 |
- >=x11-libs/libXi-1.2.99.1 |
84 |
- >=x11-libs/libXmu-1.0.3 |
85 |
- x11-libs/libXrender |
86 |
- >=x11-libs/libXres-1.0.3 |
87 |
- >=x11-libs/libXtst-1.0.99.2 |
88 |
- ) |
89 |
- glamor? ( |
90 |
- media-libs/libepoxy |
91 |
- >=media-libs/mesa-10.3.4-r1[egl,gbm] |
92 |
- !x11-libs/glamor |
93 |
- ) |
94 |
- kdrive? ( |
95 |
- >=x11-libs/libXext-1.0.5 |
96 |
- x11-libs/libXv |
97 |
- ) |
98 |
- xephyr? ( |
99 |
- x11-libs/libxcb |
100 |
- x11-libs/xcb-util |
101 |
- x11-libs/xcb-util-image |
102 |
- x11-libs/xcb-util-keysyms |
103 |
- x11-libs/xcb-util-renderutil |
104 |
- x11-libs/xcb-util-wm |
105 |
- ) |
106 |
- !minimal? ( |
107 |
- >=x11-libs/libX11-1.1.5 |
108 |
- >=x11-libs/libXext-1.0.5 |
109 |
- >=media-libs/mesa-10.3.4-r1 |
110 |
- ) |
111 |
- tslib? ( >=x11-libs/tslib-1.0 ) |
112 |
- udev? ( >=virtual/udev-150 ) |
113 |
- unwind? ( sys-libs/libunwind ) |
114 |
- wayland? ( |
115 |
- >=dev-libs/wayland-1.3.0 |
116 |
- media-libs/libepoxy |
117 |
- ) |
118 |
- >=x11-apps/xinit-1.3.3-r1 |
119 |
- systemd? ( |
120 |
- sys-apps/dbus |
121 |
- sys-apps/systemd |
122 |
- )" |
123 |
- |
124 |
-DEPEND="${CDEPEND} |
125 |
- sys-devel/flex |
126 |
- >=x11-proto/bigreqsproto-1.1.0 |
127 |
- >=x11-proto/compositeproto-0.4 |
128 |
- >=x11-proto/damageproto-1.1 |
129 |
- >=x11-proto/fixesproto-5.0 |
130 |
- >=x11-proto/fontsproto-2.1.3 |
131 |
- >=x11-proto/glproto-1.4.17-r1 |
132 |
- >=x11-proto/inputproto-2.3 |
133 |
- >=x11-proto/kbproto-1.0.3 |
134 |
- >=x11-proto/randrproto-1.5.0 |
135 |
- >=x11-proto/recordproto-1.13.99.1 |
136 |
- >=x11-proto/renderproto-0.11 |
137 |
- >=x11-proto/resourceproto-1.2.0 |
138 |
- >=x11-proto/scrnsaverproto-1.1 |
139 |
- >=x11-proto/trapproto-3.4.3 |
140 |
- >=x11-proto/videoproto-2.2.2 |
141 |
- >=x11-proto/xcmiscproto-1.2.0 |
142 |
- >=x11-proto/xextproto-7.2.99.901 |
143 |
- >=x11-proto/xf86dgaproto-2.0.99.1 |
144 |
- >=x11-proto/xf86rushproto-1.1.2 |
145 |
- >=x11-proto/xf86vidmodeproto-2.2.99.1 |
146 |
- >=x11-proto/xineramaproto-1.1.3 |
147 |
- >=x11-proto/xproto-7.0.28 |
148 |
- >=x11-proto/presentproto-1.0 |
149 |
- >=x11-proto/dri3proto-1.0 |
150 |
- dmx? ( |
151 |
- >=x11-proto/dmxproto-2.2.99.1 |
152 |
- doc? ( |
153 |
- || ( |
154 |
- www-client/links |
155 |
- www-client/lynx |
156 |
- www-client/w3m |
157 |
- ) |
158 |
- ) |
159 |
- ) |
160 |
- !minimal? ( |
161 |
- >=x11-proto/xf86driproto-2.1.0 |
162 |
- >=x11-proto/dri2proto-2.8 |
163 |
- )" |
164 |
- |
165 |
-RDEPEND="${CDEPEND} |
166 |
- selinux? ( sec-policy/selinux-xserver ) |
167 |
- !x11-drivers/xf86-video-modesetting |
168 |
-" |
169 |
- |
170 |
-PDEPEND=" |
171 |
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
172 |
- |
173 |
-REQUIRED_USE="!minimal? ( |
174 |
- || ( ${IUSE_SERVERS} ) |
175 |
- ) |
176 |
- xephyr? ( kdrive )" |
177 |
- |
178 |
-#UPSTREAMED_PATCHES=( |
179 |
-# "${WORKDIR}/patches/" |
180 |
-#) |
181 |
- |
182 |
-PATCHES=( |
183 |
- "${UPSTREAMED_PATCHES[@]}" |
184 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
185 |
- # needed for new eselect-opengl, bug #541232 |
186 |
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
187 |
-) |
188 |
- |
189 |
-pkg_pretend() { |
190 |
- # older gcc is not supported |
191 |
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
192 |
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
193 |
-} |
194 |
- |
195 |
-src_configure() { |
196 |
- # localstatedir is used for the log location; we need to override the default |
197 |
- # from ebuild.sh |
198 |
- # sysconfdir is used for the xorg.conf location; same applies |
199 |
- # NOTE: fop is used for doc generating; and I have no idea if Gentoo |
200 |
- # package it somewhere |
201 |
- XORG_CONFIGURE_OPTIONS=( |
202 |
- $(use_enable ipv6) |
203 |
- $(use_enable dmx) |
204 |
- $(use_enable glamor) |
205 |
- $(use_enable kdrive) |
206 |
- $(use_enable kdrive kdrive-kbd) |
207 |
- $(use_enable kdrive kdrive-mouse) |
208 |
- $(use_enable kdrive kdrive-evdev) |
209 |
- $(use_enable suid install-setuid) |
210 |
- $(use_enable tslib) |
211 |
- $(use_enable unwind libunwind) |
212 |
- $(use_enable wayland xwayland) |
213 |
- $(use_enable !minimal record) |
214 |
- $(use_enable !minimal xfree86-utils) |
215 |
- $(use_enable !minimal dri) |
216 |
- $(use_enable !minimal dri2) |
217 |
- $(use_enable !minimal glx) |
218 |
- $(use_enable xephyr) |
219 |
- $(use_enable xnest) |
220 |
- $(use_enable xorg) |
221 |
- $(use_enable xvfb) |
222 |
- $(use_enable udev config-udev) |
223 |
- $(use_with doc doxygen) |
224 |
- $(use_with doc xmlto) |
225 |
- $(use_with systemd systemd-daemon) |
226 |
- $(use_enable systemd systemd-logind) |
227 |
- --enable-libdrm |
228 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
229 |
- --localstatedir="${EPREFIX}"/var |
230 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
231 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
232 |
- --disable-config-hal |
233 |
- --disable-linux-acpi |
234 |
- --without-dtrace |
235 |
- --without-fop |
236 |
- --with-os-vendor=Gentoo |
237 |
- --with-sha1=libcrypto |
238 |
- ) |
239 |
- |
240 |
- xorg-2_src_configure |
241 |
-} |
242 |
- |
243 |
-src_install() { |
244 |
- xorg-2_src_install |
245 |
- |
246 |
- server_based_install |
247 |
- |
248 |
- if ! use minimal && use xorg; then |
249 |
- # Install xorg.conf.example into docs |
250 |
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
251 |
- fi |
252 |
- |
253 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
254 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
255 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
256 |
- |
257 |
- # install the @x11-module-rebuild set for Portage |
258 |
- insinto /usr/share/portage/config/sets |
259 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
260 |
-} |
261 |
- |
262 |
-pkg_postinst() { |
263 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
264 |
- eselect opengl set xorg-x11 --use-old |
265 |
-} |
266 |
- |
267 |
-pkg_postrm() { |
268 |
- # Get rid of module dir to ensure opengl-update works properly |
269 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
270 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
271 |
- fi |
272 |
-} |
273 |
- |
274 |
-server_based_install() { |
275 |
- if ! use xorg; then |
276 |
- rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
277 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
278 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
279 |
- "${ED}"/usr/share/man/man1/Xserver.1x |
280 |
- fi |
281 |
-} |
282 |
|
283 |
diff --git a/x11-base/xorg-server/xorg-server-1.18.1.ebuild b/x11-base/xorg-server/xorg-server-1.18.1.ebuild |
284 |
deleted file mode 100644 |
285 |
index f72243f..00000000 |
286 |
--- a/x11-base/xorg-server/xorg-server-1.18.1.ebuild |
287 |
+++ /dev/null |
288 |
@@ -1,242 +0,0 @@ |
289 |
-# Copyright 1999-2016 Gentoo Foundation |
290 |
-# Distributed under the terms of the GNU General Public License v2 |
291 |
-# $Id$ |
292 |
- |
293 |
-EAPI=5 |
294 |
- |
295 |
-XORG_DOC=doc |
296 |
-inherit xorg-2 multilib versionator flag-o-matic |
297 |
-EGIT_REPO_URI="git://anongit.freedesktop.org/xorg/xserver" |
298 |
- |
299 |
-DESCRIPTION="X.Org X servers" |
300 |
-SLOT="0/${PV}" |
301 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
302 |
- |
303 |
-IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb" |
304 |
-IUSE="${IUSE_SERVERS} glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind wayland" |
305 |
- |
306 |
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
307 |
- !libressl? ( dev-libs/openssl:0= ) |
308 |
- libressl? ( dev-libs/libressl ) |
309 |
- media-libs/freetype |
310 |
- >=x11-apps/iceauth-1.0.2 |
311 |
- >=x11-apps/rgb-1.0.3 |
312 |
- >=x11-apps/xauth-1.0.3 |
313 |
- x11-apps/xkbcomp |
314 |
- >=x11-libs/libdrm-2.4.46 |
315 |
- >=x11-libs/libpciaccess-0.12.901 |
316 |
- >=x11-libs/libXau-1.0.4 |
317 |
- >=x11-libs/libXdmcp-1.0.2 |
318 |
- >=x11-libs/libXfont-1.4.2 |
319 |
- >=x11-libs/libxkbfile-1.0.4 |
320 |
- >=x11-libs/libxshmfence-1.1 |
321 |
- >=x11-libs/pixman-0.27.2 |
322 |
- >=x11-libs/xtrans-1.3.5 |
323 |
- >=x11-misc/xbitmaps-1.0.1 |
324 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
325 |
- dmx? ( |
326 |
- x11-libs/libXt |
327 |
- >=x11-libs/libdmx-1.0.99.1 |
328 |
- >=x11-libs/libX11-1.1.5 |
329 |
- >=x11-libs/libXaw-1.0.4 |
330 |
- >=x11-libs/libXext-1.0.99.4 |
331 |
- >=x11-libs/libXfixes-5.0 |
332 |
- >=x11-libs/libXi-1.2.99.1 |
333 |
- >=x11-libs/libXmu-1.0.3 |
334 |
- x11-libs/libXrender |
335 |
- >=x11-libs/libXres-1.0.3 |
336 |
- >=x11-libs/libXtst-1.0.99.2 |
337 |
- ) |
338 |
- glamor? ( |
339 |
- media-libs/libepoxy |
340 |
- >=media-libs/mesa-10.3.4-r1[egl,gbm] |
341 |
- !x11-libs/glamor |
342 |
- ) |
343 |
- kdrive? ( |
344 |
- >=x11-libs/libXext-1.0.5 |
345 |
- x11-libs/libXv |
346 |
- ) |
347 |
- xephyr? ( |
348 |
- x11-libs/libxcb |
349 |
- x11-libs/xcb-util |
350 |
- x11-libs/xcb-util-image |
351 |
- x11-libs/xcb-util-keysyms |
352 |
- x11-libs/xcb-util-renderutil |
353 |
- x11-libs/xcb-util-wm |
354 |
- ) |
355 |
- !minimal? ( |
356 |
- >=x11-libs/libX11-1.1.5 |
357 |
- >=x11-libs/libXext-1.0.5 |
358 |
- >=media-libs/mesa-10.3.4-r1 |
359 |
- ) |
360 |
- tslib? ( >=x11-libs/tslib-1.0 ) |
361 |
- udev? ( >=virtual/udev-150 ) |
362 |
- unwind? ( sys-libs/libunwind ) |
363 |
- wayland? ( |
364 |
- >=dev-libs/wayland-1.3.0 |
365 |
- media-libs/libepoxy |
366 |
- ) |
367 |
- >=x11-apps/xinit-1.3.3-r1 |
368 |
- systemd? ( |
369 |
- sys-apps/dbus |
370 |
- sys-apps/systemd |
371 |
- )" |
372 |
- |
373 |
-DEPEND="${CDEPEND} |
374 |
- sys-devel/flex |
375 |
- >=x11-proto/bigreqsproto-1.1.0 |
376 |
- >=x11-proto/compositeproto-0.4 |
377 |
- >=x11-proto/damageproto-1.1 |
378 |
- >=x11-proto/fixesproto-5.0 |
379 |
- >=x11-proto/fontsproto-2.1.3 |
380 |
- >=x11-proto/glproto-1.4.17-r1 |
381 |
- >=x11-proto/inputproto-2.3 |
382 |
- >=x11-proto/kbproto-1.0.3 |
383 |
- >=x11-proto/randrproto-1.5.0 |
384 |
- >=x11-proto/recordproto-1.13.99.1 |
385 |
- >=x11-proto/renderproto-0.11 |
386 |
- >=x11-proto/resourceproto-1.2.0 |
387 |
- >=x11-proto/scrnsaverproto-1.1 |
388 |
- >=x11-proto/trapproto-3.4.3 |
389 |
- >=x11-proto/videoproto-2.2.2 |
390 |
- >=x11-proto/xcmiscproto-1.2.0 |
391 |
- >=x11-proto/xextproto-7.2.99.901 |
392 |
- >=x11-proto/xf86dgaproto-2.0.99.1 |
393 |
- >=x11-proto/xf86rushproto-1.1.2 |
394 |
- >=x11-proto/xf86vidmodeproto-2.2.99.1 |
395 |
- >=x11-proto/xineramaproto-1.1.3 |
396 |
- >=x11-proto/xproto-7.0.28 |
397 |
- >=x11-proto/presentproto-1.0 |
398 |
- >=x11-proto/dri3proto-1.0 |
399 |
- dmx? ( |
400 |
- >=x11-proto/dmxproto-2.2.99.1 |
401 |
- doc? ( |
402 |
- || ( |
403 |
- www-client/links |
404 |
- www-client/lynx |
405 |
- www-client/w3m |
406 |
- ) |
407 |
- ) |
408 |
- ) |
409 |
- !minimal? ( |
410 |
- >=x11-proto/xf86driproto-2.1.0 |
411 |
- >=x11-proto/dri2proto-2.8 |
412 |
- )" |
413 |
- |
414 |
-RDEPEND="${CDEPEND} |
415 |
- selinux? ( sec-policy/selinux-xserver ) |
416 |
- !x11-drivers/xf86-video-modesetting |
417 |
-" |
418 |
- |
419 |
-PDEPEND=" |
420 |
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
421 |
- |
422 |
-REQUIRED_USE="!minimal? ( |
423 |
- || ( ${IUSE_SERVERS} ) |
424 |
- ) |
425 |
- xephyr? ( kdrive )" |
426 |
- |
427 |
-#UPSTREAMED_PATCHES=( |
428 |
-# "${WORKDIR}/patches/" |
429 |
-#) |
430 |
- |
431 |
-PATCHES=( |
432 |
- "${UPSTREAMED_PATCHES[@]}" |
433 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
434 |
- # needed for new eselect-opengl, bug #541232 |
435 |
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
436 |
-) |
437 |
- |
438 |
-pkg_pretend() { |
439 |
- # older gcc is not supported |
440 |
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
441 |
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
442 |
-} |
443 |
- |
444 |
-src_configure() { |
445 |
- # localstatedir is used for the log location; we need to override the default |
446 |
- # from ebuild.sh |
447 |
- # sysconfdir is used for the xorg.conf location; same applies |
448 |
- # NOTE: fop is used for doc generating; and I have no idea if Gentoo |
449 |
- # package it somewhere |
450 |
- XORG_CONFIGURE_OPTIONS=( |
451 |
- $(use_enable ipv6) |
452 |
- $(use_enable dmx) |
453 |
- $(use_enable glamor) |
454 |
- $(use_enable kdrive) |
455 |
- $(use_enable kdrive kdrive-kbd) |
456 |
- $(use_enable kdrive kdrive-mouse) |
457 |
- $(use_enable kdrive kdrive-evdev) |
458 |
- $(use_enable suid install-setuid) |
459 |
- $(use_enable tslib) |
460 |
- $(use_enable unwind libunwind) |
461 |
- $(use_enable wayland xwayland) |
462 |
- $(use_enable !minimal record) |
463 |
- $(use_enable !minimal xfree86-utils) |
464 |
- $(use_enable !minimal dri) |
465 |
- $(use_enable !minimal dri2) |
466 |
- $(use_enable !minimal glx) |
467 |
- $(use_enable xephyr) |
468 |
- $(use_enable xnest) |
469 |
- $(use_enable xorg) |
470 |
- $(use_enable xvfb) |
471 |
- $(use_enable udev config-udev) |
472 |
- $(use_with doc doxygen) |
473 |
- $(use_with doc xmlto) |
474 |
- $(use_with systemd systemd-daemon) |
475 |
- $(use_enable systemd systemd-logind) |
476 |
- --enable-libdrm |
477 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
478 |
- --localstatedir="${EPREFIX}"/var |
479 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
480 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
481 |
- --disable-config-hal |
482 |
- --disable-linux-acpi |
483 |
- --without-dtrace |
484 |
- --without-fop |
485 |
- --with-os-vendor=Gentoo |
486 |
- --with-sha1=libcrypto |
487 |
- ) |
488 |
- |
489 |
- xorg-2_src_configure |
490 |
-} |
491 |
- |
492 |
-src_install() { |
493 |
- xorg-2_src_install |
494 |
- |
495 |
- server_based_install |
496 |
- |
497 |
- if ! use minimal && use xorg; then |
498 |
- # Install xorg.conf.example into docs |
499 |
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
500 |
- fi |
501 |
- |
502 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
503 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
504 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
505 |
- |
506 |
- # install the @x11-module-rebuild set for Portage |
507 |
- insinto /usr/share/portage/config/sets |
508 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
509 |
-} |
510 |
- |
511 |
-pkg_postinst() { |
512 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
513 |
- eselect opengl set xorg-x11 --use-old |
514 |
-} |
515 |
- |
516 |
-pkg_postrm() { |
517 |
- # Get rid of module dir to ensure opengl-update works properly |
518 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
519 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
520 |
- fi |
521 |
-} |
522 |
- |
523 |
-server_based_install() { |
524 |
- if ! use xorg; then |
525 |
- rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
526 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
527 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
528 |
- "${ED}"/usr/share/man/man1/Xserver.1x |
529 |
- fi |
530 |
-} |
531 |
|
532 |
diff --git a/x11-base/xorg-server/xorg-server-1.18.2.ebuild b/x11-base/xorg-server/xorg-server-1.18.2.ebuild |
533 |
deleted file mode 100644 |
534 |
index f72243f..00000000 |
535 |
--- a/x11-base/xorg-server/xorg-server-1.18.2.ebuild |
536 |
+++ /dev/null |
537 |
@@ -1,242 +0,0 @@ |
538 |
-# Copyright 1999-2016 Gentoo Foundation |
539 |
-# Distributed under the terms of the GNU General Public License v2 |
540 |
-# $Id$ |
541 |
- |
542 |
-EAPI=5 |
543 |
- |
544 |
-XORG_DOC=doc |
545 |
-inherit xorg-2 multilib versionator flag-o-matic |
546 |
-EGIT_REPO_URI="git://anongit.freedesktop.org/xorg/xserver" |
547 |
- |
548 |
-DESCRIPTION="X.Org X servers" |
549 |
-SLOT="0/${PV}" |
550 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
551 |
- |
552 |
-IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb" |
553 |
-IUSE="${IUSE_SERVERS} glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind wayland" |
554 |
- |
555 |
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
556 |
- !libressl? ( dev-libs/openssl:0= ) |
557 |
- libressl? ( dev-libs/libressl ) |
558 |
- media-libs/freetype |
559 |
- >=x11-apps/iceauth-1.0.2 |
560 |
- >=x11-apps/rgb-1.0.3 |
561 |
- >=x11-apps/xauth-1.0.3 |
562 |
- x11-apps/xkbcomp |
563 |
- >=x11-libs/libdrm-2.4.46 |
564 |
- >=x11-libs/libpciaccess-0.12.901 |
565 |
- >=x11-libs/libXau-1.0.4 |
566 |
- >=x11-libs/libXdmcp-1.0.2 |
567 |
- >=x11-libs/libXfont-1.4.2 |
568 |
- >=x11-libs/libxkbfile-1.0.4 |
569 |
- >=x11-libs/libxshmfence-1.1 |
570 |
- >=x11-libs/pixman-0.27.2 |
571 |
- >=x11-libs/xtrans-1.3.5 |
572 |
- >=x11-misc/xbitmaps-1.0.1 |
573 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
574 |
- dmx? ( |
575 |
- x11-libs/libXt |
576 |
- >=x11-libs/libdmx-1.0.99.1 |
577 |
- >=x11-libs/libX11-1.1.5 |
578 |
- >=x11-libs/libXaw-1.0.4 |
579 |
- >=x11-libs/libXext-1.0.99.4 |
580 |
- >=x11-libs/libXfixes-5.0 |
581 |
- >=x11-libs/libXi-1.2.99.1 |
582 |
- >=x11-libs/libXmu-1.0.3 |
583 |
- x11-libs/libXrender |
584 |
- >=x11-libs/libXres-1.0.3 |
585 |
- >=x11-libs/libXtst-1.0.99.2 |
586 |
- ) |
587 |
- glamor? ( |
588 |
- media-libs/libepoxy |
589 |
- >=media-libs/mesa-10.3.4-r1[egl,gbm] |
590 |
- !x11-libs/glamor |
591 |
- ) |
592 |
- kdrive? ( |
593 |
- >=x11-libs/libXext-1.0.5 |
594 |
- x11-libs/libXv |
595 |
- ) |
596 |
- xephyr? ( |
597 |
- x11-libs/libxcb |
598 |
- x11-libs/xcb-util |
599 |
- x11-libs/xcb-util-image |
600 |
- x11-libs/xcb-util-keysyms |
601 |
- x11-libs/xcb-util-renderutil |
602 |
- x11-libs/xcb-util-wm |
603 |
- ) |
604 |
- !minimal? ( |
605 |
- >=x11-libs/libX11-1.1.5 |
606 |
- >=x11-libs/libXext-1.0.5 |
607 |
- >=media-libs/mesa-10.3.4-r1 |
608 |
- ) |
609 |
- tslib? ( >=x11-libs/tslib-1.0 ) |
610 |
- udev? ( >=virtual/udev-150 ) |
611 |
- unwind? ( sys-libs/libunwind ) |
612 |
- wayland? ( |
613 |
- >=dev-libs/wayland-1.3.0 |
614 |
- media-libs/libepoxy |
615 |
- ) |
616 |
- >=x11-apps/xinit-1.3.3-r1 |
617 |
- systemd? ( |
618 |
- sys-apps/dbus |
619 |
- sys-apps/systemd |
620 |
- )" |
621 |
- |
622 |
-DEPEND="${CDEPEND} |
623 |
- sys-devel/flex |
624 |
- >=x11-proto/bigreqsproto-1.1.0 |
625 |
- >=x11-proto/compositeproto-0.4 |
626 |
- >=x11-proto/damageproto-1.1 |
627 |
- >=x11-proto/fixesproto-5.0 |
628 |
- >=x11-proto/fontsproto-2.1.3 |
629 |
- >=x11-proto/glproto-1.4.17-r1 |
630 |
- >=x11-proto/inputproto-2.3 |
631 |
- >=x11-proto/kbproto-1.0.3 |
632 |
- >=x11-proto/randrproto-1.5.0 |
633 |
- >=x11-proto/recordproto-1.13.99.1 |
634 |
- >=x11-proto/renderproto-0.11 |
635 |
- >=x11-proto/resourceproto-1.2.0 |
636 |
- >=x11-proto/scrnsaverproto-1.1 |
637 |
- >=x11-proto/trapproto-3.4.3 |
638 |
- >=x11-proto/videoproto-2.2.2 |
639 |
- >=x11-proto/xcmiscproto-1.2.0 |
640 |
- >=x11-proto/xextproto-7.2.99.901 |
641 |
- >=x11-proto/xf86dgaproto-2.0.99.1 |
642 |
- >=x11-proto/xf86rushproto-1.1.2 |
643 |
- >=x11-proto/xf86vidmodeproto-2.2.99.1 |
644 |
- >=x11-proto/xineramaproto-1.1.3 |
645 |
- >=x11-proto/xproto-7.0.28 |
646 |
- >=x11-proto/presentproto-1.0 |
647 |
- >=x11-proto/dri3proto-1.0 |
648 |
- dmx? ( |
649 |
- >=x11-proto/dmxproto-2.2.99.1 |
650 |
- doc? ( |
651 |
- || ( |
652 |
- www-client/links |
653 |
- www-client/lynx |
654 |
- www-client/w3m |
655 |
- ) |
656 |
- ) |
657 |
- ) |
658 |
- !minimal? ( |
659 |
- >=x11-proto/xf86driproto-2.1.0 |
660 |
- >=x11-proto/dri2proto-2.8 |
661 |
- )" |
662 |
- |
663 |
-RDEPEND="${CDEPEND} |
664 |
- selinux? ( sec-policy/selinux-xserver ) |
665 |
- !x11-drivers/xf86-video-modesetting |
666 |
-" |
667 |
- |
668 |
-PDEPEND=" |
669 |
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
670 |
- |
671 |
-REQUIRED_USE="!minimal? ( |
672 |
- || ( ${IUSE_SERVERS} ) |
673 |
- ) |
674 |
- xephyr? ( kdrive )" |
675 |
- |
676 |
-#UPSTREAMED_PATCHES=( |
677 |
-# "${WORKDIR}/patches/" |
678 |
-#) |
679 |
- |
680 |
-PATCHES=( |
681 |
- "${UPSTREAMED_PATCHES[@]}" |
682 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
683 |
- # needed for new eselect-opengl, bug #541232 |
684 |
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
685 |
-) |
686 |
- |
687 |
-pkg_pretend() { |
688 |
- # older gcc is not supported |
689 |
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
690 |
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
691 |
-} |
692 |
- |
693 |
-src_configure() { |
694 |
- # localstatedir is used for the log location; we need to override the default |
695 |
- # from ebuild.sh |
696 |
- # sysconfdir is used for the xorg.conf location; same applies |
697 |
- # NOTE: fop is used for doc generating; and I have no idea if Gentoo |
698 |
- # package it somewhere |
699 |
- XORG_CONFIGURE_OPTIONS=( |
700 |
- $(use_enable ipv6) |
701 |
- $(use_enable dmx) |
702 |
- $(use_enable glamor) |
703 |
- $(use_enable kdrive) |
704 |
- $(use_enable kdrive kdrive-kbd) |
705 |
- $(use_enable kdrive kdrive-mouse) |
706 |
- $(use_enable kdrive kdrive-evdev) |
707 |
- $(use_enable suid install-setuid) |
708 |
- $(use_enable tslib) |
709 |
- $(use_enable unwind libunwind) |
710 |
- $(use_enable wayland xwayland) |
711 |
- $(use_enable !minimal record) |
712 |
- $(use_enable !minimal xfree86-utils) |
713 |
- $(use_enable !minimal dri) |
714 |
- $(use_enable !minimal dri2) |
715 |
- $(use_enable !minimal glx) |
716 |
- $(use_enable xephyr) |
717 |
- $(use_enable xnest) |
718 |
- $(use_enable xorg) |
719 |
- $(use_enable xvfb) |
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-2_src_configure |
739 |
-} |
740 |
- |
741 |
-src_install() { |
742 |
- xorg-2_src_install |
743 |
- |
744 |
- server_based_install |
745 |
- |
746 |
- if ! use minimal && use xorg; then |
747 |
- # Install xorg.conf.example into docs |
748 |
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
749 |
- fi |
750 |
- |
751 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
752 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
753 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
754 |
- |
755 |
- # install the @x11-module-rebuild set for Portage |
756 |
- insinto /usr/share/portage/config/sets |
757 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
758 |
-} |
759 |
- |
760 |
-pkg_postinst() { |
761 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
762 |
- eselect opengl set xorg-x11 --use-old |
763 |
-} |
764 |
- |
765 |
-pkg_postrm() { |
766 |
- # Get rid of module dir to ensure opengl-update works properly |
767 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
768 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
769 |
- fi |
770 |
-} |
771 |
- |
772 |
-server_based_install() { |
773 |
- if ! use xorg; then |
774 |
- rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
775 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
776 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
777 |
- "${ED}"/usr/share/man/man1/Xserver.1x |
778 |
- fi |
779 |
-} |
780 |
|
781 |
diff --git a/x11-base/xorg-server/xorg-server-1.18.3.ebuild b/x11-base/xorg-server/xorg-server-1.18.3.ebuild |
782 |
deleted file mode 100644 |
783 |
index 06d2303..00000000 |
784 |
--- a/x11-base/xorg-server/xorg-server-1.18.3.ebuild |
785 |
+++ /dev/null |
786 |
@@ -1,242 +0,0 @@ |
787 |
-# Copyright 1999-2016 Gentoo Foundation |
788 |
-# Distributed under the terms of the GNU General Public License v2 |
789 |
-# $Id$ |
790 |
- |
791 |
-EAPI=5 |
792 |
- |
793 |
-XORG_DOC=doc |
794 |
-inherit xorg-2 multilib versionator flag-o-matic |
795 |
-EGIT_REPO_URI="git://anongit.freedesktop.org/xorg/xserver" |
796 |
- |
797 |
-DESCRIPTION="X.Org X servers" |
798 |
-SLOT="0/${PV}" |
799 |
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
800 |
- |
801 |
-IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb" |
802 |
-IUSE="${IUSE_SERVERS} glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind wayland" |
803 |
- |
804 |
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
805 |
- !libressl? ( dev-libs/openssl:0= ) |
806 |
- libressl? ( dev-libs/libressl ) |
807 |
- media-libs/freetype |
808 |
- >=x11-apps/iceauth-1.0.2 |
809 |
- >=x11-apps/rgb-1.0.3 |
810 |
- >=x11-apps/xauth-1.0.3 |
811 |
- x11-apps/xkbcomp |
812 |
- >=x11-libs/libdrm-2.4.46 |
813 |
- >=x11-libs/libpciaccess-0.12.901 |
814 |
- >=x11-libs/libXau-1.0.4 |
815 |
- >=x11-libs/libXdmcp-1.0.2 |
816 |
- >=x11-libs/libXfont-1.4.2 |
817 |
- >=x11-libs/libxkbfile-1.0.4 |
818 |
- >=x11-libs/libxshmfence-1.1 |
819 |
- >=x11-libs/pixman-0.27.2 |
820 |
- >=x11-libs/xtrans-1.3.5 |
821 |
- >=x11-misc/xbitmaps-1.0.1 |
822 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
823 |
- dmx? ( |
824 |
- x11-libs/libXt |
825 |
- >=x11-libs/libdmx-1.0.99.1 |
826 |
- >=x11-libs/libX11-1.1.5 |
827 |
- >=x11-libs/libXaw-1.0.4 |
828 |
- >=x11-libs/libXext-1.0.99.4 |
829 |
- >=x11-libs/libXfixes-5.0 |
830 |
- >=x11-libs/libXi-1.2.99.1 |
831 |
- >=x11-libs/libXmu-1.0.3 |
832 |
- x11-libs/libXrender |
833 |
- >=x11-libs/libXres-1.0.3 |
834 |
- >=x11-libs/libXtst-1.0.99.2 |
835 |
- ) |
836 |
- glamor? ( |
837 |
- media-libs/libepoxy |
838 |
- >=media-libs/mesa-10.3.4-r1[egl,gbm] |
839 |
- !x11-libs/glamor |
840 |
- ) |
841 |
- kdrive? ( |
842 |
- >=x11-libs/libXext-1.0.5 |
843 |
- x11-libs/libXv |
844 |
- ) |
845 |
- xephyr? ( |
846 |
- x11-libs/libxcb |
847 |
- x11-libs/xcb-util |
848 |
- x11-libs/xcb-util-image |
849 |
- x11-libs/xcb-util-keysyms |
850 |
- x11-libs/xcb-util-renderutil |
851 |
- x11-libs/xcb-util-wm |
852 |
- ) |
853 |
- !minimal? ( |
854 |
- >=x11-libs/libX11-1.1.5 |
855 |
- >=x11-libs/libXext-1.0.5 |
856 |
- >=media-libs/mesa-10.3.4-r1 |
857 |
- ) |
858 |
- tslib? ( >=x11-libs/tslib-1.0 ) |
859 |
- udev? ( >=virtual/udev-150 ) |
860 |
- unwind? ( sys-libs/libunwind ) |
861 |
- wayland? ( |
862 |
- >=dev-libs/wayland-1.3.0 |
863 |
- media-libs/libepoxy |
864 |
- ) |
865 |
- >=x11-apps/xinit-1.3.3-r1 |
866 |
- systemd? ( |
867 |
- sys-apps/dbus |
868 |
- sys-apps/systemd |
869 |
- )" |
870 |
- |
871 |
-DEPEND="${CDEPEND} |
872 |
- sys-devel/flex |
873 |
- >=x11-proto/bigreqsproto-1.1.0 |
874 |
- >=x11-proto/compositeproto-0.4 |
875 |
- >=x11-proto/damageproto-1.1 |
876 |
- >=x11-proto/fixesproto-5.0 |
877 |
- >=x11-proto/fontsproto-2.1.3 |
878 |
- >=x11-proto/glproto-1.4.17-r1 |
879 |
- >=x11-proto/inputproto-2.3 |
880 |
- >=x11-proto/kbproto-1.0.3 |
881 |
- >=x11-proto/randrproto-1.5.0 |
882 |
- >=x11-proto/recordproto-1.13.99.1 |
883 |
- >=x11-proto/renderproto-0.11 |
884 |
- >=x11-proto/resourceproto-1.2.0 |
885 |
- >=x11-proto/scrnsaverproto-1.1 |
886 |
- >=x11-proto/trapproto-3.4.3 |
887 |
- >=x11-proto/videoproto-2.2.2 |
888 |
- >=x11-proto/xcmiscproto-1.2.0 |
889 |
- >=x11-proto/xextproto-7.2.99.901 |
890 |
- >=x11-proto/xf86dgaproto-2.0.99.1 |
891 |
- >=x11-proto/xf86rushproto-1.1.2 |
892 |
- >=x11-proto/xf86vidmodeproto-2.2.99.1 |
893 |
- >=x11-proto/xineramaproto-1.1.3 |
894 |
- >=x11-proto/xproto-7.0.28 |
895 |
- >=x11-proto/presentproto-1.0 |
896 |
- >=x11-proto/dri3proto-1.0 |
897 |
- dmx? ( |
898 |
- >=x11-proto/dmxproto-2.2.99.1 |
899 |
- doc? ( |
900 |
- || ( |
901 |
- www-client/links |
902 |
- www-client/lynx |
903 |
- www-client/w3m |
904 |
- ) |
905 |
- ) |
906 |
- ) |
907 |
- !minimal? ( |
908 |
- >=x11-proto/xf86driproto-2.1.0 |
909 |
- >=x11-proto/dri2proto-2.8 |
910 |
- )" |
911 |
- |
912 |
-RDEPEND="${CDEPEND} |
913 |
- selinux? ( sec-policy/selinux-xserver ) |
914 |
- !x11-drivers/xf86-video-modesetting |
915 |
-" |
916 |
- |
917 |
-PDEPEND=" |
918 |
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
919 |
- |
920 |
-REQUIRED_USE="!minimal? ( |
921 |
- || ( ${IUSE_SERVERS} ) |
922 |
- ) |
923 |
- xephyr? ( kdrive )" |
924 |
- |
925 |
-#UPSTREAMED_PATCHES=( |
926 |
-# "${WORKDIR}/patches/" |
927 |
-#) |
928 |
- |
929 |
-PATCHES=( |
930 |
- "${UPSTREAMED_PATCHES[@]}" |
931 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
932 |
- # needed for new eselect-opengl, bug #541232 |
933 |
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
934 |
-) |
935 |
- |
936 |
-pkg_pretend() { |
937 |
- # older gcc is not supported |
938 |
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
939 |
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
940 |
-} |
941 |
- |
942 |
-src_configure() { |
943 |
- # localstatedir is used for the log location; we need to override the default |
944 |
- # from ebuild.sh |
945 |
- # sysconfdir is used for the xorg.conf location; same applies |
946 |
- # NOTE: fop is used for doc generating; and I have no idea if Gentoo |
947 |
- # package it somewhere |
948 |
- XORG_CONFIGURE_OPTIONS=( |
949 |
- $(use_enable ipv6) |
950 |
- $(use_enable dmx) |
951 |
- $(use_enable glamor) |
952 |
- $(use_enable kdrive) |
953 |
- $(use_enable kdrive kdrive-kbd) |
954 |
- $(use_enable kdrive kdrive-mouse) |
955 |
- $(use_enable kdrive kdrive-evdev) |
956 |
- $(use_enable suid install-setuid) |
957 |
- $(use_enable tslib) |
958 |
- $(use_enable unwind libunwind) |
959 |
- $(use_enable wayland xwayland) |
960 |
- $(use_enable !minimal record) |
961 |
- $(use_enable !minimal xfree86-utils) |
962 |
- $(use_enable !minimal dri) |
963 |
- $(use_enable !minimal dri2) |
964 |
- $(use_enable !minimal glx) |
965 |
- $(use_enable xephyr) |
966 |
- $(use_enable xnest) |
967 |
- $(use_enable xorg) |
968 |
- $(use_enable xvfb) |
969 |
- $(use_enable udev config-udev) |
970 |
- $(use_with doc doxygen) |
971 |
- $(use_with doc xmlto) |
972 |
- $(use_with systemd systemd-daemon) |
973 |
- $(use_enable systemd systemd-logind) |
974 |
- --enable-libdrm |
975 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
976 |
- --localstatedir="${EPREFIX}"/var |
977 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
978 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
979 |
- --disable-config-hal |
980 |
- --disable-linux-acpi |
981 |
- --without-dtrace |
982 |
- --without-fop |
983 |
- --with-os-vendor=Gentoo |
984 |
- --with-sha1=libcrypto |
985 |
- ) |
986 |
- |
987 |
- xorg-2_src_configure |
988 |
-} |
989 |
- |
990 |
-src_install() { |
991 |
- xorg-2_src_install |
992 |
- |
993 |
- server_based_install |
994 |
- |
995 |
- if ! use minimal && use xorg; then |
996 |
- # Install xorg.conf.example into docs |
997 |
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
998 |
- fi |
999 |
- |
1000 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
1001 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
1002 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
1003 |
- |
1004 |
- # install the @x11-module-rebuild set for Portage |
1005 |
- insinto /usr/share/portage/config/sets |
1006 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
1007 |
-} |
1008 |
- |
1009 |
-pkg_postinst() { |
1010 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
1011 |
- eselect opengl set xorg-x11 --use-old |
1012 |
-} |
1013 |
- |
1014 |
-pkg_postrm() { |
1015 |
- # Get rid of module dir to ensure opengl-update works properly |
1016 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
1017 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
1018 |
- fi |
1019 |
-} |
1020 |
- |
1021 |
-server_based_install() { |
1022 |
- if ! use xorg; then |
1023 |
- rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
1024 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
1025 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
1026 |
- "${ED}"/usr/share/man/man1/Xserver.1x |
1027 |
- fi |
1028 |
-} |
1029 |
|
1030 |
diff --git a/x11-base/xorg-server/xorg-server-1.19.0.ebuild b/x11-base/xorg-server/xorg-server-1.19.0.ebuild |
1031 |
deleted file mode 100644 |
1032 |
index 9930176..00000000 |
1033 |
--- a/x11-base/xorg-server/xorg-server-1.19.0.ebuild |
1034 |
+++ /dev/null |
1035 |
@@ -1,244 +0,0 @@ |
1036 |
-# Copyright 1999-2017 Gentoo Foundation |
1037 |
-# Distributed under the terms of the GNU General Public License v2 |
1038 |
-# $Id$ |
1039 |
- |
1040 |
-EAPI=5 |
1041 |
- |
1042 |
-XORG_DOC=doc |
1043 |
-inherit xorg-2 multilib versionator flag-o-matic |
1044 |
-EGIT_REPO_URI="git://anongit.freedesktop.org/xorg/xserver" |
1045 |
- |
1046 |
-DESCRIPTION="X.Org X servers" |
1047 |
-SLOT="0/${PV}" |
1048 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
1049 |
- |
1050 |
-IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb" |
1051 |
-IUSE="${IUSE_SERVERS} glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind wayland" |
1052 |
- |
1053 |
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
1054 |
- !libressl? ( dev-libs/openssl:0= ) |
1055 |
- libressl? ( dev-libs/libressl ) |
1056 |
- media-libs/freetype |
1057 |
- >=x11-apps/iceauth-1.0.2 |
1058 |
- >=x11-apps/rgb-1.0.3 |
1059 |
- >=x11-apps/xauth-1.0.3 |
1060 |
- x11-apps/xkbcomp |
1061 |
- >=x11-libs/libdrm-2.4.46 |
1062 |
- >=x11-libs/libpciaccess-0.12.901 |
1063 |
- >=x11-libs/libXau-1.0.4 |
1064 |
- >=x11-libs/libXdmcp-1.0.2 |
1065 |
- >=x11-libs/libXfont2-2.0.1 |
1066 |
- >=x11-libs/libxkbfile-1.0.4 |
1067 |
- >=x11-libs/libxshmfence-1.1 |
1068 |
- >=x11-libs/pixman-0.27.2 |
1069 |
- >=x11-libs/xtrans-1.3.5 |
1070 |
- >=x11-misc/xbitmaps-1.0.1 |
1071 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
1072 |
- dmx? ( |
1073 |
- x11-libs/libXt |
1074 |
- >=x11-libs/libdmx-1.0.99.1 |
1075 |
- >=x11-libs/libX11-1.1.5 |
1076 |
- >=x11-libs/libXaw-1.0.4 |
1077 |
- >=x11-libs/libXext-1.0.99.4 |
1078 |
- >=x11-libs/libXfixes-5.0 |
1079 |
- >=x11-libs/libXi-1.2.99.1 |
1080 |
- >=x11-libs/libXmu-1.0.3 |
1081 |
- x11-libs/libXrender |
1082 |
- >=x11-libs/libXres-1.0.3 |
1083 |
- >=x11-libs/libXtst-1.0.99.2 |
1084 |
- ) |
1085 |
- glamor? ( |
1086 |
- media-libs/libepoxy |
1087 |
- >=media-libs/mesa-10.3.4-r1[egl,gbm] |
1088 |
- !x11-libs/glamor |
1089 |
- ) |
1090 |
- kdrive? ( |
1091 |
- >=x11-libs/libXext-1.0.5 |
1092 |
- x11-libs/libXv |
1093 |
- ) |
1094 |
- xephyr? ( |
1095 |
- x11-libs/libxcb |
1096 |
- x11-libs/xcb-util |
1097 |
- x11-libs/xcb-util-image |
1098 |
- x11-libs/xcb-util-keysyms |
1099 |
- x11-libs/xcb-util-renderutil |
1100 |
- x11-libs/xcb-util-wm |
1101 |
- ) |
1102 |
- !minimal? ( |
1103 |
- >=x11-libs/libX11-1.1.5 |
1104 |
- >=x11-libs/libXext-1.0.5 |
1105 |
- >=media-libs/mesa-10.3.4-r1 |
1106 |
- ) |
1107 |
- tslib? ( >=x11-libs/tslib-1.0 ) |
1108 |
- udev? ( >=virtual/udev-150 ) |
1109 |
- unwind? ( sys-libs/libunwind ) |
1110 |
- wayland? ( |
1111 |
- >=dev-libs/wayland-1.3.0 |
1112 |
- media-libs/libepoxy |
1113 |
- >=dev-libs/wayland-protocols-1.1 |
1114 |
- ) |
1115 |
- >=x11-apps/xinit-1.3.3-r1 |
1116 |
- systemd? ( |
1117 |
- sys-apps/dbus |
1118 |
- sys-apps/systemd |
1119 |
- )" |
1120 |
- |
1121 |
-DEPEND="${CDEPEND} |
1122 |
- sys-devel/flex |
1123 |
- >=x11-proto/bigreqsproto-1.1.0 |
1124 |
- >=x11-proto/compositeproto-0.4 |
1125 |
- >=x11-proto/damageproto-1.1 |
1126 |
- >=x11-proto/fixesproto-5.0 |
1127 |
- >=x11-proto/fontsproto-2.1.3 |
1128 |
- >=x11-proto/glproto-1.4.17-r1 |
1129 |
- >=x11-proto/inputproto-2.3 |
1130 |
- >=x11-proto/kbproto-1.0.3 |
1131 |
- >=x11-proto/randrproto-1.5.0 |
1132 |
- >=x11-proto/recordproto-1.13.99.1 |
1133 |
- >=x11-proto/renderproto-0.11 |
1134 |
- >=x11-proto/resourceproto-1.2.0 |
1135 |
- >=x11-proto/scrnsaverproto-1.1 |
1136 |
- >=x11-proto/trapproto-3.4.3 |
1137 |
- >=x11-proto/videoproto-2.2.2 |
1138 |
- >=x11-proto/xcmiscproto-1.2.0 |
1139 |
- >=x11-proto/xextproto-7.2.99.901 |
1140 |
- >=x11-proto/xf86dgaproto-2.0.99.1 |
1141 |
- >=x11-proto/xf86rushproto-1.1.2 |
1142 |
- >=x11-proto/xf86vidmodeproto-2.2.99.1 |
1143 |
- >=x11-proto/xineramaproto-1.1.3 |
1144 |
- >=x11-proto/xproto-7.0.31 |
1145 |
- >=x11-proto/presentproto-1.0 |
1146 |
- >=x11-proto/dri3proto-1.0 |
1147 |
- dmx? ( |
1148 |
- >=x11-proto/dmxproto-2.2.99.1 |
1149 |
- doc? ( |
1150 |
- || ( |
1151 |
- www-client/links |
1152 |
- www-client/lynx |
1153 |
- www-client/w3m |
1154 |
- ) |
1155 |
- ) |
1156 |
- ) |
1157 |
- !minimal? ( |
1158 |
- >=x11-proto/xf86driproto-2.1.0 |
1159 |
- >=x11-proto/dri2proto-2.8 |
1160 |
- )" |
1161 |
- |
1162 |
-RDEPEND="${CDEPEND} |
1163 |
- selinux? ( sec-policy/selinux-xserver ) |
1164 |
- !x11-drivers/xf86-video-modesetting |
1165 |
-" |
1166 |
- |
1167 |
-PDEPEND=" |
1168 |
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
1169 |
- |
1170 |
-REQUIRED_USE="!minimal? ( |
1171 |
- || ( ${IUSE_SERVERS} ) |
1172 |
- ) |
1173 |
- xephyr? ( kdrive )" |
1174 |
- |
1175 |
-#UPSTREAMED_PATCHES=( |
1176 |
-# "${WORKDIR}/patches/" |
1177 |
-#) |
1178 |
- |
1179 |
-PATCHES=( |
1180 |
- "${UPSTREAMED_PATCHES[@]}" |
1181 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
1182 |
- # needed for new eselect-opengl, bug #541232 |
1183 |
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
1184 |
- "${FILESDIR}"/${PN}-1.18-sysmacros.patch #580044 |
1185 |
-) |
1186 |
- |
1187 |
-pkg_pretend() { |
1188 |
- # older gcc is not supported |
1189 |
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
1190 |
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
1191 |
-} |
1192 |
- |
1193 |
-src_configure() { |
1194 |
- # localstatedir is used for the log location; we need to override the default |
1195 |
- # from ebuild.sh |
1196 |
- # sysconfdir is used for the xorg.conf location; same applies |
1197 |
- # NOTE: fop is used for doc generating; and I have no idea if Gentoo |
1198 |
- # package it somewhere |
1199 |
- XORG_CONFIGURE_OPTIONS=( |
1200 |
- $(use_enable ipv6) |
1201 |
- $(use_enable dmx) |
1202 |
- $(use_enable glamor) |
1203 |
- $(use_enable kdrive) |
1204 |
- $(use_enable kdrive kdrive-kbd) |
1205 |
- $(use_enable kdrive kdrive-mouse) |
1206 |
- $(use_enable kdrive kdrive-evdev) |
1207 |
- $(use_enable suid install-setuid) |
1208 |
- $(use_enable tslib) |
1209 |
- $(use_enable unwind libunwind) |
1210 |
- $(use_enable wayland xwayland) |
1211 |
- $(use_enable !minimal record) |
1212 |
- $(use_enable !minimal xfree86-utils) |
1213 |
- $(use_enable !minimal dri) |
1214 |
- $(use_enable !minimal dri2) |
1215 |
- $(use_enable !minimal glx) |
1216 |
- $(use_enable xephyr) |
1217 |
- $(use_enable xnest) |
1218 |
- $(use_enable xorg) |
1219 |
- $(use_enable xvfb) |
1220 |
- $(use_enable udev config-udev) |
1221 |
- $(use_with doc doxygen) |
1222 |
- $(use_with doc xmlto) |
1223 |
- $(use_with systemd systemd-daemon) |
1224 |
- $(use_enable systemd systemd-logind) |
1225 |
- --enable-libdrm |
1226 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
1227 |
- --localstatedir="${EPREFIX}"/var |
1228 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
1229 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
1230 |
- --disable-config-hal |
1231 |
- --disable-linux-acpi |
1232 |
- --without-dtrace |
1233 |
- --without-fop |
1234 |
- --with-os-vendor=Gentoo |
1235 |
- --with-sha1=libcrypto |
1236 |
- ) |
1237 |
- |
1238 |
- xorg-2_src_configure |
1239 |
-} |
1240 |
- |
1241 |
-src_install() { |
1242 |
- xorg-2_src_install |
1243 |
- |
1244 |
- server_based_install |
1245 |
- |
1246 |
- if ! use minimal && use xorg; then |
1247 |
- # Install xorg.conf.example into docs |
1248 |
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
1249 |
- fi |
1250 |
- |
1251 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
1252 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
1253 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
1254 |
- |
1255 |
- # install the @x11-module-rebuild set for Portage |
1256 |
- insinto /usr/share/portage/config/sets |
1257 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
1258 |
-} |
1259 |
- |
1260 |
-pkg_postinst() { |
1261 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
1262 |
- eselect opengl set xorg-x11 --use-old |
1263 |
-} |
1264 |
- |
1265 |
-pkg_postrm() { |
1266 |
- # Get rid of module dir to ensure opengl-update works properly |
1267 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
1268 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
1269 |
- fi |
1270 |
-} |
1271 |
- |
1272 |
-server_based_install() { |
1273 |
- if ! use xorg; then |
1274 |
- rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
1275 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
1276 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
1277 |
- "${ED}"/usr/share/man/man1/Xserver.1x |
1278 |
- fi |
1279 |
-} |