Install the checkconfig.sh script for every version. Bug #467410. Remove old

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

9 files changed, 32 insertions, 571 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 2d05d97d311d..a753656efb9a 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/vsftpd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.167 2013/04/20 16:51:02 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.168 2013/04/27 09:45:08 hwoarang Exp $
+
+  27 Apr 2013; Markos Chandras <hwoarang@gentoo.org> -vsftpd-2.2.2.ebuild,
+  -vsftpd-2.3.2-r1.ebuild, -vsftpd-2.3.2.ebuild, -vsftpd-2.3.4.ebuild,
+  -vsftpd-3.0.0.ebuild, vsftpd-2.3.5.ebuild, vsftpd-3.0.2.ebuild:
+  Install the checkconfig.sh script for every version. Bug #467410. Remove old
 
 *vsftpd-3.0.2-r1 (20 Apr 2013)
 
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 9c3aba98178c..7a9464b25bcb 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -16,39 +16,29 @@ AUX vsftpd.init 1261 SHA256 e6cf3df546aae57bb10e2b4282a9ccd79741473ef9dbdbd7628a
 AUX vsftpd.logrotate 53 SHA256 b31f4db8e2f8640f83bc38d83444ab784f8fc9a6492f654bb4149e1f566da2f3 SHA512 6b0d718ffdc0b6a68d5092b36a03106d2c4e4fa6873a178c85345acfb3847ef839a475eadb56171d79ec243ae2bf8725cae0ae486b182afe065b181f87c831c5 WHIRLPOOL e155b30b59319cc5dac69c7446273ab20b4e56f696cce6ab8c83c3310529e0da70969edefaf94c912f121d3df526368ad9aafd291c6cf2f6a9b2d7b69d88b0aa
 AUX vsftpd.service 218 SHA256 5c93a836c0be34d785197ba01541b6cd9db6f8992c4ea081c07a6111cc98290d SHA512 f032f64ed5fab15b1c9543579090cdca007d0a759073e7c4aa0f0ef0f852f6787610f776ce63d0d922ccfbadd480df81ed9a62e6e0f399327d770f9b70c34df9 WHIRLPOOL c91aabb3b89dc3faa002cd998329d44677f756ee2901492324e37b3f7dbcc29b83c53032891ef1d802ea70d01b060f091970c20a06b36d2cae9358269df6f4e4
 AUX vsftpd.xinetd 432 SHA256 4e68c12108509823c74cd66f833299def48f497a4d660624362d3b4990af828f SHA512 f5c232345c06a7f3a7b32ff0281c386e6956e1b91d0331436bf8eb39e479ad1e37335424c35f22f12fb70416caa1f6a317b03e701caa4e0499acd556db64e909 WHIRLPOOL 7ffd1ede197d387e38ffa6e584c86be2fc35c4938b75ebd793daff562f6e99e95aaf0c5e58ee0a74a76686115e5e32e19dd5b27d8a64dd255de1ad7aae74d5fc
-DIST vsftpd-2.2.2.tar.gz 185562 SHA256 05665dfa43a268e6fe422b89f6c3cb1a63e4e989b456922508f3f89d4b276eab
-DIST vsftpd-2.3.2.tar.gz 187229 SHA256 a4e04836d8e271f361030e6a679ad001046c3e37f59e9fee5114189f9e065336
-DIST vsftpd-2.3.4.tar.gz 187043 SHA256 b466edf96437afa2b2bea6981d4ab8b0204b83ca0a2ac94bef6b62b42cc71a5a SHA512 031e7b93d8acde62595f005ec1329b0404a61b42bfada041417085da02e5d84474c1dc6a7766a52249261a221a96c3840db28c7bf3756f5beb9f6e804735a979 WHIRLPOOL a60d313549873e40341ae4882dd8aa9743fe36f43be815fa7ced0a9975361d389af4d128ca20fc0bb774b51c3129fad8900ed523e20efb74288b256ed9ebdae5
 DIST vsftpd-2.3.5.tar.gz 187691 SHA256 d87ee2987df8f03e1dbe294905f7907b2798deb89c67ca965f6e2f60879e54f1 SHA512 7d58d601c4a14cf16c074f238d557fd28e080d7573a1257f742e43bf97cff455b6bf083d8e3594cc7f8865f9485b307b692e91c17426c7fed11af9e4b41a0643 WHIRLPOOL 2dba4ae125bbd66522f58ce4ffc9d5be8ea2a84876fe6751593b82aa2c3e5fe1e1ed076c1c09268054f7ea6831683a2be0dd4e269e321d572d859d0ae2535406
