--- /usr/portage/dev-libs/cryptlib/cryptlib-3.3.3.ebuild	2010-02-14 14:06:25.000000000 -0500
+++ ./cryptlib-3.3.3-r1.ebuild	2010-07-28 20:54:08.231050586 -0400
@@ -6,19 +6,19 @@
 PYTHON_DEPEND="python? 2"
 SUPPORT_PYTHON_ABIS="1"
 
-inherit distutils eutils flag-o-matic multilib toolchain-funcs
+inherit distutils eutils flag-o-matic multilib toolchain-funcs versionator
 
 MY_PV="${PV//.0}"
 MY_PV="${MY_PV//.}"
 
 DESCRIPTION="Powerful security toolkit for adding encryption to software"
 HOMEPAGE="http://www.cs.auckland.ac.nz/~pgut001/cryptlib/"
-DOC_PREFIX="${PN}-3.3.3"
+DOC_PREFIX="${PN}-${PV}"
 SRC_URI="ftp://ftp.franken.de/pub/crypt/cryptlib/cl${MY_PV}.zip
 	doc? ( mirror://gentoo/${DOC_PREFIX}-manual.pdf.bz2 )"
 
 LICENSE="DB"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE="doc ldap odbc python"
 
@@ -66,16 +66,35 @@
 }
 
 src_compile() {
+	local libname="libcl.so.${PV}"
+	
 	# At least -O2 is needed.
 	replace-flags -O  -O2
 	replace-flags -O0 -O2
 	replace-flags -O1 -O2
 	replace-flags -Os -O2
 	is-flagq -O* || append-flags -O2
+	
+	append-flags "-D __UNIX__ -DOSVERSION=2 -DNDEBUG -I."
 
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -c -D__UNIX__ -DNDEBUG -I." || die "emake static failed"
+	if [ -f /usr/include/pthread.h -a \
+	`grep -c PTHREAD_MUTEX_RECURSIVE /usr/include/pthread.h` -ge 0 ] ; then
+		append-flags "-DHAS_RECURSIVE_MUTEX"
+	fi
+	if [ -f /usr/include/pthread.h -a \
+	`grep -c PTHREAD_MUTEX_ROBUST /usr/include/pthread.h` -ge 0 ] ; then
+		append-flags "-DHAS_ROBUST_MUTEX"
+	fi
+
+	use ldap && append-flags -DHAS_LDAP
+	use odbc && append-flags -DHAS_ODBC
+
+	emake directories || die
+	emake toolscripts || die
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -c" Linux || die "emake static failed"
 
-	emake shared CC="$(tc-getCC)" CFLAGS="${CFLAGS} -c -D__UNIX__ -DNDEBUG -I." || die "emake shared failed"
+	emake TARGET=${libname} OBJPATH="./shared-obj/" CC="$(tc-getCC)" \
+	CFLAGS="${CFLAGS} -fPIC -c" Linux || die "emake shared failed"
 
 	if use python; then
 		ln -s libcl.so.${PV} libcl.so || die