diff options
| author |   Joshua Baergen <joshuabaergen@gentoo.org> | 2005-11-02 06:11:29 +0000 |
|---|---|---|
| committer | Joshua Baergen <joshuabaergen@gentoo.org> | 2005-11-02 06:11:29 +0000 |
| commit | 51baa1a58d12f15c132a64cc4fb2aa153cac6bf6 (patch) | |
| tree | e7ec5c7ef701360d8738b983a3a2bd18bebfb1d1 /eclass | |
| parent | Add an error about collision-protect in case we allow monolithic->modular (diff) | |
| download | gentoo-2-51baa1a58d12f15c132a64cc4fb2aa153cac6bf6.tar.gz gentoo-2-51baa1a58d12f15c132a64cc4fb2aa153cac6bf6.tar.bz2 gentoo-2-51baa1a58d12f15c132a64cc4fb2aa153cac6bf6.zip | |
Drop collision-protect warning for now as we're probably going with a
blocker.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/x-modular.eclass | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/eclass/x-modular.eclass b/eclass/x-modular.eclass index ae7b5b5f5d4e..175be5a1280e 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.18 2005/11/02 05:51:38 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.19 2005/11/02 06:11:29 joshuabaergen Exp $ # # Author: Donnie Berkholz <spyderous@gentoo.org> # @@ -60,18 +60,6 @@ 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} |