diff options
Diffstat (limited to 'sys-libs/readline')
| -rw-r--r-- | sys-libs/readline/readline-6.2_p5-r2.ebuild (renamed from sys-libs/readline/readline-6.2_p5-r1.ebuild) | 16 | ||||
| -rw-r--r-- | sys-libs/readline/readline-6.3_p8-r3.ebuild (renamed from sys-libs/readline/readline-6.3_p8-r2.ebuild) | 16 |
2 files changed, 20 insertions, 12 deletions
diff --git a/sys-libs/readline/readline-6.2_p5-r1.ebuild b/sys-libs/readline/readline-6.2_p5-r2.ebuild index 36ffdf456f04..43bb680a8f04 100644 --- 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 index 48bcf83c5afb..20c1865c7b95 100644 --- 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 |