arm KEYWORDS (and sneak in some cleanup)

2 files changed, 43 insertions, 29 deletions

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index d72a3b4750db..65cd7676ead4 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,26 +1,36 @@
-MD5 abf2690f0d68c9d31321a3b9b508e3e0 stunnel-4.04-r2.ebuild 1770
-MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 62c7b90e85999a9c2b9d339b2cd473df ChangeLog 3642
-MD5 46d08a84d32d31324508bc29a7f2da55 stunnel-4.04-r1.ebuild 1700
-MD5 dc3d110d847ba43de37a1b5a9ec2445f stunnel-4.04-r3.ebuild 1761
 MD5 86eea6bc8f56e00074177c23bc9ddbfa stunnel-3.22-r2.ebuild 920
 MD5 56b1435200867f376c16f045cf081886 stunnel-3.26.ebuild 775
-MD5 3641f651f56057b9c3c7ae8064fc5ae6 stunnel-4.05.ebuild 1765
-MD5 6cdf521ff4c96a48e8863635b78fa596 files/stunnel-4.04-blinding.patch 2526
-MD5 2afb1fc42f8ea8f7b54d47a79f80e33a files/stunnel-4.04-gentoo.diff 321
-MD5 f0bc7b1f2fbe0f8e9fe15b05b8add06d files/stunnel.rc6.4.04-r3 605
-MD5 dfc2feba647c5fb39db0bd98e769fb7e files/digest-stunnel-4.04-r3 64
-MD5 2f553bbcab5ab83a6e45e3ddd73f9944 files/stunnel.conf.4.04-r3 725
-MD5 c0fb8fc4f6d919edc9d76e0f423873eb files/digest-stunnel-4.05 64
+MD5 46d08a84d32d31324508bc29a7f2da55 stunnel-4.04-r1.ebuild 1700
+MD5 abf2690f0d68c9d31321a3b9b508e3e0 stunnel-4.04-r2.ebuild 1770
+MD5 dc3d110d847ba43de37a1b5a9ec2445f stunnel-4.04-r3.ebuild 1761
+MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
+MD5 588f942c44f621f70916528fb0eb35b7 stunnel-4.05.ebuild 1705
+MD5 bf10c9036f0ff4b8578c46b89538aed7 files/digest-stunnel-3.22-r2 64
 MD5 ea2086dcf69dddf6d075a7040d209335 files/digest-stunnel-3.26 64
+MD5 dfc2feba647c5fb39db0bd98e769fb7e files/digest-stunnel-4.04-r1 64
+MD5 dfc2feba647c5fb39db0bd98e769fb7e files/digest-stunnel-4.04-r2 64
 MD5 9177dd12df6261a5bde7e8756c0f1585 files/stunnel-3.22-blinding.patch 3756
 MD5 60507279a2c9abbec2037b9e5a0840f7 files/stunnel-3.22-gentoo.diff 1170
-MD5 bf10c9036f0ff4b8578c46b89538aed7 files/digest-stunnel-3.22-r2 64
-MD5 1b63ee5eed62e328acae738d1306b224 files/stunnel.rc6.4.04-r2 568
-MD5 4839b059fba14c4f7f2acb50888aadac files/stunnel.conf 720
 MD5 b42ca1fbeb5d6454de36aac4cb893294 files/stunnel-3.26-gentoo.diff 941
+MD5 6cdf521ff4c96a48e8863635b78fa596 files/stunnel-4.04-blinding.patch 2526
+MD5 2afb1fc42f8ea8f7b54d47a79f80e33a files/stunnel-4.04-gentoo.diff 321
+MD5 4839b059fba14c4f7f2acb50888aadac files/stunnel.conf 720
+MD5 021f1b3d5a07aa11f572d4fa8a50b4f1 files/stunnel.conf.4.04-r2 721
 MD5 de0ef08d91f0d3b050792c3b20394625 files/stunnel.rc6 541
