Remove older insecure versions

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

6 files changed, 19 insertions, 343 deletions

diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog
index a45e48661fa1..cffb76167c92 100644
--- a/net-misc/stunnel/ChangeLog
+++ b/net-misc/stunnel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/stunnel
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.196 2014/12/10 15:02:37 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.197 2014/12/10 15:06:40 blueness Exp $
+
+  10 Dec 2014; Anthony G. Basile <blueness@gentoo.org> -stunnel-5.02.ebuild,
+  -stunnel-5.03.ebuild, -stunnel-5.04.ebuild, -stunnel-5.05.ebuild:
+  Remove older insecure versions
 
 *stunnel-5.08 (10 Dec 2014)
 
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 2c530a2c0067..8be6b6f3fd6b 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -5,34 +5,26 @@ AUX stunnel 1365 SHA256 f5f6007fa87a0465703f7d746514f6ce84199e9c0e37e0f5a6f8c076
 AUX stunnel.conf 1419 SHA256 9ae90e10e9cb99e69183d908e6df3b56660eeefba8651988feaa9ab874a83c88 SHA512 4f76fd92eaf7fe878f7566a29ded673e7054edb8d7efeca8aad8621fdddeed457676d73b896d24466843874bb1b82ad3102cb1de4d24a7ac3597f3bf85d36826 WHIRLPOOL c5622e8c7785b9601126446d8b92419d3b671f001363683203bccbffece3b08b762d0db61f7a9ba7cc7de14114623d0ce415909bb957c824b2e7a8b14db5e3d1
 AUX stunnel.initd 1986 SHA256 4f97093f81b854099851ba32552b36036906933933f7a794c7b1e6aa1c006e3b SHA512 8d764b0687d0d219e30dd489c6f16da20f8bac9d9797d2de937368e03fb18ddfec6c69c6e4bfdafb8bd8e7d751984c34a4351ce2ec1521bf2082fdc5f661f031 WHIRLPOOL 4d1cc28389b8d7b5e2ad16ea7e4b2e8b35ad634e4f8680a6d725389684f44cdc0aff633785d7ada6272c17891869a9b05484717dc296f7a79940ddbc975bec4e
 AUX stunnel.tmpfiles.conf 38 SHA256 68c9c963673a3bf0f3ce3f32751c9e36a3299251da12e9bcae929629657df135 SHA512 8e06ec39547ce5991217e551e563f5d212742afda94da801ec266c632375aae489594d14815fe596319d9881eb5a58e32bf05baa69f3a9d1bae554419f5ac1bb WHIRLPOOL 5e070b27ed14c06efc8e66d23a9098d60cc16c01331824d910786c6fa7697f96b8704dc02af4f4346b4628dd22b8729a11756c7d85596ffcf916f36f9de8ec05
