Install stunnel.so again. Remove redundant src_compile. Clean up.

Package-Manager: portage-2.1.3.19

9 files changed, 28 insertions, 291 deletions

diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog
index 6e9d6a79dd6c..e079cc77eb42 100644
--- a/net-misc/stunnel/ChangeLog
+++ b/net-misc/stunnel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/stunnel
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.75 2007/11/09 20:56:21 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.76 2007/11/09 21:28:11 ulm Exp $
+
+  09 Nov 2007; Ulrich Mueller <ulm@gentoo.org> stunnel-3.26.ebuild,
+  -stunnel-4.09-r1.ebuild, -stunnel-4.14-r1.ebuild, -stunnel-4.15.ebuild:
+  Install stunnel.so again. Remove redundant src_compile. Clean up.
 
   09 Nov 2007; Fabian Groffen <grobian@gentoo.org> stunnel-3.26.ebuild:
   Dropped ppc-macos keyword, see you in prefix
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index fd46ec22c631..1310bb5a0378 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX stunnel-3.26-gentoo.diff 941 RMD160 4ca4f85a8888c7c9dbeed9d1303bae182d19195d SHA1 5517c6e3395664d76c84548ea67ffd8fddddbdcd SHA256 e2a9fab361699b01ccd004ef598bb868d5f6f37bd40d05b7a16a97cd9ecee2f2
 MD5 b42ca1fbeb5d6454de36aac4cb893294 files/stunnel-3.26-gentoo.diff 941
 RMD160 4ca4f85a8888c7c9dbeed9d1303bae182d19195d files/stunnel-3.26-gentoo.diff 941
@@ -11,27 +14,12 @@ MD5 f4879ffd6081bf6db14af6fac04f6b9e files/stunnel.rc6 933
 RMD160 2ffcca398b3342ee7615c3d08030bcd8314cd5cc files/stunnel.rc6 933
 SHA256 902db622cd2861fb75ebd84e966cd9cb2002f410e4d1a8a44286be687eac0eda files/stunnel.rc6 933
 DIST stunnel-3.26.tar.gz 228923 RMD160 63347b6bc6fca1496d74a8ef234eea98a45e0b04 SHA1 0d40d268a9e4b63630312cdee4efa5ecba53c9ec SHA256 d2a55b089d46d14bc4b456bb1927303492dab6649867c67a005d2c9d1ededfb3
-DIST stunnel-4.09.tar.gz 484745 RMD160 d1e37da2ccfd27224f598c22a031e62ec4c6e8ce SHA1 4fb23be2acd497e12c8e8ce5386db922d5b05f82 SHA256 56004db651fe180ed23882c555607c8f2723a3e99734d462fe644e531a574271
-DIST stunnel-4.14.tar.gz 488512 RMD160 ece1c26dcddf6546e428fcc626a45c06f4757d67 SHA1 b2edb3a2473367f2a9f04a877adcb332483a5267 SHA256 8a5712ec0130ca7dff4d954a7aac39b9bc4209bdbcf5ae64a276a55d51a68941
-DIST stunnel-4.15.tar.gz 497103 RMD160 a8d5c9d3fb24d0518975cbb347729f5eba3d3f12 SHA1 735406c1ca94904581158a434214e1f6568539d0 SHA256 53328496fb9c2ad44bfea31c8beae93b99f5d8f577d5d60cceffc7e160936fe9
 DIST stunnel-4.16.tar.gz 507204 RMD160 cbf8136049bcd8e306ee80bd66e4dd7666272b46 SHA1 6772e0c7f26c2596564ba66978597db8cd229a72 SHA256 8ccf6d8e9960ec6cb64aa27c3e61cb1ee32f5ae12f208aebb923de9c9f200a6e
 DIST stunnel-4.20.tar.gz 513394 RMD160 6a5dfbabe17804e87ed8c7c75898dba4b4257827 SHA1 a9a449b28a4f34ab22f6b4bfaa81c1904a5883c4 SHA256 2926b8eda6d90872056145da8a260bd2eab41621c143f8a014ffa7a92e81fd10
