Version bump (old stable branch).

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

14 files changed, 43 insertions, 1674 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 2dc55dcffd3d..de3068dfd914 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-ftp/proftpd
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.315 2013/09/14 10:37:51 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.316 2014/05/16 21:08:45 slyfox Exp $
+
+*proftpd-1.3.4e (16 May 2014)
+
+  16 May 2014; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/proftpd-1.3.4e-link-tests.patch, +proftpd-1.3.4e.ebuild,
+  -files/proftpd-1.3.4a-ubug-3682.patch, -files/proftpd-1.3.4a-ubug-3728.patch,
+  -files/proftpd-1.3.4b-ubug-3795.patch,
+  -files/proftpd-1.3.4c-fix-build-noipv6.patch, -proftpd-1.3.3g.ebuild,
+  -proftpd-1.3.4a-r1.ebuild, -proftpd-1.3.4a.ebuild, -proftpd-1.3.4b.ebuild,
+  -proftpd-1.3.4c-r1.ebuild, -proftpd-1.3.4c-r2.ebuild, -proftpd-1.3.4c.ebuild:
+  Version bump (old stable branch).
 
   14 Sep 2013; Agostino Sarubbo <ago@gentoo.org> proftpd-1.3.4d.ebuild:
   Stable for ppc, wrt bug #484614
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 75cc0eeb82d6..534aa1b07aea 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,12 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX proftpd-1.3.4a-ubug-3682.patch 4244 SHA256 310c18a525b3224edba7f1cfd0364a038df6394f57c0b6e1969957f0e25ded3e SHA512 7cd8313175704b809a001f29a9c320f51793bbb59e5fd2c732f11953aa6aa9d5b82bb48e1181b305e51ce61831a4955f40257863e184b1766d0a80cc4458585b WHIRLPOOL a094dcc2efa76af5bc4229ae5d3d68a1a8910269873a7825f3378b586c7bf07d8cc6f8f66c1247ee8b062e370ac69a43ab3e2ef4e06945202190046b3c2237b3
-AUX proftpd-1.3.4a-ubug-3728.patch 327 SHA256 f81256fe91be72ee8e96b18f356a55624cc080405f975760a2d17319828791cd SHA512 a3b173c398a3e3dac633488e005d7aab66373c9c0b1c32738a2cf6ef30a94024602bd96bd794036c86f214198a5d4f02f7f8097a13803bc2bc6320c53c14b023 WHIRLPOOL 8c283894f69d5bb24dfa790a232a234eb6dff9ca5e61de835129df83adf57b890e54e2a2c383904ed958656c65464c6f8e23cb3b75a5ab2c53314c116f33ed00
-AUX proftpd-1.3.4b-ubug-3795.patch 2768 SHA256 cc5f5175298408fb12de7cf268d8e59a4fa3fe2bc3c798d0f60f8c204e9831d8 SHA512 ed6eb3ed8080275c6b59b8c42dab08d6fa2653b8fd1f336b571429248c1807e95f60fa6ad491c97a689fed26e2c595e00f3a99996b472bf3bd87840fe3936790 WHIRLPOOL 61d8d6ca1aa0496fa0568a89fe2ec8ed64f6221ff14abb969541a6bf2285b2ac79a67c9ce3bf98e167236f38442ed5b6b12b0810fce001b7ec1c050af2649319
-AUX proftpd-1.3.4c-fix-build-noipv6.patch 582 SHA256 78aa3e205ca92fa2b97be2fb93d95980e1fec8b435ee858a8abb31435893909c SHA512 5ea38b94cb9f5d1a26f5bb0e3200aa72df7e5542f2041b3a33345918dc6c95859945ab8e80263d369f16f96862dc87b2511dea08080c76c14b68abe84a74bc04 WHIRLPOOL 4497bf1253be9be7663829fb1ab6ea96e45d67228219b7f099659c9f8654c9d37cdd3192d1eadc6f17430c120365375dee9fffbbc4ed6e1a3d8b0cc1e31900b7
 AUX proftpd-1.3.4d-memset-fix.patch 1271 SHA256 814c230120772449a055479447db2684cbeeacea1c709070ebaf21071e8b2b45 SHA512 bb744eee680b8c7c612c09a04bf3b85d643629e043e6a6f178e80108470b7e1324547188b31f7a7854fbca4fe8af08b4ec3918fb7a0d819194bd1f2303f977fe WHIRLPOOL 0c2e770830b70f9ca6acd9b50eee2b3e8b3b567b6ef53d32972edd9e5fd8d1e60b6c3952055a932ede11341d105c4d7662f8bf06e3c72c4ad60633dc11cf4faf
 AUX proftpd-1.3.4d-sftp-kbdint-max-responses-bug3973.patch 1492 SHA256 00f90994dc0514d906de68d96cc798a8158ae50a50a4719a6b070de1ef669c42 SHA512 835976728f0a3d72766c8a2da192d009b30ec5f1d6dedb711e985409708275fe250f14cde168017e5c78ed339b028186e5eecf51a6b183dd0ea85294fa609bb3 WHIRLPOOL fae4ff0ec20dcc83c6be7e2eb73d44785ac95cf4bebbec5f91228864ebd744baaecb9c9ab185eab7ac5ecfdbec0f86c073a8e316e5196f0138dd550b4a4ca00a
+AUX proftpd-1.3.4e-link-tests.patch 344 SHA256 75c5c0568144c9af6fa48b6dfdf1d91b46964d4cc2020140d3acf20bea21ca95 SHA512 8a01081351f1bd198c801e3bfc91e6f97bf9082590690e02689d8446bba643457816ee55620898d97048246e73d828d6aa4f65517a14a1c95be77cdfbaa97c87 WHIRLPOOL 8aecb44b8fba1ed9d107e86107bc4c86075b5a9b9fbcf59d01b30f1b0d88a0ee3806f4d604871385a49a4e862093dcffdd090774b2490fb35222090817c0e568
 AUX proftpd-tmpfiles.d.conf 34 SHA256 75288bb0c76392ae10e7ef3ff27e7b665742cdac8ce4c70dff9f29d645d0f0f3 SHA512 aa6ffbf15e4275941837306259fb426608e82e45a2da4b99c5d7778d11b8c9341e3a12ae9b751d0e173635239b6f1b20f0431be17296c005a83525a48327fa52 WHIRLPOOL d3ef47f4e2abc178c2d153599e7b13148345a470c76410b499e41912f9e90a48c1217e7fdee3d6777b1598dd09840f8bffbd208fa9addbeaaaf9c64058d8df93
 AUX proftpd.conf.sample 1275 SHA256 a214b3937f319c70976d29cfcd47c2cd937d1d70b7274c2b241b1e97606e89c0 SHA512 1c26f3e98ed07d89192c640f7823af168c045abee6ab076791aee9d50be5446be870a189979df4b828e7ae907dd40a346f1b92998fa39195195bfada4061c5df WHIRLPOOL a9f71cf50926ccdf5fe1116250c29a4048e7eb7fc7eb73732023b7c6e78c56b02356c001c203d9dc8c46f817471116977f76e961a6b2a60c03ae1d4722d9e3e1
 AUX proftpd.initd 1544 SHA256 aed3dd4cbbf1db8a1bd0cbadee66a808b430bbbcc436610407a9911df208f668 SHA512 f11ce49440341633ea4287e8887f8127d954207c5c25b0ae08b6ca1b8f42e90e693f657e45abc465c2c86c1b43a04776c9fb68b04c97a5a43fa17a05ff5ef5c6 WHIRLPOOL 0a8fe89a575491954fa177d6db85792eb5b6639abc9fd2c88358c0a7b64dc300602f5b75e4d90ba984e5d21831d2a5c2d39e98230f138cba463f3680eba49948
@@ -15,41 +12,19 @@ AUX proftpd.xinetd 295 SHA256 150a5701f5c2788ecdf2c6ec228ce674963c9dc7bc1c511ad1
 DIST mod_clamav-0.11rc.tar.gz 5115 SHA256 87630eb1866066d6320ee711897d8998b8f4915c0498b2e78cc0464abd34855a SHA512 6d33ee7b1c9c8e3fb0a0014dde90cfb1d37daa0f4914f147bb800a8318bcf0e03c7c6748d84cda36c5e5c7cd11ee8114bad9978362f581f367db54d3563f4636 WHIRLPOOL b15024d1011a83a10ce52fb676f1f2162d67750dc137600b624cd04ebd498bb3c9242e4889fd7b73c18224eb483286cb543fc627b27e6a8ff4c9bf35468218b9
 DIST mod_gss-1.3.3.tar.gz 115098 SHA256 24702cf0333720730cc269eb30529061365b1384fdce274bc3d46ccfc300934e SHA512 61473f3102e2204a27d691907482a3e86108bb423be54ba47a79ef0d2a0313bcdc022529f8e620bd868453bee1b1169fce74cc454d835fdfd4be964e342bdedb WHIRLPOOL 90a15ca919326fa2b2e21fb2928e5ac39b912681bce015f3bff0b0b0c47241f41cc3c78789797ba2d8a61dafc24a9f1d18bf085808350301c228b6ed62721e80
 DIST mod_vroot-0.9.3.tar.gz 28352 SHA256 f16c61ed7fe2d7231e1421f8f1a484f29972e0efe0e8e065ab373c388b0c073c SHA512 08a3e5df26bb4d5875b57af9e97e7e7cf27b2ad6983bfae0fac8a21f4a5be0a487cf0d9d03e9e1c08701eb3f22f2cb51a14c05fe1cba5f4085eb8a31d5142776 WHIRLPOOL be30931f117fc4f0b7de87579b483e41d86ad3ecd2999267a726664b32090cd32e6a7e748d66ddec525ee784ee2974212fd2455af313c13b67ab61625efa29d0
