--- dev-libs/cryptlib/cryptlib-3.3.1.ebuild
+++ dev-libs/cryptlib/cryptlib-3.3.2.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/cryptlib-3.3.1.ebuild,v 1.1 2007/02/16 14:36:34 alonbl Exp $
 
-inherit eutils multilib flag-o-matic
+inherit eutils flag-o-matic multilib toolchain-funcs
 
 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.0"
+DOC_PREFIX="${PN}-3.3.2"
 SRC_URI="ftp://ftp.franken.de/pub/crypt/cryptlib/cl${MY_PV}.zip
 	doc? ( mirror://gentoo/${DOC_PREFIX}-manual.pdf.bz2 )"
 
@@ -22,7 +22,6 @@
 
 RDEPEND="odbc? ( dev-db/unixODBC )"
 DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
 	app-arch/unzip"
 
 src_unpack() {
@@ -30,9 +29,11 @@
 	unzip -qoa "${DISTDIR}/cl${MY_PV}.zip"
 	use doc && unpack "${DOC_PREFIX}-manual.pdf.bz2"
 
-	# we want our own CFLAGS) ;-)
+	# we want our own CFLAGS ;-)
 	sed -i -e "s:-m.*=pentium::g" -e "s:-fomit-frame-pointer::g" -e "s:-O2::g" \
 		-e "s:-O3::g" -e "s:-O4::g"	makefile || die "sed makefile failed"
+	sed -i -e "s/-march=[[:alnum:]\.=-]*//g" -e "s/-mcpu=[[:alnum:]\.=-]*//g" \
+		-e "s:-O2::g" -e "s:-O3::g" tools/ccopts.sh || die "sed tools/ccopts.sh failed"
 
 	# change 'make' to '$(MAKE)'
 	sed -i -e "s:@\?make:\$(MAKE):g" makefile || die "sed makefile failed"
@@ -42,8 +43,11 @@
 	# assembly parts are disabled.
 	sed -i -e 's:i\[3,4,5,6\]86:___:g' makefile || die "sed makefile failed"
 
-	# fix soname and strip issues
-	epatch "${FILESDIR}/${DOC_PREFIX}-ld.patch"
+	# respect LDFLAGS and fix soname and strip issues
+	epatch "${FILESDIR}/${P}-ld.patch"
+
+	# fix build
+	epatch "${FILESDIR}/${P}-pthread_yield.patch"
 }
 
 src_compile() {
@@ -51,20 +55,19 @@
 	replace-flags -O  -O2
 	replace-flags -Os -O2
 	replace-flags -O1 -O2
+	[[ "${CFLAGS}" =~ -O[2-9] ]] || append-flags -O2
 	append-flags -c -D__UNIX__ -DNDEBUG -I.
 	# QA issue for pthread_yield
 	append-flags -D_GNU_SOURCE
 
-	emake -j1 CFLAGS="${CFLAGS}" SCFLAGS="${CFLAGS} -fPIC" || \
-		die "emake static failed"
+	emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake static failed"
 
-	emake -j1 shared CFLAGS="${CFLAGS}" SCFLAGS="${CFLAGS} -fPIC" || \
-		die "emake shared failed"
+	emake -j1 shared CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake shared failed"
 }
 
 src_install() {
-	dolib.so "libcl.so.3.3.0"
-	dosym "libcl.so.3.3.0" "/usr/$(get_libdir)/libcl.so"
+	dolib.so "libcl.so.3.3.2"
+	dosym "libcl.so.3.3.2" "/usr/$(get_libdir)/libcl.so"
 	dolib.a "libcl.a"
 
 	insinto /usr/include