gentoo auto-resync : 14:09:2022 - 11:10:10

4 files changed, 179 insertions, 0 deletions

diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest
index a7dedf01feae..f306e42215ae 100644
--- a/net-misc/suite3270/Manifest
+++ b/net-misc/suite3270/Manifest
@@ -1,8 +1,12 @@
 AUX suite3270-4.1-musl-wint-t-fix.patch 264 BLAKE2B 7dcd71b49ddb6f736b9d7758536c30441eee68a4f1b6369bc49ca0e403b912998db0e34bc484a3dbace2527e3ae088964b139616e5d94fde3389dca42cea3488 SHA512 3cc855a0f6d84a92a31aa05f54acf19b46e39d5c296564e662e9622546503d0b58598de6b8a6f51c92245a4556b08d0fd05b5afe42c088147d859859bf7231e1
+AUX suite3270-4.2_p5-egrep.patch 490 BLAKE2B 3f60f7943716c159618a612e3244ce950f7322f70f3cdc8a819a90688a984f9a947307f7bb688e33b08ee971db0dca2f3d5823ed2c53ed7afa612db0680eaf57 SHA512 8e008f516fe116627c6e75c65fc086faad2cf1671069ff9e8ff15c25ffb5c3e281ffa2e7c24f49aeedf11f214efd1b508d635bab897eb66322abfd17cdc26fd2
+AUX suite3270-4.2_p5-ncurses-pkg-config.patch 2003 BLAKE2B 1a8b222a7bc8d77725272db949e065b7aa0acfe6845294c53236cc08272ecca32376a0ec60cdc55662d42f8dfda95e54796242a2c39165aee0230ea359744b9b SHA512 4344244c370a780d4e187a97fa59cdffb08d0c1627f4905fc5442359dfa2863bf30050770790850af948b9781a29dd070fa3da2b4a61349ca467b92501726b58
 DIST suite3270-4.0ga13-src.tgz 3317494 BLAKE2B 898f279143006e1fc1f470bda3917afe85957de745676dc915f9c94292824ba0e10fc2ccf0a47e307c41e48741a3da7c066c45f63c917295e0522122226b79dd SHA512 bdf9c5d129419c87b45907186e5f158d8623009151357e4d8a3d08ffff2f3729449cead84d005227bfb32968ae363d1a29350692cabe9bf8b71f760eda3f496b
 DIST suite3270-4.0ga14-src.tgz 3318277 BLAKE2B 218d2332e3a5a3af1aa2f4f234d71ad5415ff74eefe485d1e9db2f4606caea56ce05142eec3b051f01eac3a0f0b7796221c98f16e7d7c625af291917148c5e37 SHA512 0c76946420bbc2a483ab321658350a5b3e1c03e66b65e99f1a8cb4d350e07eedd44f9f24671244f3c374f512e5d211304785b8e44ae125265ce8f71f0a9dcc65
 DIST suite3270-4.1ga11-src.tgz 3900772 BLAKE2B b56fc8464fa01c65db333bea3a4dc204b3981a39177e108add0220cbddb9c41c4170f879ec1e9bf2755575f7cdf43490fc1a81ca1ca0e9883f97943de0c3a048 SHA512 1032a03bf9b24ae9d0e9b9f8b6a7c6319dff2c77db14257f22eb05b52b308e9134d8c6a5080178081f7ba893936e2eca63bb0e04b804d4a7df2507a5b3f625fb