-EBUILD stunnel-3.26.ebuild 765 RMD160 bfa08509193e0da8bf4b1a91225c70d51ead79db SHA1 9e693e7ab011ed71500fafed31da1a0426c79162 SHA256 4513e34a100493919a5cdf3d0a2e78bfa97461df962a6dcad98aa101dd40a51f
-MD5 1c157253f2839dbcb9ac5fe9bba02825 stunnel-3.26.ebuild 765
-RMD160 bfa08509193e0da8bf4b1a91225c70d51ead79db stunnel-3.26.ebuild 765
-SHA256 4513e34a100493919a5cdf3d0a2e78bfa97461df962a6dcad98aa101dd40a51f stunnel-3.26.ebuild 765
-EBUILD stunnel-4.09-r1.ebuild 2232 RMD160 280b94112ad985411c6a14eb987bb38dd26cd4b2 SHA1 3a346a55ac27d0cb7ea646df159f4fcdf32f14db SHA256 ae44b2a03518b999d0f7009fc90aa8b468eab976ac58241b20de79da2607f52c
-MD5 8048502e7636b74164eaa1077cb1ab80 stunnel-4.09-r1.ebuild 2232
-RMD160 280b94112ad985411c6a14eb987bb38dd26cd4b2 stunnel-4.09-r1.ebuild 2232
-SHA256 ae44b2a03518b999d0f7009fc90aa8b468eab976ac58241b20de79da2607f52c stunnel-4.09-r1.ebuild 2232
-EBUILD stunnel-4.14-r1.ebuild 2425 RMD160 2c87e2f283bc885a2eec6d43ca0dcdc98906b258 SHA1 0f6dd8ba072c11c938bcd9c90377e3c560cfa07e SHA256 9dbcee64f346a0b3adb42148dbc33eb8e2210de25f8b41ddd25c369ba56c2eb0
-MD5 1d3eed22ec60034bf9bb7b9f7d9b8644 stunnel-4.14-r1.ebuild 2425
-RMD160 2c87e2f283bc885a2eec6d43ca0dcdc98906b258 stunnel-4.14-r1.ebuild 2425
-SHA256 9dbcee64f346a0b3adb42148dbc33eb8e2210de25f8b41ddd25c369ba56c2eb0 stunnel-4.14-r1.ebuild 2425
-EBUILD stunnel-4.15.ebuild 2428 RMD160 8c6bc7eed33d0562c18ea7a65c8b3fa072d1710b SHA1 174f8758a22d0e7a58ceee4317f53c7a43a535d3 SHA256 71e30359599767b96b9a2add8466ea768008134aa4c99f60cbe05fed7f3fa085
-MD5 6f59a2a927e98672ada1fdcfa4f99f61 stunnel-4.15.ebuild 2428
-RMD160 8c6bc7eed33d0562c18ea7a65c8b3fa072d1710b stunnel-4.15.ebuild 2428
-SHA256 71e30359599767b96b9a2add8466ea768008134aa4c99f60cbe05fed7f3fa085 stunnel-4.15.ebuild 2428
+EBUILD stunnel-3.26.ebuild 731 RMD160 d7637a56ee50c656ac2ecdf7b22efea9bc6687bd SHA1 c7dee74743d5b4458e4e0f5005ba7582d1e4826d SHA256 311da4d27eb6b8bc13cf6223e0a004be3c2cb75068abcaad26450bd5027f936c
+MD5 bca10359a6459fc5e900a7ef2f6463db stunnel-3.26.ebuild 731
+RMD160 d7637a56ee50c656ac2ecdf7b22efea9bc6687bd stunnel-3.26.ebuild 731
+SHA256 311da4d27eb6b8bc13cf6223e0a004be3c2cb75068abcaad26450bd5027f936c stunnel-3.26.ebuild 731
 EBUILD stunnel-4.16.ebuild 2434 RMD160 8e9209c92c9355ac31dbf1260bd1c556dd9875f8 SHA1 7413dfbeeadc394d47b29e61600046c1c7c05dbc SHA256 1839faa0cf5e429e71054a52db8949e0c50fb8bfbcc9bb4cbdc8cd687559123b
 MD5 d76e359d18b6d4a04f1d743a620ea0a1 stunnel-4.16.ebuild 2434
 RMD160 8e9209c92c9355ac31dbf1260bd1c556dd9875f8 stunnel-4.16.ebuild 2434
@@ -40,10 +28,10 @@ EBUILD stunnel-4.20.ebuild 2432 RMD160 a04fa64fd12eddbfd765ee9fa9c3447b3ca559be
 MD5 f833a64cdf84efc9f491bf490bd0ae12 stunnel-4.20.ebuild 2432
 RMD160 a04fa64fd12eddbfd765ee9fa9c3447b3ca559be stunnel-4.20.ebuild 2432
 SHA256 8c9e93be5916ed463f3037821010b25155ee4392bca86bbc80273187d3ec18e7 stunnel-4.20.ebuild 2432
