[gentoo-commits] repo/gentoo:master commit in: net-misc/suite3270/files/, net-misc/suite3270/

[Mike Frysinger]

commit:     2727b391b3aab1c5d76ebbb8b33a6b61ba43c03b
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 02:31:26 2019 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 02:39:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2727b391

net-misc/suite3270: version bump to 3.6_p8

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 net-misc/suite3270/Manifest                        |   1 +
 .../suite3270/files/suite3270-3.5_p8-tinfo.patch   |  16 +--
 net-misc/suite3270/suite3270-3.6_p8.ebuild         | 107 +++++++++++++++++++++
 3 files changed, 116 insertions(+), 8 deletions(-)

diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest
index 6665d3354d2..af20b8dced7 100644
--- a/net-misc/suite3270/Manifest
+++ b/net-misc/suite3270/Manifest
@@ -2,3 +2,4 @@ DIST suite3270-3.4ga10-src.tgz 3398730 BLAKE2B 4adc02b416d5fbf2facbf4e42c58a2bd3
 DIST suite3270-3.5ga10-src.tgz 3412329 BLAKE2B c9ed308cf970da150da985d76ec377c83a03041eddfcbad9baa7211776a7b68292109cccb2ec250952edb77eeca79143137eb8a94da8b774e952c3e5790c6231 SHA512 0cce1212ca7589595cd2f775d18086f231a9e6d621716be5a41123a379358d9ac08c9668de2bd6a2e401ae54d12a4905c3c260cb7ba90482bbce6790d8e3efb8
 DIST suite3270-3.5ga12-src.tgz 3412286 BLAKE2B 5602f8bbe7b916a977c97848ff9a413a873f61e1c0c62b8c118dc43703adcd4a668e3cc301f9e37a139eebeeae44aca3cdedd0c10de15870ad8ead00d783e1ef SHA512 c7cb25b5c82b0d7ccac8c3ed17317a5a5ebce24fb32dcdfcaf7158157578617a7bccc265fdb67fce0557caa9c75d1afc2d8152a06b98af43ad9a9e29b5f2a267
 DIST suite3270-3.6ga4-src.tgz 3288095 BLAKE2B 34245d6050f7d70ef6195dc669fea55eed70cb9b6c616a4bc88bc52bcfd9d837e527debc87eba4ccdc47c4a453e16749c23b9618d5bf4198e4131573f437209b SHA512 5309c4b4ad0d730033166b0bdb7638bba5fc00908776a229d5f0a131f72741897a0bf6b86dee3b1c9f3d480dc4f23e03e812d3349cec7094908c6a54a87d5ccb
+DIST suite3270-3.6ga8-src.tgz 3296047 BLAKE2B 98bcee4591c3eea12c7127aa2eeb39613f6f090c041ceab7a7b0f1bf0e946c3048ba2f93eaacf2bbaf04b44ba78a8895f6b7acdcf20baea19a408464f83f4d62 SHA512 88a00bec19ae7be92e5bc0edd6ae1e27bef7fbbf8c3f419efda3ba2b3a0cb5e72693916cd44d50166d5745ce0f9d8497641481cedbb0bb3149567b6f51b1a987

diff --git a/net-misc/suite3270/files/suite3270-3.5_p8-tinfo.patch b/net-misc/suite3270/files/suite3270-3.5_p8-tinfo.patch
index 9235809f02e..54be6e0510c 100644
--- a/net-misc/suite3270/files/suite3270-3.5_p8-tinfo.patch
+++ b/net-misc/suite3270/files/suite3270-3.5_p8-tinfo.patch
@@ -10,14 +10,14 @@ 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
 ---
- x3270/c3270/configure.in |  1 +
- x3270/c3270/configure    | 45 +++++++++++++++++++++++++++++++++++++++++++++
+ c3270/configure.in |  1 +
+ c3270/configure    | 45 +++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 46 insertions(+)
 
-diff --git a/x3270/c3270/configure.in b/x3270/c3270/configure.in
+diff --git a/c3270/configure.in b/c3270/configure.in
 index d9f19e6..8c6d852 100644
---- a/x3270/c3270/configure.in
-+++ b/x3270/c3270/configure.in
+--- 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)
@@ -26,10 +26,10 @@ index d9f19e6..8c6d852 100644
  if test "$with_readline" != no; then
  AC_CHECK_LIB(readline, rl_initialize)
  fi
-diff --git a/x3270/c3270/configure b/x3270/c3270/configure
+diff --git a/c3270/configure b/c3270/configure
 index bef2dff..9946e83 100755
---- a/x3270/c3270/configure
-+++ b/x3270/c3270/configure
+--- a/c3270/configure
++++ b/c3270/configure
 @@ -4020,6 +4020,51 @@ fi
  
  fi

diff --git a/net-misc/suite3270/suite3270-3.6_p8.ebuild b/net-misc/suite3270/suite3270-3.6_p8.ebuild
new file mode 100644
index 00000000000..d8808e7e2af
--- /dev/null
+++ b/net-misc/suite3270/suite3270-3.6_p8.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2019 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/mkfontdir
+		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 ; }