-DIST proftpd-1.3.3g.tar.bz2 4204504 SHA256 b1104a91e5e4dfafb0aa876492c073cf24b7d00b3e8528fa4443c108d963ae15 SHA512 773e93cd57c1e2a61244e94623cad69507363822702b3830051dbf728ba7b9a4ceaf6108bda54bbebf36143c31eb6dd6cacd7a81644843583b8dcb6fb7f888f7 WHIRLPOOL 9836f73ab1a19a578058e16526b0c8e4a1aac8fec05ca08a4833d265f49e43209224804e1ec502fde84c021e3d33d3a6346ec5052094a4e57b0f4032bee917d6
-DIST proftpd-1.3.4a.tar.bz2 6805631 SHA256 ad92eec86deccc385ac144e3925f9b9cbe085e60f10b33d1de6da91d32f39f3e SHA512 62090d61b96dab33d44b364e6e4875f890ca0a3cedcbea642ff52c04abfffb35e272d805739191e05eec3c0e9a66f2eb4c92ad7fd5f3bc5509ff33895e368325 WHIRLPOOL f4315a3ae530d098f4115dd1fbe4803cbea3ddedf7e8e1847171dc0a7ca18ede6e303774aa17b347597ded33a742f282e16f3509d8696c69177d37439518b4c5
-DIST proftpd-1.3.4b.tar.gz 7647825 SHA256 9f659585cea90fc6af34a0ffae4a90e4ed37abe92dbd9b6c311f95a436c961cb SHA512 12d955db031af66e75ba9685c244b34d2565d2f76ae89ca8e0e2f55feaeaaebee9b6cd59c0665991977f7ae7a383ff91d090c6d4584ae94f2575f919db848d2e WHIRLPOOL 56c834cc31ebce8706b9817f02ffecc174293103772cd947f534329d6ba81abb3184056708ae011361d8e12b52d7fea47d21230f94d0837ae12c977461f2f42d
-DIST proftpd-1.3.4c.tar.gz 7689622 SHA256 fb80dd422969b8c900920a30a56f5e272862275d244d3857a980f5f2386ea912 SHA512 8482217075412cc5c578822124f866b0eec502172e49407d962198010a575d914664cb580bc7f2ffa7c4da0d60a4156959135f56f50013543bf00f6cf6fbb7b3 WHIRLPOOL 8f901ba3c01e7a153a5912da460eaa06210c872b8b94db65028995ce7645d68c11265434b78874164292400a5ad782fefd5367c99886a65360788bd218184dcd
 DIST proftpd-1.3.4d.tar.gz 7697046 SHA256 c198b53991ce641eae6b3237e856e59f0bfe8330794145b49cae33f85b6f5370 SHA512 29d6d231a1ac2889dd90f64ab27e1db3e7b28b111f3c935be4611689a3808df15e87092da49ef2adf581e0c8165c0cfd8eb58e88434319286ad91d861c5b0d4d WHIRLPOOL 52fad9428329c38800412a1e9852caa436405904346c5ef04b4078accb4f4f9358e152f1b4d8501f0f3111d2417df100df4c5e87b3113546050d2d6a66c12386
-DIST proftpd-mod-case-0.4.tar.gz 4849 SHA256 5c724a2a57a00048529bfab6c5672e16c7c0ecb2eb4e2bedd05bb3a1a5bf97fa SHA512 49440a8015cb30c791245b4369d8f92f6d31c8a6953499c5ae221ffa51f6fa6874fc1c2c1424d223d9c1516a67da2d23e04fa1fb41dea24e91e56038da650a18 WHIRLPOOL 08873392b6f03c240196c9368cf97d2334596a8dbe4f55150532bb3782add0d81848a588e6448ae8346fac8a07b09f31284ebde218bb72e3184a1141fa086eaf
+DIST proftpd-1.3.4e.tar.gz 7721545 SHA256 985f040dacced450b5b49a89efedf383eca9ab4fbd3a1e9d8ab4c61a6a19f2ba SHA512 56a1cfae9003485c8f93c3d9fcd2cd7a2d98ae06a477580e9f5eb4a1d2654c6384b7a808ba2f12ee2a3059e9a7f99e14aece927fecdc8466219a08378deb5477 WHIRLPOOL 294b99fc308ea706d68674ed1b4c490da6488080fb5d43354794edee36284331a6825bb308b768cdfd12dcfe05d53bafd906b244337408421a8f8ef7cb35f086
 DIST proftpd-mod-case-0.7.tar.gz 13184 SHA256 c3f65588250fea7771439933fa754927794f664e99b8d20f99b1e400fea62111 SHA512 c08d13ef82fec36ae75aa3213dd02e0ce4045904849f422e152f039a9da66a45e4423751074b8bcf8ce347a40ce0e7bde798a85cbadc962fd872aeaa898261fc WHIRLPOOL 27f49e9f34099c081add803aa679fd9abe7afa652dffe5d8e42889fef49aeaefd499e1009fc564d6c8f882b3c6dc31d4c6dd08cc06a42b770e7ef76a2ebfcf8a
-DIST proftpd-mod-deflate-0.5.4.tar.gz 55219678 SHA256 6ae753608ad126067bd48da8d4ea6ac3ef8eaf339ae924ffdbe30d1819a5e5db SHA512 54a12759d820fae68f4038c05b7eb8dc0a47bfdab7a6715b37bee8ab82b032b4b929cb604126cdb305f87fc93dbd06730652db5e18d66baaab4c7788181f6dcf WHIRLPOOL ade43782adc25843abfdf61b26008a0af7ffe6d40f1f5887ae5dd2875f2282c67ae11a527e07ed8e53a4b868c71c36de00336a8502cf4afae0c71c259a0c4b03
 DIST proftpd-mod-diskuse-0.9.tar.gz 18596 SHA256 424f3fd49237245ec176d27ade0965fe21a0db1d645979d5ae3e55497e3da036 SHA512 d41976bf2810e4b783e775e8c767ca2030c3b5df116219fd31cbbac7feaf9922c315bf4ea092881b0d6cf43f2f4c5dbcae61be3c3a833058d12f962a3024b975 WHIRLPOOL aabd1dc23d6c38d308e859ff778beffd0dabfe70d3530c093cf2f95e80b5e9c94b97b6b5ae5109d031f76ff94dffc3822a7aa60fa30df04523d37ebed99730d6
 DIST proftpd-mod-msg-0.4.1.tar.gz 8082 SHA256 255b79d31dc509ffad5d0fbcd469f833a8481e880aa962910c2bc8aa608ca6da SHA512 38ea63b1d355e1e10a6a4477596bf3fa28529a871c9fb8dbf093b5317f0743ef9cb59b986d0b8c1c7ed932dad5d5d571883d596fad2d3b793431824db4487012 WHIRLPOOL ff907e26a354f53231fed94515eb60050dec77118be6f49147e0eb8b79e50c9d73354618bca19d98d32a3fb79d7ba87507cc6c8b269f259c5fcf23d44ad3a906
-DIST proftpd-mod-vroot-0.9.2.tar.gz 22438 SHA256 b0ea7af760ab7a54a62ac294656b5a34a5339665c0227ade0d2f206cc54a10bf SHA512 dcaad222a5d4bbd8202782c89ec3ba700ee9b74f475a575b5044eca570515d7aa9e01735ab6a109b669f3584f3e2f1fe22c96a9effdc0e8d2d62fa522b9a5ec3 WHIRLPOOL e25ee3333f1f7324068b177e9fc7333a9a5c7c5993e9654082b4ef685b478a2db40c2a350ec6739cf76eae11d9a79e3c67331b0df8607a3620e4ce2d64d2b774
-EBUILD proftpd-1.3.3g.ebuild 7177 SHA256 faf1de255cc098d2f2cc783ce8fa3b5c7d515eedc7d7bf9f254088259a00dd45 SHA512 2b8768944f9354f6fba354fa1153d0d3ed4cbaab6e429719ab817b1c334d3ec44967f248a8301d9429e3928a94c7ecac8a355b8959d6ad0c9e7a506c90a86fcc WHIRLPOOL 0a8f85c7d8007f5504064a6c3c66d41b84df69887141398b484191ca10c84009971c7ede8fb5434ac23415ec3ad752062ef5098145a07b945c06994e0d4ac041
-EBUILD proftpd-1.3.4a-r1.ebuild 7310 SHA256 e1a2a35d992e1e84a126a4786f9a49e84ddd51ca13facfc9a31115cd3dbb1689 SHA512 51a9077c7d9d86841a6393964d0d4ea05df3abfbf16929fca4a5a4609cd5c49a6c83e9adfd0c0e6b4887d03a0b5666fc965c4a53ce2af665de6da266b1e9d2e8 WHIRLPOOL 350706a8685dd04ed0743623dac7fa2431cacf2be3e0a1e33df223ce99f78f83414558ac7b989ae7138f92b46e7d23f005b938636d82d7714dab3491515664a1
-EBUILD proftpd-1.3.4a.ebuild 6738 SHA256 398c1f9ce2e9bb261af7e34fd836950a82cfa96b7a87861427ea7501585d54f2 SHA512 bdff31c2848848c4371f93899b710aad7dfa898e2168184c9eaa1cc56c1a283ee29132f3a0458dd55d9cae06247d21fefdc07d400ceb620b7c710f59108be063 WHIRLPOOL f6db84d8c6a2a0d005b9ef873d07a10ba0a65171c6b257197ebd087abd6897131002c2c02f8500d820958ed6120c7bd7ba9826f45796395e483946777f0f59e8
-EBUILD proftpd-1.3.4b.ebuild 7216 SHA256 f0a8cbd628cec9af0ab06fe50bc568ade35b50014f739655e3bf68c9ac69bebf SHA512 4c5a1230ee552ca7a23cfbbb8760701c0a01de3b05bcb324a4c61e1763ea36a0f025c67a6347f85756869dd96897929757ebcc8e2d7ffe03266e77aa49d3de0a WHIRLPOOL ac2cdd8332338cd6b6d4dfa8ca24c6ae33cdb479527b69f7f6dca5ec6147e007e910ae578d62d85da3d02603fb68a86140c377e5ba17b2d037a1d54e560b42bc
-EBUILD proftpd-1.3.4c-r1.ebuild 7550 SHA256 9ee5bde4135f0c2d1de65e8425e7ebd0f127a26800f8876e0bac7b13ec9ab2e4 SHA512 9185b579528c8c0d9ea609ec574065398a9a0dddf4d85da8281da5afd94957fafe9dfc1d52cd7154f16b20990d1db473f7174abb093160056d016ee64e834ff2 WHIRLPOOL 9f8a5bd9a28bda42037d5bdfefc11dc73c33104fd54c83c98018705d473811f48e3b4d9a5fcdb5184387afafde23f76fd5d5f2b76c1c5bc98d7ee51a20e9c63a
-EBUILD proftpd-1.3.4c-r2.ebuild 7703 SHA256 f5f2be53b90e50a4cd632e5e7c969b476af9bdae068854b473faf4503d3e178e SHA512 00362d97212c7628a69e05450bbab071da8545be5f6970a20eadb69135a9bd2cc8fc034010ddfd8b8f1bd1431553934d2d13a0a3d9ccb977789e0ba4b672b449 WHIRLPOOL 915d5700a13734d03bf19b7396ea3b61092a6500532515ebf4cd6b691613e7d40cfd3707d83fdc3600d62c39309869c05c07f6de7833d52d32fc2693ee4a83d7
-EBUILD proftpd-1.3.4c.ebuild 7301 SHA256 a0480cfd66c9ecd5f6ee8a80ce09db5b67d1328d0d9397c330e76ec9cd3afd25 SHA512 5c69376a4c9f7735b046c3db7c7fa01cc17d8405dbe05fc5ebb709dc834226e69ab599de66ad943ceb6273e68201f69a2a63d99a4cef29c34b7e57f578442f76 WHIRLPOOL 0a1bc3358c59c7661463278d3eef5b6b82cc22ef11f7c603daa02567e65d309e22eaefc3ebdbc11329c7d38e2c9a71dc704f09e9d42c0bb18a21612f1280935e
 EBUILD proftpd-1.3.4d.ebuild 7743 SHA256 020a8a238b62d0cc63b38f2f15951f9725062681e752e99586b1e0f3fa060d97 SHA512 c4bcb3c2c67a2409aed90029708c7009ad6a162c172c54117a513c2ccc771ad79e5d3b11ae7386b62e6d3000b17aee2a83115c85550bca492effac88427a4a12 WHIRLPOOL 9e3fdf3167eaa1d577a08026ff15fc8d72f2a998634e48ff49b84d373613a388298aec0d6b61dc894d24fe48f999b59f9f68f41c83d787a254b6f9a18e34666b
