gentoo resync : 27.03.2018

3 files changed, 18 insertions, 2 deletions

diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index d01e737a25e6..7df50085f793 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -10,11 +10,12 @@ AUX ncurses-6.0-gfbsd.patch 687 BLAKE2B 74ba99be6040287480e09e07c459651375ff1ce9
 AUX ncurses-6.0-pkg-config.patch 386 BLAKE2B 27a61878d45aa781291e18a2e18b8e861dd88f523083a54032511ceea2784b5020c500d0d277fe448381a969989d896ca32c46af35ad29f35dace97511dda9eb SHA512 8065f50a1d0b2ccd8c8d9b5b6bcf10b07351e2f5e51c17a825057235a63459839771ea249aac7fa50e09c7bacde5179a92f3efe587cf3cf6697ec663faf6caf3
 AUX ncurses-6.0-rxvt-unicode-9.15.patch 3759 BLAKE2B 88e1b6145c5d1afa9d319fdf1bb70967705cc0460fb87cb3897d0e86678b065bc365573859d1cb96ac4209e61a4c43a84cd0cc3b86680e965e3bf404271354ef SHA512 5601446d34421453fb8ed0e7172b4a5230ab4f10a6ded27e6dc52f82f121cb0af510dfc8f60d9ba0d3b9a1d90a8a832c38e24256e394d8ffccbbf12a109e2da4
 AUX ncurses-6.0-ticlib.patch 492 BLAKE2B df9e747a773b532aab42def40fa048a08ae4d02b83c78bfb5fd89b70b9b753534769c5c52a0d1adde7447cd25a286fc8b5d9f52f395c6287d7cd568f184242d7 SHA512 291ed033118673aed1bc5d3b54730d099dffccad7bbe9cb47275bb216125ef9016225eaccae620fa3b06533b7633061a8029e19c8cb9f73c3e30499f587353d6
+AUX ncurses-6.1-st07_terminfo_typo.patch 563 BLAKE2B e28c682c752e8e075691045217d14f88e5a1c5805c014e9b6ccc1d19179cc60dd04dea418a6d9d6302140a89c1977e47b6d9385c7192fdac6a26c9d2e2a33f69 SHA512 a81faa2c9450179324ba56c8cbf3bc5104fbfb2bb9108dfcd93a63fb3ce88c25cb5ab130a2e015816a1a2efa42c2fb3fb3b4b381517d45804efad997a36c8508
 DIST ncurses-5.9.tar.gz 2826473 BLAKE2B 91101b049a5eb6a2674fb86b5eba56515207f490dc7a6348f3194bbc50649717a26aff7a0df64f67ca318b5f244455cd57e760c65b9e551f6ec65b8c035a6ae1 SHA512 d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1
 DIST ncurses-6.0.tar.gz 3131891 BLAKE2B 68670ebdaba28c7a750631da01a0e3681b476cc9e9ae6fd9eae5a254f41fab5f1a5df5fa9897a92d1da751f1cc0b72f2ffee4603865900e67fcbb949c102cf78 SHA512 9ec194f4783dae6de8c529cac31b5cfbfcfea212c5d47b1f87cd49df013e38f8580a9e7aa1384918df0921b4ba999d5e73eb6d6362cce2d7287e64308b673963
 DIST ncurses-6.1.tar.gz 3365395 BLAKE2B 1248a5088bc982d0880cb9550b1192457f6f624937c4b66807668c22a608002ba6c38d876986f2c2b9ee46f91d087c88bc0b19920733e4c7ca0ed8e92d9d47de SHA512 e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee
 EBUILD ncurses-5.9-r101.ebuild 5283 BLAKE2B 2860fee40555ddc883b4ffffc8ea1055c4c5151b451b8a25226fbed116d37e3862a6c9c885666365882bea428fff71417811b5ba04aa72ae0df6ed6bb3afbeaa SHA512 dce58899c1ca8b1ba1206fcbc015821e5de433b8ca4f750889d9281e35c15e70bd2628f4ef3a9990d7f1c8d6a757368833d9c88587eff6e480465697ac29d6f3
 EBUILD ncurses-6.0-r1.ebuild 8633 BLAKE2B b177892af3da61b6f3d2e276a3545de911ae0dbe123797807b63d45fb912b4b0333b487fe52827abe1154332902f9f111b65890fbb4063c691c6aba356a30062 SHA512 00585f364321576bca9f55f49ffa4f7983c8293fc3db1103f7f045d5de6618e88a68255e6c3f383098143b568e49cacedc9a27a4bf7504df69a1afb49b0bf5a8
 EBUILD ncurses-6.0-r2.ebuild 8766 BLAKE2B e8ca8e1bc7f67c21a1ee1515db347613b104fac7b57564d3862e6b2473c373c306e573277b911f355632d8d0b8abaf3aaae96c882a8b359d375cb4b9cc3824a0 SHA512 09ead9efc080da50fa5efd4405ef199ac7f2206415342663e0fed15361a59c5bc0d6b6ff604e49b857897fad1eb3ee621d3e3a7ae61cdaaaf32dcb9a32952fb2
