Remove older vulnerable versions, bug #328409

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

6 files changed, 20 insertions, 400 deletions

diff --git a/net-misc/dropbear/ChangeLog b/net-misc/dropbear/ChangeLog
index 11413a602552..c90786e2b353 100644
--- a/net-misc/dropbear/ChangeLog
+++ b/net-misc/dropbear/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/dropbear
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.100 2013/04/18 16:50:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.101 2013/09/25 18:14:40 blueness Exp $
+
+  25 Sep 2013; Anthony G. Basile <blueness@gentoo.org> -dropbear-0.52-r1.ebuild,
+  -dropbear-0.52.ebuild, -dropbear-0.53.1.ebuild, -dropbear-2011.54.ebuild:
+  Remove older vulnerable versions, bug #328409
 
 *dropbear-2013.58 (18 Apr 2013)
 
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 3ddf9f006996..00a572865b9d 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -5,37 +5,30 @@ AUX dropbear-0.46-dbscp.patch 500 SHA256 b133670f2417a112e06ae0e4ec7fe50eeb76015
 AUX dropbear-0.53.1-link.patch 1580 SHA256 91878164e0ff1998f4d2043e7b9a918536690579b67ef30a59543cc4d5f9a18f SHA512 ccfdd6d778ed3908af62ca8c7e7b2c7a55e9cd882940073d71bce24d9b4f01a607709f2dbacc988d3dae40754e25ba1b820805ccfaa60402e38e8f3862726591 WHIRLPOOL 2105f96c6cd6d0d4f1f3ad8dd3c40c3fd159884c9036dc575abe1acd04086ec3ad18406b7d55f1f72752bc67744b85d1fb7c25209ac957f89dd8b6ba8de8096d
 AUX dropbear.conf.d 190 SHA256 e891255a49d408eb11514662faa4d724a1df27cc2ee90268507dbd2573b67334 SHA512 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f WHIRLPOOL 91db627754119bec23cb22b047741699f732a8f23fef84d35cacc1977dc738e16631f936c36ee9f86dafe0a30962c9583dad44b36b798961668875451106b18b
 AUX dropbear.init.d 913 SHA256 b115e922fa679adca29e24464dd7ffb1a21a0962333d7822a11e0bcea29ea5ed SHA512 82ab77fae3a475afd4b4d1840cb6af8ae5c72f38ef49637bc6822a11e90c7c6c0d8105fb09243ac3a1a75346e8efdd8659fa08228f44e94e998abb7d052c5f7f WHIRLPOOL bbb7dffb37df1051cb8d34b11b4dfdb0b75b31d7d43e5d9e4d4f1c7ed0eb924595fc10f3cc1a26aa41e8fa891ac5485415c66129917d6acca6b3e7963474dd19
