version bump fix #494634, drop old

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

10 files changed, 27 insertions, 291 deletions

diff --git a/net-dns/pdns/ChangeLog b/net-dns/pdns/ChangeLog
index 2e744574d66a..53c84552054d 100644
--- a/net-dns/pdns/ChangeLog
+++ b/net-dns/pdns/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-dns/pdns
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.90 2013/12/16 14:56:40 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.91 2013/12/19 16:34:57 ultrabug Exp $
+
+*pdns-3.3.1 (19 Dec 2013)
+
+  19 Dec 2013; Ultrabug <ultrabug@gentoo.org> -pdns-3.3.ebuild,
+  +pdns-3.3.1.ebuild, -files/pdns-3.3-fix-autoconf.patch,
+  -files/pdns-3.3-fix-conditional-polarssl.patch,
+  -files/pdns-3.3-fix-curl-link.patch,
+  -files/pdns-3.3-fix-polarssl_1.3.0.patch,
+  +files/pdns-3.3.1-fix-curl-link.patch, -files/pdns-3.3-lib_lua.patch,
+  -files/pdns-3.3_sha.hh, metadata.xml:
+  Version bump fix 494634 thx to @Nawadanp, add the tools IUSE, drop old
 
 *pdns-3.3 (16 Dec 2013)
 
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 9fd60ff41ebd..daf4da12bc01 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -9,26 +9,21 @@ AUX pdns-3.2-fix-autoconf.patch 681 SHA256 4a078640dde0bf185a9292b1cd5e37befc675
 AUX pdns-3.2-fix-conditional-polarssl.patch 1547 SHA256 6c40a55034c526e8fd2f05802a71ad6f4cac6fcde5a605f2e308a11ec93a21fc SHA512 449b1ce7e6c1cefc4db361343c4a7297eefe5dd3d9618e6e78f3fcbfc59b051147e12f6f2b4c1329dab5c620e74e323296a583e976382d46ac2995c3937f255c WHIRLPOOL b7fb7be3c2905df2b11e013c2e1d3ded2718d10fc09b10943e25cbde793f03b212cf5d573a07353e33d4faee82530e605744abe762f2016cba4b9f6a636ab2db
 AUX pdns-3.2-fix-curl-link.patch 504 SHA256 526e7e4895895206fbca101f0d55139c7ee73c22dc4cc0a44996531ae7fd5dbc SHA512 6639ef26f3727d5754d0ecc951a7dfbee2dad36b8ee653fb58781276c9d8cd8b0ccc71599a65496bda38d4b42969eccbd01e5a542b5a384dfaf5c8616ce3fa7a WHIRLPOOL 409ad1f0cd36377244570721ffca2c840177d7ff4869445b7aa3631e6c14b77c50c858dc8568a6dd9a4477d611194849609965d40f547dc37d85823777633690
 AUX pdns-3.2-lib_lua.patch 843 SHA256 3c4732900cf5ae9e4777b7943fc24faa8639bdeb6ce83cb51f46c44ff1f623e8 SHA512 dc28c22105e5785db26119c9a7d7fde29513900d965c197eb65dc669b1bfc47825953657c63929558818f98c4813f605f5de13386d762e670ef634c5f0960a01 WHIRLPOOL 91a13b9ebfe6d813512e25ebb621b8e0c6e0181f4b3b33198525b0df0c41a5dece8fca5545805a9011a2c2b38350c2c389e6f52c2b3854964882f7a0bc934c36
