Drop versions which depend on vulnerable xorg-server, bug #532086.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x2324E7B566DF2611!

11 files changed, 26 insertions, 916 deletions

diff --git a/net-misc/tigervnc/ChangeLog b/net-misc/tigervnc/ChangeLog
index 2182e3c144b6..3a8514b3c3fe 100644
--- a/net-misc/tigervnc/ChangeLog
+++ b/net-misc/tigervnc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/tigervnc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.197 2015/01/25 11:24:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.198 2015/02/10 10:37:07 chithanh Exp $
+
+  10 Feb 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -files/1.1.0-export_missing_symbol.patch, -files/1.1.0-gethomedir.patch,
+  -files/1.1.0-xorg-1.12_fix.patch, -files/CVE-2014-0011.patch,
+  -tigervnc-1.2.0.ebuild, -tigervnc-1.2.80_p5065-r1.ebuild,
+  -tigervnc-1.2.80_p5065.ebuild, -tigervnc-1.3.1.ebuild, metadata.xml:
+  Drop versions which depend on vulnerable xorg-server, bug #532086.
 
   25 Jan 2015; Agostino Sarubbo <ago@gentoo.org> tigervnc-1.3.1-r1.ebuild:
   Stable for ppc64, wrt bug #500372
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 6f0cf33ed53d..0494f9b852ed 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,48 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 1.1.0-export_missing_symbol.patch 606 SHA256 92559d7154c9f204fd9c2dfca1f836c19ff613bff3bd9687f60f7bde5b023bc3 SHA512 82dde8d1bf1b570b2e6026de5ddf7addb4ae633ae2b67ee23bfdb2dac3cc46205963a1b14e68efc49957741f5431adbbd9cc217273e3d83ac68872683ddad5df WHIRLPOOL a0563cd8c215c82e548208638b08cdb34f045fc9f33385d0254307fa250eee59900e7960845d032f419f42fe8138b049e01e14683c1bd65d71263b603bfd7b78
-AUX 1.1.0-gethomedir.patch 889 SHA256 4b85a9ddb9980e88c2f66c0cb56f6e8f00e4789ba2ab4b99f7246c5f131e6d79 SHA512 0036a1cfcc96d10c90efafef7ea2bc057c03127dc39c10c85ffda526e343fa17991c4d2beedb90da4bee9e83ef6de576ff41c842ec304aab9a2b9a1e0b35f48e WHIRLPOOL 2b5b1f864e39f8411865ff5d41b7aa0f4d430cf50288f65afa4223d7c0d4548c0b087b10f4624ced9c7501598b3685e4f4d0c5b68b3301071f045846b3e7dd10
-AUX 1.1.0-xorg-1.12_fix.patch 829 SHA256 250b4cece83917026b958aaf625b458232027e176c97047be959f091a25c2abf SHA512 9e0c59835328e13569c9e819a69d9fd37feab3e0f228e2a8b1f0aa733dd564caa896c1d6169da1a265b73d9c8a5b5ce458a96d25517ba9483ce17e75360e0958 WHIRLPOOL 8cb1ba215b357f3b73830734b954e369d1d4d370a437fc6a0593a1e198c5d393eebd1bb5dbbff1350a9391cc2fe96c3e5bb2dc751de6e13944b9a575859eba36
-AUX CVE-2014-0011.patch 1762 SHA256 bb653a300dcd39e349967ab607d4f2b26ca56044fdb71c77c007bc968cd544d2 SHA512 2979169c429f8ae41fdd2d411b45148a7db761d67e29ecbe1801605e9ed11debbf1f3ccdbeaddf1516c9f211d4a3ce82f41003a806d7556e7f148c4be039a756 WHIRLPOOL a2d1ef62520248fbc0ed7ed83a38c13f319f294fdef6fc3c2c35a29ece85d5b5750e90c50a567363c2e3724f7fb78e089fe74aff7aa3f8ba18109276f4cbf64b
 AUX tigervnc.confd 346 SHA256 48b6ae4f3e9e528b3cd4bc1349ceed3cd1a403ab0f3a2a8dd57a4769f88ceafc SHA512 204ab170de8b76d72d6fd2c3fcfab19cb2750eca231956f53cdfc81270baaef9ae31b08ce53b103a737045ccca8ce0b7f9649fb7cbd582ee0acff437ff5c85b4 WHIRLPOOL 9911713196cb57057b2200c0303b832fe7708520453cbf4ca1b9ed945738c734afff3f4d1f96e361e487e59b39f3ef44ac939234e1ea56e2e9e4e612cd5d70ee
 AUX tigervnc.initd 2083 SHA256 3971df255bc3f0aa52b6b66a3ba71290a3114244e8c2193962ddbcead75fda46 SHA512 7e074e98c668a75f96ffb02cfe8f34100b478e2d311fc5964ad704823292d5602a5533d13fa7103ee81da79beb210165ef9bcd70eb73e1ad0f57bd6997090bc0 WHIRLPOOL 066b0b6ed598c9b8ca856381eb2f7d6b607759c7771097550d706fdb6387aada7210dcb0212b52515dad81626e48d7c68b27e07efb7e7346bf82b7dae16f4393
