gentoo resync : 15.01.2020

4 files changed, 2 insertions, 212 deletions

diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest
index ed50d45db241..26d18a47b18b 100644
--- a/net-misc/suite3270/Manifest
+++ b/net-misc/suite3270/Manifest
@@ -1,10 +1,6 @@
 AUX suite3270-3.5_p8-tinfo.patch 2733 BLAKE2B ea2d966d5138e33289d803223a4e49f4dc314ed206e5b5dd838e0ae7152a03417bb4b9044f544b8bf729421bb35f723bcb48ee2f58fcfaf27d460f51ed172d73 SHA512 5b748df7b50957746423954bea86b2ce43063b33a0e5ad3d22d93653c4e3dd11494111e46b4c83c45add41dc448c004ddc3b217be23712953682784c79f76564
-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
-EBUILD suite3270-3.5_p10.ebuild 2111 BLAKE2B 3720091974c742b7f15dac52389a61fcab79ba58a5069cb22f6298f6e780c0de1f04c969bdf5d75418e3e60ea89b4e06cafc687015cc10e91e3444370dff21db SHA512 0957867c66c3e13f181061b754256e386bd8693441c22d0135e9634c6b52c9744a894415a296d30186be2ae65824844eb034d7fcc3b8a6e5198221aa92ae87fe
 EBUILD suite3270-3.5_p12.ebuild 2111 BLAKE2B 3720091974c742b7f15dac52389a61fcab79ba58a5069cb22f6298f6e780c0de1f04c969bdf5d75418e3e60ea89b4e06cafc687015cc10e91e3444370dff21db SHA512 0957867c66c3e13f181061b754256e386bd8693441c22d0135e9634c6b52c9744a894415a296d30186be2ae65824844eb034d7fcc3b8a6e5198221aa92ae87fe
-EBUILD suite3270-3.6_p4.ebuild 2116 BLAKE2B e37c59bc618a3b93f0bbea5514759b3b7de4abf77d6f0c5da239818260f7f95ece0240e5b4207e26b4f8dc5db78c0a80ccc7c4fc0787a76f72b04e9edf36f669 SHA512 d7a82a99a30fa7e142d3d5af95870242c8d15f5093145362ab81f023e67d6e8119d8b43e295188a4f5d7248679bf0276e2aafe0cdf3d83aa2c54678fc08c2f9c
-EBUILD suite3270-3.6_p8.ebuild 2131 BLAKE2B ce8b9914fd1a727ae89275f0e8b3c249e801acb57f81a500b4bbe3adb48e4305bfb6edc3c12d30ff182a292d2f509bc81c7977851db7abb2f6f0ff0d6019998e SHA512 9060597d86be01a6de0e2c1b06399cff3ff0a354caa9330710bd90c43ea4d09253fb47d7a2daca461ca1f4b7b1ae09f458e48848a4f4685cffeda1d7a03468bd
+EBUILD suite3270-3.6_p8.ebuild 2126 BLAKE2B ee6028b2f735c8613a09fefb1adf341e901b7030b0a9008bed3687ecaf8335200d1750a7e34c62ceb99bdc8767f1895d8f1727f823abcede2f951c43a86a360f SHA512 339864c4e04fc6bfc30268810c139d56d6948f87c4128a069b6c3350f3c439c076f58045df3e9a1ae5c650cca5d7f76b9f8ac312cce3784ff6095d813f2e7768
 MISC metadata.xml 463 BLAKE2B 5035d30c690419dbe52b4caf68981eb40c858f09787189439dda81dd57096276a029201b0ea3eb67840a14552d9c4dcf21eb00003ea530b79b85219cc607c19b SHA512 ef297d66d1c0b2c7ab6f8d0c489f355267124cd1f0cc09d18cf1b2cd33458be4c8e1716e84753ba6e49903a90fb676fb7ae908205672f927656ebd9c11879e45
diff --git a/net-misc/suite3270/suite3270-3.5_p10.ebuild b/net-misc/suite3270/suite3270-3.5_p10.ebuild
deleted file mode 100644
index 887b8223af5c..000000000000
--- a/net-misc/suite3270/suite3270-3.5_p10.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-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
-	)"
-
-suite3270_makelist() {
-	echo pr3287 s3270 \
-		$(usex ncurses c3270 '') \
-		$(usex tcl tcl3270 '') \
-		$(usex X x3270 '')
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.5_p8-tinfo.patch
-
-	# 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 ; }
diff --git a/net-misc/suite3270/suite3270-3.6_p4.ebuild b/net-misc/suite3270/suite3270-3.6_p4.ebuild
deleted file mode 100644
index 3b9de305c879..000000000000
--- a/net-misc/suite3270/suite3270-3.6_p4.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-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
-	)"
-
-suite3270_makelist() {
-	echo pr3287 s3270 \
-		$(usex ncurses c3270 '') \
-		$(usex tcl tcl3270 '') \
-		$(usex X x3270 '')
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.5_p8-tinfo.patch
-
-	# 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 ; }
diff --git a/net-misc/suite3270/suite3270-3.6_p8.ebuild b/net-misc/suite3270/suite3270-3.6_p8.ebuild
index f81e1979db33..bcd2a887e4b8 100644
--- a/net-misc/suite3270/suite3270-3.6_p8.ebuild
+++ b/net-misc/suite3270/suite3270-3.6_p8.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ppc s390 sparc x86"
 IUSE="cjk doc ncurses ssl tcl X"
 
 RDEPEND="ssl? ( dev-libs/openssl:0= )