Use xterm* for bug #426224.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x64D4CF24

3 files changed, 20 insertions, 17 deletions

diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog
index 99b2fa870139..852185cf9719 100644
--- a/app-misc/screen/ChangeLog
+++ b/app-misc/screen/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-misc/screen
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.177 2012/11/13 19:49:07 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.178 2012/12/02 22:03:57 swegener Exp $
+
+  02 Dec 2012; Sven Wegener <swegener@gentoo.org> files/screenrc:
+  Use xterm* for bug #426224.
 
 *screen-4.0.3-r7 (13 Nov 2012)
 
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index dc044892db9c..81b0f1e10d6c 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -14,16 +14,16 @@ AUX screen-4.0.3-config.h-autoconf-2.62.patch 388 SHA256 71897394211d9e00e008f7c
 AUX screen-4.0.3-cppflags.patch 752 SHA256 40f4c4321170096984466665e3af9aead03490de521205da61a8d31d04cf718d SHA512 92c42ed8d9c2a9ee539784b2fb43119968bdce5b6cd371d82bcf21d9c12f9fd1353ae9630ee1bce3ed73c1528d7bdee64abd4fd1919aaf5ecd412c895ce4a3b4 WHIRLPOOL 8e7c2ef2b4d019cd8820a72660cee8614d0490c65c6ffa85a7c161753cae6f13ebf053623db33685d4cf15af53fbd894dfd224b0a5896d823f6ac165eb20e085
 AUX screen-4.0.3-crosscompile.patch 18900 SHA256 7e4109cd3f6d58ea799fe069472a58f16ea75c2397392c15f58bfcb7cbb354f9 SHA512 9d34d6245d50f0ea84735cad7148b2c6af70709efc788fe9113752081a05138172acc4d6dc33c87ac71739dead1338000b9bd64978c0edf3c44d9ead92487afb WHIRLPOOL 037ec13508ec669791fda248d4a056abb54c1d9aa6893ddcb8aa4785365231b8c4aea46e07cd5367853039c0876cc8e1ee18df4952d9aa3168806eea9f994846
 AUX screen-4.0.3-setenv_autoconf.patch 2485 SHA256 091eb224a097bbc1b5f1b3dd8048dbb04b8c7476818a9444eae5bdb8b52bce75 SHA512 72dcfd9180d05edf85ce9f459e69ccd709a6c0a4593802d0f4e88ffe2daf56215ce8049a641701693dafeab3cc8a0df796338d92338ee0d39c51d46ed718af7b WHIRLPOOL fa7645c3488f75c8acdb2305864459e3eada89e7a29e39a6048cdda7459c707b090c68ce93023a53c57a7beabb3c66f9f9f26237126e68d00cc888a7581b867c
