summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-03-15 19:17:44 +0000
committerUlrich Müller <ulm@gentoo.org>2013-03-15 19:17:44 +0000
commit2fcf2056f5ffdda557ad809402bc713b65e94bd6 (patch)
treebefeb758eeb12e87e39d931c5f1f0430cd339a33 /app-emulation/emul-linux-x86-motif
parentVersion bump (diff)
downloadgentoo-2-2fcf2056f5ffdda557ad809402bc713b65e94bd6.tar.gz
gentoo-2-2fcf2056f5ffdda557ad809402bc713b65e94bd6.tar.bz2
gentoo-2-2fcf2056f5ffdda557ad809402bc713b65e94bd6.zip
Add blocker against multilib-enabled motif.
(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Diffstat (limited to 'app-emulation/emul-linux-x86-motif')
-rw-r--r--app-emulation/emul-linux-x86-motif/ChangeLog6
-rw-r--r--app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20121202.ebuild7
-rw-r--r--app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20130224.ebuild5
3 files changed, 12 insertions, 6 deletions
diff --git a/app-emulation/emul-linux-x86-motif/ChangeLog b/app-emulation/emul-linux-x86-motif/ChangeLog
index bbaa1700ad10..8d84d1a9a4d7 100644
--- a/app-emulation/emul-linux-x86-motif/ChangeLog
+++ b/app-emulation/emul-linux-x86-motif/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/emul-linux-x86-motif
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-motif/ChangeLog,v 1.17 2013/02/27 19:37:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-motif/ChangeLog,v 1.18 2013/03/15 19:17:44 ulm Exp $
+
+ 15 Mar 2013; Ulrich Müller <ulm@gentoo.org>
+ emul-linux-x86-motif-20121202.ebuild, emul-linux-x86-motif-20130224.ebuild:
+ Add blocker against multilib-enabled motif.
27 Feb 2013; Pacho Ramos <pacho@gentoo.org>
-emul-linux-x86-motif-20121028.ebuild:
diff --git a/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20121202.ebuild b/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20121202.ebuild
index e06fb45ba21e..f5722e397e1b 100644
--- a/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20121202.ebuild
+++ b/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20121202.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20121202.ebuild,v 1.3 2012/12/25 19:06:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20121202.ebuild,v 1.4 2013/03/15 19:17:44 ulm Exp $
EAPI=5
inherit emul-linux-x86
@@ -11,4 +11,5 @@ KEYWORDS="-* amd64"
DEPEND=""
RDEPEND="~app-emulation/emul-linux-x86-xlibs-${PV}
- !<app-emulation/emul-linux-x86-xlibs-20110129"
+ !<app-emulation/emul-linux-x86-xlibs-20110129
+ !x11-libs/motif[abi_x86_32]"
diff --git a/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20130224.ebuild b/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20130224.ebuild
index 1038e08d9a8c..53c882091a19 100644
--- a/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20130224.ebuild
+++ b/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20130224.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20130224.ebuild,v 1.1 2013/02/25 18:45:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20130224.ebuild,v 1.2 2013/03/15 19:17:44 ulm Exp $
EAPI=5
inherit emul-linux-x86
@@ -11,4 +11,5 @@ KEYWORDS="-* ~amd64"
DEPEND=""
RDEPEND="~app-emulation/emul-linux-x86-xlibs-${PV}
- !<app-emulation/emul-linux-x86-xlibs-20110129"
+ !<app-emulation/emul-linux-x86-xlibs-20110129
+ !x11-libs/motif[abi_x86_32]"