-DIST stunnel-5.02.tar.gz 590655 SHA256 c258b71d7f82bba5b0a4ccc69fbda632f1fefe9108589a92aa1016f33985973e SHA512 2f1c44b06188e3bd347b97544122eb9bc0c2a4227e6c4bab184ddef8a35300c09451d836dbd97de3d9656c69ff4ad8f0573e54cdb738bdd751388bd93d0417a6 WHIRLPOOL 9d974639157a1970fcd60abc9b05f3e0ebbdcf45f229736cbbdf7e72d0bdef405e65cf654c4a7820202258dc0a1d3eb23c46f1a67c9cc0f567f4cbede0d04d33
-DIST stunnel-5.03.tar.gz 590778 SHA256 9a1e369466fa756e6f48b11480a3338c1fa4717e6472871bf4a3a96c483edd03 SHA512 db46df32e51064c2f2c148d6222088a5c9cc9a8b5ad746b1a2d848fef5cb69d7580f52d7357aec872c67c452ff585f60f455360ff0f6748449ce676292bfb4b5 WHIRLPOOL 00a9b4649c2c06ff4b2b5b3cb022fc08d91dd9cd167786acaff8ce0a7e632e6a8d4ef1d82f2f694b241f4e30f9e2fa2e28eac5be2224a48d3667242f23347864
-DIST stunnel-5.04.tar.gz 592939 SHA256 ee9702e073cb8d5940a1310ae171a38d3264f1ce3b087160728bbbcf5710cec1 SHA512 035f220106a1b9ff9c7b97c8dcd16397fd23e18213607d2a3b8502696402862dc2144fa388efbcc036db7c5235f6a89a3444e73efb9f16a793ad6bde175abc3d WHIRLPOOL 2cf9a25fa1cab01f00c43d3aa3a5a7af2bc1ab01aa9d8cd09fe07edcc635b8a2bad6098f9ea8feb43376290194bda7a5410e9f514f1185835f8cd214ec63b884
-DIST stunnel-5.05.tar.gz 596760 SHA256 c7e1653345150db7e48d00e1129cf571c7c85de8e7e1aa70b21cf1d76b1e31ef SHA512 2998c8780624686ac886ea5c19e52d969c7e2036dbef1e97ee00b8fd0fa6d117f22980652209dd798d5c2195d56a07e5b9191cfeccfc83476e207525231a3f4e WHIRLPOOL 0f80348d4bbae7b9065cab9613bb72473a35a531249b6c71331f4b069d196bc4d6a2d26586b4470cf02619f4a6e6912c88e888cf685d843a137bafba0f4ac0f8
 DIST stunnel-5.07.tar.gz 599111 SHA256 505c6c63c4a20fc0cce8c35ef1ab7626c7b01071e3fca4ac6ea417afe8065309 SHA512 267addfc0ebc10509076a92a1614f70a94b0557735616aa8bacc82768132d65d35046df040bf310a3d1146cffc93a84c22d01985ada6b88a2064765687d7a5af WHIRLPOOL d2ec56c3a500e6189beed58663b4d97e6d718a7513133670eaacc001ce6b8ba60e142053f49190caa01bfea28fc8ebc515cec251f2378a5aea4155e41b7e4161
 DIST stunnel-5.08.tar.gz 608365 SHA256 830b21d24cd237e96f4d7993be43553d4eba4d3cfa2660faa78dec8d41d314fc SHA512 8cbcb11aef85cbfa8bdad15deeeaed1af4e4361ab1bbf0f535fcd8b36bab4c00faec6519cecbf7f18d8c14397f8264ad2e0e2cb84968e0a0c40a41720e064dca WHIRLPOOL e3b4d8531af603b4a8c7f556831e877c7a4bdd0a3a75b00ea65a134e38a2df7faf30b0006d0ec44600c9cd22917eae58a9f98f63dbddd28728ec2fa85304e75c
-EBUILD stunnel-5.02.ebuild 2629 SHA256 2124faedd8ee0a64197ee8cb465bf968703104c5a7eb5489990f062e534c68ad SHA512 40cf14b4800615f5c13fa73852332600a5b16611db0a04902a7f3f2f59f1e52ead18a1678f30addb7de90f5b2f86e4c85e2cb6d9badcef23aa3ed56cffe40fda WHIRLPOOL d7746320594165be7ab5dd7e1b14d15e66aa654f244bd5b90921d880dfe21fd9c77856b381c9188af7d8bceab4c9fc39ad3a296361eea81e7aaa5bb26161da6c
-EBUILD stunnel-5.03.ebuild 2631 SHA256 6f6b67ae41eb6fdb4b186d4ebd052d2e0e27061407f1386e21b6da632a8c6736 SHA512 3f3a5ac4580b2e5ad2b376870034fabb0300349ee4a1bb150d8131e9faa53ccb01495e971e9c2650829801bb131bc8e7f7b481242f51d3ce74500713bb927ab2 WHIRLPOOL de83a97809dbfd49834357c92fdebe44e642afb2b5501492bdec2b8061cc86515543665c1d1a5705476cb0800bab0652afa64691cac79c36b66d2bd81a5acbb1
-EBUILD stunnel-5.04.ebuild 2637 SHA256 ea03e0b21e7b006f51571109368635bad31bd745ad79a23afc664d7107e7005d SHA512 c2749269a21eb7b3cd6fe5f241412f57deef204786fc15ba689b6e9ef3e0ca091650995af2756081307ef78377e9cd96b6db3866d3331270affb8dfcad44df50 WHIRLPOOL 28c746d7450c7c0181e2cd9c56cd75ce16e5f396e5c0361f1d4360813cd45c43c079ea07e46d299812719f696d855c5516e50206f22be443570dd7a6c75a3afc
-EBUILD stunnel-5.05.ebuild 2637 SHA256 9ac11498792deb97b2f5c4322b0d822177441b0fd7b2068297f4cbbc225141d9 SHA512 21a0c6ce4344e85f9985dbe9b4863a3e825439c64c4a741a007292ec7f75fc3206077d3bdc5df3ecd8332022f6fedbf0543ce23ed5d65ee019086cc6e0e17623 WHIRLPOOL a3644255861ead8b2900f1305549ae48f8f6de4d7957ef10d508a2ea32720bce84077f619132ac051b92663944478dbab135fc345394cb74058df154bc6e1a4a
 EBUILD stunnel-5.07.ebuild 2623 SHA256 d9f5a33ed46cdae69481bbf177449b09d158349cd4b6136aaa035fb5572fe8e5 SHA512 c0f3b5b952f4e90213ba86482b467a1b475457cfa35dfd01136f2b5e457a8b77f2880c917754e68bb1545d1a6ceb2104d8dcfc22fbd144ab6e614e05940e1551 WHIRLPOOL fe9518ac28369b348014c54d07e47d58876864b2a154880b7efc79df88f9c62ac6139523532a8c31114f8d4a2d2d0b8f9c9f70de7e1e24cf11c824c0bd3e667d
 EBUILD stunnel-5.08.ebuild 2637 SHA256 a1bcf8fd1a157a509032a6abe93759b005c181ac6c7b655ae76c689cc8bb026b SHA512 7e6994c0ca66ad4a7e7c83a47346830799b1d9ca14a0ef9171a59b40e90d836ad86ef697517627a7d1f6551b43dc2cb4b80d5f02d60b0269aba00cb2d751dfe0 WHIRLPOOL 2ebb85d79352e7626aacc4d88dbdc7daf095dc7279ea236302d1b5541c0229728ee6a44514827020513b443f68256b70b58d3205540b80eb6b7cc3d8407d89df
