Require same USE flag setting for the openmotif dependency, to prevent a compilation...

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index c932cc7f4b2e14707fbaf308f0b20777da57d7f0..4bab18542dac9256b470319258d2c965cf17d785 100644 (file)
--- a/app-editors/xemacs/ChangeLog
+++ b/app-editors/xemacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/xemacs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.135 2010/03/08 14:43:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.136 2010/05/23 17:48:19 ulm Exp $
+
+  23 May 2010; Ulrich Mueller <ulm@gentoo.org> xemacs-21.5.29-r2.ebuild:
+  Require same USE flag setting for the openmotif dependency, to prevent
+  a compilation failure that occurs with openmotif[xft] and xemacs[-xft].
 
   08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
   xemacs-21.5.29-r2.ebuild:

diff --git a/app-editors/xemacs/xemacs-21.5.29-r2.ebuild b/app-editors/xemacs/xemacs-21.5.29-r2.ebuild
index 29f534f872602245f2d69e9a63b08083d1090154..f9fa8574691026eb0dc4dd21b7a18fc12e9cc39f 100644 (file)
--- a/app-editors/xemacs/xemacs-21.5.29-r2.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.29-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.29-r2.ebuild,v 1.4 2010/03/08 14:43:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.29-r2.ebuild,v 1.5 2010/05/23 17:48:19 ulm Exp $
 
 # Note: xemacs currently does not work with a hardened profile. If you
 # want to use xemacs on a hardened profile then compile with the
@@ -37,7 +37,7 @@ RDEPEND="
        nas? ( media-libs/nas )
        X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
        dnd? ( x11-libs/dnd )
-       motif? ( >=x11-libs/openmotif-2.1.30 )
+       motif? ( >=x11-libs/openmotif-2.1.30[xft=] )
        athena? ( x11-libs/libXaw )
        Xaw3d? ( x11-libs/Xaw3d )
        xft? ( media-libs/freetype x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 )
@@ -63,8 +63,6 @@ src_unpack() {
 }
 
 src_prepare() {
-       cd "${S}"
-
        # Fix security issue in vcdiff script
        epatch "${FILESDIR}"/${P}-vcdiff.patch