-EBUILD ncurses-6.1-r1.ebuild 8502 BLAKE2B 1daa687c2e19b95f125536959fe190a4bfa11467635ca42531b12b0a6c66ff433fcb04e5c5f0a54561cb014b0c15218bcdd82fe2f2e239a9f8b54875342b44e1 SHA512 4d6c391d18dd551a568b257771920793e3238672a0982b3076c1b4d9be467e2eef020e1547fb76dc25e1289f944400da6e467c520c088504364a0f2aa5a7f335
+EBUILD ncurses-6.1-r2.ebuild 8557 BLAKE2B a012896823ed55fdd4d76e0f6853ee8099bfac07dc4067dd26cb3666448ad3f4a2f18fddce2c0bf31114712925bd0475426682cc47254f4c37225c0447ea6184 SHA512 2e3ff6f3b5b4abe16016cd7d06926e6c7e09da1cf9d00097a1783b01177bf86e3a642d0fbb14636f7f5c4221ed9cb4c15654e8ab9adf1d7ee11aed010177e15f
 MISC metadata.xml 619 BLAKE2B a5b29f22ce491bf7a308673944651ea9d916a6d487a45a2a7ee4a7e8d33f7b3bd398e3edeb830f0b443cb4524c0b73af4d6e1511e8128289a76666acd931d611 SHA512 3f28fd8aee675226f641d72d7437edf4c5840cdac3dca64b6a4c61902d4f4127d86f65acfefb270cba2fcfb0ba9d6ff9d3ca24930825b89c82f0eedc8160f9ef
diff --git a/sys-libs/ncurses/files/ncurses-6.1-st07_terminfo_typo.patch b/sys-libs/ncurses/files/ncurses-6.1-st07_terminfo_typo.patch
new file mode 100644
index 000000000000..4532d648a64e
--- /dev/null
+++ b/sys-libs/ncurses/files/ncurses-6.1-st07_terminfo_typo.patch
@@ -0,0 +1,14 @@
+https://github.com/tmux/tmux/issues/1264
+https://bugs.gentoo.org/651494
+
+--- ncurses-6.1/misc/terminfo.src
++++ ncurses-6.1/misc/terminfo.src
+@@ -6260,7 +6260,7 @@
+ 	     %=%t3%e%p1%d%;m,
+ 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
+ 	    %t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m,
+-	Ss=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B,
++	Ms=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B,
+ 	kLFT3=\E[1;3D, kLFT5=\E[1;5D, kNXT3=\E[6;3~,
+ 	kNXT5=\E[6;5~, kPRV3=\E[5;3~, kPRV5=\E[5;5~,
+ 	kRIT3=\E[1;3C, kRIT5=\E[1;5C, kUP3=\E[1;3A, kUP5=\E[1;5A,
diff --git a/sys-libs/ncurses/ncurses-6.1-r1.ebuild b/sys-libs/ncurses/ncurses-6.1-r2.ebuild
index d32024f19894..5ddb88667515 100644
--- a/sys-libs/ncurses/ncurses-6.1-r1.ebuild
+++ b/sys-libs/ncurses/ncurses-6.1-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
 LICENSE="MIT"
 # The subslot reflects the SONAME.
 SLOT="0/6"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode"
 
 DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
@@ -38,6 +38,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.9-gcc-5.patch" #545114
 	"${FILESDIR}/${PN}-6.0-ticlib.patch" #557360
 	"${FILESDIR}/${PN}-6.0-cppflags-cross.patch" #601426
+	"${FILESDIR}/${PN}-6.1-st07_terminfo_typo.patch" #651494
 )
 
 src_prepare() {