-DIST tigervnc-1.2.0-patches-0.1.tar.bz2 10194 SHA256 cf58845892b50f1a9f01567747d262ba0619df85fe3bd67e61ebcb3229f75ff5 SHA512 f4061c85572901b160b41107960a46b7faea59d8bee9301bfb62ade26678711b4e86951bda74ca3ce0e51ba1fcddb37404da8e8e469353e8620a72d450fd816a WHIRLPOOL 80a40306cb138a137155b848f471a2bc54f8973eb869cbc90753a23a53361469f0c793389d2dcb341d3cf8bf403c5636f7c1f34722c7a86f7ff58f5afd80dbe9
-DIST tigervnc-1.2.0.tar.gz 2487050 SHA256 6e0910f1ff1681bc8b52e7ea805e586b88b352c88f66e4c2cc31aa39c4a32f53 SHA512 a1ffe59f0db394455859a8de0551819f15f976689565fffc72c5eff9953e9678ff02f10dc0fc51931e251b6b8aee27c5c75c008ee6a7557f3db42911a90a27e5 WHIRLPOOL 5d2fc9be4cf9e281a29d27fc14362471d98b83bf3c396521ab267ad6fea24ed5c5ebeb81775af11ed06f3d0977fcda6976ea6dd16cfe798ed828442ef76a2c78
-DIST tigervnc-1.2.80-20130314svn5065.tar.bz2 1048377 SHA256 bdb1b4ded129ca45e0ad9b9616851ae6f86ffed83e961991dc04bfef767a3b68 SHA512 ca2662864e8cd4d059bc8efbc755ee8db336e7491a098cc891fded67637d6a63c5e4ce1a9eabe6904d0c73b4238e0d0fcd3444c472eb8affb40f51e316b909a2 WHIRLPOOL d76a928efdf1e6be46b4237cce41c58dddaaff1164410d556b0badbbc1e8d9904348f2feb311abfeb7d4332c11cc08f3d47f7465ec021997954b0dd481c166ff
-DIST tigervnc-1.2.80_p5065-patches-0.1.tar.bz2 6912 SHA256 16d3f5feeb017dfaccbb536c391fc66cd35465a56fb7b702c621a06cc0f8ca49 SHA512 cd04d6bfa1b64db0a964ab04fb813ad370855ff7ad4ebfe377a74bcd0dbfe1603bb8bc908befab038c428830ea286fbcceff2f3ac992d8f1aaeabc9ee952f640 WHIRLPOOL dec7b0c485302236375cc4abfe5409b2d3e0ea02b27ff5ed048e30ab1e51ef54fdad713850de6d7445e3e0b5eb9d4b483d61f7079069a301c6dccea6b9dbdbbd
-DIST tigervnc-1.3.0-patches-0.1.tar.bz2 6940 SHA256 fa9c29a544b2826fb78cfedc9d4e3fd0100e56f7572f78d7c32a7ad752c3f22e SHA512 862965a708ce5cbc35409aff7947ebc8330c020b03ed69c2298aec81bc6d85b6492408bb4cea112b221dcc6c5c1e7ad1ec5e424df10536329930a58021712fa1 WHIRLPOOL 5970c6d0ace4c8b9846e9916052114ae45f84f3bc89227e958333ea4facd2fd2f5749121b545d5d157dec2cf35d403e6aaff96b17a9ef56fd20d64ad1d4d8906
 DIST tigervnc-1.3.0-patches-0.2.tar.bz2 8130 SHA256 9cf7ca0e3fe56f99c3ca1b88ddccca0952d86a722a3c3da4585aac4b7882245d SHA512 defb37a4f0aa5b7c2dd71aaf404b048c058adf3181235721607a3cac7e8a4fec7751b081ccb1704e51a68ada84147d408328cdf969c64359dd9460916671be90 WHIRLPOOL 67db5fc1c1b8bea6dc4394d360e5261f52f160627d9bcf5a4fee221c38600c0415a0f10170a960f91cf0cf94a401f9d625d790aba3af17fc3326aae6cb2b899c
 DIST tigervnc-1.3.1-patches-0.1.tar.bz2 16016 SHA256 5bcaabd8993274a5ce1718efc15fdaf22041003a49a94293eeea9b5b72d3b822 SHA512 f7afc3e7062976b704802e58bb654e46ded5f9dcf8e089d1633e82ce8f5383b60885158319142ac8a58d4d0cf0c8fb51134124bb2dd00dc38fb441bc079b31d4 WHIRLPOOL 33c149415633fe4b0c08cd96c9208c70728acc4b2935835bad1c39037af5aec70c54ad9b98503f6ca93441608e3eef82bc3b17dfcdda97f95ae5dbc41cfcd4a4
 DIST tigervnc-1.3.1.tar.gz 6888105 SHA256 628622316eefa5d4f348f00a280a513569bfae3eae6a20d72e2990654d12274e SHA512 28fe61287c4c96b3703055701cb74f7f4cb17392af5201b93fafe5187555710ab4becf110266ea161d26568064435626e85ab7570e1f7f6df2348f1a34d56e8d WHIRLPOOL 35875b230cd4face9a24ae9ff5682c122d7db7a43fe475d9216d30ca9c55409a16788bc6af5e0a2efde3457295f00a3a8f5e29b540477e806be5b0fc30408b99
 DIST tigervnc.png 4958 SHA256 e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e SHA512 97f9a42e9b9f50f1c91de3b7d7991aa8965240fe4958d6da4e9f72f9baa4510ad615765f7c59d6e0a90c9d4b5fe53ad1547c766f2da45e4a6b6e29b03ced2b8b WHIRLPOOL bbf01f6702724bc4329d053bd3fbf856103371abce20f6f74aa3c2e5eed0eebcdcccd287788b1efbb8de3008cb484a8da5ccd1bd667727e4b0861f3bb550529c
-DIST xorg-server-1.13.0.tar.bz2 5469168 SHA256 548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a SHA512 840a341f796386156ff4eb599c4b3b96090d3fda9cdbe70c45ff175c8d01b62cb9ba04a6c73ddde90996f8b96be1a3d925c9803a3b629cb4bc317374b7b1e014 WHIRLPOOL f52984556237f7c1dd4537727050e6b8347592ef5cd8e6787c65c3fee9bdcadb9709315929636fdc89a2fb4cdfd30f5224072954ed091eafb10fd8cd64a5ac30
-DIST xorg-server-1.14.2.tar.bz2 5490488 SHA256 f6ddfb3f1cfff2d69d45657aec626ebe8b5847810154ff7df7ed2072b076c86b SHA512 5a8caf61039b1605a85da9cba36ff525ccf9deda2f52be2b3f6360171d058b929a3a49e97db24b0587c4933009b2c479514f31d364eba54918a20a7e26a9060c WHIRLPOOL e20b6f60a806065184bb51d718eb50cad5b2809b7e0fe322f865ad5db3ed53cd3e9c7e6f8b577becde9c0cbec171435370087d1a19f496ed8645d4f93e2bac50
-DIST xorg-server-1.14.3.tar.bz2 5502845 SHA256 02125ae13a443dcbb55f964d5c37f1da2f58ad54c2102356037bec23c1b84f5e SHA512 d5379e2f52e93985ab2636ca02f503baadd359a4ec05bed80162213392e16d433a2b7308e90cdd18c1a0bd283429f2c8b8758b5a2c585923533cced6245de989 WHIRLPOOL 241feac891f48bdc7470891d54abec0e13921cc127898b083665778ab87920d2bf10088536ac05b9db200cc2cc8b002307873786223995624aa70098370ba183
 DIST xorg-server-1.15.0.tar.bz2 5546579 SHA256 613b2f2e7ee2a06d2f8e862c836dc70d319c52f1537749e027398f40086aabb8 SHA512 7bf6a9eff9cc606defbaa46600a4d7b41896f4304e06af745a2717687853c7e92b191481f1f4d6d98ef0adfe5f404c9e3997ebd98553c60b626cd1bb53c58d9d WHIRLPOOL 905d3b47938e5e5604b04953f11ec7acee9298d6f32570612d6301ac71b0c5a49e774267b627957b7a6a94f6b9bf211c9ed6b7102f389a2120a40bd45502a6d7
 DIST xorg-server-1.16.0.tar.bz2 5832944 SHA256 38330a03c5f7a38745a3f9816cf069db5b8844eebb358fd39dbabf61f32cd06b SHA512 eab298e3728aa79ff2ba3f5c12637c4db0f9bbca49ed00b673b2bfedf605f33a69d8eb946bed98e3d28afd9bfaf62e21ce2e8606d84cae9906506d90c26f1662 WHIRLPOOL bd9817cf93587e2b33d63438942c75d49b04f4fc2a4544654dfcc116deaf88abcccd0fa2496fb58848d5a007d2e32177cdbcd3f44237efd8b7882a0abc5b8d56
-EBUILD tigervnc-1.2.0.ebuild 4878 SHA256 8c4517f734417e3a0ef75809ee49d23a7df1ff24280b2ebe6c355783e6be1b35 SHA512 b89b3bada718885efb220624938c4ece28ba2b6ba63134163a1a93ccbe5daeb96d87823b8bd6a4bb7740593d73268b6fbde08b767c2c4cdfb9fb2a0c80bba29e WHIRLPOOL b530fc7ad8bfa6cce606087563326e31d4d0eb9b59a34f27aebf754b5ad1c75089ff1652e9e856e6fefe5b4486cb406145322713bdb812adc24cc092d1047bf4
-EBUILD tigervnc-1.2.80_p5065-r1.ebuild 4948 SHA256 0921b47330ff92bd27e60bb638ce6757adbec0b73d8b86023e8ecd1089c0afb9 SHA512 51cb48f321a1dd32162a936b60ea90b334f78500afbe968755e0388b1ab75065d9f946803c73a128ab94f57602db38db34e53839511cae7620479a4fd5d8b401 WHIRLPOOL 75e6ea0017bb9928ad1d60809a36885d247b654dbf7d1b42ba0b1073e5fc34917161cff156845bacb5d8bc9155c3e6862575396c76c743bccf4255357262e074
-EBUILD tigervnc-1.2.80_p5065.ebuild 4908 SHA256 bb5ee87ffbf2b110df9c4ae2abe62d8cb279deff53b6dd086fa3f457b7b41140 SHA512 e415a05611ca02bd244abd7e3c11ca5bab679de80113156e4af2fe2fcd456337acf693afbd17800652a962f91c711e93ebe7c40bb055d63d9f46cd2ec6be7bb0 WHIRLPOOL ce213b8567646f9d8fd2e879558ec0e5cf45aa419a604f55d33268162c62155ae2cb7293ee840b86759af8aa532c78b874871e0fe4d280e9f9c819bf7c44de34
 EBUILD tigervnc-1.3.1-r1.ebuild 4910 SHA256 8f2cbdd86a94ab4773b59798beb307eed3849f90d8582055946f389011e263f2 SHA512 2b0871972c59fceafb0acc9d088d0a0dd56ea8555372eeedb4733614dc50d8ba754fd3ba494bc260567a7f1dc8b932fd85efd79be7266f89c548aef1a8e3ae75 WHIRLPOOL bdccbf04091ce1ce95339ab1f8e0de5641ea901ffe0ae21367e829db7c505ae40cb8115f287bea5080de7179aa1e4916b413a4f5660a6cdd60b76ac7a8abe773
 EBUILD tigervnc-1.3.1-r2.ebuild 4986 SHA256 7c5b32d499c75670abc5b16c16de833f56c22fd3009576aa82a33d9c996c852b SHA512 ed2163993fbc338d3a062533d2c50be4cfe4968e47768405db51f0586115121cbc85d51aab77de20b6417c59cc56dcf66f624089ba1dad38e4a7bd4a4cd3d968 WHIRLPOOL f367e9eae116d83834bea4e167ac7ecd864dbf9b412cac49570b530f52357b6c1b9dd66ef917742e380e77589d1da9e630b081786fd5e6cabcd410a2cc16ca55
