From 1bca7c73800d71f41052d35444d41871894a54a1 Mon Sep 17 00:00:00 2001
From: Joshua Baergen <joshuabaergen@gentoo.org>
Date: Wed, 2 Nov 2005 05:51:38 +0000
Subject: Add an error about collision-protect in case we allow
 monolithic->modular upgrade paths without unmerging the old version first.

---
 eclass/x-modular.eclass | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'eclass')

diff --git a/eclass/x-modular.eclass b/eclass/x-modular.eclass
index a40725ce37b7..ae7b5b5f5d4e 100644
--- a/eclass/x-modular.eclass
+++ b/eclass/x-modular.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.17 2005/10/30 05:32:27 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.18 2005/11/02 05:51:38 joshuabaergen Exp $
 #
 # Author: Donnie Berkholz <spyderous@gentoo.org>
 #
@@ -60,6 +60,18 @@ RDEPEND="${RDEPEND}
 # Provides virtual/x11 for temporary use until packages are ported
 #	x11-base/x11-env"
 
+x-modular_pkg_setup() {
+	# Collision protect will scream bloody murder if we install over old versions
+	if $(has_version "<x11-base/xorg-x11-7.0.0_rc0"); then
+		if has collision-protect ${FEATURES}; then
+			eerror "Having collision-protect in FEATURES will disrupt upgrades"
+			eerror "from non-modular versions of xorg-x11."
+			eerror "Please remove collision-protect from FEATURES while upgrading."
+			die    ""
+		fi
+	fi
+}
+
 x-modular_unpack_source() {
 	unpack ${A}
 	cd ${S}
-- 
cgit v1.2.3-65-gdbad