[gentoo-commits] repo/proj/prefix:master commit in: sys-libs/ncurses/

[Fabian Groffen]

commit:     edabe28f9757250d2a2ac05b8ece35d4343e633f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  7 16:50:18 2015 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Nov  7 16:50:18 2015 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=edabe28f

sys-libs/ncurses: 5.9 drop SLOT to 0, and pull in -r4 for subslots, thanks 
Gregory Turner in bug #558800

Package-Manager: portage-2.2.20-prefix

 sys-libs/ncurses/ncurses-5.9-r4.ebuild                           | 2 +-
 .../ncurses/{ncurses-5.9-r4.ebuild => ncurses-5.9-r5.ebuild}     | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sys-libs/ncurses/ncurses-5.9-r4.ebuild 
b/sys-libs/ncurses/ncurses-5.9-r4.ebuild
index 959e811..8a5eda6 100644
--- a/sys-libs/ncurses/ncurses-5.9-r4.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="${SRC_URI}
 "
 
 LICENSE="MIT"
-SLOT="5"
+SLOT="0"
 KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux 
~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ada +cxx debug doc gpm minimal profile static-libs tinfo trace unicode"
 

diff --git a/sys-libs/ncurses/ncurses-5.9-r4.ebuild 
b/sys-libs/ncurses/ncurses-5.9-r5.ebuild
similarity index 98%
copy from sys-libs/ncurses/ncurses-5.9-r4.ebuild
copy to sys-libs/ncurses/ncurses-5.9-r5.ebuild
index 959e811..7b7ae94 100644
--- a/sys-libs/ncurses/ncurses-5.9-r4.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r5.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r4.ebuild,v 
1.3 2015/04/06 20:11:01 vapier Exp $
+# $Id$
+
+EAPI="5"
 
-EAPI="4"
 inherit eutils flag-o-matic toolchain-funcs multilib-minimal libtool
 
 MY_PV=${PV:0:3}
@@ -21,13 +22,15 @@ SRC_URI="${SRC_URI}
 "
 
 LICENSE="MIT"
-SLOT="5"
+# The subslot reflects the SONAME.
+SLOT="0/5"
 KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux 
~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ada +cxx debug doc gpm minimal profile static-libs tinfo trace unicode"
 
 DEPEND="gpm? ( sys-libs/gpm )"
 #      berkdb? ( sys-libs/db )"
 RDEPEND="${DEPEND}
+       !<=sys-libs/ncurses-5.9-r4:5
        !<x11-terms/rxvt-unicode-9.06-r3
        abi_x86_32? (
                !<=app-emulation/emul-linux-x86-baselibs-20130224-r12