gentoo resync : 15.09.2019

4 files changed, 23 insertions, 17 deletions

diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest
index f0c1b3a271d7..7136600989a1 100644
--- a/net-misc/suite3270/Manifest
+++ b/net-misc/suite3270/Manifest
@@ -1,10 +1,10 @@
-AUX suite3270-3.5_p8-tinfo.patch 2793 BLAKE2B ca7c74e15022d5db381ef49103d966614e5b23e295af9766e8d5f0bc4c5af21ef0b0013772f34e962267aa9ea5f531b4ea9e729d4d21fdd571e0314be15cd410 SHA512 67a7fe63228dad755f73582eda7d1bc7efda18f454b99258f6bbfb45aa081a14c583797a6c940b80604eacfc719d4ba1be83ba2425c99de3afa4d1e027b3402b
-DIST suite3270-3.4ga10-src.tgz 3398730 BLAKE2B 4adc02b416d5fbf2facbf4e42c58a2bd3ed551ce46494ece039ef129663957632316882d5a5b28e272fa47010105a3682618b8ac2d355e745c576af74d0bb310 SHA512 d9ed4aa41c45a2e961d5c2d0c00c6b81526da64b9c1765b0c5e39cb647157026a787db2054b2feb55c57e5a458a31062141471447b1177fd46cbbeb7d71e3f28
+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
-EBUILD suite3270-3.4_p10.ebuild 2060 BLAKE2B a971fa860797532519f96c733d6525ef38cab44e3724d4243b771e2308a6ac243c318d76c5ce8d10a060e03be688eaac07d301446458cc7aeeddd6a057d59bd3 SHA512 dd59e26bff90d8d48508430ac0694861726300f3507e87ddc80af501e8045a214fa50b574a1d6808bb19540a322b46200bc5733738b6552942ccc8a5f53e3d9e
+DIST suite3270-3.6ga8-src.tgz 3296047 BLAKE2B 98bcee4591c3eea12c7127aa2eeb39613f6f090c041ceab7a7b0f1bf0e946c3048ba2f93eaacf2bbaf04b44ba78a8895f6b7acdcf20baea19a408464f83f4d62 SHA512 88a00bec19ae7be92e5bc0edd6ae1e27bef7fbbf8c3f419efda3ba2b3a0cb5e72693916cd44d50166d5745ce0f9d8497641481cedbb0bb3149567b6f51b1a987
 EBUILD suite3270-3.5_p10.ebuild 2104 BLAKE2B 41e2667ef2aecbe97cecec803926c5cc138c74fc2b81d8f8c86cf111456b3846d4075a14cab2a9d3edb85c63551e54b11eef822638e22bdd316711c4121e1aba SHA512 29f7f0dad54c07444dd1718f60e60b520dc6abc1ad7500878355b4aaafdc80f6243e706e74c421b144e097380342ee5d17ee91b904ae77e5f117b4a8df81ad7b
-EBUILD suite3270-3.5_p12.ebuild 2109 BLAKE2B afcae541a73ed17a11d17d4c28cd1162bbd93a1d62df8a105debbaa82e1dbffed20df2a6d7f01a577907d4e8230b94e0d51f77e835f57ee426f18de93f738176 SHA512 20ea6a35f9f0fdef4c8417ed0a7017c7195ec4256535d340cde43fcae72db28c876b8e8d7d085d1a94d96c4d3af270e4b8c05a1361380c93eb5560608affe4ed
+EBUILD suite3270-3.5_p12.ebuild 2104 BLAKE2B 41e2667ef2aecbe97cecec803926c5cc138c74fc2b81d8f8c86cf111456b3846d4075a14cab2a9d3edb85c63551e54b11eef822638e22bdd316711c4121e1aba SHA512 29f7f0dad54c07444dd1718f60e60b520dc6abc1ad7500878355b4aaafdc80f6243e706e74c421b144e097380342ee5d17ee91b904ae77e5f117b4a8df81ad7b
 EBUILD suite3270-3.6_p4.ebuild 2109 BLAKE2B afcae541a73ed17a11d17d4c28cd1162bbd93a1d62df8a105debbaa82e1dbffed20df2a6d7f01a577907d4e8230b94e0d51f77e835f57ee426f18de93f738176 SHA512 20ea6a35f9f0fdef4c8417ed0a7017c7195ec4256535d340cde43fcae72db28c876b8e8d7d085d1a94d96c4d3af270e4b8c05a1361380c93eb5560608affe4ed
+EBUILD suite3270-3.6_p8.ebuild 2121 BLAKE2B c1c4f5bb3f6afa7658dea77891676663c06af954cbdd0a3131691302679d2858fc55fc536c2e70e98840082e822c3ff0279603239bb40e598b9cd0cb8f454802 SHA512 70dd2f6216069872be4c1e8b7fe4721ca22baf1cb7355ff407a769fe5f24039e51d1500edc2924225f3ad8cc84b4ad709b5f2237fb498610410f513b7d391660
 MISC metadata.xml 463 BLAKE2B 5035d30c690419dbe52b4caf68981eb40c858f09787189439dda81dd57096276a029201b0ea3eb67840a14552d9c4dcf21eb00003ea530b79b85219cc607c19b SHA512 ef297d66d1c0b2c7ab6f8d0c489f355267124cd1f0cc09d18cf1b2cd33458be4c8e1716e84753ba6e49903a90fb676fb7ae908205672f927656ebd9c11879e45
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 9235809f02ef..54be6e0510ce 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.5_p12.ebuild b/net-misc/suite3270/suite3270-3.5_p12.ebuild
index f842aa368b8c..8f3125ae488d 100644
--- a/net-misc/suite3270/suite3270-3.5_p12.ebuild
+++ b/net-misc/suite3270/suite3270-3.5_p12.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= )
diff --git a/net-misc/suite3270/suite3270-3.4_p10.ebuild b/net-misc/suite3270/suite3270-3.6_p8.ebuild
index 8eaf62808b26..d8808e7e2afd 100644
--- a/net-misc/suite3270/suite3270-3.4_p10.ebuild
+++ b/net-misc/suite3270/suite3270-3.6_p8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 MY_PV=${PV/_p/ga}
 MY_P=${PN}-${MY_PV}
@@ -11,7 +11,7 @@ S=${WORKDIR}/${PN}-${SUB_PV}
 
 # only the x3270 package installs fonts
 FONT_PN="x3270"
-FONT_S=${WORKDIR}/${FONT_PN}
+FONT_S="${S}/${FONT_PN}"
 
 inherit eutils font
 
@@ -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= )
@@ -45,6 +45,10 @@ DEPEND="${RDEPEND}
 		x11-apps/bdftopcf
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5_p8-tinfo.patch
+)
+
 suite3270_makelist() {
 	echo pr3287 s3270 \
 		$(usex ncurses c3270 '') \
@@ -53,6 +57,8 @@ suite3270_makelist() {
 }
 
 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