-DIST vsftpd-3.0.0.tar.gz 193166 SHA256 ef70205dcd0c7f03b008b9578fb44c0cbe31e66daab8cfafb9904747c17fc2a8 SHA512 00d3aa7b1e9b0c568a5fb4ee28b1f83d471586db7447e7080bb552ce0c392075b5218db17560e4ff0e237d051aaf4eda8ede059567ac7d3c33065152dc31b829 WHIRLPOOL b326b0b444e9fc15b8a80c144894b188883712dc3fdb1a072ed8753d0416e0d219b3b3775e4ac1ee398d089659b6709843da0e3d2e2917f89c581f0ea443a40b
 DIST vsftpd-3.0.2.tar.gz 192808 SHA256 be46f0e2c5528fe021fafc8dab1ecfea0c1f183063a06977f8537fcd0b195e56 SHA512 d5b978e07d8b0a623b79a531824666fb9b970ad5989a8c34c21b545b62ba07cde4bfe3d77b40a8b6e92d17890c37cae209231af8f106da3404f6548e217bd023 WHIRLPOOL 7a74ab478880d021f7a82ffc6ec3989617003234e30d97063760bc06baeee2ab207861b440896b926b95eed7b3d902ab96c05c1bbd23d494d9ff168f98d3404a
-EBUILD vsftpd-2.2.2.ebuild 2897 SHA256 3342c91077595e6ebe095edfc06613ae252f4bb6e8f19daa754389e6fae8042e SHA512 dfe34e31592c397d22824f24d75816f1a8a29a610d68fc60a639bc6e9a11abc9c135ac1da38a4044643457fd47ff31c06cb349c875d7cee739cc724214775957 WHIRLPOOL b600b00663b2bdcd7286b764535799abc71cbbaf63ad83ff89175bf7ecd238f15cb6efa15478bff53f91cb8ae759bb432263e497126dcd8e4bbde43c122fe39e
-EBUILD vsftpd-2.3.2-r1.ebuild 3271 SHA256 5f98cc839686325d117446ed5ad16b6e72c17a1214e34baa54eb085c24a50674 SHA512 cb187ceea4bbaadb92d89b862ef51cbbfc6c951cc2b0be52797193b3496eb68cf7c9974ba994846617a1a48ee0f273cdad9ea43a100e38438909cf8b5c591902 WHIRLPOOL 7a67e117df44410aac85d6d9451ec0d4da7586bb360d69ff401d48ee8dcfe12e1e472cd76c459d0b6531f2fab001e389ebd53e038739d2a5819448c9cdffcb6a
-EBUILD vsftpd-2.3.2.ebuild 3128 SHA256 c0241d0f25dff6ecfb4b4d47152a7ff62be23fad63fcc64fdb0ecec46d304143 SHA512 e2d2ae4c8037087574a2c4cba79f56e0f6545e37383558886e23cbaca745cf134f0fcaf7dc5c54ac46d96346606151fb222235ab22d203d15d5d51c73038e1f4 WHIRLPOOL 925da2117d68c8a0347874f4dd02b31c127caf0a4c66f2d9aa2f97d2570bb8468a0ec7ea4e77a12a0c10ecc787e28889d40358f9750dae8251797d2ae6332606
-EBUILD vsftpd-2.3.4.ebuild 3282 SHA256 b2d6073e8a200c103d506018550f4b9e195b6468c0b1d9d7f49996c1ab75b8da SHA512 8551a76651898cfde32600e236807f51708c5bea7de7d84eb7ce8934a5671dc427d571cc0477071138bc2eb2ca0b998dc9a4f16c85058d918ae445ec9b085906 WHIRLPOOL 8cbf90f59e2311f3756188b0e0ec5b403459897262955ea36a5725956dd621119e2996e610b48a22521962859613248be589ae2924a12bcae651c2c8e8b825ca
-EBUILD vsftpd-2.3.5.ebuild 3116 SHA256 3d93968516e12ca228f6138eed946d23f9e8890f2cf3750fcd3ea95bda35391b SHA512 792ed9806b4414435ab7082cc3cbab037e394e8dcc8119fe7b73e241babaf6d6f46129dcabc25d2cce97b74b89a1230f145dea0f2fc0909c9fcc0ba2a5610591 WHIRLPOOL 1730280995a9b9ea602803fc10f1f9326a7cecd52aa4eda9a8f63300d64ef25bbd9b085103afdaa4409f18fe02c1c9c58e6b7c8c7557ad2e181707284725080e
-EBUILD vsftpd-3.0.0.ebuild 3102 SHA256 e82828dd9a0854cd2434101789997cdf46b6841c367c6cd789c893c77cef385c SHA512 fb26ef56475cb9ff8f0539fb4d7616e613961e7371b4e85cb9248718dd35b9cfd0eaf10a7ff864e54ffcab133d5b24c9798bb4934a985d832d6b5d8419c967ca WHIRLPOOL dff1207ff085fe21dfff30d7eca9ec50cdb65949e0f87de0d529dc592bd8b50002afb5b393ab64e09f92d6be472f84ee07fd1efca479c902775e32ee142c7f1a
+EBUILD vsftpd-2.3.5.ebuild 3184 SHA256 478fca0c1becd06f6e1a56372ec04a08b31be1ea242355c7005a9bd593126828 SHA512 36d69f37d53a20a05896edd9a619129507ebfe71e0074a010105824741ebf2def741b099760671ed2fcf2f6701336cd0578fe351646d53bd25db09c214f90394 WHIRLPOOL 6abbd34564d28f4776f9cdf7c39161872f199fc1ba9d5cc1c23a22f0747bd4a060514e48276b01749e82564dfcf8d25c73cdd6b2832535cfb67b877a28e07580
 EBUILD vsftpd-3.0.2-r1.ebuild 3391 SHA256 67fe25e1d0627b84b5a47d859bee8ec323531b87e8b806d82eeffce58430f598 SHA512 ad0a9d06b2fbfc145f042d95c2af6cc84470e5616ca7b6dffe7d5ef41827f66c98630c56363b9768b5bc6522e91509b6058535481f35a5f5726cbbd48aa2b25b WHIRLPOOL 647418cf0f295e4bd2bf22556a6dae710bf8876d4f598b83e0a8b9be659f9ba39b595e523f76ec525b222ab677c33feb87facacad38a7d0d4421731d5124d62f