-AUX pdns-3.3-fix-autoconf.patch 464 SHA256 49ef6c26a6b65826a913f3e3610046c8345a26943f7ee82615eea322427f8372 SHA512 782483ef6aeef944a21f48c7d76b669f94259381fd78e59d53b33168b990a510cd0a66778244e5fdfd6e95bb1e652ebd82da73482c749406523f6e0587ca8a11 WHIRLPOOL 447aee36d85ff016fdd2764a63446cc8765c509bd2da35de446815e24a39cf88a39eb598b69fe747c4013d2a9cd98a978a753563517bae6ab7377ee0ccf0e491
-AUX pdns-3.3-fix-conditional-polarssl.patch 1188 SHA256 c9f5148abb52c3d0dd57cdcecb6681508fc2bda61f4327ffb63760aa9a6273da SHA512 03dbdd6ebebb600d10db7661d27c5be9d23dac61302288997ba55123d6efdcb78245f046a7af4fd3b601e4bfe4aee9e1ac08df1faabe30e948286bf79aeede3b WHIRLPOOL 10133b223c3a413e33ff7657a2a55bae15f608414f3e31da4fad4796984036dea1b17c91a4f0de771927b76115c8b5c45eee6074b872ef215d1da8092e52740d
-AUX pdns-3.3-fix-curl-link.patch 642 SHA256 1c25076f21193acdf88a9c892c3b08154fc733a6ad0ee8d3c68fd8c7571b5a9c SHA512 c805abbb43743bb508efb95233aab5a8b87e5ae62443bb360f03f418618ebe34e9c984d935c3a626d6e3627d87945afd3b3743bded9ffade832607c5cf02a1e0 WHIRLPOOL 1077493af16f741793d64cab5446fafbbb1cdeeeebc490f7d9e86f873f74cb2c27f31c350ab0622a8b868656b5d418bff7cb6398565edf98b2c8276f96ce2ebf
-AUX pdns-3.3-fix-polarssl_1.3.0.patch 2645 SHA256 76c41580b495ec19fbc2cd447bf7e546ce15fcb8f03011ffd62469b4a6da0817 SHA512 333ed72a1838cd07ecba45d9f65513d0c744c31860f6ea536f06d2fa55bd8d64f98e915b40658218afed797b3fece16f0ddf1b76dd6378897dbeb32bec8403db WHIRLPOOL 1e1b457d7de61aa128010e9560de53c680216dc27433ddbac17b7242fbc1162d4f4f30fdc561aab2521f9c78db3f518431a1ac977fa925d42085f6e07a4df26e
-AUX pdns-3.3-lib_lua.patch 709 SHA256 655b8102c7f882cb7457fbec1cc28b4368da3a6c0bbe43cff6544c0b737b9db7 SHA512 3510962a8270d50801bc14d20119a55bae91bfee8c984e023159f0d306875f5766dbadccc333f06ecb2b2e519ba6fc0bdbbe3ec8eccd99f3fa17e0b1412e110a WHIRLPOOL 5cd013e5b2ba92b58321b910ad1587c19ff60e20c0ca4089b863e19e190bd49c0e975bd93290b9b02e573b6876661a6327fdb489040384fa1d81367dda428e2b
-AUX pdns-3.3_sha.hh 4286 SHA256 45b329126c92a1fdbc75050e2398e3d65d4872cc74258610bd987d27d59887d1 SHA512 d95b9c499c0802d7075e1031458c0731cca8d2069f5066e0de05639e2faaa247ff053124ae19ee3d5c16502762a401e492c1ed3b25bdf07ed0d5b35f3ae494f4 WHIRLPOOL b26d09441749ccd57358e6ecc6a84f56ae51033384f74d42af046882a36de910137cc853c14664f777aa18778fd5dcd13f3213dbd18dc0f0a289ef3b1f55b89b
+AUX pdns-3.3.1-fix-curl-link.patch 642 SHA256 23f332af6ecb9d25ea0733696f1280fceb39ce6d7d40bf2650ada065cc62db6d SHA512 d888281bf3a3ed464233c5d86fb649d4b4ce8b2008d4f3bd4da7dd0975235c3d73e8a8b74e8b59479baae97b1a9202cb1dd2fbf4ec0fcb8b6dd9a2a717c0dab6 WHIRLPOOL 859a3a2ca191b4459a1a15d3e55bfe07a5beb876af834238f244a71ac22cc80dc33c83079f2bc47eebed657ad7310289513137fd539addcfff5f53c70023e505
 DIST pdns-3.0.1.tar.gz 1196471 SHA256 922554431737b4a8126a8c4b5be3126eb8bf8ac2a086e3030d1cf4b3dfa7d1b9 SHA512 2266d6d0c7a878ce296e5d322df8e817582e1c2db735ac04509002f2fea0991239cd06563c72717ac1ead9a59ad5f73d69781db032c2afdb1ad38d8a986ff006 WHIRLPOOL 2cee75202c61713e1c91c3287c7718f3afc623d0a215dca6b1644aadd8d5170daa2eb60ed6ac41b00e2ce466ef03ed6dae25d58ae99fd6b3713cb188c1309930
 DIST pdns-3.1.tar.gz 1268532 SHA256 1400f7bd659207c0b1f4b8296092e559a7b7bf6a2434951970217d9af06922a1 SHA512 fdfaa98f401238b2a0cffe9e4eeb61787ca186cb3798e0265f70e525d98abfb937df200a2a922d5269db730dbeb5bbf457458b5c87fce034a359a03dfb3dfbc8 WHIRLPOOL 314423d10797628f2f0cf47ddd7da240e2d596fb3ff4e8d093c64655cc66383042c291352d3f673f147e4ea3e17b03e64dd10f180ce744d9ccd7e6926b9d6ede
 DIST pdns-3.2.tar.gz 1293593 SHA256 d1895aba065446dc68e5d7cc792d5303626c71759f61a455531ed65d59c06572 SHA512 ba129fda742f06983b429b245a86288cc5738beea7e8776f3d7980e6cda8e9a1efab90fcef84093f2e4857fb83d3b1c0a258d1d875ebf0bb7724226877898335 WHIRLPOOL ac105586c5860615ffa18923163c822b37cbd6ad902bf9aa60d952a82a1f7102da127eac330577d63e841195599ac5b67177b228c5120249f226c480cfa387f0
