Bumped to 1.9.12

Removed old versions.
Removed unnecessary patches.

6 files changed, 7 insertions, 332 deletions

diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index f6d70d4..f047a7e 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -2,7 +2,7 @@ AUX botan-1.9.11-openssl_compile.patch 4603 RMD160 172a7a01bc3c8259c8ab6dfb3fbfd
 AUX botan-1.9.11-python_respect_cflags.patch 985 RMD160 2a6cd6e7d6e0bd4cf89e18923f21742bac800ef0 SHA1 6f79a2ca82618a99544984a53f262bb224e1d528 SHA256 4b9965297bd4bde15ef3ff6333fa209a5a968c3916a4fa5c07dc652653a8db2f
 AUX botan-1.9.11-python_wrapper_fixes.patch 3186 RMD160 3be956306ed8460be3342f329acadc15a8d2aacc SHA1 4792a22b07a73351fe7441b64062d377ba4710c3 SHA256 5dfa21e23bbf235e837df187c422af0d5be09472898b78aa8689fd2820609d59
 DIST Botan-1.9.10.tbz 2977027 RMD160 b50f499cf3771582aa92333a73b8423f5e5a73f0 SHA1 600ea40b1ff563e806e7d85369870c0e04b2ae61 SHA256 a54cb37d171808e727be2835d09a924feb49d68e982f1ed95c95e8393d1f2a07
-DIST Botan-1.9.11.tbz 2968277 RMD160 2f6da620c4ed37de11ac5d3f27b290b2d113da16 SHA1 f74da0e5421e14bb6d878a0a30b342062d5dfdd5 SHA256 483f4e63d9ff69d4fa4854066543b9487a8e6ff976a14931a132571525a424c9
+DIST Botan-1.9.12.tbz 3103452 RMD160 1e25e56b88d152440933b7bc3f450dbf20941204 SHA1 c72ecf935644188277e5e6fac1c2bfc9bf0042c7 SHA256 f863f9d89fa4354dd8434abc01058fbacfbca94e992e8be8a59d632b9caa78b1
 EBUILD botan-1.9.10.ebuild 2585 RMD160 bbb2baa4ebc4baa8542b9d4ddd1074c31e50ebbc SHA1 eedfa841305320a2423edc7ca40df91a986bfdc3 SHA256 e93bca4f0701ead75b69dc3c8b18772b00962221e6ad579e9d1e28c81979852a
-EBUILD botan-1.9.11-r2.ebuild 2825 RMD160 0c9a004d8565b55b2bae2e37352b55835f3ae9e2 SHA1 b76e83918172e76ae7fc29c67e187fd95fde6b76 SHA256 3a34e3a2be5301e4ceb842e152d2e1ca8b451942f12800f1f7e5431ddae90db6
+EBUILD botan-1.9.12.ebuild 2830 RMD160 70c5c2daa298323a59a55d60b02d888b61cbda23 SHA1 bf35e5c9c68c3508d1b5fc877e662c5bcbe81dd9 SHA256 fa4d51d9db4d8613265c86dc484e1fd4b625cc2cc5791d74a578b76b9f56164b
 MISC ChangeLog 977 RMD160 978bf37be03316920cca834fef79ab569ef48b85 SHA1 127a03568289302cbc8e81ad510c0e93413b122d SHA256 62624530da3e8eeda7dabcb5166d0a9f83f0570c0c1e3f2633e9b7f60a80f609