-EBUILD tigervnc-1.3.1.ebuild 4839 SHA256 9d99526eb1e928eb4795a599d3e7f61ec2d27e0ff03b2b97f515314943676b4f SHA512 c1c739dbc5a2d636973f6c3c5e6e21f3329c1447c7f35d8a0f2f6424d629bce38a6c2da4afed2555ae676c678c7d99e817ba368767423a0b5a61f20593db8f01 WHIRLPOOL 907e185b6fa2681a177cb290bba18f50a5cb57132942d0daccd5eddb3e10b1555113e171b322e15a0557791ea198e960342724ef028cd587dd90574c4942471a
-MISC ChangeLog 26326 SHA256 6cf3be85a54d362992b3bb56757dd274d89a33fdbdb5fc55db946509759b5189 SHA512 bfd27adec42b061be16e5314856ff58fb14d355ff3f6c82db7dc9c638794b87413c786cd02fd17218d962481a410e3795a56024ad579fd8b854bc2dfcb227394 WHIRLPOOL 93c614f24cf880111a8ebd0fae420c7b6df4c72181b0afed722364e856c15b444d9f0c227fcb4e1fef5476f1631b1b1ea24008f594b4f30f0da846a3f402c033
-MISC metadata.xml 419 SHA256 86dbc1cfbd6cbb2e25c6e597dd377f99e50f315eaaebcc4402df4a3196e14042 SHA512 994d090964ed1dfd0404a7fd0abea328472587617cfb86c76fb73525479fa4c1db65d33d9413935df5472ab834bc27687793ad84b0996e82e3894aef456ae9a3 WHIRLPOOL 8bf5c41547ac54c04042cf22c4fc7d432842997e8530a72e4c8f0a508c4fc1f0e77689f382290824c1d3b83510447d1763e36db8606a875ab0e5af845ea2efcf
+MISC ChangeLog 26740 SHA256 7c6a0ad344ab443b0f689501daeb4ddce3f5e2906bc197550fbcc5bee02fb8e5 SHA512 d876346be70a27a981d49c1e702610a0cc69433ea9588e42e59f622c254ca31a381ddd92ad6473e3c808d5cbc5018ea8a3e6a344620d21d01e41b732da12cd4b WHIRLPOOL 271c50e1f788183661230914bd55ae50ae402e16d4ef5115e2e489f24dad23e6588e38e34b696d889f2fadc44658dc70c617376b770d3acfbd43607610d9aa01
+MISC metadata.xml 335 SHA256 821ea06553b929fa98b219ad2f17ca84dda361965182f46e030ddd3b2d950209 SHA512 206ccc0af085090fd0381f6e088a82a4084fe5e97a64ff6bea9f2ceb7b209e42acdff2c779621e3be77c56dad978afcf498b8bf1b16e9ff1bea447110ad39e83 WHIRLPOOL 8bc100612b6eadbf295f8cd008c67b587cea0e852f6f8d6dd61f9476fef560d9c2393b206239fb26c88cb20840e4c0e6222bffadecfd31ba8fd934d0437619e2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUxNJVAAoJELp701BxlEWfgcYP+gNcSMeHfRROAe1+JmLdXbkS
-McDXt/oo7tbNARtRV7hLHSLEMlQPFoIxyvCOgfvuO9f6e2fx/RHClYCEzQRs1QDC
-oKKc7Qo7jNsK4rNXXpmBf0q6L8RbFSjjA/3OaiDLX7AxhMK11kpgP5Azh6qmnoI8
-w2NzdExQ9bxYCfqV8LVpAP9vq+/iQssNyRar4RpD7IHhfMBYAtRLRbrXKbxponU5
-jh+EJD0RPvATTcxcoVbSDCk1yW8V5g7SpIzyESSPh24fyRU0mdr0q/m+hAi4QmT2
-49aVLxOipXXSZjYAWDvTffyOZ6YMq3guUT66AbcDAS2EBlSl51d4G1+qzvXfBP0m
-eoPiE1VsE2CR5IvCG/YTVwLy0tFkmL9iBWg7KAEMAo3PTM4v63uugkVUz1aDajHO
-/J4D0XmKxsKmKuirudnTtEOlfYz379oVABBtYrcz/HZiqpl0eZLqWdL3SQWb0dfQ
-0SYx1X+qd+9ZpjEUagZX74Z8PC1d3k+7qpczLUBjeMS9Km+ZUSImOezDB+boMsPy
-UCVRtaPinIbed25Xj9Jn1ihu4BN+dJoa0wX7WDW5EUMDLzc3o99WZdYcwnmuQmS2
-djig41mMmjzIJjuPGrLEtJv91g6AAivrGaIZC7ak1bUD9PSSAgsUzVHD5qVZnLMz
-wM/lyrWYuDGTcQbEAi/k
-=XU+T
+iQJ8BAEBCABmBQJU2d9kXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy
+MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRPW0P/18xkclTlUmC+p80DW1tSWSE
+2J6UBDYpFRidbkIhSQsZxoIw4VTwAOOqgt92n8PjDpAEWngZvue/GH5DhEZup93V
+gkB/7bCFxH6NQacIHHooLmWodVQ+b/mkGu4qCBnUr0pnnfJwsVyHoUd1TzS5Q7QN
+xdjN8u9MZJXXHHhaj8NpmuVCv/qNp1l2H4iwOeWo1QkH8h3/3ne/B7sOlF8nFq+Z
+v3XgkcI6fM5XZ5WrFS3mMYsHrm2nCw59LfTl0i447MlevSANpwMiO8MOJLZdCsDE
+kpDxcHxHT646tw4MiHy+1DwVRsaLp9LoOZca6KqyVRVreehDQkKt6RFFG5EPHjSj
+gib2CSqjDj1KSFCZ8qupwcuZqX13kLcSOKGLcjaNCtRn09QGJqhW8oSS666BISm7
+cCGgXv5w4xhTC0TYHRPZ3IIbGIJA/G5Clmec2z3mNXVxFjszf7bKlIMMtQapNFad
+uv8HkARrWie+1N64BZiaY3vDY6nNhG9pR6FGbIpo/WFkdmfVY7CmAvScicp+04Vn
+ZsF7etfJKRxi+q5jn7129u9lhZCIGnaCYgHebyrPQPGlmjKJ26T/vq30Z6+Br9ZB
++loQqDlqFJN13VzO/x/VqpE+w7dQw8nZg1awxVaxZfmv0Qd+X1v61ZDTvrkSlCvu
+HSEWfjkheYeq1ii7UuLT
+=eKPX
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tigervnc/files/1.1.0-export_missing_symbol.patch b/net-misc/tigervnc/files/1.1.0-export_missing_symbol.patch
deleted file mode 100644
index 542586edffc0..000000000000
--- a/net-misc/tigervnc/files/1.1.0-export_missing_symbol.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur xorg-server-1.11.2.orig/include/input.h xorg-server-1.11.2/include/input.h
---- xorg-server-1.11.2.orig/include/input.h	2011-07-15 17:26:40.000000000 +0400
-+++ xorg-server-1.11.2/include/input.h	2011-12-22 10:38:53.581370977 +0400
-@@ -503,7 +503,7 @@
-                         DeviceIntPtr master);
- 
- extern _X_EXPORT DeviceIntPtr GetPairedDevice(DeviceIntPtr kbd);
--extern DeviceIntPtr GetMaster(DeviceIntPtr dev, int type);
-+extern _X_EXPORT DeviceIntPtr GetMaster(DeviceIntPtr dev, int type);
- 
- extern _X_EXPORT int AllocDevicePair(ClientPtr client,
-                              char* name,
diff --git a/net-misc/tigervnc/files/1.1.0-gethomedir.patch b/net-misc/tigervnc/files/1.1.0-gethomedir.patch
deleted file mode 100644
index fd07be3bb5e2..000000000000
--- a/net-misc/tigervnc/files/1.1.0-gethomedir.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -up tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am.gethomedir tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am
---- tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am.gethomedir	2011-03-22 10:53:05.206429397 +0100
-+++ tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am	2011-03-22 10:53:30.550388457 +0100
-@@ -5,6 +5,7 @@ RFB_LIB=$(LIB_DIR)/rfb/librfb.la
- RDR_LIB=$(LIB_DIR)/rdr/librdr.la $(GNUTLS_LDFLAGS)
- NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la
- XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la
-+OS_LIB=$(LIB_DIR)/os/libos.la
- COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB)
- 
- noinst_LTLIBRARIES = libvnccommon.la
-@@ -52,7 +53,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
- 
- libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
- 
--libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS)
-+libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB)
- 
- EXTRA_DIST = Xvnc.man
- 
diff --git a/net-misc/tigervnc/files/1.1.0-xorg-1.12_fix.patch b/net-misc/tigervnc/files/1.1.0-xorg-1.12_fix.patch
deleted file mode 100644
index 82c8c83915d5..000000000000
--- a/net-misc/tigervnc/files/1.1.0-xorg-1.12_fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# Fix building with xorg-1.12.1
-# From upstream: http://tigervnc.svn.sourceforge.net/viewvc/tigervnc?view=revision&revision=4899
-
---- trunk/unix/xserver/hw/vnc/Makefile.am	2011/10/31 08:14:40	4745
-+++ trunk/unix/xserver/hw/vnc/Makefile.am	2012/04/25 15:10:38	4899
-@@ -63,7 +63,7 @@
- BUILT_SOURCES = $(nodist_Xvnc_SOURCES)
- 
- fb.h: $(top_srcdir)/fb/fb.h
--	cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fb.h
-+	cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,g' -e 's,xor,c_xor,g' > $(srcdir)/fb.h
- 
- pixman.h:
- 	for i in ${XSERVERLIBS_CFLAGS}; do \
-@@ -78,4 +78,4 @@
- 	fi
- 
- fbrop.h: $(top_srcdir)/fb/fbrop.h
--	cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fbrop.h
-+	cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,g' -e 's,xor,c_xor,g' > $(srcdir)/fbrop.h
diff --git a/net-misc/tigervnc/files/CVE-2014-0011.patch b/net-misc/tigervnc/files/CVE-2014-0011.patch
deleted file mode 100644
index 0075720bd620..000000000000
--- a/net-misc/tigervnc/files/CVE-2014-0011.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -up tigervnc-1.3.0/common/CMakeLists.txt.CVE-2014-0011 tigervnc-1.3.0/common/CMakeLists.txt
---- tigervnc-1.3.0/common/CMakeLists.txt.CVE-2014-0011	2013-07-01 13:42:01.000000000 +0100
-+++ tigervnc-1.3.0/common/CMakeLists.txt	2014-02-04 16:59:10.840037314 +0000
-@@ -23,3 +23,6 @@ if(CMAKE_COMPILER_IS_GNUCXX AND (CMAKE_S
-     set_target_properties(zlib PROPERTIES COMPILE_FLAGS -fPIC)
-   endif()
- endif()
-+
-+# Turn asserts on.
-+set_target_properties(rdr rfb PROPERTIES COMPILE_FLAGS -UNDEBUG)
-diff -up tigervnc-1.3.0/common/rfb/zrleDecode.h.CVE-2014-0011 tigervnc-1.3.0/common/rfb/zrleDecode.h
---- tigervnc-1.3.0/common/rfb/zrleDecode.h.CVE-2014-0011	2013-07-01 13:41:59.000000000 +0100
-+++ tigervnc-1.3.0/common/rfb/zrleDecode.h	2014-02-04 16:17:00.881565540 +0000
-@@ -25,9 +25,10 @@
- // FILL_RECT          - fill a rectangle with a single colour
- // IMAGE_RECT         - draw a rectangle of pixel data from a buffer
- 
-+#include <stdio.h>
- #include <rdr/InStream.h>
- #include <rdr/ZlibInStream.h>
--#include <assert.h>
-+#include <rfb/Exception.h>
- 
- namespace rfb {
- 
-@@ -143,7 +144,10 @@ void ZRLE_DECODE (const Rect& r, rdr::In
-               len += b;
-             } while (b == 255);
- 
--            assert(len <= end - ptr);
-+	    if (end - ptr < len) {
-+	      fprintf (stderr, "ZRLE decode error\n");
-+	      throw Exception ("ZRLE decode error");
-+	    }
- 
- #ifdef FAVOUR_FILL_RECT
-             int i = ptr - buf;
-@@ -193,7 +197,10 @@ void ZRLE_DECODE (const Rect& r, rdr::In
-                 len += b;
-               } while (b == 255);
- 
--              assert(len <= end - ptr);
-+	      if (end - ptr < len) {
-+		fprintf (stderr, "ZRLE decode error\n");
-+		throw Exception ("ZRLE decode error");
-+	      }
-             }
- 
-             index &= 127;
diff --git a/net-misc/tigervnc/metadata.xml b/net-misc/tigervnc/metadata.xml
index 01dbb9e631ea..2a0e1487ecd0 100644
--- a/net-misc/tigervnc/metadata.xml
+++ b/net-misc/tigervnc/metadata.xml
@@ -5,7 +5,6 @@
     <email>armin76@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name="internal-fltk">Build+link internal and enhanced fltk library</flag>
     <flag name="server">Build TigerVNC server</flag>
     <flag name="xorgmodule">Build the Xorg module</flag>
   </use>
diff --git a/net-misc/tigervnc/tigervnc-1.2.0.ebuild b/net-misc/tigervnc/tigervnc-1.2.0.ebuild
deleted file mode 100644
index 6f458265ff7d..000000000000
--- a/net-misc/tigervnc/tigervnc-1.2.0.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.2.0.ebuild,v 1.19 2013/10/12 13:26:30 jer Exp $
-
-EAPI="4"
-
-inherit eutils cmake-utils autotools java-pkg-opt-2 flag-o-matic
-
-PATCHVER="0.1"
-XSERVER_VERSION="1.13.0"
-OPENGL_DIR="xorg-x11"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="mirror://sourceforge/tigervnc/${P}.tar.gz
-	mirror://gentoo/${PN}.png
-	mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2
-	http://dev.gentoo.org/~armin76/dist/${P}-patches-${PATCHVER}.tar.bz2
-	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="gnutls +internal-fltk java nptl +opengl pam server +xorgmodule"
-
-RDEPEND="virtual/jpeg:0
-	sys-libs/zlib
-	>=x11-libs/libXtst-1.0.99.2
-	gnutls? ( net-libs/gnutls )
-	java? ( >=virtual/jre-1.5 )
-	pam? ( virtual/pam )
-	!internal-fltk? ( x11-libs/fltk:1 )
-	internal-fltk? (
-		x11-libs/libXft
-		x11-libs/libXinerama
-		x11-libs/libXcursor )
-	server? (
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXfont-1.4.2
-		>=x11-libs/libxkbfile-1.0.4
-		x11-libs/libXrender
-		>=x11-libs/pixman-0.21.8
-		>=x11-apps/xauth-1.0.3
-		x11-apps/xsetroot
-		>=x11-misc/xkeyboard-config-2.4.1-r3
-		opengl? ( >=app-admin/eselect-opengl-1.0.8 )
-		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-	)
-	!net-misc/vnc
-	!net-misc/tightvnc
-	!net-misc/xf4vnc"
-DEPEND="${RDEPEND}
-	amd64? ( dev-lang/nasm )
-	x86? ( dev-lang/nasm )
-	>=x11-proto/inputproto-2.1.99.3
-	>=x11-proto/xextproto-7.1.99
-	>=x11-proto/xproto-7.0.22
-	java? ( >=virtual/jdk-1.5 )
-	server?	(
-		virtual/pkgconfig
-		media-fonts/font-util
-		x11-misc/util-macros
-		>=x11-proto/bigreqsproto-1.1.0
-		>=x11-proto/compositeproto-0.4
-		>=x11-proto/damageproto-1.1
-		>=x11-proto/fixesproto-5.0
-		>=x11-proto/fontsproto-2.0.2
-		>=x11-proto/randrproto-1.4.0
-		>=x11-proto/renderproto-0.11
-		>=x11-proto/resourceproto-1.0.2
-		>=x11-proto/scrnsaverproto-1.1
-		>=x11-proto/videoproto-2.2.2
-		>=x11-proto/xcmiscproto-1.2.0
-		>=x11-proto/xineramaproto-1.1.3
-		>=x11-libs/xtrans-1.2.2
-		>=x11-proto/dri2proto-2.8
-		opengl? ( >=media-libs/mesa-7.8_rc[nptl=] )
-	)"
-
-CMAKE_IN_SOURCE_BUILD=1
-
-pkg_setup() {
-	if ! use server ; then
-		echo
-		einfo "The 'server' USE flag will build tigervnc's server."
-		einfo "If '-server' is chosen only the client is built to save space."
-		einfo "Stop the build now if you need to add 'server' to USE flags.\n"
-	else
-		ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
-		OLD_IMPLEM="$(eselect opengl show)"
-		eselect opengl set ${OPENGL_DIR}
-	fi
-}
-
-switch_opengl_implem() {
-	# Switch to the xorg implementation.
-	# Use new opengl-update that will not reset user selected
-	# OpenGL interface ...
-	echo
-	eselect opengl set ${OLD_IMPLEM}
-}
-
-src_prepare() {
-	if use server ; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
-	else
-		rm "${WORKDIR}"/patches/*_server_*
-	fi
-
-	EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
-		EPATCH_EXCLUDE="015_java7.patch" EPATCH_FORCE="yes" epatch
-
-	if use server ; then
-		cd unix/xserver
-		eautoreconf
-	fi
-}
-
-src_configure() {
-
-	use arm || use hppa && append-flags "-fPIC"
-
-	mycmakeargs=(
-		-G "Unix Makefiles"
-		$(cmake-utils_use_use internal-fltk INCLUDED_FLTK)
-		$(cmake-utils_use_enable gnutls GNUTLS)
-		$(cmake-utils_use_enable pam PAM)
-		$(cmake-utils_use_build java JAVA)
-	)
-
-	cmake-utils_src_configure
-
-	if use server; then
-		cd unix/xserver
-		econf \
-			$(use_enable nptl glx-tls) \
-			$(use_enable opengl glx) \
-			--disable-config-dbus \
-			--disable-config-hal \
-			--disable-config-udev \
-			--disable-devel-docs \
-			--disable-dmx \
-			--disable-dri \
-			--disable-kdrive \
-			--disable-selective-werror \
-			--disable-silent-rules \
-			--disable-static \
-			--disable-unit-tests \
-			--disable-xephyr \
-			--disable-xinerama \
-			--disable-xnest \
-			--disable-xorg \
-			--disable-xvfb \
-			--disable-xwin \
-			--enable-dri2 \
-			--with-pic \
-			--without-dtrace
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use server ; then
-		cd unix/xserver
-		emake
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon "${DISTDIR}"/tigervnc.png vncviewer.png
-	make_desktop_entry vncviewer vncviewer vncviewer Network
-
-	if use server ; then
-		cd unix/xserver/hw/vnc
-		emake DESTDIR="${D}" install
-		! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg
-
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-		rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la
-	else
-		cd "${D}"
-		for f in vncserver vncpasswd x0vncserver vncconfig; do
-			rm usr/bin/$f
-			rm usr/share/man/man1/$f.1
-		done
-	fi
-}
-
-pkg_postinst() {
-	use server && switch_opengl_implem
-}
diff --git a/net-misc/tigervnc/tigervnc-1.2.80_p5065-r1.ebuild b/net-misc/tigervnc/tigervnc-1.2.80_p5065-r1.ebuild
deleted file mode 100644
index 817adc784745..000000000000
--- a/net-misc/tigervnc/tigervnc-1.2.80_p5065-r1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.2.80_p5065-r1.ebuild,v 1.7 2014/03/24 14:30:30 ago Exp $
-
-EAPI="4"
-
-inherit eutils cmake-utils autotools java-pkg-opt-2 flag-o-matic
-
-PATCHVER="0.1"
-XSERVER_VERSION="1.14.2"
-OPENGL_DIR="xorg-x11"
-MY_P="${PN}-1.2.80-20130314svn5065"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/tigervnc/tigervnc-1.2.80-20130314svn5065.tar.bz2/4522c6f107dbe778f197b2294c0eb867/tigervnc-1.2.80-20130314svn5065.tar.bz2
-	mirror://gentoo/${PN}.png
-	mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2
-	http://dev.gentoo.org/~armin76/dist/${P}-patches-${PATCHVER}.tar.bz2
-	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86"
-IUSE="gnutls java nptl +opengl pam server +xorgmodule"
-
-RDEPEND="virtual/jpeg:0
-	sys-libs/zlib
-	>=x11-libs/libXtst-1.0.99.2
-	>=x11-libs/fltk-1.3.1
-	gnutls? ( net-libs/gnutls )
-	java? ( >=virtual/jre-1.5 )
-	pam? ( virtual/pam )
-	server? (
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXfont-1.4.2
-		>=x11-libs/libxkbfile-1.0.4
-		x11-libs/libXrender
-		>=x11-libs/pixman-0.21.8
-		>=x11-apps/xauth-1.0.3
-		x11-apps/xsetroot
-		>=x11-misc/xkeyboard-config-2.4.1-r3
-		opengl? ( >=app-admin/eselect-opengl-1.0.8 )
-		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-	)
-	!net-misc/vnc
-	!net-misc/tightvnc
-	!net-misc/xf4vnc"
-DEPEND="${RDEPEND}
-	amd64? ( dev-lang/nasm )
-	x86? ( dev-lang/nasm )
-	>=x11-proto/inputproto-2.1.99.3
-	>=x11-proto/xextproto-7.1.99
-	>=x11-proto/xproto-7.0.22
-	java? ( >=virtual/jdk-1.5 )
-	server?	(
-		virtual/pkgconfig
-		media-fonts/font-util
-		x11-misc/util-macros
-		>=x11-proto/bigreqsproto-1.1.0
-		>=x11-proto/compositeproto-0.4
-		>=x11-proto/damageproto-1.1
-		>=x11-proto/fixesproto-5.0
-		>=x11-proto/fontsproto-2.0.2
-		>=x11-proto/randrproto-1.4.0
-		>=x11-proto/renderproto-0.11
-		>=x11-proto/resourceproto-1.0.2
-		>=x11-proto/scrnsaverproto-1.1
-		>=x11-proto/videoproto-2.2.2
-		>=x11-proto/xcmiscproto-1.2.0
-		>=x11-proto/xineramaproto-1.1.3
-		>=x11-libs/xtrans-1.2.2
-		>=x11-proto/dri2proto-2.8
-		opengl? ( >=media-libs/mesa-7.8_rc[nptl=] )
-	)"
-
-CMAKE_IN_SOURCE_BUILD=1
-
-pkg_setup() {
-	if ! use server ; then
-		echo
-		einfo "The 'server' USE flag will build tigervnc's server."
-		einfo "If '-server' is chosen only the client is built to save space."
-		einfo "Stop the build now if you need to add 'server' to USE flags.\n"
-	else
-		ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
-		OLD_IMPLEM="$(eselect opengl show)"
-		eselect opengl set ${OPENGL_DIR}
-	fi
-}
-
-switch_opengl_implem() {
-	# Switch to the xorg implementation.
-	# Use new opengl-update that will not reset user selected
-	# OpenGL interface ...
-	echo
-	eselect opengl set ${OLD_IMPLEM}
-}
-
-src_prepare() {
-	if use server ; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
-	else
-		rm "${WORKDIR}"/patches/*_server_*
-	fi
-
-	epatch "${FILESDIR}"/CVE-2014-0011.patch
-	EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" epatch
-
-	if use server ; then
-		cd unix/xserver
-		epatch ../xserver114.patch
-		eautoreconf
-	fi
-}
-
-src_configure() {
-
-	use arm || use hppa && append-flags "-fPIC"
-
-	mycmakeargs=(
-		-G "Unix Makefiles"
-		$(cmake-utils_use_enable gnutls GNUTLS)
-		$(cmake-utils_use_enable pam PAM)
-		$(cmake-utils_use_build java JAVA)
-	)
-
-	cmake-utils_src_configure
-
-	if use server; then
-		cd unix/xserver
-		econf \
-			$(use_enable nptl glx-tls) \
-			$(use_enable opengl glx) \
-			--disable-config-dbus \
-			--disable-config-hal \
-			--disable-config-udev \
-			--disable-devel-docs \
-			--disable-dmx \
-			--disable-dri \
-			--disable-kdrive \
-			--disable-selective-werror \
-			--disable-silent-rules \
-			--disable-static \
-			--disable-unit-tests \
-			--disable-xephyr \
-			--disable-xinerama \
-			--disable-xnest \
-			--disable-xorg \
-			--disable-xvfb \
-			--disable-xwin \
-			--enable-dri2 \
-			--with-pic \
-			--without-dtrace
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use server ; then
-		cd unix/xserver
-		emake
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon "${DISTDIR}"/tigervnc.png vncviewer.png
-	make_desktop_entry vncviewer vncviewer vncviewer Network
-
-	if use server ; then
-		cd unix/xserver/hw/vnc
-		emake DESTDIR="${D}" install
-		! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg
-
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-		rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la
-	else
-		cd "${D}"
-		for f in vncserver vncpasswd x0vncserver vncconfig; do
-			rm usr/bin/$f
-			rm usr/share/man/man1/$f.1
-		done
-	fi
-}
-
-pkg_postinst() {
-	use server && switch_opengl_implem
-}
diff --git a/net-misc/tigervnc/tigervnc-1.2.80_p5065.ebuild b/net-misc/tigervnc/tigervnc-1.2.80_p5065.ebuild
deleted file mode 100644
index 848c7a85138e..000000000000
--- a/net-misc/tigervnc/tigervnc-1.2.80_p5065.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.2.80_p5065.ebuild,v 1.10 2014/06/22 15:02:29 klausman Exp $
-
-EAPI="4"
-
-inherit eutils cmake-utils autotools java-pkg-opt-2 flag-o-matic
-
-PATCHVER="0.1"
-XSERVER_VERSION="1.14.2"
-OPENGL_DIR="xorg-x11"
-MY_P="${PN}-1.2.80-20130314svn5065"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/tigervnc/tigervnc-1.2.80-20130314svn5065.tar.bz2/4522c6f107dbe778f197b2294c0eb867/tigervnc-1.2.80-20130314svn5065.tar.bz2
-	mirror://gentoo/${PN}.png
-	mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2
-	http://dev.gentoo.org/~armin76/dist/${P}-patches-${PATCHVER}.tar.bz2
-	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86"
-IUSE="gnutls java nptl +opengl pam server +xorgmodule"
-
-RDEPEND="virtual/jpeg:0
-	sys-libs/zlib
-	>=x11-libs/libXtst-1.0.99.2
-	>=x11-libs/fltk-1.3.1
-	gnutls? ( net-libs/gnutls )
-	java? ( >=virtual/jre-1.5 )
-	pam? ( virtual/pam )
-	server? (
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXfont-1.4.2
-		>=x11-libs/libxkbfile-1.0.4
-		x11-libs/libXrender
-		>=x11-libs/pixman-0.21.8
-		>=x11-apps/xauth-1.0.3
-		x11-apps/xsetroot
-		>=x11-misc/xkeyboard-config-2.4.1-r3
-		opengl? ( >=app-admin/eselect-opengl-1.0.8 )
-		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-	)
-	!net-misc/vnc
-	!net-misc/tightvnc
-	!net-misc/xf4vnc"
-DEPEND="${RDEPEND}
-	amd64? ( dev-lang/nasm )
-	x86? ( dev-lang/nasm )
-	>=x11-proto/inputproto-2.1.99.3
-	>=x11-proto/xextproto-7.1.99
-	>=x11-proto/xproto-7.0.22
-	java? ( >=virtual/jdk-1.5 )
-	server?	(
-		virtual/pkgconfig
-		media-fonts/font-util
-		x11-misc/util-macros
-		>=x11-proto/bigreqsproto-1.1.0
-		>=x11-proto/compositeproto-0.4
-		>=x11-proto/damageproto-1.1
-		>=x11-proto/fixesproto-5.0
-		>=x11-proto/fontsproto-2.0.2
-		>=x11-proto/randrproto-1.4.0
-		>=x11-proto/renderproto-0.11
-		>=x11-proto/resourceproto-1.0.2
-		>=x11-proto/scrnsaverproto-1.1
-		>=x11-proto/videoproto-2.2.2
-		>=x11-proto/xcmiscproto-1.2.0
-		>=x11-proto/xineramaproto-1.1.3
-		>=x11-libs/xtrans-1.2.2
-		>=x11-proto/dri2proto-2.8
-		opengl? ( >=media-libs/mesa-7.8_rc[nptl=] )
-	)"
-
-CMAKE_IN_SOURCE_BUILD=1
-
-pkg_setup() {
-	if ! use server ; then
-		echo
-		einfo "The 'server' USE flag will build tigervnc's server."
-		einfo "If '-server' is chosen only the client is built to save space."
-		einfo "Stop the build now if you need to add 'server' to USE flags.\n"
-	else
-		ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
-		OLD_IMPLEM="$(eselect opengl show)"
-		eselect opengl set ${OPENGL_DIR}
-	fi
-}
-
-switch_opengl_implem() {
-	# Switch to the xorg implementation.
-	# Use new opengl-update that will not reset user selected
-	# OpenGL interface ...
-	echo
-	eselect opengl set ${OLD_IMPLEM}
-}
-
-src_prepare() {
-	if use server ; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
-	else
-		rm "${WORKDIR}"/patches/*_server_*
-	fi
-
-	EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" epatch
-
-	if use server ; then
-		cd unix/xserver
-		epatch ../xserver114.patch
-		eautoreconf
-	fi
-}
-
-src_configure() {
-
-	use arm || use hppa && append-flags "-fPIC"
-
-	mycmakeargs=(
-		-G "Unix Makefiles"
-		$(cmake-utils_use_enable gnutls GNUTLS)
-		$(cmake-utils_use_enable pam PAM)
-		$(cmake-utils_use_build java JAVA)
-	)
-
-	cmake-utils_src_configure
-
-	if use server; then
-		cd unix/xserver
-		econf \
-			$(use_enable nptl glx-tls) \
-			$(use_enable opengl glx) \
-			--disable-config-dbus \
-			--disable-config-hal \
-			--disable-config-udev \
-			--disable-devel-docs \
-			--disable-dmx \
-			--disable-dri \
-			--disable-kdrive \
-			--disable-selective-werror \
-			--disable-silent-rules \
-			--disable-static \
-			--disable-unit-tests \
-			--disable-xephyr \
-			--disable-xinerama \
-			--disable-xnest \
-			--disable-xorg \
-			--disable-xvfb \
-			--disable-xwin \
-			--enable-dri2 \
-			--with-pic \
-			--without-dtrace
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use server ; then
-		cd unix/xserver
-		emake
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon "${DISTDIR}"/tigervnc.png vncviewer.png
-	make_desktop_entry vncviewer vncviewer vncviewer Network
-
-	if use server ; then
-		cd unix/xserver/hw/vnc
-		emake DESTDIR="${D}" install
-		! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg
-
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-		rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la
-	else
-		cd "${D}"
-		for f in vncserver vncpasswd x0vncserver vncconfig; do
-			rm usr/bin/$f
-			rm usr/share/man/man1/$f.1
-		done
-	fi
-}
-
-pkg_postinst() {
-	use server && switch_opengl_implem
-}
diff --git a/net-misc/tigervnc/tigervnc-1.3.1.ebuild b/net-misc/tigervnc/tigervnc-1.3.1.ebuild
deleted file mode 100644
index 8e18825b10f8..000000000000
--- a/net-misc/tigervnc/tigervnc-1.3.1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.3.1.ebuild,v 1.10 2014/08/15 16:54:32 armin76 Exp $
-
-EAPI="4"
-
-inherit eutils cmake-utils autotools java-pkg-opt-2 flag-o-matic
-
-PATCHVER="0.1"
-XSERVER_VERSION="1.14.3"
-OPENGL_DIR="xorg-x11"
-#MY_P="${PN}-1.2.80-20130314svn5065"
-#S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="mirror://sourceforge/tigervnc/${P}.tar.gz
-	mirror://gentoo/${PN}.png
-	mirror://gentoo/${PN}-1.3.0-patches-${PATCHVER}.tar.bz2
-	http://dev.gentoo.org/~armin76/dist/${PN}-1.3.0-patches-${PATCHVER}.tar.bz2
-	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc ~x86"
-IUSE="gnutls java nptl +opengl pam server +xorgmodule"
-
-RDEPEND="virtual/jpeg:0
-	sys-libs/zlib
-	>=x11-libs/libXtst-1.0.99.2
-	>=x11-libs/fltk-1.3.1
-	gnutls? ( net-libs/gnutls )
-	java? ( >=virtual/jre-1.5 )
-	pam? ( virtual/pam )
-	server? (
-		dev-lang/perl
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXfont-1.4.2
-		>=x11-libs/libxkbfile-1.0.4
-		x11-libs/libXrender
-		>=x11-libs/pixman-0.21.8
-		>=x11-apps/xauth-1.0.3
-		x11-apps/xsetroot
-		>=x11-misc/xkeyboard-config-2.4.1-r3
-		opengl? ( >=app-admin/eselect-opengl-1.0.8 )
-		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-	)
-	!net-misc/vnc
-	!net-misc/tightvnc
-	!net-misc/xf4vnc"
-DEPEND="${RDEPEND}
-	amd64? ( dev-lang/nasm )
-	x86? ( dev-lang/nasm )
-	>=x11-proto/inputproto-2.1.99.3
-	>=x11-proto/xextproto-7.1.99
-	>=x11-proto/xproto-7.0.22
-	java? ( >=virtual/jdk-1.5 )
-	server?	(
-		virtual/pkgconfig
-		media-fonts/font-util
-		x11-misc/util-macros
-		>=x11-proto/bigreqsproto-1.1.0
-		>=x11-proto/compositeproto-0.4
-		>=x11-proto/damageproto-1.1
-		>=x11-proto/fixesproto-5.0
-		>=x11-proto/fontsproto-2.0.2
-		>=x11-proto/glproto-1.4.16
-		>=x11-proto/randrproto-1.4.0
-		>=x11-proto/renderproto-0.11
-		>=x11-proto/resourceproto-1.0.2
-		>=x11-proto/scrnsaverproto-1.1
-		>=x11-proto/videoproto-2.2.2
-		>=x11-proto/xcmiscproto-1.2.0
-		>=x11-proto/xineramaproto-1.1.3
-		>=x11-libs/xtrans-1.2.2
-		>=x11-proto/dri2proto-2.8
-		opengl? ( >=media-libs/mesa-7.8_rc[nptl=] )
-	)"
-
-CMAKE_IN_SOURCE_BUILD=1
-
-pkg_setup() {
-	if ! use server ; then
-		echo
-		einfo "The 'server' USE flag will build tigervnc's server."
-		einfo "If '-server' is chosen only the client is built to save space."
-		einfo "Stop the build now if you need to add 'server' to USE flags.\n"
-	else
-		ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
-		OLD_IMPLEM="$(eselect opengl show)"
-		eselect opengl set ${OPENGL_DIR}
-	fi
-}
-
-switch_opengl_implem() {
-	# Switch to the xorg implementation.
-	# Use new opengl-update that will not reset user selected
-	# OpenGL interface ...
-	echo
-	eselect opengl set ${OLD_IMPLEM}
-}
-
-src_prepare() {
-	if use server ; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
-	else
-		rm "${WORKDIR}"/patches/*_server_*
-	fi
-
-	EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" epatch
-
-	if use server ; then
-		cd unix/xserver
-		epatch ../xserver114.patch
-		eautoreconf
-	fi
-}
-
-src_configure() {
-
-	use arm || use hppa && append-flags "-fPIC"
-
-	mycmakeargs=(
-		-G "Unix Makefiles"
-		$(cmake-utils_use_enable gnutls GNUTLS)
-		$(cmake-utils_use_enable pam PAM)
-		$(cmake-utils_use_build java JAVA)
-	)
-
-	cmake-utils_src_configure
-
-	if use server; then
-		cd unix/xserver
-		econf \
-			$(use_enable nptl glx-tls) \
-			$(use_enable opengl glx) \
-			--disable-config-dbus \
-			--disable-config-hal \
-			--disable-config-udev \
-			--disable-devel-docs \
-			--disable-dmx \
-			--disable-dri \
-			--disable-kdrive \
-			--disable-selective-werror \
-			--disable-silent-rules \
-			--disable-static \
-			--disable-unit-tests \
-			--disable-xephyr \
-			--disable-xinerama \
-			--disable-xnest \
-			--disable-xorg \
-			--disable-xvfb \
-			--disable-xwin \
-			--enable-dri2 \
-			--with-pic \
-			--without-dtrace
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use server ; then
-		cd unix/xserver
-		emake
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon "${DISTDIR}"/tigervnc.png vncviewer.png
-	make_desktop_entry vncviewer vncviewer vncviewer Network
-
-	if use server ; then
-		cd unix/xserver/hw/vnc
-		emake DESTDIR="${D}" install
-		! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg
-
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-		rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la
-	else
-		cd "${D}"
-		for f in vncserver vncpasswd x0vncserver vncconfig; do
-			rm usr/bin/$f
-			rm usr/share/man/man1/$f.1
-		done
-	fi
-}
-
-pkg_postinst() {
-	use server && switch_opengl_implem
-}