Revision bump. Address QA issues in bug 330289 and bug 298461.

Package-Manager: portage-2.1.8.3/cvs/Linux i686

3 files changed, 138 insertions, 2 deletions

diff --git a/dev-libs/cryptlib/ChangeLog b/dev-libs/cryptlib/ChangeLog
index 39c76f5742b1..6dd63ce0d3a2 100644
--- a/dev-libs/cryptlib/ChangeLog
+++ b/dev-libs/cryptlib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/cryptlib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/ChangeLog,v 1.20 2010/02/04 18:18:04 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/ChangeLog,v 1.21 2010/10/13 14:59:47 c1pher Exp $
+
+*cryptlib-3.3.3-r1 (13 Oct 2010)
+
+  13 Oct 2010; Dane Smith <c1pher@gentoo.org> +cryptlib-3.3.3-r1.ebuild:
+  Revision bump. Address the QA issues wrt bugs #298461 and bug #330289.
+  Also
+  contains some cosmetic fixes.
 
   04 Feb 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   cryptlib-3.3.3.ebuild:
diff --git a/dev-libs/cryptlib/Manifest b/dev-libs/cryptlib/Manifest
index 090708547b15..0326de6c4aa8 100644
--- a/dev-libs/cryptlib/Manifest
+++ b/dev-libs/cryptlib/Manifest
@@ -2,6 +2,7 @@ AUX cryptlib-3.3.2-external-zlib.patch 1086 RMD160 9f9da93a99945d66302d3bb458029
 AUX cryptlib-3.3.2-ld.patch 821 RMD160 391e5a689f906a858c20be3721ccc3c3c81faa15 SHA1 2fe7573d1cd3f9f2f7d6ec18568420ac01d288a7 SHA256 0e813cd10d11f0dcfb8420d5e8690bf682faeb50e83c221a7e5bd35d44eaab4f
 DIST cl333.zip 4530664 RMD160 4c84557c088b114cdc81e36ed3cc29960b822698 SHA1 128d24c98f1406cb4ba547617a73ec1e254caf33 SHA256 93e790963a93dd97843bce73908768bcf391103ebf4d71c893d4d35a220d327e
 DIST cryptlib-3.3.3-manual.pdf.bz2 1066618 RMD160 27f18912b4f0194b76ca3a9a53839ec028c2473b SHA1 a87611f8aa69117b9bc511bb6c865ab8d723a94b SHA256 a52b0a7ef4c7288442f3189e1050492fa9c6c5048a09ce5f161a2a402dd068da
+EBUILD cryptlib-3.3.3-r1.ebuild 3489 RMD160 38329d92ec975589bca2eb839027947d544d107b SHA1 a173c7aa1ceb77b512ab09c1605c2b28fcac1a7f SHA256 e118b1020aa1ece749c7bc54d4da751648d38426944cf1aec4e28f6b8316b7f0
 EBUILD cryptlib-3.3.3.ebuild 2931 RMD160 271ba7592a93daa179767b23b7eb511a9c1be8bf SHA1 3e38e4002d77868f9fb1bd1453000ea20e261f62 SHA256 46bd97319bb5a2a7f432da521a5217fedad85d8ba5e479a2960bdcd66f6bff2c
-MISC ChangeLog 4415 RMD160 e8ab586a6754851dd1301fb545648f243663688d SHA1 aee7adbdcd4a32130f71f4f94544eeb689d80e22 SHA256 fbf9f5c748d8fe7269c9e5af58ba409ee35fd733a9dfdcf2a560511d7e093be0
+MISC ChangeLog 4633 RMD160 0d0f265648cd7365ac6c7a96e07895dafc4bc7bf SHA1 add3e5085d13f7ce6f4151071c4f097f2316a94d SHA256 eb4a459c78fe254dc5ff6687b7742c85e68e38e98ab02294ef1cab227764cb89
 MISC metadata.xml 217 RMD160 d1e82852b46d347f8fc7027e72959160b5ade089 SHA1 d899a6870ab5af7dfe496ae91441fb7c103556a9 SHA256 5153c83d89a45bec698ace8ba637c14762333a6ddbe7ca798af6ce19f155d759
diff --git a/dev-libs/cryptlib/cryptlib-3.3.3-r1.ebuild b/dev-libs/cryptlib/cryptlib-3.3.3-r1.ebuild
new file mode 100644
index 000000000000..688f6c70e367
--- /dev/null
+++ b/dev-libs/cryptlib/cryptlib-3.3.3-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/cryptlib-3.3.3-r1.ebuild,v 1.1 2010/10/13 14:59:47 c1pher Exp $
+
+EAPI="2"
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+
+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}-${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"
+SLOT="0"
+IUSE="doc ldap odbc python"
+
+S="${WORKDIR}"
+
+RDEPEND="sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	odbc? ( dev-db/unixODBC )
+	!dev-python/cryptlib_py"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+RESTRICT_PYTHON_ABIS="3.*"
+
+src_unpack() {
+	# we need the -a option, so we can not use 'unpack'
+	unzip -qoa "${DISTDIR}/cl${MY_PV}.zip"
+	use doc && unpack "${DOC_PREFIX}-manual.pdf.bz2"
+}
+
+src_prepare() {
+	rm -fr zlib
+
+	# 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"
+
+	# NOTICE:
+	# Because of stack execution
+	# assembly parts are disabled.
+	sed -i -e 's:i\[3,4,5,6\]86:___:g' makefile || die "sed makefile failed"
+
+	# Fix version number of shared library.
+	sed -i -e 's/PLV="2"/PLV="3"/' tools/buildall.sh || die "sed tools/buildall.sh failed"
+
+	# Respect LDFLAGS and fix soname and strip issues.
+	epatch "${FILESDIR}/${PN}-3.3.2-ld.patch"
+
+	# Use external zlib.
+	epatch "${FILESDIR}/${PN}-3.3.2-external-zlib.patch"
+}
+
+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."
+
+	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 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
+
+		# Python bindings don't work with -O2 and higher.
+		replace-flags -O* -O1
+
+		cd bindings
+		distutils_src_compile
+	fi
+}
+
+src_install() {
+	dolib.so "libcl.so.${PV}" || die
+	dosym "libcl.so.${PV}" "/usr/$(get_libdir)/libcl.so" || die
+	dolib.a "libcl.a" || die
+
+	insinto /usr/include
+	doins cryptlib.h || die
+
+	if use python; then
+		pushd bindings > /dev/null
+		distutils_src_install
+		popd > /dev/null
+	fi
+
+	dodoc README || die
+	if use doc; then
+		ewdoc "${DOC_PREFIX}-manual.pdf" "manual.pdf" || die
+	fi
+}