* [gentoo-commits] gentoo-x86 commit in sys-libs/readline: readline-6.3-r4.ebuild ChangeLog readline-6.3-r3.ebuild
@ 2014-03-28 19:04 Mike Frysinger (vapier)
0 siblings, 0 replies; only message in thread
From: Mike Frysinger (vapier) @ 2014-03-28 19:04 UTC (permalink / raw
To: gentoo-commits
vapier 14/03/28 19:04:47
Modified: ChangeLog
Added: readline-6.3-r4.ebuild
Removed: readline-6.3-r3.ebuild
Log:
Update multikey patch from upstream #504440#8 by Martin von Gagern.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path
1.198 sys-libs/readline/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/readline/ChangeLog?rev=1.198&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/readline/ChangeLog?rev=1.198&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/readline/ChangeLog?r1=1.197&r2=1.198
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- ChangeLog 28 Mar 2014 02:10:02 -0000 1.197
+++ ChangeLog 28 Mar 2014 19:04:47 -0000 1.198
@@ -1,6 +1,12 @@
# ChangeLog for sys-libs/readline
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.197 2014/03/28 02:10:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.198 2014/03/28 19:04:47 vapier Exp $
+
+*readline-6.3-r4 (28 Mar 2014)
+
+ 28 Mar 2014; Mike Frysinger <vapier@gentoo.org> +readline-6.3-r4.ebuild,
+ -readline-6.3-r3.ebuild, files/readline-6.3-dispatch-multikey.patch:
+ Update multikey patch from upstream #504440#8 by Martin von Gagern.
*readline-6.3-r3 (28 Mar 2014)
1.1 sys-libs/readline/readline-6.3-r4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/readline/readline-6.3-r4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/readline/readline-6.3-r4.ebuild?rev=1.1&content-type=text/plain
Index: readline-6.3-r4.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.3-r4.ebuild,v 1.1 2014/03/28 19:04:47 vapier Exp $
EAPI=4
inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal
# Official patches
# See ftp://ftp.cwru.edu/pub/bash/readline-6.3-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 ~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.2-r2[${MULTILIB_USEDEP}]
abi_x86_32? (
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
!<=app-emulation/emul-linux-x86-baselibs-20131008-r7
)"
DEPEND="${RDEPEND}
virtual/pkgconfig"
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}-6.2-rlfe-tgoto.patch #385091
epatch "${FILESDIR}"/${P}-vi-last.patch
epatch "${FILESDIR}"/${P}-dispatch-multikey.patch #504440
epatch "${FILESDIR}"/${P}-readline-sigint-cleanup.patch
# Force ncurses linking. #71420
# Use pkg-config to get the right values. #457558
local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs)
sed -i \
-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
support/shobj-conf || die
sed -i \
-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
examples/rlfe/configure || 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
# Control cross-compiling cases when we know the right answer.
# In cases where the C library doesn't support wide characters, readline
# itself won't work correctly, so forcing the answer below should be OK.
if tc-is-cross-compiler ; then
export bash_cv_func_sigsetjmp='present'
export bash_cv_func_ctype_nonascii='yes'
export bash_cv_wcwidth_broken='no' #503312
fi
# 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}
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-03-28 19:04 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-28 19:04 [gentoo-commits] gentoo-x86 commit in sys-libs/readline: readline-6.3-r4.ebuild ChangeLog readline-6.3-r3.ebuild Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox