Version bump. Removed old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

8 files changed, 28 insertions, 236 deletions

diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog
index 9fbf2991ce26..77d7ee11e69a 100644
--- a/app-misc/screen/ChangeLog
+++ b/app-misc/screen/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-misc/screen
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.192 2014/04/20 18:37:01 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.193 2014/04/28 06:04:54 polynomial-c Exp $
+
+*screen-4.2.1 (28 Apr 2014)
+
+  28 Apr 2014; Lars Wendler <polynomial-c@gentoo.org> -screen-4.2.0-r1.ebuild,
+  +screen-4.2.1.ebuild, -files/screen-4.2.0-check_for_altscreen.patch,
+  -files/screen-4.2.0-incompatible-protocol.patch,
+  -files/screen-4.2.0-long_terminal_names.patch,
+  -files/screen-4.2.0-nonethack_segfault_fix.patch,
+  -files/screen-4.2.0-tgetent.patch:
+  Version bump. Removed old.
 
   20 Apr 2014; Lars Wendler <polynomial-c@gentoo.org> -files/4.2.0-tinfo.patch:
   Removed unused patch.
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index f72b451e8e63..053d1c16404c 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -14,35 +14,30 @@ 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 screen-4.2.0-check_for_altscreen.patch 1044 SHA256 549690b41d07d711ff412a05ff8d40e9994c923698161fa5affd5ac16b864cad SHA512 927eb398271e0fd75531b3ce480480f0410c4916ab6472262502f7bdd8d912c3e2c0c5829735cb40752f84eafafff799cadd68cd3ae628fb86de7a025ef9126d WHIRLPOOL cd76586144df4c9ea95293ab8b271556fb7cede20207eefb9af566420ac28ffcba9d838f3621117e3c72a32b51bb9399858a006697d28fea4595e777190d261d
-AUX screen-4.2.0-incompatible-protocol.patch 728 SHA256 88125edb862369680185e5df2aa7deefba0a6a4ee80a612ad604a2bfe126df23 SHA512 0139789400588ca12ae240e3bd996188185f3734fcb94e84f8ed213574a0bf4b4c23cdf401debd6edcdfd63a7b392098862f12be3c9936c86b122b140d2baa0f WHIRLPOOL 93a8cfa33307b78fc2651cc985edb1469b33532b2a6131f6afcb44fb9f05a61bfdadff3b30a70dbf442714d2dffc6d974a479364a67ca7ff9544537ccd374512
-AUX screen-4.2.0-long_terminal_names.patch 2172 SHA256 74e46b0d85a3b4ca1d30f286089e369bfd7373336dd8c1f69892d4e0071909ea SHA512 02841cc42f490f1e9de7ffa687bb8a031e9d39bd3ca249ecf31b8ad32a6e8f9682b6cc8dd0b787480f076024a0f14b25d950f43d54d29f2ee6cd90518eb9872c WHIRLPOOL 27347a246999797fc977c37820a4c5eb84de16417fc6c864c2b6ad2b67b300d19fbe13ac511bc602d729e1cb80a05339e34c08063add1c60a14a291dfd469286
-AUX screen-4.2.0-nonethack_segfault_fix.patch 1176 SHA256 afefc6c375549098dc989664bd00ed83388374ed988109d9927ee115a010f336 SHA512 026cbea0e0570b6805d59924eb190b16c8b7df991da66391d38cbf237915ed2247828e11b0b8d5f7f8a79848fce4bdb11858f57351d4db50682f03d5ae3ea0bf WHIRLPOOL 2c3855326f26f206211906a5f0e67a515674ce0b28b7c11d263a7cfc6396bf7d77d881893e79ca39affbd7a8ea67c049bc6ce655ff454118e70339b4f5d9cd3d
-AUX screen-4.2.0-tgetent.patch 972 SHA256 8b32709a27f004d50268e82d6271b838f01e81af636d0f914cf221962c2bb2cc SHA512 ca2f4da6d262781367bd24b699b9d47e3aa2866e07a87729901c9cef9bfff2de05b87e9a6eded9aebd83aee2c80899b2f4990e8ff44b8a506a8efe8e4115d9ee WHIRLPOOL 8d8bd41c34bd1f205bcfa6a3e83a528daf778dcdb37d9438f6f669511eea186a0da8948ca537799d4323190c76263638b5956622deb84354110595fec70166d8
 AUX screenrc 10412 SHA256 191d91f9fd1e676525a9e1a3bdc5ac73283f948caf74b4bb6e0cfcecbe4798bb SHA512 06fbec5e28480a2c369330fac0c94faa47e5d28e037d9fefd0cb3e813002c504866dc8ac86872b7ac6f16059a219e396a9c425b578b8afe882153ddb506158f7 WHIRLPOOL e05785d9810a709ccd189bbf1557022bd91f653ddb2f138e54286fbbc11ddbbedf2276d2b8bc975a8ff1ac024ab24d955a6b3055cf5cd2dfb445c35484e90f09
 DIST screen-4.0.3.tar.gz 840602 SHA256 78f0d5b1496084a5902586304d4a73954b2bfe33ea13edceecf21615c39e6c77 SHA512 24c1f598972f3dc9ed49cd2c05852190a0190d22fa01401eee8484627c8dd2815f0a422d9b2697faa8aaa0b3efc6730a94e2d5aa787dbe5e9ec719143176c338 WHIRLPOOL 6774786126eb05749d432593bc2c1febdc57896959220a609feb138bdc16b8da278aea63af1ccfd5c7d38ccaa9e7d28980e9e14d0009d36a54cdbd9e4cb0fca7
-DIST screen-4.2.0.tar.gz 786565 SHA256 7dc1b7a3e7669eefe7e65f32e201704d7a11cc688244fcf71757f7792a5ff413 SHA512 be9b04de668864c1e9ebabe76dc35be60ece15bda16d983d8fee0331ddbf6d732ca354a136cd602dda76baf155d8f324e1ef16cc10b4b13ee07c74d37af49350 WHIRLPOOL 8922a0766e3e55fcc7d2f255fd9c38eb6145f78363c6173cbb66336aec956ace29b8786fa93fa967920b3cc5468b2c031c90fd6f5a1c76cec0e60500acba9dc8
+DIST screen-4.2.1.tar.gz 1062485 SHA256 5468545047e301d2b3579f9d9ce00466d14a7eec95ce806e3834a3d6b0b9b080 SHA512 30826b2a2fc436483276b90cc4c6679470f7ccb7098c9bb8457d0e534998cd12da02882cf80678465f6540cade170c3fdc6bdfa31b07359ff0d3ffe2d6063710 WHIRLPOOL 7d4209651a016a9ab91aec385532c6ebd7a6d96a60342721f3a53752924c3fb72aa3d648ad665b67fab0a78d6019396abe13e04f556c7e5e9f71bf3238e64cc5
 EBUILD screen-4.0.3-r6.ebuild 4845 SHA256 29116c76a3a9779d630ed4d6bdfbb40710089b90b67c7ae9e3ff60d0d0011e05 SHA512 63eb380ff6624c3c9218cfe8013f2a051d401cdbac225ba6c65991fd1c2894c91a96c8b2a09715c075a3d801ee54c228fa2935501eeab824d82bbb1051981b52 WHIRLPOOL 5698d4cd010792ff4e20af04c2df7fb8cf59f2377170976bbeb03f251dfd75168f7a29641c888237e1db79e0d1881fb3761c1c25bc3faa5ac3ac3fcd48febffc
 EBUILD screen-4.0.3-r7.ebuild 4869 SHA256 41b6ffaf1ff6bbe2ce7a90661d3745e3fda74fbfc2c226184c0152848f895f05 SHA512 86e290b01290c2ba1c156ccc9d3b650f5613c83e3ec7e237fa2a2de97471c722f501a87b86a1ef67d5e810459f42f6e6cd055980de3970d191e428545e549349 WHIRLPOOL cc9721338d96bcad79066b4a63cfdbd745f895fb49cd06e4eaf6351fc9d6eb6bd322a081abbfa8352312be2f1da30f46a7d0b4b9acac79da6bc9e38a87dabacb
 EBUILD screen-4.0.3-r8.ebuild 5187 SHA256 0ced20043992f770364ad996b97d2c4f82433fcac15d6870075bf58c147efd19 SHA512 81c96886127cfb428fbab965e20e23dd3f492bd7f3224f5f4ad030b99d334d37978068218da540d6093ef4870ae87a974a3546cd0eb54197a60b1500e02fa88c WHIRLPOOL 5f581b990ed190e34efd1a1d49385b748095f6ec87f2e31c74d3386f49cf7615526501e02eca931b96f1199a51fb161b49bc4db58ccafadeb045782e6a0b861e
-EBUILD screen-4.2.0-r1.ebuild 3600 SHA256 14a9d600ff08d81dcb1a19f05011f3e8e88e3d47e2c2c13cb79ed4fa0335644f SHA512 1e4d1bc636235c45235c3b3e81ea202c7d860e5723a81a730fac2aa6c7ddfa024052e77d4a3710dafa1ac7b513a77bd189be8cd50fea9bce11d19bf15e9dd73e WHIRLPOOL 7383cd90f0f966066dcbe64540356d99b0aed844ce762ce61717db54b6663b49ff3623d596bf89256c7c610c1728be2dce9c984de30edfded89a83ee1550ea91
+EBUILD screen-4.2.1.ebuild 3273 SHA256 9d877daa5961913459788fa2417f22945bc704cbc9411469154b63dba5df9bfb SHA512 b5c75326d8ab919105dfb87a8df8d6619b2bfcd659b165edb0816abf1c4931492bf6302eddceffffab40a1ad8f628cd1b06b3a6a93608fe5f04f50de31e3a422 WHIRLPOOL 150262c215d5193713fee1b2d696f74acdebde7c6d19d7181790570aac3888f1ba73037eb04f4e3fa49f0c5289264c0968cb67ee0ba20956e669bab08e4cbb16
 EBUILD screen-9999.ebuild 3406 SHA256 63e115673afd760696fa4d9ff99fdea528ee107e7b1746bff2350faf404ad4bb SHA512 ac702fa4f23b0922c8c6fad4ad04c6b5e5a188c638a8c6ed7872fcc8d7283058c93b9ec4ff4ac22685af30df2ac3df25f254c512e7642c92aea6231a1258a935 WHIRLPOOL 82b58666d08a223baf223dc13962c85916943b86c1a44dd69808c29d0348c233e79b482803dfea5ac6d0b0c77680cca354c7dbedef6009f1be8bd2270a034fcf
-MISC ChangeLog 27407 SHA256 9945d4f1611a41fee5f99200121dbd3f52564f45e5ff96e5c5ef371a7948dfee SHA512 ef5d73841658bcd9821bf5e499a533b298016e62f419e1b48439bef02b6a3d6512b46938d37328b29abcf1e9a55a58523717e69de473f891e24b7ccee92e19cc WHIRLPOOL 1bd2dac9493dd337627cf8ef745b7833eef7579668df6b1d372c1f40b3b3815e2a910084565ecee815af083e8c3f7ffbd24d5b84c0a07435c91d6437ae751884
+MISC ChangeLog 27805 SHA256 78e1e830b62df382f1dabb7bc98a43220dd24c0fe055f9ecb3460c168d34c5c1 SHA512 1c4851fe52782bd81c3bda68de9c8e43c7a11c724826633228b72affb2d6da39dedb8a0cb3d6d4042003f4804b6fdeb12c902c222ae5c0394ab2ff24da963570 WHIRLPOOL eded994c5595760b3b583107b5879a037e7a6489c7b1481c6f945c07e73da5b64108b8fcdf466719c400ec78fe0490f3c7c841df1644afffb3f96a16fd385781
 MISC metadata.xml 1717 SHA256 3b683391c778841993813e38bc255e9fb7d36afc6c160b231fef4956ad6820dc SHA512 b6adab02c25cc3fac41f897c031fcd6265d1e8f4f2091501514b8469aecdbfe5efe7b2d2c66eef76bc2dd55dbb12de5f06f09ab3192fda5606cc249562820103 WHIRLPOOL 3f366cfca6b408350c0ea2d069fad9943a479033419f58558a93c58ecced96e518c0f3c59b8a71cef8fb4807b85eca7435c83beb2e1060b69931c4305fffa4d1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTVBPOAAoJEPiazRVxLXTF1dEP/3fCak9Bs3noNZuRGnID1CX4
-mrwM+Fzk0heGEooO0H4WFD/2+MIrpkPOrG3YArSLEZzwt2JelxsaopYvl1/KHQzj
-p+axLUlC5svbzEjY+vk3LO2EsuVz/zWbXDN7kxiYbBlFiCgODkHix40vZWvJ5mwi
-jQ+RrVGf7jMPGN2rJvjwaGdtWC3Cgn6AuPbl7ee3Gx+tVvgcxB3R/OVWQ4fOyalq
-QrzTTgX9dx4pSYc7sKdgY/OGz8fnj1xVrbEsuTCkM5h6xlqNFDXum5IEvPTfpzgN
-7sMGi6ciDiCgyn6gbcEn2iP2Z7bJicK0jWxcxsWldcv9ZwxtLs6IWbDdmdaJDXDh
-LhQEPfB5f8i18ozCUWbqGQOKSGjrPMtU65LqGRvg7v0JmoIFCSoUVC4CQCrA2IUt
-iNaMGDetwcruHOL7+h4Mod4QNAi+P7gTJn2LuFCKhXWomtYN3W9pmJtfWz/jDqup
-PABpMcbMEEBN25llN3QLq9GTD6ozl+cjnrUZExrqyPsFeRoTsKhNNP+4u11HlCXH
-GG+nv7H62NVnc/mde3n4QR5ARYHioEgQAbNFD1aHYYRfUvpq/64oxiZQ47C2U+E1
-krpiXznUi3zbRmVcerVNXA6ir5yhKNnng/vyCoeZ7Fx6xGSfplfqWLcQaKVEFqQ9
-dn7NURg8FveYIc0zqL+I
-=QdEn
+iQIcBAEBCAAGBQJTXe+HAAoJEPiazRVxLXTFYFMQAL6EXg9OrFQp0OaU4YGoSGiB
+m4UKMh0NaBCGJvQ1tk1GXt/N70Qxb8y+9VJ4e7T1G9vbV9RciQph16KeHx8sRaQZ
+GyRp+ri8O39nhdcgYZI/E/7DkWBSlJVWh3vfQ7mV7nH5niHAF9RwAYWWMJrtm6cw
+wIgknavA4sg5UU39YyDW3H8loxaolTX+UVPxXVlbRbHSr5nNM4zxKjW0POTmsO7E
+fHq4CSCGpaznjhkLCp+lUUIzluAgxo+huDaSUPmH/MURd32aQkupAC8wlRaPF0vd
+QJX0VIetvoQmmr2sRIWmP1AJAqlZORi4/HgYwXYwn/t7MJ0Mhqtioj99INYLiK22
+shhULZP1rFJKuR3oR6mQz2PD0+2xLrZ1Sm4nsGg68reUlPgDtC1Q96L18H1Og1SD
+IbDZ8pJEHKA1xle+74HZCRe634sBXTeU5Qd8i9LR5bw36m28IfiW6oA0n7w3W/ga
+QC21c5Jcs74Wj99TlMnqQZryQsjxAc+wN4bI5BnJD10Zz4tnmHSuPDOLBsrDqWyf
+fstVcUyRJblU7PSuO6t0cIo93tAF1fS3KHd8ZeQ5Is5lDfPU7Epnc+xM6uknCxX4
+nebctatKLzO2RZn55fSEpT7MaeIAi2IN/K7QE0BHFowfmmb7b9cVEZyAjp8z/xx+
+ZHoo+hqUxHADNjBb6fjy
+=zLWQ
 -----END PGP SIGNATURE-----
diff --git a/app-misc/screen/files/screen-4.2.0-check_for_altscreen.patch b/app-misc/screen/files/screen-4.2.0-check_for_altscreen.patch
deleted file mode 100644
index cb7ca5b0b0ab..000000000000
--- a/app-misc/screen/files/screen-4.2.0-check_for_altscreen.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 049a3bfdfc59590a24dfeefa707abb64b74ae17b Mon Sep 17 00:00:00 2001
-From: Amadeusz Sławiński <amade@asmblr.net>
-Date: Fri, 18 Apr 2014 18:28:39 +0000
-Subject: do proper checks if we are on altscreen or not
-
-fixes screen segfaults with `altscreen on` when using applications making
-use of altscreen like mc when resizing screen window
-
-Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
----
-diff --git a/src/ansi.c b/src/ansi.c
-index 04c9012..e76eef4 100644
---- a/src/ansi.c
-+++ b/src/ansi.c
-@@ -1436,14 +1436,17 @@ int c, intermediate;
- 		{
- 		  if (i)
- 		    {
--		      if (!curr->w_alt.on)
-+		      if (!curr->w_alt.on) {
- 			SaveCursor(&curr->w_alt.cursor);
--		      EnterAltScreen(curr);
-+			EnterAltScreen(curr);
-+		      }
- 		    }
- 		  else
- 		    {
--		      LeaveAltScreen(curr);
--		      RestoreCursor(&curr->w_alt.cursor);
-+		      if (curr->w_alt.on) {
-+		        LeaveAltScreen(curr);
-+		        RestoreCursor(&curr->w_alt.cursor);
-+		      }
- 		    }
- 		  if (a1 == 47 && !i)
- 		    curr->w_saved.on = 0;
---
-cgit v0.9.0.2
diff --git a/app-misc/screen/files/screen-4.2.0-incompatible-protocol.patch b/app-misc/screen/files/screen-4.2.0-incompatible-protocol.patch
deleted file mode 100644
index 582be4c8a10a..000000000000
--- a/app-misc/screen/files/screen-4.2.0-incompatible-protocol.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 14f23ca838b3d6daafbc23d14fa6aec13c382601 Mon Sep 17 00:00:00 2001
-From: Jürgen Weigert <jnweiger@gmail.com>
-Date: Fri, 18 Apr 2014 13:45:21 +0000
-Subject: incompatible protocol
-
----
-diff --git a/src/screen.h b/src/screen.h
-index 5c93f32..e74d711 100644
---- a/src/screen.h
-+++ b/src/screen.h
-@@ -182,8 +182,9 @@ struct mode
-  * 					 A few revisions after 8147d08 incorrectly
-  * 					 carried version 1, but should have carried 2.
-  * 2:	screen version 4.1.0devel	(revisions 8b46d8a upto YYYYYYY)
-+ * 3:	screen version 4.2.0		(was incorrectly originally. Patched here)
-  */
--#define MSG_VERSION	2
-+#define MSG_VERSION	3
- 
- #define MSG_REVISION	(('m'<<24) | ('s'<<16) | ('g'<<8) | MSG_VERSION)
- struct msg
---
-cgit v0.9.0.2
diff --git a/app-misc/screen/files/screen-4.2.0-long_terminal_names.patch b/app-misc/screen/files/screen-4.2.0-long_terminal_names.patch
deleted file mode 100644
index 2252fef17eb1..000000000000
--- a/app-misc/screen/files/screen-4.2.0-long_terminal_names.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 44020241d033555e8e90fad3c88617dce1aed0bb Mon Sep 17 00:00:00 2001
-From: Amadeusz Sławiński <amade@asmblr.net>
-Date: Fri, 18 Apr 2014 14:01:21 +0000
-Subject: fix screen to run on terminals with long $TERM
-
-According to tic man page:
-Terminal names exceeding the maximum alias length
-(32 characters on systems with long filenames, 14 characters otherwise)
-will  be  truncated  to  the maximum alias length and a warning message
-will be printed.
-
-Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
----
-diff --git a/src/display.h b/src/display.h
-index e8b3b80..a433e6d 100644
---- a/src/display.h
-+++ b/src/display.h
-@@ -73,7 +73,7 @@ struct display
-   struct win *d_other;		/* pointer to other window */
-   int   d_nonblock;		/* -1 don't block if obufmax reached */
- 				/* >0: block after nonblock secs */
--  char  d_termname[20 + 1];	/* $TERM */
-+  char  d_termname[MAXTERMLEN + 1];	/* $TERM */
-   char	*d_tentry;		/* buffer for tgetstr */
-   char	d_tcinited;		/* termcap inited flag */
-   int	d_width, d_height;	/* width/height of the screen */
-diff --git a/src/os.h b/src/os.h
-index 5c17c83..f1d849c 100644
---- a/src/os.h
-+++ b/src/os.h
-@@ -45,6 +45,14 @@
- #define NAME_MAX 14
- #endif
- 
-+#if !defined(MAXTERMLEN)
-+# if !defined(HAVE_LONG_FILE_NAMES)
-+#  define MAXTERMLEN 14
-+# else
-+#  define MAXTERMLEN 32
-+# endif
-+#endif
-+
- #ifdef ISC
- # ifdef ENAMETOOLONG
- #  undef ENAMETOOLONG
-diff --git a/src/screen.h b/src/screen.h
-index e74d711..01d678a 100644
---- a/src/screen.h
-+++ b/src/screen.h
-@@ -203,7 +203,7 @@ struct msg
- 	  int nargs;
- 	  char line[MAXPATHLEN];
- 	  char dir[MAXPATHLEN];
--	  char screenterm[20];	/* is screen really "screen" ? */
-+	  char screenterm[MAXTERMLEN];	/* is screen really "screen" ? */
- 	}
-       create;
-       struct
-@@ -215,7 +215,7 @@ struct msg
- 	  char preselect[20];
- 	  int esc;		/* his new escape character unless -1 */
- 	  int meta_esc;		/* his new meta esc character unless -1 */
--	  char envterm[20 + 1];	/* terminal type */
-+	  char envterm[MAXTERMLEN + 1];	/* terminal type */
- 	  int encoding;		/* encoding of display */
- 	  int detachfirst;      /* whether to detach remote sessions first */
- 	}
---
-cgit v0.9.0.2
diff --git a/app-misc/screen/files/screen-4.2.0-nonethack_segfault_fix.patch b/app-misc/screen/files/screen-4.2.0-nonethack_segfault_fix.patch
deleted file mode 100644
index 710781dc2990..000000000000
--- a/app-misc/screen/files/screen-4.2.0-nonethack_segfault_fix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 5b2ba5b3d48cb62894841f85a8c18db691491c8a Mon Sep 17 00:00:00 2001
-From: Amadeusz Sławiński <amade@asmblr.net>
-Date: Fri, 18 Apr 2014 16:44:52 +0000
-Subject: Fix bug when building without nethack commands
-
-When building with -DNONETHACK all commands were off by 1 because of
-missing nethack command in table.
-
-Provide dummy command with info message.
-
-Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
----
-diff --git a/src/comm.c b/src/comm.c
-index 5f4af8a..daad0a6 100644
---- a/src/comm.c
-+++ b/src/comm.c
-@@ -241,9 +241,7 @@ struct comm comms[RC_LAST + 1] =
- #ifdef MULTIUSER
-   { "multiuser",	ARGS_1 },
- #endif
--#ifdef NETHACK
-   { "nethack",		ARGS_1 },
--#endif
-   { "next",		ARGS_0 },
- #ifdef MULTI
-   { "nonblock",		NEED_DISPLAY|ARGS_01 },
-diff --git a/src/process.c b/src/process.c
-index 30497a3..d9dfc17 100644
---- a/src/process.c
-+++ b/src/process.c
-@@ -3185,6 +3185,10 @@ int key;
-     case RC_NETHACK:
-       (void)ParseOnOff(act, &nethackflag);
-       break;
-+#else
-+    case RC_NETHACK:
-+      Msg(0, "nethack disabled at build time");
-+      break;
- #endif
-     case RC_HARDCOPY_APPEND:
-       (void)ParseOnOff(act, &hardcopy_append);
---
-cgit v0.9.0.2
diff --git a/app-misc/screen/files/screen-4.2.0-tgetent.patch b/app-misc/screen/files/screen-4.2.0-tgetent.patch
deleted file mode 100644
index ad13cd4984f7..000000000000
--- a/app-misc/screen/files/screen-4.2.0-tgetent.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 937fcec34ba0d7ebfe0fb654c4106cc9c496f106 Mon Sep 17 00:00:00 2001
-From: Amadeusz Sławiński <amade@asmblr.net>
-Date: Fri, 18 Apr 2014 14:05:56 +0000
-Subject: test more libraries for tgetent
-
-Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
----
-diff --git a/src/configure.in b/src/configure.in
-index e9ca223..139bba1 100644
---- a/src/configure.in
-+++ b/src/configure.in
-@@ -674,10 +674,16 @@ AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
- LIBS="-lncursesw $olibs"
- AC_CHECKING(libncursesw)
- AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
-+LIBS="-ltinfow $olibs"
-+AC_CHECKING(libtinfow)
-+AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
- LIBS="-lncurses $olibs"
- AC_CHECKING(libncurses)
- AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
--AC_MSG_ERROR(!!! no tgetent - no screen)))))))
-+LIBS="-ltinfo $olibs"
-+AC_CHECKING(libtinfo)
-+AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
-+AC_MSG_ERROR(!!! no tgetent - no screen)))))))))
- 
- AC_TRY_RUN([
- main()
---
-cgit v0.9.0.2
diff --git a/app-misc/screen/screen-4.2.0-r1.ebuild b/app-misc/screen/screen-4.2.1.ebuild
index 838e2e94f757..6e440da1a7c6 100644
--- a/app-misc/screen/screen-4.2.0-r1.ebuild
+++ b/app-misc/screen/screen-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.2.0-r1.ebuild,v 1.1 2014/04/20 18:32:47 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.2.1.ebuild,v 1.1 2014/04/28 06:04:54 polynomial-c Exp $
 
 EAPI=5
 
@@ -32,15 +32,6 @@ src_prepare() {
 	# Don't use utempter even if it is found on the system
 	epatch "${FILESDIR}"/4.0.2-no-utempter.patch
 
-	epatch "${FILESDIR}"/${P}-incompatible-protocol.patch \
-		"${FILESDIR}"/${P}-long_terminal_names.patch \
-		"${FILESDIR}"/${P}-tgetent.patch
-
-	# Fix segfault when being built without nethack support (bug #507916)
-	epatch "${FILESDIR}"/${P}-nonethack_segfault_fix.patch
-
-	epatch "${FILESDIR}"/${P}-check_for_altscreen.patch
-
 	# sched.h is a system header and causes problems with some C libraries
 	mv sched.h _sched.h || die
 	sed -i '/include/ s:sched.h:_sched.h:' screen.h || die