gentoo resync : 11.05.2018

4 files changed, 144 insertions, 154 deletions

diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index e872382f9abb..0e81d6d873ea 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,2 +1,2 @@
-EBUILD xorg-x11-7.4-r2.ebuild 3552 BLAKE2B 62c82494ed3fffa9fa00491b4581fd45d506e0b5496bd814d0624aaffc5e476e21454f19e4d7d91a658867fa01148e8b418901488bf62b5d03dc9cec175ec39b SHA512 7347903377e36252b7bb306b3aa8027ee3892a04f3bfca280f8842888601707b526d96ed340fcff434ed8335e1fd0ea776e20b646bdff5a6841ab596c022bed1
-MISC metadata.xml 304 BLAKE2B e3c575d40eade3124105d9e047e2487f02aa8739dd9192a1cc3997905157687b9995f4272fbf4a25e68424c2aae0a82ab8d057022849248636e50e560a374e86 SHA512 23ae82fc7cc9613c7e27dad6461cdcb5098981b67b7b3179de464af1ceeac08efb4dab11c2d578af542e933a77d51ca3f69427ff216d276f92e66d5bab1ae763
+EBUILD xorg-x11-7.4-r3.ebuild 3354 BLAKE2B dfdb3bfd48d040efe82cdeb5e4bd1827d2a1b8364575a3f9c20147d6bcce35b064cb1edf635db9d9026604e3430bd9af224819ad72cf2c5708aa4957b8cb00a5 SHA512 340be90c77b036eed737d222d43a7fec46784591ce4474650df3e27143d37f3edac085a8cbc7e8edaf97cbe461199c2c960c1ebf44846d8af9af4a3e9bba2cd5
+MISC metadata.xml 369 BLAKE2B 36a4c5573e4280020ac40830cae3056197c2eda56c3161265c163a82d18337da4a2efbfaf7dbd08c76f6231c40a19669e1785b84ce6c89ab5bbc2fbb9b2a1970 SHA512 d0aadbeb8260987c487e28e74ec895b5012c23b8422a12d629444ee54afbe8c266ccba1286e5b1b21366a97b4255ae8724148dcf58eefc3e966fdb382e11d467
diff --git a/x11-base/xorg-x11/metadata.xml b/x11-base/xorg-x11/metadata.xml
index 61b88b3e701d..a0d9b5f6d24d 100644
--- a/x11-base/xorg-x11/metadata.xml
+++ b/x11-base/xorg-x11/metadata.xml
@@ -6,4 +6,7 @@
 	<name>X11</name>
 </maintainer>
 <longdescription>X11 implementation by X.Org Foundation</longdescription>
+<use>
+	<flag name="fonts">Install fonts from X.Org</flag>
+</use>
 </pkgmetadata>
diff --git a/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild b/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild
deleted file mode 100644
index c10948f48d8d..000000000000
--- a/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="An X11 implementation maintained by the X.Org Foundation (meta package)"
-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=""
-
-# Server
-RDEPEND="${RDEPEND}
-	x11-base/xorg-server[-minimal]"
-
-# Applications
-RDEPEND="${RDEPEND}
-	x11-apps/appres
-	x11-apps/bitmap
-	x11-apps/iceauth
-	x11-apps/luit
-	x11-apps/mkfontdir
-	x11-apps/mkfontscale
-	x11-apps/sessreg
-	x11-apps/setxkbmap
-	x11-apps/smproxy
-	x11-apps/x11perf
-	x11-apps/xauth
-	x11-apps/xbacklight
-	x11-apps/xcmsdb
-	x11-apps/xcursorgen
-	x11-apps/xdpyinfo
-	x11-apps/xdriinfo
-	x11-apps/xev
-	x11-apps/xf86dga
-	x11-apps/xgamma
-	x11-apps/xhost
-	x11-apps/xinput
-	x11-apps/xkbcomp
-	x11-apps/xkbevd
-	x11-apps/xkbutils
-	x11-apps/xkill
-	x11-apps/xlsatoms
-	x11-apps/xlsclients
-	x11-apps/xmodmap
-	x11-apps/xpr
-	x11-apps/xprop
-	x11-apps/xrandr
-	x11-apps/xrdb
-	x11-apps/xrefresh
-	x11-apps/xset
-	x11-apps/xsetroot
-	x11-apps/xvinfo
-	x11-apps/xwd
-	x11-apps/xwininfo
-	x11-apps/xwud
-	"
-
-# Data
-RDEPEND="${RDEPEND}
-	x11-misc/xbitmaps
-	x11-themes/xcursor-themes
-	"
-
-# Utilities
-RDEPEND="${RDEPEND}
-	x11-misc/makedepend
-	x11-misc/util-macros
-	"
-
-# 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
-	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
-	"
-
-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 "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 "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
-
-	# (#76985)
-	elog "Visit https://wiki.gentoo.org/wiki/Category:X.Org"
-	elog "for more information on configuring X."
-	elog
-}
diff --git a/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild b/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
new file mode 100644
index 000000000000..bc46011fc15a
--- /dev/null
+++ b/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="An X11 implementation maintained by the X.Org Foundation (meta package)"
+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="+fonts"
+
+# Server
+RDEPEND="${RDEPEND}
+	x11-base/xorg-server[-minimal]"
+
+# Applications
+RDEPEND="${RDEPEND}
+	x11-apps/appres
+	x11-apps/bitmap
+	x11-apps/iceauth
+	x11-apps/luit
+	x11-apps/mkfontdir
+	x11-apps/mkfontscale
+	x11-apps/sessreg
+	x11-apps/setxkbmap
+	x11-apps/smproxy
+	x11-apps/x11perf
+	x11-apps/xauth
+	|| ( x11-apps/xbacklight sys-power/acpilight )
+	x11-apps/xcmsdb
+	x11-apps/xcursorgen
+	x11-apps/xdpyinfo
+	x11-apps/xdriinfo
+	x11-apps/xev
+	x11-apps/xf86dga
+	x11-apps/xgamma
+	x11-apps/xhost
+	x11-apps/xinput
+	x11-apps/xkbcomp
+	x11-apps/xkbevd
+	x11-apps/xkbutils
+	x11-apps/xkill
+	x11-apps/xlsatoms
+	x11-apps/xlsclients
+	x11-apps/xmodmap
+	x11-apps/xpr
+	x11-apps/xprop
+	x11-apps/xrandr
+	x11-apps/xrdb
+	x11-apps/xrefresh
+	x11-apps/xset
+	x11-apps/xsetroot
+	x11-apps/xvinfo
+	x11-apps/xwd
+	x11-apps/xwininfo
+	x11-apps/xwud
+	"
+
+# Data
+RDEPEND="${RDEPEND}
+	x11-misc/xbitmaps
+	x11-themes/xcursor-themes
+	"
+
+# Utilities
+RDEPEND="${RDEPEND}
+	x11-misc/makedepend
+	x11-misc/util-macros
+	"
+
+# Fonts
+RDEPEND="${RDEPEND}
+	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
+		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
+	)
+	"
+
+DEPEND="${RDEPEND}"
+
+pkg_postinst() {
+	elog
+	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 "${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 ${EROOT%/}/usr/bin/startx."
+	elog
+
+	elog "Visit https://wiki.gentoo.org/wiki/Category:X.Org"
+	elog "for more information on configuring X."
+	elog
+}