-MISC ChangeLog 10697 RMD160 c0c2a9be112ddd48ccfcae659ffc2c2965d8697b SHA1 e1bf4d09330ccc51ebee5d8a89f395b2ddfd7adb SHA256 20db9c6dfbbfdbd1f3b933a5b0f0de371c2b2e052c92bb496bc4b93363b36b7a
-MD5 977b589080c2acf657f283e4735e8f0e ChangeLog 10697
-RMD160 c0c2a9be112ddd48ccfcae659ffc2c2965d8697b ChangeLog 10697
-SHA256 20db9c6dfbbfdbd1f3b933a5b0f0de371c2b2e052c92bb496bc4b93363b36b7a ChangeLog 10697
+MISC ChangeLog 10904 RMD160 12b43de83b8cdd7b63cf696bfe5390d4f22341f2 SHA1 a43b9328a9127ac5e672f2e5c7d888b9ff48f70b SHA256 650210243db88ebaae386c9abf1c33a59570a636987b5b416cdc10423e0e8d38
+MD5 9be7bfe0039c9a3c0e9cd55c7bf919a3 ChangeLog 10904
+RMD160 12b43de83b8cdd7b63cf696bfe5390d4f22341f2 ChangeLog 10904
+SHA256 650210243db88ebaae386c9abf1c33a59570a636987b5b416cdc10423e0e8d38 ChangeLog 10904
 MISC metadata.xml 641 RMD160 7ad264c22b9e0705cf00b7985eee8d23c3383310 SHA1 c9314118d8fbc0644eb690f56f9d8859d3f7c578 SHA256 16e547775081b652662ac7156f0b6cfb7d1b8165865416cd154047c9ea6abebb
 MD5 5732619250773b884ad9521fafa2e843 metadata.xml 641
 RMD160 7ad264c22b9e0705cf00b7985eee8d23c3383310 metadata.xml 641
@@ -51,18 +39,16 @@ SHA256 16e547775081b652662ac7156f0b6cfb7d1b8165865416cd154047c9ea6abebb metadata
 MD5 c147f7ff9efb49aa70e28bff38ce11cc files/digest-stunnel-3.26 238
 RMD160 ced1717e587440a5327870783cf11d78b983b83f files/digest-stunnel-3.26 238
 SHA256 68f8e2f6fb82501cef779a17d71e0e9c74210378dba8136cc7b1f2cc0ce63b3d files/digest-stunnel-3.26 238
-MD5 74cdf2d5764ef44fda86ddb756beec18 files/digest-stunnel-4.09-r1 238
-RMD160 2d845b6eaf425fe346304d4cb610bd00002d6efa files/digest-stunnel-4.09-r1 238
-SHA256 2c6f9968f798f7c7ec23a18d7750e9cce962a3768f4473bdf42625c6f57450e1 files/digest-stunnel-4.09-r1 238
-MD5 8697dc3cec55bfaa8e85486c95208902 files/digest-stunnel-4.14-r1 238
-RMD160 9f04ee32a249c4f866d0ad209ec7cb5e2571c839 files/digest-stunnel-4.14-r1 238
-SHA256 d46f635be7019a4516aee11c24a6ce345a37efd71ea3a7e46811d2e5b311d539 files/digest-stunnel-4.14-r1 238
-MD5 0582bb71118bb304fca5d6ed65e4851b files/digest-stunnel-4.15 238
-RMD160 41cbcfef877e5a695cf4aba920012886fdb14c75 files/digest-stunnel-4.15 238
-SHA256 4bfb530603f763063896a557aa83536fcfce2dd2029c06816782b80b3ca772ef files/digest-stunnel-4.15 238
 MD5 0b87729d3a32e79434ba90d7b17f60dc files/digest-stunnel-4.16 238
 RMD160 d90b50d7c324b69802056622cd7d5f83c7fa255f files/digest-stunnel-4.16 238
 SHA256 a5840dc57751d8b506fe62c3664f963b29c2c485470f54be389cbb539d3e2836 files/digest-stunnel-4.16 238
 MD5 adba84ec7a65ca30a2c181a1e483376f files/digest-stunnel-4.20 238
 RMD160 bcaae68477970fdb7e50077541e817dc13363c00 files/digest-stunnel-4.20 238
 SHA256 bf529017b12a2be5431787a9606f397740bac56c6ac75ecc32c428d12a0588d0 files/digest-stunnel-4.20 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHNNEAOeoy/oIi7uwRAuKvAKC1dQyfVTdJjhaI/sgtZ01084R6tgCgoMP9