-MISC ChangeLog 28373 SHA256 fd15bcae994ba65886fb12fad6059769db60fe1cb4b4fcc94a48ee61218552f3 SHA512 0c5db42b13305fb03831c8324df5cf15d9fdcb797f3e4bb3cdad681eab45432a7cf1edd110499e1799ae6178abc4bd3117bd5a44e354783c385659df16207e75 WHIRLPOOL 3e276e2ed7df9e02ffd26e36d5d805452d5df7ae2eb8092fcd80086e9a01b4ab80b738d8327e76f6986f51b8e8758e0810c0aff4f1aa7eff09f09a512d04f66d
+MISC ChangeLog 28552 SHA256 55aed55ff7cc612145197d1b52a02d03583a43cf2b5f95ee211338666aaf6bb1 SHA512 37a2e1f73275bddc0522dcfadfcee54e4cd80a0fc6e20c2190950e06efbc0c9fca4fb71f8ef574fae79205281637249b5451540e1059bfa76654475b249e42e7 WHIRLPOOL cc1ec049dfafa32e85a93abef2e7c62235d94c664f39684283357c204cda0d8011ac887788a3b1a120028ba04072c7b1a86b3a5d17574587abe1bcc85803ba7e
 MISC metadata.xml 622 SHA256 42b6c75bd95fd3f6322e6a6f726a9e07d74f0b46376a6f17718f9043cf6cc225 SHA512 930faf03b0f8e73c0ddb1a9821c04d8e0b0eb49fbf1e70ba439cd810e7aac827490b2036fb9a4bf4d8f2d96b3a2e0c0b2923ed21ae17b08ca09464c7cee54997 WHIRLPOOL a604c6422e399f97c5d701d756eee871438b9bb7fb7195c5b4a35357be9e11b7709d7e77172d85f1e5f1d31987de958e8f0f29f13bd1106afab1bb32b75564e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUiChIAAoJEJOE+m71LUu6tuUP/Ahum1CVUYjrFIiJ+BG+/kmM
