diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-03-29 16:53:27 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-03-29 16:53:27 +0100 |
| commit | 1173ad5704ce725916e0c332416aff326d850d06 (patch) | |
| tree | d48d60977ce19864893dfb2222bf2982ffb4262a /sys-libs/ncurses | |
| parent | 8c364c784966be1700ea39ae45028f3e9be9cae0 (diff) | |
gentoo resync : 29.03.2018
Diffstat (limited to 'sys-libs/ncurses')
| -rw-r--r-- | sys-libs/ncurses/Manifest | 4 | ||||
| -rw-r--r-- | sys-libs/ncurses/ncurses-6.0-r2.ebuild | 8 | ||||
| -rw-r--r-- | sys-libs/ncurses/ncurses-6.1-r2.ebuild | 10 |
3 files changed, 17 insertions, 5 deletions
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest index 7df50085f793..e274cc08691f 100644 --- a/sys-libs/ncurses/Manifest +++ b/sys-libs/ncurses/Manifest @@ -16,6 +16,6 @@ DIST ncurses-6.0.tar.gz 3131891 BLAKE2B 68670ebdaba28c7a750631da01a0e3681b476cc9 DIST ncurses-6.1.tar.gz 3365395 BLAKE2B 1248a5088bc982d0880cb9550b1192457f6f624937c4b66807668c22a608002ba6c38d876986f2c2b9ee46f91d087c88bc0b19920733e4c7ca0ed8e92d9d47de SHA512 e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee EBUILD ncurses-5.9-r101.ebuild 5283 BLAKE2B 2860fee40555ddc883b4ffffc8ea1055c4c5151b451b8a25226fbed116d37e3862a6c9c885666365882bea428fff71417811b5ba04aa72ae0df6ed6bb3afbeaa SHA512 dce58899c1ca8b1ba1206fcbc015821e5de433b8ca4f750889d9281e35c15e70bd2628f4ef3a9990d7f1c8d6a757368833d9c88587eff6e480465697ac29d6f3 EBUILD ncurses-6.0-r1.ebuild 8633 BLAKE2B b177892af3da61b6f3d2e276a3545de911ae0dbe123797807b63d45fb912b4b0333b487fe52827abe1154332902f9f111b65890fbb4063c691c6aba356a30062 SHA512 00585f364321576bca9f55f49ffa4f7983c8293fc3db1103f7f045d5de6618e88a68255e6c3f383098143b568e49cacedc9a27a4bf7504df69a1afb49b0bf5a8 -EBUILD ncurses-6.0-r2.ebuild 8766 BLAKE2B e8ca8e1bc7f67c21a1ee1515db347613b104fac7b57564d3862e6b2473c373c306e573277b911f355632d8d0b8abaf3aaae96c882a8b359d375cb4b9cc3824a0 SHA512 09ead9efc080da50fa5efd4405ef199ac7f2206415342663e0fed15361a59c5bc0d6b6ff604e49b857897fad1eb3ee621d3e3a7ae61cdaaaf32dcb9a32952fb2 -EBUILD ncurses-6.1-r2.ebuild 8557 BLAKE2B a012896823ed55fdd4d76e0f6853ee8099bfac07dc4067dd26cb3666448ad3f4a2f18fddce2c0bf31114712925bd0475426682cc47254f4c37225c0447ea6184 SHA512 2e3ff6f3b5b4abe16016cd7d06926e6c7e09da1cf9d00097a1783b01177bf86e3a642d0fbb14636f7f5c4221ed9cb4c15654e8ab9adf1d7ee11aed010177e15f +EBUILD ncurses-6.0-r2.ebuild 8995 BLAKE2B 1800de0a3a38539c5bc535b9845c16a16c1b5d62f891068cb364c12226672ebc9a8555d56fd56cd08f94be24ff753471eebd47415a1df926bc9e52f7c2fc3444 SHA512 1003c59f675226c70bc1fe580c1299f50a2bd26f4eb9f6dbd81f83ec3bdf7217a5f8cda15edfba48d062c6eef4001ff3a71d6b5e379fcf279170a71940a9ef4f +EBUILD ncurses-6.1-r2.ebuild 8785 BLAKE2B b23957b83421610f38fec0b7e427f6600340eec3f037c896020a39dc050ce9322f9ec7e0cab137fdab01cfb9fcbba747ce58808604df624538e49becbae45c14 SHA512 c873a02f1a5a856cc8463be151aaf21264e96e267600769804423cfb44ccacef6d61c8bcca55087c86089d2c7d17f08db833a1ef524f445d41d367f9b1a256c0 MISC metadata.xml 619 BLAKE2B a5b29f22ce491bf7a308673944651ea9d916a6d487a45a2a7ee4a7e8d33f7b3bd398e3edeb830f0b443cb4524c0b73af4d6e1511e8128289a76666acd931d611 SHA512 3f28fd8aee675226f641d72d7437edf4c5840cdac3dca64b6a4c61902d4f4127d86f65acfefb270cba2fcfb0ba9d6ff9d3ca24930825b89c82f0eedc8160f9ef diff --git a/sys-libs/ncurses/ncurses-6.0-r2.ebuild b/sys-libs/ncurses/ncurses-6.0-r2.ebuild index 15d435938bc3..6587f1b72a6f 100644 --- a/sys-libs/ncurses/ncurses-6.0-r2.ebuild +++ b/sys-libs/ncurses/ncurses-6.0-r2.ebuild @@ -135,6 +135,9 @@ do_configure() { # 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) + # Required for building on mingw-w64, and possibly other windows + # platforms, bug #639670 + $(use_enable kernel_Winnt term-driver) --disable-termcap --enable-symlinks --with-rcs-ids @@ -240,7 +243,10 @@ multilib_src_install() { # Provide a link for -lcurses. ln -sf libncurses$(get_libname) "${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die fi - use static-libs || find "${ED}"/usr/ -name '*.a' -delete + # don't delete '*.dll.a', needed for linking #631468 + if ! use static-libs; then + find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die + fi # Build fails to create this ... dosym ../share/terminfo /usr/$(get_libdir)/terminfo diff --git a/sys-libs/ncurses/ncurses-6.1-r2.ebuild b/sys-libs/ncurses/ncurses-6.1-r2.ebuild index 5ddb88667515..b091982522cf 100644 --- a/sys-libs/ncurses/ncurses-6.1-r2.ebuild +++ b/sys-libs/ncurses/ncurses-6.1-r2.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz" LICENSE="MIT" # The subslot reflects the SONAME. SLOT="0/6" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode" DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )" @@ -132,6 +132,9 @@ do_configure() { # 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) + # Required for building on mingw-w64, and possibly other windows + # platforms, bug #639670 + $(use_enable kernel_Winnt term-driver) --disable-termcap --enable-symlinks --with-rcs-ids @@ -238,7 +241,10 @@ multilib_src_install() { # Provide a link for -lcurses. ln -sf libncurses$(get_libname) "${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die fi - use static-libs || find "${ED}"/usr/ -name '*.a' -delete + # don't delete '*.dll.a', needed for linking #631468 + if ! use static-libs; then + find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die + fi # Build fails to create this ... dosym ../share/terminfo /usr/$(get_libdir)/terminfo |