-EBUILD vsftpd-3.0.2.ebuild 3193 SHA256 799536b5b4ed3d7c473f07e8e976074013b2aef0ef8a544770fff36ee52fe05c SHA512 3d00ef7f8f802746d5fa286517be852b4e533bb282c6d327f1989197c3e27fcfbccd87c30c3e57d3be36c1b0bb673660b019ada37d966c0c8a7b8bf0818e36af WHIRLPOOL cf7835f72a747b22e288e85d12fd147581d3f6efdd5b1a35424cdaa944d448531bf26058a3019dbd7c1c795babdde5d881057c1a81cc03ecbbb50298fc3d51a7
-MISC ChangeLog 23825 SHA256 f0e77fa0fefe8c29f419164cb095622509c49db3c20f54d7fac8c6442e92a1b1 SHA512 aeb0d890d3498320c7ae0ee2e28b3ae8219cfb60eb920549704a1b9662cb259be7a6ec6a1c78676eaaad1b49112b6ea22a7e308250d2f7035b13fe297c78e179 WHIRLPOOL 67bf812702e5e9a6e5ba1277698c6b85a3443d52751e9f846df288e5cbea9ee83ccf3c8274bc6fb79962bb43398ab06d1758a8636ef231d8f1207befc1547321
+EBUILD vsftpd-3.0.2.ebuild 3261 SHA256 2fbe8a15ec3becfa9b6d026131910e0bbba05e441f529ae00700912118220186 SHA512 abbd58887a36cdcbfd384b2cfcb66f1fd7aaef465a1efc61a456ff62cbd24067d5056e35592ea445997ab5537c613e168481dbca52bd903c9ad2270ca80f2e78 WHIRLPOOL b7ea0221b0b49d61a5b45fec8f98fa63bb1fdb995cce08833163c11a052560b459897eac6db2943813bdd9324f62e8c98238475db0c1e821196e178fe989fff7
+MISC ChangeLog 24117 SHA256 ea87519d655fcd0ad7eca0b0d1a62556226c30998735d82386657d9bbd1c58e9 SHA512 de0f6d470f4a48ddc7280def5764e39fba8e010052763bc019ffe853e773e321c2d51c145e773fb058dcf36391f8da544805ef9d847b8fc1d54309f8a2bcf87f WHIRLPOOL be940f1a3207c4cc0a5cc3dffc49e25f3f587e2f3931887fe206f90e3235d02f8772118cb3d95761cad297909b946b966ec9a14534c8d5769c14d224f5267730
 MISC metadata.xml 664 SHA256 769529e78a4d3270ae5c627e09783ffd6e122e24c5e931317d0832b6273ee586 SHA512 84392c28c30904caba637a5f90fc73512f028f706f5a805c1181a9fc63b93e9794dc17ade2016d969796b32c6ab6b8530f549298b099ae67c65d03a62d64955b WHIRLPOOL a4690e0bf4b66e94d072b0f6d0297da7fd208277b3302862087f2d274438167c97f2a33a6ad43e76fea2f754190e2b40cfc6a7d7ee562538ef6c479d08f36d0c