-DIST dropbear-0.52.tar.bz2 1601843 SHA256 8c7b727a4c9066e90a14f7f01c47cab698afb5a854ffa0404da162d4286f04c1 SHA512 c32fd82a7e5f4268dbdbfe5a266969e5a63164d07440eaaf8af672669404bd5975f549371cb0bb1cb9368f3807776c2c93ad3fbcb63355ba29abcb4eace83ce3 WHIRLPOOL aa2764f47e748c3d70fdf60db29f9b78d9d580cdf6347e4f9a6d6dcd9531cf4819c22605daea4c521fbc011a2efae301f2e750bb4ce9d9b9e415f42635f77c28
-DIST dropbear-0.53.1.tar.bz2 1577227 SHA256 e24d3cbecd3bc850b2b336b8eb50c845a285ceef8e22544938a582e163d36393 SHA512 edcebdef1f4f099abb75a5893730bed63f7ae7b11cf339f397148b1093e13872c6bcc543a8fda3ef240b38e5b65fc4219538e29e7cb0c658890c87e8b0b1626d WHIRLPOOL d73e22f8ad2701be2b009e895fadda40edc3ab512bb2ca8fe4c0358a6c9a65adce05d79ec24fb5c786921ed0cc6601ee073c806fc871de949973753ddf548879
-DIST dropbear-2011.54.tar.bz2 1580502 SHA256 5aa4021ac9bac4092c2bd9d41d67143429b3cf791ddc8b590841e1765d8daf3a SHA512 61202153127c7341628396bc759d1e5edf8426e27d5d9aaf99c55b726f5bf60766737d9b347845e551b6f7258ed194ec2384d28341f25435103ea900f544cdf2 WHIRLPOOL 03ebc947ed790116e6abba4fbc39fb91cd60f74d1562960d92bae8f93113716c2691d016deed7f564698464c55c2813183955a71db3bb90db09b47cf16b3ebdd
 DIST dropbear-2012.55.tar.bz2 1581421 SHA256 04982af2a10b220fa940f9f72f276d612c9bb643cfbb5ee1416e5a0f00de9b0f SHA512 34d4b15fc6d46508b5b93a3bf63e4de9de7a72fa3da56fba4815bacbd2df9e683b3f710d71baee492dfb6d3cfb2c6a454f39e3b752649e1024cd160f96fad0a9 WHIRLPOOL 21fed6d08fb92b52e2e520e3f1efde3308594e8de9d73b801230e73e239356053cd3bc811cab8b2a9eb245070fd52e9769d19d1ba3c3cd5c62ce4a517cddbc32
 DIST dropbear-2013.56.tar.bz2 1578454 SHA256 bd01d5759948d78dfac7a929f11119f1174c03e1a09fa7fd197f9e9649f27251 SHA512 dd6ef30a21564b9532a6a9845dedcdab8af759a3272cfffb7856f41adc46f5e168ace4c0f448ed6e1ee0ec3628941cf4de2a244a737a341bf359cc7e4ecd2a97 WHIRLPOOL 3357d6fb77c7d735560d804ddb470d3907882cccc4cb3aed8f626669375aa8c6d6538a56599ce8667c9d25801413bb2b6ee290f4bdf3d2d2f58aec85766cf75a
 DIST dropbear-2013.57.tar.bz2 1580725 SHA256 7797c4b4074e1d53766e7329b172289873b49f2bd4be3412980f29647505ab13 SHA512 d37c36e32f5430c84b9f4c55d53bb72936a96674c87d327a87e764f2e97692d499a46a33def791ebb0e122cfed9a64534c49206e994c6ce7ad24234d98ae7b4e WHIRLPOOL 7c8232475bbd5316e315f91f2ae57fecaeca59939c8ffbbffa62c333a150b29edf541d54be0d49c9251a6d4d01be611ae92dc608852de1774bc6dfeed63a8397
 DIST dropbear-2013.58.tar.bz2 1580584 SHA256 d866189b1d14e15353aeb4feb616f6132a63ea7c25ca8aa12b63a3a397822e55 SHA512 8b1c46d41642e0cf75e9e290695416c4577ef6ef740c2b28cf67df29f0f72a096e8a38ff67db307b4235cc2735d98a2a563c38539acbfaa60e73a41b9a1bae7f WHIRLPOOL 7a834d6f42337ab5412bc63df7ce1983e2c090c2f89374ec534313c81780f099a9056ff69b3c09d669f4a950a5dacbaa111cf67454868ca861504098e150efc2
