summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-08-12 06:20:13 -0400
committerMike Frysinger <vapier@gentoo.org>2015-08-12 06:38:07 -0400
commitc44913450f0e5957fe2bd51ead50570031e00cb8 (patch)
treed8c80880cba1690fe966255c9304fc5ff64a818b /sys-libs/ncurses
parentsys-libs/ncurses: version bump to 6.0 (diff)
downloadgentoo-c44913450f0e5957fe2bd51ead50570031e00cb8.tar.gz
gentoo-c44913450f0e5957fe2bd51ead50570031e00cb8.tar.bz2
gentoo-c44913450f0e5957fe2bd51ead50570031e00cb8.zip
sys-libs/ncurses: simplify the multilib dep logic
Block the emul package all the time now that it's no longer in the tree. Unify the gpm deps since there's already a circular dep here and the multilib code makes no real difference in that respect.
Diffstat (limited to 'sys-libs/ncurses')
-rw-r--r--sys-libs/ncurses/ncurses-6.0.ebuild11
1 files changed, 2 insertions, 9 deletions
diff --git a/sys-libs/ncurses/ncurses-6.0.ebuild b/sys-libs/ncurses/ncurses-6.0.ebuild
index 476481da25d..92adb1e5846 100644
--- a/sys-libs/ncurses/ncurses-6.0.ebuild
+++ b/sys-libs/ncurses/ncurses-6.0.ebuild
@@ -20,18 +20,11 @@ SLOT="5/6"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="ada +cxx debug doc gpm minimal profile static-libs tinfo trace unicode"
-DEPEND="gpm? ( sys-libs/gpm )"
+DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
# berkdb? ( sys-libs/db )"
RDEPEND="${DEPEND}
!<x11-terms/rxvt-unicode-9.06-r3
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20130224-r12
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-# Put the MULTILIB_USEDEP on gpm in PDEPEND only to avoid circular deps.
-# We can move it to DEPEND and drop the --with-gpm=libgpm.so.1 from the econf
-# line below once we can assume multilib gpm is available everywhere.
-PDEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
+ !app-emulation/emul-linux-x86-baselibs"
S=${WORKDIR}/${MY_P}
HOSTTIC_DIR=${WORKDIR}/${P}-host