public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/readline/
Date: Sun,  9 Feb 2020 00:35:26 +0000 (UTC)	[thread overview]
Message-ID: <1581208520.12b0358a6fcf0ecd2acfa478e48455c314df0543.polynomial-c@gentoo> (raw)

commit:     12b0358a6fcf0ecd2acfa478e48455c314df0543
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  9 00:29:29 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 00:35:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12b0358a

sys-libs/readline: Bump to version 8.0_p4

Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-libs/readline/Manifest               |   3 +
 sys-libs/readline/readline-8.0_p4.ebuild | 175 +++++++++++++++++++++++++++++++
 2 files changed, 178 insertions(+)

diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 684e5d3b106..030cef77bba 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -15,3 +15,6 @@ DIST readline70-003 1294 BLAKE2B 9473e18b582fba69cea83e3f5b9fa278dd8b05443254393
 DIST readline70-004 1501 BLAKE2B cebce69a21bee3a4d6a908de09f371d65eab6af51a8dc0f58fc915b916957db420252ce07b06703c05d984f62e1e849b6975f5444b2af6ba35ff7c939acf9d99 SHA512 7be41558eab3b88a3657f8589ecfaff0b8ee7f59083d385f50e8704fe830e05a50652a5feda19ff1f3cfd98bff4bb8e25e1637ec4dac8a618db9c8220a3d954e
 DIST readline70-005 1641 BLAKE2B f720508f698b113c6328018f7e6e8775c7c79afc464047405a5c3dae017d611535017dfc2759c11483bb536fab1e9bf72c7a9d3c769b7aea3bd2cee9686bd522 SHA512 eeb27f4f9195cb905d5891f26480d58f59c885dde3457f7a30ff57760ac772e2333ee8aeae979214949f3b52030285b10db013e307ee7311abab677a4427e878
 DIST readline80-001 927 BLAKE2B 95e3ac33ff4adb65813274864c17781056a8ea065f9a76571b4a6bcb2ebab090c3a021fa2b621832c11b5995e48a8a26dd6e3a8f5864a8e8b520bfcf85d7c4ab SHA512 a148cda6ac97935d51ede1bbacf847d7d2cba8861cf3941d32e3da2f45f16dcc05b20845b63d4264692520db8329e1236cf2bc4fd8ccbe6e40921bbbdeb2cb1c
+DIST readline80-002 1401 BLAKE2B a2f511272f6d651208469998330059d6bae17bb8b704b64468685bb0368b76df1ca5b1dcd8e5cb0019e80932130c8a92fd1a305679bf79f0b801532a94c4b4ae SHA512 a941d142a59fe592cc45c1cf4d416e2fc0ab543dd6a0496fb8b2ec6f651cedd6fb9e0c105f14880700b69b2d6912653b3f66371e45cbe4adc0cc9554801afd3c
+DIST readline80-003 2158 BLAKE2B d8910aef1b796a59500b255df8db71ad1738dd164fd69827759eade74b6d9806ecd364839cfa904fc2f2d48352342155f670e5ec43aac0693f36820fb7139a4d SHA512 85235fca047b4ac87b846d998fffc67ae67ed365b068fd2743e84f11fd00086f85e622955192e07e3560965e32ff5f6d014e0146cde528fb0d0f7b5b829875ca
+DIST readline80-004 1275 BLAKE2B ac260bab163f17ccc783e0c2a21351b05e9e86ad973383d228d10ec749f265df8588c38946c9da15e987192b50f1bcb81141c2f4e171f65455f58521e864a534 SHA512 301ced2361e7583468f9932038936387a016c20d1c41966658a78c7f7c48c70308bf66b3228de0a3c6fc880427b6a90ee1ac4d2693daed432e5ae970671a7461

