From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7CC08138247 for ; Fri, 27 Dec 2013 22:55:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 829D5E08BD; Fri, 27 Dec 2013 22:55:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0D00FE08BD for ; Fri, 27 Dec 2013 22:55:44 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 043AE33F74A for ; Fri, 27 Dec 2013 22:55:44 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2279) id 42BF12004C; Fri, 27 Dec 2013 22:55:42 +0000 (UTC) From: "Michal Gorny (mgorny)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mgorny@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-libs/readline: readline-6.2_p5-r1.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: readline-6.2_p5-r1.ebuild ChangeLog X-VCS-Directories: sys-libs/readline X-VCS-Committer: mgorny X-VCS-Committer-Name: Michal Gorny Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20131227225542.42BF12004C@flycatcher.gentoo.org> Date: Fri, 27 Dec 2013 22:55:42 +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: 3fa8d6b5-2dfc-44cf-9551-907785ac02d9 X-Archives-Hash: 064e8e78ba7663725a45eb1378e13bce mgorny 13/12/27 22:55:42 Modified: ChangeLog Added: readline-6.2_p5-r1.ebuild Log: Add multilib support, bug #496006. (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) Revision Changes Path 1.186 sys-libs/readline/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/readline/ChangeLog?rev=1.186&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/readline/ChangeLog?rev=1.186&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/readline/ChangeLog?r1=1.185&r2=1.186 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v retrieving revision 1.185 retrieving revision 1.186 diff -u -r1.185 -r1.186 --- ChangeLog 25 Dec 2013 23:46:50 -0000 1.185 +++ ChangeLog 27 Dec 2013 22:55:42 -0000 1.186 @@ -1,6 +1,11 @@ # ChangeLog for sys-libs/readline # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.185 2013/12/25 23:46:50 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.186 2013/12/27 22:55:42 mgorny Exp $ + +*readline-6.2_p5-r1 (27 Dec 2013) + + 27 Dec 2013; Michał Górny +readline-6.2_p5-r1.ebuild: + Add multilib support, bug #496006. 25 Dec 2013; Mike Frysinger readline-6.2_p5.ebuild: update dodoc line 1.1 sys-libs/readline/readline-6.2_p5-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/readline/readline-6.2_p5-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/readline/readline-6.2_p5-r1.ebuild?rev=1.1&content-type=text/plain Index: readline-6.2_p5-r1.ebuild =================================================================== # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.2_p5-r1.ebuild,v 1.1 2013/12/27 22:55:41 mgorny Exp $ EAPI="4" inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal # Official patches # See ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/ 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 local opt=$1 eval set -- {1..${PLEVEL}} set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@") if [[ ${opt} == -s ]] ; then echo "${@/#/${DISTDIR}/}" else local u for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do printf "${u}/${PN}-${MY_PV}-patches/%s " "$@" done fi } DESCRIPTION="Another cute console display library" HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~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.2-r2[${MULTILIB_USEDEP}] abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r6 )" DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} 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 # Force ncurses linking. #71420 # Use pkg-config to get the right values. #457558 sed -i \ -e "s:^SHLIB_LIBS=:SHLIB_LIBS='$($(tc-getPKG_CONFIG) ncurses --libs)':" \ support/shobj-conf || die # fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated # objformat for years, so we don't want to rely on that. sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die ln -s ../.. examples/rlfe/readline # for local readline headers } src_configure() { # fix implicit decls with widechar funcs append-cppflags -D_GNU_SOURCE # http://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free # Make sure configure picks a better ar than `ar`. #484866 export ac_cv_prog_AR=$(tc-getAR) # Force the test since we used sed above to force it. export bash_cv_termcap_lib=ncurses # This is for rlfe, but we need to make sure LDFLAGS doesn't change # so we can re-use the config cache file between the two. append-ldflags -L. multilib-minimal_src_configure } multilib_src_configure() { ECONF_SOURCE=${S} \ econf \ --cache-file="${BUILD_DIR}"/config.cache \ --with-curses \ $(use_enable static-libs static) if multilib_build_binaries && ! 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 --cache-file="${BUILD_DIR}"/config.cache fi } multilib_src_compile() { emake if multilib_build_binaries && ! tc-is-cross-compiler ; then # code is full of AC_TRY_RUN() cd examples/rlfe || die local l for l in readline history ; do ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) ln -sf ../../lib${l}.a lib${l}.a done emake fi } multilib_src_install() { default if multilib_build_binaries ; then gen_usr_ldscript -a readline history #4411 if ! tc-is-cross-compiler; then dobin examples/rlfe/rlfe fi fi } multilib_src_install_all() { einstalldocs dodoc USAGE dohtml -r doc/. docinto ps dodoc doc/*.ps } pkg_preinst() { preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5} #29865 } pkg_postinst() { preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5} }