-dWgNtzSqwjGuxUoAAB8CUkVTBssTr6jb5UNeRVMF846d7d2dxADIrMe3d1C2kl6z
-rW2C0pl3TbHs4/JHQebYcTaUgslxhEt1PDKElKnEIyqRGKH13sZ600t9ZtG0eKxA
-jwYFQ09B+CH0REHIFstS4UU3PIWGjy5RSU+7x7G95AG+OkJ61t3QC9iujmxF/+nC
-I1umzXox/ym3bY5Pb7xhFpf2L1T0Vqz4CObFKyIIlt32JtEmz5D+VZv8N7zVAt0B
-vsJXhAzlUVvTGywM2f5yg7NGuIM1H3K6bgiMq5xmg6EOIgVfG+1UkA/H4yKm1MW/
-PYw4hBoS2PR4W8F+RgDhDMNHoTFtE3rFvIL/GTwiFz2JfHBMIkJ9xkiNvmLfeAYI
-FGoXSbkTHzRyF470QK84l0v2jbP89z9d370Vzw+D6UqU9rslLvq9R8jzBUbW9FBQ
-TBfFkSgZQWlspsqfC23Ma39zfN1aIypcSgLQ4OjUFEVAmrePFPEXvxDQ9aj9stVv
-F/kOx3+Cp+ws8jS9VW5j4+htaJFsjSXsmGVJ8xGdsX9JdWFamT/VBzHpUxWkD7TC
-PVahyNiQqQO3cEpFt8d8T6W5td8VhqBdRpb7cJDviZIAEv8fLgDxISi42kU6wdqT
-dQe5MXjLhccgYZ1ua5r2
-=AaYz
+iQIcBAEBCAAGBQJUiCk6AAoJEJOE+m71LUu6hfUP/jJBf7k66M8maCLwBqeTSsB1
+qFKQEaNBo2iuw4dctFL8bh53xP74vE4X/0rf+yiJTaYXG7TD2N5RRbLqBZfgaxVh
+uU0xk66UXH0vzUNjqVSDM+g+9Kl+lhz0pmW1xQrry9J5EDT5IPcRMQsQt4SH1zVw
+/wAKTltSEQ5iqPHy0tA9HaysITq0/tb0dHiDUvJa+8bUD77IMBBrPEV2tvWkP0WA
+BgUu7NTR4cr3HIouhDm1eQktzFDcmagORZDZMJju+tj1JX2cyOmWOk1YKNpWBzNv
+aD3CCjVOu8O2uNta9ni/ACotgkj6LigpJalPbdkTG4ba+Dic+NBI4/5jXP7hhjsP
+1kSDW/E/eqAsuvs44JKu5IJfPQHtFKrt9hlf++i7v6hyHEZYydP+y7MBJpy3gvTp
+C0X5jukoX0CsQBqLQ+8zXgzuWtp9w8s1QC2D6zx2eN24b6HPX64+ImBnjvMaAgdh
+OsN56ACZZ5RrLgrNWK/3+1BHNOEEcNUqhALnfHqxPTEGl3FMEfI4/lFOGvS7UspN
+gfYuPebHiMRjcC4RTPWNAq4lN5RYux5fDk3zJFq+bD8hWtGxGsUp/QUnXCVyL8c5
+3vc2HQIpObqdFd89j+/RTzLoWrk7Q0ARdiZbcc9w0I+4iL6bCKWdhzK+R3YJAKup
+3GjxQICOXe08P7UBhju2
+=lSok
 -----END PGP SIGNATURE-----
