Update .ebuild to meet current requirement(s)

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 188 insertions, 32 deletions

diff --git a/net-misc/sslwrap/ChangeLog b/net-misc/sslwrap/ChangeLog
index f20c89a1d483..786fa898c1b7 100644
--- a/net-misc/sslwrap/ChangeLog
+++ b/net-misc/sslwrap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/sslwrap
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sslwrap/ChangeLog,v 1.24 2012/12/01 19:37:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sslwrap/ChangeLog,v 1.25 2012/12/02 04:41:00 ssuominen Exp $
+
+  02 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> sslwrap-2.0.6-r2.ebuild,
+  +files/sslwrap-2.0.6-build.patch:
+  Update .ebuild to meet current requirement(s)
 
   01 Dec 2012; Raúl Porcel <armin76@gentoo.org> sslwrap-2.0.6-r1.ebuild,
   sslwrap-2.0.6-r2.ebuild:
diff --git a/net-misc/sslwrap/Manifest b/net-misc/sslwrap/Manifest
index e7f96c5f07e1..5d1c91b6f09e 100644
--- a/net-misc/sslwrap/Manifest
+++ b/net-misc/sslwrap/Manifest
@@ -2,17 +2,22 @@
 Hash: SHA256
 
 AUX 2.0.6-openssl-0.9.7.patch 459 SHA256 742968e1c4b73b50930e84908e4043e47735b97ed8c4d5e9156dc8e78352ebd1 SHA512 c7fe25f8e3e95a1e89bd50bc225625d60081650b82dc013426bda205391f81fcf8bc8beaae4e062585ede485c580e0d4cb0e54945583aba330a716c6dd9ca1d7 WHIRLPOOL 486bb18d0765abf43fc782283cc88826f4d8961051f353524fc55add3242ae39a35e48bb520c7d2b2ed821bde78c5339183f58634416f8c14bf1f616ca3ed8ef
+AUX sslwrap-2.0.6-build.patch 4071 SHA256 3a270182e17cf80f712f266df29d87f72f77222ef20bbdc79ae51f251245866b SHA512 f8018bac13a692469bbee036b69cc888b090b42dc3414e86ab73c9161996e27b34875c6aaac463123189253b1ce6512da7fad2985612af6196c345647e0e956f WHIRLPOOL cf829c74de9a37de3807d2351fd9a22c3eb27f91ccf7cc9e94125d75f6b36b768bed50a823020336992d5c877d2341a5c6bfd8e8df5a4183233b94017e59636d
 DIST sslwrap-2.0.6.tar.gz 21170 SHA256 596a1bf61a457662e754b9fcfec6b3df7fb2f6c88498bd76ef8027f08c3af336 SHA512 627c25bdf45245f9b3e8d03272fc46a0ef8d1c356e2b7990898b07267c2bbb28efd13d5ca97d330ce7369eedd2d20b5fa781f2e1a00ac732407e06d0b3a8890d WHIRLPOOL 8d3c6843413d8a77830a3533aa972cc676bf2aa934cb259b3b04a485aedc052551914668efbcff071fcd50fd0f21ea9cd57c702f95d803f06315d92e79fafc89
 DIST sslwrap-gentoo.tar.bz2 10886 SHA256 17e6d7edf48b1b8b6edbf72cbc4b545079192a0f5637317dfbe175e373662a3f SHA512 b08ac8c937ec23842dc6ea32e78a77c21f569c32369a2d73ab7e60acec6a1ff80c7e0cb7f308096cc9c2d67648b4f99df337ca656a6853a50ebc2ac104d55852 WHIRLPOOL dfd06fb56a791b3240d46b36caa76d33698849b748e795d373c45d62664bd578960c39e4850292d56b41200c7c5bdf63dbcb4c190ca76bb06f5860073675cd87
 DIST sslwrap206.tar.gz 21170 SHA256 596a1bf61a457662e754b9fcfec6b3df7fb2f6c88498bd76ef8027f08c3af336
 EBUILD sslwrap-2.0.6-r1.ebuild 1037 SHA256 cc83ac37cbcb33b2111804c5f83dda539e49a6efee8946d634e09ab451229b8e SHA512 3a7ba94ddd7cece548b9b90deb8c52a00378d2cef16396c037b214e9e55ca3053a05cfd0cceb94a52e3c3a3c0e47616978c3933f136032da365a3980215ab137 WHIRLPOOL 4822c4a4e696d41963cfad3824f1e6a5fcc085915da0cb8ed60694f4a42a71d2ddd4a5e741d97eb7ed38a5cd26427d9494cd7edc0fb9d7976cdb675e1b94caf5
