Bug #151932 fixed. Small cleanups and dependency corrections. Old versions removed.

Package-Manager: portage-2.1.2_pre3-r3

4 files changed, 37 insertions, 8 deletions

diff --git a/dev-libs/dvssl/ChangeLog b/dev-libs/dvssl/ChangeLog
index 5c15105eb878..b0c1c514d3ef 100644
--- a/dev-libs/dvssl/ChangeLog
+++ b/dev-libs/dvssl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/dvssl
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvssl/ChangeLog,v 1.13 2005/11/22 12:52:08 ka0ttic Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvssl/ChangeLog,v 1.14 2006/10/21 23:24:05 dev-zero Exp $
+
+  21 Oct 2006; Tiziano Müller <dev-zero@gentoo.org> ChangeLog:
+  Bug #151932 fixed. Small cleanups and dependency corrections. Old versions
+  removed.
 
   22 Nov 2005; Aaron Walker <ka0ttic@gentoo.org> metadata.xml:
   Add to cpp herd.
diff --git a/dev-libs/dvssl/dvssl-0.5.4-r2.ebuild b/dev-libs/dvssl/dvssl-0.5.4-r2.ebuild
index 195845c47ced..04231297305b 100644
--- a/dev-libs/dvssl/dvssl-0.5.4-r2.ebuild
+++ b/dev-libs/dvssl/dvssl-0.5.4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvssl/dvssl-0.5.4-r2.ebuild,v 1.3 2005/08/13 23:12:50 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvssl/dvssl-0.5.4-r2.ebuild,v 1.4 2006/10/21 23:24:05 dev-zero Exp $
 
 inherit eutils
 
@@ -14,20 +14,23 @@ SLOT="0"
 IUSE="doc"
 
 DEPEND="dev-libs/openssl
-	dev-libs/dvnet"
+	dev-libs/dvnet
+	dev-libs/dvutil"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/${P}-fix-underquoted-m4.diff
+	epatch "${FILESDIR}/${P}-fix-underquoted-m4.diff"
+	epatch "${FILESDIR}/${P}-gcc41.patch"
 
 	sed -i 's|^\(SUBDIRS =.*\)doc\(.*\)$|\1\2|' Makefile.in || \
 		die "sed Makefile.in failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog NEWS README
 
 	if use doc ; then
diff --git a/dev-libs/dvssl/files/digest-dvssl-0.5.4-r2 b/dev-libs/dvssl/files/digest-dvssl-0.5.4-r2
index 607df9e2d5ff..0739cc27e709 100644
--- a/dev-libs/dvssl/files/digest-dvssl-0.5.4-r2
+++ b/dev-libs/dvssl/files/digest-dvssl-0.5.4-r2
@@ -1 +1,3 @@
 MD5 611163efd721e54561ab8c624387cd4f dvssl-0.5.4.tar.gz 388214
+RMD160 7d736acea7575c4a8deb032605b731367cba6f61 dvssl-0.5.4.tar.gz 388214
+SHA256 4d1814a66485d3b8ed9c1bcef0df9c1f440ef4958647efe023fba66ea2d62b89 dvssl-0.5.4.tar.gz 388214
diff --git a/dev-libs/dvssl/files/dvssl-0.5.4-gcc41.patch b/dev-libs/dvssl/files/dvssl-0.5.4-gcc41.patch
new file mode 100644
index 000000000000..2f743916e370
--- /dev/null
+++ b/dev-libs/dvssl/files/dvssl-0.5.4-gcc41.patch
@@ -0,0 +1,20 @@
+--- dvssl/sslsocket.h.orig	2006-10-22 01:36:33.000000000 +0200
++++ dvssl/sslsocket.h	2006-10-22 01:37:19.000000000 +0200
+@@ -56,7 +56,7 @@
+   /*! The Dv::Ssl::SslContext parameter need not contain private key or
+       certificate file information since it is not used.
+   */
+-  SslSocket::SslSocket(SslContext& context,const std::string& host,int port,
++  SslSocket(SslContext& context,const std::string& host,int port,
+   	size_t bufsize = 1024, int msecs=0);
+   //! Destructor.
+   ~SslSocket();
+@@ -70,7 +70,7 @@
+ 
+ private:
+   //! Constructor version used by Dv::Ssl::SslSocket::fs2socket.
+-  SslSocket::SslSocket(SslContext& context,int fd,size_t bufsize=1024, int msecs = 0);
++  SslSocket(SslContext& context,int fd,size_t bufsize=1024, int msecs = 0);
+   //! Used internally by Dv::Ssl::SslServerSocket::accept.
+   static ref<SslSocket>	fd2sslsocket(SslContext&, int fd, size_t bufsz=1024, int msecs=0);
+