sys-apps/util-linux: Use slot operators for ncurses

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec@gentoo.org>

diff --git a/sys-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml
index 8caf3fdd5a1db35be372cd7feaaf10ed99dd6ea0..77690bce835ff67e1d66c544b7ff98bd41f336c7 100644 (file)
--- a/sys-apps/util-linux/metadata.xml
+++ b/sys-apps/util-linux/metadata.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
        <herd>base-system</herd>
-<use>
-       <flag name='caps'>build setpriv helper (run programs with diff capabilities)</flag>
-       <flag name='cramfs'>build mkfs/fsck helpers for cramfs filesystems</flag>
-       <flag name='cytune'>build cytune for Cyclades-Z multiport serial cards</flag>
-       <flag name='fdformat'>build fdformat (floppy disk format)</flag>
-       <flag name='pam'>build runuser helper</flag>
-       <flag name='suid'>
+       <use>
+               <flag name="caps">build setpriv helper (run programs with diff capabilities)</flag>
+               <flag name="cramfs">build mkfs/fsck helpers for cramfs filesystems</flag>
+               <flag name="cytune">build cytune for Cyclades-Z multiport serial cards</flag>
+               <flag name="fdformat">build fdformat (floppy disk format)</flag>
+               <flag name="pam">build runuser helper</flag>
+               <flag name="suid">
                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
        </flag>
-       <flag name='tty-helpers'>install the mesg/wall/write tools for talking to local users</flag>
-</use>
+               <flag name="tty-helpers">install the mesg/wall/write tools for talking to local users</flag>
+       </use>
        <upstream>
                <remote-id type="cpe">cpe:/a:andries_brouwer:util-linux</remote-id>
        </upstream>

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 f16b9789a710fdbe8c3fca15bfa487cb9f82369f..2c1a869c2da76011384b5d98093bb45bd15556a3 100644 (file)
--- 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
        !<app-shells/bash-completion-1.3-r2
        caps? ( sys-libs/libcap-ng )
        cramfs? ( sys-libs/zlib )
-       ncurses? ( >=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 cd8859751d81185989445eb91a93d77036658b16..fa08f0641470c722036c635fdb474136ed1bab8f 100644 (file)
--- 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
        !<app-shells/bash-completion-1.3-r2
        caps? ( sys-libs/libcap-ng )
        cramfs? ( sys-libs/zlib )
-       ncurses? ( >=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 cd8859751d81185989445eb91a93d77036658b16..fa08f0641470c722036c635fdb474136ed1bab8f 100644 (file)
--- 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
        !<app-shells/bash-completion-1.3-r2
        caps? ( sys-libs/libcap-ng )
        cramfs? ( sys-libs/zlib )
-       ncurses? ( >=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}