From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- dev-libs/libedit/Manifest | 7 ++-- .../libedit/files/libedit-20170329.3.1-tinfo.patch | 30 ------------- dev-libs/libedit/libedit-20191211.3.1.ebuild | 49 ---------------------- dev-libs/libedit/libedit-20210216.3.1.ebuild | 4 +- dev-libs/libedit/libedit-20210419.3.1.ebuild | 43 +++++++++++++++++++ 5 files changed, 48 insertions(+), 85 deletions(-) delete mode 100644 dev-libs/libedit/files/libedit-20170329.3.1-tinfo.patch delete mode 100644 dev-libs/libedit/libedit-20191211.3.1.ebuild create mode 100644 dev-libs/libedit/libedit-20210419.3.1.ebuild (limited to 'dev-libs/libedit') diff --git a/dev-libs/libedit/Manifest b/dev-libs/libedit/Manifest index 24f57ff1bd02..a7d671abf520 100644 --- a/dev-libs/libedit/Manifest +++ b/dev-libs/libedit/Manifest @@ -1,6 +1,5 @@ -AUX libedit-20170329.3.1-tinfo.patch 954 BLAKE2B 1ec89a124ebfa5b96b8b14ef44008b50263f297db16bd838dd31b571ee69f0f15056542be533115d92115963e49b357e0caddcb34a0e5a9eb7160fddecb9ca5c SHA512 e03cef80831c8982705e9ba3448a379e48a443b3b09b4c6f6be56ca2d0ac594f4569b76739551cc945bef27fc0fac2ffea3ad532355933a528753338f4094172 -DIST libedit-20191211-3.1.tar.gz 516620 BLAKE2B 765926c035143e8e409d87d4f75709c861d83e2d725ec02c7ecfc3cccebe895be7d2902dd41970811207db32e6847689368f6544ea49ad42a600037a3a4edb58 SHA512 8393477a87e65d330b037494110501b5d6d2c1cbe80d82b9bc7a6315a21fd1327fe91354346966d30541015e2c277be2187fa4bb737b14f706957c70f4083547 DIST libedit-20210216-3.1.tar.gz 518381 BLAKE2B 4b29f08ddccd77148c7ae810c3c4e378f6eab4b6d2c530f21aa9c0da1bc156d646bac6404408510639c34298ef3583fd7f2bde5051c0dac8b3a125e2659d8412 SHA512 2577c66b3f20a7f3cdaac529bda7f55dbed1cd902f39971b8f792885dec7f8c137a980c570dbab195d3d45989cc9d16a96a3567e02c5ac32ed4757fa36e46b4c -EBUILD libedit-20191211.3.1.ebuild 1138 BLAKE2B deb7c2ef49a6252134c6d875b05e8c56f20dccc08906266f6ae58d96e2053751f4e4a756255e55d1ab7ee820371582f93094c473e52eff56eb3373ae2d9c672f SHA512 530de4d2e9057d064c7ac5149b82ae2893f30ea1a34fbeec79bdac6308c6ee73a4f30ea19560d9766fa06331354cddbfe1ee17d942dbafdad8dca4625b3a42ff -EBUILD libedit-20210216.3.1.ebuild 1076 BLAKE2B dd57f842c575047c0e8480e4ca90126f4c1decc736c44e0088cf10ee28546af05dd461eedf6eb62786b3edc846bdcac2c8659f21d5d7123d06abf5a14e76aba7 SHA512 bf6780273b052aca0b4ac375c41bd1b3bb8c4d4f8478abaa8d896a7f0e21b37804767ab190cb2e531ab4d1e8f0decea232f581bd7aade04b7a0ba9952b6996ee +DIST libedit-20210419-3.1.tar.gz 522387 BLAKE2B 265c7a10905120feb096d147279a9cf7296cf3b19e16ff4a683d7de11305c0d0c7a67fe8652c1b8f16cbaf3e09b7727987bb6839be4657eb41323c0220704969 SHA512 d5e2cdad18d17fb94e839d02b7b7437378bb85986478d4c95e4105a6ac47fcbbd6bdd0a20a83d23455ed9cb1e178d6c0acbe63f4559096afd506f283c2cc00e9 +EBUILD libedit-20210216.3.1.ebuild 1042 BLAKE2B 322abd1848d37ff9af698b84771f3a59394c513c4e6e05e9b8920f918c23a071d0e9c5d3762993b0c58e6cf91657081f8930cf745405a44859b3f5f125ab5a91 SHA512 5a7476007f620f676971050ae1e0620877e50039d119601386c9281b7b9118b2543fb64897daca5e3e6a525f91a056ac9d9bbee0ed4f2a5ad026c53accb759dd +EBUILD libedit-20210419.3.1.ebuild 1050 BLAKE2B cdfe8dbc428f92ece8a36cd29630b8ba3237c13efff3fbdc9f7ccb189ba8b169ea4dd1f6639d0fba57b2b48233f6dd79480fa6b8a35f0acd25cede62b3a26865 SHA512 be908abb3e81a7c14383cd14369e98f8b24a45478d5073688adaf6245d6d827336715daf5db978eb87ba5ab6f24a7b7c30c5ce7740bb815a806658e7cb2142ac MISC metadata.xml 641 BLAKE2B 9571b8de7209e3769419ab4286915a24f0efdc432725f0d7157a7625049702db7b05819e542a586583c3df77a3ad34b099c1f00d28855dcf7e117a81f5828e46 SHA512 ad32daf90166761308b53cb1de6fe923e52217f7d3e2359a7c5b8797841de3d4064437b1ffba727acca9085816b615e0c207c268017908ac1557943730539629 diff --git a/dev-libs/libedit/files/libedit-20170329.3.1-tinfo.patch b/dev-libs/libedit/files/libedit-20170329.3.1-tinfo.patch deleted file mode 100644 index e52b2559aa75..000000000000 --- a/dev-libs/libedit/files/libedit-20170329.3.1-tinfo.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7aa660fd9d446567d3280765ba2a50a46b2a9159 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Mon, 12 Jun 2017 21:36:54 +0200 -Subject: [PATCH] configure: Support -ltinfo as split in newer ncurses - -The newer versions of ncurses support building terminfo routines -as a split -ltinfo library. Account for that by adding this library -to the search list. ---- - configure.ac | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 9a571b2..5d714b5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -49,7 +49,9 @@ EL_MANTYPE - AC_CHECK_LIB(ncurses, tgetent,, - [AC_CHECK_LIB(curses, tgetent,, - [AC_CHECK_LIB(termcap, tgetent,, -- [AC_MSG_ERROR([libncurses, libcurses, or libtermcap is required!])] -+ [AC_CHECK_LIB(tinfo, tgetent,, -+ [AC_MSG_ERROR([libncurses, libcurses, libtermcap or libtinfo is required!])] -+ )] - )] - )] - ) --- -2.13.1 - diff --git a/dev-libs/libedit/libedit-20191211.3.1.ebuild b/dev-libs/libedit/libedit-20191211.3.1.ebuild deleted file mode 100644 index c5be4154428c..000000000000 --- a/dev-libs/libedit/libedit-20191211.3.1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -inherit autotools multilib-minimal toolchain-funcs usr-ldscript - -MY_PV=${PV/./-} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="BSD replacement for libreadline" -HOMEPAGE="https://thrysoee.dk/editline/" -SRC_URI="https://thrysoee.dk/editline/${MY_P}.tar.gz" -S=${WORKDIR}/${MY_P} - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="static-libs" - -RDEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]" -DEPEND=${RDEPEND} - -PATCHES=( - "${FILESDIR}/${PN}-20170329.3.1-tinfo.patch" -) - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable static-libs static) \ - --enable-widec \ - --enable-fast-install -} - -multilib_src_install() { - emake DESTDIR="${D}" install - gen_usr_ldscript -a edit -} - -multilib_src_install_all() { - einstalldocs - find "${D}" -name '*.la' -delete || die - # file collision with sys-libs/readline - rm "${ED}/usr/share/man/man3/history.3" || die -} diff --git a/dev-libs/libedit/libedit-20210216.3.1.ebuild b/dev-libs/libedit/libedit-20210216.3.1.ebuild index f615587f5f2b..0884e172659f 100644 --- a/dev-libs/libedit/libedit-20210216.3.1.ebuild +++ b/dev-libs/libedit/libedit-20210216.3.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -inherit autotools multilib-minimal toolchain-funcs usr-ldscript +inherit multilib-minimal usr-ldscript MY_PV=${PV/./-} MY_P=${PN}-${MY_PV} @@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_P} LICENSE="BSD-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="static-libs" RDEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]" diff --git a/dev-libs/libedit/libedit-20210419.3.1.ebuild b/dev-libs/libedit/libedit-20210419.3.1.ebuild new file mode 100644 index 000000000000..0dd34927e935 --- /dev/null +++ b/dev-libs/libedit/libedit-20210419.3.1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +inherit multilib-minimal usr-ldscript + +MY_PV=${PV/./-} +MY_P=${PN}-${MY_PV} + +DESCRIPTION="BSD replacement for libreadline" +HOMEPAGE="https://thrysoee.dk/editline/" +SRC_URI="https://thrysoee.dk/editline/${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="static-libs" + +RDEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]" +DEPEND=${RDEPEND} + +multilib_src_configure() { + local myconf=( + $(use_enable static-libs static) + --enable-widec + --enable-fast-install + ) + + ECONF_SOURCE="${S}" econf "${myconf[@]}" +} + +multilib_src_install() { + emake DESTDIR="${D}" install + gen_usr_ldscript -a edit +} + +multilib_src_install_all() { + einstalldocs + find "${D}" -name '*.la' -delete || die + # file collision with sys-libs/readline + rm "${ED}/usr/share/man/man3/history.3" || die +} -- cgit v1.2.3