From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 556131395E2 for ; Mon, 5 Dec 2016 08:36:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8A03421C1F0; Mon, 5 Dec 2016 08:36:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3FEAA21C1F0 for ; Mon, 5 Dec 2016 08:36:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F228E3411B5 for ; Mon, 5 Dec 2016 08:36:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6A365495 for ; Mon, 5 Dec 2016 08:36:48 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1480927004.de816e9be1f3db2925acbb33ee2d60ead8cd0837.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/readline/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/readline/readline-6.2_p5-r1.ebuild sys-libs/readline/readline-6.2_p5-r2.ebuild sys-libs/readline/readline-6.3_p8-r2.ebuild sys-libs/readline/readline-6.3_p8-r3.ebuild X-VCS-Directories: sys-libs/readline/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: de816e9be1f3db2925acbb33ee2d60ead8cd0837 X-VCS-Branch: master Date: Mon, 5 Dec 2016 08:36:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: cae36cbe-4735-4c7a-9cb0-725f1ea73254 X-Archives-Hash: 5b4520b35546bce0d1c0030b7103b195 commit: de816e9be1f3db2925acbb33ee2d60ead8cd0837 Author: Lars Wendler gentoo org> AuthorDate: Mon Dec 5 08:36:31 2016 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Dec 5 08:36:44 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de816e9b 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 ...adline-6.2_p5-r1.ebuild => readline-6.2_p5-r2.ebuild} | 16 ++++++++++------ ...adline-6.3_p8-r2.ebuild => readline-6.3_p8-r3.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 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 36ffdf4..43bb680 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 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 48bcf83..20c1865 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