diff --git a/net-misc/stunnel/stunnel-5.02.ebuild b/net-misc/stunnel/stunnel-5.02.ebuild
deleted file mode 100644
index 70a1179be7d0..000000000000
--- a/net-misc/stunnel/stunnel-5.02.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-5.02.ebuild,v 1.11 2014/09/25 22:16:03 blueness Exp $
-
-EAPI="5"
-
-inherit ssl-cert eutils systemd user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html"
-SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
-	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 selinux tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	dev-libs/openssl"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-stunnel )"
-
-pkg_setup() {
-	enewgroup stunnel
-	enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_prepare() {
-	# Hack away generation of certificate
-	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
-		tools/Makefile.in || die "sed failed"
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable tcpd libwrap) \
-		--with-ssl="${EPREFIX}"/usr \
-		--disable-fips
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample "${ED}"/usr/bin/stunnel3 \
-		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
-
-	# The binary was moved to /usr/bin with 4.21,
-	# symlink for backwards compatibility
-	dosym ../bin/stunnel /usr/sbin/stunnel
-
-	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
-	dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
-		tools/importCA.html
-
-	insinto /etc/stunnel
-	doins "${FILESDIR}"/stunnel.conf
-	doinitd "${FILESDIR}"/stunnel
-
-	systemd_dounit "${S}/tools/stunnel.service"
-	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
-}
-
-pkg_postinst() {
-	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
-		install_cert /etc/stunnel/stunnel
-		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-	fi
-
-	einfo "If you want to run multiple instances of stunnel, create a new config"
-	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
-	einfo "\'pid= \' with a unique filename."
-}
diff --git a/net-misc/stunnel/stunnel-5.03.ebuild b/net-misc/stunnel/stunnel-5.03.ebuild
deleted file mode 100644
index 78de08a5b79a..000000000000
--- a/net-misc/stunnel/stunnel-5.03.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-5.03.ebuild,v 1.6 2014/09/25 22:16:03 blueness Exp $
-
-EAPI="5"
-
-inherit ssl-cert eutils systemd user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html"
-SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
-	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 selinux tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	dev-libs/openssl"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-stunnel )"
-
-pkg_setup() {
-	enewgroup stunnel
-	enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_prepare() {
-	# Hack away generation of certificate
-	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
-		tools/Makefile.in || die "sed failed"
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable tcpd libwrap) \
-		--with-ssl="${EPREFIX}"/usr \
-		--disable-fips
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample "${ED}"/usr/bin/stunnel3 \
-		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
-
-	# The binary was moved to /usr/bin with 4.21,
-	# symlink for backwards compatibility
-	dosym ../bin/stunnel /usr/sbin/stunnel
-
-	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
-	dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
-		tools/importCA.html
-
-	insinto /etc/stunnel
-	doins "${FILESDIR}"/stunnel.conf
-	doinitd "${FILESDIR}"/stunnel
-
-	systemd_dounit "${S}/tools/stunnel.service"
-	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
-}
-
-pkg_postinst() {
-	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
-		install_cert /etc/stunnel/stunnel
-		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-	fi
-
-	einfo "If you want to run multiple instances of stunnel, create a new config"
-	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
-	einfo "\'pid= \' with a unique filename."
-}
diff --git a/net-misc/stunnel/stunnel-5.04.ebuild b/net-misc/stunnel/stunnel-5.04.ebuild
deleted file mode 100644
index 2910684adb89..000000000000
--- a/net-misc/stunnel/stunnel-5.04.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-5.04.ebuild,v 1.3 2014/09/23 20:11:39 blueness Exp $
-
-EAPI="5"
-
-inherit ssl-cert eutils systemd user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html"
-SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
-	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 selinux tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	dev-libs/openssl"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-stunnel )"
-
-pkg_setup() {
-	enewgroup stunnel
-	enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_prepare() {
-	# Hack away generation of certificate
-	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
-		tools/Makefile.in || die "sed failed"
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable tcpd libwrap) \
-		--with-ssl="${EPREFIX}"/usr \
-		--disable-fips
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample "${ED}"/usr/bin/stunnel3 \
-		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
-
-	# The binary was moved to /usr/bin with 4.21,
-	# symlink for backwards compatibility
-	dosym ../bin/stunnel /usr/sbin/stunnel
-
-	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
-	dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
-		tools/importCA.html
-
-	insinto /etc/stunnel
-	doins "${FILESDIR}"/stunnel.conf
-	doinitd "${FILESDIR}"/stunnel
-
-	systemd_dounit "${S}/tools/stunnel.service"
-	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
-}
-
-pkg_postinst() {
-	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
-		install_cert /etc/stunnel/stunnel
-		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-	fi
-
-	einfo "If you want to run multiple instances of stunnel, create a new config"
-	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
-	einfo "\'pid= \' with a unique filename."
-}
diff --git a/net-misc/stunnel/stunnel-5.05.ebuild b/net-misc/stunnel/stunnel-5.05.ebuild
deleted file mode 100644
index 54e411b22261..000000000000
--- a/net-misc/stunnel/stunnel-5.05.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-5.05.ebuild,v 1.1 2014/10/11 12:07:21 blueness Exp $
-
-EAPI="5"
-
-inherit ssl-cert eutils systemd user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html"
-SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
-	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 selinux tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	dev-libs/openssl"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-stunnel )"
-
-pkg_setup() {
-	enewgroup stunnel
-	enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_prepare() {
-	# Hack away generation of certificate
-	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
-		tools/Makefile.in || die "sed failed"
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable tcpd libwrap) \
-		--with-ssl="${EPREFIX}"/usr \
-		--disable-fips
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample "${ED}"/usr/bin/stunnel3 \
-		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
-
-	# The binary was moved to /usr/bin with 4.21,
-	# symlink for backwards compatibility
-	dosym ../bin/stunnel /usr/sbin/stunnel
-
-	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
-	dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
-		tools/importCA.html
-
-	insinto /etc/stunnel
-	doins "${FILESDIR}"/stunnel.conf
-	doinitd "${FILESDIR}"/stunnel
-
-	systemd_dounit "${S}/tools/stunnel.service"
-	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
-}
-
-pkg_postinst() {
-	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
-		install_cert /etc/stunnel/stunnel
-		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-	fi
-
-	einfo "If you want to run multiple instances of stunnel, create a new config"
-	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
-	einfo "\'pid= \' with a unique filename."
-}