Version bump and remove some older

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

4 files changed, 10 insertions, 157 deletions

diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog
index 2201f67e834a..dbb137dc7d02 100644
--- a/net-misc/stunnel/ChangeLog
+++ b/net-misc/stunnel/ChangeLog
@@ -1,6 +1,12 @@
 # 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.161 2014/03/19 13:51:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.162 2014/04/09 14:05:06 blueness Exp $
+
+*stunnel-5.01 (09 Apr 2014)
+
+  09 Apr 2014; Anthony G. Basile <blueness@gentoo.org> +stunnel-5.01.ebuild,
+  -stunnel-4.54.ebuild, -stunnel-4.56-r1.ebuild, -stunnel-5.00.ebuild:
+  Version bump and remove some older
 
   19 Mar 2014; Agostino Sarubbo <ago@gentoo.org> stunnel-4.56-r2.ebuild:
   Stable for alpha, wrt bug #499310
diff --git a/net-misc/stunnel/stunnel-4.54.ebuild b/net-misc/stunnel/stunnel-4.54.ebuild
deleted file mode 100644
index 55aa1edae35b..000000000000
--- a/net-misc/stunnel/stunnel-4.54.ebuild
+++ /dev/null
@@ -1,76 +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-4.54.ebuild,v 1.3 2014/03/06 16:42:13 blueness Exp $
-
-EAPI="5"
-
-inherit autotools ssl-cert eutils user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://stunnel.mirt.net/"
-SRC_URI="ftp://ftp.stunnel.org/stunnel/${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 xforward listen-queue"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	>=dev-libs/openssl-0.9.8k"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-stunnel )"
-
-pkg_setup() {
-	enewgroup stunnel
-	enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_prepare() {
-	use xforward && epatch "${FILESDIR}/stunnel-${PV}-xforwarded-for.patch"
-	use listen-queue && epatch "${FILESDIR}/stunnel-${PV}-listen-queue.patch"
-	eautoreconf
-
-	# 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) \
-		--with-ssl="${EPREFIX}"/usr \
-		$(use_enable tcpd libwrap)
-}
-
-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
-	newinitd "${FILESDIR}"/stunnel.initd-start-stop-daemon stunnel
-
-	keepdir /var/run/stunnel
-	fowners stunnel:stunnel /var/run/stunnel
-}
-
-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-4.56-r1.ebuild b/net-misc/stunnel/stunnel-4.56-r1.ebuild
deleted file mode 100644
index 60ffc981bc78..000000000000
--- a/net-misc/stunnel/stunnel-4.56-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.56-r1.ebuild,v 1.11 2013/08/06 12:35:26 ago Exp $
-
-EAPI="5"
-
-inherit ssl-cert eutils user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://stunnel.mirt.net/"
-SRC_URI="ftp://ftp.stunnel.org/stunnel/${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 xforward listen-queue"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	>=dev-libs/openssl-0.9.8k"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-stunnel )"
-
-pkg_setup() {
-	enewgroup stunnel
-	enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_prepare() {
-	use xforward && epatch "${FILESDIR}/${P}-xforwarded-for.patch"
-	use listen-queue && epatch "${FILESDIR}/${P}-listen-queue.patch"
-
-	# 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
-	newinitd "${FILESDIR}"/stunnel.initd-start-stop-daemon stunnel
-}
-
-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.00.ebuild b/net-misc/stunnel/stunnel-5.01.ebuild
index 5a8f93a46148..ba701ce5a449 100644
--- a/net-misc/stunnel/stunnel-5.00.ebuild
+++ b/net-misc/stunnel/stunnel-5.01.ebuild
@@ -1,6 +1,6 @@
 # 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.00.ebuild,v 1.1 2014/03/06 16:42:13 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-5.01.ebuild,v 1.1 2014/04/09 14:05:06 blueness Exp $
 
 EAPI="5"
 
@@ -13,10 +13,10 @@ SRC_URI="http://www.stunnel.org/downloads/${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 xforward listen-queue"
+IUSE="ipv6 selinux tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	>=dev-libs/openssl-0.9.8k"
+	dev-libs/openssl"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-stunnel )"
 
@@ -26,9 +26,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	use xforward && epatch "${FILESDIR}/${PN}-4.56-xforwarded-for.patch"
-	use listen-queue && epatch "${FILESDIR}/${PN}-4.56-listen-queue.patch"
-
 	# Hack away generation of certificate
 	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
 		tools/Makefile.in || die "sed failed"