Cleanup

Package-Manager: portage-2.1.4_rc14

12 files changed, 11 insertions, 774 deletions

diff --git a/dev-libs/crypto++/ChangeLog b/dev-libs/crypto++/ChangeLog
index 210ab96471e7..e6b098039d41 100644
--- a/dev-libs/crypto++/ChangeLog
+++ b/dev-libs/crypto++/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/crypto++
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.38 2008/01/02 15:46:58 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.39 2008/01/02 15:53:42 alonbl Exp $
+
+  02 Jan 2008; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/crypto++-5.1-amd64.diff, -files/crypto++-5.2.1-ubuntu-gcc4.patch,
+  -crypto++-5.2.1.ebuild, -crypto++-5.4.ebuild, -crypto++-5.4-r1.ebuild,
+  -crypto++-5.5.1.ebuild:
+  Cleanup
 
   02 Jan 2008; Christoph Mende <angelos@gentoo.org> crypto++-5.5.2.ebuild:
   Stable on amd64 wrt bug #198687
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index 73c012c93364..ceef82d56c64 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -1,65 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX crypto++-5.1-amd64.diff 3070 RMD160 98433ffc3bc037fb8568c46e85769b8aef196bb9 SHA1 d90d2b085672a9152781348ef82919e023ed25df SHA256 a97c286aef3a7e964e3cf5a3ea73f5b779e1afb65c22d835ca27ddb504ad2901
-MD5 04a9a9a0aab549dfb7ec96bfe3b82cd6 files/crypto++-5.1-amd64.diff 3070
-RMD160 98433ffc3bc037fb8568c46e85769b8aef196bb9 files/crypto++-5.1-amd64.diff 3070
-SHA256 a97c286aef3a7e964e3cf5a3ea73f5b779e1afb65c22d835ca27ddb504ad2901 files/crypto++-5.1-amd64.diff 3070
-AUX crypto++-5.2.1-ubuntu-gcc4.patch 18717 RMD160 38edd1a738cf686f98c92d5b2ae1d54a5374fa81 SHA1 2b7f1a26bbad298817b098004fd235cee9ea880c SHA256 83edc575423c1b8c2db622655cab306bd30872294c3e3789e544db540d88f9d5
-MD5 310ab277c77a6b47f22d898c8f180cb8 files/crypto++-5.2.1-ubuntu-gcc4.patch 18717
-RMD160 38edd1a738cf686f98c92d5b2ae1d54a5374fa81 files/crypto++-5.2.1-ubuntu-gcc4.patch 18717
-SHA256 83edc575423c1b8c2db622655cab306bd30872294c3e3789e544db540d88f9d5 files/crypto++-5.2.1-ubuntu-gcc4.patch 18717
-DIST cryptopp521.zip 1010937 RMD160 7c4d3cf702a1cf38f2a19cb5cebf170dabc23a35 SHA1 4b84311d1cbde04df5d88b5375d29c2e35ccb89c SHA256 d578d297f1804a6b1c3f9090cc77091e49ae6d0311846a45117e79d4d20c2a39
-DIST cryptopp54.zip 950582 RMD160 8efd6d1ab9a34f69dfa2ef04852eff0efb69b47f SHA1 88f6534b713fbbf5c1af5fdddc402b221eea73bf SHA256 fa9aceb1b46c886b5c13fe5aa3d0cdbd74b4a2dd894e290cbdbfd17fe8a7fe5a
-DIST cryptopp551.zip 982157 RMD160 197395eaf7c2028032d96a099c84ceb4abba2a6c SHA1 9e30568f0fd653e5626038d4e424dbc2cd637b85 SHA256 11d3ad235ae8954575fd4307edc86cf5733f51b89b4822b99ed42f548972ded9
 DIST cryptopp552.zip 992073 RMD160 8929795b654d7186b2b38714d22a57ea01862dbd SHA1 18efe451b3c682f40db75dc2b09cb448a835e7d6 SHA256 078f8deb033e2619582b4e9e462bbac5127b0defbcfea49c3583be31f940a759
-EBUILD crypto++-5.2.1.ebuild 1581 RMD160 1b08401b4f2bab80b2d150fd5cebe9de33fb3d73 SHA1 fd1266c549e67aab398f57ff353d8abc5939446f SHA256 dedc26fc0f0d6e4f55e8b15bdb4622cceb093813101be1ea56c304bea268482b
-MD5 389b3e7a55b7d1ddb6998307e839310a crypto++-5.2.1.ebuild 1581
-RMD160 1b08401b4f2bab80b2d150fd5cebe9de33fb3d73 crypto++-5.2.1.ebuild 1581
-SHA256 dedc26fc0f0d6e4f55e8b15bdb4622cceb093813101be1ea56c304bea268482b crypto++-5.2.1.ebuild 1581
-EBUILD crypto++-5.4-r1.ebuild 1506 RMD160 65ac96c86d065eadedff23946378f7538de93604 SHA1 2f052512b7f113cd7cec4a4406e72c97a9493725 SHA256 0113fbdbcfd220f26d4b11ba9ac1cd001e5ad26bc9ba321ce87d2a6702795851
-MD5 d0a15ea61df49dfca2e30d89097e5d12 crypto++-5.4-r1.ebuild 1506
-RMD160 65ac96c86d065eadedff23946378f7538de93604 crypto++-5.4-r1.ebuild 1506
-SHA256 0113fbdbcfd220f26d4b11ba9ac1cd001e5ad26bc9ba321ce87d2a6702795851 crypto++-5.4-r1.ebuild 1506
-EBUILD crypto++-5.4.ebuild 1479 RMD160 d751edc6a825736efcc53284d7c85471dd62a508 SHA1 4e30f726e449aac4b6fe2cea9eed369d64574117 SHA256 2bcbd7c3651a29a072917e0e4e6d4ab9a14ddb9918181d08902454650c09bc7f
-MD5 05c6433645f757d6e7e947b26becece9 crypto++-5.4.ebuild 1479
-RMD160 d751edc6a825736efcc53284d7c85471dd62a508 crypto++-5.4.ebuild 1479
-SHA256 2bcbd7c3651a29a072917e0e4e6d4ab9a14ddb9918181d08902454650c09bc7f crypto++-5.4.ebuild 1479
-EBUILD crypto++-5.5.1.ebuild 1509 RMD160 a437a2867d857a88dabcd214bcd11789a728152d SHA1 284a1c3c5d2155e5bb3c1d22242594d1d87f790f SHA256 86b68a4d63295071c8c4ea1990d6a53dc9a0db493dba68da920444a7db47a774
-MD5 0d9c407cf4c9ebcccd0c8460e393e0b9 crypto++-5.5.1.ebuild 1509
-RMD160 a437a2867d857a88dabcd214bcd11789a728152d crypto++-5.5.1.ebuild 1509
-SHA256 86b68a4d63295071c8c4ea1990d6a53dc9a0db493dba68da920444a7db47a774 crypto++-5.5.1.ebuild 1509
 EBUILD crypto++-5.5.2.ebuild 1524 RMD160 4d51c23e3bee806118f62c17de5bed54ca895321 SHA1 9754444581e5305478d5358aa8e92c65c2f173db SHA256 c8c667d93b6337fc7cd7741c4ad3661657fdb760383c6d68bf23001af8a82525
 MD5 02c454e7da790e427e20c50a2822157a crypto++-5.5.2.ebuild 1524
 RMD160 4d51c23e3bee806118f62c17de5bed54ca895321 crypto++-5.5.2.ebuild 1524
 SHA256 c8c667d93b6337fc7cd7741c4ad3661657fdb760383c6d68bf23001af8a82525 crypto++-5.5.2.ebuild 1524
-MISC ChangeLog 5526 RMD160 3abf46d74169d0188aee8da148c392142f1c8758 SHA1 286fabef580b0456579927d35f0bbb038e5f209a SHA256 d3dddd34fcc29e38f39099fb0bfee5a5972371e2dfde5860335cf058073992dc
-MD5 86aed4c11ce5bca9ac61153aabbf6df1 ChangeLog 5526
-RMD160 3abf46d74169d0188aee8da148c392142f1c8758 ChangeLog 5526
-SHA256 d3dddd34fcc29e38f39099fb0bfee5a5972371e2dfde5860335cf058073992dc ChangeLog 5526
+MISC ChangeLog 5758 RMD160 5d019f1c7eef3670bd556c7f32fbb3a789be300d SHA1 70fa6d86c177eb51545f703900b757f2f5413294 SHA256 0fa347e3d7dc478e61a5ac5f03d67f86efb29c5079fa2da2c02d493c8c7f2514
+MD5 bcad41a21aefb8ca2d82b9fa36fce589 ChangeLog 5758
+RMD160 5d019f1c7eef3670bd556c7f32fbb3a789be300d ChangeLog 5758
+SHA256 0fa347e3d7dc478e61a5ac5f03d67f86efb29c5079fa2da2c02d493c8c7f2514 ChangeLog 5758
 MISC metadata.xml 159 RMD160 7f0018281c6308f73c2d95b3690e3804f0c353c5 SHA1 09baadee9aeb270d0a7f31be07db9db5c105abbc SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03
 MD5 243e4cd9809545d12f991b2d417040e1 metadata.xml 159
 RMD160 7f0018281c6308f73c2d95b3690e3804f0c353c5 metadata.xml 159
 SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 metadata.xml 159
-MD5 2bd133c2a9baa91be72e4743174e3a9e files/digest-crypto++-5.2.1 229
-RMD160 df32989529f31898c59f072fbe770e2e2df42fe8 files/digest-crypto++-5.2.1 229
-SHA256 b6cfb3d42a35f374acab3249d0f4799fb0b72b3e500ba71a749af7d7d3ae8933 files/digest-crypto++-5.2.1 229
-MD5 ed67a8f0d78f51b672949c4ecc19705b files/digest-crypto++-5.4 223
-RMD160 995fbe25317c8d0ba0c2490e6f067281f37565ff files/digest-crypto++-5.4 223
-SHA256 246bf05a787fba6fccdafc1f940a1e1c26cc468bd8e8fc736f6544ff15df6739 files/digest-crypto++-5.4 223
-MD5 ed67a8f0d78f51b672949c4ecc19705b files/digest-crypto++-5.4-r1 223
-RMD160 995fbe25317c8d0ba0c2490e6f067281f37565ff files/digest-crypto++-5.4-r1 223
-SHA256 246bf05a787fba6fccdafc1f940a1e1c26cc468bd8e8fc736f6544ff15df6739 files/digest-crypto++-5.4-r1 223
-MD5 feaf40c667615952d59c8063d32011f6 files/digest-crypto++-5.5.1 226
-RMD160 e5aaacb047d687828ad7de9ca47e490374fb625d files/digest-crypto++-5.5.1 226
-SHA256 21db521b9f45cd278ed58d46d53983d5a18165eddfdf867987fe8c9b05b16f2c files/digest-crypto++-5.5.1 226
 MD5 f04ecede9e00d43f74f44252a8c828b0 files/digest-crypto++-5.5.2 226
 RMD160 ab5441ea0f29c6b031dc2ff02cd32a59a50a3e78 files/digest-crypto++-5.5.2 226
 SHA256 3ab162781a7b25e59e50a7fd94f37e0f842aeedc31d2c700a62a271a5cd8f9f5 files/digest-crypto++-5.5.2 226
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
-
-iEYEARECAAYFAkd7sfgACgkQKhnDs22gwa+t7wCeIEnd3+lZUtcNl0CGuJ6X5kJg
-YagAn0VyykUu6x4sUkoL9yRoFA+HDQ0p
-=Rl+U
------END PGP SIGNATURE-----
diff --git a/dev-libs/crypto++/crypto++-5.2.1.ebuild b/dev-libs/crypto++/crypto++-5.2.1.ebuild
deleted file mode 100644
index 8b6d0b576466..000000000000
--- a/dev-libs/crypto++/crypto++-5.2.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/crypto++-5.2.1.ebuild,v 1.15 2007/07/12 02:25:34 mr_bones_ Exp $
-
-inherit flag-o-matic eutils
-
-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="amd64 ppc ppc64 sparc x86"
-DEPEND="app-arch/unzip"
-RDEPEND=""
-IUSE=""
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	# bug 117547 - gcc4
-	epatch "${FILESDIR}"/${PN}-5.2.1-ubuntu-gcc4.patch
-}
-
-src_compile() {
-	# -O3 causes segfaults
-	replace-flags -O3 -O2
-	filter-flags -fomit-frame-pointer
-	filter-flags -msse2
-	if use x86 || use amd64
-	then
-		append-flags -mno-sse2
-	fi
-	emake -f GNUmakefile || die
-}
-
-src_test() {
-	# make sure all test vectors have unix line endings
-	for f in TestVectors/* ; do
-		edos2unix $f
-	done
-
-	if ! ./cryptest.exe v
-	then
-	    eerror "crypto++ self-tests failed"
-	    eerror "Try to remove some optimization flags and re-emerge"
-	    die
-	fi;
-}
-
-src_install() {
-	# For consistency across GNU/Linux distributions,
-	# "crypto++" has been preferred over "crytopp"...
-	newlib.a libcryptopp.a libcrypto++.a
-	# ...unbreak programs which don't expect this
-	dosym libcrypto++.a /usr/lib/libcryptopp.a
-	insinto /usr/include/crypto++
-	doins *.h
-	# should the .exe extension be removed??
-	dobin cryptest.exe
-	# unbreak programs which expect cryptopp
-	into /usr/include
-	dosym crypto++ /usr/include/cryptopp
-}
diff --git a/dev-libs/crypto++/crypto++-5.4-r1.ebuild b/dev-libs/crypto++/crypto++-5.4-r1.ebuild
deleted file mode 100644
index 40803d70abf1..000000000000
--- a/dev-libs/crypto++/crypto++-5.4-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/crypto++-5.4-r1.ebuild,v 1.8 2007/08/25 17:15:36 beandog Exp $
-
-inherit flag-o-matic eutils 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="amd64 ppc ppc64 sparc x86"
-DEPEND="app-arch/unzip"
-RDEPEND=""
-IUSE=""
-
-S="${WORKDIR}"
-
-src_compile() {
-	# -O3 causes segfaults
-	replace-flags -O3 -O2
-	filter-flags -fomit-frame-pointer
-	emake -f GNUmakefile \
-		CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" || die
-}
-
-src_test() {
-	# make sure all test vectors have unix line endings
-	for f in TestVectors/* ; do
-		edos2unix $f
-	done
-
-	if ! ./cryptest.exe v
-	then
-	    eerror "crypto++ self-tests failed"
-	    eerror "Try to remove some optimization flags and re-emerge"
-	    die
-	fi;
-}
-
-src_install() {
-	# For consistency across GNU/Linux distributions,
-	# "crypto++" has been preferred over "crytopp"...
-	newlib.a libcryptopp.a libcrypto++.a
-	# ...unbreak programs which don't expect this
-	dosym libcrypto++.a /usr/lib/libcryptopp.a
-	insinto /usr/include/crypto++
-	doins *.h
-	# should the .exe extension be removed??
-	dobin cryptest.exe
-	# unbreak programs which expect cryptopp
-	into /usr/include
-	dosym crypto++ /usr/include/cryptopp
-}
diff --git a/dev-libs/crypto++/crypto++-5.4.ebuild b/dev-libs/crypto++/crypto++-5.4.ebuild
deleted file mode 100644
index 8c94402fb29e..000000000000
--- a/dev-libs/crypto++/crypto++-5.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/crypto++-5.4.ebuild,v 1.2 2007/07/12 02:25:34 mr_bones_ Exp $
-
-inherit flag-o-matic eutils
-
-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="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-DEPEND="app-arch/unzip"
-RDEPEND=""
-IUSE=""
-
-S="${WORKDIR}"
-
-src_compile() {
-	# -O3 causes segfaults
-	replace-flags -O3 -O2
-	filter-flags -fomit-frame-pointer
-	filter-flags -msse2
-	if use x86 || use amd64
-	then
-		append-flags -mno-sse2
-	fi
-	emake -f GNUmakefile || die
-}
-
-src_test() {
-	# make sure all test vectors have unix line endings
-	for f in TestVectors/* ; do
-		edos2unix $f
-	done
-
-	if ! ./cryptest.exe v
-	then
-	    eerror "crypto++ self-tests failed"
-	    eerror "Try to remove some optimization flags and re-emerge"
-	    die
-	fi;
-}
-
-src_install() {
-	# For consistency across GNU/Linux distributions,
-	# "crypto++" has been preferred over "crytopp"...
-	newlib.a libcryptopp.a libcrypto++.a
-	# ...unbreak programs which don't expect this
-	dosym libcrypto++.a /usr/lib/libcryptopp.a
-	insinto /usr/include/crypto++
-	doins *.h
-	# should the .exe extension be removed??
-	dobin cryptest.exe
-	# unbreak programs which expect cryptopp
-	into /usr/include
-	dosym crypto++ /usr/include/cryptopp
-}
diff --git a/dev-libs/crypto++/crypto++-5.5.1.ebuild b/dev-libs/crypto++/crypto++-5.5.1.ebuild
deleted file mode 100644
index 3ef8d1256314..000000000000
--- a/dev-libs/crypto++/crypto++-5.5.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/crypto++-5.5.1.ebuild,v 1.1 2007/08/02 23:35:53 alonbl Exp $
-
-inherit flag-o-matic eutils 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="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-DEPEND="app-arch/unzip"
-RDEPEND=""
-IUSE=""
-
-S="${WORKDIR}"
-
-src_compile() {
-	# -O3 causes segfaults
-	replace-flags -O3 -O2
-	filter-flags -fomit-frame-pointer
-	emake -f GNUmakefile \
-		CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" || die
-}
-
-src_test() {
-	# make sure all test vectors have unix line endings
-	for f in TestVectors/* ; do
-		edos2unix $f
-	done
-
-	if ! ./cryptest.exe v
-	then
-	    eerror "crypto++ self-tests failed"
-	    eerror "Try to remove some optimization flags and re-emerge"
-	    die
-	fi;
-}
-
-src_install() {
-	# For consistency across GNU/Linux distributions,
-	# "crypto++" has been preferred over "crytopp"...
-	newlib.a libcryptopp.a libcrypto++.a
-	# ...unbreak programs which don't expect this
-	dosym libcrypto++.a /usr/lib/libcryptopp.a
-	insinto /usr/include/crypto++
-	doins *.h
-	# should the .exe extension be removed??
-	dobin cryptest.exe
-	# unbreak programs which expect cryptopp
-	into /usr/include
-	dosym crypto++ /usr/include/cryptopp
-}
diff --git a/dev-libs/crypto++/files/crypto++-5.1-amd64.diff b/dev-libs/crypto++/files/crypto++-5.1-amd64.diff
deleted file mode 100644
index 783007335b2b..000000000000
--- a/dev-libs/crypto++/files/crypto++-5.1-amd64.diff
+++ /dev/null
@@ -1,78 +0,0 @@
-Only in crypto++-5.1.amd64/: adhoc.cpp
-diff -ru crypto++-5.1/config.h crypto++-5.1.amd64/config.h
---- crypto++-5.1/config.h	2003-03-20 02:24:11.000000000 +0100
-+++ crypto++-5.1.amd64/config.h	2004-04-26 15:37:37.000000000 +0200
-@@ -100,7 +100,7 @@
- NAMESPACE_BEGIN(CryptoPP)

- 

- typedef unsigned short word16;

--#if defined(__alpha) && !defined(_MSC_VER)

-+#if (defined(__alpha) || defined(__x86_64__)) && !defined(_MSC_VER)

- 	typedef unsigned int word32;

- #else

- 	typedef unsigned long word32;

-@@ -124,7 +124,7 @@
- // word should have the same size as your CPU registers

- // dword should be twice as big as word

- 

--#if (defined(__GNUC__) && !defined(__alpha)) || defined(__MWERKS__)

-+#if (defined(__GNUC__) && !defined(__alpha)) && !defined(__x86_64__) || defined(__MWERKS__)

- 	typedef unsigned long word;

- 	typedef unsigned long long dword;

- #elif defined(_MSC_VER) || defined(__BCPLUSPLUS__)

-diff -ru crypto++-5.1/misc.cpp crypto++-5.1.amd64/misc.cpp
---- crypto++-5.1/misc.cpp	2002-10-04 19:31:51.000000000 +0200
-+++ crypto++-5.1.amd64/misc.cpp	2004-04-26 15:37:37.000000000 +0200
-@@ -16,7 +16,7 @@
- 

- void xorbuf(byte *buf, const byte *mask, unsigned int count)

- {

--	if (((unsigned int)buf | (unsigned int)mask | count) % WORD_SIZE == 0)

-+	if (((uintptr_t)buf | (uintptr_t)mask | count) % WORD_SIZE == 0)

- 		XorWords((word *)buf, (const word *)mask, count/WORD_SIZE);

- 	else

- 	{

-@@ -27,7 +27,7 @@
- 

- void xorbuf(byte *output, const byte *input, const byte *mask, unsigned int count)

- {

--	if (((unsigned int)output | (unsigned int)input | (unsigned int)mask | count) % WORD_SIZE == 0)

-+	if (((uintptr_t)output | (uintptr_t)input | (uintptr_t)mask | count) % WORD_SIZE == 0)

- 		XorWords((word *)output, (const word *)input, (const word *)mask, count/WORD_SIZE);

- 	else

- 	{

-diff -ru crypto++-5.1/misc.h crypto++-5.1.amd64/misc.h
---- crypto++-5.1/misc.h	2002-10-04 19:31:52.000000000 +0200
-+++ crypto++-5.1.amd64/misc.h	2004-04-26 15:37:37.000000000 +0200
-@@ -5,6 +5,7 @@
- #include "cryptlib.h"

- #include <assert.h>

- #include <string.h>		// CodeWarrior doesn't have memory.h

-+#include <inttypes.h>

- #include <algorithm>

- #include <string>

- 

-@@ -142,7 +143,7 @@
- 

- inline bool IsAlignedOn(const void *p, unsigned int alignment)

- {

--	return IsPowerOf2(alignment) ? ModPowerOf2((unsigned int)p, alignment) == 0 : (unsigned int)p % alignment == 0;

-+	return IsPowerOf2(alignment) ? ModPowerOf2((uintptr_t)p, alignment) == 0 : (uintptr_t)p % alignment == 0;

- }

- 

- template <class T>

-diff -ru crypto++-5.1/serpent.cpp crypto++-5.1.amd64/serpent.cpp
---- crypto++-5.1/serpent.cpp	2002-10-04 19:31:57.000000000 +0200
-+++ crypto++-5.1.amd64/serpent.cpp	2004-04-26 15:38:39.000000000 +0200
-@@ -428,7 +428,9 @@
- 	word32 *k = m_key;

- 	GetUserKey(LITTLE_ENDIAN_ORDER, k, 8, userKey, keylen);

- 

--	word32	i,a,b,c,d,e;

-+	word32	a,b,c,d,e;

-+        // word32 is an unsigned integral type,so it will underflow

-+        int i;

- 

- 	if (keylen < 32)

- 		k[keylen/4] |= word32(1) << ((keylen%4)*8);

-Only in crypto++-5.1.amd64/: serpent.cpp~
diff --git a/dev-libs/crypto++/files/crypto++-5.2.1-ubuntu-gcc4.patch b/dev-libs/crypto++/files/crypto++-5.2.1-ubuntu-gcc4.patch
deleted file mode 100644
index d4234be0026f..000000000000
--- a/dev-libs/crypto++/files/crypto++-5.2.1-ubuntu-gcc4.patch
+++ /dev/null
@@ -1,392 +0,0 @@
-diff -ur work-orig/camellia.h work/camellia.h
---- work-orig/camellia.h	2006-04-15 02:32:18.000000000 -0400
-+++ work/camellia.h	2006-04-15 02:39:31.000000000 -0400
-@@ -22,7 +22,7 @@
- /// <a href="http://www.weidai.com/scan-mirror/cs.html#Camellia">Camellia</a>

- class Camellia : public Camellia_Info, public BlockCipherDocumentation

- {

--	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<Camellia_Info>

-+	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<Camellia_Info>, public SimpledKeyed_Helper

- 	{

- 	public:

- 		void UncheckedSetKey(CipherDir dir, const byte *key, unsigned int keylen);

-diff -ur work-orig/cast.h work/cast.h
---- work-orig/cast.h	2006-04-15 02:32:18.000000000 -0400
-+++ work/cast.h	2006-04-15 02:49:35.000000000 -0400
-@@ -24,7 +24,7 @@
- /// <a href="http://www.weidai.com/scan-mirror/cs.html#CAST-128">CAST-128</a>

- class CAST128 : public CAST128_Info, public BlockCipherDocumentation

- {

--	class CRYPTOPP_NO_VTABLE Base : public CAST, public BlockCipherImpl<CAST128_Info>

-+	class CRYPTOPP_NO_VTABLE Base : public CAST, public BlockCipherImpl<CAST128_Info>, public SimpledKeyed_Helper

- 	{

- 	public:

- 		void UncheckedSetKey(CipherDir direction, const byte *userKey, unsigned int length);

-@@ -60,7 +60,7 @@
- //! <a href="http://www.weidai.com/scan-mirror/cs.html#CAST-256">CAST-256</a>

- class CAST256 : public CAST256_Info, public BlockCipherDocumentation

- {

--	class CRYPTOPP_NO_VTABLE Base : public CAST, public BlockCipherImpl<CAST256_Info>

-+	class CRYPTOPP_NO_VTABLE Base : public CAST, public BlockCipherImpl<CAST256_Info>, public SimpledKeyed_Helper

- 	{

- 	public:

- 		void UncheckedSetKey(CipherDir direction, const byte *userKey, unsigned int length = 8);

-diff -ur work-orig/des.h work/des.h
---- work-orig/des.h	2006-04-15 02:32:18.000000000 -0400
-+++ work/des.h	2006-04-15 02:41:08.000000000 -0400
-@@ -35,7 +35,7 @@
- 	check or correct the parity bits if you wish. */

- class DES : public DES_Info, public BlockCipherDocumentation

- {

--	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<DES_Info>, public RawDES

-+	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<DES_Info>, public RawDES, public SimpledKeyed_Helper

- 	{

- 	public:

- 		void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const;

-@@ -60,7 +60,7 @@
- /// <a href="http://www.weidai.com/scan-mirror/cs.html#DESede">DES-EDE2</a>

- class DES_EDE2 : public DES_EDE2_Info, public BlockCipherDocumentation

- {

--	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<DES_EDE2_Info>

-+	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<DES_EDE2_Info>, public SimpledKeyed_Helper

- 	{

- 	public:

- 		void UncheckedSetKey(CipherDir direction, const byte *userKey, unsigned int length);

-@@ -84,7 +84,7 @@
- /// <a href="http://www.weidai.com/scan-mirror/cs.html#DESede">DES-EDE3</a>

- class DES_EDE3 : public DES_EDE3_Info, public BlockCipherDocumentation

- {

--	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<DES_EDE3_Info>

-+	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<DES_EDE3_Info>, public SimpledKeyed_Helper

- 	{

- 	public:

- 		void UncheckedSetKey(CipherDir dir, const byte *key, unsigned int length);

-@@ -108,7 +108,7 @@
- /// <a href="http://www.weidai.com/scan-mirror/cs.html#DESX">DES-XEX3</a>, AKA DESX

- class DES_XEX3 : public DES_XEX3_Info, public BlockCipherDocumentation

- {

--	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<DES_XEX3_Info>

-+	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<DES_XEX3_Info>, public SimpledKeyed_Helper

- 	{

- 	public:

- 		void UncheckedSetKey(CipherDir dir, const byte *key, unsigned int length);

-diff -ur work-orig/dll.cpp work/dll.cpp
---- work-orig/dll.cpp	2006-04-15 02:52:25.000000000 -0400
-+++ work/dll.cpp	2006-04-15 02:31:49.000000000 -0400
-@@ -1,6 +1,10 @@
- // dll.cpp - written and placed in the public domain by Wei Dai

- 

--#define CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES

-+#if defined( __GNUC__ ) && __GNUC__ > 3
-+#	undef CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES
-+#else
-+#	define CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES
-+#endif

- #define CRYPTOPP_DEFAULT_NO_DLL

- 

- #include "dll.h"

-@@ -36,6 +40,79 @@
- CRYPTOPP_DLL_TEMPLATE_CLASS AdditiveCipherTemplate<AbstractPolicyHolder<AdditiveCipherAbstractPolicy, CTR_ModePolicy> >;

- CRYPTOPP_DLL_TEMPLATE_CLASS AbstractEuclideanDomain<Integer>;

- #endif

-+
-+#if defined(__GNUC__) && __GNUC__ > 3
-+template class CRYPTOPP_DLL AbstractEuclideanDomain<Integer>;
-+template class CRYPTOPP_DLL AbstractEuclideanDomain<PolynomialMod2>;
-+template class CRYPTOPP_DLL AbstractGroup<Integer>;
-+template class CRYPTOPP_DLL AbstractGroup<EC2NPoint>;
-+template class CRYPTOPP_DLL AbstractGroup<ECPPoint>;
-+template class CRYPTOPP_DLL AbstractGroup<PolynomialMod2>;
-+template class CRYPTOPP_DLL AbstractPolicyHolder<AdditiveCipherAbstractPolicy, TwoBases<SimpleKeyedTransformation<StreamTransformation>, RandomNumberGenerator> >;
-+template class CRYPTOPP_DLL AbstractRing<Integer>;
-+template class CRYPTOPP_DLL AbstractRing<PolynomialMod2>;
-+template class CRYPTOPP_DLL AdditiveCipherTemplate<>;
-+template class CRYPTOPP_DLL AdditiveCipherTemplate<AbstractPolicyHolder<AdditiveCipherAbstractPolicy, CTR_ModePolicy> >;
-+template class CRYPTOPP_DLL AdditiveCipherTemplate<AbstractPolicyHolder<AdditiveCipherAbstractPolicy, OFB_ModePolicy> >;
-+template class CRYPTOPP_DLL AllocatorWithCleanup<byte>;
-+template class CRYPTOPP_DLL AllocatorWithCleanup<word16>;
-+template class CRYPTOPP_DLL AllocatorWithCleanup<word32>;
-+template class CRYPTOPP_DLL AutoSeededX917RNG<DES_EDE3>;
-+template class CRYPTOPP_DLL CFB_CipherTemplate<AbstractPolicyHolder<CFB_CipherAbstractPolicy, CFB_ModePolicy> >;
-+template class CRYPTOPP_DLL CFB_CipherTemplate<AbstractPolicyHolder<CFB_CipherAbstractPolicy, SymmetricCipher> >;
-+template class CRYPTOPP_DLL CFB_DecryptionTemplate<>;
-+template class CRYPTOPP_DLL CFB_DecryptionTemplate<AbstractPolicyHolder<CFB_CipherAbstractPolicy, CFB_ModePolicy> >;
-+template class CRYPTOPP_DLL CFB_EncryptionTemplate<>;
-+template class CRYPTOPP_DLL CFB_EncryptionTemplate<AbstractPolicyHolder<CFB_CipherAbstractPolicy, CFB_ModePolicy> >;
-+template class CRYPTOPP_DLL CipherModeFinalTemplate_ExternalCipher<CBC_CTS_Decryption>;
-+template class CRYPTOPP_DLL CipherModeFinalTemplate_ExternalCipher<CBC_CTS_Encryption>;
-+template class CRYPTOPP_DLL CipherModeFinalTemplate_ExternalCipher<CBC_Decryption>;
-+template class CRYPTOPP_DLL CipherModeFinalTemplate_ExternalCipher<CBC_Encryption>;
-+template class CRYPTOPP_DLL CipherModeFinalTemplate_ExternalCipher<ECB_OneWay>;
-+template class CRYPTOPP_DLL DH_Domain<DL_GroupParameters_GFP_DefaultSafePrime>;
-+template class CRYPTOPP_DLL DL_Algorithm_GDSA<EC2N::Point>;
-+template class CRYPTOPP_DLL DL_Algorithm_GDSA<ECP::Point>;
-+template class CRYPTOPP_DLL DL_Algorithm_GDSA<Integer>;
-+template class CRYPTOPP_DLL DL_FixedBasePrecomputationImpl<EC2N::Point>;
-+template class CRYPTOPP_DLL DL_FixedBasePrecomputationImpl<ECPPoint>;
-+template class CRYPTOPP_DLL DL_FixedBasePrecomputationImpl<Integer>;
-+template class CRYPTOPP_DLL DL_GroupParameters<Integer>;
-+template class CRYPTOPP_DLL DL_GroupParameters_EC<EC2N>;
-+template class CRYPTOPP_DLL DL_GroupParameters_EC<ECP>;
-+template class CRYPTOPP_DLL DL_GroupParameters_IntegerBasedImpl<ModExpPrecomputation>;
-+template class CRYPTOPP_DLL DL_GroupPrecomputation<EC2N::Point>;
-+template class CRYPTOPP_DLL DL_GroupPrecomputation<ECPPoint>;
-+template class CRYPTOPP_DLL DL_PrivateKeyImpl<DL_GroupParameters_EC<EC2N> >;
-+template class CRYPTOPP_DLL DL_PrivateKeyImpl<DL_GroupParameters_EC<ECP> >;
-+template class CRYPTOPP_DLL DL_PrivateKey_EC<EC2N>;
-+template class CRYPTOPP_DLL DL_PrivateKey_EC<ECP>;
-+template class CRYPTOPP_DLL DL_PrivateKey_GFP<DL_GroupParameters_DSA>;
-+template class CRYPTOPP_DLL DL_PrivateKey_WithSignaturePairwiseConsistencyTest<DL_PrivateKey_EC<EC2N>, ECDSA<EC2N> >;
-+template class CRYPTOPP_DLL DL_PrivateKey_WithSignaturePairwiseConsistencyTest<DL_PrivateKey_EC<ECP>, ECDSA<ECP> >;
-+template class CRYPTOPP_DLL DL_PrivateKey_WithSignaturePairwiseConsistencyTest<DL_PrivateKey_GFP<DL_GroupParameters_DSA>, DSA>;
-+template class CRYPTOPP_DLL DL_PublicKeyImpl<DL_GroupParameters_EC<EC2N> >;
-+template class CRYPTOPP_DLL DL_PublicKeyImpl<DL_GroupParameters_EC<ECP> >;
-+template class CRYPTOPP_DLL DL_PublicKey_EC<EC2N>;
-+template class CRYPTOPP_DLL DL_PublicKey_EC<ECP>;
-+template class CRYPTOPP_DLL DL_PublicKey_GFP<DL_GroupParameters_DSA>;
-+template class CRYPTOPP_DLL EuclideanDomainOf<PolynomialMod2>;
-+template class CRYPTOPP_DLL IteratedHashBase<word32, HashTransformation>;
-+template class CRYPTOPP_DLL IteratedHashBase<word32, MessageAuthenticationCode>;
-+#ifdef WORD64_AVAILABLE
-+template class CRYPTOPP_DLL IteratedHashBase<word64, HashTransformation>;
-+template class CRYPTOPP_DLL IteratedHashBase<word64, MessageAuthenticationCode>;
-+#endif
-+template class CRYPTOPP_DLL OAEP<SHA>;
-+#ifdef CRYPTOPP_IS_DLL
-+template class CRYPTOPP_DLL PKCS_DigestDecoration<SHA>;
-+#endif
-+template class CRYPTOPP_DLL QuotientRing<EuclideanDomainOf<PolynomialMod2> >;
-+template class CRYPTOPP_DLL SimpleKeyedTransformation<BlockTransformation>;
-+template class CRYPTOPP_DLL SimpleKeyedTransformation<HashTransformation>;
-+template class CRYPTOPP_DLL SimpleKeyedTransformation<StreamTransformation>;
-+template class CRYPTOPP_DLL StringSinkTemplate<std::string>;
-+template class CRYPTOPP_DLL TwoBases<SymmetricCipher, RandomNumberGenerator>;
-+#endif // __GNUC__ > 3
- 

- template<> const byte PKCS_DigestDecoration<SHA>::decoration[] = {0x30,0x21,0x30,0x09,0x06,0x05,0x2B,0x0E,0x03,0x02,0x1A,0x05,0x00,0x04,0x14};

- template<> const unsigned int PKCS_DigestDecoration<SHA>::length = sizeof(PKCS_DigestDecoration<SHA>::decoration);

-diff -ur work-orig/gost.h work/gost.h
---- work-orig/gost.h	2006-04-15 02:32:18.000000000 -0400
-+++ work/gost.h	2006-04-15 02:48:12.000000000 -0400
-@@ -18,7 +18,7 @@
- /// <a href="http://www.weidai.com/scan-mirror/cs.html#GOST">GOST</a>

- class GOST : public GOST_Info, public BlockCipherDocumentation

- {

--	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<GOST_Info>

-+	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<GOST_Info>, public SimpledKeyed_Helper

- 	{

- 	public:

- 		void UncheckedSetKey(CipherDir direction, const byte *userKey, unsigned int length);

-diff -ur work-orig/hmac.h work/hmac.h
---- work-orig/hmac.h	2006-04-15 02:32:18.000000000 -0400
-+++ work/hmac.h	2006-04-15 02:41:47.000000000 -0400
-@@ -9,7 +9,7 @@
- NAMESPACE_BEGIN(CryptoPP)

- 

- //! _

--class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE HMAC_Base : public VariableKeyLength<16, 0, UINT_MAX>, public MessageAuthenticationCode

-+class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE HMAC_Base : public VariableKeyLength<16, 0, UINT_MAX>, public MessageAuthenticationCode, public SimpledKeyed_Helper

- {

- public:

- 	HMAC_Base() : m_innerHashKeyed(false) {}

-diff -ur work-orig/iterhash.h work/iterhash.h
---- work-orig/iterhash.h	2006-04-15 02:52:25.000000000 -0400
-+++ work/iterhash.h	2006-04-15 02:31:49.000000000 -0400
-@@ -88,7 +88,7 @@
- 	: public ClonableImpl<T_Transform, AlgorithmImpl<IteratedHash<T_HashWordType, T_Endianness, T_BlockSize>, T_Transform> >

- {

- public:

--	enum {DIGESTSIZE = T_DigestSize};

-+	enum GCC4FIX2 {DIGESTSIZE = T_DigestSize};

- 	unsigned int DigestSize() const {return DIGESTSIZE;};

- 

- protected:

-diff -ur work-orig/lubyrack.h work/lubyrack.h
---- work-orig/lubyrack.h	2006-04-15 02:52:25.000000000 -0400
-+++ work/lubyrack.h	2006-04-15 02:48:55.000000000 -0400
-@@ -23,7 +23,7 @@
- template <class T>

- class LR : public LR_Info<T>, public BlockCipherDocumentation

- {

--	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<LR_Info<T> >

-+	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<LR_Info<T> >, public SimpledKeyed_Helper

- 	{

- 	public:

- 		// VC60 workaround: have to define these functions within class definition

-@@ -38,7 +38,7 @@
- 		}

- 

- 	protected:

--		enum {S=T::DIGESTSIZE};

-+		enum GCC4FIX4 {S=T::DIGESTSIZE};

- 		unsigned int L;	// key length / 2

- 		SecByteBlock key;

- 

-diff -ur work-orig/mars.h work/mars.h
---- work-orig/mars.h	2006-04-15 02:32:18.000000000 -0400
-+++ work/mars.h	2006-04-15 02:47:59.000000000 -0400
-@@ -18,7 +18,7 @@
- /// <a href="http://www.weidai.com/scan-mirror/cs.html#MARS">MARS</a>

- class MARS : public MARS_Info, public BlockCipherDocumentation

- {

--	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<MARS_Info>

-+	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<MARS_Info>, public SimpledKeyed_Helper

- 	{

- 	public:

- 		void UncheckedSetKey(CipherDir direction, const byte *userKey, unsigned int length);

-diff -ur work-orig/md5mac.h work/md5mac.h
---- work-orig/md5mac.h	2006-04-15 02:32:18.000000000 -0400
-+++ work/md5mac.h	2006-04-15 02:47:45.000000000 -0400
-@@ -9,7 +9,7 @@
- 

- NAMESPACE_BEGIN(CryptoPP)

- 

--class CRYPTOPP_NO_VTABLE MD5MAC_Base : public FixedKeyLength<16>, public IteratedHash<word32, LittleEndian, 64, MessageAuthenticationCode>

-+class CRYPTOPP_NO_VTABLE MD5MAC_Base : public FixedKeyLength<16>, public IteratedHash<word32, LittleEndian, 64, MessageAuthenticationCode>, public SimpledKeyed_Helper

- {

- public:

- 	static std::string StaticAlgorithmName() {return "MD5-MAC";}

-diff -ur work-orig/mdc.h work/mdc.h
---- work-orig/mdc.h	2006-04-15 02:32:18.000000000 -0400
-+++ work/mdc.h	2006-04-15 02:45:57.000000000 -0400
-@@ -13,7 +13,7 @@
- 

- //! _

- template <class T>

--struct MDC_Info : public FixedBlockSize<T::DIGESTSIZE>, public FixedKeyLength<T::BLOCKSIZE>

-+struct MDC_Info : public FixedBlockSize<T::DIGESTSIZE>, public FixedKeyLength<T::BLOCKSIZE>, public SimpledKeyed_Helper

- {

- 	static std::string StaticAlgorithmName() {return std::string("MDC/")+T::StaticAlgorithmName();}

- };

-diff -ur work-orig/rijndael.h work/rijndael.h
---- work-orig/rijndael.h	2006-04-15 02:32:18.000000000 -0400
-+++ work/rijndael.h	2006-04-15 02:43:34.000000000 -0400
-@@ -18,7 +18,7 @@
- /// <a href="http://www.weidai.com/scan-mirror/cs.html#Rijndael">Rijndael</a>

- class CRYPTOPP_DLL Rijndael : public Rijndael_Info, public BlockCipherDocumentation

- {

--	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<Rijndael_Info>

-+	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<Rijndael_Info>, public SimpledKeyed_Helper

- 	{

- 	public:

- 		void UncheckedSetKey(CipherDir direction, const byte *userKey, unsigned int length);

-diff -ur work-orig/seckey.h work/seckey.h
---- work-orig/seckey.h	2006-04-15 02:52:25.000000000 -0400
-+++ work/seckey.h	2006-04-15 02:37:09.000000000 -0400
-@@ -21,7 +21,7 @@
- class FixedBlockSize

- {

- public:

--	enum {BLOCKSIZE = N};

-+	enum GCC4FIX0 {BLOCKSIZE = N};

- };

- 

- // ************** rounds ***************

-@@ -31,7 +31,7 @@
- class FixedRounds

- {

- public:

--	enum {ROUNDS = R};

-+	enum GCC4FIX1 {ROUNDS = R};

- 

- protected:

- 	template <class T>

-@@ -50,7 +50,7 @@
- class VariableRounds

- {

- public:

--	enum {DEFAULT_ROUNDS = D, MIN_ROUNDS = N, MAX_ROUNDS = M};

-+	enum GCC4FIX3 {DEFAULT_ROUNDS = D, MIN_ROUNDS = N, MAX_ROUNDS = M};

- 	static unsigned int StaticGetDefaultRounds(unsigned int keylength) {return DEFAULT_ROUNDS;}

- 

- protected:

-@@ -123,19 +123,21 @@
- 

- // ************** implementation helper for SimpledKeyed ***************

- 

--template <class T>

--static inline void CheckedSetKey(T *obj, Empty empty, const byte *key, unsigned int length, const NameValuePairs &param)

--{

--	obj->ThrowIfInvalidKeyLength(length);

--	obj->UncheckedSetKey(key, length);

--}

--

--template <class T>

--static inline void CheckedSetKey(T *obj, CipherDir dir, const byte *key, unsigned int length, const NameValuePairs &param)

--{

--	obj->ThrowIfInvalidKeyLength(length);

--	obj->UncheckedSetKey(dir, key, length);

--}

-+struct SimpledKeyed_Helper {

-+ template <class T>

-+ static inline void CheckedSetKey(T *obj, Empty empty, const byte *key, unsigned int length, const NameValuePairs &param)

-+ {

-+ obj->ThrowIfInvalidKeyLength(length);

-+ obj->UncheckedSetKey(key, length);

-+ }

-+

-+ template <class T>

-+ static inline void CheckedSetKey(T *obj, CipherDir dir, const byte *key, unsigned int length, const NameValuePairs &param)

-+ {

-+ obj->ThrowIfInvalidKeyLength(length);

-+ obj->UncheckedSetKey(dir, key, length);

-+ }

-+};

- 

- //! _

- template <class BASE, class INFO = BASE>

-@@ -176,7 +178,7 @@
- 

- 	void SetKey(const byte *key, unsigned int length, const NameValuePairs &param = g_nullNameValuePairs)

- 	{

--		CheckedSetKey(this, DIR, key, length, param);

-+		BASE::CheckedSetKey(this, DIR, key, length, param);

- 	}

- };

- 

-@@ -187,7 +189,7 @@
- public:

- 	void SetKey(const byte *key, unsigned int length, const NameValuePairs &params = g_nullNameValuePairs)

- 	{

--		CheckedSetKey(this, Empty(), key, length, params);

-+		BASE::CheckedSetKey(this, Empty(), key, length, params);

- 	}

- };

- 

-diff -ur work-orig/shacal2.h work/shacal2.h
---- work-orig/shacal2.h	2006-04-15 02:32:18.000000000 -0400
-+++ work/shacal2.h	2006-04-15 02:47:12.000000000 -0400
-@@ -18,7 +18,7 @@
- /// <a href="http://www.weidai.com/scan-mirror/cs.html#SHACAL-2">SHACAL-2</a>

- class SHACAL2 : public SHACAL2_Info, public BlockCipherDocumentation

- {

--	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<SHACAL2_Info>

-+	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<SHACAL2_Info>, public SimpledKeyed_Helper

- 	{

- 	public:

- 		void UncheckedSetKey(CipherDir direction, const byte *userKey, unsigned int length);

-diff -ur work-orig/skipjack.h work/skipjack.h
---- work-orig/skipjack.h	2006-04-15 02:32:18.000000000 -0400
-+++ work/skipjack.h	2006-04-15 02:43:54.000000000 -0400
-@@ -18,7 +18,7 @@
- /// <a href="http://www.weidai.com/scan-mirror/cs.html#SKIPJACK">SKIPJACK</a>

- class SKIPJACK : public SKIPJACK_Info, public BlockCipherDocumentation

- {

--	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<SKIPJACK_Info>

-+	class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<SKIPJACK_Info>, public SimpledKeyed_Helper

- 	{

- 	public:

- 		void UncheckedSetKey(CipherDir direction, const byte *userKey, unsigned int length);

-diff -ur work-orig/ttmac.h work/ttmac.h
---- work-orig/ttmac.h	2006-04-15 02:32:18.000000000 -0400
-+++ work/ttmac.h	2006-04-15 02:47:29.000000000 -0400
-@@ -9,7 +9,7 @@
- NAMESPACE_BEGIN(CryptoPP)

- 

- //! _

--class CRYPTOPP_NO_VTABLE TTMAC_Base : public FixedKeyLength<20>, public IteratedHash<word32, LittleEndian, 64, MessageAuthenticationCode>

-+class CRYPTOPP_NO_VTABLE TTMAC_Base : public FixedKeyLength<20>, public IteratedHash<word32, LittleEndian, 64, MessageAuthenticationCode>, public SimpledKeyed_Helper

- {

- public:

- 	static std::string StaticAlgorithmName() {return std::string("Two-Track-MAC");}

-
diff --git a/dev-libs/crypto++/files/digest-crypto++-5.2.1 b/dev-libs/crypto++/files/digest-crypto++-5.2.1
deleted file mode 100644
index 44bb9fcae448..000000000000
--- a/dev-libs/crypto++/files/digest-crypto++-5.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 82a00c44235ccbae2bedf9cb16c40ac3 cryptopp521.zip 1010937
-RMD160 7c4d3cf702a1cf38f2a19cb5cebf170dabc23a35 cryptopp521.zip 1010937
-SHA256 d578d297f1804a6b1c3f9090cc77091e49ae6d0311846a45117e79d4d20c2a39 cryptopp521.zip 1010937
diff --git a/dev-libs/crypto++/files/digest-crypto++-5.4 b/dev-libs/crypto++/files/digest-crypto++-5.4
deleted file mode 100644
index 7ec77390ccbc..000000000000
--- a/dev-libs/crypto++/files/digest-crypto++-5.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 40e760012d1b0b7e316676ef09e0a814 cryptopp54.zip 950582
-RMD160 8efd6d1ab9a34f69dfa2ef04852eff0efb69b47f cryptopp54.zip 950582
-SHA256 fa9aceb1b46c886b5c13fe5aa3d0cdbd74b4a2dd894e290cbdbfd17fe8a7fe5a cryptopp54.zip 950582
diff --git a/dev-libs/crypto++/files/digest-crypto++-5.4-r1 b/dev-libs/crypto++/files/digest-crypto++-5.4-r1
deleted file mode 100644
index 7ec77390ccbc..000000000000
--- a/dev-libs/crypto++/files/digest-crypto++-5.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 40e760012d1b0b7e316676ef09e0a814 cryptopp54.zip 950582
-RMD160 8efd6d1ab9a34f69dfa2ef04852eff0efb69b47f cryptopp54.zip 950582
-SHA256 fa9aceb1b46c886b5c13fe5aa3d0cdbd74b4a2dd894e290cbdbfd17fe8a7fe5a cryptopp54.zip 950582
diff --git a/dev-libs/crypto++/files/digest-crypto++-5.5.1 b/dev-libs/crypto++/files/digest-crypto++-5.5.1
deleted file mode 100644
index bd574fd80fc0..000000000000
--- a/dev-libs/crypto++/files/digest-crypto++-5.5.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cb80b068d4a683321091d6f0342372e8 cryptopp551.zip 982157
-RMD160 197395eaf7c2028032d96a099c84ceb4abba2a6c cryptopp551.zip 982157
-SHA256 11d3ad235ae8954575fd4307edc86cf5733f51b89b4822b99ed42f548972ded9 cryptopp551.zip 982157