-MISC ChangeLog 54074 SHA256 51fae100e6afedccf4ef6cc98fe795b1ecdd84c88d52916f0540cc39b3810a93 SHA512 890da97f09e35d8146941a18109067387b2d4c40c1e750ecb8c3f9e58536b53f421d423ec610c8a41e7b63202c40b65e733df20add8634e4f5d2fa93ce441e2f WHIRLPOOL 007e6e87895aa76fcc23dec1de20017cce1be351a0c0f3cfffd9d11fe7fbc2b34cbb9b8e43526644862ec52b31620cbc74f858d59aa426010ec996fa8d841859
+EBUILD proftpd-1.3.4e.ebuild 7763 SHA256 6b86491734016bcb1c03eee32e83552d08c6491e5f52b3a1cb63b87d53107794 SHA512 7bfeef4e50852b21dd63f0fda99f192e8ba67c3804f283f0fc2690e382f19a1a291caa9742b04f4edeca3b361da220c6f51c89aeaa74040293d14dcdca507e5d WHIRLPOOL b1c08b99bfa87fbf7aa5370003f563432ca1c768bbc4b87d06a96fb01f98228710483821999afc084b4692296db49e0611a53ea79031e1eb4cdd5ec66e523f12
+MISC ChangeLog 54615 SHA256 0b8b5923fcf06d8c6f00d9568ea2eb91a7efb3151ff7ef92a83543fc1542d8ea SHA512 7abda21ebe7604ee8025400c1530ef8917f66229acec20b462fe1733870671237c4732405bd7b3e26377941a2eaf9ca2f0d7aecb218471a077f72de7d19ce295 WHIRLPOOL af4ad2e3b51a5058ca7c4d4749fb0bef82ed5c2c798dfc57eaa17561ca2ac82d88873097e5ec920d1499b68df3757ff55ed1a288c2bc61b925edccd1b1af6cb6
 MISC metadata.xml 3191 SHA256 66e910e6dc0a9969d60941e120ae3adf75c41dca3548992a56572cd6071e2018 SHA512 efe5b66061928783ba85fd591cc78c32392f78a35cf3478c85e29e9f2851ae1dc13eaf122c9644595ecfb86329a8020867cb6cbee97bb1712f65b4c9c39679c1 WHIRLPOOL 5a8f94671535deb1f6a579af5870672b6f606980bccd1abc2538bd39098b48837252f1bb46176cbb14f3e935df5246a41e897fe8020c9808964e3f557594973c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSNDx5AAoJELp701BxlEWfaO4P/jq8FcWGMmwE+TGeqkdlysPx
