From: Joshua Baergen <joshuabaergen@gentoo.org>
Date: Fri, 11 Nov 2005 20:12:03 +0000 (+0000)
Subject: Bump for 7.0RC2.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=341d873233cdcf64516e339594bdd9dd0e6f28b9;p=gentoo.git

Bump for 7.0RC2.
Package-Manager: portage-2.0.53_rc7
---

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index cdc4c400f6fe..2afa38dad3af 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.476 2005/11/10 01:10:37 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.477 2005/11/11 20:12:03 joshuabaergen Exp $
+
+*xorg-x11-7.0.0_rc2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xorg-x11-7.0.0_rc2.ebuild:
+  Bump for 7.0RC2.
 
   10 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
   xorg-x11-7.0.0_rc1.ebuild:
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index e039e60e854e..67e5ade00205 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,10 +1,12 @@
-MD5 9e336e956aa56f616113602d05fe755e ChangeLog 108632
+MD5 2c4855de18f8a4a90b5539562985e206 ChangeLog 108774
 MD5 84ed1084819731e2acef3610f0b6b30a files/digest-xorg-x11-6.8.2-r4 506
 MD5 a60034cf312e05f28a2da6b202d53e44 files/digest-xorg-x11-6.8.2-r6 504
 MD5 74c3f07657d69432f516175657c23ba0 files/digest-xorg-x11-6.8.99.15-r4 518
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xorg-x11-7.0.0_rc1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xorg-x11-7.0.0_rc2 0
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 MD5 aa1fdddf5e2240d1b9001668019c55a7 xorg-x11-6.8.2-r4.ebuild 55108
 MD5 8eecd782819774d2b23d36e37a2864f7 xorg-x11-6.8.2-r6.ebuild 55222
 MD5 38dbe8c5ae52c31df510280ef0b3187a xorg-x11-6.8.99.15-r4.ebuild 54183
 MD5 50e2282625e4cd6c7cf3bd0f89e734ee xorg-x11-7.0.0_rc1.ebuild 2765
+MD5 bbd4be9778968621e41efd8954ffa816 xorg-x11-7.0.0_rc2.ebuild 2765
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-7.0.0_rc2 b/x11-base/xorg-x11/files/digest-xorg-x11-7.0.0_rc2
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/x11-base/xorg-x11/xorg-x11-7.0.0_rc2.ebuild b/x11-base/xorg-x11/xorg-x11-7.0.0_rc2.ebuild
new file mode 100644
index 000000000000..e77f99cd51e4
--- /dev/null
+++ b/x11-base/xorg-x11/xorg-x11-7.0.0_rc2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2005 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.0.0_rc2.ebuild,v 1.1 2005/11/11 20:12:03 joshuabaergen Exp $
+
+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="~amd64 ~mips ~sparc ~x86"
+IUSE="xprint"
+
+# Collision protect will scream bloody murder if we install over old versions
+RDEPEND="!<x11-base/xorg-x11-7.0.0_rc0"
+
+# Server
+RDEPEND="${RDEPEND}
+	>=x11-base/xorg-server-0.99.3"
+
+# Common Applications
+RDEPEND="${RDEPEND}
+	>=x11-apps/setxkbmap-0.99.2
+	>=x11-apps/xauth-0.99.2
+	>=x11-apps/xhost-0.99.2
+	>=x11-apps/xinit-0.99.3
+	>=x11-apps/xmodmap-0.99.1
+	>=x11-apps/xrandr-0.99.1"
+
+# Common Libraries - move these to eclass eventually
+RDEPEND="${RDEPEND}
+	>=x11-libs/libSM-0.99.2
+	>=x11-libs/libXcomposite-0.2.2
+	>=x11-libs/libXcursor-1.1.5
+	>=x11-libs/libXdamage-1.0.2
+	>=x11-libs/libXfixes-3.0.1
+	>=x11-libs/libXv-0.99.1
+	>=x11-libs/libXxf86dga-0.99.2
+	>=x11-libs/libXinerama-0.99.1
+	>=x11-libs/libXScrnSaver-0.99.2
+	xprint? ( >=x11-libs/libXp-0.99.1 )"
+
+# Some fonts
+RDEPEND="${RDEPEND}
+	>=media-fonts/font-bh-ttf-0.99.0
+	>=media-fonts/font-adobe-utopia-type1-0.99.0
+	>=media-fonts/font-bitstream-type1-0.99.0"
+
+DEPEND="${RDEPEND}"
+
+# We need some checks for weird symlinks on migrate
+# /usr/lib/X11/xdm -> ../../../etc/X11/xdm
+
+pkg_postinst() {
+	x-modular_pkg_postinst
+
+	echo
+	einfo "Please note that the xcursors are in /usr/share/cursors/${PN}."
+	einfo "Any custom cursor sets should be placed in that directory."
+	echo
+	einfo "If you wish to set system-wide default cursors, please create"
+	einfo "/usr/local/share/cursors/${PN}/default/index.theme"
+	einfo "with content: \"Inherits=theme_name\" so that future"
+	einfo "emerges will not overwrite those settings."
+	echo
+	einfo "Listening on TCP is disabled by default with startx."
+	einfo "To enable it, edit /usr/bin/startx."
+	echo
+
+	ewarn "Please read the modular X migration guide at"
+	ewarn "http://dev.gentoo.org/~spyderous/xorg-x11/migrating_to_modular_x_howto.txt"
+	echo
+	einfo "If you encounter any non-configuration issues, please file a bug at"
+	einfo "http://bugs.gentoo.org/enter_bug.cgi?product=Gentoo%20Linux"
+	einfo "and attach /etc/X11/xorg.conf, /var/log/Xorg.0.log and emerge info"
+	echo
+	einfo "In the future, you will be able to affect which drivers are installed"
+	einfo "with the VIDEO_CARDS and INPUT_DEVICES settings."
+	echo
+
+	# (#76985)
+	einfo "Visit http://www.gentoo.org/doc/en/index.xml?catid=desktop"
+	einfo "for more information on configuring X."
+	echo
+
+	# Try to get people to read this, pending #11359
+	ebeep 5
+	epause 10
+}