Update for 7.1 release.

(Portage version: 2.1_rc3)
 (Unsigned Manifest commit)

3 files changed, 26 insertions, 154 deletions

diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 7f3a9d3f1445..7a92f87f22c5 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,38 +1,38 @@
-AUX CVE-2006-1526-xrender-mitri.patch 833 RMD160 a7ac6f0b9925ffee95fcac0549e1e68f29b5e783 SHA1 40b6500d5b947c093837dcc708b5630fb3f178fc SHA256 7a5f115be88411ed28d1098a79be021440c57fef3200cabfec48c943d3b0df01 size 833
+AUX CVE-2006-1526-xrender-mitri.patch 833 RMD160 a7ac6f0b9925ffee95fcac0549e1e68f29b5e783 SHA1 40b6500d5b947c093837dcc708b5630fb3f178fc SHA256 7a5f115be88411ed28d1098a79be021440c57fef3200cabfec48c943d3b0df01
 MD5 daeec68d1c01357b57daa15ff859ddc5 files/CVE-2006-1526-xrender-mitri.patch 833
 RMD160 a7ac6f0b9925ffee95fcac0549e1e68f29b5e783 files/CVE-2006-1526-xrender-mitri.patch 833
 SHA256 7a5f115be88411ed28d1098a79be021440c57fef3200cabfec48c943d3b0df01 files/CVE-2006-1526-xrender-mitri.patch 833