+R/q+y8GL3RW0UvaZEIqeqm4=
+=fQgL
+-----END PGP SIGNATURE-----
diff --git a/net-misc/stunnel/files/digest-stunnel-4.09-r1 b/net-misc/stunnel/files/digest-stunnel-4.09-r1
deleted file mode 100644
index 4121c90d70eb..000000000000
--- a/net-misc/stunnel/files/digest-stunnel-4.09-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2077669b04c36e4c0baa68348e8860a7 stunnel-4.09.tar.gz 484745
-RMD160 d1e37da2ccfd27224f598c22a031e62ec4c6e8ce stunnel-4.09.tar.gz 484745
-SHA256 56004db651fe180ed23882c555607c8f2723a3e99734d462fe644e531a574271 stunnel-4.09.tar.gz 484745
diff --git a/net-misc/stunnel/files/digest-stunnel-4.14-r1 b/net-misc/stunnel/files/digest-stunnel-4.14-r1
deleted file mode 100644
index 29e2e2c16045..000000000000
--- a/net-misc/stunnel/files/digest-stunnel-4.14-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0969cc4868dfd75f22792ecccc9ec555 stunnel-4.14.tar.gz 488512
-RMD160 ece1c26dcddf6546e428fcc626a45c06f4757d67 stunnel-4.14.tar.gz 488512
-SHA256 8a5712ec0130ca7dff4d954a7aac39b9bc4209bdbcf5ae64a276a55d51a68941 stunnel-4.14.tar.gz 488512
diff --git a/net-misc/stunnel/files/digest-stunnel-4.15 b/net-misc/stunnel/files/digest-stunnel-4.15
deleted file mode 100644
index 7c7c902924d9..000000000000
--- a/net-misc/stunnel/files/digest-stunnel-4.15
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2c00153ad099a5f9c5609e8d1dbbe470 stunnel-4.15.tar.gz 497103
-RMD160 a8d5c9d3fb24d0518975cbb347729f5eba3d3f12 stunnel-4.15.tar.gz 497103
-SHA256 53328496fb9c2ad44bfea31c8beae93b99f5d8f577d5d60cceffc7e160936fe9 stunnel-4.15.tar.gz 497103
diff --git a/net-misc/stunnel/stunnel-3.26.ebuild b/net-misc/stunnel/stunnel-3.26.ebuild
index 4bf2a4ed7503..8c384adec9a4 100644
--- a/net-misc/stunnel/stunnel-3.26.ebuild
+++ b/net-misc/stunnel/stunnel-3.26.ebuild
@@ -1,6 +1,6 @@
 # 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-3.26.ebuild,v 1.16 2007/11/09 20:56:21 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-3.26.ebuild,v 1.17 2007/11/09 21:28:11 ulm Exp $
 
 inherit eutils
 
@@ -18,17 +18,13 @@ DEPEND=">=dev-libs/openssl-0.9.6j
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-}
-
-src_compile() {
-	econf || die
-	emake || die
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.diff"
 }
 
 src_install() {
 	dosbin stunnel
-	dodoc FAQ README HISTORY COPYING BUGS PORTS TODO transproxy.txt
+	dolib.so stunnel.so
+	dodoc FAQ README HISTORY BUGS PORTS TODO transproxy.txt
 	doman stunnel.8
 }
diff --git a/net-misc/stunnel/stunnel-4.09-r1.ebuild b/net-misc/stunnel/stunnel-4.09-r1.ebuild
deleted file mode 100644
index f88ffa4adba1..000000000000
--- a/net-misc/stunnel/stunnel-4.09-r1.ebuild
+++ /dev/null
@@ -1,76 +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.09-r1.ebuild,v 1.12 2007/03/09 17:38:51 vapier 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 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() {
-	econf \
-		`use_enable ipv6`\
-		`use_with tcpd tcp-wrappers` \
-		|| 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
-	newins ${FILESDIR}/stunnel.conf stunnel.conf
-	newinitd ${FILESDIR}/stunnel.rc6 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.14-r1.ebuild b/net-misc/stunnel/stunnel-4.14-r1.ebuild
deleted file mode 100644
index 8d9a1e125a62..000000000000
--- a/net-misc/stunnel/stunnel-4.14-r1.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.14-r1.ebuild,v 1.5 2007/03/09 17:38:51 vapier 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 ~ppc ~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
-	newins ${FILESDIR}/stunnel.conf stunnel.conf
-	newinitd ${FILESDIR}/stunnel.rc6 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.15.ebuild b/net-misc/stunnel/stunnel-4.15.ebuild
deleted file mode 100644
index 07109e4dfaa9..000000000000
--- a/net-misc/stunnel/stunnel-4.15.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.15.ebuild,v 1.6 2007/03/09 17:38:51 vapier 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 ~ia64 ~ppc ~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
-	newins ${FILESDIR}/stunnel.conf stunnel.conf
-	newinitd ${FILESDIR}/stunnel.rc6 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
-}