-DIST pdns-3.3.tar.gz 1360167 SHA256 93417bb418ccd1eaf85fc98aa9f687ed175de388fa2624a1978b7cd40dc2b0b6 SHA512 839cdd38dea64d9120adf81d077d9f6f2306c9cf37df65b0a3e2f0b16f36a906ef2553b107eb80a28a7f2d3b44d52a8c1077e4a56cc8e05fed6a1096ab5c8cde WHIRLPOOL 971946dc9728734f2bbe394adc8e6aca7c7dcedc86be7cffecfeb1835bd888c75c86a95d8d542b658d526e2462e0cce2b6ee04d05a4f89b8ecb6fa61b1bf93f7
+DIST pdns-3.3.1.tar.gz 1403435 SHA256 feb566994725e049391e9b862c9437ca545f1bb970143d2387e474a6ff645bf3 SHA512 b56fa8afce0eb2f881c269f4deedf61b4313dea80563c11f75af5c4bcc35d4e59d52629351abace534e7b810759baf0aaa30ee42fcf030aa5b9684e18dc43bb4 WHIRLPOOL dd688c3da04231571217516aabdd0dc71609e216e66b40c38c68b5f0209cf57ec4075f15e211c1b941fa5ed651d58a6443fc10906bc73710ba9ea66e69369dc7
 EBUILD pdns-3.0.1.ebuild 3064 SHA256 1b67ba8ab60cc5be702d0c3552d6efac8235d8914ae5383c47d33f172df185ea SHA512 b40abb170207838c7b49d3814eda7767eee6cdf25508d5097f471f14612f2de56d4133ab12ea1481fb8130cf3d96b1650550af84461b3c549bdd7494501fefa3 WHIRLPOOL 60d93ce9ddec34b5c51c35fd14842e6ead3ec752afd9aec3c29a453c841219eb05bd384eb3b6969b208fb9d2166e5c292e86cd90fcf876905b5031b3efc5afeb
 EBUILD pdns-3.1.ebuild 2928 SHA256 5790060a9ee78d32f1e57959223d8e487399eb3ae6ed28a13c426eb513a9ade7 SHA512 e8249d9584f6e10429e60009b06176324c8141717ac590a7c464338b8ed80d823f5b43a01c25de0e30e968a88e72d53dd5a6e5c5b7d84888bf9fbf97f0721498 WHIRLPOOL d18869852f88a5f8582cc328d6f89b71c073bcce1bc5b30f05d8da77eec5f043cef8aca4d6098bb26378ffb7dffa0cc331920354e16546aadcb701e9d70935b4
 EBUILD pdns-3.2.ebuild 5163 SHA256 7d912945935410e4b41f20d15636231f541baf188a33d5d0695863a20e9bfeba SHA512 987d2b654656b011cba9ca4bd07bb3b4050de8e22cadae86864382d668793a96588a0f05bd533137a0e2e35ed4ef45a9a32b2d07f3ffef1fa7060a186ed17968 WHIRLPOOL 59fda2f24f55c99e7dfd5484a46d2a2ab5ce0a2278006fe678ccdbd8c171e1791c79b35448c199748e5ece5b0b3a84f53ad22b195d83b613887180e173816866
