From 27006ba6b83a4c1439ab85ee55942b23ee4afd3d Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Mon, 24 Nov 2014 01:39:55 +0000 Subject: [PATCH] eqawarn about /usr/lib/pypy/share instead of dying. --- eclass/ChangeLog | 5 ++++- eclass/distutils-r1.eclass | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 2aab3c1711bf..fa6fb01efc14 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1444 2014/11/23 21:46:29 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1445 2014/11/24 01:39:55 floppym Exp $ + + 24 Nov 2014; Mike Gilbert distutils-r1.eclass: + eqawarn about /usr/lib/pypy/share instead of dying. 23 Nov 2014; Michał Górny gnome2-utils.eclass: Support multilib in gnome2_query_immodules_gtk2() as well. diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index a3183e69ad4b..8c220db957fd 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.102 2014/08/24 13:23:48 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.103 2014/11/24 01:39:55 floppym Exp $ # @ECLASS: distutils-r1 # @MAINTAINER: @@ -557,7 +557,7 @@ distutils-r1_python_install() { die "Package installs 'tests' package, file collisions likely." fi if [[ -d ${root}/usr/$(get_libdir)/pypy/share ]]; then - die "Package installs 'share' in PyPy prefix, see bug #465546." + eqawarn "Package installs 'share' in PyPy prefix, see bug #465546." fi if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then -- 2.26.2