-DIST X11R6.8.2-src.tar.bz2 44371402 RMD160 80efdaf74a25e43c77aab1d83e817f03f344d105 SHA256 f02e3c85572dc9ad7cb77c2a638e3be24cc1b5bea9fdbb0b0299c9668475c534 size 44371402
-DIST X11R6.9.0-src.tar.bz2 46220125 RMD160 5c830d43607c4550ad44936d77b5adc56f67dbf5 SHA256 6509e5bee489ab7c8d0c255c12f6ceb8f06be74b57b060b6e9a61497710a3f4c size 46220125
-DIST eurofonts-X11.tar.bz2 8811 RMD160 d3f54324dcfd961dc128a257917a90a5bc9560da SHA256 6028bda00ecf403f1723ca66d24ed3f609bf6d7eaef46e0facb04fb322aac3e3 size 8811
-DIST gemini-koi8-u.tar.bz2 439173 RMD160 861e7048f0ec5136c898976b092b96da8772d70c SHA256 df70d795be2cfbac04647365495e70c84b3a2119db2297a9deca7f939c135811 size 439173
-DIST gentoo-cursors-tad-0.3.1.tar.bz2 1196991 RMD160 cd10e8ffbfd8879e096ba5d31fd16d613c780660 SHA256 90c6775fcd194153b79e06e4232c74054ebf11227a83c5762e6aa539d46ef847 size 1196991
-DIST xfsft-encodings-0.1.tar.bz2 11892 RMD160 d51d2110764484dd49cba393510f2f143a7eb0a2 SHA256 a13acec68d913f42cf49c97113da86a90d15867f799fcaa7e9892759c6b37645 size 11892
-DIST xorg-x11-6.8.2-files-0.8.tar.bz2 9920 RMD160 cacc6ebb392dce9b1274b13c3a87ac62f42e2828 SHA256 51b8f9af14a25ba90e61f61f8a8531b8075a59ac41d4f7d0a1812bcaf9623f02 size 9920
-DIST xorg-x11-6.8.2-patches-0.1.13.tar.bz2 191763 RMD160 d0d363afcf26f78005e380a49ff7c7be4301f6cd SHA256 aebc58cd8e85a50c39f33ca9a1dbb300e972ca8fa50bd1527c71d52864dcc09f size 191763
-DIST xorg-x11-6.9.0-files-0.1.tar.bz2 9930 RMD160 0bf43b280db86b28f4ee93b1c47959f4372d71fc SHA256 207f366cd69ae1b828206f227bd600d5ec9e9dfddb0cab8e418f222f4b787755 size 9930
-DIST xorg-x11-6.9.0-patches-0.1.1.tar.bz2 114332 RMD160 ff9b0f2cd969ccfb1078c5b6f3b2d4a7e5085b10 SHA256 fb6a652fcbf6c8416b675766960850ed104fbd44b71440dcd335f0d3a2f069d3 size 114332
-EBUILD xorg-x11-6.8.2-r7.ebuild 55143 RMD160 84cd4a6299d7cd1b9bff63b996d910fd96052915 SHA1 f93af8a295a8f36c4c057c54c03759b8cd61d887 SHA256 19e71c0b7a4dfbfd3f213ba4317b92082370f9ca728c185fd5989c1423e89365 size 55143
+DIST X11R6.8.2-src.tar.bz2 44371402 RMD160 80efdaf74a25e43c77aab1d83e817f03f344d105 SHA256 f02e3c85572dc9ad7cb77c2a638e3be24cc1b5bea9fdbb0b0299c9668475c534
+DIST X11R6.9.0-src.tar.bz2 46220125 RMD160 5c830d43607c4550ad44936d77b5adc56f67dbf5 SHA256 6509e5bee489ab7c8d0c255c12f6ceb8f06be74b57b060b6e9a61497710a3f4c
+DIST eurofonts-X11.tar.bz2 8811 RMD160 d3f54324dcfd961dc128a257917a90a5bc9560da SHA256 6028bda00ecf403f1723ca66d24ed3f609bf6d7eaef46e0facb04fb322aac3e3
+DIST gemini-koi8-u.tar.bz2 439173 RMD160 861e7048f0ec5136c898976b092b96da8772d70c SHA256 df70d795be2cfbac04647365495e70c84b3a2119db2297a9deca7f939c135811
+DIST gentoo-cursors-tad-0.3.1.tar.bz2 1196991 RMD160 cd10e8ffbfd8879e096ba5d31fd16d613c780660 SHA256 90c6775fcd194153b79e06e4232c74054ebf11227a83c5762e6aa539d46ef847
+DIST xfsft-encodings-0.1.tar.bz2 11892 RMD160 d51d2110764484dd49cba393510f2f143a7eb0a2 SHA256 a13acec68d913f42cf49c97113da86a90d15867f799fcaa7e9892759c6b37645
+DIST xorg-x11-6.8.2-files-0.8.tar.bz2 9920 RMD160 cacc6ebb392dce9b1274b13c3a87ac62f42e2828 SHA256 51b8f9af14a25ba90e61f61f8a8531b8075a59ac41d4f7d0a1812bcaf9623f02
+DIST xorg-x11-6.8.2-patches-0.1.13.tar.bz2 191763 RMD160 d0d363afcf26f78005e380a49ff7c7be4301f6cd SHA256 aebc58cd8e85a50c39f33ca9a1dbb300e972ca8fa50bd1527c71d52864dcc09f
+DIST xorg-x11-6.9.0-files-0.1.tar.bz2 9930 RMD160 0bf43b280db86b28f4ee93b1c47959f4372d71fc SHA256 207f366cd69ae1b828206f227bd600d5ec9e9dfddb0cab8e418f222f4b787755
+DIST xorg-x11-6.9.0-patches-0.1.1.tar.bz2 114332 RMD160 ff9b0f2cd969ccfb1078c5b6f3b2d4a7e5085b10 SHA256 fb6a652fcbf6c8416b675766960850ed104fbd44b71440dcd335f0d3a2f069d3
+EBUILD xorg-x11-6.8.2-r7.ebuild 55143 RMD160 84cd4a6299d7cd1b9bff63b996d910fd96052915 SHA1 f93af8a295a8f36c4c057c54c03759b8cd61d887 SHA256 19e71c0b7a4dfbfd3f213ba4317b92082370f9ca728c185fd5989c1423e89365
 MD5 feceb4507a8585d4b67e3388fcd1d60b xorg-x11-6.8.2-r7.ebuild 55143
 RMD160 84cd4a6299d7cd1b9bff63b996d910fd96052915 xorg-x11-6.8.2-r7.ebuild 55143
 SHA256 19e71c0b7a4dfbfd3f213ba4317b92082370f9ca728c185fd5989c1423e89365 xorg-x11-6.8.2-r7.ebuild 55143