-EBUILD dropbear-0.52-r1.ebuild 2670 SHA256 1d785741a254a67a5788cc06eff463a52743c9a6c2f85d53d0cac62462a75594 SHA512 c3228a035b766c5e4cabf66a88e582b3c6fc5580ded1c6dd4a83982066a801a335e6c23a59520e1176069cb17ef7b3d475b75fb21cba9df410438a4c5c709ac0 WHIRLPOOL abd123227943fe7f5e2658294e4e199a9c93c6478b5218f3d404fa902769db628bf1fb2ee1f2b98d920e90e1a938e1626f0a0d3d32667758a31754ffa91e0d2b
-EBUILD dropbear-0.52.ebuild 2656 SHA256 3b9300dd2963f18cd6369ccea62397f1d3aa3284d1bd01d15542174e7a9d1fa8 SHA512 628b43a89834eeca9b36e3b5a8dc22f65eda02a62e7cc8c6717a3854ecb94cf22cb92a5e41570b1e92d598c7746e766238c8964675ad25bc1d65ab7df0d2987c WHIRLPOOL 37752ded7fb75dc15ab371aa74fd7fcd5ca24f4c4ad4a91d5c67369321527dd943364df90db277c67cfb85fe7fe64e6e643671a5bbe56e5c945aae775414c01a
-EBUILD dropbear-0.53.1.ebuild 2715 SHA256 51b10644328995c9cd6e39607c3d123d09b468aa87dbf8c9b6c9a3fed3ecedcf SHA512 6699a7935d221315f4df0709d69827a8ed394b90b89969f5c63aa2f39c1e0dc312553b665b8f913ff580cb02b27be68a23908f98b86a4c28e7b3f31c9b8f42c0 WHIRLPOOL f28a87b97f69f86fdfe917a5e7e398b2ad1240059b6c7dd12c4d42bfd53a4dc070dad88c7cd4f05496e0324759faa6baf87d51b0b0394f74106c59a293f7326e
-EBUILD dropbear-2011.54.ebuild 2369 SHA256 8ec48573a1e65d93218487ead2a799df23735ea96649b99d20583af956efaf3c SHA512 4ed4fa9119d2e0e26ca1f7b2075883c8f044e2bafeccba43bfe2a4ef4b16858b251f60d49ccbe59db45ab3dc97bd1df1a2c1c93222c45631b329d1e2b6d075bf WHIRLPOOL bd30b2a4bff9ae8bdf8587ce07c98074685c4769a14b6e1fc0f7306b43d4ae8223cfbff7d9b833808e3626c860ebfffd7162fe90872f09b7b93a91178a4d4887
 EBUILD dropbear-2012.55.ebuild 2480 SHA256 f93efb713ca63cd5fd4f52f6357f89b5e434cec02b456b0ac939044b7ea722ff SHA512 a9c4cef174270af12901638492c598ce61fd8c09d22afe6f821d1f470a4423a8efc7e217be8e393e93d38ca55d5ba11e35b56a8b2ddb658361002ba16a280f1d WHIRLPOOL bdf6451ee8d93fff3a9e5382f8de3bdfe7726e68ce276020f94f93401e6f51a0f780dd4cc014561a9ed35f08c53f459d81006a21a49ad8adbfcc691d1a8954cf
 EBUILD dropbear-2013.56.ebuild 2602 SHA256 78289eef2c93f923aabe512b2e73a157f1a444596c0fa887bfac7f829997b836 SHA512 4f6601164d1830be79365a1269d2011bb68992a2467a7db8830e4dc42b08f81c1fcf271e6e8855721af35a43fdb9fb5b2e0946deb5213eb956da53ab32240ddb WHIRLPOOL 57ee552db76da17d6d53967155553f7e5a8c019dd8524e52b8525da2452d58bf0303e34f02d38d7b5710469991086b12ac6bed6eca7449168f9754cbdf62c2dd
 EBUILD dropbear-2013.57.ebuild 2602 SHA256 c884d4de20368d351e359c90c5c0165fb01fdd27f941a290a73dfb5da36723e5 SHA512 598e3f40d5d5bd111887e4e0bc6aabfcebd0f39aa5e7d4258a6b3b4fd6051ca3a7902c429f6502f66c3c7f7cdf364df47a143691872309aada9e54cdc88d0845 WHIRLPOOL 22378a6c4f4792b8b9725f8d9dae2da29ee0063fc2dc3120cb4547415855b43fbf7b986eb9b6e52e74196b4e95b4ffa5b25af56d6006d11e46c7ace452bd61b1
 EBUILD dropbear-2013.58.ebuild 2602 SHA256 2baa5d0bbe273cc88fa8732703bdd751d055d98e596a78b5782473c46708e3c2 SHA512 3b16f23945f3b491def8b23fd06a25dc67f604b634c6d3a86c62a0334f0f220e0c6deaa2cced243aab6e38c43140cc032a93e81e6027ce79881a842ce83ac02d WHIRLPOOL c0d200a0d4167b940af7e3e785459ce41cf6de29fe35da95b48e8e5049a52121c3bb58a43088301e0bd6951e81bc3e5a6d232ac9c445d9ccfa44ada9dfaa2a26
