Bump for 7.0RC4.

(Portage version: 2.1_pre1)

4 files changed, 135 insertions, 9 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 76c0d4014dae..46c94f81e7ea 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.496 2005/12/16 22:47:11 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.497 2005/12/18 20:02:31 joshuabaergen Exp $
+
+*xorg-x11-7.0.0_rc4 (18 Dec 2005)
+
+  18 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xorg-x11-7.0.0_rc4.ebuild:
+  Bump for 7.0RC4.
 
   16 Dec 2005; Stephen P. Becker <geoman@gentoo.org>
   xorg-x11-7.0.0_rc3-r1.ebuild:
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 7f1870bc9845..413485efe0f5 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,12 +1,14 @@
-MD5 2e954169d7027d6cdb742eea5ef2b1c7 xorg-x11-6.8.2-r4.ebuild 55086
-MD5 3d68301ad06af39bfd4ab92387e1518b xorg-x11-6.8.2-r6.ebuild 55191
-MD5 e579682131797f70d4ab4f4c88147566 xorg-x11-6.8.99.15-r4.ebuild 54164
-MD5 3378ccca638510440bf947351122923b xorg-x11-7.0.0_rc3.ebuild 3629
-MD5 72c63519f5c6520d4202c60c6af9bfda xorg-x11-7.0.0_rc3-r1.ebuild 3658
-MD5 5ea559a2a269f54538d2437aa64eecb1 ChangeLog 111846
-MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xorg-x11-7.0.0_rc3 0
+MD5 0606955d92ce98d4340cb92c26c62a20 ChangeLog 111988
 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_rc3 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xorg-x11-7.0.0_rc3-r1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xorg-x11-7.0.0_rc4 0
+MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
+MD5 2e954169d7027d6cdb742eea5ef2b1c7 xorg-x11-6.8.2-r4.ebuild 55086
+MD5 3d68301ad06af39bfd4ab92387e1518b xorg-x11-6.8.2-r6.ebuild 55191
+MD5 e579682131797f70d4ab4f4c88147566 xorg-x11-6.8.99.15-r4.ebuild 54164
+MD5 72c63519f5c6520d4202c60c6af9bfda xorg-x11-7.0.0_rc3-r1.ebuild 3658
+MD5 3378ccca638510440bf947351122923b xorg-x11-7.0.0_rc3.ebuild 3629
+MD5 4458f637cdcce3c258050ca978715f25 xorg-x11-7.0.0_rc4.ebuild 3582
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-7.0.0_rc4 b/x11-base/xorg-x11/files/digest-xorg-x11-7.0.0_rc4
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/x11-base/xorg-x11/files/digest-xorg-x11-7.0.0_rc4
diff --git a/x11-base/xorg-x11/xorg-x11-7.0.0_rc4.ebuild b/x11-base/xorg-x11/xorg-x11-7.0.0_rc4.ebuild
new file mode 100644
index 000000000000..521c8c1421e8
--- /dev/null
+++ b/x11-base/xorg-x11/xorg-x11-7.0.0_rc4.ebuild
@@ -0,0 +1,118 @@
+# 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_rc4.ebuild,v 1.1 2005/12/18 20:02:31 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 ~ppc ~sparc ~x86"
+IUSE="xprint"
+
+# Collision protect will scream bloody murder if we install over old versions
+RDEPEND="!<=x11-base/xorg-x11-6.9"
+
+# Server
+RDEPEND="${RDEPEND}
+	>=x11-base/xorg-server-1.0.0"
+
+# Common Applications
+RDEPEND="${RDEPEND}
+	>=x11-apps/mesa-progs-6.4.1
+	>=x11-apps/setxkbmap-1
+	>=x11-apps/xauth-1
+	>=x11-apps/xhost-1
+	>=x11-apps/xinit-1
+	>=x11-apps/xmodmap-1
+	>=x11-apps/xrandr-1"
+
+# Common Libraries - move these to eclass eventually
+RDEPEND="${RDEPEND}
+	>=x11-libs/libSM-1
+	>=x11-libs/libXcomposite-0.2.2.2
+	>=x11-libs/libXcursor-1.1.5.2
+	>=x11-libs/libXdamage-1.0.2.2
+	>=x11-libs/libXfixes-3.0.1.2
+	>=x11-libs/libXv-1
+	>=x11-libs/libXxf86dga-1
+	>=x11-libs/libXinerama-1
+	>=x11-libs/libXScrnSaver-1
+	xprint? ( >=x11-libs/libXp-1 )"
+
+# Some fonts
+RDEPEND="${RDEPEND}
+	>=media-fonts/font-bh-ttf-1
+	>=media-fonts/font-adobe-utopia-type1-1
+	>=media-fonts/font-bitstream-type1-1"
+
+DEPEND="${RDEPEND}"
+
+src_install() {
+	# Make /usr/X11R6 a symlink to ../usr.
+	dodir /usr
+	dosym ../usr /usr/X11R6
+}
+
+pkg_preinst() {
+	# Check for /usr/X11R6 -> /usr symlink
+	if [[ -e "/usr/X11R6" ]] &&
+		[[ $(readlink "/usr/X11R6") != "../usr" ]]; then
+			eerror "/usr/X11R6 isn't a symlink to ../usr. Please delete it."
+			ewarn "First, save a list of all the packages installing there:"
+			ewarn "		equery belongs /usr/X11R6 > usr-x11r6-packages"
+			ewarn "This requires gentoolkit to be installed."
+			die "/usr/X11R6 is not a symlink to ../usr."
+	fi
+
+	# Filter out ModulePath line since it often holds a now-invalid path
+	# Bug #112924
+	# For RC3 - filter out RgbPath line since it also seems to break things
+	XORGCONF="/etc/X11/xorg.conf"
+	if [ -e ${XORGCONF} ]; then
+		mkdir -p "${IMAGE}/etc/X11"
+		sed "/ModulePath/d" ${XORGCONF}	> ${IMAGE}${XORGCONF}
+		sed -i "/RgbPath/d" ${IMAGE}${XORGCONF}
+	fi
+}
+
+pkg_postinst() {
+	# I'm not sure why this was added, but we don't inherit x-modular
+	# 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
+}