Fix quoting in cp command and have it die for good measure. Respect LDFLAGS (bug #335001), CC. Do not hard-wire CFLAGS. Make sed die. Update HOMEPAGE, SRC_URI.

Package-Manager: portage-2.2_rc84/cvs/Linux i686

4 files changed, 62 insertions, 46 deletions

diff --git a/net-misc/sslwrap/ChangeLog b/net-misc/sslwrap/ChangeLog
index a6e80f8a59bb..5d589f7f00da 100644
--- a/net-misc/sslwrap/ChangeLog
+++ b/net-misc/sslwrap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/sslwrap
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sslwrap/ChangeLog,v 1.20 2009/03/22 13:27:00 jmbsvicetto Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sslwrap/ChangeLog,v 1.21 2010/09/20 19:05:15 jer Exp $
+
+*sslwrap-2.0.6-r2 (20 Sep 2010)
+
+  20 Sep 2010; Jeroen Roovers <jer@gentoo.org> -sslwrap-2.0.6.ebuild,
+  +sslwrap-2.0.6-r2.ebuild:
+  Fix quoting in cp command and have it die for good measure. Respect
+  LDFLAGS (bug #335001), CC. Do not hard-wire CFLAGS. Make sed die. Update
+  HOMEPAGE, SRC_URI.
 
   22 Mar 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   metadata.xml, sslwrap-2.0.6.ebuild, sslwrap-2.0.6-r1.ebuild:
diff --git a/net-misc/sslwrap/Manifest b/net-misc/sslwrap/Manifest
index 5c167f07defe..7203dec39e93 100644
--- a/net-misc/sslwrap/Manifest
+++ b/net-misc/sslwrap/Manifest
@@ -1,7 +1,8 @@
 AUX 2.0.6-openssl-0.9.7.patch 459 RMD160 abe01b9907b2444b8af87158c001ddee1b69de82 SHA1 83ee55896a38706cd6c914a85acd8b2a7c6d2dcb SHA256 742968e1c4b73b50930e84908e4043e47735b97ed8c4d5e9156dc8e78352ebd1
+DIST sslwrap-2.0.6.tar.gz 21170 RMD160 9b212acc6df16cded31ec6e85de8360ed99b9969 SHA1 fc8a4a4134d2668705f9fc4ac92a45a847c3edf9 SHA256 596a1bf61a457662e754b9fcfec6b3df7fb2f6c88498bd76ef8027f08c3af336
 DIST sslwrap-gentoo.tar.bz2 10886 RMD160 13e569fdab4cd1060baf3873ee33c860e20f4cb0 SHA1 796e8a504580ba4ec0f083d35c633b992ce91411 SHA256 17e6d7edf48b1b8b6edbf72cbc4b545079192a0f5637317dfbe175e373662a3f
 DIST sslwrap206.tar.gz 21170 RMD160 9b212acc6df16cded31ec6e85de8360ed99b9969 SHA1 fc8a4a4134d2668705f9fc4ac92a45a847c3edf9 SHA256 596a1bf61a457662e754b9fcfec6b3df7fb2f6c88498bd76ef8027f08c3af336
 EBUILD sslwrap-2.0.6-r1.ebuild 1047 RMD160 1290576d665a0e6447d2c8dbe8fede907060d53f SHA1 b4b0d11b9a5fd7f8790f3d41b380e359d1b54a59 SHA256 67423c2ee27c1d83ab270d4c7bc4fb4eb410a164c97c911836b2c7d2c8fde9b3
-EBUILD sslwrap-2.0.6.ebuild 977 RMD160 a30d900806a36c02df3925091c974c5b2b760248 SHA1 7740dfd6d36462c518aa12296c36ffb4f749bef4 SHA256 b7c6c2af027406ba9dcfa6ea45fe64d658910ee1ddcb018d6775bb7669dd33e1
-MISC ChangeLog 2579 RMD160 a679e827cd1c2fed3c61fd766587da5663105e3f SHA1 5c4e54c5622c8cd0dc55085bb9030ee44bfd8421 SHA256 152a15d6d45e9337806a45d34f33b33aa09c6f5e8534c8a055464bbf3770b3e3
+EBUILD sslwrap-2.0.6-r2.ebuild 1171 RMD160 dfe303cff0ad90c905e0aaaa1bccb0ddeccb6004 SHA1 6a766c7ccffb2ffcc6af1c538adc21ad7ad92a3f SHA256 25d2f8c1941009bd0b63b25e7f2f8b3c32d1975fee3a4acb272e8d56397b9849
+MISC ChangeLog 2869 RMD160 d83088140430180cfd100d7fcf6504f0802d9548 SHA1 40b3f1888579aaffc0a5d8b3bdba4263391f3a45 SHA256 10dae162e92d10dde901c6aea933f53bb423371b20bf11db3847f2ca4cd50e1b
 MISC metadata.xml 241 RMD160 dbd39e15096a9c09432225b4dee87bcadcb33907 SHA1 1beb1a93e4526085c26b282271027ad508b29059 SHA256 950a704ea9fcebef2e688e8bd6e0f0d292c967e246d58e4778b9955b1d615ab4
diff --git a/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild b/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild
new file mode 100644
index 000000000000..3f4ee128a36c
--- /dev/null
+++ b/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild,v 1.1 2010/09/20 19:05:16 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="TSL/SSL - Port Wrapper"
+HOMEPAGE="http://www.rickk.com/sslwrap/index.htm"
+SRC_URI="http://www.rickk.com/${PN}/${PN}.tar.gz -> ${P}.tar.gz
+	mirror://gentoo/${PN}-gentoo.tar.bz2"
+
+LICENSE="sslwrap"
+SLOT="0"
+KEYWORDS="~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/openssl-0.9.6"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}${PV//.}
+
+src_prepare() {
+	sed -i Makefile \
+		-e 's:gcc:$(CC):' \
+		-e 's:/usr/local/ssl/include:/usr/include/openssl:' \
+		|| die "sed Makefile"
+
+	cp -v "${WORKDIR}"/${PN}-gentoo/*.c . || die "cp"
+
+	has_version '=dev-libs/openssl-0.9.7*' \
+		&& epatch "${FILESDIR}/${PV}-openssl-0.9.7.patch"
+
+	sed -i *.h *.c \
+		-e 's:OPENSSL":"openssl\/:g' \
+		-e 's:SSL_OP_NON_EXPORT_FIRST:SSL_OP_CIPHER_SERVER_PREFERENCE:g' \
+		|| die "sed *.h *.c"
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) OPT="${CFLAGS} ${LDFLAGS}" || die "emake"
+}
+
+src_install() {
+	dosbin sslwrap
+	dodoc README
+	dohtml -r ./
+}
diff --git a/net-misc/sslwrap/sslwrap-2.0.6.ebuild b/net-misc/sslwrap/sslwrap-2.0.6.ebuild
deleted file mode 100644
index 18e5005380cb..000000000000
--- a/net-misc/sslwrap/sslwrap-2.0.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sslwrap/sslwrap-2.0.6.ebuild,v 1.13 2009/03/22 13:27:00 jmbsvicetto Exp $
-
-inherit eutils
-
-DESCRIPTION="TSL/SSL - Port Wrapper"
-HOMEPAGE="http://quiltaholic.com/rickk/sslwrap/"
-SRC_URI="http://quiltaholic.com/rickk/sslwrap/${PN}${PV/.0./0}.tar.gz
-	mirror://gentoo/${PN}-gentoo.tar.bz2"
-
-LICENSE="sslwrap"
-SLOT="0"
-KEYWORDS="x86 sparc"
-IUSE=""
-
-DEPEND=">=dev-libs/openssl-0.9.6"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}${PV//.}
-
-src_unpack () {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e "s:-O2:${CFLAGS}:" \
-		-e "s:/usr/local/ssl/include:/usr/include/openssl:" \
-		Makefile
-
-	cp "${WORKDIR}/${PN}-gentoo/*.c" "${S}"
-	has_version '=dev-libs/openssl-0.9.7*' \
-		&& epatch "${FILESDIR}/${PV}"-openssl-0.9.7.patch
-	sed -i \
-		-e "s:OPENSSL\":\"openssl\/:g" \
-		*.h *.c
-}
-
-src_install() {
-	dosbin sslwrap
-	dodoc README
-	dohtml -r ./
-}