-MISC ChangeLog 12791 SHA256 20056457af13cf1a76c3dd5ba6b61e1a37f069f8cf4d7e999e2bb0b77e4c6dff SHA512 ee644a2e01613d6df24bce74eb7057881a43524dfe7cd6a750fb22b55dc6127bccf487b3caacd778de221abd27e109812298b1cd68f9bda519a9de4613b3b660 WHIRLPOOL cc437624d8944cdc64201d73f85cc500346256cb6c0d6fdfe40a83ee5ac48af44bc45249566e86e2b5ef75cfc48c06889b2613bb7cb9b6b2ab1706bf34ebc855
+MISC ChangeLog 12999 SHA256 ac8e5b78aac7043c759b0651c4193f87fa5a96b4c90958319bc780ff4a636dc9 SHA512 7f08bb369f518f2e69191e0852362ae87f18a4526283fce47c6b6e798e321f2dc77614a6fa4916299a7f210f5e89d6c196684fba048eb9786b80a97562ada3f9 WHIRLPOOL 1c5f8a2aea4f84c84741b451e35c7127f85e02613cfa6d682d87a2145dacff12df9d6bfdc068ce4944f28ac7fd4602549bae54ac86bfd29cc4ed710fd52eadaf
 MISC metadata.xml 1597 SHA256 7004c16f947868bd973e18b32dbae55c891a4714d454ec2ef5e835ddf5e1539b SHA512 9abf8e6dc46448060a76acbca75f90d513c4150b016356eb5bf482814ebcf16bb37a61163f363a61e9fab888d4919c20224f8bb9b2d7764a22515802a17b7260 WHIRLPOOL 9f634eb93008b74dfdf885faff5c05f53c970a1105298acc9f2c5107d321b1a74706a4e42b847d2ba8ea6e84e9b928c598c1380cac613afc0bf806194c7e494f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRcCTeAAoJELEHsLL7fEFWvdIQAJYg6jalNDAO0H5z9OjAXwcy