-MISC vsftpd-3.0.2-r1.ebuild.orig 3259 SHA256 edd88cb238accb37281299b5e9fc9ec59122a8b0260afd12e2eeae3a84f69e28 SHA512 de14157a52a510da140c34be08c2aef56c30cd027ac50dd3420423e754dc30c1e5db7d70c12b9c752a593279d61c1112b590b7b469d19e2adcbd94b75f90b4aa WHIRLPOOL 050d3054a4ecd48e6e3308bc07bf8abefd6c07949f9c80a15c1d0a845f69e0965edb71bc32b2fd36e80ef324d682a739874c5f1e910543b7db2342464c3375c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRcsd2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJRe54kXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88f9YP/382cyLXi4OmBvyRp9IT4No8
-5TrQABKCkiekdqjcmzuy4XBNDtt2M21NznSRgnztnImxAF0TwMWtXRmWjnwObKV8
-3ine3YlupZS4yDxM23zyddF13faGIcUJGWBQGX7XvINHlf35j3UmgpW2PCyLOw6Y
-Ee38V1rqEqzDt1bRysmiHXCz8HGvJElkHDOk5uqEp1irvqweh6Cze06AxkETZMLP
-kdJefm3uLaxGdmfpZJ8neeUPvA215dY/u3/kwOXjnWZMo8ruO+EAXXLXdmZZDrOt
-QJ8vEOxV9Q8WfZnYrj2/MBVvoUOXewxu4hjY5jsjbPtt7P6Qo5ZFxVyQ+lCCiu7O
-eJnagX12w5Mfob4pXZssa0Xn8AxTyZiIWBxoXxA1FfXleeldkCemc4iBe++3D/OU
-UfZy/M6CyB3Z/KdiegHv+l0Cw/H/g0ZsAEyt05krx7vClLny1h3a1osNMvNDLknQ
-7TSKh5zI6oWW1QcNze94kEsyHR7RgW8lBZoWHcV4q6RIyD9nY5i6ckTrMFsGfYXZ
-kKNXYwVuChjkJ8h5oMoTG0Q7mjUNf/CToAe65SVavxKH2lhbHCK6JZM1fN/OZIJ1
-WdyyBa9L6quKEUjK9XLZTp1vazUoSWJWsINYrWcWehG8C5dvgRjDXsOHcSuMHMue
-u8GVk7AzOSEqmA0nKzYY
-=NkU0
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88mckQALIqAhGavLgRoapl7DaW0N7j
+Ti11EGBhPRDFl4LD4RQuy/vLjwTnc0PD+eYGlsxbHD4VESfb31ZiZBzdZRE8xR/5
+QWbZRnL+RsNXW4dffDY/iqfxp6MqonvNVzsdxujT+V3gxu+3kYwsc8mpFkuIZkVL
+8gtVWwF3UFNGftFx2EYMiMDRDj6dDh7oJXHIHa5I5fYr7Ir9OWrbQdmRFZVnvR2/
+ccNirCqFSfJzaivEcZxRjQVLMjU8P/CJRiuTrQuenwL3OFOj1REdMT/UGWu0dLiS
+ZEZriCr3mHVq8xerd83NNz1eu/NGe0bFD5yhxLKGPapYAYZdlnPtdQ1dC7OlabG4
+tEgerkHzDyfzN8OxfZHgPRCla6SpqLXdzyFINrSQNrLCs70jFUYAlYzYeos2s1EJ
+pf14XVfBS7I6bcN2xrcA8iUa1xXiTiMwNxgwyIWRQ6Iv2LV2+7rGPfa2YyhcExQo
+N5M8XRMABduY2eV/QBPu5GzPswIkvOHuSS0y8qqLrIiUmfM7q4HcVONvhktcB5ut
+SJpmkCXsayF9M/CPzFsQOsV4lY0Jd+NAYv8SQUWZNIfi747kU9VQbO4m2nU5w9eB
+3UaQYyql4VfqBPdRYhMCFHgS8GtTWDz+k0AQhg0cOms111ttBkchUF69GsapNTtE
+1HtfC61KQ6D6TtBAhTQv
+=wfSq
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/vsftpd/vsftpd-2.2.2.ebuild b/net-ftp/vsftpd/vsftpd-2.2.2.ebuild
deleted file mode 100644
index 8f0c8a8576a6..000000000000
--- a/net-ftp/vsftpd/vsftpd-2.2.2.ebuild
+++ /dev/null
@@ -1,104 +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/vsftpd/vsftpd-2.2.2.ebuild,v 1.6 2012/05/13 10:57:37 swift Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
-HOMEPAGE="http://vsftpd.beasts.org/"
-SRC_URI="ftp://vsftpd.beasts.org/users/cevans/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="caps pam tcpd ssl selinux xinetd"
-
-DEPEND="caps? ( >=sys-libs/libcap-2 )
-	pam? ( virtual/pam )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? ( >=dev-libs/openssl-0.9.7d )"
-RDEPEND="${DEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )
-	xinetd? ( sys-apps/xinetd )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Patch the source, config and the manpage to use /etc/vsftpd/
-	epatch "${FILESDIR}/${PN}-2.2.0-gentoo.patch"
-
-	# Fix building without the libcap
-	epatch "${FILESDIR}/${PN}-2.1.0-caps.patch"
-
-	# Configure vsftpd build defaults
-	use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
-	use ssl && echo "#define VSF_BUILD_SSL" >> builddefs.h
-	use pam || echo "#undef VSF_BUILD_PAM" >> builddefs.h
-
-	# Ensure that we don't link against libcap unless asked
-	if ! use caps ; then
-		sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c
-		epatch "${FILESDIR}"/${PN}-2.2.0-dont-link-caps.patch
-	fi
-
-	# Let portage control stripping
-	sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	into /usr
-	doman vsftpd.conf.5 vsftpd.8
-	dosbin vsftpd || die
-
-	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
-		README README.security REWARD SIZE \
-		SPEED TODO TUNING
-	newdoc vsftpd.conf vsftpd.conf.example
-
-	docinto security
-	dodoc SECURITY/*
-
-	insinto "/usr/share/doc/${PF}/examples"
-	doins -r EXAMPLE/*
-
-	insinto /etc/vsftpd
-	newins vsftpd.conf vsftpd.conf.example
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/vsftpd.logrotate" vsftpd
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/vsftpd.xinetd" vsftpd
-	fi
-
-	newinitd "${FILESDIR}/vsftpd.init" vsftpd
-
-	keepdir /usr/share/vsftpd/empty
-}
-
-pkg_preinst() {
-	# If we use xinetd, then we set listen=NO
-	# so that our default config works under xinetd - fixes #78347
-	if use xinetd ; then
-		sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/vsftpd/vsftpd.conf.example
-	fi
-}
-
-pkg_postinst() {
-	einfo "vsftpd init script can now be multiplexed."
-	einfo "The default init script forces /etc/vsftpd/vsftpd.conf to exist."
-	einfo "If you symlink the init script to another one, say vsftpd.foo"
-	einfo "then that uses /etc/vsftpd/foo.conf instead."
-	einfo
-	einfo "Example:"
-	einfo "   cd /etc/init.d"
-	einfo "   ln -s vsftpd vsftpd.foo"
-	einfo "You can now treat vsftpd.foo like any other service"
-}
diff --git a/net-ftp/vsftpd/vsftpd-2.3.2-r1.ebuild b/net-ftp/vsftpd/vsftpd-2.3.2-r1.ebuild
deleted file mode 100644
index 38e8d35beeb7..000000000000
--- a/net-ftp/vsftpd/vsftpd-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,110 +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/vsftpd/vsftpd-2.3.2-r1.ebuild,v 1.8 2012/05/13 10:57:37 swift Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
-HOMEPAGE="http://vsftpd.beasts.org/"
-SRC_URI="ftp://vsftpd.beasts.org/users/cevans/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="caps pam tcpd ssl selinux xinetd"
-
-DEPEND="caps? ( >=sys-libs/libcap-2 )
-	pam? ( virtual/pam )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? ( >=dev-libs/openssl-0.9.7d )"
-RDEPEND="${DEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )
-	xinetd? ( sys-apps/xinetd )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# as-needed patch. Bug #335977
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-
-	# kerberos patch. bug #335980
-	epatch "${FILESDIR}/${P}-kerberos.patch"
-
-	# Patch the source, config and the manpage to use /etc/vsftpd/
-	epatch "${FILESDIR}/${PN}-2.2.0-gentoo.patch"
-
-	# Fix building without the libcap
-	epatch "${FILESDIR}/${PN}-2.1.0-caps.patch"
-
-	# Configure vsftpd build defaults
-	use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
-	use ssl && echo "#define VSF_BUILD_SSL" >> builddefs.h
-	use pam || echo "#undef VSF_BUILD_PAM" >> builddefs.h
-
-	# Ensure that we don't link against libcap unless asked
-	if ! use caps ; then
-		sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c
-		epatch "${FILESDIR}"/${PN}-2.2.0-dont-link-caps.patch
-	fi
-
-	# Let portage control stripping
-	sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	into /usr
-	doman vsftpd.conf.5 vsftpd.8 || die "doman failed"
-	dosbin vsftpd || die "disbin failed"
-
-	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
-		README README.security REWARD SIZE \
-		SPEED TODO TUNING || die "dodoc failed"
-	newdoc vsftpd.conf vsftpd.conf.example || die "newdoc failed"
-
-	docinto security
-	dodoc SECURITY/* || die "dodoc failed"
-
-	insinto "/usr/share/doc/${PF}/examples"
-	doins -r EXAMPLE/* || die "doins faileD"
-
-	insinto /etc/vsftpd
-	newins vsftpd.conf vsftpd.conf.example || die "newins failed"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/vsftpd.logrotate" vsftpd || die "newins failed"
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/vsftpd.xinetd" vsftpd || die "newins failed"
-	fi
-
-	newinitd "${FILESDIR}/vsftpd.init" vsftpd || die "newinitd failed"
-
-	keepdir /usr/share/vsftpd/empty
-}
-
-pkg_preinst() {
-	# If we use xinetd, then we set listen=NO
-	# so that our default config works under xinetd - fixes #78347
-	if use xinetd ; then
-		sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/vsftpd/vsftpd.conf.example
-	fi
-}
-
-pkg_postinst() {
-	einfo "vsftpd init script can now be multiplexed."
-	einfo "The default init script forces /etc/vsftpd/vsftpd.conf to exist."
-	einfo "If you symlink the init script to another one, say vsftpd.foo"
-	einfo "then that uses /etc/vsftpd/foo.conf instead."
-	einfo
-	einfo "Example:"
-	einfo "   cd /etc/init.d"
-	einfo "   ln -s vsftpd vsftpd.foo"
-	einfo "You can now treat vsftpd.foo like any other service"
-}
diff --git a/net-ftp/vsftpd/vsftpd-2.3.2.ebuild b/net-ftp/vsftpd/vsftpd-2.3.2.ebuild
deleted file mode 100644
index 76a040af9d7e..000000000000
--- a/net-ftp/vsftpd/vsftpd-2.3.2.ebuild
+++ /dev/null
@@ -1,104 +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/vsftpd/vsftpd-2.3.2.ebuild,v 1.2 2012/05/13 10:57:37 swift Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
-HOMEPAGE="http://vsftpd.beasts.org/"
-SRC_URI="ftp://vsftpd.beasts.org/users/cevans/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="caps pam tcpd ssl selinux xinetd"
-
-DEPEND="caps? ( >=sys-libs/libcap-2 )
-	pam? ( virtual/pam )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? ( >=dev-libs/openssl-0.9.7d )"
-RDEPEND="${DEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )
-	xinetd? ( sys-apps/xinetd )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Patch the source, config and the manpage to use /etc/vsftpd/
-	epatch "${FILESDIR}/${PN}-2.2.0-gentoo.patch"
-
-	# Fix building without the libcap
-	epatch "${FILESDIR}/${PN}-2.1.0-caps.patch"
-
-	# Configure vsftpd build defaults
-	use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
-	use ssl && echo "#define VSF_BUILD_SSL" >> builddefs.h
-	use pam || echo "#undef VSF_BUILD_PAM" >> builddefs.h
-
-	# Ensure that we don't link against libcap unless asked
-	if ! use caps ; then
-		sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c
-		epatch "${FILESDIR}"/${PN}-2.2.0-dont-link-caps.patch
-	fi
-
-	# Let portage control stripping
-	sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	into /usr
-	doman vsftpd.conf.5 vsftpd.8 || die "doman failed"
-	dosbin vsftpd || die "disbin failed"
-
-	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
-		README README.security REWARD SIZE \
-		SPEED TODO TUNING || die "dodoc failed"
-	newdoc vsftpd.conf vsftpd.conf.example || die "newdoc failed"
-
-	docinto security
-	dodoc SECURITY/* || die "dodoc failed"
-
-	insinto "/usr/share/doc/${PF}/examples"
-	doins -r EXAMPLE/* || die "doins faileD"
-
-	insinto /etc/vsftpd
-	newins vsftpd.conf vsftpd.conf.example || die "newins failed"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/vsftpd.logrotate" vsftpd || die "newins failed"
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/vsftpd.xinetd" vsftpd || die "newins failed"
-	fi
-
-	newinitd "${FILESDIR}/vsftpd.init" vsftpd || die "newinitd failed"
-
-	keepdir /usr/share/vsftpd/empty
-}
-
-pkg_preinst() {
-	# If we use xinetd, then we set listen=NO
-	# so that our default config works under xinetd - fixes #78347
-	if use xinetd ; then
-		sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/vsftpd/vsftpd.conf.example
-	fi
-}
-
-pkg_postinst() {
-	einfo "vsftpd init script can now be multiplexed."
-	einfo "The default init script forces /etc/vsftpd/vsftpd.conf to exist."
-	einfo "If you symlink the init script to another one, say vsftpd.foo"
-	einfo "then that uses /etc/vsftpd/foo.conf instead."
-	einfo
-	einfo "Example:"
-	einfo "   cd /etc/init.d"
-	einfo "   ln -s vsftpd vsftpd.foo"
-	einfo "You can now treat vsftpd.foo like any other service"
-}
diff --git a/net-ftp/vsftpd/vsftpd-2.3.4.ebuild b/net-ftp/vsftpd/vsftpd-2.3.4.ebuild
deleted file mode 100644
index 6a7a2fee437e..000000000000
--- a/net-ftp/vsftpd/vsftpd-2.3.4.ebuild
+++ /dev/null
@@ -1,110 +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/vsftpd/vsftpd-2.3.4.ebuild,v 1.9 2012/05/13 10:57:37 swift Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
-HOMEPAGE="http://vsftpd.beasts.org/"
-SRC_URI="ftp://vsftpd.beasts.org/users/cevans/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="caps pam tcpd ssl selinux xinetd"
-
-DEPEND="caps? ( >=sys-libs/libcap-2 )
-	pam? ( virtual/pam )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? ( >=dev-libs/openssl-0.9.7d )"
-RDEPEND="${DEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )
-	xinetd? ( sys-apps/xinetd )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# as-needed patch. Bug #335977
-	epatch "${FILESDIR}/${PN}-2.3.2-as-needed.patch"
-
-	# kerberos patch. bug #335980
-	epatch "${FILESDIR}/${PN}-2.3.2-kerberos.patch"
-
-	# Patch the source, config and the manpage to use /etc/vsftpd/
-	epatch "${FILESDIR}/${PN}-2.2.0-gentoo.patch"
-
-	# Fix building without the libcap
-	epatch "${FILESDIR}/${PN}-2.1.0-caps.patch"
-
-	# Configure vsftpd build defaults
-	use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
-	use ssl && echo "#define VSF_BUILD_SSL" >> builddefs.h
-	use pam || echo "#undef VSF_BUILD_PAM" >> builddefs.h
-
-	# Ensure that we don't link against libcap unless asked
-	if ! use caps ; then
-		sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c
-		epatch "${FILESDIR}"/${PN}-2.2.0-dont-link-caps.patch
-	fi
-
-	# Let portage control stripping
-	sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	into /usr
-	doman vsftpd.conf.5 vsftpd.8 || die "doman failed"
-	dosbin vsftpd || die "disbin failed"
-
-	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
-		README README.security REWARD SIZE \
-		SPEED TODO TUNING || die "dodoc failed"
-	newdoc vsftpd.conf vsftpd.conf.example || die "newdoc failed"
-
-	docinto security
-	dodoc SECURITY/* || die "dodoc failed"
-
-	insinto "/usr/share/doc/${PF}/examples"
-	doins -r EXAMPLE/* || die "doins faileD"
-
-	insinto /etc/vsftpd
-	newins vsftpd.conf vsftpd.conf.example || die "newins failed"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/vsftpd.logrotate" vsftpd || die "newins failed"
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/vsftpd.xinetd" vsftpd || die "newins failed"
-	fi
-
-	newinitd "${FILESDIR}/vsftpd.init" vsftpd || die "newinitd failed"
-
-	keepdir /usr/share/vsftpd/empty
-}
-
-pkg_preinst() {
-	# If we use xinetd, then we set listen=NO
-	# so that our default config works under xinetd - fixes #78347
-	if use xinetd ; then
-		sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/vsftpd/vsftpd.conf.example
-	fi
-}
-
-pkg_postinst() {
-	einfo "vsftpd init script can now be multiplexed."
-	einfo "The default init script forces /etc/vsftpd/vsftpd.conf to exist."
-	einfo "If you symlink the init script to another one, say vsftpd.foo"
-	einfo "then that uses /etc/vsftpd/foo.conf instead."
-	einfo
-	einfo "Example:"
-	einfo "   cd /etc/init.d"
-	einfo "   ln -s vsftpd vsftpd.foo"
-	einfo "You can now treat vsftpd.foo like any other service"
-}
diff --git a/net-ftp/vsftpd/vsftpd-2.3.5.ebuild b/net-ftp/vsftpd/vsftpd-2.3.5.ebuild
index 496d236f4e1b..2e93fa055009 100644
--- a/net-ftp/vsftpd/vsftpd-2.3.5.ebuild
+++ b/net-ftp/vsftpd/vsftpd-2.3.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.3.5.ebuild,v 1.9 2012/05/28 14:50:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.3.5.ebuild,v 1.10 2013/04/27 09:45:08 hwoarang Exp $
 
 EAPI="4"
 
@@ -89,6 +89,9 @@ src_install() {
 	newinitd "${FILESDIR}/${PN}.init" ${PN}
 
 	keepdir /usr/share/${PN}/empty
+
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/vsftpd-checkconfig.sh"
 }
 
 pkg_preinst() {
diff --git a/net-ftp/vsftpd/vsftpd-3.0.0.ebuild b/net-ftp/vsftpd/vsftpd-3.0.0.ebuild
deleted file mode 100644
index 9ccbd279b522..000000000000
--- a/net-ftp/vsftpd/vsftpd-3.0.0.ebuild
+++ /dev/null
@@ -1,112 +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/vsftpd/vsftpd-3.0.0.ebuild,v 1.2 2012/05/13 10:57:37 swift Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
-HOMEPAGE="http://vsftpd.beasts.org/"
-SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="caps pam tcpd ssl selinux xinetd"
-
-DEPEND="caps? ( >=sys-libs/libcap-2 )
-	pam? ( virtual/pam )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? ( >=dev-libs/openssl-0.9.7d )"
-RDEPEND="${DEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )
-	xinetd? ( sys-apps/xinetd )"
-
-src_prepare() {
-
-	# kerberos patch. bug #335980
-	epatch "${FILESDIR}/${PN}-2.3.2-kerberos.patch"
-
-	# Patch the source, config and the manpage to use /etc/vsftpd/
-	epatch "${FILESDIR}/${PN}-2.3.5-gentoo.patch"
-
-	# Fix building without the libcap
-	epatch "${FILESDIR}/${PN}-2.1.0-caps.patch"
-
-	# Configure vsftpd build defaults
-	use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
-	use ssl && echo "#define VSF_BUILD_SSL" >> builddefs.h
-	use pam || echo "#undef VSF_BUILD_PAM" >> builddefs.h
-
-	# Ensure that we don't link against libcap unless asked
-	if ! use caps ; then
-		sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c || die
-		epatch "${FILESDIR}"/${PN}-2.2.0-dont-link-caps.patch
-	fi
-
-	# Let portage control stripping
-	sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile || die
-
-	#Bug #335977
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-}
-
-src_compile() {
-	CFLAGS="${CFLAGS}" \
-	CC="$(tc-getCC)" \
-	emake
-}
-
-src_install() {
-	into /usr
-	doman ${PN}.conf.5 ${PN}.8
-	dosbin ${PN} || die "disbin failed"
-
-	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
-		README README.security REWARD SIZE \
-		SPEED TODO TUNING || die "dodoc failed"
-	newdoc ${PN}.conf ${PN}.conf.example
-
-	docinto security
-	dodoc SECURITY/* || die "dodoc failed"
-
-	insinto "/usr/share/doc/${PF}/examples"
-	doins -r EXAMPLE/* || die "doins faileD"
-
-	insinto /etc/${PN}
-	newins ${PN}.conf{,.example}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/${PN}.xinetd" ${PN}
-	fi
-
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-
-	keepdir /usr/share/${PN}/empty
-}
-
-pkg_preinst() {
-	# If we use xinetd, then we set listen=NO
-	# so that our default config works under xinetd - fixes #78347
-	if use xinetd ; then
-		sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/${PN}/${PN}.conf.example
-	fi
-}
-
-pkg_postinst() {
-	einfo "vsftpd init script can now be multiplexed."
-	einfo "The default init script forces /etc/vsftpd/vsftpd.conf to exist."
-	einfo "If you symlink the init script to another one, say vsftpd.foo"
-	einfo "then that uses /etc/vsftpd/foo.conf instead."
-	einfo
-	einfo "Example:"
-	einfo "   cd /etc/init.d"
-	einfo "   ln -s vsftpd vsftpd.foo"
-	einfo "You can now treat vsftpd.foo like any other service"
-}
diff --git a/net-ftp/vsftpd/vsftpd-3.0.2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.2.ebuild
index 114070947ebe..dbc9a300eaea 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.2.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-3.0.2.ebuild,v 1.9 2013/01/01 18:52:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-3.0.2.ebuild,v 1.10 2013/04/27 09:45:08 hwoarang Exp $
 
 EAPI="4"
 
@@ -92,6 +92,9 @@ src_install() {
 	newinitd "${FILESDIR}/${PN}.init" ${PN}
 
 	keepdir /usr/share/${PN}/empty
+
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/vsftpd-checkconfig.sh"
 }
 
 pkg_preinst() {