diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-08-04 05:49:32 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-08-04 05:49:32 +0000 |
| commit | 25b68c18a3e9d37e45ffeb72df0db96cf2238892 (patch) | |
| tree | d6879c6149edde22b22793dba11d7c5cc865a561 /sys-apps | |
| parent | Version Bump (diff) | |
| download | gentoo-2-25b68c18a3e9d37e45ffeb72df0db96cf2238892.tar.gz gentoo-2-25b68c18a3e9d37e45ffeb72df0db96cf2238892.tar.bz2 gentoo-2-25b68c18a3e9d37e45ffeb72df0db96cf2238892.zip | |
Use subslots/USE deps for ncurses/udev #555706 by Steven Johnson.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/util-linux/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/util-linux/util-linux-2.26.2.ebuild | 7 | ||||
| -rw-r--r-- | sys-apps/util-linux/util-linux-9999.ebuild | 6 |
3 files changed, 11 insertions, 8 deletions
diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog index 4b8975b6d3e5..30b9a80d60c0 100644 --- a/sys-apps/util-linux/ChangeLog +++ b/sys-apps/util-linux/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/util-linux # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.508 2015/05/30 11:43:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.509 2015/08/04 05:49:32 vapier Exp $ + + 04 Aug 2015; Mike Frysinger <vapier@gentoo.org> util-linux-2.26.2.ebuild, + util-linux-9999.ebuild: + Use subslots/USE deps for ncurses/udev #555706 by Steven Johnson. 30 May 2015; Mike Frysinger <vapier@gentoo.org> util-linux-2.25.2-r2.ebuild, util-linux-2.26.2.ebuild, util-linux-9999.ebuild: 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 6ef5a784f4cf..e6c5ed83db15 100644 --- a/sys-apps/util-linux/util-linux-2.26.2.ebuild +++ b/sys-apps/util-linux/util-linux-2.26.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.26.2.ebuild,v 1.2 2015/05/30 11:43:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.26.2.ebuild,v 1.3 2015/08/04 05:49:32 vapier Exp $ EAPI="5" @@ -36,13 +36,13 @@ 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:=[unicode?] ) pam? ( sys-libs/pam ) python? ( ${PYTHON_DEPS} ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) slang? ( sys-libs/slang ) systemd? ( sys-apps/systemd ) - udev? ( virtual/libudev ) + udev? ( virtual/libudev:= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] @@ -62,7 +62,6 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/${PN}-2.25-parallel-setarch.patch #511812 if [[ ${PV} == 9999 ]] ; then po/update-potfiles eautoreconf diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index 9cdf98d42c72..0b7553621df8 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.64 2015/05/30 11:43:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.65 2015/08/04 05:49:32 vapier Exp $ EAPI="5" @@ -36,13 +36,13 @@ 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:=[unicode?] ) pam? ( sys-libs/pam ) python? ( ${PYTHON_DEPS} ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) slang? ( sys-libs/slang ) systemd? ( sys-apps/systemd ) - udev? ( virtual/libudev ) + udev? ( virtual/libudev:= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] |