Remove reference to non-existent upgrade guide, bug #540584.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x2324E7B566DF2611!)

3 files changed, 7 insertions, 31 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index e279fc3873d7..fe0fa1e75d8d 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.824 2015/02/19 08:52:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.825 2015/02/19 15:50:39 chithanh Exp $
+
+  19 Feb 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  xorg-server-1.16.4-r1.ebuild, xorg-server-1.16.4.ebuild:
+  Remove reference to non-existent upgrade guide, bug #540584.
 
   19 Feb 2015; Agostino Sarubbo <ago@gentoo.org> xorg-server-1.12.4-r4.ebuild,
   xorg-server-1.15.2-r2.ebuild, xorg-server-1.16.4.ebuild:
diff --git a/x11-base/xorg-server/xorg-server-1.16.4-r1.ebuild b/x11-base/xorg-server/xorg-server-1.16.4-r1.ebuild
index bf3904fc11f7..50dcfd0c99d6 100644
--- a/x11-base/xorg-server/xorg-server-1.16.4-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.16.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.16.4-r1.ebuild,v 1.1 2015/02/11 10:20:17 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.16.4-r1.ebuild,v 1.2 2015/02/19 15:50:39 chithanh Exp $
 
 EAPI=5
 
@@ -212,20 +212,6 @@ src_install() {
 pkg_postinst() {
 	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
 	eselect opengl set xorg-x11 --use-old
-
-	if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
-		elog "You should consider reading upgrade guide for this release:"
-		elog "  http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml"
-		echo
-		ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
-		ewarn "because the ABI changed. If you cannot start X because"
-		ewarn "of module version mismatch errors, this is your problem."
-
-		echo
-		ewarn "You can rebuild all installed packages in the x11-drivers"
-		ewarn "category using this command:"
-		ewarn "	emerge @x11-module-rebuild"
-	fi
 }
 
 pkg_postrm() {
diff --git a/x11-base/xorg-server/xorg-server-1.16.4.ebuild b/x11-base/xorg-server/xorg-server-1.16.4.ebuild
index 25195d80dadc..dc762d594ad7 100644
--- a/x11-base/xorg-server/xorg-server-1.16.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.16.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.16.4.ebuild,v 1.3 2015/02/19 08:52:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.16.4.ebuild,v 1.4 2015/02/19 15:50:39 chithanh Exp $
 
 EAPI=5
 
@@ -226,20 +226,6 @@ src_install() {
 pkg_postinst() {
 	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
 	eselect opengl set xorg-x11 --use-old
-
-	if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
-		elog "You should consider reading upgrade guide for this release:"
-		elog "  http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml"
-		echo
-		ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
-		ewarn "because the ABI changed. If you cannot start X because"
-		ewarn "of module version mismatch errors, this is your problem."
-
-		echo
-		ewarn "You can rebuild all installed packages in the x11-drivers"
-		ewarn "category using this command:"
-		ewarn "	emerge @x11-module-rebuild"
-	fi
 }
 
 pkg_postrm() {