diff --git a/dev-libs/botan/botan-1.9.10.ebuild b/dev-libs/botan/botan-1.9.10.ebuild
deleted file mode 100644
index 3df1af0..0000000
--- a/dev-libs/botan/botan-1.9.10.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.6"
-RESTRICT_PYTHON_ABIS="3.*"
-inherit eutils multilib python toolchain-funcs
-
-MY_PN="Botan"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="A C++ crypto library"
-HOMEPAGE="http://botan.randombit.net/"
-SRC_URI="http://botan.randombit.net/files/${MY_P}.tbz"
-
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~ppc-macos"
-SLOT="0"
-LICENSE="BSD"
-IUSE="altivec bzip2 gmp python sse2 ssse3 ssl threads zlib"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="python? ( dev-libs/boost[python] )
-	bzip2? ( >=app-arch/bzip2-1.0.5 )
-	zlib? ( >=sys-libs/zlib-1.2.3 )
-	gmp? ( >=dev-libs/gmp-4.2.2 )
-	ssl? ( >=dev-libs/openssl-0.9.8g )"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_configure() {
-	local disable_modules="proc_walk,unix_procs"
-
-	if ! useq threads; then
-		disable_modules="${disable_modules},pthreads"
-	fi
-
-	# Enable v9 instructions for sparc64
-	if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
-		CHOSTARCH="sparc32-v9"
-	else
-		CHOSTARCH="${CHOST%%-*}"
-	fi
-
-	cd "${S}"
-	elog "Disabling modules: ${disable_modules}"
-
-	local myos=
-	case ${CHOST} in
-		*-darwin*)	myos=darwin ;;
-		*)		myos=linux  ;;
-	esac
-
-	# foobared buildsystem, --prefix translates into DESTDIR, see also make
-	# install in src_install, we need the correct live-system prefix here on
-	# Darwin for a shared lib with correct install_name
-	./configure.py \
-		--prefix="${EPREFIX}/usr" \
-		--libdir=$(get_libdir) \
-		--docdir=share/doc/ \
-		--cc=gcc \
-		--os=${myos} \
-		--cpu=${CHOSTARCH} \
-		--with-endian="$(tc-endian)" \
-		--with-tr1=system \
-		$(use_with python boost-python) \
-		$(use_with bzip2) \
-		$(use_with gmp gnump) \
-		$(use_with ssl openssl) \
-		$(use_with zlib) \
-		$(use_enable sse2) \
-		$(use_enable ssse3) \
-		$(use_enable altivec) \
-		--disable-modules=${disable_modules} \
-		|| die "configure.py failed"
-}
-
-src_compile() {
-	emake CXX="$(tc-getCXX)" AR="$(tc-getAR) crs" LIB_OPT="${CXXFLAGS}" MACH_OPT="" || die "emake failed"
-
-	if useq python; then
-		emake CXX="$(tc-getCXX)" -f Makefile.python || die "emake failed"
-	fi
-}
-
-src_test() {
-	chmod -R ugo+rX "${S}"
-	emake CXX="$(tc-getCXX)" CHECK_OPT="${CXXFLAGS}" check || die "emake check failed"
-	LD_LIBRARY_PATH="${S}" ./check --validate || die "Validation tests failed"
-}
-
-src_install() {
-        emake DESTDIR="${ED}usr" install || die "emake install failed"
-
-	if useq python; then
-		emake install PYTHON_SITE_PACKAGE_DIR="${D}/usr/lib/python2.6/site-packages" -f Makefile.python || die "emake install failed"
-	fi
-}
diff --git a/dev-libs/botan/botan-1.9.11-r2.ebuild b/dev-libs/botan/botan-1.9.12.ebuild
index adb52f1..2c88af2 100644
--- a/dev-libs/botan/botan-1.9.11-r2.ebuild
+++ b/dev-libs/botan/botan-1.9.12.ebuild
@@ -32,11 +32,11 @@ pkg_setup() {
 	python_set_active_version 2
 }
 
-src_prepare(){
-	epatch "${FILESDIR}"/${P}-python_wrapper_fixes.patch
-	epatch "${FILESDIR}"/${P}-openssl_compile.patch
-	epatch "${FILESDIR}"/${P}-python_respect_cflags.patch
-}
+#src_prepare(){
+#	epatch "${FILESDIR}"/${P}-python_wrapper_fixes.patch
+#	epatch "${FILESDIR}"/${P}-openssl_compile.patch
+#	epatch "${FILESDIR}"/${P}-python_respect_cflags.patch
+#}
 
 src_configure() {
 	local disable_modules="proc_walk,unix_procs"
diff --git a/dev-libs/botan/files/botan-1.9.11-openssl_compile.patch b/dev-libs/botan/files/botan-1.9.11-openssl_compile.patch
deleted file mode 100644
index d03c24e..0000000
--- a/dev-libs/botan/files/botan-1.9.11-openssl_compile.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# old_revision [52e500a0ac32174fdce00c589290e69186b99bdd]
-#
-# patch "src/engine/openssl/ossl_arc4.cpp"
-#  from [4aed07563d8f2b1ada6a76cbe55b4e76e8877403]
-#    to [d8ca80a67a27f9b2a1bcfb1e1e1efb4122ea28aa]
-# 
-# patch "src/engine/openssl/ossl_bc.cpp"
-#  from [9efd108ef8aebb28f4c0507bfcd3a08baf813531]
-#    to [947792c43bcccd42b8667a6d59e5bc477e374d0c]
-# 
-# patch "src/engine/openssl/ossl_md.cpp"
-#  from [c8fe0b67a8f0797fa8be764e9aeb78d5960d9bd9]
-#    to [29482b218897968d26787b4f4e517c11f511767d]
-#
-============================================================
---- src/engine/openssl/ossl_bc.cpp	9efd108ef8aebb28f4c0507bfcd3a08baf813531
-+++ src/engine/openssl/ossl_bc.cpp	947792c43bcccd42b8667a6d59e5bc477e374d0c
-@@ -29,6 +29,8 @@ class EVP_BlockCipher : public BlockCiph
-       EVP_BlockCipher(const EVP_CIPHER*, const std::string&,
-                       size_t, size_t, size_t);
- 
-+      Key_Length_Specification key_spec() const { return cipher_key_spec; }
-+
-       ~EVP_BlockCipher();
-    private:
-       void encrypt_n(const byte in[], byte out[], size_t blocks) const;
-@@ -36,6 +38,7 @@ class EVP_BlockCipher : public BlockCiph
-       void key_schedule(const byte[], size_t);
- 
-       size_t block_sz;
-+      Key_Length_Specification cipher_key_spec;
-       std::string cipher_name;
-       mutable EVP_CIPHER_CTX encrypt, decrypt;
-    };
-@@ -45,8 +48,8 @@ EVP_BlockCipher::EVP_BlockCipher(const E
- */
- EVP_BlockCipher::EVP_BlockCipher(const EVP_CIPHER* algo,
-                                  const std::string& algo_name) :
--   BlockCipher(EVP_CIPHER_key_length(algo)),
-    block_sz(EVP_CIPHER_block_size(algo)),
-+   cipher_key_spec(EVP_CIPHER_key_length(algo)),
-    cipher_name(algo_name)
-    {
-    if(EVP_CIPHER_mode(algo) != EVP_CIPH_ECB_MODE)
-@@ -69,8 +72,8 @@ EVP_BlockCipher::EVP_BlockCipher(const E
-                                  const std::string& algo_name,
-                                  size_t key_min, size_t key_max,
-                                  size_t key_mod) :
--   BlockCipher(key_min, key_max, key_mod),
-    block_sz(EVP_CIPHER_block_size(algo)),
-+   cipher_key_spec(key_min, key_max, key_mod),
-    cipher_name(algo_name)
-    {
-    if(EVP_CIPHER_mode(algo) != EVP_CIPH_ECB_MODE)
-@@ -148,8 +151,10 @@ BlockCipher* EVP_BlockCipher::clone() co
- BlockCipher* EVP_BlockCipher::clone() const
-    {
-    return new EVP_BlockCipher(EVP_CIPHER_CTX_cipher(&encrypt),
--                              cipher_name, MINIMUM_KEYLENGTH,
--                              MAXIMUM_KEYLENGTH, KEYLENGTH_MULTIPLE);
-+                              cipher_name,
-+                              cipher_key_spec.minimum_keylength(),
-+                              cipher_key_spec.maximum_keylength(),
-+                              cipher_key_spec.keylength_multiple());
-    }
- 
- /*
-============================================================
---- src/engine/openssl/ossl_md.cpp	c8fe0b67a8f0797fa8be764e9aeb78d5960d9bd9
-+++ src/engine/openssl/ossl_md.cpp	29482b218897968d26787b4f4e517c11f511767d
-@@ -22,8 +22,16 @@ class EVP_HashFunction : public HashFunc
-       std::string name() const { return algo_name; }
-       HashFunction* clone() const;
- 
--      size_t hash_block_size() const { return block_size; }
-+      size_t output_length() const
-+         {
-+         return EVP_MD_size(EVP_MD_CTX_md(&md));
-+         }
- 
-+      size_t hash_block_size() const
-+         {
-+         return EVP_MD_block_size(EVP_MD_CTX_md(&md));
-+         }
-+
-       EVP_HashFunction(const EVP_MD*, const std::string&);
-       ~EVP_HashFunction();
-    private:
-@@ -76,8 +84,6 @@ EVP_HashFunction::EVP_HashFunction(const
- */
- EVP_HashFunction::EVP_HashFunction(const EVP_MD* algo,
-                                    const std::string& name) :
--   HashFunction(EVP_MD_size(algo)),
--   block_size(EVP_MD_block_size(algo)),
-    algo_name(name)
-    {
-    EVP_MD_CTX_init(&md);
-============================================================
---- src/engine/openssl/ossl_arc4.cpp	4aed07563d8f2b1ada6a76cbe55b4e76e8877403
-+++ src/engine/openssl/ossl_arc4.cpp	d8ca80a67a27f9b2a1bcfb1e1e1efb4122ea28aa
-@@ -23,7 +23,13 @@ class ARC4_OpenSSL : public StreamCipher
-       std::string name() const;
-       StreamCipher* clone() const { return new ARC4_OpenSSL(SKIP); }
- 
--      ARC4_OpenSSL(size_t s = 0) : StreamCipher(1, 32), SKIP(s) { clear(); }
-+      Key_Length_Specification key_spec() const
-+         {
-+         return Key_Length_Specification(1, 32);
-+         }
-+
-+
-+      ARC4_OpenSSL(size_t s = 0) : SKIP(s) { clear(); }
-       ~ARC4_OpenSSL() { clear(); }
-    private:
-       void cipher(const byte[], byte[], size_t);
diff --git a/dev-libs/botan/files/botan-1.9.11-python_respect_cflags.patch b/dev-libs/botan/files/botan-1.9.11-python_respect_cflags.patch
deleted file mode 100644
index e15c48a..0000000
--- a/dev-libs/botan/files/botan-1.9.11-python_respect_cflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# old_revision [30bf23de07dd1dca68b59182d9099481cf5e2901]
-#
-# patch "src/build-data/makefile/python.in"
-#  from [ea02068348f95c5be9cf878f8ea33880e5156fcf]
-#    to [d64ee88702cff87e7467c00015166508892c5faa]
-#
-============================================================
---- src/build-data/makefile/python.in	ea02068348f95c5be9cf878f8ea33880e5156fcf
-+++ src/build-data/makefile/python.in	d64ee88702cff87e7467c00015166508892c5faa
-@@ -1,4 +1,5 @@ CXX           = %{cc}
- CXX           = %{cc}
-+CFLAGS        = -Os
- LDFLAGS       =
- WARN_FLAGS    = %{warn_flags}
- 
-@@ -6,7 +7,7 @@ PYTHON_SITE_PACKAGE_DIR = /usr/lib/pytho
- PYTHON_INC = -I/usr/include/python%{python_version}
- PYTHON_SITE_PACKAGE_DIR = /usr/lib/python%{python_version}/site-packages/
- 
--PYTHON_FLAGS = -Isrc/wrap/python -Os -fPIC -ftemplate-depth-255 $(WARN_FLAGS) $(PYTHON_INC)
-+PYTHON_FLAGS = -Isrc/wrap/python -fPIC -ftemplate-depth-255 $(WARN_FLAGS) $(PYTHON_INC) $(CFLAGS)
- 
- BOTAN_PYTHON_MODDIR = %{python_obj_dir}
- 
diff --git a/dev-libs/botan/files/botan-1.9.11-python_wrapper_fixes.patch b/dev-libs/botan/files/botan-1.9.11-python_wrapper_fixes.patch
deleted file mode 100644
index b7cd31b..0000000
--- a/dev-libs/botan/files/botan-1.9.11-python_wrapper_fixes.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# old_revision [fe7f0ad489656afee72254e9c90a80b45b3a64b1]
-#
-# patch "src/build-data/makefile/python.in"
-#  from [9a54ecabca6cb72ba7cf670e7426aacc28161d8a]
-#    to [ea02068348f95c5be9cf878f8ea33880e5156fcf]
-# 
-# patch "src/wrap/python/filter.cpp"
-#  from [7cc91ffa5889e7483eb9a9e314ec42f5ace06273]
-#    to [c855b9d7c7f458080b4844074d97f10c82daac0f]
-# 
-# patch "src/wrap/python/x509.cpp"
-#  from [7ae9bd324943cc782008e8322e542c58eb70d14d]
-#    to [a603dfce3827f4569c5ef059b50b369662612cf2]
-#
-============================================================
---- src/wrap/python/filter.cpp	7cc91ffa5889e7483eb9a9e314ec42f5ace06273
-+++ src/wrap/python/filter.cpp	c855b9d7c7f458080b4844074d97f10c82daac0f
-@@ -19,7 +19,7 @@ class Py_Filter : public Filter
- 
-       std::string name() const { return "Py_Filter_FIXME"; }
- 
--      void write(const byte data[], u32bit length)
-+      void write(const byte data[], size_t length)
-          {
-          write_str(std::string((const char*)data, length));
-          }
-============================================================
---- src/wrap/python/x509.cpp	7ae9bd324943cc782008e8322e542c58eb70d14d
-+++ src/wrap/python/x509.cpp	a603dfce3827f4569c5ef059b50b369662612cf2
-@@ -56,16 +56,6 @@ class memvec_to_hexstr
-          }
-    };
- 
--class X509_Store_Search_Wrap : public X509_Store::Search_Func,
--                               public python::wrapper<X509_Store::Search_Func>
--   {
--   public:
--      bool match(const X509_Certificate& cert) const
--         {
--         return this->get_override("match")(cert);
--         }
--   };
--
- BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(add_cert_ols, add_cert, 1, 2)
- BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(validate_cert_ols, validate_cert, 1, 2)
- 
-@@ -132,11 +122,6 @@ void export_x509()
-          python::class_<X509_Store>("X509_Store")
-          .def("add_cert", &X509_Store::add_cert, add_cert_ols())
-          .def("validate", &X509_Store::validate_cert, validate_cert_ols())
--         .def("get_certs", &X509_Store::get_certs)
-          .def("add_crl", &X509_Store::add_crl);
--
--      python::class_<X509_Store_Search_Wrap, boost::noncopyable>
--              ("Search_Func")
--         .def("match", python::pure_virtual(&X509_Store::Search_Func::match));
-       }
-    }
-============================================================
---- src/build-data/makefile/python.in	9a54ecabca6cb72ba7cf670e7426aacc28161d8a
-+++ src/build-data/makefile/python.in	ea02068348f95c5be9cf878f8ea33880e5156fcf
-@@ -1,4 +1,5 @@ CXX           = %{cc}
- CXX           = %{cc}
-+LDFLAGS       =
- WARN_FLAGS    = %{warn_flags}
- 
- PYTHON_ROOT = /usr/lib/python%{python_version}/config
-@@ -17,10 +18,11 @@ $(BOTAN_PYTHON_MODDIR)/_botan.so: $(PYTH
- 
- $(BOTAN_PYTHON_MODDIR)/_botan.so: $(PYTHON_OBJS)
- 	cp src/wrap/python/*.py $(BOTAN_PYTHON_MODDIR)
--	$(CXX) -shared -o $@ $(PYTHON_OBJS) -L. -L$(PYTHON_ROOT) -lbotan -lboost_python -Wl,-rpath-link,. -Wl,-soname,$@
-+	$(CXX) -shared -Wl,-soname,$@ $(PYTHON_OBJS) -L. -L$(PYTHON_ROOT) $(LDFLAGS) -lbotan -lboost_python -o $@
- 
- clean:
--	rm -f $(PYTHON_OBJS) $(BOTAN_PYTHON_MODDIR)
-+	rm -rf $(BOTAN_PYTHON_MODDIR)/*
-+	rm -f $(PYTHON_OBJS)
- 
- install:
- 	mkdir -p $(PYTHON_SITE_PACKAGE_DIR)/botan