diff options
author | Matt Turner <mattst88@gentoo.org> | 2014-07-17 17:13:02 +0000 |
---|---|---|
committer | Matt Turner <mattst88@gentoo.org> | 2014-07-17 17:13:02 +0000 |
commit | 705ac3de8fbacebc7447aeb21a632be0c1eca203 (patch) | |
tree | 22015beb71553d9e2bf52c9b8515e1c616f3ec02 /x11-base/xorg-server | |
parent | Remove short <longdescription>. (diff) | |
download | historical-705ac3de8fbacebc7447aeb21a632be0c1eca203.tar.gz historical-705ac3de8fbacebc7447aeb21a632be0c1eca203.tar.bz2 historical-705ac3de8fbacebc7447aeb21a632be0c1eca203.zip |
Version bump to 1.16.0.
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x974CA72A
Diffstat (limited to 'x11-base/xorg-server')
-rw-r--r-- | x11-base/xorg-server/ChangeLog | 7 | ||||
-rw-r--r-- | x11-base/xorg-server/Manifest | 24 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-1.16.0.ebuild | 273 |
3 files changed, 302 insertions, 2 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index b2aceef81f20..ed6df1043bca 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.797 2014/06/13 13:23:56 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.798 2014/07/17 17:12:50 mattst88 Exp $ + +*xorg-server-1.16.0 (17 Jul 2014) + + 17 Jul 2014; Matt Turner <mattst88@gentoo.org> +xorg-server-1.16.0.ebuild: + Version bump to 1.16.0. *xorg-server-1.14.7 (13 Jun 2014) diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index db47655f327f..4468e810fc60 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX xdm-setup.initd-1 346 SHA256 942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406 SHA512 b12ef1a757213c2df2d4fb50691695fdaf00ee9edb7d4ec551980c48b6eb05598d3eda0db543719a11a82b019939fb4af82a19813d238a725dcc0d818379103e WHIRLPOOL 28a033355ec3871eba2dfdf45969e9ac354d8ae542dcb1449901af856b9c26314318f6a91cec81f2548caaede19d88e14eac2de0fd7dab8957a7358e94a594b2 AUX xdm.confd-4 562 SHA256 9d26b72bb28611a60a6b9f942b8d8cfe47b59f926be89af9709b5912668344d8 SHA512 facfb91c0b4e0b1cae86b707d263523215633720e1e8f4595639411f936907b321643e8a06111dd3f7b74fa601476e4b0d09768edfdec762c73fa07cb227588b WHIRLPOOL d701fb5f40ecde2b2f2bb56970576c8abde1499916168fee4a6d27afbc1c0493eb17ddd1a8ee70bfbc77d553a47e219e538febada4946d19cccbdabc90f40e6f AUX xdm.initd-10 6032 SHA256 85e5778e23748c6a6285fdadaeb18e6c04b3fdf98d2a81f0ab9d854dbac8076c SHA512 60656a77800a773f5e05e4725e62c2a666a4635192f0fa4f51dd27b31e743dac6ed3b2eeef4de271df3a0863b1e1c59d99755987a88c8bdb9542911266dd3bc7 WHIRLPOOL 8d2b389b74e45963fcfb98faefe1297d1f8ba2b7d03f243cc9555635073c599c4367e2d54a0081dcfc24964d3045f539f0c88ad22b6f76a517ef326e24957a71 @@ -29,6 +32,7 @@ DIST xorg-server-1.14.7.tar.bz2 5520884 SHA256 fcf66fa6ad86227613d2d3e8ae13ded29 DIST xorg-server-1.15.0.tar.bz2 5546579 SHA256 613b2f2e7ee2a06d2f8e862c836dc70d319c52f1537749e027398f40086aabb8 SHA512 7bf6a9eff9cc606defbaa46600a4d7b41896f4304e06af745a2717687853c7e92b191481f1f4d6d98ef0adfe5f404c9e3997ebd98553c60b626cd1bb53c58d9d WHIRLPOOL 905d3b47938e5e5604b04953f11ec7acee9298d6f32570612d6301ac71b0c5a49e774267b627957b7a6a94f6b9bf211c9ed6b7102f389a2120a40bd45502a6d7 DIST xorg-server-1.15.1.tar.bz2 5489347 SHA256 626db6882602ebe1ff81f7a4231c7ccc6ceb5032f2b5b3954bf749e1567221e2 SHA512 93c9831d354f926243d047bc05a057484e69914410914193d7e8e8b4724ee7b74f57476f1ba59cae5a845e69565ff5529ec25e45322200de9aa38cdf6394257f WHIRLPOOL 7424e8b06c4edf1cdccc5b64d14cbeb901a9f5eeff5df79c2f138c62b8eccb41f5048ca357c2f688089fe3b7595703aae583c5031b0237f7ff13eb08a4b4708c DIST xorg-server-1.15.99.903.tar.bz2 5813761 SHA256 69b5863e1f8ade2db47e3733708972700acc20465a3f57819cace5f783496c14 SHA512 16c07a115415a1fc692266a641d1ff80e9f3b9be5037a07550bdb4838c3d62ea26a916495ad1d8f5e9152a40fd8d3dcfbd47d1205bc074416134b396d41de58a WHIRLPOOL 78c518c6a8228693aeda4caca62826d00cc353ce5bf6e48a1f5eb696db0ab418825d61bca6b6585989cd160efd4fd69043bb486af28ede392d7b19a5efb8cd76 +DIST xorg-server-1.16.0.tar.bz2 5832944 SHA256 38330a03c5f7a38745a3f9816cf069db5b8844eebb358fd39dbabf61f32cd06b SHA512 eab298e3728aa79ff2ba3f5c12637c4db0f9bbca49ed00b673b2bfedf605f33a69d8eb946bed98e3d28afd9bfaf62e21ce2e8606d84cae9906506d90c26f1662 WHIRLPOOL bd9817cf93587e2b33d63438942c75d49b04f4fc2a4544654dfcc116deaf88abcccd0fa2496fb58848d5a007d2e32177cdbcd3f44237efd8b7882a0abc5b8d56 DIST xorg-server-1.9.5.tar.bz2 5172054 SHA256 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc SHA512 f17baa6e871c7df4dc61330e32e235906d9e4c842a70226b0833d2b64ab62811131b960eb942f4dc9359ea828676ce60afd82802aa7cffc711d27c4946c32345 WHIRLPOOL a8ede9d5e4ae80713e2b363042a80fe7ac9a03f8623dbf058b241a4237edd2397b437dda5ea56076ec1da71b946dc5b936adfd4afd436893b5c8350996ba169e EBUILD xorg-server-1.10.6-r3.ebuild 7244 SHA256 0ecb1d013df6b783d07e1b98a3b63279303a09adc77c894ce3707d1324cdde97 SHA512 7e360a813c87d33bc1e3e13f9634ace0bec8349835aea1c1a24d4c7a26ebb4dd9359cdd597ff920c62fe32cf4af13f95414f71e9b3034a224dd4dc645cd974d9 WHIRLPOOL d0c1a7e8c63254d9f3c4475a0a2fad7c12a9fb2d7a9bb3341c85b0b9d743cf306d4547897d88577af3d03f436de3dfcb9a7a75e763251d3d7f34e956b9c9af05 EBUILD xorg-server-1.11.4-r3.ebuild 7433 SHA256 5d48bb1cfe684d97797b4c9a713f8ceb6efdafc47634803590825de234c02478 SHA512 89e6b0d9fdd6a22cf82d3a3ef1cc04e4802090be3ece8d989d4e3fe8a3fad0937f1f9954701565ac8e64c6caaf2847ab978e7cd6fdfbe4141e2db8a06b7dd334 WHIRLPOOL 1b29c0b381b95ecdb2318ade218e4c0d558d57635c52271a7a7c481e29699e977b0796d9e749d38bc6467d273699a7d198041f91138e315981ac1dd7d6031143 @@ -39,7 +43,25 @@ EBUILD xorg-server-1.14.7.ebuild 7153 SHA256 21cd84e8353feff99fc3b4131ee4cced39d EBUILD xorg-server-1.15.0.ebuild 7226 SHA256 015aa7e8bf28a82aff5ae9b3df55f55b4d3e383c3356397e107682eb969f5a43 SHA512 7070e6a27c242d0c9aae6d67758ac5dad545822d856cf72349c16feed61bc1d5cb6e747d9648eda775b2aafbd88eebad0dbbda12a555bef82f13bef7b2e133ac WHIRLPOOL 9b293c5102460d7185707de9d5ea28cd785026e7135751eebfe0ebce3c5517c3542a0376652da0179b3a78de4854dc2a2653aac7fa12127ec70ce1f328cb7ac4 EBUILD xorg-server-1.15.1.ebuild 7239 SHA256 60d661d2c34ccb33fde1ddb5406cd50ed850d75ec33ae79087d6a64cff82cd3f SHA512 5f776d9a40ba66f225b3887414648d0083d1ba3a4ed191cc74b43b456cc04f9c0e0e9352168b7403129086bd9f4d4de223ddc66458c74bd26c17f34227a5d441 WHIRLPOOL bd91b8be79cce9ed081371752f3d7048618d687cdc3920ec2cfdd2eaa2997e89f87561946a8de185fa7857523cc6bcdff4ce27a121084275403745ec7c52f0ea EBUILD xorg-server-1.15.99.903.ebuild 7791 SHA256 047e26dd817086b113294684ff3666b7b85e0734606502d13a518946b82321d0 SHA512 076678668148d588da817a41d928216ee258cd66d2f0481d8b1d4d990ac05b675a739f4c2e0a67731f6ea02ecd22927f6f95a4cc1e24b7e046a455f62679957c WHIRLPOOL af4f8c90273d4c29472bc2e334870b8c565ee70f72d5b63e7073c38138f1d4f1792c694d536499aa4eb2635d09c2c557bda455e12473e2a06bc2bab4d3916fc1 +EBUILD xorg-server-1.16.0.ebuild 7786 SHA256 ce46176ec19e604d13cda488f50863939ea713013263aa115ed291b81c366494 SHA512 c3a180d73eda07852cb0c5bd705b69d398a5985d9db3d9e56a3e1fc1d3a2a783e09c100e6715f3a588767d0aad1a2e8bd8c7dca45bd4ffb2bc3c17ef3e59e99a WHIRLPOOL 96a17967376c77a2685ce4925aac98cadec2459ec23329e28f4e1bda7bdfbd24f0dbf8fdbc75e7a5c5b5581043ebac952ccaac1268472307576b9b1bc1716b28 EBUILD xorg-server-1.9.5-r3.ebuild 7967 SHA256 74e6a536de6c99f4c3081ca6f4b65c653e6b54d72ba17963b2186be0b031a3a6 SHA512 bb5b4f17f6fbd07cc1501019464b7b944599256e5ca0021d5481e6c194fd19fdb0e5029351b999b1efa621c61c1c7256970d431f99b3c31a659859649a09a63d WHIRLPOOL 4ff73d879f6a8c3c69d2f8f7414eb08d873187e3cbd6b4f1453d53398a3b13a93da4e3847a62c87e6b26f30fffb2fb7153b2e3da3a8bd0eaffc4eeb870701cb8 -MISC ChangeLog 56553 SHA256 750f1e6fed9fca80a507f1169e4f2381ffc540adbd17da2430e124a731d73a5c SHA512 c7d38fad3d11e6f6391379fb5d49a19a1bb1592e8ab9220987fed30697266eef2e7901ac49606209ef68fdce0a67bd63e43b65cdf8e0c06af344b9e4c4018b1d WHIRLPOOL 1a267ea527299e44f23f57b60215f8f989bfd3b460945f44a158f4c8f2a6697a4f62d0f817f282b7fa3fda777065d68f672b2ff8fdecf50f05147f4fd94f605b +MISC ChangeLog 56692 SHA256 73b02714eef9a7003ec79ca17d9cee781270fd1be3c8132784596b2d620a76c2 SHA512 c04e305c3e1c73ceaf201de55b63f5784889fd813595a9aaa30c0171eeee3a172fb246ba2307507cebf31e5a180ac2295d292bf6ae80f5528fdacf9d06732da0 WHIRLPOOL 5cee6ec06965a43e798cf61a4db086aedec5af645adb56aa0efb62b0dbeb00acde4bb793ddedd01b911a95fe7747de6c0ad21c2ac33b24d5d5ba501640f82cd0 MISC ChangeLog-2009 109242 SHA256 76119bd85f64b74b4f8129911eef944e8f1baa3ae38bbfb65bcd6197a6f58c88 SHA512 200b2a1f8d66bc4461de84a5b675ae9bdc1fd38ffea339cdc69afdb613d7a6d6ffe29175fba62b10c4f9d95e050035933f59e21172bf9c545d7a70137c8d04f4 WHIRLPOOL 1c084a461e803c1a6627986cb2444cd7a23743f409df5bb1ca5f55d1e7c3106670cfc2cd4f875a479e0c75513b7937ee35b591b4016b715f7fa45209e098cece MISC metadata.xml 751 SHA256 02f470045d13e4baad4089f1cbc7cafd4dd1ab1b1799eeb2c0fb7864e956df80 SHA512 a58ad7f347519d7ba3bd710f1eab0f67925645961bcfa97fd9f106d5ea81400da79eebe95037ee4589b19c462fbdf6948949818f31210995ec9a930eaef78b26 WHIRLPOOL 67b3f0584a5c1d9e6da206761fc34a82caae36a4d9544c5512a95cdef800417c0f3f03a49606ebef72aa61522f097bf448fa0bdf651b5dd3b04554dcc86aaf5f +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIcBAEBCAAGBQJTyASHAAoJEA/daC2XTKcqd2MP/iy/lPnFTo4g5d7VPs/Q/+ZC +xHrkX6CKPew7tnOx2MaDlatadvs3D/xbI5n7cfmJkav3sCcHGNFnX+FMLBmvlgiv +VHQe9I7L5kqr+oqXK+5q3YTe0581AilRChlN1n5yOffDDr2LiymgqJmVkYOPcjbf +zJZ3XJlVMHdPew2/siovRIkxAYMe1XKP1Loz5jGVlkWfuOj+o99xzXzig3K7joo9 +Wu8hCAtFAH4GSF1L7dTOuXgXFHR5xtqGl4v3gS4hEivVkHNHyiAUqy645p8z7ldj +wrJb5c8wJVdXRWdPlQoOvggxL1cactYl3k1jLjT/1pLjg7tmJvuaewz+lFnA+O1+ +lBq14nMqRAw/q7FJWffuYQE10l4wWbGhqdj0M/l5kKX38liBJS7WcOXL0RXvbL/b +83Od2z1a5PuTryiuD3K9uPfUHdnFYh1r4HXP7R4TwhGSIbgCEf2Vy4BpH0uFa2Pu +vlS8/82+ddsVnS3KuW7qlDtcKaaYHhNObZ4P6L6SJK3Bg3JkjV1ZCMGQ7F5Osr/R +cSpJ/L8sL7dz4dEFp9X84NT0xeWFzsK9plSx76dG86M3i4QOnORUDyQvXkkBnd+5 +hDsrS71+fvz94j0j14jLLDTujX16QX04UWpBporw64j67cvUD0gcI+dsrOhWyyHK +/gFi9652D88llsK+T4Qf +=lcIZ +-----END PGP SIGNATURE----- diff --git a/x11-base/xorg-server/xorg-server-1.16.0.ebuild b/x11-base/xorg-server/xorg-server-1.16.0.ebuild new file mode 100644 index 000000000000..5ab10f8907f3 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.16.0.ebuild @@ -0,0 +1,273 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.16.0.ebuild,v 1.1 2014/07/17 17:12:50 mattst88 Exp $ + +EAPI=5 + +XORG_DOC=doc +inherit xorg-2 multilib versionator flag-o-matic +EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" + +DESCRIPTION="X.Org X servers" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" + +IUSE_SERVERS="dmx kdrive xnest xorg xvfb" +IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland" + +RDEPEND=">=app-admin/eselect-opengl-1.0.8 + dev-libs/openssl + media-libs/freetype + >=x11-apps/iceauth-1.0.2 + >=x11-apps/rgb-1.0.3 + >=x11-apps/xauth-1.0.3 + x11-apps/xkbcomp + >=x11-libs/libdrm-2.4.20 + >=x11-libs/libpciaccess-0.12.901 + >=x11-libs/libXau-1.0.4 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXfont-1.4.2 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/libxshmfence-1.1 + >=x11-libs/pixman-0.27.2 + >=x11-libs/xtrans-1.3.3 + >=x11-misc/xbitmaps-1.0.1 + >=x11-misc/xkeyboard-config-2.4.1-r3 + dmx? ( + x11-libs/libXt + >=x11-libs/libdmx-1.0.99.1 + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXaw-1.0.4 + >=x11-libs/libXext-1.0.99.4 + >=x11-libs/libXfixes-5.0 + >=x11-libs/libXi-1.2.99.1 + >=x11-libs/libXmu-1.0.3 + x11-libs/libXrender + >=x11-libs/libXres-1.0.3 + >=x11-libs/libXtst-1.0.99.2 + ) + glamor? ( + media-libs/libepoxy + media-libs/mesa[egl,gbm] + !x11-libs/glamor + ) + kdrive? ( + >=x11-libs/libXext-1.0.5 + x11-libs/libXv + ) + !minimal? ( + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXext-1.0.5 + >=media-libs/mesa-9.2.0[nptl=] + ) + tslib? ( >=x11-libs/tslib-1.0 ) + udev? ( >=virtual/udev-150 ) + unwind? ( sys-libs/libunwind ) + wayland? ( + >=dev-libs/wayland-1.3.0 + media-libs/libepoxy + ) + >=x11-apps/xinit-1.3 + selinux? ( sec-policy/selinux-xserver ) + systemd? ( + sys-apps/dbus + sys-apps/systemd + )" + +DEPEND="${RDEPEND} + sys-devel/flex + >=x11-proto/bigreqsproto-1.1.0 + >=x11-proto/compositeproto-0.4 + >=x11-proto/damageproto-1.1 + >=x11-proto/fixesproto-5.0 + >=x11-proto/fontsproto-2.1.3 + >=x11-proto/glproto-1.4.17 + >=x11-proto/inputproto-2.2.99.1 + >=x11-proto/kbproto-1.0.3 + >=x11-proto/randrproto-1.4.0 + >=x11-proto/recordproto-1.13.99.1 + >=x11-proto/renderproto-0.11 + >=x11-proto/resourceproto-1.2.0 + >=x11-proto/scrnsaverproto-1.1 + >=x11-proto/trapproto-3.4.3 + >=x11-proto/videoproto-2.2.2 + >=x11-proto/xcmiscproto-1.2.0 + >=x11-proto/xextproto-7.2.99.901 + >=x11-proto/xf86dgaproto-2.0.99.1 + >=x11-proto/xf86rushproto-1.1.2 + >=x11-proto/xf86vidmodeproto-2.2.99.1 + >=x11-proto/xineramaproto-1.1.3 + >=x11-proto/xproto-7.0.26 + >=x11-proto/presentproto-1.0 + >=x11-proto/dri3proto-1.0 + dmx? ( + >=x11-proto/dmxproto-2.2.99.1 + doc? ( + || ( + www-client/links + www-client/lynx + www-client/w3m + ) + ) + ) + !minimal? ( + >=x11-proto/xf86driproto-2.1.0 + >=x11-proto/dri2proto-2.8 + )" + +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + )" + +#UPSTREAMED_PATCHES=( +# "${WORKDIR}/patches/" +#) + +PATCHES=( + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch + "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch +) + +pkg_pretend() { + # older gcc is not supported + [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ + die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." +} + +src_configure() { + # localstatedir is used for the log location; we need to override the default + # from ebuild.sh + # sysconfdir is used for the xorg.conf location; same applies + # NOTE: fop is used for doc generating ; and i have no idea if gentoo + # package it somewhere + XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + $(use_enable dmx) + $(use_enable glamor) + $(use_enable kdrive) + $(use_enable kdrive kdrive-kbd) + $(use_enable kdrive kdrive-mouse) + $(use_enable kdrive kdrive-evdev) + $(use_enable suid install-setuid) + $(use_enable tslib) + $(use_enable unwind libunwind) + $(use_enable wayland xwayland) + $(use_enable !minimal record) + $(use_enable !minimal xfree86-utils) + $(use_enable !minimal install-libxf86config) + $(use_enable !minimal dri) + $(use_enable !minimal dri2) + $(use_enable !minimal glx) + $(use_enable xnest) + $(use_enable xorg) + $(use_enable xvfb) + $(use_enable nptl glx-tls) + $(use_enable udev config-udev) + $(use_with doc doxygen) + $(use_with doc xmlto) + $(use_with systemd systemd-daemon) + $(use_enable systemd systemd-logind) + --enable-libdrm + --sysconfdir="${EPREFIX}"/etc/X11 + --localstatedir="${EPREFIX}"/var + --with-fontrootdir="${EPREFIX}"/usr/share/fonts + --with-xkb-output="${EPREFIX}"/var/lib/xkb + --disable-config-hal + --disable-linux-acpi + --without-dtrace + --without-fop + --with-os-vendor=Gentoo + --with-sha1=libcrypto + ) + + # Xorg-server requires includes from OS mesa which are not visible for + # users of binary drivers. + mkdir -p "${T}/mesa-symlinks/GL" + for i in gl glx glxmd glxproto glxtokens; do + ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die + done + for i in glext glxext; do + ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die + done + append-cppflags "-I${T}/mesa-symlinks" + + xorg-2_src_configure +} + +src_install() { + xorg-2_src_install + + dynamic_libgl_install + + server_based_install + + if ! use minimal && use xorg; then + # Install xorg.conf.example into docs + dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example + fi + + newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup + newinitd "${FILESDIR}"/xdm.initd-11 xdm + newconfd "${FILESDIR}"/xdm.confd-4 xdm + + # install the @x11-module-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/xorg-sets.conf xorg.conf +} + +pkg_postinst() { + # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) + eselect opengl set xorg-x11 --use-old + + if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then + elog "You should consider reading upgrade guide for this release:" + elog " http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml" + echo + ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)" + ewarn "because the ABI changed. If you cannot start X because" + ewarn "of module version mismatch errors, this is your problem." + + echo + ewarn "You can rebuild all installed packages in the x11-drivers" + ewarn "category using this command:" + ewarn " emerge @x11-module-rebuild" + fi + + if use udev && has_version virtual/udev[-keymap]; then + ewarn "virtual/udev was built without keymap support. This may cause input device" + ewarn "autoconfiguration to fail." + fi +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then + rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules + fi +} + +dynamic_libgl_install() { + # next section is to setup the dynamic libGL stuff + ebegin "Moving GL files for dynamic switching" + dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions + local x="" + for x in "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do + if [ -f ${x} -o -L ${x} ]; then + mv -f ${x} "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/extensions + fi + done + eend 0 +} + +server_based_install() { + if ! use xorg; then + rm "${ED}"/usr/share/man/man1/Xserver.1x \ + "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ + "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ + "${ED}"/usr/share/man/man1/Xserver.1x + fi +} |