sys-libs/readline: Revbumped remaining EAPI-4 ebuilds to EAPI-5.

This is necessary to add sub-slot dependency for sys-libs/ncurses.
Bumped straight to stable.

Fixes Gentoo bug #601650.

Package-Manager: portage-2.3.2

diff --git a/sys-libs/readline/readline-6.2_p5-r1.ebuild b/sys-libs/readline/readline-6.2_p5-r2.ebuild
similarity index 92%
rename from sys-libs/readline/readline-6.2_p5-r1.ebuild
rename to sys-libs/readline/readline-6.2_p5-r2.ebuild
index 36ffdf456f042ba996d61756325dbb8c00e0f0ec..43bb680a8f0424c7b9ae8df7f580203065738bfe 100644 (file)
--- a/sys-libs/readline/readline-6.2_p5-r1.ebuild
+++ b/sys-libs/readline/readline-6.2_p5-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=5
 
 inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal
 
@@ -37,7 +37,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static-libs"
 
-RDEPEND=">=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}]
+RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
        abi_x86_32? (
                !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
                !<=app-emulation/emul-linux-x86-baselibs-20131008-r7
@@ -47,15 +47,19 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=(
+       "${FILESDIR}"/${PN}-5.0-no_rpath.patch
+       "${FILESDIR}"/${PN}-5.2-no-ignore-shlib-errors.patch #216952
+       "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
+)
+
 src_unpack() {
        unpack ${MY_P}.tar.gz
 }
 
 src_prepare() {
        [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-       epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
-       epatch "${FILESDIR}"/${PN}-5.2-no-ignore-shlib-errors.patch #216952
-       epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
+       epatch "${PATCHES[@]}"
 
        # Force ncurses linking. #71420
        # Use pkg-config to get the right values. #457558

diff --git a/sys-libs/readline/readline-6.3_p8-r2.ebuild b/sys-libs/readline/readline-6.3_p8-r3.ebuild
similarity index 93%
rename from sys-libs/readline/readline-6.3_p8-r2.ebuild
rename to sys-libs/readline/readline-6.3_p8-r3.ebuild
index 48bcf83c5afb0edffafa2b073f2e19e1257ed6eb..20c1865c7b951ceb9653e36843270401467c675d 100644 (file)
--- a/sys-libs/readline/readline-6.3_p8-r2.ebuild
+++ b/sys-libs/readline/readline-6.3_p8-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
 
 inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal
 
@@ -37,7 +37,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static-libs utils"
 
-RDEPEND=">=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}]
+RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
        abi_x86_32? (
                !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
                !<=app-emulation/emul-linux-x86-baselibs-20131008-r7
@@ -47,16 +47,20 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=(
+       "${FILESDIR}"/${PN}-5.0-no_rpath.patch
+       "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
+       "${FILESDIR}"/${PN}-6.3-fix-long-prompt-vi-search.patch
+       "${FILESDIR}"/${PN}-6.3-read-eof.patch
+)
+
 src_unpack() {
        unpack ${MY_P}.tar.gz
 }
 
 src_prepare() {
        [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-       epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
-       epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
-       epatch "${FILESDIR}"/${PN}-6.3-fix-long-prompt-vi-search.patch
-       epatch "${FILESDIR}"/${PN}-6.3-read-eof.patch
+       epatch "${PATCHES[@]}"
 
        # Force ncurses linking. #71420
        # Use pkg-config to get the right values. #457558