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 589D31382C5 for ; Thu, 12 Apr 2018 15:45:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 65EDDE0883; Thu, 12 Apr 2018 15:45:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 315C7E0883 for ; Thu, 12 Apr 2018 15:45:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D4C62335C7A for ; Thu, 12 Apr 2018 15:45:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 36D48285 for ; Thu, 12 Apr 2018 15:45:40 +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: <1523547922.2bd8ed47fd1c293f87eb9c64e2a0b3fcae662717.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-7.0_p3-r1.ebuild X-VCS-Directories: sys-libs/readline/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 2bd8ed47fd1c293f87eb9c64e2a0b3fcae662717 X-VCS-Branch: master Date: Thu, 12 Apr 2018 15:45:40 +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: 5e2e7a14-9750-4d32-a163-6242d7998cce X-Archives-Hash: 4dc993b2a04cbf78045e0dc6ccba96e8 commit: 2bd8ed47fd1c293f87eb9c64e2a0b3fcae662717 Author: Lars Wendler gentoo org> AuthorDate: Thu Apr 12 15:45:22 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Apr 12 15:45:22 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bd8ed47 sys-libs/readline: Post EAPI-6 conversion cleanup. Package-Manager: Portage-2.3.28, Repoman-2.3.9 sys-libs/readline/readline-7.0_p3-r1.ebuild | 37 +++++++++++++++++++---------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/sys-libs/readline/readline-7.0_p3-r1.ebuild b/sys-libs/readline/readline-7.0_p3-r1.ebuild index 6bc35b2a686..ceeb39505bd 100644 --- a/sys-libs/readline/readline-7.0_p3-r1.ebuild +++ b/sys-libs/readline/readline-7.0_p3-r1.ebuild @@ -7,10 +7,10 @@ inherit flag-o-matic multilib-minimal toolchain-funcs # Official patches # See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/ -PLEVEL=${PV##*_p} -MY_PV=${PV/_p*} -MY_PV=${MY_PV/_/-} -MY_P=${PN}-${MY_PV} +PLEVEL="${PV##*_p}" +MY_PV="${PV/_p*}" +MY_PV="${MY_PV/_/-}" +MY_P="${PN}-${MY_PV}" [[ ${PV} != *_p* ]] && PLEVEL=0 patches() { [[ ${PLEVEL} -eq 0 ]] && return 1 @@ -29,9 +29,14 @@ patches() { DESCRIPTION="Another cute console display library" HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" + case ${PV} in -*_alpha*|*_beta*|*_rc*) SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" ;; -*) SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" ;; + *_alpha*|*_beta*|*_rc*) + SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" + ;; + *) + SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" + ;; esac LICENSE="GPL-3" @@ -53,6 +58,12 @@ PATCHES=( "${FILESDIR}"/${PN}-7.0-mingw.patch ) +# Needed because we don't want the patches being unpacked +# (which emits annoying and useless error messages) +src_unpack() { + unpack ${MY_P}.tar.gz +} + src_prepare() { [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s) default @@ -103,18 +114,18 @@ src_configure() { } multilib_src_configure() { - ECONF_SOURCE=${S} \ - econf \ - --cache-file="${BUILD_DIR}"/config.cache \ - --docdir='$(datarootdir)'/doc/${PF} \ - --with-curses \ + local myeconfargs=( + --cache-file="${BUILD_DIR}"/config.cache + --with-curses $(use_enable static-libs static) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then # code is full of AC_TRY_RUN() mkdir -p examples/rlfe || die cd examples/rlfe || die - ECONF_SOURCE=${S}/examples/rlfe \ + ECONF_SOURCE="${S}"/examples/rlfe \ econf --cache-file="${BUILD_DIR}"/config.cache fi } @@ -128,7 +139,7 @@ multilib_src_compile() { local l for l in readline history ; do ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die - ln -sf ../../lib${l}.a lib${l}.a || die + ln -s ../../lib${l}.a lib${l}.a || die done emake fi