-EBUILD sslwrap-2.0.6-r2.ebuild 1174 SHA256 d8b8c9f70143e8bdf0d869df4727602e99ddb1f4774d12c3c56a9a43bf3da461 SHA512 a696295a9e45b151bf8da79c7acb8758f1ae1ab62deee2eb976558a23202d7cbe3738feeef2d11672910a25fe5a78a3ef9bd2786417f9517e51460977fcc21b4 WHIRLPOOL 43fda7ada2998b47f96169285ae3b494f20911383693cd76c0200c4232184002deefae7f5a6dc632a6f8a7b01e835efe0a8867cd8617e4b76c47f1f8fa814c45
-MISC ChangeLog 3211 SHA256 a2316cd81e93556e7b1d5fc9830c706049911b8b843d4bd5748bc80df2765bb6 SHA512 2e68e14a13e4b657fdb9a38040011373cdf1acfb12cbab683146e744aa92264c83761d8ab2bfef28a2e484f33f71ad8424f8771ee375247e8cdc878c228512b1 WHIRLPOOL 185c641dc8c775e36c713440f1d29df71e84c1249d16242eb43296acfcc79b93fe3daf05f73f67e5268fe931c062720ac8ec41b48702f23e0d72210f2670427b
+EBUILD sslwrap-2.0.6-r2.ebuild 721 SHA256 b3a3ffaf5795a9b8a41159c0e21d975c96e32ecaa072c72223c6db2259885d07 SHA512 452ff2f1008a477bee26bd3a615a0ffad4e1ca767dfdd821f150b40cfe49d7eb471e7777948e435a4e7e05e7152de76a98745024a719589e22779d9ff17f79f3 WHIRLPOOL ab4037c0f9a44585c0a61588063124831aee181e5849cac7d7f5065dfa42db64579a468ea3da88ae87f2b3fe4dfc6e81a613588137f35215e7859405963d0765
+MISC ChangeLog 3377 SHA256 a8cb048015212cc93ba788a212ecd47a4967919e40581bd4ee2c4884d0afe581 SHA512 a3c25f12624bb60835f38256477a61006e68559369eaa0b9c7cdee9ee5ca7f7367b9a28fbe7a9be2dc17f42b89215bb88ce8898b38a9dd7df59694fd8006dbba WHIRLPOOL 6aefd9647b0f70d8da489d84f81666e83a72c9a9f02b8d23f0d64ecb9f1309e78dd69a4c2b45da852fe4116329e47991f8a61bcb3c2a2c33b588cb761ac2562b
 MISC metadata.xml 218 SHA256 e124ad5b959f26606c176ee0a8cc3e59839b98e93c712fe4b699e7e4df11fd6b SHA512 d689950ba64adf80b0b7b667dfa81f230bc7ecf280eabba76ea3f4f0ecec3105d850cb24d34a88243debd08febe8bbd95e389fb8463f6aaeffe96a39a87d569b WHIRLPOOL 72aa8e8b9896ec82acedd6f4b4a1876861523430bc29bc96fcc03da4475e78ddb3802268b81d80d535d6942baad1508fe939a9a769b7635dfebbef7076962ee6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC6XHgACgkQuQc30/atMkAmzQCgtgkjQp0HO4gVc6zsQiu6kYFH
-kLYAn2wLrXRpo09GgiO01Zg79zIEmXab
-=Wkzx
+iQEcBAEBCAAGBQJQutveAAoJEEdUh39IaPFNlCIH/iNWqH/Lf4SoS6TB0k6kdKLf
+16rilqjl25iW47eBNTFHwluvGq9g7vDi3X0aWYZa0bac1hOGvJSk/s3GsZ1vjyAi
+8nw17Q1uDrCTkn/qSUV2YE9JAiTJ1I0VWk4ifGujP4SyBIPDMF2cIccVhm5FVM9q
+xBmJNAKSYfiFj+R5b30zXFhuXOYOSpyC5UTogSdQp5LHvRhHU6pLJJ2bOHW6xfkk
+nOMOaU9Veu7cnHEdXvZnPGvy1My+kfk5Khi+lEsNAVOEZztC0mOSsjAelrnqD5bS
+XZ49Pfb3yE0Gnxj65CM41mntTFG77yOP4Zt9T37Mpxm3cNIHAv60FoJTqJ/MrGU=
+=7WQM
 -----END PGP SIGNATURE-----
