Remove old.

Package-Manager: portage-2.1.4.4

5 files changed, 16 insertions, 203 deletions

diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog
index b2ed805f7361..fa172cc439a5 100644
--- a/net-misc/stunnel/ChangeLog
+++ b/net-misc/stunnel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/stunnel
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.90 2008/02/16 16:11:14 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.91 2008/02/16 16:38:26 ulm Exp $
+
+  16 Feb 2008; Ulrich Mueller <ulm@gentoo.org> -files/stunnel.rc6.4.20,
+  -stunnel-4.20.ebuild, -stunnel-4.21.ebuild:
+  Remove old.
 
   16 Feb 2008; Robert Buchholz <rbu@gentoo.org> stunnel-4.21-r1.ebuild:
   amd64 stable (bug #201896)
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 84757f5abf30..6f6aa6ab8a3c 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,15 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX stunnel-3.26-gentoo.diff 941 RMD160 4ca4f85a8888c7c9dbeed9d1303bae182d19195d SHA1 5517c6e3395664d76c84548ea67ffd8fddddbdcd SHA256 e2a9fab361699b01ccd004ef598bb868d5f6f37bd40d05b7a16a97cd9ecee2f2
 AUX stunnel-4.21-libwrap.patch 380 RMD160 c5ed7c06c3612bc5930ca8c77cac8bf58ec403f3 SHA1 fa1bf6674f775fa1b5934f4707c9e7eafed0d8a9 SHA256 b22f56707b96df785ebc20b48faf9761fb52cf4a362be875c60071b0d4572be1
 AUX stunnel-4.21-setuid.patch 2497 RMD160 037d422dd62c7140c03ad21103293cab201834e6 SHA1 2af63c8d7e212e80e0ce974a00f2ebb725a5d353 SHA256 38b525f41f7c876c0ec781d17a4c8096542b96a34d87f8b1acf49864479ca203
 AUX stunnel.conf 1423 RMD160 606c53b0e241e44c8aabe423ca6772dc76aa69a9 SHA1 0b18a6dea836abc3c224c367f9ebd6fa30b931f2 SHA256 be8deb0e051f594e14c898c2ec8a4a6879adcd48a56286093653346d12c3f105
 AUX stunnel.rc6 779 RMD160 3cb0ba8b6f90484a9cec951e3eb36eef45169f6d SHA1 7de8dc829e271b3ed248e3b44afb9b537621cc02 SHA256 b2128e3bfe38485ef4afad35b57d8711666281087f3fcf920d5d313642e06dea
-AUX stunnel.rc6.4.20 933 RMD160 153786753342f787e61ccb5203287090f59ae76d SHA1 23ad6f838e5817c97866ff8472dcb525043cf4c4 SHA256 3e8f2d66184a29da7873e564dd544a4b03d3e35895b29399251a3cf1f86b861c
 DIST stunnel-3.26.tar.gz 228923 RMD160 63347b6bc6fca1496d74a8ef234eea98a45e0b04 SHA1 0d40d268a9e4b63630312cdee4efa5ecba53c9ec SHA256 d2a55b089d46d14bc4b456bb1927303492dab6649867c67a005d2c9d1ededfb3
-DIST stunnel-4.20.tar.gz 513394 RMD160 6a5dfbabe17804e87ed8c7c75898dba4b4257827 SHA1 a9a449b28a4f34ab22f6b4bfaa81c1904a5883c4 SHA256 2926b8eda6d90872056145da8a260bd2eab41621c143f8a014ffa7a92e81fd10
 DIST stunnel-4.21.tar.gz 528196 RMD160 e0f599bb44bbdd5178af9972110f71ee64cbf724 SHA1 7785c45167d902aa728b839adee02a8cc056d86a SHA256 b1121c1157c48320491f1929eb1f1c64ba20f76c7352c0df01c77cf09be19add
 EBUILD stunnel-3.26.ebuild 723 RMD160 0636c7eae1da61ec4af4771feae60d9a86f70322 SHA1 b71fe6b65de35833c2d35c620e38c231fe3a5d04 SHA256 adc4a2cb260ca77fd1881c960230486f4952b6946db94ec57a33f2131aeae986
-EBUILD stunnel-4.20.ebuild 2443 RMD160 04394dd6b4c0a5a10e447d3922ca141ab56506c2 SHA1 8365fd154475400bf161ec19300f2c5036c50404 SHA256 6e8d0e9899bd6016bfdbd6c0963c932e58c968af32901f45f8bfad84bbbb600e
 EBUILD stunnel-4.21-r1.ebuild 2409 RMD160 a458bec31394969c71a2b25e964969ba3c202031 SHA1 a011bf4cc15094b0cc9b43be26f36853563d2192 SHA256 21684cdeff9d9ca9466078cdd82932df2bd31a9226228a7f47630d0a8fe27192
-EBUILD stunnel-4.21.ebuild 2371 RMD160 167e98bb05fdf387f4040be34759fcaa7899859f SHA1 dd5d36ab601ebe11be0b95487538bfa1b7f686ee SHA256 69222e02011325a94f20f796c1ed67b4b3d2e35899480dc6c8c8a3728e95747d
-MISC ChangeLog 12900 RMD160 79205c33536f05905bc861b15ed5a3e2bc30039a SHA1 10c304a24da7b763d5e536854e898358c6064a9f SHA256 90fd3c8f5b87b58394d90a9e47a446e4e0beab85c33dd6b19979ac33ede4e57c
+MISC ChangeLog 13033 RMD160 8afdb07280c63f618867e77f775396f297bfce29 SHA1 2677884655a539e3ddd4b50769d440166214add1 SHA256 eaf2b0bd9a3ea5024897b211f92954af82b188057b78ed54b9e53942e2af334a
 MISC metadata.xml 641 RMD160 7ad264c22b9e0705cf00b7985eee8d23c3383310 SHA1 c9314118d8fbc0644eb690f56f9d8859d3f7c578 SHA256 16e547775081b652662ac7156f0b6cfb7d1b8165865416cd154047c9ea6abebb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.8 (GNU/Linux)
+
+iEYEARECAAYFAke3EYYACgkQOeoy/oIi7uw2dwCfWggGkBGrkTHxWJ9m+ISikiQR
+0RMAoIVU5S1VMkliWu2tv3M3AL5QbcoA
+=zG/k
+-----END PGP SIGNATURE-----
diff --git a/net-misc/stunnel/files/stunnel.rc6.4.20 b/net-misc/stunnel/files/stunnel.rc6.4.20
deleted file mode 100644
index b8bdfe5e29cd..000000000000
--- a/net-misc/stunnel/files/stunnel.rc6.4.20
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/files/stunnel.rc6.4.20,v 1.1 2007/12/08 10:38:26 ulm Exp $
-
-# Default pidfile location
-PIDFILE="/var/run/stunnel/stunnel.pid"
-
-checkconfig() {
-    # To ensure backwards compatibility
-    if [ ! -z "$(egrep '/etc/stunnel/stunnel.pid' /etc/stunnel/stunnel.conf)" ] ; then
-	ewarn "Please update your stunnel.conf!"
-	ewarn "pid should point to /var/run/stunnel/stunnel.pid"
-	PIDFILE="/etc/stunnel/stunnel.pid"
-    fi
-}
-
-depend() {
-    need net
-}
-
-start() {
-    checkconfig
-    ebegin "Starting stunnel"
-    start-stop-daemon --start --pidfile ${PIDFILE} --quiet --exec /usr/sbin/stunnel -- /etc/stunnel/stunnel.conf  
-    eend $?
-}
-
-stop() {
-    checkconfig
-    ebegin "Stopping stunnel"
-    start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
-    eend $?
-}
diff --git a/net-misc/stunnel/stunnel-4.20.ebuild b/net-misc/stunnel/stunnel-4.20.ebuild
deleted file mode 100644
index 3b7f40680eac..000000000000
--- a/net-misc/stunnel/stunnel-4.20.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.20.ebuild,v 1.13 2007/12/08 10:38:25 ulm Exp $
-
-inherit ssl-cert eutils flag-o-matic
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://stunnel.mirt.net/"
-SRC_URI="http://www.stunnel.org/download/stunnel/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="ipv6 selinux tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	>=dev-libs/openssl-0.9.6j"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-stunnel )"
-
-src_unpack() {
-	unpack ${A}
-	# Hack away generation of certificate
-	sed -i s/^install-data-local:/do-not-run-this:/ "${S}"/tools/Makefile.in
-}
-
-src_compile() {
-	local myconf=""
-	# Don't shoot me for doing this! The stunnel configure script is broke and
-	# doesn't honor --disable-foo
-	if use ipv6 ; then
-		myconf="${myconf} --enable-ipv6"
-	fi
-	if ! use tcpd ; then
-		myconf="${myconf} --disable-libwrap"
-	fi
-	econf ${myconf} || die "econf died"
-	emake || die "emake died"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	rm -rf "${D}"/usr/share/doc/${PN}
-	rm -f "${D}"/{etc/stunnel/stunnel.conf-sample,usr/sbin/stunnel3}
-	rm -f "${D}"/usr/share/man/man8/{stunnel.fr.8,stunnel.pl.8}
-
-	dodoc AUTHORS BUGS CREDITS INSTALL NEWS PORTS README TODO ChangeLog \
-		doc/en/transproxy.txt
-	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.rc6.${PV} stunnel
-	# Check if there's currently an cert already there
-	if [ ! -f /etc/stunnel/stunnel.key ]; then
-		docert stunnel
-	fi
-
-	keepdir /var/run/stunnel
-}
-
-pkg_postinst() {
-	enewgroup stunnel
-	enewuser stunnel -1 -1 -1 stunnel
-
-	chown stunnel:stunnel "${ROOT}"/var/run/stunnel
-	chown stunnel:stunnel "${ROOT}"/etc/stunnel/stunnel.{conf,crt,csr,key,pem}
-	chmod 0640 "${ROOT}"/etc/stunnel/stunnel.{conf,crt,csr,key,pem}
-
-	if [ ! -z "$(egrep '/etc/stunnel/stunnel.pid' \
-		"${ROOT}"/etc/stunnel/stunnel.conf )" ] ; then
-
-		ewarn "As of stunnel-4.09, the pid file will be located in /var/run/stunnel."
-		ewarn "Please stop stunnel, etc-update, and start stunnel back up to ensure"
-		ewarn "the update takes place"
-		ewarn ""
-		ewarn "The new location will be /var/run/stunnel/stunnel.pid"
-		ebeep 3
-		epause 3
-	fi
-}
diff --git a/net-misc/stunnel/stunnel-4.21.ebuild b/net-misc/stunnel/stunnel-4.21.ebuild
deleted file mode 100644
index c9ff69025bb4..000000000000
--- a/net-misc/stunnel/stunnel-4.21.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.21.ebuild,v 1.6 2008/01/10 09:18:02 vapier Exp $
-
-inherit autotools ssl-cert eutils
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://stunnel.mirt.net/"
-SRC_URI="http://www.stunnel.org/download/stunnel/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 arm hppa ~ia64 ~ppc ppc64 sparc x86"
-IUSE="ipv6 selinux tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	>=dev-libs/openssl-0.9.6j"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-stunnel )"
-
-pkg_setup() {
-	enewgroup stunnel
-	enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-libwrap.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_compile() {
-	econf $(use_enable ipv6) \
-		$(use_enable tcpd libwrap) || die "econf died"
-	emake || die "emake died"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	rm -rf "${D}"/usr/share/doc/${PN}
-	rm -f "${D}"/etc/stunnel/stunnel.conf-sample "${D}"/usr/bin/stunnel3 \
-		"${D}"/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 doc/en/transproxy.txt
-	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.rc6 stunnel
-
-	keepdir /var/run/stunnel
-	fowners stunnel:stunnel /var/run/stunnel
-}
-
-pkg_postinst() {
-	if [ ! -f "${ROOT}"/etc/stunnel/stunnel.key ]; then
-		install_cert /etc/stunnel/stunnel
-		chown stunnel:stunnel "${ROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-		chmod 0640 "${ROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-	fi
-
-	if [ ! -z "$(grep /etc/stunnel/stunnel.pid \
-		"${ROOT}"/etc/stunnel/stunnel.conf )" ] ; then
-
-		ewarn "As of stunnel-4.09, the pid file will be located in /var/run/stunnel."
-		ewarn "Please stop stunnel, etc-update, and start stunnel back up to ensure"
-		ewarn "the update takes place"
-		ewarn
-		ewarn "The new location will be /var/run/stunnel/stunnel.pid"
-	fi
-}