-EBUILD xorg-x11-6.9.0-r1.ebuild 53374 RMD160 1fa3e4d8fcadc4da0df55c028383126ddba16f29 SHA1 4accb0e3910c1385b605814aff20710d88bb1cd7 SHA256 b90d21bf1e7ec0a38da4c7a1fd8a7884302d95ce0fdf21e3b31870442fef2062 size 53374
+EBUILD xorg-x11-6.9.0-r1.ebuild 53374 RMD160 1fa3e4d8fcadc4da0df55c028383126ddba16f29 SHA1 4accb0e3910c1385b605814aff20710d88bb1cd7 SHA256 b90d21bf1e7ec0a38da4c7a1fd8a7884302d95ce0fdf21e3b31870442fef2062
 MD5 a0bf7493f3f8ac9194099f5ef90e0a92 xorg-x11-6.9.0-r1.ebuild 53374
 RMD160 1fa3e4d8fcadc4da0df55c028383126ddba16f29 xorg-x11-6.9.0-r1.ebuild 53374
 SHA256 b90d21bf1e7ec0a38da4c7a1fd8a7884302d95ce0fdf21e3b31870442fef2062 xorg-x11-6.9.0-r1.ebuild 53374
-EBUILD xorg-x11-7.0-r1.ebuild 17006 RMD160 627992b23d09536feb904c2128ea253a8e7d8ddc SHA1 fbe945488681a970c88e3403aa7438cbbd491478 SHA256 338b63eabee74f764f6739db8cd341cd7bf9e3f821ca07ee7ad4c214ccec867f size 17006
+EBUILD xorg-x11-7.0-r1.ebuild 17006 RMD160 627992b23d09536feb904c2128ea253a8e7d8ddc SHA1 fbe945488681a970c88e3403aa7438cbbd491478 SHA256 338b63eabee74f764f6739db8cd341cd7bf9e3f821ca07ee7ad4c214ccec867f
 MD5 67e7474cfcb772d58190a8a5131ce02f xorg-x11-7.0-r1.ebuild 17006
 RMD160 627992b23d09536feb904c2128ea253a8e7d8ddc xorg-x11-7.0-r1.ebuild 17006
 SHA256 338b63eabee74f764f6739db8cd341cd7bf9e3f821ca07ee7ad4c214ccec867f xorg-x11-7.0-r1.ebuild 17006
-EBUILD xorg-x11-7.1_rc2.ebuild 3998 RMD160 b5919267bc1de7b6206af8e65f7fa2f0e2b21ab8 SHA1 948c6e179f1931e8204de9d1a3e2ba0a29d0ea07 SHA256 6e554eace845565e5e423b0bc562fb26c94de6ebbbdfd2832e5f20c1f2e8e940 size 3998
-MD5 f1b1013c8a81125354c4a7663280b3e2 xorg-x11-7.1_rc2.ebuild 3998
-RMD160 b5919267bc1de7b6206af8e65f7fa2f0e2b21ab8 xorg-x11-7.1_rc2.ebuild 3998
-SHA256 6e554eace845565e5e423b0bc562fb26c94de6ebbbdfd2832e5f20c1f2e8e940 xorg-x11-7.1_rc2.ebuild 3998
-MISC ChangeLog 119425 RMD160 a4d344b71c7461ddf98a5ed309167ae17dada8ef SHA1 e612d284ac12657164767d75220ce6efdc269a8f SHA256 2530a271af45e041771ca645ce6755b2efbd4b3b530c228cf64cef4d2c135abc size 119425
-MD5 6af38c2d2174cb38c76c5bbfd7a75bc5 ChangeLog 119425
-RMD160 a4d344b71c7461ddf98a5ed309167ae17dada8ef ChangeLog 119425
-SHA256 2530a271af45e041771ca645ce6755b2efbd4b3b530c228cf64cef4d2c135abc ChangeLog 119425
-MISC metadata.xml 230 RMD160 a293db25b0a2b203eb1b788ee62601190618066e SHA1 c54cfbf65124c6abed943e76d0e3e6c976fc4f12 SHA256 92ca18d8e0533e35b2537904c3d02051148894ef05496a26db29fecc0066a6e0 size 230
+EBUILD xorg-x11-7.1.ebuild 3991 RMD160 22516036cdfa8f25d2ff91a5055901e949ceef1d SHA1 95955ed7023d6daeb60e6d31536dc0f3e312f7b3 SHA256 5e9c814847e2203fa2b39003e7eafc2e3502c37c917f51bee667bfd454c020d7
+MD5 3c2c849c7c9fbeeed783cac6ad2adf0a xorg-x11-7.1.ebuild 3991
+RMD160 22516036cdfa8f25d2ff91a5055901e949ceef1d xorg-x11-7.1.ebuild 3991
+SHA256 5e9c814847e2203fa2b39003e7eafc2e3502c37c917f51bee667bfd454c020d7 xorg-x11-7.1.ebuild 3991
+MISC ChangeLog 119588 RMD160 5518d2055e187c6fe0bbf1657585863e89adff0c SHA1 b7a24c8c2693df236a5e75d1655fc80d50eaf3af SHA256 e6ef168f9fcaabf32cfc55264c37e8331a1aadb6f3c5a6a18f209971d003921b
+MD5 a138341402dbf8c9904517627878e475 ChangeLog 119588
+RMD160 5518d2055e187c6fe0bbf1657585863e89adff0c ChangeLog 119588
+SHA256 e6ef168f9fcaabf32cfc55264c37e8331a1aadb6f3c5a6a18f209971d003921b ChangeLog 119588
+MISC metadata.xml 230 RMD160 a293db25b0a2b203eb1b788ee62601190618066e SHA1 c54cfbf65124c6abed943e76d0e3e6c976fc4f12 SHA256 92ca18d8e0533e35b2537904c3d02051148894ef05496a26db29fecc0066a6e0
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 RMD160 a293db25b0a2b203eb1b788ee62601190618066e metadata.xml 230
 SHA256 92ca18d8e0533e35b2537904c3d02051148894ef05496a26db29fecc0066a6e0 metadata.xml 230
