From b24bd25253fe093f722ab576d29fdc41d04cb1ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Aug 2019 19:14:55 +0100 Subject: gentoo resync : 02.08.2019 --- x11-base/Manifest.gz | Bin 1044 -> 1048 bytes x11-base/xorg-drivers/Manifest | 4 +- x11-base/xorg-drivers/xorg-drivers-1.20.ebuild | 4 +- x11-base/xorg-drivers/xorg-drivers-9999.ebuild | 4 +- x11-base/xorg-proto/Manifest | 4 +- x11-base/xorg-proto/xorg-proto-2018.4.ebuild | 68 -------- x11-base/xorg-proto/xorg-proto-2019.1.ebuild | 2 +- x11-base/xorg-server/Manifest | 6 +- x11-base/xorg-server/files/xdm.initd-11 | 2 +- x11-base/xorg-server/xorg-server-1.20.4.ebuild | 227 ------------------------- x11-base/xorg-server/xorg-server-1.20.5.ebuild | 2 +- 11 files changed, 14 insertions(+), 309 deletions(-) delete mode 100644 x11-base/xorg-proto/xorg-proto-2018.4.ebuild delete mode 100644 x11-base/xorg-server/xorg-server-1.20.4.ebuild (limited to 'x11-base') diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz index 311ad3eff2c6..2d8de0132b8d 100644 Binary files a/x11-base/Manifest.gz and b/x11-base/Manifest.gz differ diff --git a/x11-base/xorg-drivers/Manifest b/x11-base/xorg-drivers/Manifest index 398fe5d6e487..3c806af76188 100644 --- a/x11-base/xorg-drivers/Manifest +++ b/x11-base/xorg-drivers/Manifest @@ -1,3 +1,3 @@ -EBUILD xorg-drivers-1.20.ebuild 3720 BLAKE2B 4cdd3fd92ad8d01f0ba3cb27134a4177e3ac2a1c77cf8a033fd190ddd79141d1c99ca78d05d0665d5eec1b23e346366508638d5b4319c3ae62a5e9c2b62f14ea SHA512 aa5ae48b6aa8f7937089ec4a0f8edb4bfd153aea13f4dc810e8c9dfbd88c175850fcbd8015a1a53253afc58c1cf017ea5f0a11e6969ec3202bca5c4b641cd78d -EBUILD xorg-drivers-9999.ebuild 3608 BLAKE2B 4d1d2b7456b9c8610ab22a910e5ad502e4fa29f0973c147566f6ac302dcf80667019753e355bb0ea06999568e18509572ebfbeed87437ce75fd6c1103f0d7cf2 SHA512 7deb8c1b48e66283bdf6093a350b2b1adab8d9634bb1ac5a4e7fa7703f60ae965b08f6b1dedc986e42623bbb989be761d3cc778b6fe1f6cb57c9375f393ab468 +EBUILD xorg-drivers-1.20.ebuild 3753 BLAKE2B f7114d9971116f7be246c2360e704de7ea78cc23bd6fd651372f6cdcecde791197dc065263d04b880111c7f19c64a976d8c0f4d310b37729179bbccd5d544a13 SHA512 fe5c175552848cf8f9f3272ea78fc1f243014179d407bcb4bc33dca8b8ef3c92d349438f57aab440b4930ad31f561c4ad69493f5a52ad6c8e856e3d9a4c38c8b +EBUILD xorg-drivers-9999.ebuild 3764 BLAKE2B 00bacaf207ef45871fdab7782d804b706348db82303bd253c7879cb69d1dd9f1ba7d78f61428dd8cbba6d364c844472aeb22582d8d836a44a5ca9fb37a04d51e SHA512 ae83dc566924d70e157954c50c082d13d358cd398eb92d5c85208b5cf9bef2f6dcb08024adaecd1c5368cdd56dbab5e8391162707fbdbd9123c0509b352614dd MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b diff --git a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild index 5b88eba38a21..05ab2a211692 100644 --- a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild +++ b/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild @@ -9,7 +9,9 @@ SRC_URI="" LICENSE="metapackage" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +if [[ ${PV} != 9999 ]]; then + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +fi IUSE_INPUT_DEVICES=" input_devices_elographics diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild index 5b7d51f4782e..bdc159ab2476 100644 --- a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild +++ b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild @@ -9,7 +9,9 @@ SRC_URI="" LICENSE="metapackage" SLOT="0" -KEYWORDS="" +if [[ ${PV} != 9999 ]]; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +fi IUSE_INPUT_DEVICES=" input_devices_elographics diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest index 1c7915738d1f..ef4ac9c00de8 100644 --- a/x11-base/xorg-proto/Manifest +++ b/x11-base/xorg-proto/Manifest @@ -1,6 +1,4 @@ -DIST xorgproto-2018.4.tar.gz 493597 BLAKE2B f25a637317ff2d7ba34d416368261b5afb617e42a1fb642cc78ab3e877752a81291fe0523d1af6cd0fe27399676b14a70ceea7178d521187423bb503c9b1c63b SHA512 f79a47fc3de04d7258769869c11e99eff7fa4a4b5925cf60f9f7579f946d7d0e737224e9a54d18e439a3586126e66e0764c0f09ed50987c781955b9b9a1e0362 DIST xorgproto-2019.1.tar.gz 1119813 BLAKE2B eed29e0e236cc448b2ff220a844c68f69b0d1d2d7cfb4e82219731bbedadfc9352cf894ce8ba3c2a9f7dd1689a46be0a9ed4b0d061c661b752b0e81ef1057f27 SHA512 7d3a5b24cf5c5ff78c63f61b7e4e2fe6f8b6ca64c345422a1943688af8dccd621cf22833035ee632d37ebb96bf4864d1c18a8015373d69e734299cccb481615a -EBUILD xorg-proto-2018.4.ebuild 1843 BLAKE2B 7ac6c1ef845ac38bc53316cf16ed63fb2a0db71fc1e63c96e412324bfdc98fea34209ab7ecc4d75ea78c51cd734558c1af6a22ed1a0f62aada5662b791352e88 SHA512 b3bfc81d6b81dc882f26d4baa8d83963cf44e1ea9e8a638c87c13273c86a800906557d5d42bddb225a6a2905abfd588251222a89a7634f606d920afd305196f6 -EBUILD xorg-proto-2019.1.ebuild 1845 BLAKE2B c385978e6baf6b4856972020c4a1f24224bcbd7b31228197a2bbdf238240efacbc94255e5525a86f883a1d604c92ee199918de6d1c2c49bd74003b47b84983b7 SHA512 cb1f91e636b897e54f41aad38a6fae5a06507d90d7038644b833d1cce1cef4b35548bb40d108349d4c3d1706791f4e7cc355444f1eea9d8dfe543fe1309e1bbc +EBUILD xorg-proto-2019.1.ebuild 1843 BLAKE2B 86e3aca0861e8636bf58cce7c5dbe944477c37a7eb89a71a8f032d9c4e72b9a382cb8c228c2e13cac55f8bc235f078bb733db517648c25142e917e81806882aa SHA512 5c2e4603f94f3435bf0e7dba374bb3d35dc79cd0da3c4b350c58c4903fb616d38535265a42d8b5580c60f15e5212a4478a46dc5b7c19cb79b37c5fe9935dfe02 EBUILD xorg-proto-9999.ebuild 1854 BLAKE2B 49f6dbf2a63f3c67dd5c81fe4bbcddf545e8cce801dae7757e7ef093f0292ece21ab6fc0dcf88b1c8926657c8d69c1f6d799c2cfd9a0527c48d363ab66dd6cec SHA512 43d0d0e9dfa1a57d4212ed4de9a02b2df7a6e071d37a575b3fc41cab49376856c11721940281ef77506b96f262a4956ecceddbb9942ef0f4310902cbf94f35e4 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 diff --git a/x11-base/xorg-proto/xorg-proto-2018.4.ebuild b/x11-base/xorg-proto/xorg-proto-2018.4.ebuild deleted file mode 100644 index 581f897fdb2b..000000000000 --- a/x11-base/xorg-proto/xorg-proto-2018.4.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="${PN/xorg-/xorg}" -MY_P="${MY_PN}-${PV}" - -EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/${MY_PN}.git" - -if [[ ${PV} = 9999* ]]; then - GIT_ECLASS="git-r3" -fi - -inherit ${GIT_ECLASS} meson - -DESCRIPTION="X.Org combined protocol headers" -HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto" -if [[ ${PV} = 9999* ]]; then - SRC_URI="" -else - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" - SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz" - S="${WORKDIR}/${MY_P}" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND=" - !/dev/null; then start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \ ${mypidfile:+--pidfile} ${mypidfile} \ ${myname:+--name} ${myname} diff --git a/x11-base/xorg-server/xorg-server-1.20.4.ebuild b/x11-base/xorg-server/xorg-server-1.20.4.ebuild deleted file mode 100644 index 09900780117f..000000000000 --- a/x11-base/xorg-server/xorg-server-1.20.4.ebuild +++ /dev/null @@ -1,227 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -XORG_DOC=doc -XORG_EAUTORECONF="yes" -inherit xorg-3 multilib flag-o-matic -EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" - -DESCRIPTION="X.Org X servers" -SLOT="0/${PV}" -if [[ ${PV} != 9999* ]]; then - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -fi - -IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity" - -CDEPEND=">=app-eselect/eselect-opengl-1.3.0 - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - >=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.89 - >=x11-libs/libpciaccess-0.12.901 - >=x11-libs/libXau-1.0.4 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXfont2-2.0.1 - >=x11-libs/libxkbfile-1.0.4 - >=x11-libs/libxshmfence-1.1 - >=x11-libs/pixman-0.27.2 - >=x11-libs/xtrans-1.3.5 - >=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[X,egl(+)] - >=media-libs/mesa-18[egl,gbm] - !x11-libs/glamor - ) - kdrive? ( - >=x11-libs/libXext-1.0.5 - x11-libs/libXv - ) - xephyr? ( - x11-libs/libxcb[xkb] - x11-libs/xcb-util - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - ) - !minimal? ( - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXext-1.0.5 - >=media-libs/mesa-18 - ) - udev? ( virtual/libudev:= ) - unwind? ( sys-libs/libunwind ) - wayland? ( - >=dev-libs/wayland-1.3.0 - media-libs/libepoxy[egl(+)] - >=dev-libs/wayland-protocols-1.1 - ) - >=x11-apps/xinit-1.3.3-r1 - systemd? ( - sys-apps/dbus - sys-apps/systemd - ) - elogind? ( - sys-apps/dbus - sys-auth/elogind - sys-auth/pambase[elogind] - ) - " - -DEPEND="${CDEPEND} - sys-devel/flex - >=x11-base/xorg-proto-2018.3 - dmx? ( - doc? ( - || ( - www-client/links - www-client/lynx - www-client/w3m - ) - ) - )" - -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-xserver ) - !x11-drivers/xf86-video-modesetting -" - -PDEPEND=" - xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" - -REQUIRED_USE="!minimal? ( - || ( ${IUSE_SERVERS} ) - ) - elogind? ( udev ) - ?? ( elogind systemd ) - minimal? ( !glamor !wayland ) - xephyr? ( kdrive )" - -UPSTREAMED_PATCHES=( - "${FILESDIR}"/${P}-shm-reindent-shm_tmpfile-to-follow-our-standards.patch - "${FILESDIR}"/${P}-shm-Pick-the-shm-dir-at-run-time-not-build-time.patch - "${FILESDIR}"/${P}-shm-Use-memfd_create-when-possible.patch -) - -PATCHES=( - "${UPSTREAMED_PATCHES[@]}" - "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch - # needed for new eselect-opengl, bug #541232 - "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch -) - -pkg_setup() { - if use wayland && ! use glamor; then - ewarn "glamor is necessary for acceleration under Xwayland." - ewarn "Performance may be unacceptable without it." - fi - - # 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 debug) - $(use_enable dmx) - $(use_enable glamor) - $(use_enable kdrive) - $(use_enable unwind libunwind) - $(use_enable wayland xwayland) - $(use_enable !minimal record) - $(use_enable !minimal xfree86-utils) - $(use_enable !minimal dri) - $(use_enable !minimal dri2) - $(use_enable !minimal dri3) - $(use_enable !minimal glx) - $(use_enable xcsecurity) - $(use_enable xephyr) - $(use_enable xnest) - $(use_enable xorg) - $(use_enable xvfb) - $(use_enable udev config-udev) - $(use_with doc doxygen) - $(use_with doc xmlto) - $(usex !elogind $(use_enable systemd systemd-logind) '--enable-systemd-logind') - $(use_with systemd systemd-daemon) - $(usex suid $(use_enable systemd suid-wrapper) '--disable-suid-wrapper') - $(usex suid $(use_enable !systemd install-setuid) '--disable-install-setuid') - --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 - ) -} - -src_install() { - xorg-3_src_install - - server_based_install - - if ! use minimal && use xorg; then - # Install xorg.conf.example into docs - dodoc "${S}"/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 - - find "${ED}"/var -type d -empty -delete || die -} - -pkg_postinst() { - if ! use minimal; then - # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) - eselect opengl set xorg-x11 --use-old - 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 -} - -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 -} diff --git a/x11-base/xorg-server/xorg-server-1.20.5.ebuild b/x11-base/xorg-server/xorg-server-1.20.5.ebuild index 2a418db64eb5..24aef3bd190b 100644 --- a/x11-base/xorg-server/xorg-server-1.20.5.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.5.ebuild @@ -11,7 +11,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" DESCRIPTION="X.Org X servers" SLOT="0/${PV}" if [[ ${PV} != 9999* ]]; then - KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" fi IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -- cgit v1.2.3