1 |
commit: a68fb875cdc5d83bfe3e28686ca39b86032e3a94 |
2 |
Author: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 29 13:43:35 2015 +0000 |
4 |
Commit: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 29 13:43:35 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a68fb875 |
7 |
|
8 |
x11-base/xorg-server: remove versions that crash with xproto-7.0.28 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=555776 |
11 |
|
12 |
Package-Manager: portage-2.2.20.1 |
13 |
|
14 |
x11-base/xorg-server/Manifest | 2 - |
15 |
x11-base/xorg-server/xorg-server-1.12.4-r6.ebuild | 226 ------------------- |
16 |
x11-base/xorg-server/xorg-server-1.15.2-r3.ebuild | 235 ------------------- |
17 |
x11-base/xorg-server/xorg-server-1.16.4-r1.ebuild | 231 ------------------- |
18 |
x11-base/xorg-server/xorg-server-1.16.4-r2.ebuild | 233 ------------------- |
19 |
x11-base/xorg-server/xorg-server-1.16.4-r3.ebuild | 261 ---------------------- |
20 |
x11-base/xorg-server/xorg-server-1.16.4-r4.ebuild | 236 ------------------- |
21 |
x11-base/xorg-server/xorg-server-1.17.1-r1.ebuild | 244 -------------------- |
22 |
x11-base/xorg-server/xorg-server-1.17.1.ebuild | 242 -------------------- |
23 |
x11-base/xorg-server/xorg-server-1.17.2-r1.ebuild | 245 -------------------- |
24 |
x11-base/xorg-server/xorg-server-1.17.2-r2.ebuild | 246 -------------------- |
25 |
x11-base/xorg-server/xorg-server-1.17.2.ebuild | 244 -------------------- |
26 |
12 files changed, 2645 deletions(-) |
27 |
|
28 |
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest |
29 |
index 2363cbf..f26dfac 100644 |
30 |
--- a/x11-base/xorg-server/Manifest |
31 |
+++ b/x11-base/xorg-server/Manifest |
32 |
@@ -3,6 +3,4 @@ DIST xorg-server-1.12.4.tar.bz2 5444761 SHA256 8ac07c35306ba3fb3c0972722dd4e9193 |
33 |
DIST xorg-server-1.15.2.tar.bz2 5551426 SHA256 3c0585607c654ded836da43a45a75492fc13454ff4149704fb08dac39f051163 SHA512 5fcbf0012af309f80e1db206e05d7861796146d765cd17f3963fde6da7f43f0e57d63dbbdbf2c554612a557aa4dee623ef62f7ca7d007834aafd7a46ca7bb1d6 WHIRLPOOL 22cdbad68462f9bac32b13be958df496411ca72fe47435ec7e3ebb470b121ba4b4a0e023913f31a92113c5a56bc4be660dfec5086bc1fb72a617d2cdeaa8adf1 |
34 |
DIST xorg-server-1.16-cve-2014-8091..8103.patches.tar.xz 27892 SHA256 47d8c9bb79c829389e7599aef1110d43afbc5bf744dbcf73d8f3cf01796d287a SHA512 f8b55c009166883b3e6ec2c8c7a2ff4ed61df6970afcc4f0efb9efa36741af194456a368d4b1c7ba9345ef973fb139a48eb50cb5a7ebc144b43749b9ffdb1f7b WHIRLPOOL 2f8b26c018f4ad4cf780ed7dcb0b844de64e7a612adc30c622d1956dfcee710086ffcc837ff0a64cdcc14d47720d82d8797374488bf0b52d77ca63adf6806885 |
35 |
DIST xorg-server-1.16.4.tar.bz2 5817330 SHA256 abb6e1cc9213a9915a121f48576ff6739a0b8cdb3d32796f9a7743c9a6efc871 SHA512 f756fca65535aa921a85d8d8eb36ea2ba5b7af90a46d640b0ca76259a9abd9d323885087e11156528d95240937c70373045001ae20266a1b9e89909f007e9e74 WHIRLPOOL 63980a3e2b57d2860998344f21a6524598b3dc135c277e5a868e34b57ab5060681ae7137358b3ba8b9ca5fd622a91aeb06bd0ac9e3e5ce1f4dc55df2b2dc0e33 |
36 |
-DIST xorg-server-1.17.1.tar.bz2 5852385 SHA256 2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab SHA512 195a0e0a6bd9c7655e62dd40dfbd7dea77d10f1143d4fd6154e8bdbb463d3729f81ecd1e379d66f68e828d4f4583782c15ce260de24444802076844aec552c4f WHIRLPOOL a8a78b0bfa6137941e3434f083319a827f0332fd9c190922bb0a33381e86173868d236c96a89ee3049400f37521fe052838416f009713f004227f05b8717d776 |
37 |
-DIST xorg-server-1.17.2.tar.bz2 5767983 SHA256 f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993 SHA512 7e7b7620890cc8db696695758fa22fa879f9d3c33946663611ec0b37f02116e9c6f08779f9eece59907b430d3df93f0c0548939683ea156b3c4cbe02571b7551 WHIRLPOOL bfa04d9a6fba776138ec239183bd9f7badd73da520f1c4c62f7bf00bc264431959cd73ba145b5698429a6d5f3ae71d8dc07ab3f9442f365fae94ba2a98d69b96 |
38 |
DIST xorg-server-1.17.4.tar.bz2 5791384 SHA256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 SHA512 4b8377b86ca88f27dcf59db2996b2ee620ce6f181a37dc47600365db588d48f2f3ca66a3149e7c856e686e5783b1cccb2ba0827aa7413299163dfca869f4d376 WHIRLPOOL c5baa1b01e57eac9e18bd1890c0a7e2246836524645057d5e05a1a19225d863645616aafaadbf9d083ffb672d47ea1934ad8323d813533e9519f0d92f9a1c6ab |
39 |
|
40 |
diff --git a/x11-base/xorg-server/xorg-server-1.12.4-r6.ebuild b/x11-base/xorg-server/xorg-server-1.12.4-r6.ebuild |
41 |
deleted file mode 100644 |
42 |
index 1f04d68..0000000 |
43 |
--- a/x11-base/xorg-server/xorg-server-1.12.4-r6.ebuild |
44 |
+++ /dev/null |
45 |
@@ -1,226 +0,0 @@ |
46 |
-# Copyright 1999-2015 Gentoo Foundation |
47 |
-# Distributed under the terms of the GNU General Public License v2 |
48 |
-# $Id$ |
49 |
- |
50 |
-EAPI=5 |
51 |
- |
52 |
-XORG_DOC=doc |
53 |
-inherit xorg-2 multilib versionator flag-o-matic |
54 |
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" |
55 |
- |
56 |
-DESCRIPTION="X.Org X servers" |
57 |
-SLOT="0/${PV}" |
58 |
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" |
59 |
- |
60 |
-SRC_URI="${SRC_URI} mirror://gentoo/${PN}-1.12-cve-2014-8091..8103.patches.tar.xz" |
61 |
- |
62 |
-IUSE_SERVERS="dmx kdrive xnest xorg xvfb" |
63 |
-IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev" |
64 |
- |
65 |
-RDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
66 |
- dev-libs/openssl |
67 |
- media-libs/freetype |
68 |
- >=x11-apps/iceauth-1.0.2 |
69 |
- >=x11-apps/rgb-1.0.3 |
70 |
- >=x11-apps/xauth-1.0.3 |
71 |
- x11-apps/xkbcomp |
72 |
- >=x11-libs/libpciaccess-0.12.901 |
73 |
- >=x11-libs/libXau-1.0.4 |
74 |
- >=x11-libs/libXdmcp-1.0.2 |
75 |
- >=x11-libs/libXfont-1.4.2 |
76 |
- <x11-libs/libXfont-1.5.0 |
77 |
- >=x11-libs/libxkbfile-1.0.4 |
78 |
- >=x11-libs/pixman-0.21.8 |
79 |
- >=x11-libs/xtrans-1.2.2 |
80 |
- >=x11-misc/xbitmaps-1.0.1 |
81 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
82 |
- dmx? ( |
83 |
- x11-libs/libXt |
84 |
- >=x11-libs/libdmx-1.0.99.1 |
85 |
- >=x11-libs/libX11-1.1.5 |
86 |
- >=x11-libs/libXaw-1.0.4 |
87 |
- >=x11-libs/libXext-1.0.99.4 |
88 |
- >=x11-libs/libXfixes-5.0 |
89 |
- >=x11-libs/libXi-1.2.99.1 |
90 |
- >=x11-libs/libXmu-1.0.3 |
91 |
- x11-libs/libXrender |
92 |
- >=x11-libs/libXres-1.0.3 |
93 |
- >=x11-libs/libXtst-1.0.99.2 |
94 |
- ) |
95 |
- kdrive? ( |
96 |
- >=x11-libs/libXext-1.0.5 |
97 |
- x11-libs/libXv |
98 |
- ) |
99 |
- !minimal? ( |
100 |
- >=x11-libs/libX11-1.1.5 |
101 |
- >=x11-libs/libXext-1.0.5 |
102 |
- >=media-libs/mesa-10.3.7-r2[nptl=] |
103 |
- ) |
104 |
- tslib? ( >=x11-libs/tslib-1.0 ) |
105 |
- udev? ( >=virtual/udev-150 ) |
106 |
- >=x11-apps/xinit-1.3 |
107 |
- selinux? ( sec-policy/selinux-xserver )" |
108 |
- |
109 |
-DEPEND="${RDEPEND} |
110 |
- sys-devel/flex |
111 |
- >=x11-proto/bigreqsproto-1.1.0 |
112 |
- >=x11-proto/compositeproto-0.4 |
113 |
- >=x11-proto/damageproto-1.1 |
114 |
- >=x11-proto/fixesproto-5.0 |
115 |
- >=x11-proto/fontsproto-2.0.2 |
116 |
- <x11-proto/fontsproto-2.1.3 |
117 |
- >=x11-proto/glproto-1.4.17-r1 |
118 |
- >=x11-proto/inputproto-2.1.99.3 |
119 |
- >=x11-proto/kbproto-1.0.3 |
120 |
- >=x11-proto/randrproto-1.2.99.3 |
121 |
- >=x11-proto/recordproto-1.13.99.1 |
122 |
- >=x11-proto/renderproto-0.11 |
123 |
- >=x11-proto/resourceproto-1.0.2 |
124 |
- >=x11-proto/scrnsaverproto-1.1 |
125 |
- >=x11-proto/trapproto-3.4.3 |
126 |
- >=x11-proto/videoproto-2.2.2 |
127 |
- >=x11-proto/xcmiscproto-1.2.0 |
128 |
- >=x11-proto/xextproto-7.1.99 |
129 |
- >=x11-proto/xf86dgaproto-2.0.99.1 |
130 |
- >=x11-proto/xf86rushproto-1.1.2 |
131 |
- >=x11-proto/xf86vidmodeproto-2.2.99.1 |
132 |
- >=x11-proto/xineramaproto-1.1.3 |
133 |
- >=x11-proto/xproto-7.0.22 |
134 |
- dmx? ( |
135 |
- >=x11-proto/dmxproto-2.2.99.1 |
136 |
- doc? ( |
137 |
- || ( |
138 |
- www-client/links |
139 |
- www-client/lynx |
140 |
- www-client/w3m |
141 |
- ) |
142 |
- ) |
143 |
- ) |
144 |
- !minimal? ( |
145 |
- >=x11-proto/xf86driproto-2.1.0 |
146 |
- >=x11-proto/dri2proto-2.6 |
147 |
- >=x11-libs/libdrm-2.4.20 |
148 |
- )" |
149 |
- |
150 |
-PDEPEND=" |
151 |
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
152 |
- |
153 |
-REQUIRED_USE="!minimal? ( |
154 |
- || ( ${IUSE_SERVERS} ) |
155 |
- )" |
156 |
- |
157 |
-# Security patches taken from Debian from their 1.12 package |
158 |
-UPSTREAMED_PATCHES=( |
159 |
- "${WORKDIR}"/patches/${PN}-1.12-cve-2014-8091..8103.patch |
160 |
-) |
161 |
- |
162 |
-PATCHES=( |
163 |
- "${UPSTREAMED_PATCHES[@]}" |
164 |
- "${FILESDIR}"/${PN}-1.12-disable-acpi.patch |
165 |
- "${FILESDIR}"/${PN}-1.12-cve-2013-1940.patch |
166 |
- "${FILESDIR}"/${PN}-1.12-cve-2013-4396.patch |
167 |
- "${FILESDIR}"/${PN}-1.17-cve-2015-0255-0.patch |
168 |
- "${FILESDIR}"/${PN}-1.17-cve-2015-0255-1.patch |
169 |
- "${FILESDIR}"/${PN}-1.12-cve-2015-3418.patch |
170 |
-) |
171 |
- |
172 |
-pkg_pretend() { |
173 |
- # older gcc is not supported |
174 |
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
175 |
- die "Sorry, but gcc earlier than 4.0 wont work for xorg-server." |
176 |
-} |
177 |
- |
178 |
-src_configure() { |
179 |
- # localstatedir is used for the log location; we need to override the default |
180 |
- # from ebuild.sh |
181 |
- # sysconfdir is used for the xorg.conf location; same applies |
182 |
- # --enable-install-setuid needed because sparcs default off |
183 |
- # NOTE: fop is used for doc generating ; and i have no idea if gentoo |
184 |
- # package it somewhere |
185 |
- XORG_CONFIGURE_OPTIONS=( |
186 |
- $(use_enable ipv6) |
187 |
- $(use_enable dmx) |
188 |
- $(use_enable kdrive) |
189 |
- $(use_enable kdrive kdrive-kbd) |
190 |
- $(use_enable kdrive kdrive-mouse) |
191 |
- $(use_enable kdrive kdrive-evdev) |
192 |
- $(use_enable tslib) |
193 |
- $(use_enable !minimal record) |
194 |
- $(use_enable !minimal xfree86-utils) |
195 |
- $(use_enable !minimal install-libxf86config) |
196 |
- $(use_enable !minimal dri) |
197 |
- $(use_enable !minimal dri2) |
198 |
- $(use_enable !minimal glx) |
199 |
- $(use_enable xnest) |
200 |
- $(use_enable xorg) |
201 |
- $(use_enable xvfb) |
202 |
- $(use_enable nptl glx-tls) |
203 |
- $(use_enable udev config-udev) |
204 |
- $(use_with doc doxygen) |
205 |
- $(use_with doc xmlto) |
206 |
- --sysconfdir=/etc/X11 |
207 |
- --localstatedir=/var |
208 |
- --enable-install-setuid |
209 |
- --with-fontrootdir=/usr/share/fonts |
210 |
- --with-xkb-output=/var/lib/xkb |
211 |
- --disable-config-hal |
212 |
- --without-dtrace |
213 |
- --without-fop |
214 |
- --with-os-vendor=Gentoo |
215 |
- ) |
216 |
- |
217 |
- xorg-2_src_configure |
218 |
-} |
219 |
- |
220 |
-src_install() { |
221 |
- xorg-2_src_install |
222 |
- |
223 |
- server_based_install |
224 |
- |
225 |
- if ! use minimal && use xorg; then |
226 |
- # Install xorg.conf.example into docs |
227 |
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
228 |
- fi |
229 |
- |
230 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
231 |
- newinitd "${FILESDIR}"/xdm.initd-9 xdm |
232 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
233 |
- |
234 |
- # install the @x11-module-rebuild set for Portage |
235 |
- insinto /usr/share/portage/config/sets |
236 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
237 |
-} |
238 |
- |
239 |
-pkg_postinst() { |
240 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
241 |
- eselect opengl set xorg-x11 --use-old |
242 |
- |
243 |
- if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then |
244 |
- ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)" |
245 |
- ewarn "because the ABI changed. If you cannot start X because" |
246 |
- ewarn "of module version mismatch errors, this is your problem." |
247 |
- |
248 |
- echo |
249 |
- ewarn "You can generate a list of all installed packages in the x11-drivers" |
250 |
- ewarn "category using this command:" |
251 |
- ewarn " emerge portage-utils; qlist -I -C x11-drivers/" |
252 |
- ewarn "or using sets from portage-2.2:" |
253 |
- ewarn " emerge @x11-module-rebuild" |
254 |
- fi |
255 |
-} |
256 |
- |
257 |
-pkg_postrm() { |
258 |
- # Get rid of module dir to ensure opengl-update works properly |
259 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
260 |
- rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules |
261 |
- fi |
262 |
-} |
263 |
- |
264 |
-server_based_install() { |
265 |
- if ! use xorg; then |
266 |
- rm "${D}"/usr/share/man/man1/Xserver.1x \ |
267 |
- "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
268 |
- "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
269 |
- "${D}"/usr/share/man/man1/Xserver.1x |
270 |
- fi |
271 |
-} |
272 |
|
273 |
diff --git a/x11-base/xorg-server/xorg-server-1.15.2-r3.ebuild b/x11-base/xorg-server/xorg-server-1.15.2-r3.ebuild |
274 |
deleted file mode 100644 |
275 |
index 0d51022..0000000 |
276 |
--- a/x11-base/xorg-server/xorg-server-1.15.2-r3.ebuild |
277 |
+++ /dev/null |
278 |
@@ -1,235 +0,0 @@ |
279 |
-# Copyright 1999-2015 Gentoo Foundation |
280 |
-# Distributed under the terms of the GNU General Public License v2 |
281 |
-# $Id$ |
282 |
- |
283 |
-EAPI=5 |
284 |
- |
285 |
-XORG_EAUTORECONF=yes |
286 |
-XORG_DOC=doc |
287 |
-inherit xorg-2 multilib versionator flag-o-matic |
288 |
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" |
289 |
- |
290 |
-DESCRIPTION="X.Org X servers" |
291 |
-SLOT="0/${PV}" |
292 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
293 |
- |
294 |
-SRC_URI="${SRC_URI} mirror://gentoo/${PN}-1.16-cve-2014-8091..8103.patches.tar.xz" |
295 |
- |
296 |
-IUSE_SERVERS="dmx kdrive xnest xorg xvfb" |
297 |
-IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev unwind" |
298 |
- |
299 |
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
300 |
- dev-libs/openssl |
301 |
- media-libs/freetype |
302 |
- >=x11-apps/iceauth-1.0.2 |
303 |
- >=x11-apps/rgb-1.0.3 |
304 |
- >=x11-apps/xauth-1.0.3 |
305 |
- x11-apps/xkbcomp |
306 |
- >=x11-libs/libdrm-2.4.20 |
307 |
- >=x11-libs/libpciaccess-0.12.901 |
308 |
- >=x11-libs/libXau-1.0.4 |
309 |
- >=x11-libs/libXdmcp-1.0.2 |
310 |
- >=x11-libs/libXfont-1.4.2 |
311 |
- <x11-libs/libXfont-1.5.0 |
312 |
- >=x11-libs/libxkbfile-1.0.4 |
313 |
- >=x11-libs/libxshmfence-1.1 |
314 |
- >=x11-libs/pixman-0.27.2 |
315 |
- >=x11-libs/xtrans-1.3.2 |
316 |
- >=x11-misc/xbitmaps-1.0.1 |
317 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
318 |
- dmx? ( |
319 |
- x11-libs/libXt |
320 |
- >=x11-libs/libdmx-1.0.99.1 |
321 |
- >=x11-libs/libX11-1.1.5 |
322 |
- >=x11-libs/libXaw-1.0.4 |
323 |
- >=x11-libs/libXext-1.0.99.4 |
324 |
- >=x11-libs/libXfixes-5.0 |
325 |
- >=x11-libs/libXi-1.2.99.1 |
326 |
- >=x11-libs/libXmu-1.0.3 |
327 |
- x11-libs/libXrender |
328 |
- >=x11-libs/libXres-1.0.3 |
329 |
- >=x11-libs/libXtst-1.0.99.2 |
330 |
- ) |
331 |
- kdrive? ( |
332 |
- >=x11-libs/libXext-1.0.5 |
333 |
- x11-libs/libXv |
334 |
- ) |
335 |
- !minimal? ( |
336 |
- >=x11-libs/libX11-1.1.5 |
337 |
- >=x11-libs/libXext-1.0.5 |
338 |
- >=media-libs/mesa-10.3.7-r2[nptl=] |
339 |
- ) |
340 |
- tslib? ( >=x11-libs/tslib-1.0 ) |
341 |
- udev? ( >=virtual/udev-150 ) |
342 |
- unwind? ( sys-libs/libunwind ) |
343 |
- >=x11-apps/xinit-1.3" |
344 |
- |
345 |
-DEPEND="${CDEPEND} |
346 |
- sys-devel/flex |
347 |
- >=x11-proto/bigreqsproto-1.1.0 |
348 |
- >=x11-proto/compositeproto-0.4 |
349 |
- >=x11-proto/damageproto-1.1 |
350 |
- >=x11-proto/fixesproto-5.0 |
351 |
- >=x11-proto/fontsproto-2.0.2 |
352 |
- <x11-proto/fontsproto-2.1.3 |
353 |
- >=x11-proto/glproto-1.4.17-r1 |
354 |
- >=x11-proto/inputproto-2.2.99.1 |
355 |
- >=x11-proto/kbproto-1.0.3 |
356 |
- >=x11-proto/randrproto-1.4.0 |
357 |
- >=x11-proto/recordproto-1.13.99.1 |
358 |
- >=x11-proto/renderproto-0.11 |
359 |
- >=x11-proto/resourceproto-1.2.0 |
360 |
- >=x11-proto/scrnsaverproto-1.1 |
361 |
- >=x11-proto/trapproto-3.4.3 |
362 |
- >=x11-proto/videoproto-2.2.2 |
363 |
- >=x11-proto/xcmiscproto-1.2.0 |
364 |
- >=x11-proto/xextproto-7.2.99.901 |
365 |
- >=x11-proto/xf86dgaproto-2.0.99.1 |
366 |
- >=x11-proto/xf86rushproto-1.1.2 |
367 |
- >=x11-proto/xf86vidmodeproto-2.2.99.1 |
368 |
- >=x11-proto/xineramaproto-1.1.3 |
369 |
- >=x11-proto/xproto-7.0.22 |
370 |
- >=x11-proto/presentproto-1.0 |
371 |
- >=x11-proto/dri3proto-1.0 |
372 |
- dmx? ( |
373 |
- >=x11-proto/dmxproto-2.2.99.1 |
374 |
- doc? ( |
375 |
- || ( |
376 |
- www-client/links |
377 |
- www-client/lynx |
378 |
- www-client/w3m |
379 |
- ) |
380 |
- ) |
381 |
- ) |
382 |
- !minimal? ( |
383 |
- >=x11-proto/xf86driproto-2.1.0 |
384 |
- >=x11-proto/dri2proto-2.8 |
385 |
- )" |
386 |
- |
387 |
-RDEPEND="${CDEPEND} |
388 |
- selinux? ( sec-policy/selinux-xserver ) |
389 |
-" |
390 |
- |
391 |
-PDEPEND=" |
392 |
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
393 |
- |
394 |
-REQUIRED_USE="!minimal? ( |
395 |
- || ( ${IUSE_SERVERS} ) |
396 |
- )" |
397 |
- |
398 |
-pkg_pretend() { |
399 |
- # older gcc is not supported |
400 |
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
401 |
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
402 |
-} |
403 |
- |
404 |
-src_prepare() { |
405 |
- UPSTREAMED_PATCHES=( |
406 |
- "${WORKDIR}"/patches/*.patch |
407 |
- ) |
408 |
- PATCHES=( |
409 |
- "${UPSTREAMED_PATCHES[@]}" |
410 |
- "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch |
411 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
412 |
- "${FILESDIR}"/${PN}-1.17-cve-2015-0255-0.patch |
413 |
- "${FILESDIR}"/${PN}-1.17-cve-2015-0255-1.patch |
414 |
- |
415 |
- ) |
416 |
- xorg-2_src_prepare |
417 |
-} |
418 |
- |
419 |
-src_configure() { |
420 |
- # localstatedir is used for the log location; we need to override the default |
421 |
- # from ebuild.sh |
422 |
- # sysconfdir is used for the xorg.conf location; same applies |
423 |
- # NOTE: fop is used for doc generating ; and i have no idea if gentoo |
424 |
- # package it somewhere |
425 |
- XORG_CONFIGURE_OPTIONS=( |
426 |
- $(use_enable ipv6) |
427 |
- $(use_enable dmx) |
428 |
- $(use_enable kdrive) |
429 |
- $(use_enable kdrive kdrive-kbd) |
430 |
- $(use_enable kdrive kdrive-mouse) |
431 |
- $(use_enable kdrive kdrive-evdev) |
432 |
- $(use_enable suid install-setuid) |
433 |
- $(use_enable tslib) |
434 |
- $(use_enable unwind libunwind) |
435 |
- $(use_enable !minimal record) |
436 |
- $(use_enable !minimal xfree86-utils) |
437 |
- $(use_enable !minimal install-libxf86config) |
438 |
- $(use_enable !minimal dri) |
439 |
- $(use_enable !minimal dri2) |
440 |
- $(use_enable !minimal glx) |
441 |
- $(use_enable xnest) |
442 |
- $(use_enable xorg) |
443 |
- $(use_enable xvfb) |
444 |
- $(use_enable nptl glx-tls) |
445 |
- $(use_enable udev config-udev) |
446 |
- $(use_with doc doxygen) |
447 |
- $(use_with doc xmlto) |
448 |
- --enable-libdrm |
449 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
450 |
- --localstatedir="${EPREFIX}"/var |
451 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
452 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
453 |
- --disable-config-hal |
454 |
- --disable-linux-acpi |
455 |
- --without-dtrace |
456 |
- --without-fop |
457 |
- --with-os-vendor=Gentoo |
458 |
- --with-sha1=libcrypto |
459 |
- ) |
460 |
- |
461 |
- xorg-2_src_configure |
462 |
-} |
463 |
- |
464 |
-src_install() { |
465 |
- xorg-2_src_install |
466 |
- |
467 |
- server_based_install |
468 |
- |
469 |
- if ! use minimal && use xorg; then |
470 |
- # Install xorg.conf.example into docs |
471 |
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
472 |
- fi |
473 |
- |
474 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
475 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
476 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
477 |
- |
478 |
- # install the @x11-module-rebuild set for Portage |
479 |
- insinto /usr/share/portage/config/sets |
480 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
481 |
-} |
482 |
- |
483 |
-pkg_postinst() { |
484 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
485 |
- eselect opengl set xorg-x11 --use-old |
486 |
- |
487 |
- if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then |
488 |
- ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)" |
489 |
- ewarn "because the ABI changed. If you cannot start X because" |
490 |
- ewarn "of module version mismatch errors, this is your problem." |
491 |
- |
492 |
- echo |
493 |
- ewarn "You can rebuild all installed packages in the x11-drivers" |
494 |
- ewarn "category using this command:" |
495 |
- ewarn " emerge @x11-module-rebuild" |
496 |
- fi |
497 |
-} |
498 |
- |
499 |
-pkg_postrm() { |
500 |
- # Get rid of module dir to ensure opengl-update works properly |
501 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
502 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
503 |
- fi |
504 |
-} |
505 |
- |
506 |
-server_based_install() { |
507 |
- if ! use xorg; then |
508 |
- rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
509 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
510 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
511 |
- "${ED}"/usr/share/man/man1/Xserver.1x |
512 |
- fi |
513 |
-} |
514 |
|
515 |
diff --git a/x11-base/xorg-server/xorg-server-1.16.4-r1.ebuild b/x11-base/xorg-server/xorg-server-1.16.4-r1.ebuild |
516 |
deleted file mode 100644 |
517 |
index f05a732..0000000 |
518 |
--- a/x11-base/xorg-server/xorg-server-1.16.4-r1.ebuild |
519 |
+++ /dev/null |
520 |
@@ -1,231 +0,0 @@ |
521 |
-# Copyright 1999-2015 Gentoo Foundation |
522 |
-# Distributed under the terms of the GNU General Public License v2 |
523 |
-# $Id$ |
524 |
- |
525 |
-EAPI=5 |
526 |
- |
527 |
-XORG_DOC=doc |
528 |
-inherit xorg-2 multilib versionator flag-o-matic |
529 |
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" |
530 |
- |
531 |
-DESCRIPTION="X.Org X servers" |
532 |
-SLOT="0/1.16.1" |
533 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
534 |
- |
535 |
-IUSE_SERVERS="dmx kdrive xnest xorg xvfb" |
536 |
-IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland" |
537 |
- |
538 |
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
539 |
- dev-libs/openssl |
540 |
- media-libs/freetype |
541 |
- >=x11-apps/iceauth-1.0.2 |
542 |
- >=x11-apps/rgb-1.0.3 |
543 |
- >=x11-apps/xauth-1.0.3 |
544 |
- x11-apps/xkbcomp |
545 |
- >=x11-libs/libdrm-2.4.20 |
546 |
- >=x11-libs/libpciaccess-0.12.901 |
547 |
- >=x11-libs/libXau-1.0.4 |
548 |
- >=x11-libs/libXdmcp-1.0.2 |
549 |
- >=x11-libs/libXfont-1.4.2 |
550 |
- >=x11-libs/libxkbfile-1.0.4 |
551 |
- >=x11-libs/libxshmfence-1.1 |
552 |
- >=x11-libs/pixman-0.27.2 |
553 |
- >=x11-libs/xtrans-1.3.3 |
554 |
- >=x11-misc/xbitmaps-1.0.1 |
555 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
556 |
- dmx? ( |
557 |
- x11-libs/libXt |
558 |
- >=x11-libs/libdmx-1.0.99.1 |
559 |
- >=x11-libs/libX11-1.1.5 |
560 |
- >=x11-libs/libXaw-1.0.4 |
561 |
- >=x11-libs/libXext-1.0.99.4 |
562 |
- >=x11-libs/libXfixes-5.0 |
563 |
- >=x11-libs/libXi-1.2.99.1 |
564 |
- >=x11-libs/libXmu-1.0.3 |
565 |
- x11-libs/libXrender |
566 |
- >=x11-libs/libXres-1.0.3 |
567 |
- >=x11-libs/libXtst-1.0.99.2 |
568 |
- ) |
569 |
- glamor? ( |
570 |
- media-libs/libepoxy |
571 |
- >=media-libs/mesa-10.3.4-r1[egl,gbm] |
572 |
- !x11-libs/glamor |
573 |
- ) |
574 |
- kdrive? ( |
575 |
- >=x11-libs/libXext-1.0.5 |
576 |
- x11-libs/libXv |
577 |
- ) |
578 |
- !minimal? ( |
579 |
- >=x11-libs/libX11-1.1.5 |
580 |
- >=x11-libs/libXext-1.0.5 |
581 |
- >=media-libs/mesa-10.3.4-r1[nptl=] |
582 |
- ) |
583 |
- tslib? ( >=x11-libs/tslib-1.0 ) |
584 |
- udev? ( >=virtual/udev-150 ) |
585 |
- unwind? ( sys-libs/libunwind ) |
586 |
- wayland? ( |
587 |
- >=dev-libs/wayland-1.3.0 |
588 |
- media-libs/libepoxy |
589 |
- ) |
590 |
- >=x11-apps/xinit-1.3 |
591 |
- systemd? ( |
592 |
- sys-apps/dbus |
593 |
- sys-apps/systemd |
594 |
- )" |
595 |
- |
596 |
-DEPEND="${CDEPEND} |
597 |
- sys-devel/flex |
598 |
- >=x11-proto/bigreqsproto-1.1.0 |
599 |
- >=x11-proto/compositeproto-0.4 |
600 |
- >=x11-proto/damageproto-1.1 |
601 |
- >=x11-proto/fixesproto-5.0 |
602 |
- >=x11-proto/fontsproto-2.1.3 |
603 |
- >=x11-proto/glproto-1.4.17-r1 |
604 |
- >=x11-proto/inputproto-2.2.99.1 |
605 |
- >=x11-proto/kbproto-1.0.3 |
606 |
- >=x11-proto/randrproto-1.4.0 |
607 |
- >=x11-proto/recordproto-1.13.99.1 |
608 |
- >=x11-proto/renderproto-0.11 |
609 |
- >=x11-proto/resourceproto-1.2.0 |
610 |
- >=x11-proto/scrnsaverproto-1.1 |
611 |
- >=x11-proto/trapproto-3.4.3 |
612 |
- >=x11-proto/videoproto-2.2.2 |
613 |
- >=x11-proto/xcmiscproto-1.2.0 |
614 |
- >=x11-proto/xextproto-7.2.99.901 |
615 |
- >=x11-proto/xf86dgaproto-2.0.99.1 |
616 |
- >=x11-proto/xf86rushproto-1.1.2 |
617 |
- >=x11-proto/xf86vidmodeproto-2.2.99.1 |
618 |
- >=x11-proto/xineramaproto-1.1.3 |
619 |
- >=x11-proto/xproto-7.0.26 |
620 |
- >=x11-proto/presentproto-1.0 |
621 |
- >=x11-proto/dri3proto-1.0 |
622 |
- dmx? ( |
623 |
- >=x11-proto/dmxproto-2.2.99.1 |
624 |
- doc? ( |
625 |
- || ( |
626 |
- www-client/links |
627 |
- www-client/lynx |
628 |
- www-client/w3m |
629 |
- ) |
630 |
- ) |
631 |
- ) |
632 |
- !minimal? ( |
633 |
- >=x11-proto/xf86driproto-2.1.0 |
634 |
- >=x11-proto/dri2proto-2.8 |
635 |
- )" |
636 |
- |
637 |
-RDEPEND="${CDEPEND} |
638 |
- selinux? ( sec-policy/selinux-xserver ) |
639 |
-" |
640 |
- |
641 |
-PDEPEND=" |
642 |
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
643 |
- |
644 |
-REQUIRED_USE="!minimal? ( |
645 |
- || ( ${IUSE_SERVERS} ) |
646 |
- )" |
647 |
- |
648 |
-#UPSTREAMED_PATCHES=( |
649 |
-# "${WORKDIR}/patches/" |
650 |
-#) |
651 |
- |
652 |
-PATCHES=( |
653 |
- "${UPSTREAMED_PATCHES[@]}" |
654 |
- "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch |
655 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
656 |
-) |
657 |
- |
658 |
-pkg_pretend() { |
659 |
- # older gcc is not supported |
660 |
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
661 |
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
662 |
-} |
663 |
- |
664 |
-src_configure() { |
665 |
- # localstatedir is used for the log location; we need to override the default |
666 |
- # from ebuild.sh |
667 |
- # sysconfdir is used for the xorg.conf location; same applies |
668 |
- # NOTE: fop is used for doc generating ; and i have no idea if gentoo |
669 |
- # package it somewhere |
670 |
- XORG_CONFIGURE_OPTIONS=( |
671 |
- $(use_enable ipv6) |
672 |
- $(use_enable dmx) |
673 |
- $(use_enable glamor) |
674 |
- $(use_enable kdrive) |
675 |
- $(use_enable kdrive kdrive-kbd) |
676 |
- $(use_enable kdrive kdrive-mouse) |
677 |
- $(use_enable kdrive kdrive-evdev) |
678 |
- $(use_enable suid install-setuid) |
679 |
- $(use_enable tslib) |
680 |
- $(use_enable unwind libunwind) |
681 |
- $(use_enable wayland xwayland) |
682 |
- $(use_enable !minimal record) |
683 |
- $(use_enable !minimal xfree86-utils) |
684 |
- $(use_enable !minimal install-libxf86config) |
685 |
- $(use_enable !minimal dri) |
686 |
- $(use_enable !minimal dri2) |
687 |
- $(use_enable !minimal glx) |
688 |
- $(use_enable xnest) |
689 |
- $(use_enable xorg) |
690 |
- $(use_enable xvfb) |
691 |
- $(use_enable nptl glx-tls) |
692 |
- $(use_enable udev config-udev) |
693 |
- $(use_with doc doxygen) |
694 |
- $(use_with doc xmlto) |
695 |
- $(use_with systemd systemd-daemon) |
696 |
- $(use_enable systemd systemd-logind) |
697 |
- --enable-libdrm |
698 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
699 |
- --localstatedir="${EPREFIX}"/var |
700 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
701 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
702 |
- --disable-config-hal |
703 |
- --disable-linux-acpi |
704 |
- --without-dtrace |
705 |
- --without-fop |
706 |
- --with-os-vendor=Gentoo |
707 |
- --with-sha1=libcrypto |
708 |
- ) |
709 |
- |
710 |
- xorg-2_src_configure |
711 |
-} |
712 |
- |
713 |
-src_install() { |
714 |
- xorg-2_src_install |
715 |
- |
716 |
- server_based_install |
717 |
- |
718 |
- if ! use minimal && use xorg; then |
719 |
- # Install xorg.conf.example into docs |
720 |
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
721 |
- fi |
722 |
- |
723 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
724 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
725 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
726 |
- |
727 |
- # install the @x11-module-rebuild set for Portage |
728 |
- insinto /usr/share/portage/config/sets |
729 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
730 |
-} |
731 |
- |
732 |
-pkg_postinst() { |
733 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
734 |
- eselect opengl set xorg-x11 --use-old |
735 |
-} |
736 |
- |
737 |
-pkg_postrm() { |
738 |
- # Get rid of module dir to ensure opengl-update works properly |
739 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
740 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
741 |
- fi |
742 |
-} |
743 |
- |
744 |
-server_based_install() { |
745 |
- if ! use xorg; then |
746 |
- rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
747 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
748 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
749 |
- "${ED}"/usr/share/man/man1/Xserver.1x |
750 |
- fi |
751 |
-} |
752 |
|
753 |
diff --git a/x11-base/xorg-server/xorg-server-1.16.4-r2.ebuild b/x11-base/xorg-server/xorg-server-1.16.4-r2.ebuild |
754 |
deleted file mode 100644 |
755 |
index 166c3ff..0000000 |
756 |
--- a/x11-base/xorg-server/xorg-server-1.16.4-r2.ebuild |
757 |
+++ /dev/null |
758 |
@@ -1,233 +0,0 @@ |
759 |
-# Copyright 1999-2015 Gentoo Foundation |
760 |
-# Distributed under the terms of the GNU General Public License v2 |
761 |
-# $Id$ |
762 |
- |
763 |
-EAPI=5 |
764 |
- |
765 |
-XORG_DOC=doc |
766 |
-inherit xorg-2 multilib versionator flag-o-matic |
767 |
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" |
768 |
- |
769 |
-DESCRIPTION="X.Org X servers" |
770 |
-SLOT="0/1.16.1" |
771 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
772 |
- |
773 |
-IUSE_SERVERS="dmx kdrive xnest xorg xvfb" |
774 |
-IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland" |
775 |
- |
776 |
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
777 |
- dev-libs/openssl |
778 |
- media-libs/freetype |
779 |
- >=x11-apps/iceauth-1.0.2 |
780 |
- >=x11-apps/rgb-1.0.3 |
781 |
- >=x11-apps/xauth-1.0.3 |
782 |
- x11-apps/xkbcomp |
783 |
- >=x11-libs/libdrm-2.4.20 |
784 |
- >=x11-libs/libpciaccess-0.12.901 |
785 |
- >=x11-libs/libXau-1.0.4 |
786 |
- >=x11-libs/libXdmcp-1.0.2 |
787 |
- >=x11-libs/libXfont-1.4.2 |
788 |
- >=x11-libs/libxkbfile-1.0.4 |
789 |
- >=x11-libs/libxshmfence-1.1 |
790 |
- >=x11-libs/pixman-0.27.2 |
791 |
- >=x11-libs/xtrans-1.3.3 |
792 |
- >=x11-misc/xbitmaps-1.0.1 |
793 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
794 |
- dmx? ( |
795 |
- x11-libs/libXt |
796 |
- >=x11-libs/libdmx-1.0.99.1 |
797 |
- >=x11-libs/libX11-1.1.5 |
798 |
- >=x11-libs/libXaw-1.0.4 |
799 |
- >=x11-libs/libXext-1.0.99.4 |
800 |
- >=x11-libs/libXfixes-5.0 |
801 |
- >=x11-libs/libXi-1.2.99.1 |
802 |
- >=x11-libs/libXmu-1.0.3 |
803 |
- x11-libs/libXrender |
804 |
- >=x11-libs/libXres-1.0.3 |
805 |
- >=x11-libs/libXtst-1.0.99.2 |
806 |
- ) |
807 |
- glamor? ( |
808 |
- media-libs/libepoxy |
809 |
- >=media-libs/mesa-10.3.4-r1[egl,gbm] |
810 |
- !x11-libs/glamor |
811 |
- ) |
812 |
- kdrive? ( |
813 |
- >=x11-libs/libXext-1.0.5 |
814 |
- x11-libs/libXv |
815 |
- ) |
816 |
- !minimal? ( |
817 |
- >=x11-libs/libX11-1.1.5 |
818 |
- >=x11-libs/libXext-1.0.5 |
819 |
- >=media-libs/mesa-10.3.4-r1[nptl=] |
820 |
- ) |
821 |
- tslib? ( >=x11-libs/tslib-1.0 ) |
822 |
- udev? ( >=virtual/udev-150 ) |
823 |
- unwind? ( sys-libs/libunwind ) |
824 |
- wayland? ( |
825 |
- >=dev-libs/wayland-1.3.0 |
826 |
- media-libs/libepoxy |
827 |
- ) |
828 |
- >=x11-apps/xinit-1.3 |
829 |
- systemd? ( |
830 |
- sys-apps/dbus |
831 |
- sys-apps/systemd |
832 |
- )" |
833 |
- |
834 |
-DEPEND="${CDEPEND} |
835 |
- sys-devel/flex |
836 |
- >=x11-proto/bigreqsproto-1.1.0 |
837 |
- >=x11-proto/compositeproto-0.4 |
838 |
- >=x11-proto/damageproto-1.1 |
839 |
- >=x11-proto/fixesproto-5.0 |
840 |
- >=x11-proto/fontsproto-2.1.3 |
841 |
- >=x11-proto/glproto-1.4.17-r1 |
842 |
- >=x11-proto/inputproto-2.2.99.1 |
843 |
- >=x11-proto/kbproto-1.0.3 |
844 |
- >=x11-proto/randrproto-1.4.0 |
845 |
- >=x11-proto/recordproto-1.13.99.1 |
846 |
- >=x11-proto/renderproto-0.11 |
847 |
- >=x11-proto/resourceproto-1.2.0 |
848 |
- >=x11-proto/scrnsaverproto-1.1 |
849 |
- >=x11-proto/trapproto-3.4.3 |
850 |
- >=x11-proto/videoproto-2.2.2 |
851 |
- >=x11-proto/xcmiscproto-1.2.0 |
852 |
- >=x11-proto/xextproto-7.2.99.901 |
853 |
- >=x11-proto/xf86dgaproto-2.0.99.1 |
854 |
- >=x11-proto/xf86rushproto-1.1.2 |
855 |
- >=x11-proto/xf86vidmodeproto-2.2.99.1 |
856 |
- >=x11-proto/xineramaproto-1.1.3 |
857 |
- >=x11-proto/xproto-7.0.26 |
858 |
- >=x11-proto/presentproto-1.0 |
859 |
- >=x11-proto/dri3proto-1.0 |
860 |
- dmx? ( |
861 |
- >=x11-proto/dmxproto-2.2.99.1 |
862 |
- doc? ( |
863 |
- || ( |
864 |
- www-client/links |
865 |
- www-client/lynx |
866 |
- www-client/w3m |
867 |
- ) |
868 |
- ) |
869 |
- ) |
870 |
- !minimal? ( |
871 |
- >=x11-proto/xf86driproto-2.1.0 |
872 |
- >=x11-proto/dri2proto-2.8 |
873 |
- )" |
874 |
- |
875 |
-RDEPEND="${CDEPEND} |
876 |
- selinux? ( sec-policy/selinux-xserver ) |
877 |
-" |
878 |
- |
879 |
-PDEPEND=" |
880 |
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
881 |
- |
882 |
-REQUIRED_USE="!minimal? ( |
883 |
- || ( ${IUSE_SERVERS} ) |
884 |
- )" |
885 |
- |
886 |
-#UPSTREAMED_PATCHES=( |
887 |
-# "${WORKDIR}/patches/" |
888 |
-#) |
889 |
- |
890 |
-PATCHES=( |
891 |
- "${UPSTREAMED_PATCHES[@]}" |
892 |
- "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch |
893 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
894 |
- # needed for new eselect-opengl, bug #541232 |
895 |
- "${FILESDIR}"/${PN}-1.17-support-multiple-Files-sections.patch |
896 |
-) |
897 |
- |
898 |
-pkg_pretend() { |
899 |
- # older gcc is not supported |
900 |
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
901 |
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
902 |
-} |
903 |
- |
904 |
-src_configure() { |
905 |
- # localstatedir is used for the log location; we need to override the default |
906 |
- # from ebuild.sh |
907 |
- # sysconfdir is used for the xorg.conf location; same applies |
908 |
- # NOTE: fop is used for doc generating ; and i have no idea if gentoo |
909 |
- # package it somewhere |
910 |
- XORG_CONFIGURE_OPTIONS=( |
911 |
- $(use_enable ipv6) |
912 |
- $(use_enable dmx) |
913 |
- $(use_enable glamor) |
914 |
- $(use_enable kdrive) |
915 |
- $(use_enable kdrive kdrive-kbd) |
916 |
- $(use_enable kdrive kdrive-mouse) |
917 |
- $(use_enable kdrive kdrive-evdev) |
918 |
- $(use_enable suid install-setuid) |
919 |
- $(use_enable tslib) |
920 |
- $(use_enable unwind libunwind) |
921 |
- $(use_enable wayland xwayland) |
922 |
- $(use_enable !minimal record) |
923 |
- $(use_enable !minimal xfree86-utils) |
924 |
- $(use_enable !minimal install-libxf86config) |
925 |
- $(use_enable !minimal dri) |
926 |
- $(use_enable !minimal dri2) |
927 |
- $(use_enable !minimal glx) |
928 |
- $(use_enable xnest) |
929 |
- $(use_enable xorg) |
930 |
- $(use_enable xvfb) |
931 |
- $(use_enable nptl glx-tls) |
932 |
- $(use_enable udev config-udev) |
933 |
- $(use_with doc doxygen) |
934 |
- $(use_with doc xmlto) |
935 |
- $(use_with systemd systemd-daemon) |
936 |
- $(use_enable systemd systemd-logind) |
937 |
- --enable-libdrm |
938 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
939 |
- --localstatedir="${EPREFIX}"/var |
940 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
941 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
942 |
- --disable-config-hal |
943 |
- --disable-linux-acpi |
944 |
- --without-dtrace |
945 |
- --without-fop |
946 |
- --with-os-vendor=Gentoo |
947 |
- --with-sha1=libcrypto |
948 |
- ) |
949 |
- |
950 |
- xorg-2_src_configure |
951 |
-} |
952 |
- |
953 |
-src_install() { |
954 |
- xorg-2_src_install |
955 |
- |
956 |
- server_based_install |
957 |
- |
958 |
- if ! use minimal && use xorg; then |
959 |
- # Install xorg.conf.example into docs |
960 |
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
961 |
- fi |
962 |
- |
963 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
964 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
965 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
966 |
- |
967 |
- # install the @x11-module-rebuild set for Portage |
968 |
- insinto /usr/share/portage/config/sets |
969 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
970 |
-} |
971 |
- |
972 |
-pkg_postinst() { |
973 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
974 |
- eselect opengl set xorg-x11 --use-old |
975 |
-} |
976 |
- |
977 |
-pkg_postrm() { |
978 |
- # Get rid of module dir to ensure opengl-update works properly |
979 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
980 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
981 |
- fi |
982 |
-} |
983 |
- |
984 |
-server_based_install() { |
985 |
- if ! use xorg; then |
986 |
- rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
987 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
988 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
989 |
- "${ED}"/usr/share/man/man1/Xserver.1x |
990 |
- fi |
991 |
-} |
992 |
|
993 |
diff --git a/x11-base/xorg-server/xorg-server-1.16.4-r3.ebuild b/x11-base/xorg-server/xorg-server-1.16.4-r3.ebuild |
994 |
deleted file mode 100644 |
995 |
index 58c70e0..0000000 |
996 |
--- a/x11-base/xorg-server/xorg-server-1.16.4-r3.ebuild |
997 |
+++ /dev/null |
998 |
@@ -1,261 +0,0 @@ |
999 |
-# Copyright 1999-2015 Gentoo Foundation |
1000 |
-# Distributed under the terms of the GNU General Public License v2 |
1001 |
-# $Id$ |
1002 |
- |
1003 |
-EAPI=5 |
1004 |
- |
1005 |
-XORG_DOC=doc |
1006 |
-inherit xorg-2 multilib versionator flag-o-matic |
1007 |
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" |
1008 |
- |
1009 |
-DESCRIPTION="X.Org X servers" |
1010 |
-SLOT="0/1.16.1" |
1011 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
1012 |
- |
1013 |
-IUSE_SERVERS="dmx kdrive xnest xorg xvfb" |
1014 |
-IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland" |
1015 |
- |
1016 |
-CDEPEND=">=app-eselect/eselect-opengl-1.0.8 |
1017 |
- !>=app-eselect/eselect-opengl-1.3.0 |
1018 |
- dev-libs/openssl |
1019 |
- media-libs/freetype |
1020 |
- >=x11-apps/iceauth-1.0.2 |
1021 |
- >=x11-apps/rgb-1.0.3 |
1022 |
- >=x11-apps/xauth-1.0.3 |
1023 |
- x11-apps/xkbcomp |
1024 |
- >=x11-libs/libdrm-2.4.20 |
1025 |
- >=x11-libs/libpciaccess-0.12.901 |
1026 |
- >=x11-libs/libXau-1.0.4 |
1027 |
- >=x11-libs/libXdmcp-1.0.2 |
1028 |
- >=x11-libs/libXfont-1.4.2 |
1029 |
- >=x11-libs/libxkbfile-1.0.4 |
1030 |
- >=x11-libs/libxshmfence-1.1 |
1031 |
- >=x11-libs/pixman-0.27.2 |
1032 |
- >=x11-libs/xtrans-1.3.3 |
1033 |
- >=x11-misc/xbitmaps-1.0.1 |
1034 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
1035 |
- dmx? ( |
1036 |
- x11-libs/libXt |
1037 |
- >=x11-libs/libdmx-1.0.99.1 |
1038 |
- >=x11-libs/libX11-1.1.5 |
1039 |
- >=x11-libs/libXaw-1.0.4 |
1040 |
- >=x11-libs/libXext-1.0.99.4 |
1041 |
- >=x11-libs/libXfixes-5.0 |
1042 |
- >=x11-libs/libXi-1.2.99.1 |
1043 |
- >=x11-libs/libXmu-1.0.3 |
1044 |
- x11-libs/libXrender |
1045 |
- >=x11-libs/libXres-1.0.3 |
1046 |
- >=x11-libs/libXtst-1.0.99.2 |
1047 |
- ) |
1048 |
- glamor? ( |
1049 |
- media-libs/libepoxy |
1050 |
- media-libs/mesa[egl,gbm] |
1051 |
- !x11-libs/glamor |
1052 |
- ) |
1053 |
- kdrive? ( |
1054 |
- >=x11-libs/libXext-1.0.5 |
1055 |
- x11-libs/libXv |
1056 |
- ) |
1057 |
- !minimal? ( |
1058 |
- >=x11-libs/libX11-1.1.5 |
1059 |
- >=x11-libs/libXext-1.0.5 |
1060 |
- >=media-libs/mesa-9.2.0[nptl=] |
1061 |
- ) |
1062 |
- tslib? ( >=x11-libs/tslib-1.0 ) |
1063 |
- udev? ( >=virtual/udev-150 ) |
1064 |
- unwind? ( sys-libs/libunwind ) |
1065 |
- wayland? ( |
1066 |
- >=dev-libs/wayland-1.3.0 |
1067 |
- media-libs/libepoxy |
1068 |
- ) |
1069 |
- >=x11-apps/xinit-1.3 |
1070 |
- systemd? ( |
1071 |
- sys-apps/dbus |
1072 |
- sys-apps/systemd |
1073 |
- )" |
1074 |
- |
1075 |
-DEPEND="${CDEPEND} |
1076 |
- sys-devel/flex |
1077 |
- >=x11-proto/bigreqsproto-1.1.0 |
1078 |
- >=x11-proto/compositeproto-0.4 |
1079 |
- >=x11-proto/damageproto-1.1 |
1080 |
- >=x11-proto/fixesproto-5.0 |
1081 |
- >=x11-proto/fontsproto-2.1.3 |
1082 |
- >=x11-proto/glproto-1.4.17 |
1083 |
- >=x11-proto/inputproto-2.2.99.1 |
1084 |
- >=x11-proto/kbproto-1.0.3 |
1085 |
- >=x11-proto/randrproto-1.4.0 |
1086 |
- >=x11-proto/recordproto-1.13.99.1 |
1087 |
- >=x11-proto/renderproto-0.11 |
1088 |
- >=x11-proto/resourceproto-1.2.0 |
1089 |
- >=x11-proto/scrnsaverproto-1.1 |
1090 |
- >=x11-proto/trapproto-3.4.3 |
1091 |
- >=x11-proto/videoproto-2.2.2 |
1092 |
- >=x11-proto/xcmiscproto-1.2.0 |
1093 |
- >=x11-proto/xextproto-7.2.99.901 |
1094 |
- >=x11-proto/xf86dgaproto-2.0.99.1 |
1095 |
- >=x11-proto/xf86rushproto-1.1.2 |
1096 |
- >=x11-proto/xf86vidmodeproto-2.2.99.1 |
1097 |
- >=x11-proto/xineramaproto-1.1.3 |
1098 |
- >=x11-proto/xproto-7.0.26 |
1099 |
- >=x11-proto/presentproto-1.0 |
1100 |
- >=x11-proto/dri3proto-1.0 |
1101 |
- dmx? ( |
1102 |
- >=x11-proto/dmxproto-2.2.99.1 |
1103 |
- doc? ( |
1104 |
- || ( |
1105 |
- www-client/links |
1106 |
- www-client/lynx |
1107 |
- www-client/w3m |
1108 |
- ) |
1109 |
- ) |
1110 |
- ) |
1111 |
- !minimal? ( |
1112 |
- >=x11-proto/xf86driproto-2.1.0 |
1113 |
- >=x11-proto/dri2proto-2.8 |
1114 |
- )" |
1115 |
- |
1116 |
-RDEPEND="${CDEPEND} |
1117 |
- selinux? ( sec-policy/selinux-xserver ) |
1118 |
-" |
1119 |
- |
1120 |
-PDEPEND=" |
1121 |
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
1122 |
- |
1123 |
-REQUIRED_USE="!minimal? ( |
1124 |
- || ( ${IUSE_SERVERS} ) |
1125 |
- )" |
1126 |
- |
1127 |
-#UPSTREAMED_PATCHES=( |
1128 |
-# "${WORKDIR}/patches/" |
1129 |
-#) |
1130 |
- |
1131 |
-PATCHES=( |
1132 |
- "${UPSTREAMED_PATCHES[@]}" |
1133 |
- "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch |
1134 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
1135 |
- "${FILESDIR}"/${PN}-1.17-cve-2015-3164-1.patch |
1136 |
- "${FILESDIR}"/${PN}-1.17-cve-2015-3164-2.patch |
1137 |
- "${FILESDIR}"/${PN}-1.17-cve-2015-3164-3.patch |
1138 |
-) |
1139 |
- |
1140 |
-pkg_pretend() { |
1141 |
- # older gcc is not supported |
1142 |
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
1143 |
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
1144 |
-} |
1145 |
- |
1146 |
-src_configure() { |
1147 |
- # localstatedir is used for the log location; we need to override the default |
1148 |
- # from ebuild.sh |
1149 |
- # sysconfdir is used for the xorg.conf location; same applies |
1150 |
- # NOTE: fop is used for doc generating ; and i have no idea if gentoo |
1151 |
- # package it somewhere |
1152 |
- XORG_CONFIGURE_OPTIONS=( |
1153 |
- $(use_enable ipv6) |
1154 |
- $(use_enable dmx) |
1155 |
- $(use_enable glamor) |
1156 |
- $(use_enable kdrive) |
1157 |
- $(use_enable kdrive kdrive-kbd) |
1158 |
- $(use_enable kdrive kdrive-mouse) |
1159 |
- $(use_enable kdrive kdrive-evdev) |
1160 |
- $(use_enable suid install-setuid) |
1161 |
- $(use_enable tslib) |
1162 |
- $(use_enable unwind libunwind) |
1163 |
- $(use_enable wayland xwayland) |
1164 |
- $(use_enable !minimal record) |
1165 |
- $(use_enable !minimal xfree86-utils) |
1166 |
- $(use_enable !minimal install-libxf86config) |
1167 |
- $(use_enable !minimal dri) |
1168 |
- $(use_enable !minimal dri2) |
1169 |
- $(use_enable !minimal glx) |
1170 |
- $(use_enable xnest) |
1171 |
- $(use_enable xorg) |
1172 |
- $(use_enable xvfb) |
1173 |
- $(use_enable nptl glx-tls) |
1174 |
- $(use_enable udev config-udev) |
1175 |
- $(use_with doc doxygen) |
1176 |
- $(use_with doc xmlto) |
1177 |
- $(use_with systemd systemd-daemon) |
1178 |
- $(use_enable systemd systemd-logind) |
1179 |
- --enable-libdrm |
1180 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
1181 |
- --localstatedir="${EPREFIX}"/var |
1182 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
1183 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
1184 |
- --disable-config-hal |
1185 |
- --disable-linux-acpi |
1186 |
- --without-dtrace |
1187 |
- --without-fop |
1188 |
- --with-os-vendor=Gentoo |
1189 |
- --with-sha1=libcrypto |
1190 |
- ) |
1191 |
- |
1192 |
- # Xorg-server requires includes from OS mesa which are not visible for |
1193 |
- # users of binary drivers. |
1194 |
- mkdir -p "${T}/mesa-symlinks/GL" |
1195 |
- for i in gl glx glxmd glxproto glxtokens; do |
1196 |
- ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die |
1197 |
- done |
1198 |
- for i in glext glxext; do |
1199 |
- ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die |
1200 |
- done |
1201 |
- append-cppflags "-I${T}/mesa-symlinks" |
1202 |
- |
1203 |
- xorg-2_src_configure |
1204 |
-} |
1205 |
- |
1206 |
-src_install() { |
1207 |
- xorg-2_src_install |
1208 |
- |
1209 |
- dynamic_libgl_install |
1210 |
- |
1211 |
- server_based_install |
1212 |
- |
1213 |
- if ! use minimal && use xorg; then |
1214 |
- # Install xorg.conf.example into docs |
1215 |
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
1216 |
- fi |
1217 |
- |
1218 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
1219 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
1220 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
1221 |
- |
1222 |
- # install the @x11-module-rebuild set for Portage |
1223 |
- insinto /usr/share/portage/config/sets |
1224 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
1225 |
-} |
1226 |
- |
1227 |
-pkg_postinst() { |
1228 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
1229 |
- eselect opengl set xorg-x11 --use-old |
1230 |
-} |
1231 |
- |
1232 |
-pkg_postrm() { |
1233 |
- # Get rid of module dir to ensure opengl-update works properly |
1234 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
1235 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
1236 |
- fi |
1237 |
-} |
1238 |
- |
1239 |
-dynamic_libgl_install() { |
1240 |
- # next section is to setup the dynamic libGL stuff |
1241 |
- ebegin "Moving GL files for dynamic switching" |
1242 |
- dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions |
1243 |
- local x="" |
1244 |
- for x in "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do |
1245 |
- if [ -f ${x} -o -L ${x} ]; then |
1246 |
- mv -f ${x} "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/extensions |
1247 |
- fi |
1248 |
- done |
1249 |
- eend 0 |
1250 |
-} |
1251 |
- |
1252 |
-server_based_install() { |
1253 |
- if ! use xorg; then |
1254 |
- rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
1255 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
1256 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
1257 |
- "${ED}"/usr/share/man/man1/Xserver.1x |
1258 |
- fi |
1259 |
-} |
1260 |
|
1261 |
diff --git a/x11-base/xorg-server/xorg-server-1.16.4-r4.ebuild b/x11-base/xorg-server/xorg-server-1.16.4-r4.ebuild |
1262 |
deleted file mode 100644 |
1263 |
index 1ec0222..0000000 |
1264 |
--- a/x11-base/xorg-server/xorg-server-1.16.4-r4.ebuild |
1265 |
+++ /dev/null |
1266 |
@@ -1,236 +0,0 @@ |
1267 |
-# Copyright 1999-2015 Gentoo Foundation |
1268 |
-# Distributed under the terms of the GNU General Public License v2 |
1269 |
-# $Id$ |
1270 |
- |
1271 |
-EAPI=5 |
1272 |
- |
1273 |
-XORG_DOC=doc |
1274 |
-inherit xorg-2 multilib versionator flag-o-matic |
1275 |
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" |
1276 |
- |
1277 |
-DESCRIPTION="X.Org X servers" |
1278 |
-SLOT="0/1.16.1" |
1279 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
1280 |
- |
1281 |
-IUSE_SERVERS="dmx kdrive xnest xorg xvfb" |
1282 |
-IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland" |
1283 |
- |
1284 |
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
1285 |
- dev-libs/openssl |
1286 |
- media-libs/freetype |
1287 |
- >=x11-apps/iceauth-1.0.2 |
1288 |
- >=x11-apps/rgb-1.0.3 |
1289 |
- >=x11-apps/xauth-1.0.3 |
1290 |
- x11-apps/xkbcomp |
1291 |
- >=x11-libs/libdrm-2.4.20 |
1292 |
- >=x11-libs/libpciaccess-0.12.901 |
1293 |
- >=x11-libs/libXau-1.0.4 |
1294 |
- >=x11-libs/libXdmcp-1.0.2 |
1295 |
- >=x11-libs/libXfont-1.4.2 |
1296 |
- >=x11-libs/libxkbfile-1.0.4 |
1297 |
- >=x11-libs/libxshmfence-1.1 |
1298 |
- >=x11-libs/pixman-0.27.2 |
1299 |
- >=x11-libs/xtrans-1.3.3 |
1300 |
- >=x11-misc/xbitmaps-1.0.1 |
1301 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
1302 |
- dmx? ( |
1303 |
- x11-libs/libXt |
1304 |
- >=x11-libs/libdmx-1.0.99.1 |
1305 |
- >=x11-libs/libX11-1.1.5 |
1306 |
- >=x11-libs/libXaw-1.0.4 |
1307 |
- >=x11-libs/libXext-1.0.99.4 |
1308 |
- >=x11-libs/libXfixes-5.0 |
1309 |
- >=x11-libs/libXi-1.2.99.1 |
1310 |
- >=x11-libs/libXmu-1.0.3 |
1311 |
- x11-libs/libXrender |
1312 |
- >=x11-libs/libXres-1.0.3 |
1313 |
- >=x11-libs/libXtst-1.0.99.2 |
1314 |
- ) |
1315 |
- glamor? ( |
1316 |
- media-libs/libepoxy |
1317 |
- >=media-libs/mesa-10.3.4-r1[egl,gbm] |
1318 |
- !x11-libs/glamor |
1319 |
- ) |
1320 |
- kdrive? ( |
1321 |
- >=x11-libs/libXext-1.0.5 |
1322 |
- x11-libs/libXv |
1323 |
- ) |
1324 |
- !minimal? ( |
1325 |
- >=x11-libs/libX11-1.1.5 |
1326 |
- >=x11-libs/libXext-1.0.5 |
1327 |
- >=media-libs/mesa-10.3.4-r1[nptl=] |
1328 |
- ) |
1329 |
- tslib? ( >=x11-libs/tslib-1.0 ) |
1330 |
- udev? ( >=virtual/udev-150 ) |
1331 |
- unwind? ( sys-libs/libunwind ) |
1332 |
- wayland? ( |
1333 |
- >=dev-libs/wayland-1.3.0 |
1334 |
- media-libs/libepoxy |
1335 |
- ) |
1336 |
- >=x11-apps/xinit-1.3 |
1337 |
- systemd? ( |
1338 |
- sys-apps/dbus |
1339 |
- sys-apps/systemd |
1340 |
- )" |
1341 |
- |
1342 |
-DEPEND="${CDEPEND} |
1343 |
- sys-devel/flex |
1344 |
- >=x11-proto/bigreqsproto-1.1.0 |
1345 |
- >=x11-proto/compositeproto-0.4 |
1346 |
- >=x11-proto/damageproto-1.1 |
1347 |
- >=x11-proto/fixesproto-5.0 |
1348 |
- >=x11-proto/fontsproto-2.1.3 |
1349 |
- >=x11-proto/glproto-1.4.17-r1 |
1350 |
- >=x11-proto/inputproto-2.2.99.1 |
1351 |
- >=x11-proto/kbproto-1.0.3 |
1352 |
- >=x11-proto/randrproto-1.4.0 |
1353 |
- >=x11-proto/recordproto-1.13.99.1 |
1354 |
- >=x11-proto/renderproto-0.11 |
1355 |
- >=x11-proto/resourceproto-1.2.0 |
1356 |
- >=x11-proto/scrnsaverproto-1.1 |
1357 |
- >=x11-proto/trapproto-3.4.3 |
1358 |
- >=x11-proto/videoproto-2.2.2 |
1359 |
- >=x11-proto/xcmiscproto-1.2.0 |
1360 |
- >=x11-proto/xextproto-7.2.99.901 |
1361 |
- >=x11-proto/xf86dgaproto-2.0.99.1 |
1362 |
- >=x11-proto/xf86rushproto-1.1.2 |
1363 |
- >=x11-proto/xf86vidmodeproto-2.2.99.1 |
1364 |
- >=x11-proto/xineramaproto-1.1.3 |
1365 |
- >=x11-proto/xproto-7.0.26 |
1366 |
- >=x11-proto/presentproto-1.0 |
1367 |
- >=x11-proto/dri3proto-1.0 |
1368 |
- dmx? ( |
1369 |
- >=x11-proto/dmxproto-2.2.99.1 |
1370 |
- doc? ( |
1371 |
- || ( |
1372 |
- www-client/links |
1373 |
- www-client/lynx |
1374 |
- www-client/w3m |
1375 |
- ) |
1376 |
- ) |
1377 |
- ) |
1378 |
- !minimal? ( |
1379 |
- >=x11-proto/xf86driproto-2.1.0 |
1380 |
- >=x11-proto/dri2proto-2.8 |
1381 |
- )" |
1382 |
- |
1383 |
-RDEPEND="${CDEPEND} |
1384 |
- selinux? ( sec-policy/selinux-xserver ) |
1385 |
-" |
1386 |
- |
1387 |
-PDEPEND=" |
1388 |
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
1389 |
- |
1390 |
-REQUIRED_USE="!minimal? ( |
1391 |
- || ( ${IUSE_SERVERS} ) |
1392 |
- )" |
1393 |
- |
1394 |
-#UPSTREAMED_PATCHES=( |
1395 |
-# "${WORKDIR}/patches/" |
1396 |
-#) |
1397 |
- |
1398 |
-PATCHES=( |
1399 |
- "${UPSTREAMED_PATCHES[@]}" |
1400 |
- "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch |
1401 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
1402 |
- # needed for new eselect-opengl, bug #541232 |
1403 |
- "${FILESDIR}"/${PN}-1.17-support-multiple-Files-sections.patch |
1404 |
- "${FILESDIR}"/${PN}-1.17-cve-2015-3164-1.patch |
1405 |
- "${FILESDIR}"/${PN}-1.17-cve-2015-3164-2.patch |
1406 |
- "${FILESDIR}"/${PN}-1.17-cve-2015-3164-3.patch |
1407 |
-) |
1408 |
- |
1409 |
-pkg_pretend() { |
1410 |
- # older gcc is not supported |
1411 |
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
1412 |
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
1413 |
-} |
1414 |
- |
1415 |
-src_configure() { |
1416 |
- # localstatedir is used for the log location; we need to override the default |
1417 |
- # from ebuild.sh |
1418 |
- # sysconfdir is used for the xorg.conf location; same applies |
1419 |
- # NOTE: fop is used for doc generating ; and i have no idea if gentoo |
1420 |
- # package it somewhere |
1421 |
- XORG_CONFIGURE_OPTIONS=( |
1422 |
- $(use_enable ipv6) |
1423 |
- $(use_enable dmx) |
1424 |
- $(use_enable glamor) |
1425 |
- $(use_enable kdrive) |
1426 |
- $(use_enable kdrive kdrive-kbd) |
1427 |
- $(use_enable kdrive kdrive-mouse) |
1428 |
- $(use_enable kdrive kdrive-evdev) |
1429 |
- $(use_enable suid install-setuid) |
1430 |
- $(use_enable tslib) |
1431 |
- $(use_enable unwind libunwind) |
1432 |
- $(use_enable wayland xwayland) |
1433 |
- $(use_enable !minimal record) |
1434 |
- $(use_enable !minimal xfree86-utils) |
1435 |
- $(use_enable !minimal install-libxf86config) |
1436 |
- $(use_enable !minimal dri) |
1437 |
- $(use_enable !minimal dri2) |
1438 |
- $(use_enable !minimal glx) |
1439 |
- $(use_enable xnest) |
1440 |
- $(use_enable xorg) |
1441 |
- $(use_enable xvfb) |
1442 |
- $(use_enable nptl glx-tls) |
1443 |
- $(use_enable udev config-udev) |
1444 |
- $(use_with doc doxygen) |
1445 |
- $(use_with doc xmlto) |
1446 |
- $(use_with systemd systemd-daemon) |
1447 |
- $(use_enable systemd systemd-logind) |
1448 |
- --enable-libdrm |
1449 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
1450 |
- --localstatedir="${EPREFIX}"/var |
1451 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
1452 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
1453 |
- --disable-config-hal |
1454 |
- --disable-linux-acpi |
1455 |
- --without-dtrace |
1456 |
- --without-fop |
1457 |
- --with-os-vendor=Gentoo |
1458 |
- --with-sha1=libcrypto |
1459 |
- ) |
1460 |
- |
1461 |
- xorg-2_src_configure |
1462 |
-} |
1463 |
- |
1464 |
-src_install() { |
1465 |
- xorg-2_src_install |
1466 |
- |
1467 |
- server_based_install |
1468 |
- |
1469 |
- if ! use minimal && use xorg; then |
1470 |
- # Install xorg.conf.example into docs |
1471 |
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
1472 |
- fi |
1473 |
- |
1474 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
1475 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
1476 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
1477 |
- |
1478 |
- # install the @x11-module-rebuild set for Portage |
1479 |
- insinto /usr/share/portage/config/sets |
1480 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
1481 |
-} |
1482 |
- |
1483 |
-pkg_postinst() { |
1484 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
1485 |
- eselect opengl set xorg-x11 --use-old |
1486 |
-} |
1487 |
- |
1488 |
-pkg_postrm() { |
1489 |
- # Get rid of module dir to ensure opengl-update works properly |
1490 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
1491 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
1492 |
- fi |
1493 |
-} |
1494 |
- |
1495 |
-server_based_install() { |
1496 |
- if ! use xorg; then |
1497 |
- rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
1498 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
1499 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
1500 |
- "${ED}"/usr/share/man/man1/Xserver.1x |
1501 |
- fi |
1502 |
-} |
1503 |
|
1504 |
diff --git a/x11-base/xorg-server/xorg-server-1.17.1-r1.ebuild b/x11-base/xorg-server/xorg-server-1.17.1-r1.ebuild |
1505 |
deleted file mode 100644 |
1506 |
index 8f4c90e..0000000 |
1507 |
--- a/x11-base/xorg-server/xorg-server-1.17.1-r1.ebuild |
1508 |
+++ /dev/null |
1509 |
@@ -1,244 +0,0 @@ |
1510 |
-# Copyright 1999-2015 Gentoo Foundation |
1511 |
-# Distributed under the terms of the GNU General Public License v2 |
1512 |
-# $Id$ |
1513 |
- |
1514 |
-EAPI=5 |
1515 |
- |
1516 |
-XORG_DOC=doc |
1517 |
-inherit xorg-2 multilib versionator flag-o-matic |
1518 |
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" |
1519 |
- |
1520 |
-DESCRIPTION="X.Org X servers" |
1521 |
-SLOT="0/${PV}" |
1522 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
1523 |
- |
1524 |
-IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb" |
1525 |
-IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland" |
1526 |
- |
1527 |
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
1528 |
- dev-libs/openssl |
1529 |
- media-libs/freetype |
1530 |
- >=x11-apps/iceauth-1.0.2 |
1531 |
- >=x11-apps/rgb-1.0.3 |
1532 |
- >=x11-apps/xauth-1.0.3 |
1533 |
- x11-apps/xkbcomp |
1534 |
- >=x11-libs/libdrm-2.4.46 |
1535 |
- >=x11-libs/libpciaccess-0.12.901 |
1536 |
- >=x11-libs/libXau-1.0.4 |
1537 |
- >=x11-libs/libXdmcp-1.0.2 |
1538 |
- >=x11-libs/libXfont-1.4.2 |
1539 |
- >=x11-libs/libxkbfile-1.0.4 |
1540 |
- >=x11-libs/libxshmfence-1.1 |
1541 |
- >=x11-libs/pixman-0.27.2 |
1542 |
- >=x11-libs/xtrans-1.3.5 |
1543 |
- >=x11-misc/xbitmaps-1.0.1 |
1544 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
1545 |
- dmx? ( |
1546 |
- x11-libs/libXt |
1547 |
- >=x11-libs/libdmx-1.0.99.1 |
1548 |
- >=x11-libs/libX11-1.1.5 |
1549 |
- >=x11-libs/libXaw-1.0.4 |
1550 |
- >=x11-libs/libXext-1.0.99.4 |
1551 |
- >=x11-libs/libXfixes-5.0 |
1552 |
- >=x11-libs/libXi-1.2.99.1 |
1553 |
- >=x11-libs/libXmu-1.0.3 |
1554 |
- x11-libs/libXrender |
1555 |
- >=x11-libs/libXres-1.0.3 |
1556 |
- >=x11-libs/libXtst-1.0.99.2 |
1557 |
- ) |
1558 |
- glamor? ( |
1559 |
- media-libs/libepoxy |
1560 |
- >=media-libs/mesa-10.3.4-r1[egl,gbm] |
1561 |
- !x11-libs/glamor |
1562 |
- ) |
1563 |
- kdrive? ( |
1564 |
- >=x11-libs/libXext-1.0.5 |
1565 |
- x11-libs/libXv |
1566 |
- ) |
1567 |
- xephyr? ( |
1568 |
- x11-libs/libxcb |
1569 |
- x11-libs/xcb-util |
1570 |
- x11-libs/xcb-util-image |
1571 |
- x11-libs/xcb-util-keysyms |
1572 |
- x11-libs/xcb-util-renderutil |
1573 |
- x11-libs/xcb-util-wm |
1574 |
- ) |
1575 |
- !minimal? ( |
1576 |
- >=x11-libs/libX11-1.1.5 |
1577 |
- >=x11-libs/libXext-1.0.5 |
1578 |
- >=media-libs/mesa-10.3.4-r1[nptl=] |
1579 |
- ) |
1580 |
- tslib? ( >=x11-libs/tslib-1.0 ) |
1581 |
- udev? ( >=virtual/udev-150 ) |
1582 |
- unwind? ( sys-libs/libunwind ) |
1583 |
- wayland? ( |
1584 |
- >=dev-libs/wayland-1.3.0 |
1585 |
- media-libs/libepoxy |
1586 |
- ) |
1587 |
- >=x11-apps/xinit-1.3.3-r1 |
1588 |
- systemd? ( |
1589 |
- sys-apps/dbus |
1590 |
- sys-apps/systemd |
1591 |
- )" |
1592 |
- |
1593 |
-DEPEND="${CDEPEND} |
1594 |
- sys-devel/flex |
1595 |
- >=x11-proto/bigreqsproto-1.1.0 |
1596 |
- >=x11-proto/compositeproto-0.4 |
1597 |
- >=x11-proto/damageproto-1.1 |
1598 |
- >=x11-proto/fixesproto-5.0 |
1599 |
- >=x11-proto/fontsproto-2.1.3 |
1600 |
- >=x11-proto/glproto-1.4.17-r1 |
1601 |
- >=x11-proto/inputproto-2.2.99.1 |
1602 |
- >=x11-proto/kbproto-1.0.3 |
1603 |
- >=x11-proto/randrproto-1.4.0 |
1604 |
- >=x11-proto/recordproto-1.13.99.1 |
1605 |
- >=x11-proto/renderproto-0.11 |
1606 |
- >=x11-proto/resourceproto-1.2.0 |
1607 |
- >=x11-proto/scrnsaverproto-1.1 |
1608 |
- >=x11-proto/trapproto-3.4.3 |
1609 |
- >=x11-proto/videoproto-2.2.2 |
1610 |
- >=x11-proto/xcmiscproto-1.2.0 |
1611 |
- >=x11-proto/xextproto-7.2.99.901 |
1612 |
- >=x11-proto/xf86dgaproto-2.0.99.1 |
1613 |
- >=x11-proto/xf86rushproto-1.1.2 |
1614 |
- >=x11-proto/xf86vidmodeproto-2.2.99.1 |
1615 |
- >=x11-proto/xineramaproto-1.1.3 |
1616 |
- >=x11-proto/xproto-7.0.26 |
1617 |
- >=x11-proto/presentproto-1.0 |
1618 |
- >=x11-proto/dri3proto-1.0 |
1619 |
- dmx? ( |
1620 |
- >=x11-proto/dmxproto-2.2.99.1 |
1621 |
- doc? ( |
1622 |
- || ( |
1623 |
- www-client/links |
1624 |
- www-client/lynx |
1625 |
- www-client/w3m |
1626 |
- ) |
1627 |
- ) |
1628 |
- ) |
1629 |
- !minimal? ( |
1630 |
- >=x11-proto/xf86driproto-2.1.0 |
1631 |
- >=x11-proto/dri2proto-2.8 |
1632 |
- )" |
1633 |
- |
1634 |
-RDEPEND="${CDEPEND} |
1635 |
- selinux? ( sec-policy/selinux-xserver ) |
1636 |
- !x11-drivers/xf86-video-modesetting |
1637 |
-" |
1638 |
- |
1639 |
-PDEPEND=" |
1640 |
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
1641 |
- |
1642 |
-REQUIRED_USE="!minimal? ( |
1643 |
- || ( ${IUSE_SERVERS} ) |
1644 |
- ) |
1645 |
- xephyr? ( kdrive )" |
1646 |
- |
1647 |
-#UPSTREAMED_PATCHES=( |
1648 |
-# "${WORKDIR}/patches/" |
1649 |
-#) |
1650 |
- |
1651 |
-PATCHES=( |
1652 |
- "${UPSTREAMED_PATCHES[@]}" |
1653 |
- "${FILESDIR}"/${PN}-1.17-ia64-fix_inx_outx.patch |
1654 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
1655 |
- # needed for new eselect-opengl, bug #541232 |
1656 |
- "${FILESDIR}"/${PN}-1.17-support-multiple-Files-sections.patch |
1657 |
-) |
1658 |
- |
1659 |
-pkg_pretend() { |
1660 |
- # older gcc is not supported |
1661 |
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
1662 |
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
1663 |
-} |
1664 |
- |
1665 |
-src_configure() { |
1666 |
- # localstatedir is used for the log location; we need to override the default |
1667 |
- # from ebuild.sh |
1668 |
- # sysconfdir is used for the xorg.conf location; same applies |
1669 |
- # NOTE: fop is used for doc generating ; and i have no idea if gentoo |
1670 |
- # package it somewhere |
1671 |
- XORG_CONFIGURE_OPTIONS=( |
1672 |
- $(use_enable ipv6) |
1673 |
- $(use_enable dmx) |
1674 |
- $(use_enable glamor) |
1675 |
- $(use_enable kdrive) |
1676 |
- $(use_enable kdrive kdrive-kbd) |
1677 |
- $(use_enable kdrive kdrive-mouse) |
1678 |
- $(use_enable kdrive kdrive-evdev) |
1679 |
- $(use_enable suid install-setuid) |
1680 |
- $(use_enable tslib) |
1681 |
- $(use_enable unwind libunwind) |
1682 |
- $(use_enable wayland xwayland) |
1683 |
- $(use_enable !minimal record) |
1684 |
- $(use_enable !minimal xfree86-utils) |
1685 |
- $(use_enable !minimal install-libxf86config) |
1686 |
- $(use_enable !minimal dri) |
1687 |
- $(use_enable !minimal dri2) |
1688 |
- $(use_enable !minimal glx) |
1689 |
- $(use_enable xephyr) |
1690 |
- $(use_enable xnest) |
1691 |
- $(use_enable xorg) |
1692 |
- $(use_enable xvfb) |
1693 |
- $(use_enable nptl glx-tls) |
1694 |
- $(use_enable udev config-udev) |
1695 |
- $(use_with doc doxygen) |
1696 |
- $(use_with doc xmlto) |
1697 |
- $(use_with systemd systemd-daemon) |
1698 |
- $(use_enable systemd systemd-logind) |
1699 |
- --enable-libdrm |
1700 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
1701 |
- --localstatedir="${EPREFIX}"/var |
1702 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
1703 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
1704 |
- --disable-config-hal |
1705 |
- --disable-linux-acpi |
1706 |
- --without-dtrace |
1707 |
- --without-fop |
1708 |
- --with-os-vendor=Gentoo |
1709 |
- --with-sha1=libcrypto |
1710 |
- ) |
1711 |
- |
1712 |
- xorg-2_src_configure |
1713 |
-} |
1714 |
- |
1715 |
-src_install() { |
1716 |
- xorg-2_src_install |
1717 |
- |
1718 |
- server_based_install |
1719 |
- |
1720 |
- if ! use minimal && use xorg; then |
1721 |
- # Install xorg.conf.example into docs |
1722 |
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
1723 |
- fi |
1724 |
- |
1725 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
1726 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
1727 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
1728 |
- |
1729 |
- # install the @x11-module-rebuild set for Portage |
1730 |
- insinto /usr/share/portage/config/sets |
1731 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
1732 |
-} |
1733 |
- |
1734 |
-pkg_postinst() { |
1735 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
1736 |
- eselect opengl set xorg-x11 --use-old |
1737 |
-} |
1738 |
- |
1739 |
-pkg_postrm() { |
1740 |
- # Get rid of module dir to ensure opengl-update works properly |
1741 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
1742 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
1743 |
- fi |
1744 |
-} |
1745 |
- |
1746 |
-server_based_install() { |
1747 |
- if ! use xorg; then |
1748 |
- rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
1749 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
1750 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
1751 |
- "${ED}"/usr/share/man/man1/Xserver.1x |
1752 |
- fi |
1753 |
-} |
1754 |
|
1755 |
diff --git a/x11-base/xorg-server/xorg-server-1.17.1.ebuild b/x11-base/xorg-server/xorg-server-1.17.1.ebuild |
1756 |
deleted file mode 100644 |
1757 |
index 84398cd..0000000 |
1758 |
--- a/x11-base/xorg-server/xorg-server-1.17.1.ebuild |
1759 |
+++ /dev/null |
1760 |
@@ -1,242 +0,0 @@ |
1761 |
-# Copyright 1999-2015 Gentoo Foundation |
1762 |
-# Distributed under the terms of the GNU General Public License v2 |
1763 |
-# $Id$ |
1764 |
- |
1765 |
-EAPI=5 |
1766 |
- |
1767 |
-XORG_DOC=doc |
1768 |
-inherit xorg-2 multilib versionator flag-o-matic |
1769 |
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" |
1770 |
- |
1771 |
-DESCRIPTION="X.Org X servers" |
1772 |
-SLOT="0/${PV}" |
1773 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
1774 |
- |
1775 |
-IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb" |
1776 |
-IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland" |
1777 |
- |
1778 |
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
1779 |
- dev-libs/openssl |
1780 |
- media-libs/freetype |
1781 |
- >=x11-apps/iceauth-1.0.2 |
1782 |
- >=x11-apps/rgb-1.0.3 |
1783 |
- >=x11-apps/xauth-1.0.3 |
1784 |
- x11-apps/xkbcomp |
1785 |
- >=x11-libs/libdrm-2.4.46 |
1786 |
- >=x11-libs/libpciaccess-0.12.901 |
1787 |
- >=x11-libs/libXau-1.0.4 |
1788 |
- >=x11-libs/libXdmcp-1.0.2 |
1789 |
- >=x11-libs/libXfont-1.4.2 |
1790 |
- >=x11-libs/libxkbfile-1.0.4 |
1791 |
- >=x11-libs/libxshmfence-1.1 |
1792 |
- >=x11-libs/pixman-0.27.2 |
1793 |
- >=x11-libs/xtrans-1.3.5 |
1794 |
- >=x11-misc/xbitmaps-1.0.1 |
1795 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
1796 |
- dmx? ( |
1797 |
- x11-libs/libXt |
1798 |
- >=x11-libs/libdmx-1.0.99.1 |
1799 |
- >=x11-libs/libX11-1.1.5 |
1800 |
- >=x11-libs/libXaw-1.0.4 |
1801 |
- >=x11-libs/libXext-1.0.99.4 |
1802 |
- >=x11-libs/libXfixes-5.0 |
1803 |
- >=x11-libs/libXi-1.2.99.1 |
1804 |
- >=x11-libs/libXmu-1.0.3 |
1805 |
- x11-libs/libXrender |
1806 |
- >=x11-libs/libXres-1.0.3 |
1807 |
- >=x11-libs/libXtst-1.0.99.2 |
1808 |
- ) |
1809 |
- glamor? ( |
1810 |
- media-libs/libepoxy |
1811 |
- >=media-libs/mesa-10.3.4-r1[egl,gbm] |
1812 |
- !x11-libs/glamor |
1813 |
- ) |
1814 |
- kdrive? ( |
1815 |
- >=x11-libs/libXext-1.0.5 |
1816 |
- x11-libs/libXv |
1817 |
- ) |
1818 |
- xephyr? ( |
1819 |
- x11-libs/libxcb |
1820 |
- x11-libs/xcb-util |
1821 |
- x11-libs/xcb-util-image |
1822 |
- x11-libs/xcb-util-keysyms |
1823 |
- x11-libs/xcb-util-renderutil |
1824 |
- x11-libs/xcb-util-wm |
1825 |
- ) |
1826 |
- !minimal? ( |
1827 |
- >=x11-libs/libX11-1.1.5 |
1828 |
- >=x11-libs/libXext-1.0.5 |
1829 |
- >=media-libs/mesa-10.3.4-r1[nptl=] |
1830 |
- ) |
1831 |
- tslib? ( >=x11-libs/tslib-1.0 ) |
1832 |
- udev? ( >=virtual/udev-150 ) |
1833 |
- unwind? ( sys-libs/libunwind ) |
1834 |
- wayland? ( |
1835 |
- >=dev-libs/wayland-1.3.0 |
1836 |
- media-libs/libepoxy |
1837 |
- ) |
1838 |
- >=x11-apps/xinit-1.3.3-r1 |
1839 |
- systemd? ( |
1840 |
- sys-apps/dbus |
1841 |
- sys-apps/systemd |
1842 |
- )" |
1843 |
- |
1844 |
-DEPEND="${CDEPEND} |
1845 |
- sys-devel/flex |
1846 |
- >=x11-proto/bigreqsproto-1.1.0 |
1847 |
- >=x11-proto/compositeproto-0.4 |
1848 |
- >=x11-proto/damageproto-1.1 |
1849 |
- >=x11-proto/fixesproto-5.0 |
1850 |
- >=x11-proto/fontsproto-2.1.3 |
1851 |
- >=x11-proto/glproto-1.4.17-r1 |
1852 |
- >=x11-proto/inputproto-2.2.99.1 |
1853 |
- >=x11-proto/kbproto-1.0.3 |
1854 |
- >=x11-proto/randrproto-1.4.0 |
1855 |
- >=x11-proto/recordproto-1.13.99.1 |
1856 |
- >=x11-proto/renderproto-0.11 |
1857 |
- >=x11-proto/resourceproto-1.2.0 |
1858 |
- >=x11-proto/scrnsaverproto-1.1 |
1859 |
- >=x11-proto/trapproto-3.4.3 |
1860 |
- >=x11-proto/videoproto-2.2.2 |
1861 |
- >=x11-proto/xcmiscproto-1.2.0 |
1862 |
- >=x11-proto/xextproto-7.2.99.901 |
1863 |
- >=x11-proto/xf86dgaproto-2.0.99.1 |
1864 |
- >=x11-proto/xf86rushproto-1.1.2 |
1865 |
- >=x11-proto/xf86vidmodeproto-2.2.99.1 |
1866 |
- >=x11-proto/xineramaproto-1.1.3 |
1867 |
- >=x11-proto/xproto-7.0.26 |
1868 |
- >=x11-proto/presentproto-1.0 |
1869 |
- >=x11-proto/dri3proto-1.0 |
1870 |
- dmx? ( |
1871 |
- >=x11-proto/dmxproto-2.2.99.1 |
1872 |
- doc? ( |
1873 |
- || ( |
1874 |
- www-client/links |
1875 |
- www-client/lynx |
1876 |
- www-client/w3m |
1877 |
- ) |
1878 |
- ) |
1879 |
- ) |
1880 |
- !minimal? ( |
1881 |
- >=x11-proto/xf86driproto-2.1.0 |
1882 |
- >=x11-proto/dri2proto-2.8 |
1883 |
- )" |
1884 |
- |
1885 |
-RDEPEND="${CDEPEND} |
1886 |
- selinux? ( sec-policy/selinux-xserver ) |
1887 |
- !x11-drivers/xf86-video-modesetting |
1888 |
-" |
1889 |
- |
1890 |
-PDEPEND=" |
1891 |
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
1892 |
- |
1893 |
-REQUIRED_USE="!minimal? ( |
1894 |
- || ( ${IUSE_SERVERS} ) |
1895 |
- ) |
1896 |
- xephyr? ( kdrive )" |
1897 |
- |
1898 |
-#UPSTREAMED_PATCHES=( |
1899 |
-# "${WORKDIR}/patches/" |
1900 |
-#) |
1901 |
- |
1902 |
-PATCHES=( |
1903 |
- "${UPSTREAMED_PATCHES[@]}" |
1904 |
- "${FILESDIR}"/${PN}-1.17-ia64-fix_inx_outx.patch |
1905 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
1906 |
-) |
1907 |
- |
1908 |
-pkg_pretend() { |
1909 |
- # older gcc is not supported |
1910 |
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
1911 |
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
1912 |
-} |
1913 |
- |
1914 |
-src_configure() { |
1915 |
- # localstatedir is used for the log location; we need to override the default |
1916 |
- # from ebuild.sh |
1917 |
- # sysconfdir is used for the xorg.conf location; same applies |
1918 |
- # NOTE: fop is used for doc generating ; and i have no idea if gentoo |
1919 |
- # package it somewhere |
1920 |
- XORG_CONFIGURE_OPTIONS=( |
1921 |
- $(use_enable ipv6) |
1922 |
- $(use_enable dmx) |
1923 |
- $(use_enable glamor) |
1924 |
- $(use_enable kdrive) |
1925 |
- $(use_enable kdrive kdrive-kbd) |
1926 |
- $(use_enable kdrive kdrive-mouse) |
1927 |
- $(use_enable kdrive kdrive-evdev) |
1928 |
- $(use_enable suid install-setuid) |
1929 |
- $(use_enable tslib) |
1930 |
- $(use_enable unwind libunwind) |
1931 |
- $(use_enable wayland xwayland) |
1932 |
- $(use_enable !minimal record) |
1933 |
- $(use_enable !minimal xfree86-utils) |
1934 |
- $(use_enable !minimal install-libxf86config) |
1935 |
- $(use_enable !minimal dri) |
1936 |
- $(use_enable !minimal dri2) |
1937 |
- $(use_enable !minimal glx) |
1938 |
- $(use_enable xephyr) |
1939 |
- $(use_enable xnest) |
1940 |
- $(use_enable xorg) |
1941 |
- $(use_enable xvfb) |
1942 |
- $(use_enable nptl glx-tls) |
1943 |
- $(use_enable udev config-udev) |
1944 |
- $(use_with doc doxygen) |
1945 |
- $(use_with doc xmlto) |
1946 |
- $(use_with systemd systemd-daemon) |
1947 |
- $(use_enable systemd systemd-logind) |
1948 |
- --enable-libdrm |
1949 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
1950 |
- --localstatedir="${EPREFIX}"/var |
1951 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
1952 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
1953 |
- --disable-config-hal |
1954 |
- --disable-linux-acpi |
1955 |
- --without-dtrace |
1956 |
- --without-fop |
1957 |
- --with-os-vendor=Gentoo |
1958 |
- --with-sha1=libcrypto |
1959 |
- ) |
1960 |
- |
1961 |
- xorg-2_src_configure |
1962 |
-} |
1963 |
- |
1964 |
-src_install() { |
1965 |
- xorg-2_src_install |
1966 |
- |
1967 |
- server_based_install |
1968 |
- |
1969 |
- if ! use minimal && use xorg; then |
1970 |
- # Install xorg.conf.example into docs |
1971 |
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
1972 |
- fi |
1973 |
- |
1974 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
1975 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
1976 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
1977 |
- |
1978 |
- # install the @x11-module-rebuild set for Portage |
1979 |
- insinto /usr/share/portage/config/sets |
1980 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
1981 |
-} |
1982 |
- |
1983 |
-pkg_postinst() { |
1984 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
1985 |
- eselect opengl set xorg-x11 --use-old |
1986 |
-} |
1987 |
- |
1988 |
-pkg_postrm() { |
1989 |
- # Get rid of module dir to ensure opengl-update works properly |
1990 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
1991 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
1992 |
- fi |
1993 |
-} |
1994 |
- |
1995 |
-server_based_install() { |
1996 |
- if ! use xorg; then |
1997 |
- rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
1998 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
1999 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
2000 |
- "${ED}"/usr/share/man/man1/Xserver.1x |
2001 |
- fi |
2002 |
-} |
2003 |
|
2004 |
diff --git a/x11-base/xorg-server/xorg-server-1.17.2-r1.ebuild b/x11-base/xorg-server/xorg-server-1.17.2-r1.ebuild |
2005 |
deleted file mode 100644 |
2006 |
index 8181fa5..0000000 |
2007 |
--- a/x11-base/xorg-server/xorg-server-1.17.2-r1.ebuild |
2008 |
+++ /dev/null |
2009 |
@@ -1,245 +0,0 @@ |
2010 |
-# Copyright 1999-2015 Gentoo Foundation |
2011 |
-# Distributed under the terms of the GNU General Public License v2 |
2012 |
-# $Id$ |
2013 |
- |
2014 |
-EAPI=5 |
2015 |
- |
2016 |
-XORG_DOC=doc |
2017 |
-inherit xorg-2 multilib versionator flag-o-matic |
2018 |
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" |
2019 |
- |
2020 |
-DESCRIPTION="X.Org X servers" |
2021 |
-SLOT="0/${PV}" |
2022 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
2023 |
- |
2024 |
-IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb" |
2025 |
-IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland" |
2026 |
- |
2027 |
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
2028 |
- dev-libs/openssl |
2029 |
- media-libs/freetype |
2030 |
- >=x11-apps/iceauth-1.0.2 |
2031 |
- >=x11-apps/rgb-1.0.3 |
2032 |
- >=x11-apps/xauth-1.0.3 |
2033 |
- x11-apps/xkbcomp |
2034 |
- >=x11-libs/libdrm-2.4.46 |
2035 |
- >=x11-libs/libpciaccess-0.12.901 |
2036 |
- >=x11-libs/libXau-1.0.4 |
2037 |
- >=x11-libs/libXdmcp-1.0.2 |
2038 |
- >=x11-libs/libXfont-1.4.2 |
2039 |
- >=x11-libs/libxkbfile-1.0.4 |
2040 |
- >=x11-libs/libxshmfence-1.1 |
2041 |
- >=x11-libs/pixman-0.27.2 |
2042 |
- >=x11-libs/xtrans-1.3.5 |
2043 |
- >=x11-misc/xbitmaps-1.0.1 |
2044 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
2045 |
- dmx? ( |
2046 |
- x11-libs/libXt |
2047 |
- >=x11-libs/libdmx-1.0.99.1 |
2048 |
- >=x11-libs/libX11-1.1.5 |
2049 |
- >=x11-libs/libXaw-1.0.4 |
2050 |
- >=x11-libs/libXext-1.0.99.4 |
2051 |
- >=x11-libs/libXfixes-5.0 |
2052 |
- >=x11-libs/libXi-1.2.99.1 |
2053 |
- >=x11-libs/libXmu-1.0.3 |
2054 |
- x11-libs/libXrender |
2055 |
- >=x11-libs/libXres-1.0.3 |
2056 |
- >=x11-libs/libXtst-1.0.99.2 |
2057 |
- ) |
2058 |
- glamor? ( |
2059 |
- media-libs/libepoxy |
2060 |
- >=media-libs/mesa-10.3.4-r1[egl,gbm] |
2061 |
- !x11-libs/glamor |
2062 |
- ) |
2063 |
- kdrive? ( |
2064 |
- >=x11-libs/libXext-1.0.5 |
2065 |
- x11-libs/libXv |
2066 |
- ) |
2067 |
- xephyr? ( |
2068 |
- x11-libs/libxcb |
2069 |
- x11-libs/xcb-util |
2070 |
- x11-libs/xcb-util-image |
2071 |
- x11-libs/xcb-util-keysyms |
2072 |
- x11-libs/xcb-util-renderutil |
2073 |
- x11-libs/xcb-util-wm |
2074 |
- ) |
2075 |
- !minimal? ( |
2076 |
- >=x11-libs/libX11-1.1.5 |
2077 |
- >=x11-libs/libXext-1.0.5 |
2078 |
- >=media-libs/mesa-10.3.4-r1[nptl=] |
2079 |
- ) |
2080 |
- tslib? ( >=x11-libs/tslib-1.0 ) |
2081 |
- udev? ( >=virtual/udev-150 ) |
2082 |
- unwind? ( sys-libs/libunwind ) |
2083 |
- wayland? ( |
2084 |
- >=dev-libs/wayland-1.3.0 |
2085 |
- media-libs/libepoxy |
2086 |
- ) |
2087 |
- >=x11-apps/xinit-1.3.3-r1 |
2088 |
- systemd? ( |
2089 |
- sys-apps/dbus |
2090 |
- sys-apps/systemd |
2091 |
- )" |
2092 |
- |
2093 |
-DEPEND="${CDEPEND} |
2094 |
- sys-devel/flex |
2095 |
- >=x11-proto/bigreqsproto-1.1.0 |
2096 |
- >=x11-proto/compositeproto-0.4 |
2097 |
- >=x11-proto/damageproto-1.1 |
2098 |
- >=x11-proto/fixesproto-5.0 |
2099 |
- >=x11-proto/fontsproto-2.1.3 |
2100 |
- >=x11-proto/glproto-1.4.17-r1 |
2101 |
- >=x11-proto/inputproto-2.2.99.1 |
2102 |
- >=x11-proto/kbproto-1.0.3 |
2103 |
- >=x11-proto/randrproto-1.4.0 |
2104 |
- >=x11-proto/recordproto-1.13.99.1 |
2105 |
- >=x11-proto/renderproto-0.11 |
2106 |
- >=x11-proto/resourceproto-1.2.0 |
2107 |
- >=x11-proto/scrnsaverproto-1.1 |
2108 |
- >=x11-proto/trapproto-3.4.3 |
2109 |
- >=x11-proto/videoproto-2.2.2 |
2110 |
- >=x11-proto/xcmiscproto-1.2.0 |
2111 |
- >=x11-proto/xextproto-7.2.99.901 |
2112 |
- >=x11-proto/xf86dgaproto-2.0.99.1 |
2113 |
- >=x11-proto/xf86rushproto-1.1.2 |
2114 |
- >=x11-proto/xf86vidmodeproto-2.2.99.1 |
2115 |
- >=x11-proto/xineramaproto-1.1.3 |
2116 |
- >=x11-proto/xproto-7.0.26 |
2117 |
- >=x11-proto/presentproto-1.0 |
2118 |
- >=x11-proto/dri3proto-1.0 |
2119 |
- dmx? ( |
2120 |
- >=x11-proto/dmxproto-2.2.99.1 |
2121 |
- doc? ( |
2122 |
- || ( |
2123 |
- www-client/links |
2124 |
- www-client/lynx |
2125 |
- www-client/w3m |
2126 |
- ) |
2127 |
- ) |
2128 |
- ) |
2129 |
- !minimal? ( |
2130 |
- >=x11-proto/xf86driproto-2.1.0 |
2131 |
- >=x11-proto/dri2proto-2.8 |
2132 |
- )" |
2133 |
- |
2134 |
-RDEPEND="${CDEPEND} |
2135 |
- selinux? ( sec-policy/selinux-xserver ) |
2136 |
- !x11-drivers/xf86-video-modesetting |
2137 |
-" |
2138 |
- |
2139 |
-PDEPEND=" |
2140 |
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
2141 |
- |
2142 |
-REQUIRED_USE="!minimal? ( |
2143 |
- || ( ${IUSE_SERVERS} ) |
2144 |
- ) |
2145 |
- xephyr? ( kdrive )" |
2146 |
- |
2147 |
-#UPSTREAMED_PATCHES=( |
2148 |
-# "${WORKDIR}/patches/" |
2149 |
-#) |
2150 |
- |
2151 |
-PATCHES=( |
2152 |
- "${UPSTREAMED_PATCHES[@]}" |
2153 |
- "${FILESDIR}"/${PN}-1.17-ia64-fix_inx_outx.patch |
2154 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
2155 |
- # needed for new eselect-opengl, bug #541232 |
2156 |
- "${FILESDIR}"/${PN}-1.17-support-multiple-Files-sections.patch |
2157 |
- "${FILESDIR}"/${PN}-1.17.2-uninit-clientsWritable.patch |
2158 |
-) |
2159 |
- |
2160 |
-pkg_pretend() { |
2161 |
- # older gcc is not supported |
2162 |
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
2163 |
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
2164 |
-} |
2165 |
- |
2166 |
-src_configure() { |
2167 |
- # localstatedir is used for the log location; we need to override the default |
2168 |
- # from ebuild.sh |
2169 |
- # sysconfdir is used for the xorg.conf location; same applies |
2170 |
- # NOTE: fop is used for doc generating ; and i have no idea if gentoo |
2171 |
- # package it somewhere |
2172 |
- XORG_CONFIGURE_OPTIONS=( |
2173 |
- $(use_enable ipv6) |
2174 |
- $(use_enable dmx) |
2175 |
- $(use_enable glamor) |
2176 |
- $(use_enable kdrive) |
2177 |
- $(use_enable kdrive kdrive-kbd) |
2178 |
- $(use_enable kdrive kdrive-mouse) |
2179 |
- $(use_enable kdrive kdrive-evdev) |
2180 |
- $(use_enable suid install-setuid) |
2181 |
- $(use_enable tslib) |
2182 |
- $(use_enable unwind libunwind) |
2183 |
- $(use_enable wayland xwayland) |
2184 |
- $(use_enable !minimal record) |
2185 |
- $(use_enable !minimal xfree86-utils) |
2186 |
- $(use_enable !minimal install-libxf86config) |
2187 |
- $(use_enable !minimal dri) |
2188 |
- $(use_enable !minimal dri2) |
2189 |
- $(use_enable !minimal glx) |
2190 |
- $(use_enable xephyr) |
2191 |
- $(use_enable xnest) |
2192 |
- $(use_enable xorg) |
2193 |
- $(use_enable xvfb) |
2194 |
- $(use_enable nptl glx-tls) |
2195 |
- $(use_enable udev config-udev) |
2196 |
- $(use_with doc doxygen) |
2197 |
- $(use_with doc xmlto) |
2198 |
- $(use_with systemd systemd-daemon) |
2199 |
- $(use_enable systemd systemd-logind) |
2200 |
- --enable-libdrm |
2201 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
2202 |
- --localstatedir="${EPREFIX}"/var |
2203 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
2204 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
2205 |
- --disable-config-hal |
2206 |
- --disable-linux-acpi |
2207 |
- --without-dtrace |
2208 |
- --without-fop |
2209 |
- --with-os-vendor=Gentoo |
2210 |
- --with-sha1=libcrypto |
2211 |
- ) |
2212 |
- |
2213 |
- xorg-2_src_configure |
2214 |
-} |
2215 |
- |
2216 |
-src_install() { |
2217 |
- xorg-2_src_install |
2218 |
- |
2219 |
- server_based_install |
2220 |
- |
2221 |
- if ! use minimal && use xorg; then |
2222 |
- # Install xorg.conf.example into docs |
2223 |
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
2224 |
- fi |
2225 |
- |
2226 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
2227 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
2228 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
2229 |
- |
2230 |
- # install the @x11-module-rebuild set for Portage |
2231 |
- insinto /usr/share/portage/config/sets |
2232 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
2233 |
-} |
2234 |
- |
2235 |
-pkg_postinst() { |
2236 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
2237 |
- eselect opengl set xorg-x11 --use-old |
2238 |
-} |
2239 |
- |
2240 |
-pkg_postrm() { |
2241 |
- # Get rid of module dir to ensure opengl-update works properly |
2242 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
2243 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
2244 |
- fi |
2245 |
-} |
2246 |
- |
2247 |
-server_based_install() { |
2248 |
- if ! use xorg; then |
2249 |
- rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
2250 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
2251 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
2252 |
- "${ED}"/usr/share/man/man1/Xserver.1x |
2253 |
- fi |
2254 |
-} |
2255 |
|
2256 |
diff --git a/x11-base/xorg-server/xorg-server-1.17.2-r2.ebuild b/x11-base/xorg-server/xorg-server-1.17.2-r2.ebuild |
2257 |
deleted file mode 100644 |
2258 |
index 3001951..0000000 |
2259 |
--- a/x11-base/xorg-server/xorg-server-1.17.2-r2.ebuild |
2260 |
+++ /dev/null |
2261 |
@@ -1,246 +0,0 @@ |
2262 |
-# Copyright 1999-2015 Gentoo Foundation |
2263 |
-# Distributed under the terms of the GNU General Public License v2 |
2264 |
-# $Id$ |
2265 |
- |
2266 |
-EAPI=5 |
2267 |
- |
2268 |
-XORG_DOC=doc |
2269 |
-inherit xorg-2 multilib versionator flag-o-matic |
2270 |
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" |
2271 |
- |
2272 |
-DESCRIPTION="X.Org X servers" |
2273 |
-SLOT="0/${PV}" |
2274 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
2275 |
- |
2276 |
-IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb" |
2277 |
-IUSE="${IUSE_SERVERS} glamor ipv6 libressl minimal nptl selinux +suid systemd tslib +udev unwind wayland" |
2278 |
- |
2279 |
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
2280 |
- !libressl? ( dev-libs/openssl:0 ) |
2281 |
- libressl? ( dev-libs/libressl ) |
2282 |
- media-libs/freetype |
2283 |
- >=x11-apps/iceauth-1.0.2 |
2284 |
- >=x11-apps/rgb-1.0.3 |
2285 |
- >=x11-apps/xauth-1.0.3 |
2286 |
- x11-apps/xkbcomp |
2287 |
- >=x11-libs/libdrm-2.4.46 |
2288 |
- >=x11-libs/libpciaccess-0.12.901 |
2289 |
- >=x11-libs/libXau-1.0.4 |
2290 |
- >=x11-libs/libXdmcp-1.0.2 |
2291 |
- >=x11-libs/libXfont-1.4.2 |
2292 |
- >=x11-libs/libxkbfile-1.0.4 |
2293 |
- >=x11-libs/libxshmfence-1.1 |
2294 |
- >=x11-libs/pixman-0.27.2 |
2295 |
- >=x11-libs/xtrans-1.3.5 |
2296 |
- >=x11-misc/xbitmaps-1.0.1 |
2297 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
2298 |
- dmx? ( |
2299 |
- x11-libs/libXt |
2300 |
- >=x11-libs/libdmx-1.0.99.1 |
2301 |
- >=x11-libs/libX11-1.1.5 |
2302 |
- >=x11-libs/libXaw-1.0.4 |
2303 |
- >=x11-libs/libXext-1.0.99.4 |
2304 |
- >=x11-libs/libXfixes-5.0 |
2305 |
- >=x11-libs/libXi-1.2.99.1 |
2306 |
- >=x11-libs/libXmu-1.0.3 |
2307 |
- x11-libs/libXrender |
2308 |
- >=x11-libs/libXres-1.0.3 |
2309 |
- >=x11-libs/libXtst-1.0.99.2 |
2310 |
- ) |
2311 |
- glamor? ( |
2312 |
- media-libs/libepoxy |
2313 |
- >=media-libs/mesa-10.3.4-r1[egl,gbm] |
2314 |
- !x11-libs/glamor |
2315 |
- ) |
2316 |
- kdrive? ( |
2317 |
- >=x11-libs/libXext-1.0.5 |
2318 |
- x11-libs/libXv |
2319 |
- ) |
2320 |
- xephyr? ( |
2321 |
- x11-libs/libxcb |
2322 |
- x11-libs/xcb-util |
2323 |
- x11-libs/xcb-util-image |
2324 |
- x11-libs/xcb-util-keysyms |
2325 |
- x11-libs/xcb-util-renderutil |
2326 |
- x11-libs/xcb-util-wm |
2327 |
- ) |
2328 |
- !minimal? ( |
2329 |
- >=x11-libs/libX11-1.1.5 |
2330 |
- >=x11-libs/libXext-1.0.5 |
2331 |
- >=media-libs/mesa-10.3.4-r1[nptl=] |
2332 |
- ) |
2333 |
- tslib? ( >=x11-libs/tslib-1.0 ) |
2334 |
- udev? ( >=virtual/udev-150 ) |
2335 |
- unwind? ( sys-libs/libunwind ) |
2336 |
- wayland? ( |
2337 |
- >=dev-libs/wayland-1.3.0 |
2338 |
- media-libs/libepoxy |
2339 |
- ) |
2340 |
- >=x11-apps/xinit-1.3.3-r1 |
2341 |
- systemd? ( |
2342 |
- sys-apps/dbus |
2343 |
- sys-apps/systemd |
2344 |
- )" |
2345 |
- |
2346 |
-DEPEND="${CDEPEND} |
2347 |
- sys-devel/flex |
2348 |
- >=x11-proto/bigreqsproto-1.1.0 |
2349 |
- >=x11-proto/compositeproto-0.4 |
2350 |
- >=x11-proto/damageproto-1.1 |
2351 |
- >=x11-proto/fixesproto-5.0 |
2352 |
- >=x11-proto/fontsproto-2.1.3 |
2353 |
- >=x11-proto/glproto-1.4.17-r1 |
2354 |
- >=x11-proto/inputproto-2.2.99.1 |
2355 |
- >=x11-proto/kbproto-1.0.3 |
2356 |
- >=x11-proto/randrproto-1.4.0 |
2357 |
- >=x11-proto/recordproto-1.13.99.1 |
2358 |
- >=x11-proto/renderproto-0.11 |
2359 |
- >=x11-proto/resourceproto-1.2.0 |
2360 |
- >=x11-proto/scrnsaverproto-1.1 |
2361 |
- >=x11-proto/trapproto-3.4.3 |
2362 |
- >=x11-proto/videoproto-2.2.2 |
2363 |
- >=x11-proto/xcmiscproto-1.2.0 |
2364 |
- >=x11-proto/xextproto-7.2.99.901 |
2365 |
- >=x11-proto/xf86dgaproto-2.0.99.1 |
2366 |
- >=x11-proto/xf86rushproto-1.1.2 |
2367 |
- >=x11-proto/xf86vidmodeproto-2.2.99.1 |
2368 |
- >=x11-proto/xineramaproto-1.1.3 |
2369 |
- >=x11-proto/xproto-7.0.26 |
2370 |
- >=x11-proto/presentproto-1.0 |
2371 |
- >=x11-proto/dri3proto-1.0 |
2372 |
- dmx? ( |
2373 |
- >=x11-proto/dmxproto-2.2.99.1 |
2374 |
- doc? ( |
2375 |
- || ( |
2376 |
- www-client/links |
2377 |
- www-client/lynx |
2378 |
- www-client/w3m |
2379 |
- ) |
2380 |
- ) |
2381 |
- ) |
2382 |
- !minimal? ( |
2383 |
- >=x11-proto/xf86driproto-2.1.0 |
2384 |
- >=x11-proto/dri2proto-2.8 |
2385 |
- )" |
2386 |
- |
2387 |
-RDEPEND="${CDEPEND} |
2388 |
- selinux? ( sec-policy/selinux-xserver ) |
2389 |
- !x11-drivers/xf86-video-modesetting |
2390 |
-" |
2391 |
- |
2392 |
-PDEPEND=" |
2393 |
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
2394 |
- |
2395 |
-REQUIRED_USE="!minimal? ( |
2396 |
- || ( ${IUSE_SERVERS} ) |
2397 |
- ) |
2398 |
- xephyr? ( kdrive )" |
2399 |
- |
2400 |
-#UPSTREAMED_PATCHES=( |
2401 |
-# "${WORKDIR}/patches/" |
2402 |
-#) |
2403 |
- |
2404 |
-PATCHES=( |
2405 |
- "${UPSTREAMED_PATCHES[@]}" |
2406 |
- "${FILESDIR}"/${PN}-1.17-ia64-fix_inx_outx.patch |
2407 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
2408 |
- # needed for new eselect-opengl, bug #541232 |
2409 |
- "${FILESDIR}"/${PN}-1.17-support-multiple-Files-sections.patch |
2410 |
- "${FILESDIR}"/${PN}-1.17.2-uninit-clientsWritable.patch |
2411 |
-) |
2412 |
- |
2413 |
-pkg_pretend() { |
2414 |
- # older gcc is not supported |
2415 |
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
2416 |
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
2417 |
-} |
2418 |
- |
2419 |
-src_configure() { |
2420 |
- # localstatedir is used for the log location; we need to override the default |
2421 |
- # from ebuild.sh |
2422 |
- # sysconfdir is used for the xorg.conf location; same applies |
2423 |
- # NOTE: fop is used for doc generating ; and i have no idea if gentoo |
2424 |
- # package it somewhere |
2425 |
- XORG_CONFIGURE_OPTIONS=( |
2426 |
- $(use_enable ipv6) |
2427 |
- $(use_enable dmx) |
2428 |
- $(use_enable glamor) |
2429 |
- $(use_enable kdrive) |
2430 |
- $(use_enable kdrive kdrive-kbd) |
2431 |
- $(use_enable kdrive kdrive-mouse) |
2432 |
- $(use_enable kdrive kdrive-evdev) |
2433 |
- $(use_enable suid install-setuid) |
2434 |
- $(use_enable tslib) |
2435 |
- $(use_enable unwind libunwind) |
2436 |
- $(use_enable wayland xwayland) |
2437 |
- $(use_enable !minimal record) |
2438 |
- $(use_enable !minimal xfree86-utils) |
2439 |
- $(use_enable !minimal install-libxf86config) |
2440 |
- $(use_enable !minimal dri) |
2441 |
- $(use_enable !minimal dri2) |
2442 |
- $(use_enable !minimal glx) |
2443 |
- $(use_enable xephyr) |
2444 |
- $(use_enable xnest) |
2445 |
- $(use_enable xorg) |
2446 |
- $(use_enable xvfb) |
2447 |
- $(use_enable nptl glx-tls) |
2448 |
- $(use_enable udev config-udev) |
2449 |
- $(use_with doc doxygen) |
2450 |
- $(use_with doc xmlto) |
2451 |
- $(use_with systemd systemd-daemon) |
2452 |
- $(use_enable systemd systemd-logind) |
2453 |
- --enable-libdrm |
2454 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
2455 |
- --localstatedir="${EPREFIX}"/var |
2456 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
2457 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
2458 |
- --disable-config-hal |
2459 |
- --disable-linux-acpi |
2460 |
- --without-dtrace |
2461 |
- --without-fop |
2462 |
- --with-os-vendor=Gentoo |
2463 |
- --with-sha1=libcrypto |
2464 |
- ) |
2465 |
- |
2466 |
- xorg-2_src_configure |
2467 |
-} |
2468 |
- |
2469 |
-src_install() { |
2470 |
- xorg-2_src_install |
2471 |
- |
2472 |
- server_based_install |
2473 |
- |
2474 |
- if ! use minimal && use xorg; then |
2475 |
- # Install xorg.conf.example into docs |
2476 |
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
2477 |
- fi |
2478 |
- |
2479 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
2480 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
2481 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
2482 |
- |
2483 |
- # install the @x11-module-rebuild set for Portage |
2484 |
- insinto /usr/share/portage/config/sets |
2485 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
2486 |
-} |
2487 |
- |
2488 |
-pkg_postinst() { |
2489 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
2490 |
- eselect opengl set xorg-x11 --use-old |
2491 |
-} |
2492 |
- |
2493 |
-pkg_postrm() { |
2494 |
- # Get rid of module dir to ensure opengl-update works properly |
2495 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
2496 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
2497 |
- fi |
2498 |
-} |
2499 |
- |
2500 |
-server_based_install() { |
2501 |
- if ! use xorg; then |
2502 |
- rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
2503 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
2504 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
2505 |
- "${ED}"/usr/share/man/man1/Xserver.1x |
2506 |
- fi |
2507 |
-} |
2508 |
|
2509 |
diff --git a/x11-base/xorg-server/xorg-server-1.17.2.ebuild b/x11-base/xorg-server/xorg-server-1.17.2.ebuild |
2510 |
deleted file mode 100644 |
2511 |
index 8f4c90e..0000000 |
2512 |
--- a/x11-base/xorg-server/xorg-server-1.17.2.ebuild |
2513 |
+++ /dev/null |
2514 |
@@ -1,244 +0,0 @@ |
2515 |
-# Copyright 1999-2015 Gentoo Foundation |
2516 |
-# Distributed under the terms of the GNU General Public License v2 |
2517 |
-# $Id$ |
2518 |
- |
2519 |
-EAPI=5 |
2520 |
- |
2521 |
-XORG_DOC=doc |
2522 |
-inherit xorg-2 multilib versionator flag-o-matic |
2523 |
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" |
2524 |
- |
2525 |
-DESCRIPTION="X.Org X servers" |
2526 |
-SLOT="0/${PV}" |
2527 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
2528 |
- |
2529 |
-IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb" |
2530 |
-IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland" |
2531 |
- |
2532 |
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
2533 |
- dev-libs/openssl |
2534 |
- media-libs/freetype |
2535 |
- >=x11-apps/iceauth-1.0.2 |
2536 |
- >=x11-apps/rgb-1.0.3 |
2537 |
- >=x11-apps/xauth-1.0.3 |
2538 |
- x11-apps/xkbcomp |
2539 |
- >=x11-libs/libdrm-2.4.46 |
2540 |
- >=x11-libs/libpciaccess-0.12.901 |
2541 |
- >=x11-libs/libXau-1.0.4 |
2542 |
- >=x11-libs/libXdmcp-1.0.2 |
2543 |
- >=x11-libs/libXfont-1.4.2 |
2544 |
- >=x11-libs/libxkbfile-1.0.4 |
2545 |
- >=x11-libs/libxshmfence-1.1 |
2546 |
- >=x11-libs/pixman-0.27.2 |
2547 |
- >=x11-libs/xtrans-1.3.5 |
2548 |
- >=x11-misc/xbitmaps-1.0.1 |
2549 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
2550 |
- dmx? ( |
2551 |
- x11-libs/libXt |
2552 |
- >=x11-libs/libdmx-1.0.99.1 |
2553 |
- >=x11-libs/libX11-1.1.5 |
2554 |
- >=x11-libs/libXaw-1.0.4 |
2555 |
- >=x11-libs/libXext-1.0.99.4 |
2556 |
- >=x11-libs/libXfixes-5.0 |
2557 |
- >=x11-libs/libXi-1.2.99.1 |
2558 |
- >=x11-libs/libXmu-1.0.3 |
2559 |
- x11-libs/libXrender |
2560 |
- >=x11-libs/libXres-1.0.3 |
2561 |
- >=x11-libs/libXtst-1.0.99.2 |
2562 |
- ) |
2563 |
- glamor? ( |
2564 |
- media-libs/libepoxy |
2565 |
- >=media-libs/mesa-10.3.4-r1[egl,gbm] |
2566 |
- !x11-libs/glamor |
2567 |
- ) |
2568 |
- kdrive? ( |
2569 |
- >=x11-libs/libXext-1.0.5 |
2570 |
- x11-libs/libXv |
2571 |
- ) |
2572 |
- xephyr? ( |
2573 |
- x11-libs/libxcb |
2574 |
- x11-libs/xcb-util |
2575 |
- x11-libs/xcb-util-image |
2576 |
- x11-libs/xcb-util-keysyms |
2577 |
- x11-libs/xcb-util-renderutil |
2578 |
- x11-libs/xcb-util-wm |
2579 |
- ) |
2580 |
- !minimal? ( |
2581 |
- >=x11-libs/libX11-1.1.5 |
2582 |
- >=x11-libs/libXext-1.0.5 |
2583 |
- >=media-libs/mesa-10.3.4-r1[nptl=] |
2584 |
- ) |
2585 |
- tslib? ( >=x11-libs/tslib-1.0 ) |
2586 |
- udev? ( >=virtual/udev-150 ) |
2587 |
- unwind? ( sys-libs/libunwind ) |
2588 |
- wayland? ( |
2589 |
- >=dev-libs/wayland-1.3.0 |
2590 |
- media-libs/libepoxy |
2591 |
- ) |
2592 |
- >=x11-apps/xinit-1.3.3-r1 |
2593 |
- systemd? ( |
2594 |
- sys-apps/dbus |
2595 |
- sys-apps/systemd |
2596 |
- )" |
2597 |
- |
2598 |
-DEPEND="${CDEPEND} |
2599 |
- sys-devel/flex |
2600 |
- >=x11-proto/bigreqsproto-1.1.0 |
2601 |
- >=x11-proto/compositeproto-0.4 |
2602 |
- >=x11-proto/damageproto-1.1 |
2603 |
- >=x11-proto/fixesproto-5.0 |
2604 |
- >=x11-proto/fontsproto-2.1.3 |
2605 |
- >=x11-proto/glproto-1.4.17-r1 |
2606 |
- >=x11-proto/inputproto-2.2.99.1 |
2607 |
- >=x11-proto/kbproto-1.0.3 |
2608 |
- >=x11-proto/randrproto-1.4.0 |
2609 |
- >=x11-proto/recordproto-1.13.99.1 |
2610 |
- >=x11-proto/renderproto-0.11 |
2611 |
- >=x11-proto/resourceproto-1.2.0 |
2612 |
- >=x11-proto/scrnsaverproto-1.1 |
2613 |
- >=x11-proto/trapproto-3.4.3 |
2614 |
- >=x11-proto/videoproto-2.2.2 |
2615 |
- >=x11-proto/xcmiscproto-1.2.0 |
2616 |
- >=x11-proto/xextproto-7.2.99.901 |
2617 |
- >=x11-proto/xf86dgaproto-2.0.99.1 |
2618 |
- >=x11-proto/xf86rushproto-1.1.2 |
2619 |
- >=x11-proto/xf86vidmodeproto-2.2.99.1 |
2620 |
- >=x11-proto/xineramaproto-1.1.3 |
2621 |
- >=x11-proto/xproto-7.0.26 |
2622 |
- >=x11-proto/presentproto-1.0 |
2623 |
- >=x11-proto/dri3proto-1.0 |
2624 |
- dmx? ( |
2625 |
- >=x11-proto/dmxproto-2.2.99.1 |
2626 |
- doc? ( |
2627 |
- || ( |
2628 |
- www-client/links |
2629 |
- www-client/lynx |
2630 |
- www-client/w3m |
2631 |
- ) |
2632 |
- ) |
2633 |
- ) |
2634 |
- !minimal? ( |
2635 |
- >=x11-proto/xf86driproto-2.1.0 |
2636 |
- >=x11-proto/dri2proto-2.8 |
2637 |
- )" |
2638 |
- |
2639 |
-RDEPEND="${CDEPEND} |
2640 |
- selinux? ( sec-policy/selinux-xserver ) |
2641 |
- !x11-drivers/xf86-video-modesetting |
2642 |
-" |
2643 |
- |
2644 |
-PDEPEND=" |
2645 |
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
2646 |
- |
2647 |
-REQUIRED_USE="!minimal? ( |
2648 |
- || ( ${IUSE_SERVERS} ) |
2649 |
- ) |
2650 |
- xephyr? ( kdrive )" |
2651 |
- |
2652 |
-#UPSTREAMED_PATCHES=( |
2653 |
-# "${WORKDIR}/patches/" |
2654 |
-#) |
2655 |
- |
2656 |
-PATCHES=( |
2657 |
- "${UPSTREAMED_PATCHES[@]}" |
2658 |
- "${FILESDIR}"/${PN}-1.17-ia64-fix_inx_outx.patch |
2659 |
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
2660 |
- # needed for new eselect-opengl, bug #541232 |
2661 |
- "${FILESDIR}"/${PN}-1.17-support-multiple-Files-sections.patch |
2662 |
-) |
2663 |
- |
2664 |
-pkg_pretend() { |
2665 |
- # older gcc is not supported |
2666 |
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
2667 |
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
2668 |
-} |
2669 |
- |
2670 |
-src_configure() { |
2671 |
- # localstatedir is used for the log location; we need to override the default |
2672 |
- # from ebuild.sh |
2673 |
- # sysconfdir is used for the xorg.conf location; same applies |
2674 |
- # NOTE: fop is used for doc generating ; and i have no idea if gentoo |
2675 |
- # package it somewhere |
2676 |
- XORG_CONFIGURE_OPTIONS=( |
2677 |
- $(use_enable ipv6) |
2678 |
- $(use_enable dmx) |
2679 |
- $(use_enable glamor) |
2680 |
- $(use_enable kdrive) |
2681 |
- $(use_enable kdrive kdrive-kbd) |
2682 |
- $(use_enable kdrive kdrive-mouse) |
2683 |
- $(use_enable kdrive kdrive-evdev) |
2684 |
- $(use_enable suid install-setuid) |
2685 |
- $(use_enable tslib) |
2686 |
- $(use_enable unwind libunwind) |
2687 |
- $(use_enable wayland xwayland) |
2688 |
- $(use_enable !minimal record) |
2689 |
- $(use_enable !minimal xfree86-utils) |
2690 |
- $(use_enable !minimal install-libxf86config) |
2691 |
- $(use_enable !minimal dri) |
2692 |
- $(use_enable !minimal dri2) |
2693 |
- $(use_enable !minimal glx) |
2694 |
- $(use_enable xephyr) |
2695 |
- $(use_enable xnest) |
2696 |
- $(use_enable xorg) |
2697 |
- $(use_enable xvfb) |
2698 |
- $(use_enable nptl glx-tls) |
2699 |
- $(use_enable udev config-udev) |
2700 |
- $(use_with doc doxygen) |
2701 |
- $(use_with doc xmlto) |
2702 |
- $(use_with systemd systemd-daemon) |
2703 |
- $(use_enable systemd systemd-logind) |
2704 |
- --enable-libdrm |
2705 |
- --sysconfdir="${EPREFIX}"/etc/X11 |
2706 |
- --localstatedir="${EPREFIX}"/var |
2707 |
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
2708 |
- --with-xkb-output="${EPREFIX}"/var/lib/xkb |
2709 |
- --disable-config-hal |
2710 |
- --disable-linux-acpi |
2711 |
- --without-dtrace |
2712 |
- --without-fop |
2713 |
- --with-os-vendor=Gentoo |
2714 |
- --with-sha1=libcrypto |
2715 |
- ) |
2716 |
- |
2717 |
- xorg-2_src_configure |
2718 |
-} |
2719 |
- |
2720 |
-src_install() { |
2721 |
- xorg-2_src_install |
2722 |
- |
2723 |
- server_based_install |
2724 |
- |
2725 |
- if ! use minimal && use xorg; then |
2726 |
- # Install xorg.conf.example into docs |
2727 |
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
2728 |
- fi |
2729 |
- |
2730 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
2731 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
2732 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
2733 |
- |
2734 |
- # install the @x11-module-rebuild set for Portage |
2735 |
- insinto /usr/share/portage/config/sets |
2736 |
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
2737 |
-} |
2738 |
- |
2739 |
-pkg_postinst() { |
2740 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
2741 |
- eselect opengl set xorg-x11 --use-old |
2742 |
-} |
2743 |
- |
2744 |
-pkg_postrm() { |
2745 |
- # Get rid of module dir to ensure opengl-update works properly |
2746 |
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
2747 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
2748 |
- fi |
2749 |
-} |
2750 |
- |
2751 |
-server_based_install() { |
2752 |
- if ! use xorg; then |
2753 |
- rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
2754 |
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
2755 |
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
2756 |
- "${ED}"/usr/share/man/man1/Xserver.1x |
2757 |
- fi |
2758 |
-} |