-AUX screenrc 10409 SHA256 f2fbb2de649df9d6b0afbb913d002eb7fdabec5525930515452c286dffcde072 SHA512 32783353cadb403999041e184c7c69570869d45793df4aff35c341f222903dab23d7872e24a78dcf84d82d636890950ad2719614c5475d7084f58769a24e8e71 WHIRLPOOL 3d1a75bcaad7870637dee9c4549062ffcddfd6be614e73e786d166b45f82b35a7f5311d9a60060a7d38afa96264b8eed3719f23244fc3799b7f8fe6ca774a754
+AUX screenrc 10412 SHA256 191d91f9fd1e676525a9e1a3bdc5ac73283f948caf74b4bb6e0cfcecbe4798bb SHA512 06fbec5e28480a2c369330fac0c94faa47e5d28e037d9fefd0cb3e813002c504866dc8ac86872b7ac6f16059a219e396a9c425b578b8afe882153ddb506158f7 WHIRLPOOL e05785d9810a709ccd189bbf1557022bd91f653ddb2f138e54286fbbc11ddbbedf2276d2b8bc975a8ff1ac024ab24d955a6b3055cf5cd2dfb445c35484e90f09
 DIST screen-4.0.3.tar.gz 840602 SHA256 78f0d5b1496084a5902586304d4a73954b2bfe33ea13edceecf21615c39e6c77 SHA512 24c1f598972f3dc9ed49cd2c05852190a0190d22fa01401eee8484627c8dd2815f0a422d9b2697faa8aaa0b3efc6730a94e2d5aa787dbe5e9ec719143176c338 WHIRLPOOL 6774786126eb05749d432593bc2c1febdc57896959220a609feb138bdc16b8da278aea63af1ccfd5c7d38ccaa9e7d28980e9e14d0009d36a54cdbd9e4cb0fca7
 EBUILD screen-4.0.3-r6.ebuild 4655 SHA256 45c9d3baf87ec1db41f05de7c70ab8e74d62fae55479685cdef917f384d5265b SHA512 736ab86ef010969968def6533e4f64a0ae93290fefc947bd3feff41e1ee15a602cd4c743e5e2a014f13ab4d0c0fa8840965dc8c8e83508305865378ee76692cb WHIRLPOOL 8cbc553c21a51a4cdfeaadd3b0af18681f9ab49e027c87b02a93bc29fb1ccd29dbd6eae553792433a7e2e685a5824e0389afd682819343926744806ad7573856
 EBUILD screen-4.0.3-r7.ebuild 4743 SHA256 44526028ba00ddf1ddf6d25793c82edbad012ef6ef83540a7aa309cacd5b24d5 SHA512 f276682507874891a9cf71f94fdcfead6c72828ae7526339483cbc496959492a65582ebd9e09418525470641710d5e89c7afd65112dc8f249ff98c1abd403ee8 WHIRLPOOL 5c1927e58d71974c57edd0a3f5921fad0665618e042d3c362cc35c63d455c27fd7dad4b685f3ae2e395edbde0004005134cd0e2fb040d6be7a937b0794a4d464
-MISC ChangeLog 25021 SHA256 46faa4b0a4e65f6760b6634462554b0e47a7afdc1e5dfd5f35eb40ec9504778d SHA512 d60c9eb70ebaf7205fb59f54e8dcb35460cd63823b7818cf0f4e63d65054cda41faea7ce8a1f3056c515507e4072320a81227eaa839e95a7889059f94acfe2a0 WHIRLPOOL e69af686cbe20ef34a9e6cf96d9801558a73c053a0d3cdfef5e60f4cc269d71a825f0e2e5854128427e4646f50597f0deb3161d46dfe9309d9377d0a42ca072c
+MISC ChangeLog 25118 SHA256 bfc8a44e793fa88b3b58a571890256a2f792f1b870b95aef09a488a7ac939134 SHA512 17c13ca14792f9cc2ba94c712487ee8b70339ca5612d934128b2d16a8355c19c1ef3727f04aa4480b5b398f0b0525ccdb9048364d1e1328966aca51889f8ff4d WHIRLPOOL ec62483ef3d99f8716c6d5f4087273fd17d3b1396b34a67ff8132bbce4a54e2c3e8f8d283d1b2a196a87654bae3bfc0314d2ecd34623211ac2c686825dfc0d26
 MISC metadata.xml 1703 SHA256 f730fdee708602205eac134d406226c041480a730800b270fddc0f29b0663782 SHA512 2458aebc3c3a1852e0c251d3650846401f9a634a7d5fb722ad47a0b966705fa93de77b2fef1858d81e7dca29bc8b5ec46c22de993e385fbcc117244dedc9e46d WHIRLPOOL 4862c8c314207cde5eca001b985efa691a7ad02335f208d916c903bf6fa2acfd5100514a0704adcfee0f32d75d29a978b49ae104e9f0f60a8eaf54e07a963098
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCipDYACgkQI1lqEGTUzyRcUACg3CgmCgJtnLyqcrp4HkpMSYRd
-HYYAnRQlaXGZdpI+Z1Xu7E2oYNAFa8qR
-=uhwI
+iEYEAREIAAYFAlC70FAACgkQI1lqEGTUzyTSAwCeJw0DcAHFD9jhBr5a5kVqS/Gb
+N44AoKKKiUM2fyBACNGXpwEJFU1uw/k7
+=uNdX
 -----END PGP SIGNATURE-----
