Remove xsetmode from meta-deps.

Package-Manager: portage-2.2.0_alpha100_p10/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 168 insertions, 17 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index bd0bff369324..2482bc21f82b 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.622 2012/01/01 22:08:11 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.623 2012/04/22 07:34:11 mgorny Exp $
+
+*xorg-x11-7.4-r2 (22 Apr 2012)
+
+  22 Apr 2012; Michał Górny <mgorny@gentoo.org> +xorg-x11-7.4-r2.ebuild:
+  Remove xsetmode from meta-deps.
 
   01 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> +ChangeLog-2005:
   Split ChangeLog.
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 221a6bcdb633..83c16007772c 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,24 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 EBUILD xorg-x11-7.4-r1.ebuild 3674 RMD160 b9ec65d3d1f30e6342ed4e2bf87154e4a13d1838 SHA1 a5d82478b179920bc57919575498b144a86ba72e SHA256 5e9309fc4bcb1a7a6c4a6ae17e9e709716368119366c42deb182db2e38d9de8f
-MISC ChangeLog 17960 RMD160 68eab54ece8dc729817ac0671afd7865a6c30ab5 SHA1 c3c154723fc3de1cb187049264557b6fb90f6799 SHA256 6e21f841d097b5f273522ec2342b1de8da81492adaa227d3aac8abc6d53802bb
+EBUILD xorg-x11-7.4-r2.ebuild 3655 RMD160 6d395c04c479998f539a29975ed3cabc3c5fd3b4 SHA1 935fde803a8910b2b7a7489e57fb65684c3565a5 SHA256 78e5e7d70510a3005ce69b9a565613d2fb39f3359168a10973cbd120adbd0251
+MISC ChangeLog 18099 RMD160 e6ba0ef93faf2d5d0b78eff98cec8e596a43f4e6 SHA1 73b402aec49ead0e93bd4c46c6ba5bb07cba7375 SHA256 7f587ee92a53184ff1eb58210ccb7bae6457fbe19301be98f62837006d187fb3
 MISC ChangeLog-2005 112755 RMD160 0041fc93985e62ee7b74cca15465f63cb342b2eb SHA1 54838cac302d8133d7cce2f66fab9ac5bcabc906 SHA256 99fa41385441d093a976da579ef62d816f636660cf5e1936ae885f6099746b75
 MISC metadata.xml 230 RMD160 a293db25b0a2b203eb1b788ee62601190618066e SHA1 c54cfbf65124c6abed943e76d0e3e6c976fc4f12 SHA256 92ca18d8e0533e35b2537904c3d02051148894ef05496a26db29fecc0066a6e0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPANnGAAoJEEb+UGWnxTyHDBQP/AzXeOIQ+emF1vytBiELCFNX
-6EV9MSYEf7gjym7c5HEdUJ2S6h5Oy+ZwdLKHCF2UokJB9SitvIaqcY4gUHCaMVI3
-jH9rx5SDMvqTUg7D9F2+eV8igAAUDsxuWhq8yhP2iK7J2/MhP1VBWTCQvC8jeG8d
-sSy3xdGmkLgHlerWYhsyefQOWj20lA1eKZqUQWIzgbhbRW1G/NOUACSvVN2ytXIB
-NM/tzqZehKHEKku/JYct8jYTIlVagdgUTO3FJQlCAeK/Z5P8G1oql/f+V3gO0Hee
-+RJq/f5RhTx9Q0d5VwwnTn2xviq/EJpD8+atBcTyHBf7MFOOgMHFvjvOOtTvqAqu
-fB5ftNU4rbo0ZA6z04/AmMetCZjVqwnz36BlIF4XtvZeKUu9AcGJ7TDMg7vStaox
-OLnCt10Eu+bYsCfl9pbnxammybSWNXjvk64sid8sdDCxncnaEfEz0BOHdjmQ/2q7
-EzhIDB8iqDUtt2uay7qi6GNTzsTULNe5LVNa0oJeJwRPrnej2FY7W6YikaUh2CkS
-2cWpXKUMw+7PYrZmFKSnZOXmYc9DTLah23BvwRy9j7VLTerGEwpn2w7qzitqWrvA
-mVbHAUcGObzSMbkEEOXeVqkxRs/FqCb0o35isr/HAdxmZlLzAJ4ou4a2u2h2Zpjc
-2WIqnhN7zYMeiy8qIAbP
-=Xc5x
+iJwEAQEIAAYFAk+TtKAACgkQfXuS5UK5QB2nRAP+Ol2/7oz9rYWvSlaIw61KjXeJ
+mQe7XL3JxhJoXXYsAvuIxPI4ubCRkH2wFtdV9qmeD9ImNxxf4NTYFlkKcxzMGlV7
+r+anV+lL/0mAD8R6TbxCDQKMvm/wm2yDnFlpOm2PIJzRxQDlhIZlT0K/SjusIKbs
+/bM9ifUq3xn/FOk5GkI=
+=0m8v
 -----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild b/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild
new file mode 100644
index 000000000000..d3988ebda8f8
--- /dev/null
+++ b/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild,v 1.1 2012/04/22 07:34:11 mgorny Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="An X11 implementation maintained by the X.Org Foundation (meta package)"
+HOMEPAGE="http://xorg.freedesktop.org"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~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 http://www.gentoo.org/doc/en/index.xml?catid=desktop"
+	elog "for more information on configuring X."
+	elog
+}