Stop supporting Xorg 7.0.

(Portage version: 2.1.2)
 (Unsigned Manifest commit)

3 files changed, 4 insertions, 314 deletions

diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index bfa314041d58..d630aaef33a3 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 6.9.0-fix-rom-read-dualhead.patch 3245 RMD160 1cd7036604715b8d0caaeef0d77516fe244d02ef SHA1 ebececdee80fde617c80b26207dfc270185851a3 SHA256 e97d3cb6791caeb8538dfbacb2df39e236e1747c308e1322edd9c48f667a0ea9
 MD5 1a0bb4c5b887105f3232ab9a7706e7b4 files/6.9.0-fix-rom-read-dualhead.patch 3245
 RMD160 1cd7036604715b8d0caaeef0d77516fe244d02ef files/6.9.0-fix-rom-read-dualhead.patch 3245
@@ -35,18 +32,14 @@ EBUILD xorg-x11-6.9.0-r3.ebuild 61218 RMD160 a8a1e32069b972680d17333af3a2ac85319
 MD5 7858f704812383425b0fec24c6e8a041 xorg-x11-6.9.0-r3.ebuild 61218
 RMD160 a8a1e32069b972680d17333af3a2ac853192aeaa xorg-x11-6.9.0-r3.ebuild 61218
 SHA256 768968066a6ed8e1110d28610144dbae28f82f4b2262ddf8f6dbed256ad605f9 xorg-x11-6.9.0-r3.ebuild 61218
-EBUILD xorg-x11-7.0-r1.ebuild 9782 RMD160 1c0d15fa231dd8d30bf8e9cc3e5f75c59120ad81 SHA1 ddc92f5f718e020e5edf266c6de6698d23dd2168 SHA256 7c850fa6a4dd27632fe8d1264ae1e74c666940a98c5c208a8678c610fea6eeb4
-MD5 3fcf1d0360b3946b5e7bc6217989c96d xorg-x11-7.0-r1.ebuild 9782
-RMD160 1c0d15fa231dd8d30bf8e9cc3e5f75c59120ad81 xorg-x11-7.0-r1.ebuild 9782
-SHA256 7c850fa6a4dd27632fe8d1264ae1e74c666940a98c5c208a8678c610fea6eeb4 xorg-x11-7.0-r1.ebuild 9782
 EBUILD xorg-x11-7.1.ebuild 3839 RMD160 10fad8db34ec5dd3b05cd3674ebec6cd54be662a SHA1 20431a4e72a070633dd3fc5bc39a1a7f215166ec SHA256 fbaa02356fe8b86455a91dee98c98f3b8a9838c3d421a8a16d9bbc6dc4b5e0e7
 MD5 403830badf415ead887a0933ad19fedd xorg-x11-7.1.ebuild 3839
 RMD160 10fad8db34ec5dd3b05cd3674ebec6cd54be662a xorg-x11-7.1.ebuild 3839
 SHA256 fbaa02356fe8b86455a91dee98c98f3b8a9838c3d421a8a16d9bbc6dc4b5e0e7 xorg-x11-7.1.ebuild 3839