diff --git a/sys-libs/readline/readline-8.0_p4.ebuild b/sys-libs/readline/readline-8.0_p4.ebuild
new file mode 100644
index 00000000000..cd51e2e9352
--- /dev/null
+++ b/sys-libs/readline/readline-8.0_p4.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal preserve-libs toolchain-funcs usr-ldscript
+
+# 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}"
+[[ ${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="https://tiswww.case.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)"
+	;;
+esac
+
+LICENSE="GPL-3"
+SLOT="0/8"  # subslot matches SONAME major
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs +unicode utils"
+
+RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0-no_rpath.patch
+	"${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
+	"${FILESDIR}"/${PN}-7.0-headers.patch
+	"${FILESDIR}"/${PN}-8.0-headers.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
+
+	# Force ncurses linking. #71420
+	# Use pkg-config to get the right values. #457558
+	local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --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 || die # for local readline headers
+}
+
+src_configure() {
+	# fix implicit decls with widechar funcs
+	append-cppflags -D_GNU_SOURCE
+	# https://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
+		use kernel_Winnt || 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() {
+	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 --cache-file="${BUILD_DIR}"/config.cache
+	fi
+}
+
+multilib_src_compile() {
+	emake
+
+	if use utils && multilib_is_native_abi && ! 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) || die
+			ln -s ../../lib${l}.a lib${l}.a || die
+		done
+		emake
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a readline history #4411
+
+		if use utils && ! tc-is-cross-compiler; then
+			dobin examples/rlfe/rlfe
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs
+	dodoc USAGE
+	docinto ps
+	dodoc doc/*.ps
+}
+pkg_preinst() {
+	# bug #29865
+	# Reappeared in #595324 with paludis so keeping this for now...
+	preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5,6,7}
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5,6,7}
+}


             reply	other threads:[~2020-02-09  0:35 UTC|newest]

Thread overview: 181+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-09  0:35 Lars Wendler [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-12-23 10:52 [gentoo-commits] repo/gentoo:master commit in: sys-libs/readline/ Sam James
2024-12-17 17:17 Sam James
2024-12-13 15:46 Sam James
2024-12-06 16:07 Sam James
2024-12-06 13:04 Sam James
2024-12-01 17:35 Jakov Smolić
2024-12-01 10:17 Sam James
2024-12-01 10:12 Sam James
2024-12-01 10:12 Sam James
2024-12-01 10:12 Sam James
2024-12-01 10:12 Sam James
2024-12-01 10:11 Sam James
2024-11-23  3:33 Sam James
2024-11-23  3:33 Sam James
2024-11-16 10:15 Sam James
2024-11-16 10:15 Sam James
2024-11-05  1:21 Sam James
2024-10-15  5:22 Sam James
2024-10-12 23:45 Sam James
2024-10-10 12:20 Arthur Zamarin
2024-10-08 21:50 Jakov Smolić
2024-10-05 11:48 Arthur Zamarin
2024-10-05  9:44 Sam James
2024-10-05  9:21 Arthur Zamarin
2024-10-05  8:50 Arthur Zamarin
2024-08-30 14:59 Ionen Wolkens
2024-08-03 22:51 Sam James
2024-06-21  4:23 Arthur Zamarin
2024-06-20 21:46 Sam James
2024-06-20 21:46 Sam James
2024-06-20 20:17 Arthur Zamarin
2024-06-20 20:16 Arthur Zamarin
2024-06-20 20:14 Arthur Zamarin
2024-06-20 19:36 Arthur Zamarin
2024-05-11  2:17 Sam James
2024-04-23 14:02 Sam James
2024-04-23 13:56 Sam James
2024-04-23 13:56 Sam James
2024-03-19  3:42 Ionen Wolkens
2024-03-14  2:25 Sam James
2024-03-04 10:24 Sam James
2024-03-03  2:48 Sam James
2024-03-02 22:14 Sam James
2024-02-29 22:17 Sam James
2024-02-27 23:57 Sam James
2024-02-27 23:21 Sam James
2024-02-27 23:04 Sam James
2024-02-27 23:04 Sam James
2024-02-07 19:20 Sam James
2024-01-14 21:35 Sam James
2023-12-28 14:58 Sam James
2023-11-25  4:49 Sam James
2023-08-29 23:23 Sam James
2023-06-25 19:17 Sam James
2023-06-02 21:47 Sam James
2022-11-30  7:48 Sam James
2022-11-23 14:12 Jakov Smolić
2022-11-18 10:53 Arthur Zamarin
2022-11-18  7:00 Sam James
2022-11-18  6:50 Arthur Zamarin
2022-11-18  6:47 Arthur Zamarin
2022-11-18  6:45 Sam James
2022-11-18  6:43 Arthur Zamarin
2022-11-18  6:38 Arthur Zamarin
2022-10-18  2:47 Sam James
2022-10-06 14:45 Sam James
2022-10-06 14:45 Sam James
2022-09-26 17:54 Sam James
2022-09-26 17:53 Sam James
2022-09-23  2:09 Sam James
2022-09-10  0:29 Sam James
2022-08-26 22:57 Sam James
2022-08-26 22:54 Sam James
2022-08-26 22:54 Sam James
2022-07-26  4:10 Sam James
2022-07-26  4:10 Sam James
2022-07-26  2:17 Sam James
2022-06-17 19:33 Sam James
2022-04-19 18:59 Sam James
2022-04-13 17:51 Sam James
2022-04-07  0:09 Sam James
2022-02-08 19:38 Arthur Zamarin
2022-02-08 19:38 Arthur Zamarin
2022-02-08 19:37 Arthur Zamarin
2022-02-08  7:24 Agostino Sarubbo
2022-02-08  7:23 Agostino Sarubbo
2022-02-08  7:22 Agostino Sarubbo
2022-02-08  5:50 Sam James
2022-02-08  5:50 Sam James
2022-01-21 23:43 Sam James
2022-01-06 20:21 Sam James
2022-01-06 19:51 Lars Wendler
2021-11-18  4:30 Sam James
2021-10-14  8:57 Sam James
2021-10-14  8:39 Sam James
2021-09-03  1:53 Sam James
2021-07-17 21:30 David Seifert
2021-06-06 15:42 David Seifert
2021-05-14  9:20 Sam James
2021-05-14  9:20 Sam James
2021-05-14  9:19 Sam James
2021-05-14  9:01 Sam James
2021-05-14  9:01 Sam James
2021-05-14  9:01 Sam James
2021-05-14  8:56 Sam James
2021-05-14  8:56 Sam James
2021-05-13 19:02 Sam James
2021-05-13 18:56 Sam James
2021-05-13 16:59 Sam James
2021-05-13 16:55 Sam James
2021-05-13 16:54 Sam James
2021-05-13 16:44 Sam James
2021-05-13 16:29 Sam James
2021-05-04 19:50 Lars Wendler
2021-01-06 15:35 Fabian Groffen
2020-12-26 13:23 Fabian Groffen
2020-12-07 11:50 Lars Wendler
2020-11-18  8:29 Lars Wendler
2020-11-18  8:26 Lars Wendler
2020-11-04 15:49 Lars Wendler
2020-06-06 11:49 Lars Wendler
2020-05-30 19:20 Sergei Trofimovich
2020-05-11 11:38 Agostino Sarubbo
2020-05-06  6:28 Agostino Sarubbo
2020-05-06  6:27 Agostino Sarubbo
2020-05-04  6:16 Mart Raudsepp
2020-05-03 10:25 Agostino Sarubbo
2020-05-03 10:22 Agostino Sarubbo
2020-02-12 15:22 David Seifert
2020-02-09  0:35 Lars Wendler
2019-10-14  7:51 Lars Wendler
2019-10-14  7:36 Lars Wendler
2019-10-07  8:10 Lars Wendler
2019-08-18 23:09 Lars Wendler
2019-08-18 23:02 Lars Wendler
2019-08-15 10:50 Lars Wendler
2019-08-15 10:50 Lars Wendler
2019-05-13 17:57 Aaron Bauman
2019-05-03 23:59 Mikle Kolyada
2019-02-16 13:39 Mikle Kolyada
2019-02-16 13:39 Mikle Kolyada
2019-01-31 14:23 Tobias Klausmann
2019-01-29 11:40 Mikle Kolyada
2019-01-23 13:41 Mikle Kolyada
2019-01-17 22:41 Sergei Trofimovich
2019-01-17  8:29 Sergei Trofimovich
2019-01-17  8:08 Sergei Trofimovich
2019-01-17  8:01 Sergei Trofimovich
2019-01-17  7:23 Sergei Trofimovich
2019-01-16 10:50 Mikle Kolyada
2019-01-15 22:10 Thomas Deutschmann
2019-01-15 10:36 Mart Raudsepp
2019-01-13 11:18 Lars Wendler
2018-06-07  8:09 Lars Wendler
2018-05-11 19:52 Mikle Kolyada
2018-04-21 20:54 Mart Raudsepp
2018-04-12 15:45 Lars Wendler
2018-03-22 17:34 Mikle Kolyada
2018-03-04  8:16 Tobias Klausmann
2018-01-10  6:19 Markus Meier
2018-01-05  9:35 Lars Wendler
2018-01-03 17:19 Mikle Kolyada
2018-01-03  9:28 Sergei Trofimovich
2018-01-03  9:04 Sergei Trofimovich
2017-06-17 21:54 Lars Wendler
2017-02-14 12:19 Lars Wendler
2016-12-05  8:36 Lars Wendler
2016-12-04 12:44 Lars Wendler
2016-10-07  9:06 Lars Wendler
2016-09-28  5:43 Lars Wendler
2016-09-16  7:44 Lars Wendler
2016-09-15 18:38 Lars Wendler
2016-09-15 18:38 Lars Wendler
2016-08-23  9:07 Lars Wendler
2016-08-23  9:07 Lars Wendler
2016-05-21 13:28 Benda XU
2016-02-24 16:01 Mike Frysinger
2015-10-24 23:35 Mike Frysinger
2015-10-15 16:22 Mike Frysinger
2015-08-16 11:30 Justin Lecher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1581208520.12b0358a6fcf0ecd2acfa478e48455c314df0543.polynomial-c@gentoo \
    --to=polynomial-c@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox