commit: 91e7d28362d0508ab78963aab7cd4d156901e552 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Sat Feb 13 10:27:10 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Feb 13 10:27:10 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91e7d283
net-misc/suite3270: Remove old Bug: https://bugs.gentoo.org/765517 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> Signed-off-by: David Seifert <soap <AT> gentoo.org> net-misc/suite3270/Manifest | 1 - .../suite3270/files/suite3270-3.5_p8-tinfo.patch | 87 ----------------- net-misc/suite3270/suite3270-3.6_p8.ebuild | 107 --------------------- 3 files changed, 195 deletions(-) diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest index a16fef905a5..5f9a9141c1a 100644 --- a/net-misc/suite3270/Manifest +++ b/net-misc/suite3270/Manifest @@ -1,2 +1 @@ -DIST suite3270-3.6ga8-src.tgz 3296047 BLAKE2B 98bcee4591c3eea12c7127aa2eeb39613f6f090c041ceab7a7b0f1bf0e946c3048ba2f93eaacf2bbaf04b44ba78a8895f6b7acdcf20baea19a408464f83f4d62 SHA512 88a00bec19ae7be92e5bc0edd6ae1e27bef7fbbf8c3f419efda3ba2b3a0cb5e72693916cd44d50166d5745ce0f9d8497641481cedbb0bb3149567b6f51b1a987 DIST suite3270-4.0ga13-src.tgz 3317494 BLAKE2B 898f279143006e1fc1f470bda3917afe85957de745676dc915f9c94292824ba0e10fc2ccf0a47e307c41e48741a3da7c066c45f63c917295e0522122226b79dd SHA512 bdf9c5d129419c87b45907186e5f158d8623009151357e4d8a3d08ffff2f3729449cead84d005227bfb32968ae363d1a29350692cabe9bf8b71f760eda3f496b diff --git a/net-misc/suite3270/files/suite3270-3.5_p8-tinfo.patch b/net-misc/suite3270/files/suite3270-3.5_p8-tinfo.patch deleted file mode 100644 index 54be6e0510c..00000000000 --- a/net-misc/suite3270/files/suite3270-3.5_p8-tinfo.patch +++ /dev/null @@ -1,87 +0,0 @@ -From a28f70d7fa11907898887706df35c3c3831d901a Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vap...@gentoo.org> -Date: Tue, 10 May 2016 01:12:30 -0400 -Subject: [PATCH] c3270: autolink libtinfo when it exists - -The ncurses libs might split out core funcs into libtinfo. Make sure we -detect & link this when available otherwise the linker might complain the -symbols are missing: -ld: screen.o: undefined reference to symbol 'meta' -/usr/lib64/libtinfo.so.6: error adding symbols: DSO missing from command line -collect2: error: ld returned 1 exit status ---- - c3270/configure.in | 1 + - c3270/configure | 45 +++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 46 insertions(+) - -diff --git a/c3270/configure.in b/c3270/configure.in -index d9f19e6..8c6d852 100644 ---- a/c3270/configure.in -+++ b/c3270/configure.in -@@ -129,6 +129,7 @@ dnl first, so that objects in them can be used by subsequent libraries. - AC_SEARCH_LIBS(forkpty, util) - AC_CHECK_FUNCS(forkpty) - AC_CHECK_LIB(ncursesw, newterm, , [AC_CHECK_LIB(ncurses, newterm, , [AC_CHECK_LIB(curses, newterm, , [AC_MSG_ERROR(Can't find libncurses or new-enough libcurses)])])]) -+AC_CHECK_LIB(tinfo, meta) - if test "$with_readline" != no; then - AC_CHECK_LIB(readline, rl_initialize) - fi -diff --git a/c3270/configure b/c3270/configure -index bef2dff..9946e83 100755 ---- a/c3270/configure -+++ b/c3270/configure -@@ -4020,6 +4020,51 @@ fi - - fi - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for meta in -ltinfo" >&5 -+$as_echo_n "checking for meta in -ltinfo... " >&6; } -+if ${ac_cv_lib_tinfo_meta+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ltinfo $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char meta (); -+int -+main () -+{ -+return meta (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_tinfo_meta=yes -+else -+ ac_cv_lib_tinfo_meta=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_meta" >&5 -+$as_echo "$ac_cv_lib_tinfo_meta" >&6; } -+if test "x$ac_cv_lib_tinfo_meta" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_LIBTINFO 1 -+_ACEOF -+ -+ LIBS="-ltinfo $LIBS" -+ -+fi -+ - if test "$with_readline" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_initialize in -lreadline" >&5 - $as_echo_n "checking for rl_initialize in -lreadline... " >&6; } --- -2.7.4 - diff --git a/net-misc/suite3270/suite3270-3.6_p8.ebuild b/net-misc/suite3270/suite3270-3.6_p8.ebuild deleted file mode 100644 index d8c130a1692..00000000000 --- a/net-misc/suite3270/suite3270-3.6_p8.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -MY_PV=${PV/_p/ga} -MY_P=${PN}-${MY_PV} -SUB_PV=${PV:0:3} - -S=${WORKDIR}/${PN}-${SUB_PV} - -# only the x3270 package installs fonts -FONT_PN="x3270" -FONT_S="${S}/${FONT_PN}" - -inherit eutils font - -DESCRIPTION="Complete 3270 access package" -HOMEPAGE="http://x3270.bgp.nu/"; -SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc s390 sparc x86" -IUSE="cjk doc ncurses ssl tcl X" - -RDEPEND="ssl? ( dev-libs/openssl:0= ) - X? ( - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXmu - x11-libs/libXt - ) - ncurses? ( - sys-libs/ncurses:= - sys-libs/readline:0= - ) - tcl? ( dev-lang/tcl:0 )" -DEPEND="${RDEPEND} - X? ( - x11-base/xorg-proto - x11-misc/xbitmaps - app-text/rman - >=x11-apps/mkfontscale-1.2.0 - x11-apps/bdftopcf - )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.5_p8-tinfo.patch -) - -suite3270_makelist() { - echo pr3287 s3270 \ - $(usex ncurses c3270 '') \ - $(usex tcl tcl3270 '') \ - $(usex X x3270 '') -} - -src_prepare() { - default - - # Some subdirs (like c3270/x3270/s3270) install the same set of data files - # (they have the same contents). Wrap that in a retry to avoid errors. - cat <<-EOF > _install - #!/bin/sh - for n in 1 2 3 4 5; do - install "\$@" && exit - echo "retrying ..." - done - exit 1 - EOF - chmod a+rx _install - # Can't use the $INSTALL var as top level configure also uses it. - # https://sourceforge.net/p/x3270/bugs/15/ - export ac_cv_path_install="${S}/_install" -} - -src_configure() { - echo "${INSTALL}" - econf \ - --cache-file="${S}"/config.cache \ - --enable-s3270 \ - --enable-pr3287 \ - $(use_enable ncurses c3270) \ - $(use_enable tcl tcl3270) \ - $(use_enable X x3270) \ - $(use_with X x) \ - $(use_with X fontdir "${FONTDIR}") -} - -src_install() { - use X && dodir "${FONTDIR}" - emake DESTDIR="${D}" install{,.man} - - local p - for p in $(suite3270_makelist) ; do - cd "${S}/${p}" - docinto ${p} - dodoc README* - use doc && dohtml html/* - done - - use X && font_src_install -} - -pkg_postinst() { use X && font_pkg_postinst ; } -pkg_postrm() { use X && font_pkg_postrm ; }
