X-Git-Url: http://git.draconx.ca/gitweb/gentoo-fixes.git/blobdiff_plain/3662abe6a457c01384c59fabb46786c220248630:/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild..c5ad4e57246dc176a4dcfd91aae7de08b48d4148:/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild

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