-EBUILD pdns-3.3.ebuild 5299 SHA256 028d63ea4fd5788c15f2ceebc891668422b4e5c233f5d99ed21fd4b12ec27335 SHA512 c97c56da3bf5e62ab0b34d0d3e9b236fbbaf6f4215cbae12af782901a9af2398a2aa56b292bf6fa272d9737dc219e42ffd2a0a8dde557f88bd5bb79cd3daf817 WHIRLPOOL cd54a46bbc1bb405bc07e6498794231c576ebb7f4aadd3835ec0e8307a24aff3be83f19cbf1d3525f158d86a02e068a0787b25c6fe468ea27de797b7cf5e55f4
-MISC ChangeLog 14241 SHA256 936125c1dcf2f6e40ff1ee6ad1989ce9679b758706ce2a9bb41e699b8912c2cd SHA512 86a75ecdc412ab9f3bad5a86c03239efe168dce77d59538c3a6693f1477478f13e21516e9326daac7e60c6da9da45aa9f59870aa506f0c12838d15f9bf508a20 WHIRLPOOL ddd35f0889cadfecebb37432dbefab7a7a5b321aa8eea3e7fdcc23355b3a8ad827d7099fb868563a04717e00eb38c9a5dff824fd1ca82154316e1cb0a37f3f78
-MISC metadata.xml 1420 SHA256 71d1877c78a2ec451298ee16f2d482c37d93bd16687ed1ff5aeeb049d72772c4 SHA512 87faa2dda26ee19baa11380759e1680de0f4b5924306d0417ba126dd44defed5095fb03adb60dceb27e2151e359d0111b05103a590ef2991c69f31ba8012e128 WHIRLPOOL 9dd8c9b188802b6e0c6c77faa957b62794932ffed131cfc4b80d5ea84b2b6f5057ef3e663460e4c9baeff76c384e981c131227a92e80a4becdbf9de6e64c9e4a
+EBUILD pdns-3.3.1.ebuild 5079 SHA256 0ad814f21cb3da96de88bdb68227ca4ce23835144d785e918bcc45f563b54ee4 SHA512 6cdf31a26a83fb4a37677d0acf824d8ff856f4d0331b312d0c4a97b866a69831642b4d148ebb23c088166ba258552fdc5191dd04cda7e6f01fcb5ea8ff2ec925 WHIRLPOOL 35429c069f762c77cac34ea34889b42be2ab6fbf8154eeb31edea9085fdf30440eda2f29d3ad6c5aa5a8078341ceba9bdf8154b6786a200a09787dc37885a447
+MISC ChangeLog 14709 SHA256 e0f130c256acebcb212aa3fb2594229128c039c3462f16d9bc8616ca3770046e SHA512 d42a463ae2eba7ac0359fc79888cc8c8a7defd40e7dc1ad7b5dc49f3cc11e831518f64e96de9293c01d821911978864db57dc75ca2945e4d88770392357dc6b3 WHIRLPOOL e853dc11dcac5adaba6a3e6abdb51f26ff6c00b431a1fa0963fd6d54a6375a878a12f96db09b1057debf9a9b5acb682a9a5f90de09be2b070757019e66347334
+MISC metadata.xml 1496 SHA256 62f11762f2f33be179a8a11f9c061750b16e735712479ed53048b2dd81844f6a SHA512 a547fd6064efa6c3681f43a3d9427e256d2a18d065c240548c0d6663d586d5c5c3e20ee3993fb6490191517385b9f95a7475c586e1eaf12dafe97bd94845e8d8 WHIRLPOOL 623e25c6a52203d38aba761e8e41d94bd5e63d01bcb3c1969828b68125c0ae8cbf5290ec36b6cf166f2360441902162d31370f3b6cffb49f80ca130e6edba77f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlKvFK8ACgkQKiQSS7ZY+hOSugD/X2HhopEG0/Wd3ah7bWRApQBd
-EBC50t3LDEinCO7+0u4A/R+BqGlap/nF6e03MsQv+5yoec5g0y5e8qBUdIDJnQyQ
-=i6KB
+iF4EAREIAAYFAlKzIDkACgkQKiQSS7ZY+hM9oAD9EDYGLFpZx/ZLvQ9JYtKVPkUt
++/bSmLCrR7ls7Vo/4A4A/17j4QkFMypU0byJC85v2PXkQNe0vxLv+xedukjwcps6
+=2gvD
 -----END PGP SIGNATURE-----