+DIST suite3270-4.2ga5-src.tgz 4192998 BLAKE2B 2e29a9e9f25688bd5fc84101cab684c0fcdde9eff5e65cf0f247e9942990c812174eec17569716928de299fec0d87e77c785d8415370f7245cc0909c7e2020dd SHA512 4a5847c81262a099c68a914141bc7eba7b7b46f0ed4dabc1e7421b4244ea1ca5877e472262f9a4ab2f1a9ca72bde3901f8281dc0957046d3355ed98377de0492
 EBUILD suite3270-4.0_p13.ebuild 2048 BLAKE2B d80986faad81ef67e87e2b04c08501597b52038a3b2c9d1acc036e7b60771dae0b7fbf87778362c243c461b17122f43d493e45b90a0306b3b350048613ecc9be SHA512 7f3b6c7fe32ff609f6ac04bc07ed1f2db932ab3dbc8cf8f5a33a296e1dc45fddc122900be2cea3b5ce307106b564a64cc07b78dc1a51f613c47f471af9221292
 EBUILD suite3270-4.0_p14.ebuild 2052 BLAKE2B 9dc44ca0a90febe1ce62cd0a97ad7eb77ba1f61dabe77d22b2285fc9549779d554a389e3b6563e4cff6cd1d98d074c27e67d70d3c769efd2596f5c1eaaa044fe SHA512 c4ac7388701fa6756d9b4e982e234813ab9edcd488d1afea90875ea8fd2e286ff670c8467915bf1a2dd6f12361f19112035cad2ff4c80790b3f25e4f33e45b26
 EBUILD suite3270-4.1_p11.ebuild 1859 BLAKE2B bef4edc8308450eb4a0492944de6cdc90e32e23b496666452d63d47c7bedef04e7060962764bc636c5f60bb725a4bca33e9e6948fd18b24a4ffe60fc03e7f229 SHA512 e16cc0876b34ec9dc7b608e57ec8d8f26762f3b9b589404fc959da9a7f329da20a8baa4550c6ff93ff2a53d8dff0801ebed13b0634af9bf383a8bef7a70a124c
+EBUILD suite3270-4.2_p5-r1.ebuild 2035 BLAKE2B 850c915e744e242f668fed07764babcbc6e2ee197cc12c6cfd325233ed0b12d06638adba1910909052dff6811ff2adfe14e422ff8eac99c594a48c5b1fecc5db SHA512 3a7dbe9bcc842d382aa800b83fb5393bdfe7655712acc2f1f896501d08d98cdd0f8c645dce8d6e34b059ec19803f3f0648f600b570e25fcc9ef2b29db14bdce8
 MISC metadata.xml 457 BLAKE2B cb4578a310eb76545a496f18038819ff2743decd2fca974700cb361883644a442ea7eb0a2c0e4e189012c74b3738cc7baade6c8e791149a98ec8fdb664f0b868 SHA512 9e24148183d02f4e8ed481720da479757690a29163e7d0c22d3a66f88b1c84d3d0d1ac9ed0c22d973a88fb59341228f1ffbda6dece48f14d0efce8d3e15a6a96
