From 2d82c41140ff458f09e00ef04745d19573fae797 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 16 Aug 2015 12:58:33 +0200 Subject: [PATCH] sys-apps/util-linux: Use slot operators for ncurses Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher --- sys-apps/util-linux/metadata.xml | 18 +++++++++--------- .../util-linux/util-linux-2.26.1-r1.ebuild | 4 ++-- sys-apps/util-linux/util-linux-2.26.2.ebuild | 4 ++-- sys-apps/util-linux/util-linux-9999.ebuild | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sys-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml index 8caf3fdd5a1d..77690bce835f 100644 --- a/sys-apps/util-linux/metadata.xml +++ b/sys-apps/util-linux/metadata.xml @@ -2,18 +2,18 @@ base-system - - build setpriv helper (run programs with diff capabilities) - build mkfs/fsck helpers for cramfs filesystems - build cytune for Cyclades-Z multiport serial cards - build fdformat (floppy disk format) - build runuser helper - + + build setpriv helper (run programs with diff capabilities) + build mkfs/fsck helpers for cramfs filesystems + build cytune for Cyclades-Z multiport serial cards + build fdformat (floppy disk format) + build runuser helper + install mount/umount as setuid so non-root users may mount/umount devices, and wall/write as setgid so non-root users can notify other users - install the mesg/wall/write tools for talking to local users - + install the mesg/wall/write tools for talking to local users + cpe:/a:andries_brouwer:util-linux diff --git a/sys-apps/util-linux/util-linux-2.26.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.26.1-r1.ebuild index f16b9789a710..2c1a869c2da7 100644 --- a/sys-apps/util-linux/util-linux-2.26.1-r1.ebuild +++ b/sys-apps/util-linux/util-linux-2.26.1-r1.ebuild @@ -36,7 +36,7 @@ RDEPEND="!sys-process/schedutils !=sys-libs/ncurses-5.2-r2 ) + ncurses? ( >=sys-libs/ncurses-5.2-r2:5= ) pam? ( sys-libs/pam ) python? ( ${PYTHON_DEPS} ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) @@ -44,7 +44,7 @@ RDEPEND="!sys-process/schedutils systemd? ( sys-apps/systemd ) udev? ( virtual/libudev ) abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 + !<=app-emulation/emul-linux-x86-baselibs-20150406-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )" DEPEND="${RDEPEND} diff --git a/sys-apps/util-linux/util-linux-2.26.2.ebuild b/sys-apps/util-linux/util-linux-2.26.2.ebuild index cd8859751d81..fa08f0641470 100644 --- a/sys-apps/util-linux/util-linux-2.26.2.ebuild +++ b/sys-apps/util-linux/util-linux-2.26.2.ebuild @@ -36,7 +36,7 @@ RDEPEND="!sys-process/schedutils !=sys-libs/ncurses-5.2-r2:=[unicode?] ) + ncurses? ( >=sys-libs/ncurses-5.2-r2:5=[unicode?] ) pam? ( sys-libs/pam ) python? ( ${PYTHON_DEPS} ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) @@ -44,7 +44,7 @@ RDEPEND="!sys-process/schedutils systemd? ( sys-apps/systemd ) udev? ( virtual/libudev:= ) abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 + !<=app-emulation/emul-linux-x86-baselibs-20150406-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )" DEPEND="${RDEPEND} diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index cd8859751d81..fa08f0641470 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -36,7 +36,7 @@ RDEPEND="!sys-process/schedutils !=sys-libs/ncurses-5.2-r2:=[unicode?] ) + ncurses? ( >=sys-libs/ncurses-5.2-r2:5=[unicode?] ) pam? ( sys-libs/pam ) python? ( ${PYTHON_DEPS} ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) @@ -44,7 +44,7 @@ RDEPEND="!sys-process/schedutils systemd? ( sys-apps/systemd ) udev? ( virtual/libudev:= ) abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 + !<=app-emulation/emul-linux-x86-baselibs-20150406-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )" DEPEND="${RDEPEND} -- 2.26.2