-MISC ChangeLog 124878 RMD160 0a605c5b1816272db1d3f3f5e17a25510ca621f9 SHA1 6eeac0c8e3db3ada44deba1bd2f6413e0f89d3f2 SHA256 6a6850ffb952363f89888b428c9d1745c3e4d13adbab70801569141fea30aca6
-MD5 d1a01d5798e6e80f7bab011d70a63cfe ChangeLog 124878
-RMD160 0a605c5b1816272db1d3f3f5e17a25510ca621f9 ChangeLog 124878
-SHA256 6a6850ffb952363f89888b428c9d1745c3e4d13adbab70801569141fea30aca6 ChangeLog 124878
+MISC ChangeLog 124989 RMD160 3098cf850bba57e0ef6c2c659539a2ca55ba1dd2 SHA1 eae3bc2a6e9ae366b4098d835e3bf31a3815ec0a SHA256 51ccd8fceec258c1f4dd5df34375fa96f2b45cefd7013527de3891c0458c66b9
+MD5 e78a7d68799751918fe910c7d74c3d78 ChangeLog 124989
+RMD160 3098cf850bba57e0ef6c2c659539a2ca55ba1dd2 ChangeLog 124989
+SHA256 51ccd8fceec258c1f4dd5df34375fa96f2b45cefd7013527de3891c0458c66b9 ChangeLog 124989
 MISC metadata.xml 230 RMD160 a293db25b0a2b203eb1b788ee62601190618066e SHA1 c54cfbf65124c6abed943e76d0e3e6c976fc4f12 SHA256 92ca18d8e0533e35b2537904c3d02051148894ef05496a26db29fecc0066a6e0
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 RMD160 a293db25b0a2b203eb1b788ee62601190618066e metadata.xml 230
@@ -57,16 +50,6 @@ SHA256 36f92eea9fd6b4345001fc67164120bcd885267f5ad1dbe81547ffe7230f2f28 files/di
 MD5 c3e8a36e06412232a60c8ea285357ece files/digest-xorg-x11-6.9.0-r3 1831
 RMD160 ab84a1d96a2f006310190681c711f8951c46db3c files/digest-xorg-x11-6.9.0-r3 1831
 SHA256 96bcf76fba399a75d943495aabed45e2c7ac7b5ccf511b5a1b4b7897e9928711 files/digest-xorg-x11-6.9.0-r3 1831
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xorg-x11-7.0-r1 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-xorg-x11-7.0-r1 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-xorg-x11-7.0-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xorg-x11-7.1 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-xorg-x11-7.1 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-xorg-x11-7.1 0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFVqHzamhnQswr0vIRAjesAJ9v301lfmwP+2glHy2SBpgN5AJxqQCfSmnF
-Nfa8Ze/chzI8P348g7h9XlE=
-=bcNL
------END PGP SIGNATURE-----
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-7.0-r1 b/x11-base/xorg-x11/files/digest-xorg-x11-7.0-r1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/x11-base/xorg-x11/files/digest-xorg-x11-7.0-r1
+++ /dev/null
diff --git a/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild b/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild
deleted file mode 100644
index 8276c7a456ee..000000000000
--- a/x11-base/xorg-x11/xorg-x11-7.0-r1.ebuild
+++ /dev/null
@@ -1,293 +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-r1.ebuild,v 1.33 2006/11/12 04:24:07 vapier 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="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 sh ~sparc x86 ~x86-fbsd"
-IUSE_INPUT_DEVICES="
-	input_devices_acecad
-	input_devices_aiptek
-	input_devices_calcomp
-	input_devices_citron
-	input_devices_digitaledge
-	input_devices_dmc
-	input_devices_dynapro
-	input_devices_elo2300
-	input_devices_elographics
-	input_devices_evdev
-	input_devices_fpit
-	input_devices_hyperpen
-	input_devices_jamstudio
-	input_devices_joystick
-	input_devices_keyboard
-	input_devices_magellan
-	input_devices_magictouch
-	input_devices_microtouch
-	input_devices_mouse
-	input_devices_mutouch
-	input_devices_palmax
-	input_devices_penmount
-	input_devices_spaceorb
-	input_devices_summa
-	input_devices_tek4957
-	input_devices_ur98
-	input_devices_vmmouse
-	input_devices_void
-
-	input_devices_synaptics
-	input_devices_wacom"
-IUSE_VIDEO_CARDS="
-	video_cards_apm
-	video_cards_ark
-	video_cards_chips
-	video_cards_cirrus
-	video_cards_cyrix
-	video_cards_dummy
-	video_cards_fbdev
-	video_cards_glint
-	video_cards_i128
-	video_cards_i740
-	video_cards_i810
-	video_cards_imstt
-	video_cards_mach64
-	video_cards_mga
-	video_cards_neomagic
-	video_cards_newport
-	video_cards_nsc
-	video_cards_nv
-	video_cards_r128
-	video_cards_radeon
-	video_cards_rendition
-	video_cards_s3
-	video_cards_s3virge
-	video_cards_savage
-	video_cards_siliconmotion
-	video_cards_sis
-	video_cards_sisusb
-	video_cards_sunbw2
-	video_cards_suncg14
-	video_cards_suncg3
-	video_cards_suncg6
-	video_cards_sunffb
-	video_cards_sunleo
-	video_cards_suntcx
-	video_cards_tdfx
-	video_cards_tga
-	video_cards_trident
-	video_cards_tseng
-	video_cards_v4l
-	video_cards_vesa
-	video_cards_vga
-	video_cards_via
-	video_cards_vmware
-	video_cards_voodoo
-
-	video_cards_nvidia
-	video_cards_fglrx"
-IUSE="${IUSE_VIDEO_CARDS}
-	${IUSE_INPUT_DEVICES}
-	3dfx"
-
-# 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/libXp-1
-	>=x11-libs/libXv-1.0.1
-	>=x11-libs/libXxf86dga-1
-	>=x11-libs/libXinerama-1.0.1
-	>=x11-libs/libXScrnSaver-1.0.1"
-
-# Some fonts
-RDEPEND="${RDEPEND}
-	media-fonts/ttf-bitstream-vera
-	>=media-fonts/font-bh-type1-1
-	>=media-fonts/font-adobe-utopia-type1-1.0.1
-	>=media-fonts/font-adobe-100dpi-1"
-
-# Documentation
-RDEPEND="${RDEPEND}
-	>=app-doc/xorg-docs-1.0.1"
-
-# Drivers
-RDEPEND="${RDEPEND}
-	input_devices_acecad? ( x11-drivers/xf86-input-acecad )
-	input_devices_aiptek? ( x11-drivers/xf86-input-aiptek )
-	input_devices_calcomp? ( x11-drivers/xf86-input-calcomp )
-	input_devices_citron? ( x11-drivers/xf86-input-citron )
-	input_devices_digitaledge? ( x11-drivers/xf86-input-digitaledge )
-	input_devices_dmc? ( x11-drivers/xf86-input-dmc )
-	input_devices_dynapro? ( x11-drivers/xf86-input-dynapro )
-	input_devices_elo2300? ( x11-drivers/xf86-input-elo2300 )
-	input_devices_elographics? ( x11-drivers/xf86-input-elographics )
-	input_devices_evdev? ( x11-drivers/xf86-input-evdev )
-	input_devices_fpit? ( x11-drivers/xf86-input-fpit )
-	input_devices_hyperpen? ( x11-drivers/xf86-input-hyperpen )
-	input_devices_jamstudio? ( x11-drivers/xf86-input-jamstudio )
-	input_devices_joystick? ( x11-drivers/xf86-input-joystick )
-	input_devices_keyboard? ( x11-drivers/xf86-input-keyboard )
-	input_devices_magellan? ( x11-drivers/xf86-input-magellan )
-	input_devices_magictouch? ( x11-drivers/xf86-input-magictouch )
-	input_devices_microtouch? ( x11-drivers/xf86-input-microtouch )
-	input_devices_mouse? ( x11-drivers/xf86-input-mouse )
-	input_devices_mutouch? ( x11-drivers/xf86-input-mutouch )
-	input_devices_palmax? ( x11-drivers/xf86-input-palmax )
-	input_devices_penmount? ( x11-drivers/xf86-input-penmount )
-	input_devices_spaceorb? ( x11-drivers/xf86-input-spaceorb )
-	input_devices_summa? ( x11-drivers/xf86-input-summa )
-	input_devices_tek4957? ( x11-drivers/xf86-input-tek4957 )
-	input_devices_ur98? ( x11-drivers/xf86-input-ur98 )
-	input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse )
-	input_devices_void? ( x11-drivers/xf86-input-void )
-
-	input_devices_synaptics? ( x11-drivers/synaptics )
-	input_devices_wacom? ( x11-drivers/linuxwacom )
-
-	video_cards_apm? ( x11-drivers/xf86-video-apm )
-	video_cards_ark? ( x11-drivers/xf86-video-ark )
-	video_cards_chips? ( x11-drivers/xf86-video-chips )
-	video_cards_cirrus? ( x11-drivers/xf86-video-cirrus )
-	video_cards_cyrix? ( x11-drivers/xf86-video-cyrix )
-	video_cards_dummy? ( x11-drivers/xf86-video-dummy )
-	video_cards_fbdev? ( x11-drivers/xf86-video-fbdev )
-	video_cards_glint? ( x11-drivers/xf86-video-glint )
-	video_cards_i128? ( x11-drivers/xf86-video-i128 )
-	video_cards_i740? ( x11-drivers/xf86-video-i740 )
-	video_cards_i810? ( x11-drivers/xf86-video-i810 )
-	video_cards_imstt? ( x11-drivers/xf86-video-imstt )
-	video_cards_mach64? ( x11-drivers/xf86-video-ati )
-	video_cards_mga? ( x11-drivers/xf86-video-mga )
-	video_cards_neomagic? ( x11-drivers/xf86-video-neomagic )
-	video_cards_newport? ( x11-drivers/xf86-video-newport )
-	video_cards_nsc? ( x11-drivers/xf86-video-nsc )
-	video_cards_nv? ( x11-drivers/xf86-video-nv )
-	video_cards_r128? ( x11-drivers/xf86-video-ati )
-	video_cards_radeon? ( x11-drivers/xf86-video-ati )
-	video_cards_rendition? ( x11-drivers/xf86-video-rendition )
-	video_cards_s3? ( x11-drivers/xf86-video-s3 )
-	video_cards_s3virge? ( x11-drivers/xf86-video-s3virge )
-	video_cards_savage? ( x11-drivers/xf86-video-savage )
-	video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion )
-	video_cards_sis? ( x11-drivers/xf86-video-sis )
-	video_cards_sisusb? ( x11-drivers/xf86-video-sisusb )
-	video_cards_sunbw2? ( x11-drivers/xf86-video-sunbw2 )
-	video_cards_suncg14? ( x11-drivers/xf86-video-suncg14 )
-	video_cards_suncg3? ( x11-drivers/xf86-video-suncg3 )
-	video_cards_suncg6? ( x11-drivers/xf86-video-suncg6 )
-	video_cards_sunffb? ( x11-drivers/xf86-video-sunffb )
-	video_cards_sunleo? ( x11-drivers/xf86-video-sunleo )
-	video_cards_suntcx? ( x11-drivers/xf86-video-suntcx )
-	video_cards_tdfx? ( x11-drivers/xf86-video-tdfx )
-	video_cards_tga? ( x11-drivers/xf86-video-tga )
-	video_cards_trident? ( x11-drivers/xf86-video-trident )
-	video_cards_tseng? ( x11-drivers/xf86-video-tseng )
-	video_cards_v4l? ( x11-drivers/xf86-video-v4l )
-	video_cards_vesa? ( x11-drivers/xf86-video-vesa )
-	video_cards_vga? ( x11-drivers/xf86-video-vga )
-	video_cards_via? ( x11-drivers/xf86-video-via )
-	video_cards_vmware? ( x11-drivers/xf86-video-vmware )
-	video_cards_voodoo? ( x11-drivers/xf86-video-voodoo )
-
-	video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
-	video_cards_nvidia? (
-		|| (
-			x11-drivers/nvidia-drivers
-			x11-drivers/nvidia-legacy-drivers
-		)
-	)
-	video_cards_fglrx? ( x11-drivers/ati-drivers )"
-
-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 "You can now choose which drivers are installed with the VIDEO_CARDS"
-	einfo "and INPUT_DEVICES settings. Set these like any other Portage"
-	einfo "variable in /etc/make.conf or on the command line."
-	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
-}