diff --git a/net-misc/suite3270/files/suite3270-4.2_p5-egrep.patch b/net-misc/suite3270/files/suite3270-4.2_p5-egrep.patch
new file mode 100644
index 000000000000..629cbca5f9f3
--- /dev/null
+++ b/net-misc/suite3270/files/suite3270-4.2_p5-egrep.patch
@@ -0,0 +1,21 @@
+--- a/configure.in
++++ b/configure.in
+@@ -29,6 +29,8 @@ AC_PREREQ([2.69])
+ 
+ AC_CANONICAL_HOST
+ 
++AC_PROG_EGREP
++
+ AC_ARG_ENABLE(unix,[  --enable-unix           build all Unix emulators])
+ AC_ARG_ENABLE(windows,[  --enable-windows        build all Windows emulators])
+ 
+--- a/lib/configure.in
++++ b/lib/configure.in
+@@ -31,6 +31,7 @@ dnl Checks for programs.
+ AC_PROG_INSTALL
+ AC_PROG_CC
+ AC_PROG_RANLIB
++AC_PROG_EGREP
+ AC_CHECK_TOOLS(AR, [ar])
+ 
+ dnl Figure out what sort of host this is.
diff --git a/net-misc/suite3270/files/suite3270-4.2_p5-ncurses-pkg-config.patch b/net-misc/suite3270/files/suite3270-4.2_p5-ncurses-pkg-config.patch
new file mode 100644
index 000000000000..7142bb293c00
--- /dev/null
+++ b/net-misc/suite3270/files/suite3270-4.2_p5-ncurses-pkg-config.patch
@@ -0,0 +1,48 @@
+Needed to ensure we pick up definitions from ncurses' pkg-config file
+like -DNCURSES_WIDECHAR (issue is observable on say, musl).
+--- a/x3270if/configure.in
++++ b/x3270if/configure.in
+@@ -65,6 +65,9 @@ AC_CHECK_HEADERS(getopt.h)
+ if test "$with_readline" != no; then
+ AC_CHECK_HEADERS(readline/history.h)
+ fi
++
++dnl Try pkg-config first, and if it fails, try the traditional methods.
++PKG_CHECK_MODULES([ncurses], [ncursesw], [AC_DEFINE([HAVE_NCURSESW_NCURSES_H] ,[1]) AC_DEFINE([HAVE_NCURSESW_TERM_H], [1])], [
+ dnl Find the best curses header file and hope it's consistent with the library
+ dnl we found.
+ AC_CHECK_HEADERS(ncursesw/ncurses.h, ,
+@@ -75,15 +78,16 @@ AC_CHECK_HEADERS(ncursesw/term.h, ,
+  [AC_CHECK_HEADERS(ncurses/term.h, ,
+   [AC_CHECK_HEADERS(term.h)])])
+ 
++  AC_SEARCH_LIBS(newterm, ncursesw ncurses curses, , [AC_MSG_ERROR(Can't find libncurses or new-enough libcurses)])
++  AC_SEARCH_LIBS(setupterm, tinfow tinfo, , [AC_MSG_ERROR(Can't find terminfo library)])
++  AC_CHECK_FUNCS(tiparm)])
++
+ dnl Check for --without-readline
+ AC_ARG_WITH(readline, [  --without-readline      Don't use the readline library]) 
+ 
+ dnl Checks for library functions.
+ AC_CHECK_FUNCS(vasprintf)
+ AC_FUNC_FSEEKO
+-AC_SEARCH_LIBS(newterm, ncursesw ncurses curses, , [AC_MSG_ERROR(Can't find libncurses or new-enough libcurses)])
+-AC_SEARCH_LIBS(setupterm, tinfow tinfo, , [AC_MSG_ERROR(Can't find terminfo library)])
+-AC_CHECK_FUNCS(tiparm)
+ if test "$with_readline" != no; then
+ AC_CHECK_LIB(readline, rl_initialize)
+ fi
+--- a/x3270if/Makefile.obj.in
++++ b/x3270if/Makefile.obj.in
+@@ -51,9 +51,9 @@ INSTALL_DATA = @INSTALL_DATA@
+ 
+ CCOPTIONS = @CCOPTIONS@
+ XCPPFLAGS = -I$(THIS) -I$(TOP)/include -I$(TOP)/Common/x3270if @CPPFLAGS@
+-CFLAGS = $(CCOPTIONS) $(CDEBUGFLAGS) $(XCPPFLAGS) @CFLAGS@
++CFLAGS = $(CCOPTIONS) $(CDEBUGFLAGS) $(XCPPFLAGS) @ncurses_CFLAGS@ @CFLAGS@
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ @ncurses_LIBS@
+ 
+ XVERSION = xversion.c
+ version.o: mkversion.sh $(VOBJS) version.txt
diff --git a/net-misc/suite3270/suite3270-4.2_p5-r1.ebuild b/net-misc/suite3270/suite3270-4.2_p5-r1.ebuild
new file mode 100644
index 000000000000..89288f125a7c
--- /dev/null
+++ b/net-misc/suite3270/suite3270-4.2_p5-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 autotools font
+
+DESCRIPTION="Complete 3270 (S390) 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="X cjk doc ncurses ssl tcl"
+
+RDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXmu
+		x11-libs/libXt
+	)
+	ssl? ( dev-libs/openssl:= )
+	ncurses? (
+		sys-libs/ncurses:=
+		sys-libs/readline:=
+	)
+	tcl? ( dev-lang/tcl:= )
+"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	X? (
+		app-text/rman
+		x11-apps/bdftopcf
+		>=x11-apps/mkfontscale-1.2.0
+		x11-misc/xbitmaps
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.1-musl-wint-t-fix.patch
+	"${FILESDIR}"/${PN}-4.2_p5-ncurses-pkg-config.patch
+	"${FILESDIR}"/${PN}-4.2_p5-egrep.patch
+)
+
+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 || die
+	# 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
+
+	AT_NOEAUTOHEADER=yes eautoreconf
+}
+
+src_configure() {
+	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}
+
+	use X && font_src_install
+}
+
+pkg_postinst() {
+	use X && font_pkg_postinst
+}
+
+pkg_postrm() {
+	use X && font_pkg_postrm
+}