-5hHp8jDPXgxK03FuQJWW/KBsPmXRUyvFnSDZsXZhLd0zjS2tsVSV7AcNOPdXpf1Y
-iKIaMjYvGsf4SoGe7A9IfQE3Eeu2qgmPZ9J0ni8gBoNMmCQyAzBtMR2gmNjvcWeW
-guEBLbaPrx5Z9x1xYQlJPL2+eDQfS0NiN7To/gEaYqtnAquR1WWGQ7lyxScjUqAu
-6Em6MRZr2kmg2uFglwqlGBooYGt3BznQiKjrrtPRqNal9aLIGldXJIevPQRVTK+3
-oupVJ6G1BtnJVD9fJ1DXlqR/BvLNm0MVUuNHgGOuIio43cKjzT/751Cu+q9pEe67
-V1hs8Hw8wGh8gkXw3UeRSsB5Up6dRXy/BkGOgE9ktqJ8vrA5fyWLLYJDc11tyYwd
-kq4iut/MHzwZezsyz6si+B7oLaNAs2eIaXaBfS6r1BJxJP1N2mqyhz1RdyXS3TQz
-GMl54ZfAazN3du4ddYO6L2GU8uhiL7yAEiPadbOK+3A8HG4cbEPZSgnowknhgPFl
-p6yzV/u0EGIZWQ1hvibaWPLY4TYZvwmRtK+w+Z9y9WsnIUhb1S/OmtiXBtKMZ7p2
-P9/dKlGTyIIlQerzn1Z6s0h894ZjDHenm14IFxD+HVTlurRNvvvsDYoDVCyEQ398
-9VVvBRq5/MNjALnSlIgh
-=PH66
+iQIcBAEBCAAGBQJSQyhRAAoJEJOE+m71LUu6ixYQAKZ03SVU7j229u5oEdGYyDCh
+Ur/jMvvRRAslFgLtWOu6C8hzfxzGq7E1Vq5OGlFtCpaf2qZO8Jaug8sPa3PNit3U
+jWLnnyO+aSQLRrEGeN7ICf7jEAXwP8GPNI4udIypweAZZkx7MPa0QBDQ2yyoh9wJ
+My7jGTQq9SX4ENo2gc0t7hyUP1ZpInMiwN2ZW/lL7W3/2pakLqS+NbZ/ErdVierU
+jLpz7luSulSRryR+qSJB5vt1hNeN496OI9sbHnPoZjwQ3U4qUkRjZAIWcRgLjhwO
+nj78igDZRshed2/gu+A9elJRpFd/EnXq9wqs7fZqYUHQHnN4401EwFJdYA1Af4bQ
+X63fKtxr+7pYSrMJbeQCL9563PvznSv33Fhf8OhlZfGcJo2qmT3ipfCo5hBdaLMu
+pDP8E12m1ifyiihPOMCLn68fxUMBIhjrbtDGm80+1hR/rMrv6y8PVYKRI3hrQgM6
+A53IHQGbbNffK/BqnTjjD6AV/ezPBZlTE3xSq5fNSD52K/eh2KLN0y7S2ZR1TbVt
+JQitU7R7PMbSnDEhdtCT4TKN8At/MPg4sNyrsdkIxT7A/JhFsZvGuIwFr8JoiqF+
+ZIkCsi1GdQ/kwWiZGGbnPv1RFJ3rSC1pZxtkOWfz5EO/VtWmUFBqu5QgK3UEgaYP
+FLMGH9hsvMRthExde/Oj
+=lOgF
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dropbear/dropbear-0.52-r1.ebuild b/net-misc/dropbear/dropbear-0.52-r1.ebuild
deleted file mode 100644
index 32a719df2f27..000000000000
--- a/net-misc/dropbear/dropbear-0.52-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.52-r1.ebuild,v 1.3 2012/08/12 03:56:20 vapier Exp $
-
-inherit eutils savedconfig pam user
-
-DESCRIPTION="small SSH 2 client/server designed for small memory environments"
-HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html"
-SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
-	http://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="bsdpty minimal multicall pam static syslog zlib"
-
-DEPEND="zlib? ( sys-libs/zlib )
-	pam? ( virtual/pam )"
-RDEPEND="${DEPEND}
-	pam? ( >=sys-auth/pambase-20080219.1 )"
-
-set_options() {
-	use minimal \
-		&& progs="dropbear dbclient dropbearkey" \
-		|| progs="dropbear dbclient dropbearkey dropbearconvert scp"
-	use multicall && makeopts="${makeopts} MULTI=1"
-	use static && makeopts="${makeopts} STATIC=1"
-}
-
-pkg_setup() {
-	if use pam && use static ; then
-		die "USE='pam static' makes no sense ... pick one"
-	fi
-
-	enewgroup sshd 22
-	enewuser sshd 22 -1 /var/empty sshd
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/dropbear-0.46-dbscp.patch
-	sed -i \
-		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
-		-e '/XAUTH_COMMAND/s:/X11R6/:/:' \
-		options.h
-	sed -i \
-		-e '/pam_start/s:sshd:dropbear:' \
-		svr-authpam.c || die
-	restore_config options.h
-}
-
-src_compile() {
-	if use static && use pam ; then
-		ewarn "You cannot have USE='static pam'.  Assuming static is more important."
-	fi
-	econf \
-		$(use_enable zlib) \
-		$(use_enable pam) \
-		$(use_enable !bsdpty openpty) \
-		$(use_enable syslog) \
-		|| die
-	set_options
-	emake ${makeopts} PROGRAMS="${progs}" || die "make ${makeopts} failed"
-}
-
-src_install() {
-	set_options
-	emake install DESTDIR="${D}" ${makeopts} PROGRAMS="${progs}" || die "make install failed"
-	doman *.8
-	newinitd "${FILESDIR}"/dropbear.init.d dropbear || die
-	newconfd "${FILESDIR}"/dropbear.conf.d dropbear || die
-	dodoc CHANGES README TODO SMALL MULTI
-
-	# The multi install target does not install the links
-	if use multicall ; then
-		cd "${D}"/usr/bin
-		local x
-		for x in ${progs} ; do
-			ln -s dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
-		done
-		rm -f dropbear
-		dodir /usr/sbin
-		dosym ../bin/dropbearmulti /usr/sbin/dropbear
-		cd "${S}"
-	fi
-	save_config options.h
-
-	if ! use minimal ; then
-		mv "${D}"/usr/bin/{,db}scp || die
-	fi
-
-	pamd_mimic system-remote-login dropbear auth account password session \
-		|| die "unable to mimic system-remote-login pamd file."
-}
diff --git a/net-misc/dropbear/dropbear-0.52.ebuild b/net-misc/dropbear/dropbear-0.52.ebuild
deleted file mode 100644
index 9403eb72ce04..000000000000
--- a/net-misc/dropbear/dropbear-0.52.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.52.ebuild,v 1.12 2012/08/12 03:56:20 vapier Exp $
-
-inherit eutils savedconfig pam user
-
-DESCRIPTION="small SSH 2 client/server designed for small memory environments"
-HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html"
-SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
-	http://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="bsdpty minimal multicall pam static syslog zlib"
-
-DEPEND="zlib? ( sys-libs/zlib )
-	pam? ( virtual/pam )"
-RDEPEND="${DEPEND}
-	pam? ( >=sys-auth/pambase-20080219.1 )"
-
-set_options() {
-	use minimal \
-		&& progs="dropbear dbclient dropbearkey" \
-		|| progs="dropbear dbclient dropbearkey dropbearconvert scp"
-	use multicall && makeopts="${makeopts} MULTI=1"
-	use static && makeopts="${makeopts} STATIC=1"
-}
-
-pkg_setup() {
-	if use pam && use static ; then
-		die "USE='pam static' makes no sense ... pick one"
-	fi
-
-	enewgroup sshd 22
-	enewuser sshd 22 -1 /var/empty sshd
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/dropbear-0.46-dbscp.patch
-	sed -i \
-		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
-		-e '/XAUTH_COMMAND/s:/X11R6/:/:' \
-		options.h
-	sed -i \
-		-e '/pam_start/s:sshd:dropbear:' \
-		svr-authpam.c || die
-	restore_config options.h
-}
-
-src_compile() {
-	if use static && use pam ; then
-		ewarn "You cannot have USE='static pam'.  Assuming static is more important."
-	fi
-	econf \
-		$(use_enable zlib) \
-		$(use_enable pam) \
-		$(use_enable !bsdpty openpty) \
-		$(use_enable syslog) \
-		|| die
-	set_options
-	emake ${makeopts} PROGRAMS="${progs}" || die "make ${makeopts} failed"
-}
-
-src_install() {
-	set_options
-	emake install DESTDIR="${D}" ${makeopts} PROGRAMS="${progs}" || die "make install failed"
-	doman *.8
-	newinitd "${FILESDIR}"/dropbear.init.d dropbear || die
-	newconfd "${FILESDIR}"/dropbear.conf.d dropbear || die
-	dodoc CHANGES README TODO SMALL MULTI
-
-	# The multi install target does not install the links
-	if use multicall ; then
-		cd "${D}"/usr/bin
-		local x
-		for x in ${progs} ; do
-			ln -s dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
-		done
-		rm -f dropbear
-		dodir /usr/sbin
-		dosym ../bin/dropbearmulti /usr/sbin/dropbear
-		cd "${S}"
-	fi
-	save_config options.h
-
-	if ! use minimal ; then
-		mv "${D}"/usr/bin/{,db}scp || die
-	fi
-
-	pamd_mimic system-remote-login dropbear auth account password session \
-		|| die "unable to mimic system-remote-login pamd file."
-}
diff --git a/net-misc/dropbear/dropbear-0.53.1.ebuild b/net-misc/dropbear/dropbear-0.53.1.ebuild
deleted file mode 100644
index 9c103009a281..000000000000
--- a/net-misc/dropbear/dropbear-0.53.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.53.1.ebuild,v 1.4 2012/08/12 03:56:20 vapier Exp $
-
-inherit eutils savedconfig pam user
-
-DESCRIPTION="small SSH 2 client/server designed for small memory environments"
-HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html"
-SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
-	http://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="bsdpty minimal multicall pam static syslog zlib"
-
-DEPEND="zlib? ( sys-libs/zlib )
-	pam? ( virtual/pam )"
-RDEPEND="${DEPEND}
-	pam? ( >=sys-auth/pambase-20080219.1 )"
-
-set_options() {
-	use minimal \
-		&& progs="dropbear dbclient dropbearkey" \
-		|| progs="dropbear dbclient dropbearkey dropbearconvert scp"
-	use multicall && makeopts="${makeopts} MULTI=1"
-	use static && makeopts="${makeopts} STATIC=1"
-}
-
-pkg_setup() {
-	if use pam && use static ; then
-		die "USE='pam static' makes no sense ... pick one"
-	fi
-
-	enewgroup sshd 22
-	enewuser sshd 22 -1 /var/empty sshd
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/dropbear-0.46-dbscp.patch
-	epatch "${FILESDIR}"/${P}-link.patch #357249
-	sed -i \
-		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
-		-e '/XAUTH_COMMAND/s:/X11R6/:/:' \
-		options.h
-	sed -i \
-		-e '/pam_start/s:sshd:dropbear:' \
-		svr-authpam.c || die
-	restore_config options.h
-}
-
-src_compile() {
-	if use static && use pam ; then
-		ewarn "You cannot have USE='static pam'.  Assuming static is more important."
-	fi
-	econf \
-		$(use_enable zlib) \
-		$(use_enable pam) \
-		$(use_enable !bsdpty openpty) \
-		$(use_enable syslog) \
-		|| die
-	set_options
-	emake ${makeopts} PROGRAMS="${progs}" || die "make ${makeopts} failed"
-}
-
-src_install() {
-	set_options
-	emake install DESTDIR="${D}" ${makeopts} PROGRAMS="${progs}" || die "make install failed"
-	doman *.8
-	newinitd "${FILESDIR}"/dropbear.init.d dropbear || die
-	newconfd "${FILESDIR}"/dropbear.conf.d dropbear || die
-	dodoc CHANGES README TODO SMALL MULTI
-
-	# The multi install target does not install the links
-	if use multicall ; then
-		cd "${D}"/usr/bin
-		local x
-		for x in ${progs} ; do
-			ln -s dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
-		done
-		rm -f dropbear
-		dodir /usr/sbin
-		dosym ../bin/dropbearmulti /usr/sbin/dropbear
-		cd "${S}"
-	fi
-	save_config options.h
-
-	if ! use minimal ; then
-		mv "${D}"/usr/bin/{,db}scp || die
-	fi
-
-	pamd_mimic system-remote-login dropbear auth account password session \
-		|| die "unable to mimic system-remote-login pamd file."
-}
diff --git a/net-misc/dropbear/dropbear-2011.54.ebuild b/net-misc/dropbear/dropbear-2011.54.ebuild
deleted file mode 100644
index a301f9fb1839..000000000000
--- a/net-misc/dropbear/dropbear-2011.54.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-2011.54.ebuild,v 1.3 2012/08/12 03:56:20 vapier Exp $
-
-EAPI="4"
-
-inherit eutils savedconfig pam user
-
-DESCRIPTION="small SSH 2 client/server designed for small memory environments"
-HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html"
-SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
-	http://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="bsdpty minimal multicall pam static syslog zlib"
-
-DEPEND="static? ( zlib? ( sys-libs/zlib[static-libs] ) )
-	pam? ( virtual/pam )"
-RDEPEND="${DEPEND}
-	!static? ( zlib? ( sys-libs/zlib ) )
-	pam? ( >=sys-auth/pambase-20080219.1 )"
-
-REQUIRED_USE="pam? ( !static )"
-
-set_options() {
-	progs="dropbear dbclient dropbearkey"
-	progs+=" $(usex minimal "" "dropbearconvert scp")"
-	use multicall && makeopts+=" MULTI=1"
-	use static && makeopts+=" STATIC=1"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/dropbear-0.46-dbscp.patch
-	sed -i \
-		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
-		-e '/XAUTH_COMMAND/s:/X11R6/:/:' \
-		options.h
-	sed -i \
-		-e '/pam_start/s:sshd:dropbear:' \
-		svr-authpam.c || die
-	restore_config options.h
-}
-
-src_configure() {
-	econf \
-		$(use_enable zlib) \
-		$(use_enable pam) \
-		$(use_enable !bsdpty openpty) \
-		$(use_enable syslog)
-}
-
-src_compile() {
-	set_options
-	emake ${makeopts} PROGRAMS="${progs}"
-}
-
-src_install() {
-	set_options
-	emake install DESTDIR="${D}" ${makeopts} PROGRAMS="${progs}"
-	doman *.8
-	newinitd "${FILESDIR}"/dropbear.init.d dropbear
-	newconfd "${FILESDIR}"/dropbear.conf.d dropbear
-	dodoc CHANGES README TODO SMALL MULTI
-
-	# The multi install target does not install the links
-	if use multicall ; then
-		cd "${D}"/usr/bin
-		local x
-		for x in ${progs} ; do
-			ln -s dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
-		done
-		rm -f dropbear
-		dodir /usr/sbin
-		dosym ../bin/dropbearmulti /usr/sbin/dropbear
-		cd "${S}"
-	fi
-	save_config options.h
-
-	if ! use minimal ; then
-		mv "${D}"/usr/bin/{,db}scp || die
-	fi
-
-	pamd_mimic system-remote-login dropbear auth account password session
-}
-
-pkg_preinst() {
-	enewgroup sshd 22
-	enewuser sshd 22 -1 /var/empty sshd
-}