diff --git a/net-misc/sslwrap/files/sslwrap-2.0.6-build.patch b/net-misc/sslwrap/files/sslwrap-2.0.6-build.patch
new file mode 100644
index 000000000000..7d6ce0c46db3
--- /dev/null
+++ b/net-misc/sslwrap/files/sslwrap-2.0.6-build.patch
@@ -0,0 +1,161 @@
+diff -ur sslwrap206.orig/apps.h sslwrap206/apps.h
+--- sslwrap206.orig/apps.h	2000-11-12 00:01:25.000000000 +0200
++++ sslwrap206/apps.h	2012-12-02 06:27:36.774823569 +0200
+@@ -65,9 +65,9 @@
+ #include "../e_os.h"
+ #endif
+ 
+-#include OPENSSL"buffer.h"
+-#include OPENSSL"bio.h"
+-#include OPENSSL"crypto.h"
++#include "openssl/buffer.h"
++#include "openssl/bio.h"
++#include "openssl/crypto.h"
+ /*#include "progs.h"*/
+ 
+ #ifdef WIN16
+diff -ur sslwrap206.orig/Makefile sslwrap206/Makefile
+--- sslwrap206.orig/Makefile	2000-11-12 00:01:25.000000000 +0200
++++ sslwrap206/Makefile	2012-12-02 06:34:57.362496172 +0200
+@@ -1,28 +1,9 @@
+-
+ SRC = s_server.c s_socket.c s_cb.c
+-
+-# For Solaris2.6
+-#EXTLIBS = -lxnet
+-
+-# Debug/Optimizations
+-#OPT = -g
+-OPT = -O2
+-
+-# Define 
++LIBS = `pkg-config --libs openssl`
+ OPENSSL="\"openssl/\""
+-#OPENSSL=""
+ 
+-all :
+-	gcc -o sslwrap ${SRC} ${OPT} -DFLAT_INC -DOPENSSL=${OPENSSL} \
+-		-L/usr/local/ssl/lib -lssl -lcrypto \
+-		-I/usr/local/ssl/include \
+-		${EXTLIBS}
++all:
++	$(CC) $(LDFLAGS) $(CFLAGS) -o sslwrap ${SRC} -DFLAT_INC -DOPENSSL=${OPENSSL} ${LIBS}
+ 
+ clean:
+ 	rm -f sslwrap *.o *~
+-
+-
+-
+-
+-
+-
+diff -ur sslwrap206.orig/s_cb.c sslwrap206/s_cb.c
+--- sslwrap206.orig/s_cb.c	2000-11-12 00:01:25.000000000 +0200
++++ sslwrap206/s_cb.c	2012-12-02 06:27:36.078783978 +0200
+@@ -63,9 +63,9 @@
+ #include "apps.h"
+ #undef NON_MAIN
+ #undef USE_SOCKETS
+-#include OPENSSL"err.h"
+-#include OPENSSL"x509.h"
+-#include OPENSSL"ssl.h"
++#include "openssl/err.h"
++#include "openssl/x509.h"
++#include "openssl/ssl.h"
+ #include "s_apps.h"
+ 
+ int verify_depth=0;
+diff -ur sslwrap206.orig/s_server.c sslwrap206/s_server.c
+--- sslwrap206.orig/s_server.c	2000-11-12 00:11:18.000000000 +0200
++++ sslwrap206/s_server.c	2012-12-02 06:27:36.080784083 +0200
+@@ -27,11 +27,7 @@
+  * Version 2.0.5
+  * Compatibility with OpenSSL 0.9.4
+  *
+- * Version 2.0.6
+- * Changed Malloc to malloc and Free to free
+- * Changed #include "err.h" to #include OPENSSL"err.h"
+- *
+- * Copyright 1997-9, 2000 Rick R. Kaseguma
++ * Copyright 1997-9 Rick R. Kaseguma
+  * All rights reserved
+  *
+  * Feel free to use this as you want for commercial or non-commercial use,
+@@ -121,14 +117,14 @@
+ #ifdef WIN16
+ #define APPS_WIN16
+ #endif
+-#include OPENSSL"lhash.h"
+-#include OPENSSL"bn.h"
++#include "openssl/lhash.h"
++#include "openssl/bn.h"
+ #define USE_SOCKETS
+ #include "apps.h"
+-#include OPENSSL"err.h"
+-#include OPENSSL"pem.h"
+-#include OPENSSL"x509.h"
+-#include OPENSSL"ssl.h"
++#include "err.h"
++#include "openssl/pem.h"
++#include "openssl/x509.h"
++#include "openssl/ssl.h"
+ #include "s_apps.h"
+ 
+ #ifndef NOPROTO
+@@ -468,7 +464,7 @@
+ 
+ 	if (bugs) SSL_CTX_set_options(ctx,SSL_OP_ALL);
+ 	if (hack) SSL_CTX_set_options(ctx,SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG);
+-	if (hack) SSL_CTX_set_options(ctx,SSL_OP_NON_EXPORT_FIRST);
++	if (hack) SSL_CTX_set_options(ctx,SSL_OP_CIPHER_SERVER_PREFERENCE);
+ 
+ 	if (state) SSL_CTX_set_info_callback(ctx,apps_ssl_info_callback);
+ 
+@@ -622,7 +618,7 @@
+ #endif /*NO_EXEC*/
+ 	}
+ 
+-	if ((buf=malloc(BUFSIZZ)) == NULL)
++	if ((buf=CRYPTO_malloc(BUFSIZZ,__FILE__,__LINE__)) == NULL)
+ 		{
+ 		BIO_printf(bio_err,"out of memory\n");
+ 		goto err;
+@@ -729,7 +725,7 @@
+ 	if (buf != NULL)
+ 		{
+ 		memset(buf,0,BUFSIZZ);
+-		free(buf);
++		CRYPTO_free(buf);
+ 		}
+ 
+ 	return(ret);
+diff -ur sslwrap206.orig/s_socket.c sslwrap206/s_socket.c
+--- sslwrap206.orig/s_socket.c	2000-11-12 00:03:47.000000000 +0200
++++ sslwrap206/s_socket.c	2012-12-02 06:27:36.081784132 +0200
+@@ -67,7 +67,7 @@
+ #undef USE_SOCKETS
+ #undef NON_MAIN
+ #include "s_apps.h"
+-#include OPENSSL"ssl.h"
++#include "openssl/ssl.h"
+ 
+ #ifndef NOPROTO
+ static struct hostent *GetHostByName(char *name);
+@@ -305,7 +305,7 @@
+ 			return(0);
+ 			}
+ 		i=(*cb)(name,sock, sock);
+-		if (name != NULL) free(name);
++		if (name != NULL) CRYPTO_free(name);
+ 		SHUTDOWN(sock);
+ 		if (i < 0)
+ 			{
+@@ -410,7 +410,7 @@
+ 		}
+ 	else
+ 		{
+-		if ((*host=(char *)malloc(strlen(h1->h_name)+1)) == NULL)
++		if ((*host=(char *)CRYPTO_malloc(strlen(h1->h_name)+1,__FILE__,__LINE__)) == NULL)
+ 			{
+ 			perror("Malloc");
+ 			return(0);
diff --git a/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild b/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild
index 354fa5649023..14ac899cb4a3 100644
--- a/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild
+++ b/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild
@@ -1,49 +1,35 @@
 # Copyright 1999-2012 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.4 2012/12/01 19:37:27 armin76 Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild,v 1.5 2012/12/02 04:41:00 ssuominen Exp $
 
+EAPI=5
 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"
+SRC_URI="http://www.rickk.com/${PN}/${PN}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="sslwrap"
 SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE=""
 
-DEPEND=">=dev-libs/openssl-0.9.6"
-RDEPEND="${DEPEND}"
+RDEPEND="dev-libs/openssl:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 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"
+pkg_setup() {
+	tc-export CC
 }
 
-src_compile() {
-	emake CC=$(tc-getCC) OPT="${CFLAGS} ${LDFLAGS}" || die "emake"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
 }
 
 src_install() {
-	dosbin sslwrap
+	dosbin ${PN}
 	dodoc README
-	dohtml -r ./
+	dohtml -r .
 }