-mXFEjHg6UCR+nmYl5Q3k9mEacyzI4ojQObF4mrS2EyrMZlnhyTFQOmOb+l7yGbpt
-ySYbDexNxbvOu8dAYuuOZoh2b5p+dU9U+EiIzJywBFvMkOrbqch+9r3DFmGrUpGD
-eXOJzWH41y2ZlvsEYDA+wc09StTc3sNZywzwml4hmJ1r4KFDlbX4Fl0mPrkEOIkl
-04qCf1/ogExVj+zUTxOnGWWgXUIjGjrJJVqSqP+2ZQXS+TVzojbbNltlZN5GtfOX
-Kyfp2+IRO0uFAc3V9oiTfzBu77XtHUjO1iCAShbtlPenJo8GqwLB87Jo3y+CLuBT
-L2pfvtbM6P9kiboTTdlYN0guNFUEfkbJonjdc9hCZSfVympbmStQTgJeXFJkiGDc
-jqfMuZevabyvJZydp+Clqd+u4VHDYAvKnaBRcNJ1vqf4B4hqwnTGa4Toe10DHitU
-Yd7MPQtkrsJ71nY/OSn1WVSGIHOiRPpd+OPBfwPpnjqwdolzTC7nN6urBwacyNqj
-vqE19joEf3erNp5Ay8lMNMI2AclXOuN3MOJ8HrfdjtVwmHgk8EgfecaWTqrY4aaL
-0jZEurnxoqrHeFscmLcbx/6eA4x4fFrduMeYoBoD72GcEyrsQRyycw0MYyVrFOkW
-gT1K5heae2sTc7WEVW71
-=z4at
+iEYEAREIAAYFAlN2fmIACgkQcaHudmEf86phTgCfYUwHsLe7Eiq1LHvk6/khDRfA
+4qgAoIIiXJWkIRE59BcSVy0K/wbpZV+N
+=cHnK
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/proftpd/files/proftpd-1.3.4a-ubug-3682.patch b/net-ftp/proftpd/files/proftpd-1.3.4a-ubug-3682.patch
deleted file mode 100644
index c6ebef741a47..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.4a-ubug-3682.patch
+++ /dev/null
@@ -1,146 +0,0 @@
---- configure
-+++ configure
-@@ -15457,7 +15457,7 @@
- fi
- 
- 
--                  { echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
-+                        { echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
- echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6; }
- if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15533,6 +15533,82 @@
-          ENABLE_NLS="1"
- 
- else
-+  { echo "$as_me:$LINENO: checking for libiconv_open in -liconv" >&5
-+echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-liconv  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char libiconv_open ();
-+int
-+main ()
-+{
-+return libiconv_open ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_iconv_libiconv_open=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_iconv_libiconv_open=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_libiconv_open" >&5
-+echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6; }
-+if test $ac_cv_lib_iconv_libiconv_open = yes; then
-+  LIBS="$LIBS -liconv"
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LIBICONV 1
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define PR_USE_NLS 1
-+_ACEOF
-+
-+           ENABLE_NLS="1"
-+
-+else
-   { echo "$as_me:$LINENO: checking for iconv_open in -lc" >&5
- echo $ECHO_N "checking for iconv_open in -lc... $ECHO_C" >&6; }
- if test "${ac_cv_lib_c_iconv_open+set}" = set; then
-@@ -15600,7 +15676,7 @@
- #define PR_USE_NLS 1
- _ACEOF
- 
--           ENABLE_NLS="1"
-+             ENABLE_NLS="1"
- 
- else
-   { { echo "$as_me:$LINENO: error: libiconv support, required for NLS, not present -- aborting" >&5
-@@ -15609,6 +15685,9 @@
- 
- fi
- 
-+
-+fi
-+
- 
- fi
- 
---- configure.in
-+++ configure.in
-@@ -715,18 +715,26 @@
-       )
- 
-       dnl Similarly, the libiconv library is only needed on some non-GNU
--      dnl systems.
-+      dnl systems.  Note that some systems redefine the iconv_open function
-+      dnl to something else (Bug#3682), e.g. libiconv_open.
-       AC_CHECK_LIB(iconv, iconv_open,
-         [LIBS="$LIBS -liconv"
-          AC_DEFINE(HAVE_LIBICONV, 1, [Define if libiconv is present.])
-          AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])
-          ENABLE_NLS="1"
-         ],
--        [AC_CHECK_LIB(c, iconv_open,
--          [AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])
-+        [AC_CHECK_LIB(iconv, libiconv_open,
-+          [LIBS="$LIBS -liconv"
-+           AC_DEFINE(HAVE_LIBICONV, 1, [Define if libiconv is present.])
-+           AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])
-            ENABLE_NLS="1"
-           ],
--          [AC_MSG_ERROR([libiconv support, required for NLS, not present -- aborting])]
-+          [AC_CHECK_LIB(c, iconv_open,
-+            [AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])
-+             ENABLE_NLS="1"
-+            ],
-+            [AC_MSG_ERROR([libiconv support, required for NLS, not present -- aborting])]
-+          ])
-         ])
-       )
-     fi
diff --git a/net-ftp/proftpd/files/proftpd-1.3.4a-ubug-3728.patch b/net-ftp/proftpd/files/proftpd-1.3.4a-ubug-3728.patch
deleted file mode 100644
index 8f656dd8a899..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.4a-ubug-3728.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/wtmp.c
-+++ src/wtmp.c
-@@ -42,7 +42,7 @@
-     !(defined(LINUX) || defined(__hpux) || defined (_AIX))
-   /* This "auxilliary" utmp doesn't exist under linux. */
- 
--#if defined(__sparcv9) && !defined(__NetBSD__)
-+#if defined(__sparcv9) && !defined(__NetBSD__) && !defined(__FreeBSD__)
-   struct futmpx utx;
-   time_t t;
- 
diff --git a/net-ftp/proftpd/files/proftpd-1.3.4b-ubug-3795.patch b/net-ftp/proftpd/files/proftpd-1.3.4b-ubug-3795.patch
deleted file mode 100644
index b39442620438..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.4b-ubug-3795.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- configure
-+++ configure
-@@ -33211,6 +33211,21 @@
- 
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-+
-+  if test x"$openssl_cmdline" != xno; then
-+    if `$openssl_cmdline version 2>/dev/null 1>&2`; then
-+      openssl_cflags=`$openssl_cmdline version -f 2>/dev/null`
-+      if test ! -z "$openssl_cflags"; then
-+        # Look for the -pthread flag, indicating that this OpenSSL was built
-+        # with threads support (see Bug#3795)
-+        for openssl_cflag in $openssl_cflags; do
-+          if test x"$openssl_cflag" = x"-pthread"; then
-+            LIBS="$LIBS -pthread"
-+          fi
-+        done
-+      fi
-+    fi
-+  fi
- fi
- 
- if test x"$pr_use_postgres" = xyes; then
-@@ -33303,21 +33318,6 @@
-   CPPFLAGS="$saved_cppflags"
-   LDFLAGS="$saved_ldflags"
-   LIBS="$saved_libs"
--
--  if test x"$openssl_cmdline" != xno; then
--    if `$openssl_cmdline version 2>/dev/null 1>&2`; then
--      openssl_cflags=`$openssl_cmdline version -f 2>/dev/null`
--      if test ! -z "$openssl_cflags"; then
--        # Look for the -pthread flag, indicating that this OpenSSL was built
--        # with threads support (see Bug#3795)
--        for openssl_cflag in $openssl_cflags; do
--          if test x"$openssl_cflag" = x"-pthread"; then
--            LIBS="$LIBS -pthread"
--          fi
--        done
--      fi
--    fi
--  fi
- fi
- 
- for module in $ac_shared_modules ; do
---- configure.in
-+++ configure.in
-@@ -2473,6 +2473,21 @@
-       )
-     ]
-   )
-+
-+  if test x"$openssl_cmdline" != xno; then
-+    if `$openssl_cmdline version 2>/dev/null 1>&2`; then
-+      openssl_cflags=`$openssl_cmdline version -f 2>/dev/null`
-+      if test ! -z "$openssl_cflags"; then
-+        # Look for the -pthread flag, indicating that this OpenSSL was built
-+        # with threads support (see Bug#3795)
-+        for openssl_cflag in $openssl_cflags; do
-+          if test x"$openssl_cflag" = x"-pthread"; then
-+            LIBS="$LIBS -pthread"
-+          fi
-+        done
-+      fi
-+    fi
-+  fi
- fi
- 
- if test x"$pr_use_postgres" = xyes; then
-@@ -2521,21 +2536,6 @@
-   CPPFLAGS="$saved_cppflags"
-   LDFLAGS="$saved_ldflags"
-   LIBS="$saved_libs"
--
--  if test x"$openssl_cmdline" != xno; then
--    if `$openssl_cmdline version 2>/dev/null 1>&2`; then
--      openssl_cflags=`$openssl_cmdline version -f 2>/dev/null`
--      if test ! -z "$openssl_cflags"; then
--        # Look for the -pthread flag, indicating that this OpenSSL was built
--        # with threads support (see Bug#3795)
--        for openssl_cflag in $openssl_cflags; do 
--          if test x"$openssl_cflag" = x"-pthread"; then
--            LIBS="$LIBS -pthread"
--          fi
--        done
--      fi
--    fi
--  fi
- fi
- 
- for module in $ac_shared_modules ; do
diff --git a/net-ftp/proftpd/files/proftpd-1.3.4c-fix-build-noipv6.patch b/net-ftp/proftpd/files/proftpd-1.3.4c-fix-build-noipv6.patch
deleted file mode 100644
index 937fff019415..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.4c-fix-build-noipv6.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Fix buld failure of USE=-ipv6 case.
-
-> netaddr.c: In function 'get_addr_by_name':
-> netaddr.c:694:3: warning: control reaches end of non-void function [-Wreturn-type]
->    }
->    ^
-
-Fixes: http://bugs.gentoo.org/465134
-Patch-by:  Yuri Shatroff <yks-uno@ya.ru>
-diff --git a/src/netaddr.c b/src/netaddr.c
-index 9dbc716..2b025b6 100644
---- a/src/netaddr.c
-+++ b/src/netaddr.c
-@@ -690,8 +690,8 @@ static pr_netaddr_t *get_addr_by_name(pool *p, const char *name,
-         pr_freeaddrinfo(info);
-       }
-     }
--#endif /* PR_USE_IPV6 */
-   }
-+#endif /* PR_USE_IPV6 */
- 
-   return na;
- }
diff --git a/net-ftp/proftpd/files/proftpd-1.3.4e-link-tests.patch b/net-ftp/proftpd/files/proftpd-1.3.4e-link-tests.patch
new file mode 100644
index 000000000000..d19c98a41849
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.4e-link-tests.patch
@@ -0,0 +1,15 @@
+diff --git a/tests/api/stubs.c b/tests/api/stubs.c
+index 9f49c9d..7f1e898 100644
+--- a/tests/api/stubs.c
++++ b/tests/api/stubs.c
+@@ -46,6 +46,10 @@ char *pr_fs_encode_path(pool *p, const char *path) {
+   return (char *) path;
+ }
+ 
++int pr_fs_get_usable_fd(int fd) {
++  return -1;
++}
++
+ void pr_log_debug(int level, const char *fmt, ...) {
+ }
+ 
diff --git a/net-ftp/proftpd/proftpd-1.3.3g.ebuild b/net-ftp/proftpd/proftpd-1.3.3g.ebuild
deleted file mode 100644
index 3f8a5ab41e69..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.3g.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3g.ebuild,v 1.7 2012/05/13 10:49:47 swift Exp $
-
-EAPI="2"
-inherit eutils autotools
-
-CASE_VER="0.4"
-CLAMAV_VER="0.11rc"
-DEFLATE_VER="0.5.4"
-GSS_VER="1.3.3"
-VROOT_VER="0.9.2"
-
-DESCRIPTION="An advanced and very configurable FTP server."
-HOMEPAGE="http://www.proftpd.org/
-	http://www.castaglia.org/proftpd/
-	http://www.thrallingpenguin.com/resources/mod_clamav.htm
-	http://gssmod.sourceforge.net/"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2
-	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${CASE_VER}.tar.gz )
-	clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${CLAMAV_VER}.tar.gz )
-	deflate? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-deflate-${DEFLATE_VER}.tar.gz )
-	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${GSS_VER}.tar.gz )
-	vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${VROOT_VER}.tar.gz )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="acl authfile ban +caps case clamav +ctrls deflate doc exec ifsession ident ipv6 kerberos ldap mysql ncurses nls pam postgres radius ratio readme rewrite selinux sftp shaper sitemisc softquota ssl tcpd trace vroot xinetd"
-
-DEPEND="acl? ( sys-apps/acl sys-apps/attr )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	ncurses? ( sys-libs/ncurses )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sftp? ( dev-libs/openssl )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	xinetd? ( virtual/inetd )"
-RDEPEND="${DEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-S="${WORKDIR}/${P/_/}"
-
-__prepare_module() {
-	mv "${WORKDIR}"/$1/$1.c contrib
-	mv "${WORKDIR}"/$1/$1.html doc/contrib
-	rm -rf "${WORKDIR}"/$1
-}
-
-pkg_setup() {
-	if [ -f "${ROOT}"/var/run/proftpd.pid ] ; then
-		eerror "Your ProFTPD server is running. In order to install this update"
-		eerror "you have to stop the running server. If you are using ProFTPD in"
-		eerror "the standalone mode you can stop the server by executing:"
-		eerror "  /etc/init.d/proftpd stop"
-		eerror "If you are sure that ProFTPD is not running anymore you have to"
-		eerror "delete the /var/run/proftpd.pid file."
-		die "This update requires to stop the ProFTPD server!"
-	fi
-}
-
-src_prepare() {
-	use case && __prepare_module mod_case
-	if use clamav ; then
-		mv "${WORKDIR}"/mod_clamav-${CLAMAV_VER}/mod_clamav.{c,h} contrib
-		epatch "${WORKDIR}"/mod_clamav-${CLAMAV_VER}/${PN}.patch
-		rm -rf "${WORKDIR}"/mod_clamav-${CLAMAV_VER}
-	fi
-	use deflate && __prepare_module mod_deflate
-	use vroot && __prepare_module mod_vroot
-
-	# Fix MySQL includes
-	sed -i -e "s/<mysql.h>/<mysql\/mysql.h>/g" contrib/mod_sql_mysql.c
-
-	# Manipulate build system
-	sed -i -e "s/utils install-conf install/utils install/g" Makefile.in
-	sed -i -e "s/ @INSTALL_STRIP@//g" Make.rules.in
-
-	# Support new versions of mit-krb5 (Gentoo Bugs #284853, #324903)
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${GSS_VER}
-		sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in
-		sed -i -e "/ac_gss_libs/s/\-ldes425\ //" configure.in
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myc myl mym
-
-	use acl && mym="${mym}:mod_facl"
-	use ban && mym="${mym}:mod_ban"
-	use case && mym="${mym}:mod_case"
-	use clamav && mym="${mym}:mod_clamav"
-	if use ctrls || use ban || use shaper ; then
-		myc="${myc} --enable-ctrls"
-		mym="${mym}:mod_ctrls_admin"
-	fi
-	use deflate && mym="${mym}:mod_deflate"
-	use exec && mym="${mym}:mod_exec"
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${GSS_VER}
-		if has_version app-crypt/mit-krb5 ; then
-			econf --enable-mit
-		else
-			econf --enable-heimdal
-		fi
-		mv mod_{auth_gss,gss}.c "${S}"/contrib
-		mv mod_gss.h "${S}"/include
-		mv README.mod_{auth_gss,gss} "${S}"
-		mv mod_gss.html "${S}"/doc/contrib
-		mv rfc{1509,2228}.txt "${S}"/doc/rfc
-		cd "${S}"
-		rm -rf "${WORKDIR}"/mod_gss-${GSS_VER}
-		mym="${mym}:mod_gss:mod_auth_gss"
-	fi
-	if use ldap ; then
-		myl="${myl} -lresolv"
-		mym="${mym}:mod_ldap"
-	fi
-	if use mysql || use postgres ; then
-		mym="${mym}:mod_sql:mod_sql_passwd"
-		if use mysql ; then
-			myc="${myc} --with-includes=/usr/include/mysql"
-			mym="${mym}:mod_sql_mysql"
-		fi
-		if use postgres ; then
-			myc="${myc} --with-includes=/usr/include/postgresql"
-			mym="${mym}:mod_sql_postgres"
-		fi
-	fi
-	if use sftp || use ssl ; then
-		CFLAGS="${CFLAGS} -DHAVE_OPENSSL"
-		myc="${myc} --enable-openssl --with-includes=/usr/include/openssl"
-		myl="${myl} -lcrypto"
-	fi
-	use radius && mym="${mym}:mod_radius"
-	use ratio && mym="${mym}:mod_ratio"
-	use readme && mym="${mym}:mod_readme"
-	use rewrite && mym="${mym}:mod_rewrite"
-	if use sftp ; then
-		mym="${mym}:mod_sftp"
-		use pam && mym="${mym}:mod_sftp_pam"
-		if use mysql || use postgres ; then
-			mym="${mym}:mod_sftp_sql"
-		fi
-	fi
-	use shaper && mym="${mym}:mod_shaper"
-	use sitemisc && mym="${mym}:mod_site_misc"
-	if use softquota ; then
-		mym="${mym}:mod_quotatab:mod_quotatab_file"
-		use ldap && mym="${mym}:mod_quotatab_ldap"
-		use radius && mym="${mym}:mod_quotatab_radius"
-		if use mysql || use postgres ; then
-			mym="${mym}:mod_quotatab_sql"
-		fi
-	fi
-	use ssl && mym="${mym}:mod_tls:mod_tls_shmcache"
-	use tcpd && mym="${mym}:mod_wrap"
-	use vroot && mym="${mym}:mod_vroot"
-	# mod_ifsession needs to be the last module in the mym list.
-	use ifsession && mym="${mym}:mod_ifsession"
-
-	[ -z ${mym} ] || myc="${myc} --with-modules=${mym:1}"
-	LIBS="${myl:1}" econf --sbindir=/usr/sbin --localstatedir=/var/run/proftpd \
-		--sysconfdir=/etc/proftpd --enable-shadow --enable-autoshadow ${myc:1} \
-		$(use_enable acl facl) \
-		$(use_enable authfile auth-file) \
-		$(use_enable caps cap) \
-		$(use_enable ident) \
-		$(use_enable ipv6) \
-		$(use_enable ncurses) \
-		$(use_enable nls) \
-		$(use_enable trace) \
-		$(use_enable pam auth-pam)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample
-	newinitd "${FILESDIR}"/proftpd.initd proftpd
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/proftpd.xinetd proftpd
-	fi
-
-	dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
-	if use doc ; then
-		dohtml doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
-		docinto rfc
-		dodoc doc/rfc/*.txt
-	fi
-}
-
-pkg_postinst() {
-	if use mysql && use postgres ; then
-		elog
-		elog "ProFTPD has been built with the MySQL and PostgreSQL modules."
-		elog "You can use the 'SQLBackend' directive to specify the used SQL"
-		elog "backend. Without this directive the default backend is MySQL."
-		elog
-	fi
-	if use exec ; then
-		ewarn
-		ewarn "ProFTPD has been built with the mod_exec module. This module"
-		ewarn "can be a security risk for your server as it executes external"
-		ewarn "programs. Vulnerables in these external programs may disclose"
-		ewarn "information or even compromise your server."
-		ewarn "You have been warned! Use this module at your own risk!"
-		ewarn
-	fi
-}
diff --git a/net-ftp/proftpd/proftpd-1.3.4a-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.4a-r1.ebuild
deleted file mode 100644
index b4554d10007e..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.4a-r1.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4a-r1.ebuild,v 1.3 2012/09/19 08:27:54 voyageur Exp $
-
-EAPI=4
-inherit eutils multilib
-
-MOD_CASE="0.7"
-MOD_CLAMAV="0.11rc"
-MOD_DISKUSE="0.9"
-MOD_GSS="1.3.3"
-MOD_VROOT="0.9.2"
-
-DESCRIPTION="An advanced and very configurable FTP server."
-HOMEPAGE="http://www.proftpd.org/
-	http://www.castaglia.org/proftpd/
-	http://www.thrallingpenguin.com/resources/mod_clamav.htm
-	http://gssmod.sourceforge.net/"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2
-	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz )
-	clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${MOD_CLAMAV}.tar.gz )
-	diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
-	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
-	vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${MOD_VROOT}.tar.gz )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso exec ifsession ifversion ident ipv6
-	kerberos ldap linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR
-	linguas_ru_RU linguas_zh_CN linguas_zh_TW memcache mysql ncurses nls openssl pam +pcre postgres qos radius
-	ratio readme rewrite selinux sftp shaper sitemisc softquota sqlite ssl tcpd test trace vroot xinetd"
-REQUIRED_USE="ban? ( ctrls )
-	sftp? ( openssl )
-	shaper? ( ctrls )
-	ssl? ( openssl )"
-
-CDEPEND="acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	memcache? ( >=dev-libs/libmemcached-0.41 )
-	mysql? ( virtual/mysql )
-	nls? ( virtual/libiconv )
-	ncurses? ( sys-libs/ncurses )
-	openssl? ( dev-libs/openssl )
-	pam? ( virtual/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite:3 )
-	xinetd? ( virtual/inetd )"
-DEPEND="${CDEPEND}
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-S="${WORKDIR}/${P/_/}"
-
-__prepare_module() {
-	mv "${WORKDIR}"/$1/$1.c contrib
-	mv "${WORKDIR}"/$1/$1.html doc/contrib
-	rm -r "${WORKDIR}"/$1
-}
-
-src_prepare() {
-	# Skip 'install-conf' / Support LINGUAS
-	sed -i -e "/install-all/s/ install-conf//" Makefile.in
-	sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in
-
-	# Prepare external modules
-	use case && __prepare_module mod_case
-	if use clamav ; then
-		mv "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib
-		epatch "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.patch
-		rm -r "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}
-	fi
-	use vroot && __prepare_module mod_vroot
-
-	# Fix Gentoo Bug #354295 / ProFTPD Bug #3682
-	epatch "${FILESDIR}"/${P}-ubug-3682.patch
-
-	# Fix Gentoo Bug #393189 / ProFTPD Bug #3728
-	epatch "${FILESDIR}"/${P}-ubug-3728.patch
-
-	# Prepare external kerberos module
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-
-		# Support app-crypt/heimdal / Gentoo Bug #284853
-		sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in
-
-		# Remove obsolete DES / Gentoo Bug #324903
-		# Replace 'rpm' lookups / Gentoo Bug #391021
-		sed -i -e "/ac_gss_libs/s/ -ldes425//" \
-			-e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \
-			-e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" configure{,.in}
-	fi
-}
-
-src_configure() {
-	local c m
-
-	use acl && m="${m}:mod_facl"
-	use ban && m="${m}:mod_ban"
-	use case && m="${m}:mod_case"
-	use clamav && m="${m}:mod_clamav"
-	use copy && m="${m}:mod_copy"
-	use ctrls && m="${m}:mod_ctrls_admin"
-	use deflate && m="${m}:mod_deflate"
-	if use diskuse ; then
-		cd "${WORKDIR}"/mod_diskuse
-		econf
-		mv mod_diskuse.{c,h} "${S}"/contrib
-		mv mod_diskuse.html "${S}"/doc/contrib
-		cd "${S}"
-		rm -r "${WORKDIR}"/mod_diskuse
-		m="${m}:mod_diskuse"
-	fi
-	use exec && m="${m}:mod_exec"
-	use ifsession && m="${m}:mod_ifsession"
-	use ifversion && m="${m}:mod_ifversion"
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-		if has_version app-crypt/mit-krb5 ; then
-			econf --enable-mit
-		else
-			econf --enable-heimdal
-		fi
-		mv mod_{auth_gss,gss}.c "${S}"/contrib
-		mv mod_gss.h "${S}"/include
-		mv README.mod_{auth_gss,gss} "${S}"
-		mv mod_gss.html "${S}"/doc/contrib
-		mv rfc{1509,2228}.txt "${S}"/doc/rfc
-		cd "${S}"
-		rm -r "${WORKDIR}"/mod_gss-${MOD_GSS}
-		m="${m}:mod_gss:mod_auth_gss"
-	fi
-	use ldap && m="${m}:mod_ldap"
-	if use mysql || use postgres || use sqlite ; then
-		m="${m}:mod_sql:mod_sql_passwd"
-		use mysql && m="${m}:mod_sql_mysql"
-		use postgres && m="${m}:mod_sql_postgres"
-		use sqlite && m="${m}:mod_sql_sqlite"
-	fi
-	use qos && m="${m}:mod_qos"
-	use radius && m="${m}:mod_radius"
-	use ratio && m="${m}:mod_ratio"
-	use readme && m="${m}:mod_readme"
-	use rewrite && m="${m}:mod_rewrite"
-	if use sftp ; then
-		m="${m}:mod_sftp"
-		use pam && m="${m}:mod_sftp_pam"
-		use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql"
-	fi
-	use shaper && m="${m}:mod_shaper"
-	use sitemisc && m="${m}:mod_site_misc"
-	if use softquota ; then
-		m="${m}:mod_quotatab:mod_quotatab_file"
-		use ldap && m="${m}:mod_quotatab_ldap"
-		use radius && m="${m}:mod_quotatab_radius"
-		use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql"
-	fi
-	if use ssl ; then
-		m="${m}:mod_tls:mod_tls_shmcache"
-		use memcache && m="${m}:mod_tls_memcache"
-	fi
-	if use tcpd ; then
-		m="${m}:mod_wrap2:mod_wrap2_file"
-		use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
-	fi
-	use vroot && m="${m}:mod_vroot"
-
-	[ -z ${m} ] || c="${c} --with-modules=${m:1}"
-	econf --localstatedir=/var/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \
-		$(use_enable acl facl) \
-		$(use_enable authfile auth-file) \
-		$(use_enable caps cap) \
-		$(use_enable ctrls) \
-		$(use_enable dso) \
-		$(use_enable ident) \
-		$(use_enable ipv6) \
-		$(use_enable memcache) \
-		$(use_enable ncurses) \
-		$(use_enable nls) \
-		$(use_enable openssl) \
-		$(use_enable pam auth-pam) \
-		$(use_enable pcre) \
-		$(use_enable test tests) \
-		$(use_enable trace) \
-		$(use_enable userland_GNU shadow) \
-		$(use_enable userland_GNU autoshadow) \
-		${c:1}
-}
-
-src_test() {
-	emake api-tests -C tests
-}
-
-src_install() {
-	default
-	[ -z ${LINGUAS} ] && rm -r "${ED}"/usr/share/locale
-	newinitd "${FILESDIR}"/proftpd.initd proftpd
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/proftpd.xinetd proftpd
-	fi
-
-	dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
-	if use doc ; then
-		dohtml doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
-		docinto rfc
-		dodoc doc/rfc/*.txt
-	fi
-}
-
-pkg_postinst() {
-	if use tcpd ; then
-		ewarn
-		ewarn "Important: Since ProFTPD 1.3.4rc2 the module mod_wrap for TCP Wrapper"
-		ewarn "support has been replaced by mod_wrap2 which is more configurable and"
-		ewarn "portable.  But you have to adjust your configuration before restaring"
-		ewarn "ProFTPD. On the following website you can find more information:"
-		ewarn "  http://proftpd.org/docs/contrib/mod_wrap2.html"
-		ewarn
-	fi
-}
diff --git a/net-ftp/proftpd/proftpd-1.3.4a.ebuild b/net-ftp/proftpd/proftpd-1.3.4a.ebuild
deleted file mode 100644
index 2b8dff3b7bae..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.4a.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4a.ebuild,v 1.3 2012/05/13 10:49:47 swift Exp $
-
-EAPI=4
-inherit eutils autotools
-
-MOD_CASE="0.7"
-MOD_CLAMAV="0.11rc"
-MOD_DISKUSE="0.9"
-MOD_GSS="1.3.3"
-MOD_VROOT="0.9.2"
-
-DESCRIPTION="An advanced and very configurable FTP server."
-HOMEPAGE="http://www.proftpd.org/
-	http://www.castaglia.org/proftpd/
-	http://www.thrallingpenguin.com/resources/mod_clamav.htm
-	http://gssmod.sourceforge.net/"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2
-	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz )
-	clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${MOD_CLAMAV}.tar.gz )
-	diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
-	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
-	vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${MOD_VROOT}.tar.gz )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc exec ifsession ifversion ident
-	ipv6 kerberos ldap memcache mysql ncurses nls pam +pcre postgres qos radius ratio readme rewrite
-	selinux sftp shaper sitemisc softquota sqlite ssl tcpd test trace vroot xinetd"
-
-CDEPEND="acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	memcache? ( >=dev-libs/libmemcached-0.41 )
-	mysql? ( virtual/mysql )
-	nls? ( virtual/libiconv )
-	ncurses? ( sys-libs/ncurses )
-	pam? ( virtual/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql-base )
-	sftp? ( dev-libs/openssl )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl )
-	xinetd? ( virtual/inetd )"
-DEPEND="${CDEPEND}
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-S="${WORKDIR}/${P/_/}"
-
-__prepare_module() {
-	mv "${WORKDIR}"/$1/$1.c contrib
-	mv "${WORKDIR}"/$1/$1.html doc/contrib
-	rm -rf "${WORKDIR}"/$1
-}
-
-src_prepare() {
-	use case && __prepare_module mod_case
-	if use clamav ; then
-		mv "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib
-		epatch "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.patch
-		rm -rf "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}
-	fi
-	use vroot && __prepare_module mod_vroot
-
-	sed -i -e "s/utils install-conf install/utils install/g" Makefile.in
-
-	# Fixes Gentoo Bug #354295 / ProFTPD Bug #3682
-	epatch "${FILESDIR}"/${P}-ubug-3682.patch
-
-	# Fixes Gentoo Bug #393189 / ProFTPD Bug #3728
-	epatch "${FILESDIR}"/${P}-ubug-3728.patch
-
-	# Support new versions of mit-krb5 (Gentoo Bugs #284853, #324903)
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-		sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in
-		sed -i -e "/ac_gss_libs/s/\-ldes425\ //" configure.in
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local c m
-
-	use acl && m="${m}:mod_facl"
-	use ban && m="${m}:mod_ban"
-	use case && m="${m}:mod_case"
-	use clamav && m="${m}:mod_clamav"
-	use copy && m="${m}:mod_copy"
-	if use ctrls || use ban || use shaper ; then
-		c="${c} --enable-ctrls"
-		m="${m}:mod_ctrls_admin"
-	fi
-	use deflate && m="${m}:mod_deflate"
-	if use diskuse ; then
-		cd "${WORKDIR}"/mod_diskuse
-		econf
-		mv mod_diskuse.{c,h} "${S}"/contrib
-		mv mod_diskuse.html "${S}"/doc/contrib
-		cd "${S}"
-		rm -rf "${WORKDIR}"/mod_diskuse
-		m="${m}:mod_diskuse"
-	fi
-	use exec && m="${m}:mod_exec"
-	use ifsession && m="${m}:mod_ifsession"
-	use ifversion && m="${m}:mod_ifversion"
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-		if has_version app-crypt/mit-krb5 ; then
-			econf --enable-mit
-		else
-			econf --enable-heimdal
-		fi
-		mv mod_{auth_gss,gss}.c "${S}"/contrib
-		mv mod_gss.h "${S}"/include
-		mv README.mod_{auth_gss,gss} "${S}"
-		mv mod_gss.html "${S}"/doc/contrib
-		mv rfc{1509,2228}.txt "${S}"/doc/rfc
-		cd "${S}"
-		rm -rf "${WORKDIR}"/mod_gss-${MOD_GSS}
-		m="${m}:mod_gss:mod_auth_gss"
-	fi
-	use ldap && m="${m}:mod_ldap"
-	if use mysql || use postgres || use sqlite ; then
-		m="${m}:mod_sql:mod_sql_passwd"
-		use mysql && m="${m}:mod_sql_mysql"
-		use postgres && m="${m}:mod_sql_postgres"
-		use sqlite && m="${m}:mod_sql_sqlite"
-	fi
-	use qos && m="${m}:mod_qos"
-	use radius && m="${m}:mod_radius"
-	use ratio && m="${m}:mod_ratio"
-	use readme && m="${m}:mod_readme"
-	use rewrite && m="${m}:mod_rewrite"
-	use sftp || use ssl && c="${c} --enable-openssl"
-	if use sftp ; then
-		m="${m}:mod_sftp"
-		use pam && m="${m}:mod_sftp_pam"
-		use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql"
-	fi
-	use shaper && m="${m}:mod_shaper"
-	use sitemisc && m="${m}:mod_site_misc"
-	if use softquota ; then
-		m="${m}:mod_quotatab:mod_quotatab_file"
-		use ldap && m="${m}:mod_quotatab_ldap"
-		use radius && m="${m}:mod_quotatab_radius"
-		use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql"
-	fi
-	if use ssl ; then
-		m="${m}:mod_tls:mod_tls_shmcache"
-		use memcache && m="${m}:mod_tls_memcache"
-	fi
-	if use tcpd ; then
-		m="${m}:mod_wrap2:mod_wrap2_file"
-		use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
-	fi
-	use vroot && m="${m}:mod_vroot"
-
-	[ -z ${m} ] || c="${c} --with-modules=${m:1}"
-	econf --localstatedir=/var/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \
-		$(use_enable acl facl) \
-		$(use_enable authfile auth-file) \
-		$(use_enable caps cap) \
-		$(use_enable ident) \
-		$(use_enable ipv6) \
-		$(use_enable memcache) \
-		$(use_enable ncurses) \
-		$(use_enable nls) \
-		$(use_enable pam auth-pam) \
-		$(use_enable pcre) \
-		$(use_enable test tests) \
-		$(use_enable trace) \
-		$(use_enable userland_GNU shadow) \
-		$(use_enable userland_GNU autoshadow) \
-		${c:1}
-}
-
-src_test() {
-	emake api-tests -C tests
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/proftpd.initd proftpd
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/proftpd.xinetd proftpd
-	fi
-
-	dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
-	if use doc ; then
-		dohtml doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
-		docinto rfc
-		dodoc doc/rfc/*.txt
-	fi
-}
-
-pkg_postinst() {
-	if use tcpd ; then
-		ewarn
-		ewarn "Important: Since ProFTPD 1.3.4rc2 the module mod_wrap for TCP Wrapper"
-		ewarn "support has been replaced by mod_wrap2 which is more configurable and"
-		ewarn "portable.  But you have to adjust your configuration before restaring"
-		ewarn "ProFTPD. On the following website you can find more information:"
-		ewarn "  http://proftpd.org/docs/contrib/mod_wrap2.html"
-		ewarn
-	fi
-}
diff --git a/net-ftp/proftpd/proftpd-1.3.4b.ebuild b/net-ftp/proftpd/proftpd-1.3.4b.ebuild
deleted file mode 100644
index 9b7e5e5eb3bf..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.4b.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4b.ebuild,v 1.1 2012/09/19 08:27:54 voyageur Exp $
-
-EAPI=4
-inherit eutils multilib
-
-MOD_CASE="0.7"
-MOD_CLAMAV="0.11rc"
-MOD_DISKUSE="0.9"
-MOD_GSS="1.3.3"
-MOD_VROOT="0.9.2"
-
-DESCRIPTION="An advanced and very configurable FTP server."
-HOMEPAGE="http://www.proftpd.org/
-	http://www.castaglia.org/proftpd/
-	http://www.thrallingpenguin.com/resources/mod_clamav.htm
-	http://gssmod.sourceforge.net/"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
-	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz )
-	clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${MOD_CLAMAV}.tar.gz )
-	diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
-	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
-	vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${MOD_VROOT}.tar.gz )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso exec ifsession ifversion ident ipv6
-	kerberos ldap linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR
-	linguas_ru_RU linguas_zh_CN linguas_zh_TW memcache mysql ncurses nls openssl pam +pcre postgres qos radius
-	ratio readme rewrite selinux sftp shaper sitemisc softquota sqlite ssl tcpd test trace vroot xinetd"
-REQUIRED_USE="ban? ( ctrls )
-	sftp? ( openssl )
-	shaper? ( ctrls )
-	ssl? ( openssl )"
-
-CDEPEND="acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	memcache? ( >=dev-libs/libmemcached-0.41 )
-	mysql? ( virtual/mysql )
-	nls? ( virtual/libiconv )
-	ncurses? ( sys-libs/ncurses )
-	openssl? ( dev-libs/openssl )
-	pam? ( virtual/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite:3 )
-	xinetd? ( virtual/inetd )"
-DEPEND="${CDEPEND}
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-S="${WORKDIR}/${P/_/}"
-
-__prepare_module() {
-	mv "${WORKDIR}"/$1/$1.c contrib
-	mv "${WORKDIR}"/$1/$1.html doc/contrib
-	rm -r "${WORKDIR}"/$1
-}
-
-src_prepare() {
-	# Skip 'install-conf' / Support LINGUAS
-	sed -i -e "/install-all/s/ install-conf//" Makefile.in
-	sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in
-
-	# Prepare external modules
-	use case && __prepare_module mod_case
-	if use clamav ; then
-		mv "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib
-		epatch "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.patch
-		rm -r "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}
-	fi
-	use vroot && __prepare_module mod_vroot
-
-	# Fix Gentoo Bug #422941 / ProFTPD Bug #3795
-	epatch "${FILESDIR}"/${P}-ubug-3795.patch
-
-	# Prepare external kerberos module
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-
-		# Support app-crypt/heimdal / Gentoo Bug #284853
-		sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in
-
-		# Remove obsolete DES / Gentoo Bug #324903
-		# Replace 'rpm' lookups / Gentoo Bug #391021
-		sed -i -e "/ac_gss_libs/s/ -ldes425//" \
-			-e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \
-			-e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" configure{,.in}
-	fi
-}
-
-src_configure() {
-	local c m
-
-	use acl && m="${m}:mod_facl"
-	use ban && m="${m}:mod_ban"
-	use case && m="${m}:mod_case"
-	use clamav && m="${m}:mod_clamav"
-	use copy && m="${m}:mod_copy"
-	use ctrls && m="${m}:mod_ctrls_admin"
-	use deflate && m="${m}:mod_deflate"
-	if use diskuse ; then
-		cd "${WORKDIR}"/mod_diskuse
-		econf
-		mv mod_diskuse.{c,h} "${S}"/contrib
-		mv mod_diskuse.html "${S}"/doc/contrib
-		cd "${S}"
-		rm -r "${WORKDIR}"/mod_diskuse
-		m="${m}:mod_diskuse"
-	fi
-	use exec && m="${m}:mod_exec"
-	use ifsession && m="${m}:mod_ifsession"
-	use ifversion && m="${m}:mod_ifversion"
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-		if has_version app-crypt/mit-krb5 ; then
-			econf --enable-mit
-		else
-			econf --enable-heimdal
-		fi
-		mv mod_{auth_gss,gss}.c "${S}"/contrib
-		mv mod_gss.h "${S}"/include
-		mv README.mod_{auth_gss,gss} "${S}"
-		mv mod_gss.html "${S}"/doc/contrib
-		mv rfc{1509,2228}.txt "${S}"/doc/rfc
-		cd "${S}"
-		rm -r "${WORKDIR}"/mod_gss-${MOD_GSS}
-		m="${m}:mod_gss:mod_auth_gss"
-	fi
-	use ldap && m="${m}:mod_ldap"
-	if use mysql || use postgres || use sqlite ; then
-		m="${m}:mod_sql:mod_sql_passwd"
-		use mysql && m="${m}:mod_sql_mysql"
-		use postgres && m="${m}:mod_sql_postgres"
-		use sqlite && m="${m}:mod_sql_sqlite"
-	fi
-	use qos && m="${m}:mod_qos"
-	use radius && m="${m}:mod_radius"
-	use ratio && m="${m}:mod_ratio"
-	use readme && m="${m}:mod_readme"
-	use rewrite && m="${m}:mod_rewrite"
-	if use sftp ; then
-		m="${m}:mod_sftp"
-		use pam && m="${m}:mod_sftp_pam"
-		use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql"
-	fi
-	use shaper && m="${m}:mod_shaper"
-	use sitemisc && m="${m}:mod_site_misc"
-	if use softquota ; then
-		m="${m}:mod_quotatab:mod_quotatab_file"
-		use ldap && m="${m}:mod_quotatab_ldap"
-		use radius && m="${m}:mod_quotatab_radius"
-		use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql"
-	fi
-	if use ssl ; then
-		m="${m}:mod_tls:mod_tls_shmcache"
-		use memcache && m="${m}:mod_tls_memcache"
-	fi
-	if use tcpd ; then
-		m="${m}:mod_wrap2:mod_wrap2_file"
-		use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
-	fi
-	use vroot && m="${m}:mod_vroot"
-
-	[ -z ${m} ] || c="${c} --with-modules=${m:1}"
-	econf --localstatedir=/var/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \
-		$(use_enable acl facl) \
-		$(use_enable authfile auth-file) \
-		$(use_enable caps cap) \
-		$(use_enable ctrls) \
-		$(use_enable dso) \
-		$(use_enable ident) \
-		$(use_enable ipv6) \
-		$(use_enable memcache) \
-		$(use_enable ncurses) \
-		$(use_enable nls) \
-		$(use_enable openssl) \
-		$(use_enable pam auth-pam) \
-		$(use_enable pcre) \
-		$(use_enable test tests) \
-		$(use_enable trace) \
-		$(use_enable userland_GNU shadow) \
-		$(use_enable userland_GNU autoshadow) \
-		${c:1}
-}
-
-src_test() {
-	emake api-tests -C tests
-}
-
-src_install() {
-	default
-	[ -z ${LINGUAS} ] && rm -r "${ED}"/usr/share/locale
-	newinitd "${FILESDIR}"/proftpd.initd proftpd
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/proftpd.xinetd proftpd
-	fi
-
-	dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
-	if use doc ; then
-		dohtml doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
-		docinto rfc
-		dodoc doc/rfc/*.txt
-	fi
-}
-
-pkg_postinst() {
-	if use tcpd ; then
-		ewarn
-		ewarn "Important: Since ProFTPD 1.3.4rc2 the module mod_wrap for TCP Wrapper"
-		ewarn "support has been replaced by mod_wrap2 which is more configurable and"
-		ewarn "portable.  But you have to adjust your configuration before restaring"
-		ewarn "ProFTPD. On the following website you can find more information:"
-		ewarn "  http://proftpd.org/docs/contrib/mod_wrap2.html"
-		ewarn
-	fi
-}
diff --git a/net-ftp/proftpd/proftpd-1.3.4c-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.4c-r1.ebuild
deleted file mode 100644
index d2fc5afadb12..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.4c-r1.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4c-r1.ebuild,v 1.1 2013/04/09 20:22:24 slyfox Exp $
-
-EAPI=5
-inherit eutils multilib systemd
-
-MOD_CASE="0.7"
-MOD_CLAMAV="0.11rc"
-MOD_DISKUSE="0.9"
-MOD_GSS="1.3.3"
-MOD_MSG="0.4.1"
-MOD_VROOT="0.9.2"
-
-DESCRIPTION="An advanced and very configurable FTP server."
-HOMEPAGE="http://www.proftpd.org/
-	http://www.castaglia.org/proftpd/
-	http://www.thrallingpenguin.com/resources/mod_clamav.htm
-	http://gssmod.sourceforge.net/"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
-	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz )
-	clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${MOD_CLAMAV}.tar.gz )
-	diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
-	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
-	msg? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz )
-	vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${MOD_VROOT}.tar.gz )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso dynmasq exec ifsession ifversion ident ipv6
-	kerberos ldap linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR
-	linguas_ru_RU linguas_zh_CN linguas_zh_TW memcache msg mysql ncurses nls openssl pam +pcre postgres qos radius
-	ratio readme rewrite selinux sftp shaper sitemisc softquota sqlite ssl tcpd test trace vroot xinetd"
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( openssl )
-	shaper? ( ctrls )
-	ssl? ( openssl )"
-
-CDEPEND="acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	memcache? ( >=dev-libs/libmemcached-0.41 )
-	mysql? ( virtual/mysql )
-	nls? ( virtual/libiconv )
-	ncurses? ( sys-libs/ncurses )
-	openssl? ( dev-libs/openssl )
-	pam? ( virtual/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite:3 )
-	xinetd? ( virtual/inetd )"
-DEPEND="${CDEPEND}
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-S="${WORKDIR}/${P/_/}"
-
-__prepare_module() {
-	mv "${WORKDIR}"/$1/$1.c contrib
-	mv "${WORKDIR}"/$1/$1.html doc/contrib
-	rm -r "${WORKDIR}"/$1
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-build-noipv6.patch #465134
-
-	# Skip 'install-conf' / Support LINGUAS
-	sed -i -e "/install-all/s/ install-conf//" Makefile.in
-	sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in
-
-	# Prepare external modules
-	use case && __prepare_module mod_case
-	if use clamav ; then
-		mv "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib
-		epatch "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.patch
-		rm -r "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}
-	fi
-	use msg && __prepare_module mod_msg
-	use vroot && __prepare_module mod_vroot
-
-	# Prepare external kerberos module
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-
-		# Support app-crypt/heimdal / Gentoo Bug #284853
-		sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in
-
-		# Remove obsolete DES / Gentoo Bug #324903
-		# Replace 'rpm' lookups / Gentoo Bug #391021
-		sed -i -e "/ac_gss_libs/s/ -ldes425//" \
-			-e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \
-			-e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" configure{,.in}
-	fi
-}
-
-src_configure() {
-	local c m
-
-	use acl && m="${m}:mod_facl"
-	use ban && m="${m}:mod_ban"
-	use case && m="${m}:mod_case"
-	use clamav && m="${m}:mod_clamav"
-	use copy && m="${m}:mod_copy"
-	use ctrls && m="${m}:mod_ctrls_admin"
-	use deflate && m="${m}:mod_deflate"
-	if use diskuse ; then
-		cd "${WORKDIR}"/mod_diskuse
-		econf
-		mv mod_diskuse.{c,h} "${S}"/contrib
-		mv mod_diskuse.html "${S}"/doc/contrib
-		cd "${S}"
-		rm -r "${WORKDIR}"/mod_diskuse
-		m="${m}:mod_diskuse"
-	fi
-	use dynmasq && mym="${mym}:mod_dynmasq"
-	use exec && m="${m}:mod_exec"
-	use ifsession && m="${m}:mod_ifsession"
-	use ifversion && m="${m}:mod_ifversion"
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-		if has_version app-crypt/mit-krb5 ; then
-			econf --enable-mit
-		else
-			econf --enable-heimdal
-		fi
-		mv mod_{auth_gss,gss}.c "${S}"/contrib
-		mv mod_gss.h "${S}"/include
-		mv README.mod_{auth_gss,gss} "${S}"
-		mv mod_gss.html "${S}"/doc/contrib
-		mv rfc{1509,2228}.txt "${S}"/doc/rfc
-		cd "${S}"
-		rm -r "${WORKDIR}"/mod_gss-${MOD_GSS}
-		m="${m}:mod_gss:mod_auth_gss"
-	fi
-	use ldap && m="${m}:mod_ldap"
-	use msg && mym="${mym}:mod_msg"
-	if use mysql || use postgres || use sqlite ; then
-		m="${m}:mod_sql:mod_sql_passwd"
-		use mysql && m="${m}:mod_sql_mysql"
-		use postgres && m="${m}:mod_sql_postgres"
-		use sqlite && m="${m}:mod_sql_sqlite"
-	fi
-	use qos && m="${m}:mod_qos"
-	use radius && m="${m}:mod_radius"
-	use ratio && m="${m}:mod_ratio"
-	use readme && m="${m}:mod_readme"
-	use rewrite && m="${m}:mod_rewrite"
-	if use sftp ; then
-		m="${m}:mod_sftp"
-		use pam && m="${m}:mod_sftp_pam"
-		use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql"
-	fi
-	use shaper && m="${m}:mod_shaper"
-	use sitemisc && m="${m}:mod_site_misc"
-	if use softquota ; then
-		m="${m}:mod_quotatab:mod_quotatab_file"
-		use ldap && m="${m}:mod_quotatab_ldap"
-		use radius && m="${m}:mod_quotatab_radius"
-		use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql"
-	fi
-	if use ssl ; then
-		m="${m}:mod_tls:mod_tls_shmcache"
-		use memcache && m="${m}:mod_tls_memcache"
-	fi
-	if use tcpd ; then
-		m="${m}:mod_wrap2:mod_wrap2_file"
-		use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
-	fi
-	use vroot && m="${m}:mod_vroot"
-
-	[ -z ${m} ] || c="${c} --with-modules=${m:1}"
-	econf --localstatedir=/var/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \
-		$(use_enable acl facl) \
-		$(use_enable authfile auth-file) \
-		$(use_enable caps cap) \
-		$(use_enable ctrls) \
-		$(use_enable dso) \
-		$(use_enable ident) \
-		$(use_enable ipv6) \
-		$(use_enable memcache) \
-		$(use_enable ncurses) \
-		$(use_enable nls) \
-		$(use_enable openssl) \
-		$(use_enable pam auth-pam) \
-		$(use_enable pcre) \
-		$(use_enable test tests) \
-		$(use_enable trace) \
-		$(use_enable userland_GNU shadow) \
-		$(use_enable userland_GNU autoshadow) \
-		${c:1}
-}
-
-src_test() {
-	emake api-tests -C tests
-}
-
-src_install() {
-	default
-	[ -z ${LINGUAS} ] && rm -r "${ED}"/usr/share/locale
-	newinitd "${FILESDIR}"/proftpd.initd proftpd
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/proftpd.xinetd proftpd
-	fi
-
-	dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
-	if use doc ; then
-		dohtml doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
-		docinto rfc
-		dodoc doc/rfc/*.txt
-	fi
-
-	systemd_dounit       "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf ${PN}.conf
-}
-
-pkg_postinst() {
-	if use tcpd ; then
-		ewarn
-		ewarn "Important: Since ProFTPD 1.3.4rc2 the module mod_wrap for TCP Wrapper"
-		ewarn "support has been replaced by mod_wrap2 which is more configurable and"
-		ewarn "portable.  But you have to adjust your configuration before restaring"
-		ewarn "ProFTPD. On the following website you can find more information:"
-		ewarn "  http://proftpd.org/docs/contrib/mod_wrap2.html"
-		ewarn
-	fi
-}
diff --git a/net-ftp/proftpd/proftpd-1.3.4c.ebuild b/net-ftp/proftpd/proftpd-1.3.4c.ebuild
deleted file mode 100644
index 50b9ea31f0b8..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.4c.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4c.ebuild,v 1.10 2013/07/14 17:37:56 ago Exp $
-
-EAPI=4
-inherit eutils multilib systemd
-
-MOD_CASE="0.7"
-MOD_CLAMAV="0.11rc"
-MOD_DISKUSE="0.9"
-MOD_GSS="1.3.3"
-MOD_VROOT="0.9.2"
-
-DESCRIPTION="An advanced and very configurable FTP server."
-HOMEPAGE="http://www.proftpd.org/
-	http://www.castaglia.org/proftpd/
-	http://www.thrallingpenguin.com/resources/mod_clamav.htm
-	http://gssmod.sourceforge.net/"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
-	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz )
-	clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${MOD_CLAMAV}.tar.gz )
-	diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
-	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
-	vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${MOD_VROOT}.tar.gz )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso exec ifsession ifversion ident ipv6
-	kerberos ldap linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR
-	linguas_ru_RU linguas_zh_CN linguas_zh_TW memcache mysql ncurses nls openssl pam +pcre postgres qos radius
-	ratio readme rewrite selinux sftp shaper sitemisc softquota sqlite ssl tcpd test trace vroot xinetd"
-REQUIRED_USE="ban? ( ctrls )
-	sftp? ( openssl )
-	shaper? ( ctrls )
-	ssl? ( openssl )"
-
-CDEPEND="acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	memcache? ( >=dev-libs/libmemcached-0.41 )
-	mysql? ( virtual/mysql )
-	nls? ( virtual/libiconv )
-	ncurses? ( sys-libs/ncurses )
-	openssl? ( dev-libs/openssl )
-	pam? ( virtual/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite:3 )
-	xinetd? ( virtual/inetd )"
-DEPEND="${CDEPEND}
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-S="${WORKDIR}/${P/_/}"
-
-__prepare_module() {
-	mv "${WORKDIR}"/$1/$1.c contrib
-	mv "${WORKDIR}"/$1/$1.html doc/contrib
-	rm -r "${WORKDIR}"/$1
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-build-noipv6.patch #465134
-
-	# Skip 'install-conf' / Support LINGUAS
-	sed -i -e "/install-all/s/ install-conf//" Makefile.in
-	sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in
-
-	# Prepare external modules
-	use case && __prepare_module mod_case
-	if use clamav ; then
-		mv "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib
-		epatch "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.patch
-		rm -r "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}
-	fi
-	use vroot && __prepare_module mod_vroot
-
-	# Prepare external kerberos module
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-
-		# Support app-crypt/heimdal / Gentoo Bug #284853
-		sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in
-
-		# Remove obsolete DES / Gentoo Bug #324903
-		# Replace 'rpm' lookups / Gentoo Bug #391021
-		sed -i -e "/ac_gss_libs/s/ -ldes425//" \
-			-e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \
-			-e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" configure{,.in}
-	fi
-}
-
-src_configure() {
-	local c m
-
-	use acl && m="${m}:mod_facl"
-	use ban && m="${m}:mod_ban"
-	use case && m="${m}:mod_case"
-	use clamav && m="${m}:mod_clamav"
-	use copy && m="${m}:mod_copy"
-	use ctrls && m="${m}:mod_ctrls_admin"
-	use deflate && m="${m}:mod_deflate"
-	if use diskuse ; then
-		cd "${WORKDIR}"/mod_diskuse
-		econf
-		mv mod_diskuse.{c,h} "${S}"/contrib
-		mv mod_diskuse.html "${S}"/doc/contrib
-		cd "${S}"
-		rm -r "${WORKDIR}"/mod_diskuse
-		m="${m}:mod_diskuse"
-	fi
-	use exec && m="${m}:mod_exec"
-	use ifsession && m="${m}:mod_ifsession"
-	use ifversion && m="${m}:mod_ifversion"
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-		if has_version app-crypt/mit-krb5 ; then
-			econf --enable-mit
-		else
-			econf --enable-heimdal
-		fi
-		mv mod_{auth_gss,gss}.c "${S}"/contrib
-		mv mod_gss.h "${S}"/include
-		mv README.mod_{auth_gss,gss} "${S}"
-		mv mod_gss.html "${S}"/doc/contrib
-		mv rfc{1509,2228}.txt "${S}"/doc/rfc
-		cd "${S}"
-		rm -r "${WORKDIR}"/mod_gss-${MOD_GSS}
-		m="${m}:mod_gss:mod_auth_gss"
-	fi
-	use ldap && m="${m}:mod_ldap"
-	if use mysql || use postgres || use sqlite ; then
-		m="${m}:mod_sql:mod_sql_passwd"
-		use mysql && m="${m}:mod_sql_mysql"
-		use postgres && m="${m}:mod_sql_postgres"
-		use sqlite && m="${m}:mod_sql_sqlite"
-	fi
-	use qos && m="${m}:mod_qos"
-	use radius && m="${m}:mod_radius"
-	use ratio && m="${m}:mod_ratio"
-	use readme && m="${m}:mod_readme"
-	use rewrite && m="${m}:mod_rewrite"
-	if use sftp ; then
-		m="${m}:mod_sftp"
-		use pam && m="${m}:mod_sftp_pam"
-		use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql"
-	fi
-	use shaper && m="${m}:mod_shaper"
-	use sitemisc && m="${m}:mod_site_misc"
-	if use softquota ; then
-		m="${m}:mod_quotatab:mod_quotatab_file"
-		use ldap && m="${m}:mod_quotatab_ldap"
-		use radius && m="${m}:mod_quotatab_radius"
-		use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql"
-	fi
-	if use ssl ; then
-		m="${m}:mod_tls:mod_tls_shmcache"
-		use memcache && m="${m}:mod_tls_memcache"
-	fi
-	if use tcpd ; then
-		m="${m}:mod_wrap2:mod_wrap2_file"
-		use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
-	fi
-	use vroot && m="${m}:mod_vroot"
-
-	[ -z ${m} ] || c="${c} --with-modules=${m:1}"
-	econf --localstatedir=/var/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \
-		$(use_enable acl facl) \
-		$(use_enable authfile auth-file) \
-		$(use_enable caps cap) \
-		$(use_enable ctrls) \
-		$(use_enable dso) \
-		$(use_enable ident) \
-		$(use_enable ipv6) \
-		$(use_enable memcache) \
-		$(use_enable ncurses) \
-		$(use_enable nls) \
-		$(use_enable openssl) \
-		$(use_enable pam auth-pam) \
-		$(use_enable pcre) \
-		$(use_enable test tests) \
-		$(use_enable trace) \
-		$(use_enable userland_GNU shadow) \
-		$(use_enable userland_GNU autoshadow) \
-		${c:1}
-}
-
-src_test() {
-	emake api-tests -C tests
-}
-
-src_install() {
-	default
-	[ -z ${LINGUAS} ] && rm -r "${ED}"/usr/share/locale
-	newinitd "${FILESDIR}"/proftpd.initd proftpd
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/proftpd.xinetd proftpd
-	fi
-
-	dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
-	if use doc ; then
-		dohtml doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
-		docinto rfc
-		dodoc doc/rfc/*.txt
-	fi
-
-	systemd_dounit       "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf ${PN}.conf
-}
-
-pkg_postinst() {
-	if use tcpd ; then
-		ewarn
-		ewarn "Important: Since ProFTPD 1.3.4rc2 the module mod_wrap for TCP Wrapper"
-		ewarn "support has been replaced by mod_wrap2 which is more configurable and"
-		ewarn "portable.  But you have to adjust your configuration before restaring"
-		ewarn "ProFTPD. On the following website you can find more information:"
-		ewarn "  http://proftpd.org/docs/contrib/mod_wrap2.html"
-		ewarn
-	fi
-}
diff --git a/net-ftp/proftpd/proftpd-1.3.4c-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.4e.ebuild
index cb23bc8eba37..a04cea6157dd 100644
--- a/net-ftp/proftpd/proftpd-1.3.4c-r2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.4e.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4c-r2.ebuild,v 1.1 2013/07/16 08:12:52 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4e.ebuild,v 1.1 2014/05/16 21:08:45 slyfox Exp $
 
 EAPI=5
 inherit eutils multilib systemd
@@ -71,7 +71,8 @@ __prepare_module() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-build-noipv6.patch #465134
+	epatch "${FILESDIR}"/${P}-link-tests.patch
+	epatch "${FILESDIR}"/${PN}-1.3.4d-memset-fix.patch
 
 	# Skip 'install-conf' / Support LINGUAS
 	sed -i -e "/install-all/s/ install-conf//" Makefile.in
@@ -206,6 +207,8 @@ src_test() {
 src_install() {
 	default
 	[ -z ${LINGUAS} ] && rm -r "${ED}"/usr/share/locale
+	rm -rf "${ED}"/var/run
+
 	newinitd "${FILESDIR}"/proftpd.initd proftpd
 	insinto /etc/proftpd
 	doins "${FILESDIR}"/proftpd.conf.sample