From 908778078736bd36f7a60a2d576d415cb8e000fa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 22 May 2021 07:31:18 +0100 Subject: gentoo resync : 22.05.2021 --- sys-libs/ncurses-compat/Manifest | 5 +- .../ncurses-compat-6.1_p20190609.ebuild | 227 --------------------- sys-libs/ncurses-compat/ncurses-compat-6.2.ebuild | 2 +- 3 files changed, 2 insertions(+), 232 deletions(-) delete mode 100644 sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild (limited to 'sys-libs/ncurses-compat') diff --git a/sys-libs/ncurses-compat/Manifest b/sys-libs/ncurses-compat/Manifest index c8d3a59069d2..6f995a3174bc 100644 --- a/sys-libs/ncurses-compat/Manifest +++ b/sys-libs/ncurses-compat/Manifest @@ -4,9 +4,6 @@ AUX ncurses-6.0-cppflags-cross.patch 1240 BLAKE2B 56fbe4810c28e089a8ceb8fa8c983d AUX ncurses-6.0-pkg-config.patch 386 BLAKE2B 27a61878d45aa781291e18a2e18b8e861dd88f523083a54032511ceea2784b5020c500d0d277fe448381a969989d896ca32c46af35ad29f35dace97511dda9eb SHA512 8065f50a1d0b2ccd8c8d9b5b6bcf10b07351e2f5e51c17a825057235a63459839771ea249aac7fa50e09c7bacde5179a92f3efe587cf3cf6697ec663faf6caf3 AUX ncurses-6.0-rxvt-unicode-9.15.patch 3759 BLAKE2B 88e1b6145c5d1afa9d319fdf1bb70967705cc0460fb87cb3897d0e86678b065bc365573859d1cb96ac4209e61a4c43a84cd0cc3b86680e965e3bf404271354ef SHA512 5601446d34421453fb8ed0e7172b4a5230ab4f10a6ded27e6dc52f82f121cb0af510dfc8f60d9ba0d3b9a1d90a8a832c38e24256e394d8ffccbbf12a109e2da4 AUX ncurses-6.0-ticlib.patch 492 BLAKE2B df9e747a773b532aab42def40fa048a08ae4d02b83c78bfb5fd89b70b9b753534769c5c52a0d1adde7447cd25a286fc8b5d9f52f395c6287d7cd568f184242d7 SHA512 291ed033118673aed1bc5d3b54730d099dffccad7bbe9cb47275bb216125ef9016225eaccae620fa3b06533b7633061a8029e19c8cb9f73c3e30499f587353d6 -DIST ncurses-6.1-20190609-patch.sh.bz2 602174 BLAKE2B 38b1cb1f376b8fdfddc7cf9ed8e10190dd50fc2315f11eaf3a14c0299167c0e6bbd82a3684fa83d6e8fa6d2f02ea14e88ea065f8bb886905d85788bde13731c0 SHA512 efd009f5087a7b16413b94ce37ad19da0df8974be579b742d57bc64e034792ccf03b9967593a0ac5c90522ccfde4b6d23ef763d6fbeb91a5f327f8d7a0970872 -DIST ncurses-6.1.tar.gz 3365395 BLAKE2B 1248a5088bc982d0880cb9550b1192457f6f624937c4b66807668c22a608002ba6c38d876986f2c2b9ee46f91d087c88bc0b19920733e4c7ca0ed8e92d9d47de SHA512 e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee DIST ncurses-6.2.tar.gz 3425862 BLAKE2B 6680cd7a369a4cb8234442a70869c283f0db6db9d7da1da2a7a5c519eb862a2c9b9411957d99f9ebb5089cad00b42e1ca6bc0784327461113df2eeaec695913c SHA512 4c1333dcc30e858e8a9525d4b9aefb60000cfc727bc4a1062bace06ffc4639ad9f6e54f6bdda0e3a0e5ea14de995f96b52b3327d9ec633608792c99a1e8d840d -EBUILD ncurses-compat-6.1_p20190609.ebuild 6326 BLAKE2B 7890df6ed17ce8520b5bcb9dcb61b93e1b8daeff464431acd88f4d08d1cada762014ac31139a84c9125f9a6ef017f962862d577fe422a727e9c14483cb4e7579 SHA512 8c4b8d1ff0432b01793fd9a5db0a99824956dfb4bd274a2ec52147355963a504cc4c826f5c97ed1666f5f174d85455cb963c8cb89a9cf89e0ab1abaed3c94004 -EBUILD ncurses-compat-6.2.ebuild 6333 BLAKE2B c4c2f0794236630dc8ddc9c60495edf8d95c245e23e7cfbb8cd8a175e7aa3aae04e9c69a92c4dc8956e8e85aeacdf7bb4c12d2f1f82f1ed2bc335195b8f3437c SHA512 e5f28598938d53b68c7bc9410f2801ed744997397bf91c48abb99fd334f24591ff6d1cc2ae7be300e3fd9dc21107156986f3a96b0de17ca698e0b06afe814a29 +EBUILD ncurses-compat-6.2.ebuild 6326 BLAKE2B 7890df6ed17ce8520b5bcb9dcb61b93e1b8daeff464431acd88f4d08d1cada762014ac31139a84c9125f9a6ef017f962862d577fe422a727e9c14483cb4e7579 SHA512 8c4b8d1ff0432b01793fd9a5db0a99824956dfb4bd274a2ec52147355963a504cc4c826f5c97ed1666f5f174d85455cb963c8cb89a9cf89e0ab1abaed3c94004 MISC metadata.xml 553 BLAKE2B b4d08cf9605063f09966cab08e095e0ed0194e03d941aceab3c3990aac37e143a2d0b0f69488c621fe200195c639ff4f3fdbf7969869edc4e237d994b8802084 SHA512 96895eee198c9686f03715f854fceab32e726f2944c357fb9c59915756132d57a919e0e10bb8bd093315b0102831ddd6db32060723997bc9134bf6f3e34e84e9 diff --git a/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild b/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild deleted file mode 100644 index 0c319e1dadb0..000000000000 --- a/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild +++ /dev/null @@ -1,227 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# This version is just for the ABI .5 library - -EAPI=7 - -inherit flag-o-matic toolchain-funcs multilib-minimal preserve-libs usr-ldscript - -MY_PV="${PV:0:3}" -MY_P="${PN/-compat}-${MY_PV}" -MY_PN="${PN/-compat}" - -DESCRIPTION="console display library (ABI version 5)" -HOMEPAGE="https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/" -SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz" - -if [[ "${PV}" == *_p* ]] ; then - SRC_URI+=" ftp://ftp.invisible-island.net/ncurses/${PV/_p*}/${MY_PN}-${PV/_p/-}-patch.sh.bz2 - https://invisible-mirror.net/archives/ncurses/${PV/_p*}/${MY_PN}-${PV/_p/-}-patch.sh.bz2" -fi - -LICENSE="MIT" -# The subslot reflects the SONAME. -SLOT="5/5" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="gpm tinfo unicode" - -DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )" -# Block the ncurses-5 that installs the same lib. #557472 -RDEPEND="${DEPEND} - !& /dev/null \ - || lbuildflags="${dbuildflags}" - - # We can't re-use the multilib BUILD_DIR because we run outside of it. - BUILD_DIR="${WORKDIR}" \ - CHOST=${CBUILD} \ - CFLAGS=${BUILD_CFLAGS} \ - CXXFLAGS=${BUILD_CXXFLAGS} \ - CPPFLAGS=${BUILD_CPPFLAGS} \ - LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \ - do_configure cross --without-shared --with-normal - fi - multilib-minimal_src_configure -} - -multilib_src_configure() { - local t - for t in "${NCURSES_TARGETS[@]}" ; do - do_configure "${t}" - done -} - -do_configure() { - local target=$1 - shift - - mkdir "${BUILD_DIR}/${target}" || die - cd "${BUILD_DIR}/${target}" || die - - local conf=( - # We need the basic terminfo files in /etc, bug #37026. We will - # add '--with-terminfo-dirs' and then populate /etc/terminfo in - # src_install() ... - ##--with-rel-version=5.9 ?? - --with-abi-version=5 - --with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo" - - # Now the rest of the various standard flags. - --without-hashed-db - --disable-pc-files - --with-shared - --without-hashed-db - --without-ada - --without-cxx - --without-cxx-binding - --without-debug - --without-profile - # The configure script uses ldd to parse the linked output which - # is flaky for cross-compiling/multilib/ldd versions/etc... - $(use_with gpm gpm libgpm.so.1) - --disable-termcap - --enable-symlinks - --with-rcs-ids - --with-manpage-format=normal - --enable-const - --enable-colorfgbg - --enable-echo - --disable-warnings - --without-assertions - --enable-leaks - --without-expanded - --with-macros - --without-progs - --without-tests - --without-trace - $(use_with tinfo termlib) - - # The chtype/mmask-t settings below are to retain ABI compat - # with ncurses-5.4 so dont change em ! - --with-chtype=long - --with-mmask-t=long - --disable-ext-colors - --disable-ext-mouse - --without-{pthread,reentrant} - ) - - if [[ ${target} == ncurses*w ]] ; then - conf+=( --enable-widec ) - else - conf+=( --disable-widec ) - fi - # Make sure each variant goes in a unique location. - if [[ ${target} != "ncurses" ]] ; then - conf+=( --includedir="${EPREFIX}"/usr/include/${target} ) - fi - # See comments in src_configure. - if [[ ${target} != "cross" ]] ; then - local cross_path="${WORKDIR}/cross" - [[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic" - else - conf+=( --with-progs ) - fi - - # Force bash until upstream rebuilds the configure script with a newer - # version of autotools. #545532 - CONFIG_SHELL="${EPREFIX}"/bin/bash \ - ECONF_SOURCE="${S}" \ - econf "${conf[@]}" "$@" -} - -src_compile() { - # See comments in src_configure. - if ! has_version -b "~sys-libs/${P}:0" ; then - BUILD_DIR="${WORKDIR}" \ - do_compile cross -C progs tic - fi - - multilib-minimal_src_compile -} - -multilib_src_compile() { - local t - for t in "${NCURSES_TARGETS[@]}" ; do - do_compile "${t}" - done -} - -do_compile() { - local target=$1 - shift - - cd "${BUILD_DIR}/${target}" || die - - # A little hack to fix parallel builds ... they break when - # generating sources so if we generate the sources first (in - # non-parallel), we can then build the rest of the package - # in parallel. This is not really a perf hit since the source - # generation is quite small. - emake -j1 sources - # For some reason, sources depends on pc-files which depends on - # compiled libraries which depends on sources which ... - # Manually delete the pc-files file so the install step will - # create the .pc files we want. - rm -f misc/pc-files || die - emake "$@" -} - -multilib_src_install() { - local target lib - for target in "${NCURSES_TARGETS[@]}" ; do - cd "${BUILD_DIR}/${target}/lib" || die - for lib in *5.9 ; do - newlib.so "${lib}" "${lib%%.9}" - done - done -} diff --git a/sys-libs/ncurses-compat/ncurses-compat-6.2.ebuild b/sys-libs/ncurses-compat/ncurses-compat-6.2.ebuild index 0484acd9547a..0c319e1dadb0 100644 --- a/sys-libs/ncurses-compat/ncurses-compat-6.2.ebuild +++ b/sys-libs/ncurses-compat/ncurses-compat-6.2.ebuild @@ -23,7 +23,7 @@ fi LICENSE="MIT" # The subslot reflects the SONAME. SLOT="5/5" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="gpm tinfo unicode" DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )" -- cgit v1.2.3