+MD5 1b63ee5eed62e328acae738d1306b224 files/stunnel.rc6.4.04-r2 568
+MD5 dfc2feba647c5fb39db0bd98e769fb7e files/digest-stunnel-4.04-r3 64
+MD5 2f553bbcab5ab83a6e45e3ddd73f9944 files/stunnel.conf.4.04-r3 725
+MD5 f0bc7b1f2fbe0f8e9fe15b05b8add06d files/stunnel.rc6.4.04-r3 605
+MD5 c0fb8fc4f6d919edc9d76e0f423873eb files/digest-stunnel-4.05 64
 MD5 2afb1fc42f8ea8f7b54d47a79f80e33a files/stunnel-4.05-gentoo.diff 321
-MD5 dfc2feba647c5fb39db0bd98e769fb7e files/digest-stunnel-4.04-r2 64
-MD5 021f1b3d5a07aa11f572d4fa8a50b4f1 files/stunnel.conf.4.04-r2 721
-MD5 dfc2feba647c5fb39db0bd98e769fb7e files/digest-stunnel-4.04-r1 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.8 (GNU/Linux)
+
+iD8DBQFA09lfHTu7gpaalycRAkqxAJ40sTT3qHn9EI7HIYC90FQv4UIC3ACg1A4W
+5sgWLvVVXd7HLVFvnJBgE8o=
+=5qqK
+-----END PGP SIGNATURE-----
diff --git a/net-misc/stunnel/stunnel-4.05.ebuild b/net-misc/stunnel/stunnel-4.05.ebuild
index ff937cc41842..bb7849c9d184 100644
--- a/net-misc/stunnel/stunnel-4.05.ebuild
+++ b/net-misc/stunnel/stunnel-4.05.ebuild
@@ -1,19 +1,21 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.05.ebuild,v 1.2 2004/06/18 17:48:05 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.05.ebuild,v 1.3 2004/06/19 06:12:35 vapier Exp $
 
 inherit ssl-cert eutils
 
-IUSE="static"
-S=${WORKDIR}/${P}
 DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://stunnel.mirt.net/"
 SRC_URI="http://www.stunnel.org/download/stunnel/src/${P}.tar.gz"
-HOMEPAGE="http://stunnel.mirt.net"
-DEPEND="virtual/glibc >=dev-libs/openssl-0.9.6j"
-RDEPEND=">=dev-libs/openssl-0.9.6j"
-KEYWORDS="~x86 ~sparc ~alpha ~amd64 ~ppc"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha arm ~amd64"
+IUSE="static"
+
+DEPEND="virtual/glibc
+	>=dev-libs/openssl-0.9.6j"
+RDEPEND=">=dev-libs/openssl-0.9.6j"
 
 src_unpack() {
 	unpack ${A}; cd ${S}
@@ -21,9 +23,11 @@ src_unpack() {
 }
 
 src_compile() {
-	use static && myconf="${myconf} --disable-shared --enable-static"
-	use static && LDADD="${LDADD} -all-static" && export LDADD
-	econf ${myconf} || die
+	use static && append-ldflags -all-static
+	econf \
+		`use_enable static` \
+		`use_enable !static shared` \
+		|| die
 	emake || die
 }
 
@@ -33,7 +37,7 @@ src_install() {
 
 	into /usr
 	dosbin src/stunnel
-	dodoc AUTHORS BUGS COPYING COPYRIGHT.GPL CREDITS INSTALL NEWS PORTS README TODO
+	dodoc AUTHORS BUGS CREDITS INSTALL NEWS PORTS README TODO
 	dodoc doc/en/transproxy.txt
 	dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html tools/importCA.html
 	doman doc/stunnel.8
@@ -56,7 +60,7 @@ pkg_postinst() {
 	enewuser stunnel
 	enewgroup stunnel
 
-	chown stunnel /etc/stunnel
+	chown stunnel ${ROOT}/etc/stunnel
 
 	einfo "Starting from version 4 stunnel now uses a configuration file for setting up stunnels."
 	einfo "Stunnel can now also be run as a daemon"