From: Nick Bowler Date: Sat, 19 May 2018 21:31:28 +0000 (-0400) Subject: xorg-x11: Bump to match latest upstream. X-Git-Url: http://git.draconx.ca/gitweb/gentoo-fixes.git/commitdiff_plain/c5ad4e57246dc176a4dcfd91aae7de08b48d4148 xorg-x11: Bump to match latest upstream. --- diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest index 6ac8153..26c8fdb 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,2 +1,2 @@ -EBUILD xorg-x11-7.4-r2.ebuild 3880 SHA256 36bad60b212e4a0f859008e230250b2d5f060a3e93e660e0c5655217e245558d SHA512 0cdba48bfb2a851874e53bb3b410b150ea48d13fe49352396ed284880613e10a9c7c633d93aa0f5def94f8f47007faaba23cd2b48393d77b868f2ce3632545ce WHIRLPOOL 6b89e6ac434db3b38c50c0b5119002793714774628e6eda902307cf067e2c6491658b869f990e3fdb88cff4d4eeb590054975e2bc9a8086b1844f17dfe5d6a59 -MISC metadata.xml 233 SHA256 efc76379fa583a568350d52a864d9f0003346a91928487afb3de419514c3a337 SHA512 a06995e9f52455988091f273b40be5bbfa56c864d45f5fe73f731f0aaa9a317804305bd87c36eaa39ffd6b6d096c1fc54559221a0e11fa56ac2f01e0b959e12e WHIRLPOOL 7893ebd8f64b4e8019dfd9e9d730b173315755b19a914d5677e1ba5534efcca3551d47f91775a9c67d0a86c67e7a3bd063830ed3615c6f7a942391f34918a759 +EBUILD xorg-x11-7.4-r3.ebuild 3726 BLAKE2B 2ea33df5d00ad4ec7f0da1b71084fe593a411ff1f52ff088248112f50c8a316227b105cbf4163a4a3ab1d09cdda6f5500ebb20e2cb92271c8cd14d9b886e2067 SHA512 92b0056b981f45490fb555780b5c080ea4c52276f7c943cc021a9b52fe5f8e68d0545236f690063ef01829afe57f539791a77915041dac4c21e5caa5bfba8a97 +MISC metadata.xml 233 BLAKE2B 275dfed53b44f8c976a9b718cfbdb421c28ad80097e632173f27a3400ce32f2eaf7f686929b486626b9aa23afa40cd49f61b975a3876a8e61e1577c3c1db9405 SHA512 a06995e9f52455988091f273b40be5bbfa56c864d45f5fe73f731f0aaa9a317804305bd87c36eaa39ffd6b6d096c1fc54559221a0e11fa56ac2f01e0b959e12e diff --git a/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild b/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild similarity index 52% rename from x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild rename to x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild index d8ca84b..dc8b3b1 100644 --- a/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild +++ b/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild @@ -1,16 +1,14 @@ -# Copyright © 2014,2017 Nick Bowler +# Copyright © 2014,2017-2018 Nick Bowler # License GPLv2+: GNU General Public License version 2 or later. # There is NO WARRANTY, to the extent permitted by law. # # This a modified version of the original ebuild from Gentoo GNU/Linux, # covered by the following copyright and permission notice: # -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="2" - -inherit eutils +EAPI=6 DESCRIPTION="An X11 implementation maintained by the X.Org Foundation (meta package)" HOMEPAGE="https://www.x.org/wiki/" @@ -18,7 +16,9 @@ HOMEPAGE="https://www.x.org/wiki/" LICENSE="metapackage" SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="bh-fonts" +IUSE="+fonts bh-fonts" + +REQUIRED_USE="bh-fonts? ( fonts )" # Server RDEPEND="${RDEPEND} @@ -37,7 +37,7 @@ RDEPEND="${RDEPEND} x11-apps/smproxy x11-apps/x11perf x11-apps/xauth - x11-apps/xbacklight + || ( x11-apps/xbacklight sys-power/acpilight ) x11-apps/xcmsdb x11-apps/xcursorgen x11-apps/xdpyinfo @@ -81,80 +81,69 @@ RDEPEND="${RDEPEND} # Fonts RDEPEND="${RDEPEND} - media-fonts/font-adobe-100dpi - media-fonts/font-adobe-75dpi - media-fonts/font-adobe-utopia-100dpi - media-fonts/font-adobe-utopia-75dpi - media-fonts/font-adobe-utopia-type1 - media-fonts/font-alias - media-fonts/font-arabic-misc - bh-fonts? ( - media-fonts/font-bh-100dpi - media-fonts/font-bh-75dpi - media-fonts/font-bh-lucidatypewriter-100dpi - media-fonts/font-bh-lucidatypewriter-75dpi - media-fonts/font-bh-ttf - media-fonts/font-bh-type1 - ) - media-fonts/font-bitstream-100dpi - media-fonts/font-bitstream-75dpi - media-fonts/font-bitstream-speedo - media-fonts/font-bitstream-type1 - media-fonts/font-cronyx-cyrillic - media-fonts/font-cursor-misc - media-fonts/font-daewoo-misc - media-fonts/font-dec-misc - media-fonts/font-ibm-type1 - media-fonts/font-isas-misc - media-fonts/font-jis-misc - media-fonts/font-micro-misc - media-fonts/font-misc-cyrillic - media-fonts/font-misc-ethiopic - media-fonts/font-misc-meltho - media-fonts/font-misc-misc - media-fonts/font-mutt-misc - media-fonts/font-schumacher-misc - media-fonts/font-screen-cyrillic - media-fonts/font-sony-misc - media-fonts/font-sun-misc - media-fonts/font-util - media-fonts/font-winitzki-cyrillic - media-fonts/font-xfree86-type1 + fonts? ( + media-fonts/font-adobe-100dpi + media-fonts/font-adobe-75dpi + media-fonts/font-adobe-utopia-100dpi + media-fonts/font-adobe-utopia-75dpi + media-fonts/font-adobe-utopia-type1 + media-fonts/font-alias + media-fonts/font-arabic-misc + bh-fonts? ( + media-fonts/font-bh-100dpi + media-fonts/font-bh-75dpi + media-fonts/font-bh-lucidatypewriter-100dpi + media-fonts/font-bh-lucidatypewriter-75dpi + media-fonts/font-bh-ttf + media-fonts/font-bh-type1 + ) + media-fonts/font-bitstream-100dpi + media-fonts/font-bitstream-75dpi + media-fonts/font-bitstream-speedo + media-fonts/font-bitstream-type1 + media-fonts/font-cronyx-cyrillic + media-fonts/font-cursor-misc + media-fonts/font-daewoo-misc + media-fonts/font-dec-misc + media-fonts/font-ibm-type1 + media-fonts/font-isas-misc + media-fonts/font-jis-misc + media-fonts/font-micro-misc + media-fonts/font-misc-cyrillic + media-fonts/font-misc-ethiopic + media-fonts/font-misc-meltho + media-fonts/font-misc-misc + media-fonts/font-mutt-misc + media-fonts/font-schumacher-misc + media-fonts/font-screen-cyrillic + media-fonts/font-sony-misc + media-fonts/font-sun-misc + media-fonts/font-util + media-fonts/font-winitzki-cyrillic + media-fonts/font-xfree86-type1 - media-fonts/font-alias - media-fonts/font-util - media-fonts/encodings + media-fonts/font-alias + media-fonts/font-util + media-fonts/encodings + ) " DEPEND="${RDEPEND}" -pkg_preinst() { - # Save xorg.conf because of bug #278268 - if [[ -f "${ROOT}etc/X11/xorg.conf" ]]; then - cp "${ROOT}etc/X11/xorg.conf" "${T}" - fi -} - pkg_postinst() { - # Restore saved xorg.conf - if [[ -f "${T}/xorg.conf" ]]; then - cp "${T}/xorg.conf" "${ROOT}etc/X11/xorg.conf" - fi - elog - elog "Please note that the xcursors are in ${ROOT}usr/share/cursors/${PN}." + elog "Please note that the xcursors are in ${EROOT%/}/usr/share/cursors/${PN}." elog "Any custom cursor sets should be placed in that directory." elog elog "If you wish to set system-wide default cursors, please create" - elog "${ROOT}usr/local/share/cursors/${PN}/default/index.theme" + elog "${EROOT%/}/usr/local/share/cursors/${PN}/default/index.theme" elog "with content: \"Inherits=theme_name\" so that future" elog "emerges will not overwrite those settings." elog elog "Listening on TCP is disabled by default with startx." - elog "To enable it, edit ${ROOT}usr/bin/startx." + elog "To enable it, edit ${EROOT%/}/usr/bin/startx." elog - # (#76985) elog "Visit https://wiki.gentoo.org/wiki/Category:X.Org" elog "for more information on configuring X." elog