Revbump for crypto++ to fix test issues on amd64 wrt bug 343373 and crypto++ amule issues wrt bug 322713.

(Portage version: 2.2.0_alpha3_p8/cvs/Linux x86_64)

2 files changed, 68 insertions, 1 deletions

diff --git a/dev-libs/crypto++/ChangeLog b/dev-libs/crypto++/ChangeLog
index 7dffeb1a3401..1dc9e245e3c9 100644
--- a/dev-libs/crypto++/ChangeLog
+++ b/dev-libs/crypto++/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-libs/crypto++
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.65 2011/01/08 04:04:54 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.66 2011/01/08 04:11:10 c1pher Exp $
+
+*crypto++-5.6.1-r1 (08 Jan 2011)
+
+  08 Jan 2011; Dane Smith <c1pher@gentoo.org> +crypto++-5.6.1-r1.ebuild:
+  Remove no longer needed -DCRYPTOPP_DISABLE_ASM on amd64.
+  *Fix crypto++ issues on amd64 wrt amule as noted in bug 322713.
+  *Fix issues with tests on amd64 as noted in bug 343373.
+  There is an upstream patch to fix these issues with DCRYPTOPP_DISABLE_ASM
+  at
+  http://sourceforge.net/apps/trac/cryptopp/ticket/6 but as we no longer
+  use it,I didn't include it.
 
   08 Jan 2011; Dane Smith <c1pher@gentoo.org> crypto++-5.6.1.ebuild:
   Revert my earlier changes. This should probably be revbumped. Sorry for
diff --git a/dev-libs/crypto++/crypto++-5.6.1-r1.ebuild b/dev-libs/crypto++/crypto++-5.6.1-r1.ebuild
new file mode 100644
index 000000000000..15b86486c3a3
--- /dev/null
+++ b/dev-libs/crypto++/crypto++-5.6.1-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/crypto++-5.6.1-r1.ebuild,v 1.1 2011/01/08 04:11:10 c1pher Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Crypto++ is a C++ class library of cryptographic schemes"
+HOMEPAGE="http://cryptopp.com"
+SRC_URI="mirror://sourceforge/cryptopp/cryptopp${PV//.}.zip"
+
+LICENSE="cryptopp"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fix_build_system.patch" \
+		"${FILESDIR}/${P}-sunos.patch"
+}
+
+src_compile() {
+	# Higher optimizations cause problems.
+	replace-flags -O? -O1
+	filter-flags -fomit-frame-pointer
+	#Remove no longer needed amd64 flags.
+	#use amd64 && append-flags -DCRYPTOPP_DISABLE_ASM
+
+	emake -f GNUmakefile CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" \
+		LIBDIR="$(get_libdir)" || die "emake failed"
+}
+
+src_test() {
+	# Ensure that all test vectors have Unix line endings.
+	local file
+	for file in TestVectors/*; do
+		edos2unix ${file}
+	done
+
+	if ! emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" test; then
+		eerror "Crypto++ self-tests failed."
+		eerror "Try to remove some optimization flags and reemerge Crypto++."
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install \
+		|| die "emake install failed"
+}