diff --git a/net-dns/pdns/files/pdns-3.3-fix-autoconf.patch b/net-dns/pdns/files/pdns-3.3-fix-autoconf.patch
deleted file mode 100644
index e3ee3037b5df..000000000000
--- a/net-dns/pdns/files/pdns-3.3-fix-autoconf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 1beab82..243b693 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -180,7 +180,7 @@ AC_ARG_WITH([system-polarssl],
-  [system_polarssl=$withval],
-  [system_polarssl=yes])
- AC_MSG_RESULT($system_polarssl)
--AM_CONDITIONAL(HAVE_LIBPOLARSSL, false)
-+AM_CONDITIONAL(HAVE_LIBPOLARSSL, test x"$system_polarssl" = "xyes")
- if test x$system_polarssl = xyes; then
-  AC_MSG_CHECKING([PolarSSL version >= 1.1])
-  AC_COMPILE_IFELSE(
diff --git a/net-dns/pdns/files/pdns-3.3-fix-conditional-polarssl.patch b/net-dns/pdns/files/pdns-3.3-fix-conditional-polarssl.patch
deleted file mode 100644
index 15a2c504f49d..000000000000
--- a/net-dns/pdns/files/pdns-3.3-fix-conditional-polarssl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/pdns/Makefile.am	2013-12-10 11:53:54.530368351 +0100
-+++ b/pdns/Makefile.am	2013-12-10 11:55:33.398973939 +0100
-@@ -70,7 +70,11 @@
- 
- #
- pdns_server_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_SERIALIZATION_LDFLAGS) -rdynamic 
-+if HAVE_LIBPOLARSSL
-+pdns_server_LDADD= $(BOOST_SERIALIZATION_LIBS) $(LUA_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib)
-+else
- pdns_server_LDADD= ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_SERIALIZATION_LIBS) $(LUA_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib)
-+endif
- 
- if BOTAN110
- pdns_server_SOURCES += botan110signers.cc botansigners.cc
-@@ -112,7 +116,11 @@
- 
- 
- pdnssec_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS) 
-+if HAVE_LIBPOLARSSL
-+pdnssec_LDADD= $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_SERIALIZATION_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib)
-+else
- pdnssec_LDADD= ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_SERIALIZATION_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib)
-+endif
- 
- if BOTAN110
- pdnssec_SOURCES += botan110signers.cc botansigners.cc
diff --git a/net-dns/pdns/files/pdns-3.3-fix-polarssl_1.3.0.patch b/net-dns/pdns/files/pdns-3.3-fix-polarssl_1.3.0.patch
deleted file mode 100644
index 032cfd028461..000000000000
--- a/net-dns/pdns/files/pdns-3.3-fix-polarssl_1.3.0.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- /dev/shm/portage/net-dns/pdns-3.3/work/pdns-3.3/pdns/polarrsakeyinfra.cc	2013-04-26 21:54:34.000000000 +0200
-+++ pdns/pdns/polarrsakeyinfra.cc	2013-12-16 15:08:59.476418683 +0100
-@@ -1,20 +1,8 @@
--#ifdef HAVE_LIBPOLARSSLSSL
- #include <polarssl/rsa.h>
- #include <polarssl/base64.h>
--#include <polarssl/sha1.h>
--#include <polarssl/sha2.h>
--#include <polarssl/sha4.h>
-+#include <sha.hh>
- #include <polarssl/entropy.h>
- #include <polarssl/ctr_drbg.h>
--#else
--#include "ext/polarssl-1.1.2/include/polarssl/rsa.h"
--#include "ext/polarssl-1.1.2/include/polarssl/base64.h"
--#include "ext/polarssl-1.1.2/include/polarssl/sha1.h"
--#include "ext/polarssl-1.1.2/include/polarssl/sha2.h"
--#include "ext/polarssl-1.1.2/include/polarssl/sha4.h"
--#include "ext/polarssl-1.1.2/include/polarssl/entropy.h"
--#include "ext/polarssl-1.1.2/include/polarssl/ctr_drbg.h"
--#endif
- #include <boost/assign/std/vector.hpp> // for 'operator+=()'
- #include <boost/foreach.hpp>
- #include "dnssecinfra.hh"
-@@ -147,7 +135,8 @@
- {
-   string hash = this->hash(msg);
-   unsigned char signature[mpi_size(&d_context.N)];
--  int hashKind;
-+  md_type_t hashKind;
-+
-   if(hash.size()==20)
-     hashKind= SIG_RSA_SHA1;
-   else if(hash.size()==32) 
-@@ -169,7 +158,7 @@
- 
- bool RSADNSCryptoKeyEngine::verify(const std::string& msg, const std::string& signature) const
- {
--  int hashKind;
-+  md_type_t hashKind;
-   string hash=this->hash(msg);
-   if(hash.size()==20)
-     hashKind= SIG_RSA_SHA1;
-@@ -178,7 +167,11 @@
-   else
-     hashKind = SIG_RSA_SHA512;
-   
--  int ret=rsa_pkcs1_verify(const_cast<rsa_context*>(&d_context), RSA_PUBLIC, 
-+  int ret=rsa_pkcs1_verify(const_cast<rsa_context*>(&d_context),
-+#if POLARSSL_VERSION_NUMBER >= 0x01020900
-+    NULL, NULL,
-+#endif
-+    RSA_PUBLIC,
-     hashKind,
-     hash.size(),
-     (const unsigned char*) hash.c_str(), (unsigned char*) signature.c_str());
-@@ -195,12 +188,20 @@
-   } 
-   else if(d_algorithm == 8) { // RSASHA256
-     unsigned char hash[32];
-+#if POLARSSL_VERSION_NUMBER >= 0x01030000
-+    sha256((unsigned char*)toHash.c_str(), toHash.length(), hash, 0);
-+#else
-     sha2((unsigned char*)toHash.c_str(), toHash.length(), hash, 0);
-+#endif
-     return string((char*)hash, sizeof(hash));
-   } 
-   else if(d_algorithm == 10) { // RSASHA512
-     unsigned char hash[64];
-+#if POLARSSL_VERSION_NUMBER >= 0x01030000
-+    sha512((unsigned char*)toHash.c_str(), toHash.length(), hash, 0);
-+#else
-     sha4((unsigned char*)toHash.c_str(), toHash.length(), hash, 0);
-+#endif
-     return string((char*)hash, sizeof(hash));
-   }
-   throw runtime_error("PolarSSL hashing method can't hash algorithm "+lexical_cast<string>(d_algorithm));
diff --git a/net-dns/pdns/files/pdns-3.3-lib_lua.patch b/net-dns/pdns/files/pdns-3.3-lib_lua.patch
deleted file mode 100644
index 916ae26c911a..000000000000
--- a/net-dns/pdns/files/pdns-3.3-lib_lua.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/modules/luabackend/Makefile.am	2013-12-10 11:57:48.597065748 +0100
-+++ b/modules/luabackend/Makefile.am	2013-12-10 12:00:05.855127730 +0100
-@@ -1,4 +1,4 @@
--AM_CPPFLAGS=-I/usr/include/lua5.1 @THREADFLAGS@
-+AM_CPPFLAGS=$(LUA_CFLAGS) @THREADFLAGS@
- #AM_CPPFLAGS=-I/usr/local/include/luajit-2.0 -DUSE_LUAJIT @THREADFLAGS@
- EXTRA_DIST=OBJECTFILES OBJECTLIBS 
- 
-@@ -8,5 +8,6 @@
- libluabackend_la_SOURCES=luabackend.cc luabackend.hh minimal.cc reload.cc lua_functions.cc master.cc private.cc slave.cc supermaster.cc dnssec.cc \
- 	lua_functions.hh 
- 
--libluabackend_la_LDFLAGS=-module -avoid-version -llua5.1
-+libluabackend_la_LDFLAGS=-module -avoid-version
-+libluabackend_la_LIBADD=$(LUA_LIBS)
- #-lluajit-5.1
diff --git a/net-dns/pdns/files/pdns-3.3-fix-curl-link.patch b/net-dns/pdns/files/pdns-3.3.1-fix-curl-link.patch
index 64366a09d7f3..5ab2889ee853 100644
--- a/net-dns/pdns/files/pdns-3.3-fix-curl-link.patch
+++ b/net-dns/pdns/files/pdns-3.3.1-fix-curl-link.patch
@@ -1,6 +1,6 @@
 --- a/modules/remotebackend/Makefile.am	2013-12-10 11:45:24.487559267 +0100
 +++ b/modules/remotebackend/Makefile.am	2013-12-10 11:45:48.887215368 +0100
-@@ -13,7 +13,7 @@
+@@ -16,7 +16,7 @@
  libremotebackend_la_SOURCES=remotebackend.hh remotebackend.cc unixconnector.cc httpconnector.cc pipeconnector.cc 
  
  libremotebackend_la_LDFLAGS=-module -avoid-version
diff --git a/net-dns/pdns/files/pdns-3.3_sha.hh b/net-dns/pdns/files/pdns-3.3_sha.hh
deleted file mode 100644
index f90e8cb3e720..000000000000
--- a/net-dns/pdns/files/pdns-3.3_sha.hh
+++ /dev/null
@@ -1,134 +0,0 @@
-#ifndef _SHA_HH
-#define _SHA_HH
-
-#include <string>
-#include <stdint.h>
-#include <polarssl/version.h>
-#if POLARSSL_VERSION_NUMBER >= 0x01030000
-  #include <polarssl/sha1.h>
-  #include <polarssl/sha256.h>
-  #include <polarssl/sha512.h>
-  typedef sha256_context sha2_context;
-  typedef sha512_context sha4_context;
-  #define sha2_finish sha256_finish
-  #define sha2_hmac_finish sha256_hmac_finish
-  #define sha2_hmac_starts sha256_hmac_starts
-  #define sha2_hmac_update sha256_hmac_update
-  #define sha2_starts sha256_starts
-  #define sha2_update sha256_update
-  #define sha4_finish sha512_finish
-  #define sha4_hmac_finish sha512_hmac_finish
-  #define sha4_hmac_starts sha512_hmac_starts
-  #define sha4_hmac_update sha512_hmac_update
-  #define sha4_starts sha512_starts
-  #define sha4_update sha512_update
-  #define POLARSSL_SHA2_C POLARSSL_SHA256_C
-  #define POLARSSL_SHA4_C POLARSSL_SHA512_C
-  #define SIG_RSA_SHA1    POLARSSL_MD_SHA1
-  #define SIG_RSA_SHA224  POLARSSL_MD_SHA224
-  #define SIG_RSA_SHA256  POLARSSL_MD_SHA256
-  #define SIG_RSA_SHA384  POLARSSL_MD_SHA384
-  #define SIG_RSA_SHA512  POLARSSL_MD_SHA512
-#else
-  #include <polarssl/sha1.h>
-  #include <polarssl/sha2.h>
-  #include <polarssl/sha4.h>
-  typedef int md_type_t;
-#endif
-
-class SHA1Summer
-{
-public:
-   SHA1Summer() { sha1_starts(&d_context); };
-   void feed(const std::string &str) { feed(str.c_str(), str.length()); };
-   void feed(const char *ptr, size_t len) { sha1_update(&d_context, reinterpret_cast<const unsigned char*>(ptr), len); };
-   const std::string get() const { 
-     sha1_context ctx2;
-     unsigned char result[20] = {0};
-     ctx2=d_context;
-     sha1_finish(&ctx2, result);
-     return std::string(result, result + sizeof result);
-   };
-private:
-   SHA1Summer(const SHA1Summer&);
-   SHA1Summer& operator=(const SHA1Summer&);
-   sha1_context d_context;
-};
-
-class SHA224Summer
-{
-public:
-   SHA224Summer() { sha2_starts(&d_context, 1); };
-   void feed(const std::string &str) { feed(str.c_str(), str.length()); };
-   void feed(const char *ptr, size_t len) { sha2_update(&d_context, reinterpret_cast<const unsigned char*>(ptr), len); };
-   const std::string get() const { 
-     sha2_context ctx2;
-     unsigned char result[32] = {0};
-     ctx2=d_context;
-     sha2_finish(&ctx2, result);
-     return std::string(result, result + 28);
-   };
-private:
-   SHA224Summer(const SHA1Summer&);
-   SHA224Summer& operator=(const SHA1Summer&);
-   sha2_context d_context;
-};
-
-class SHA256Summer
-{
-public:
-   SHA256Summer() { sha2_starts(&d_context, 0); };
-   void feed(const std::string &str) { feed(str.c_str(), str.length()); };
-   void feed(const char *ptr, size_t len) { sha2_update(&d_context, reinterpret_cast<const unsigned char*>(ptr), len); };
-   const std::string get() const {
-     sha2_context ctx2;
-     unsigned char result[32] = {0};
-     ctx2=d_context;
-     sha2_finish(&ctx2, result);
-     return std::string(result, result + 32);
-   };
-private:
-   SHA256Summer(const SHA1Summer&);
-   SHA256Summer& operator=(const SHA1Summer&);
-   sha2_context d_context;
-};
-
-class SHA384Summer
-{
-public:
-   SHA384Summer() { sha4_starts(&d_context, 1); };
-   void feed(const std::string &str) { feed(str.c_str(), str.length()); };
-   void feed(const char *ptr, size_t len) { sha4_update(&d_context, reinterpret_cast<const unsigned char*>(ptr), len); };
-   const std::string get() const {
-     sha4_context ctx2;
-     unsigned char result[64] = {0};
-     ctx2 = d_context;
-     sha4_finish(&ctx2, result);
-     return std::string(result, result + 48);
-   };
-private:
-   SHA384Summer(const SHA1Summer&);
-   SHA384Summer& operator=(const SHA1Summer&);
-   sha4_context d_context;
-};
-
-class SHA512Summer
-{
-public:
-   SHA512Summer() { sha4_starts(&d_context, 0); };
-   void feed(const std::string &str) { feed(str.c_str(), str.length()); };
-   void feed(const char *ptr, size_t len) { sha4_update(&d_context, reinterpret_cast<const unsigned char*>(ptr), len); };
-   const std::string get() const {
-     sha4_context ctx2;
-     unsigned char result[64] = {0};
-     ctx2=d_context;
-     sha4_finish(&ctx2, result);
-     return std::string(result, result + sizeof result);
-   };
-private:
-   SHA512Summer(const SHA1Summer&);
-   SHA512Summer& operator=(const SHA1Summer&);
-   sha4_context d_context;
-};
-
-#endif /* sha.hh */
diff --git a/net-dns/pdns/metadata.xml b/net-dns/pdns/metadata.xml
index b43f48ecba53..ec7b58d9d788 100644
--- a/net-dns/pdns/metadata.xml
+++ b/net-dns/pdns/metadata.xml
@@ -19,5 +19,6 @@ standards documents. Furthermore, PowerDNS interfaces with almost any database.
 	<flag name='remote'>Use a generic socket or pipe as a backend (via JSON RPC requests).</flag>
 	<flag name='remote-http'>Enable remote connections to HTTP as backends (via RESTful JSON requests).</flag>
 	<flag name='tinydns'>Use a TinyDNS CDB database as backend.</flag>
+	<flag name='tools'>Build optional tools (dnsscan, dnsscope, etc..).</flag>
 </use>
 </pkgmetadata>
diff --git a/net-dns/pdns/pdns-3.3.ebuild b/net-dns/pdns/pdns-3.3.1.ebuild
index e13cac88aa6d..7343f8942d32 100644
--- a/net-dns/pdns/pdns-3.3.ebuild
+++ b/net-dns/pdns/pdns-3.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-3.3.ebuild,v 1.1 2013/12/16 14:56:40 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-3.3.1.ebuild,v 1.1 2013/12/19 16:34:57 ultrabug Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 # xdb: (almost) dead, surely not supported
 
 IUSE="botan cryptopp debug doc ldap lua mydns mysql odbc opendbx postgres remote
-remote-http sqlite static tinydns"
+remote-http sqlite static tools tinydns"
 
 REQUIRED_USE="mydns? ( mysql )"
 
@@ -41,7 +41,7 @@ RDEPEND="!static? (
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	static? (
-		net-libs/polarssl[static-libs(+)]
+		>=net-libs/polarssl-1.3.0[static-libs(+)]
 		>=dev-libs/boost-1.34[static-libs(+)]
 		botan? ( =dev-libs/botan-1.10*[static-libs(+)] )
 		cryptopp? ( dev-libs/crypto++[static-libs(+)] )
@@ -57,14 +57,8 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
 src_prepare() {
-	#TODO: kill me, I'm dirty @ultrabug
-	cp "${FILESDIR}/${P}_sha.hh" pdns/sha.hh
 	epatch \
-		"${FILESDIR}/${P}-fix-polarssl_1.3.0.patch" \
-		"${FILESDIR}/${P}-fix-autoconf.patch" \
-		"${FILESDIR}/${P}-fix-conditional-polarssl.patch" \
-		"${FILESDIR}/${P}-fix-curl-link.patch" \
-		"${FILESDIR}/${P}-lib_lua.patch"
+		"${FILESDIR}/${P}-fix-curl-link.patch"
 	eautoreconf
 }
 
@@ -108,6 +102,7 @@ src_configure() {
 		--with-mysql-lib=/usr/$(get_libdir) \
 		$(use_with lua) \
 		$(use_enable static static-binaries) \
+		$(use_enable tools) \
 		${myconf}
 }