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

(Portage version: 2.1.3.19)

8 files changed, 10 insertions, 259 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/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
-}