@@ -45,6 +45,6 @@ SHA256 96bcf76fba399a75d943495aabed45e2c7ac7b5ccf511b5a1b4b7897e9928711 files/di
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-xorg-x11-7.0-r1 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-xorg-x11-7.0-r1 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-xorg-x11-7.0-r1 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-xorg-x11-7.1_rc2 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-xorg-x11-7.1_rc2 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-xorg-x11-7.1_rc2 1
+MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-xorg-x11-7.1 1
+RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-xorg-x11-7.1 1
+SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-xorg-x11-7.1 1
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-7.1_rc2 b/x11-base/xorg-x11/files/digest-xorg-x11-7.1_rc2
deleted file mode 100644
index 8b137891791f..000000000000
--- a/x11-base/xorg-x11/files/digest-xorg-x11-7.1_rc2
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/x11-base/xorg-x11/xorg-x11-7.1_rc2.ebuild b/x11-base/xorg-x11/xorg-x11-7.1_rc2.ebuild
deleted file mode 100644
index 659069e2feb4..000000000000
--- a/x11-base/xorg-x11/xorg-x11-7.1_rc2.ebuild
+++ /dev/null
@@ -1,127 +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.1_rc2.ebuild,v 1.2 2006/05/13 15:34:42 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-
-# 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.99.902"
-
-# Common Applications
-RDEPEND="${RDEPEND}
-	>=x11-apps/mesa-progs-6.5
-	>=x11-apps/setxkbmap-1.0.2
-	>=x11-apps/xauth-1.0.1
-	>=x11-apps/xhost-1.0.1
-	>=x11-apps/xinit-1.0.2
-	>=x11-apps/xmodmap-1.0.1
-	>=x11-apps/xrandr-1.0.2"
-
-# Common Libraries - move these to eclass eventually
-RDEPEND="${RDEPEND}
-	>=x11-libs/libSM-1.0.1
-	>=x11-libs/libXcomposite-0.3
-	>=x11-libs/libXcursor-1.1.6
-	>=x11-libs/libXdamage-1.0.3
-	>=x11-libs/libXfixes-4.0
-	>=x11-libs/libXp-1
-	>=x11-libs/libXv-1.0.1
-	>=x11-libs/libXxf86dga-1.0.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.1"
-
-# We require a brand-new portage for the drivers section to work as expected,
-# rather than pulling in absolutely nothing if VIDEO_CARDS is unset or ""
-RDEPEND="${RDEPEND}
-	>=sys-apps/portage-2.1_pre4"
-
-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
-}