diff --git a/app-misc/screen/files/screenrc b/app-misc/screen/files/screenrc
index 02e63bf6cc6b..11f2f551b0bc 100644
--- a/app-misc/screen/files/screenrc
+++ b/app-misc/screen/files/screenrc
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 #
 # /etc/screenrc
@@ -114,12 +114,12 @@ defnonblock on
 # xterm understands both im/ic and doesn't have a status line.
 # Note: Do not specify im and ic in the real termcap/info file as
 # some programs (e.g. vi) will not work anymore.
-  termcap  xterm hs@:cs=\E[%i%d;%dr:im=\E[4h:ei=\E[4l
-  terminfo xterm hs@:cs=\E[%i%p1%d;%p2%dr:im=\E[4h:ei=\E[4l
+  termcap  xterm* hs@:cs=\E[%i%d;%dr:im=\E[4h:ei=\E[4l
+  terminfo xterm* hs@:cs=\E[%i%p1%d;%p2%dr:im=\E[4h:ei=\E[4l
 
 # 80/132 column switching must be enabled for ^AW to work
 # change init sequence to not switch width
-  termcapinfo  xterm Z0=\E[?3h:Z1=\E[?3l:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l
+  termcapinfo  xterm* Z0=\E[?3h:Z1=\E[?3l:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l
 
 # Make the output buffer large for (fast) xterms.
 # termcapinfo xterm* OL=10000
@@ -127,25 +127,25 @@ defnonblock on
 
 # tell screen that xterm can switch to dark background and has function
 # keys.
-  termcapinfo xterm 'VR=\E[?5h:VN=\E[?5l'
-  termcapinfo xterm 'k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~'
-  termcapinfo xterm 'kh=\EOH:kI=\E[2~:kD=\E[3~:kH=\EOF:kP=\E[5~:kN=\E[6~'
+  termcapinfo xterm* 'VR=\E[?5h:VN=\E[?5l'
+  termcapinfo xterm* 'k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~'
+  termcapinfo xterm* 'kh=\EOH:kI=\E[2~:kD=\E[3~:kH=\EOF:kP=\E[5~:kN=\E[6~'
 
 # special xterm hardstatus: use the window title.
-  termcapinfo xterm 'hs:ts=\E]2;:fs=\007:ds=\E]2;screen\007'
+  termcapinfo xterm* 'hs:ts=\E]2;:fs=\007:ds=\E]2;screen\007'
 
 #terminfo xterm 'vb=\E[?5h$<200/>\E[?5l'
-  termcapinfo xterm 'vi=\E[?25l:ve=\E[34h\E[?25h:vs=\E[34l'
+  termcapinfo xterm* 'vi=\E[?25l:ve=\E[34h\E[?25h:vs=\E[34l'
 
 # emulate part of the 'K' charset
-  termcapinfo xterm 'XC=K%,%\E(B,[\304,\\\\\326,]\334,{\344,|\366,}\374,~\337'
+  termcapinfo xterm* 'XC=K%,%\E(B,[\304,\\\\\326,]\334,{\344,|\366,}\374,~\337'
 
 # xterm-52 tweaks:
 # - uses background color for delete operations
   termcapinfo xterm* be
 
 # Do not use xterm's alternative window buffer, it breaks scrollback (see bug #61195)
-  termcapinfo xterm|xterms|xs ti@:te=\E[2J
+  termcapinfo xterm*|xs ti@:te=\E[2J
 
 # WYSE TERMINALS
 # ===============================================================