Everyone on modular should use the newer ebuild.

(Portage version: 2.1_pre4-r1)

3 files changed, 4 insertions, 124 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index e64d953d0898..36502f949bf1 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.521 2006/02/09 22:24:41 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.522 2006/02/17 04:51:32 spyderous Exp $
+
+  17 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; -xorg-x11-7.0.ebuild:
+  Everyone on modular should use the newer ebuild.
 
   07 Feb 2006; Aron Griffis <agriffis@gentoo.org> xorg-x11-6.8.2-r6.ebuild:
   Mark 6.8.2-r6 stable on alpha
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-7.0 b/x11-base/xorg-x11/files/digest-xorg-x11-7.0
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/x11-base/xorg-x11/files/digest-xorg-x11-7.0
+++ /dev/null
diff --git a/x11-base/xorg-x11/xorg-x11-7.0.ebuild b/x11-base/xorg-x11/xorg-x11-7.0.ebuild
deleted file mode 100644
index 62e42d98b965..000000000000
--- a/x11-base/xorg-x11/xorg-x11-7.0.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.4 2006/01/10 05:59:06 spyderous 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 ~arm ~hppa ~ia64 ~mips ~ppc ~sh ~sparc ~x86"
-IUSE="3dfx 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.1"
-
-# Common Applications
-RDEPEND="${RDEPEND}
-	>=x11-apps/mesa-progs-6.4.1
-	>=x11-apps/setxkbmap-1.0.1
-	>=x11-apps/xauth-1.0.1
-	>=x11-apps/xhost-1
-	>=x11-apps/xinit-1.0.1
-	>=x11-apps/xmodmap-1
-	>=x11-apps/xrandr-1.0.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.0.1
-	>=x11-libs/libXxf86dga-1
-	>=x11-libs/libXinerama-1.0.1
-	>=x11-libs/libXScrnSaver-1.0.1
-	xprint? ( >=x11-libs/libXp-1 )
-	3dfx? ( >=media-libs/glide-v3-3.10 )"
-
-# Some fonts
-RDEPEND="${RDEPEND}
-	>=media-fonts/font-bh-ttf-1
-	>=media-fonts/font-adobe-utopia-type1-1.0.1
-	>=media-fonts/font-bitstream-type1-1"
-
-# Documentation
-RDEPEND="${RDEPEND}
-	>=app-doc/xorg-docs-1.0.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://www.gentoo.org/proj/en/desktop/x/x11/modular-x-howto.xml"
-	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
-}