stable amd64 x86; fixed missing include, thx to T.Rausch on wrt bug 423697

(Portage version: 2.2.10/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 34C2808A)

5 files changed, 11 insertions, 553 deletions

diff --git a/dev-libs/tntnet/ChangeLog b/dev-libs/tntnet/ChangeLog
index 3232369f53f3..229bdfe41fd2 100644
--- a/dev-libs/tntnet/ChangeLog
+++ b/dev-libs/tntnet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/tntnet
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/ChangeLog,v 1.27 2014/03/01 22:14:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/ChangeLog,v 1.28 2014/06/11 18:55:12 hd_brummy Exp $
+
+  11 Jun 2014; Joerg Bornkessel <hd_brummy@gentoo.org> -tntnet-2.2.ebuild,
+  tntnet-2.2.1.ebuild, -files/tntnet-2.0-as-needed.patch,
+  -files/tntnet-2.0-gnutls.patch:
+  stable amd64 x86; fixed missing include, thx to T.Rausch on wrt bug 423697
 
   01 Mar 2014; Michał Górny <mgorny@gentoo.org> tntnet-2.2.1.ebuild,
   tntnet-2.2.ebuild:
diff --git a/dev-libs/tntnet/files/tntnet-2.0-as-needed.patch b/dev-libs/tntnet/files/tntnet-2.0-as-needed.patch
deleted file mode 100644
index 35d10a91f6d0..000000000000
--- a/dev-libs/tntnet/files/tntnet-2.0-as-needed.patch
+++ /dev/null
@@ -1,429 +0,0 @@
-From a43a952135bd8b657b455ff88bae640ad8d104e9 Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Thu, 20 Jan 2011 18:20:45 +0100
-Subject: [PATCH] Fix LDFLAGS usage
-
----
- framework/cgi/Makefile.am          |    4 ++--
- framework/common/Makefile.am       |    7 ++++---
- framework/defcomp/Makefile.am      |    4 ++--
- framework/runtime/Makefile.am      |    3 +--
- sdk/demos/Makefile.am              |    4 ++--
- sdk/demos/calc/Makefile.am         |    4 ++--
- sdk/demos/calcajax/Makefile.am     |    4 ++--
- sdk/demos/calci18n/Makefile.am     |    4 ++--
- sdk/demos/calcmvc/Makefile.am      |    4 ++--
- sdk/demos/chat/Makefile.am         |    4 ++--
- sdk/demos/comp/Makefile.am         |    8 ++++----
- sdk/demos/config/Makefile.am       |    4 ++--
- sdk/demos/controls/Makefile.am     |    4 ++--
- sdk/demos/cookie/Makefile.am       |    4 ++--
- sdk/demos/hello/Makefile.am        |    4 ++--
- sdk/demos/rajax-jquery/Makefile.am |    4 ++--
- sdk/demos/savepoint/Makefile.am    |    4 ++--
- sdk/demos/session/Makefile.am      |    4 ++--
- sdk/demos/sprintf/Makefile.am      |    4 ++--
- sdk/demos/strings/Makefile.am      |    4 ++--
- sdk/demos/upload/Makefile.am       |    4 ++--
- sdk/tools/common/Makefile.am       |    3 ++-
- sdk/tools/ecppc/Makefile.am        |    3 +--
- sdk/tools/ecppl/Makefile.am        |    3 +--
- sdk/tools/ecppll/Makefile.am       |    3 +--
- utest/Makefile.am                  |    3 +--
- 26 files changed, 51 insertions(+), 54 deletions(-)
-
-diff --git a/framework/cgi/Makefile.am b/framework/cgi/Makefile.am
-index 4912e19..0bc02f4 100644
---- a/framework/cgi/Makefile.am
-+++ b/framework/cgi/Makefile.am
-@@ -7,5 +7,5 @@ libtntnet_cgi_la_SOURCES = \
- 	tnt/cgi.h
- 
- libtntnet_cgi_la_CXXFLAGS = $(PTHREAD_CFLAGS)
--libtntnet_cgi_la_LDFLAGS = -version-info @sonumber@ $(PTHREAD_LIBS)
--libtntnet_cgi_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la -lcxxtools
-+libtntnet_cgi_la_LDFLAGS = -version-info @sonumber@
-+libtntnet_cgi_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la -lcxxtools $(PTHREAD_LIBS)
-diff --git a/framework/common/Makefile.am b/framework/common/Makefile.am
-index d2de886..84c4297 100644
---- a/framework/common/Makefile.am
-+++ b/framework/common/Makefile.am
-@@ -114,7 +114,8 @@ noinst_HEADERS = \
- 	tnt/util.h
- 
- libtntnet_la_CXXFLAGS = -DPKGLIBDIR=\"@libdir@/@PACKAGE@\" $(PTHREAD_CFLAGS)
--libtntnet_la_LDFLAGS = -version-info @sonumber@ -lz -lcxxtools $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
-+libtntnet_la_LDFLAGS = -version-info @sonumber@ @SHARED_LIB_FLAG@
-+libtntnet_la_LIBADD = -lz -lcxxtools $(PTHREAD_LIBS)
- 
- if MAKE_GNUTLS
- libtntnet_la_SOURCES += \
-@@ -125,7 +126,7 @@ noinst_HEADERS += \
- 	tnt/gcryptinit.h \
- 	tnt/gnutls.h
- 
--libtntnet_la_LDFLAGS += -lgnutls -lgcrypt
-+libtntnet_la_LIBADD += -lgnutls -lgcrypt
- endif
- 
- if MAKE_OPENSSL
-@@ -135,7 +136,7 @@ libtntnet_la_SOURCES += \
- noinst_HEADERS += \
- 	tnt/openssl.h
- 
--libtntnet_la_LDFLAGS += -lssl -lcrypto
-+libtntnet_la_LIBADD += -lssl -lcrypto
- endif
- 
- if MAKE_STRESSJOB
-diff --git a/framework/defcomp/Makefile.am b/framework/defcomp/Makefile.am
-index a053e1a..2f33529 100644
---- a/framework/defcomp/Makefile.am
-+++ b/framework/defcomp/Makefile.am
-@@ -14,5 +14,5 @@ tntnet_la_SOURCES = \
- 	static.h
- 
- tntnet_la_CXXFLAGS = $(PTHREAD_CFLAGS)
--tntnet_la_LDFLAGS = -module -version-info @sonumber@ $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
--tntnet_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+tntnet_la_LDFLAGS = -module -version-info @sonumber@ @SHARED_LIB_FLAG@
-+tntnet_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
-diff --git a/framework/runtime/Makefile.am b/framework/runtime/Makefile.am
-index e318ab7..4c59be4 100644
---- a/framework/runtime/Makefile.am
-+++ b/framework/runtime/Makefile.am
-@@ -9,7 +9,6 @@ tntnet_SOURCES = \
- nobase_include_HEADERS = \
- 	tnt/process.h
- 
--tntnet_LDFLAGS = $(PTHREAD_LIBS)
--tntnet_LDADD = $(top_builddir)/framework/common/libtntnet.la
-+tntnet_LDADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- tntnet_CXXFLAGS=-DTNTNET_CONF=\"@sysconfdir@/tntnet/tntnet.conf\" -DTNTNET_PID=\"@localstatedir@/tntnet.pid\" $(PTHREAD_CFLAGS)
- 
-diff --git a/sdk/demos/Makefile.am b/sdk/demos/Makefile.am
-index f6a93f8..cea7468 100644
---- a/sdk/demos/Makefile.am
-+++ b/sdk/demos/Makefile.am
-@@ -10,8 +10,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
--alldemos_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
--alldemos_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+alldemos_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+alldemos_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.properties
- CLEANFILES = alldemos.cpp tntnet.properties
-diff --git a/sdk/demos/calc/Makefile.am b/sdk/demos/calc/Makefile.am
-index 7b14f3c..339b12a 100644
---- a/sdk/demos/calc/Makefile.am
-+++ b/sdk/demos/calc/Makefile.am
-@@ -8,8 +8,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
--calc_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
--calc_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+calc_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+calc_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = calc.cpp tntnet.conf tntnet.properties
-diff --git a/sdk/demos/calcajax/Makefile.am b/sdk/demos/calcajax/Makefile.am
-index c569868..020df8b 100644
---- a/sdk/demos/calcajax/Makefile.am
-+++ b/sdk/demos/calcajax/Makefile.am
-@@ -12,8 +12,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
--calcajax_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
--calcajax_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+calcajax_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+calcajax_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = calcajax.cpp calcajax_js.cpp docalc.cpp tntnet.conf tntnet.properties
-diff --git a/sdk/demos/calci18n/Makefile.am b/sdk/demos/calci18n/Makefile.am
-index d334ffe..2952da4 100644
---- a/sdk/demos/calci18n/Makefile.am
-+++ b/sdk/demos/calci18n/Makefile.am
-@@ -16,8 +16,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
--calci18n_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
--calci18n_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+calci18n_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+calci18n_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties calci18n.txt calci18n.fi calci18n.de
- CLEANFILES = calci18n.cpp tntnet.conf tntnet.properties \
-diff --git a/sdk/demos/calcmvc/Makefile.am b/sdk/demos/calcmvc/Makefile.am
-index 9b4baaa..bc37b2a 100644
---- a/sdk/demos/calcmvc/Makefile.am
-+++ b/sdk/demos/calcmvc/Makefile.am
-@@ -18,8 +18,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
--calcmvc_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
--calcmvc_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+calcmvc_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+calcmvc_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = calcController.cpp calcModel.cpp calcView.cpp calcmvc.cpp \
-diff --git a/sdk/demos/chat/Makefile.am b/sdk/demos/chat/Makefile.am
-index 72fa35c..7816390 100644
---- a/sdk/demos/chat/Makefile.am
-+++ b/sdk/demos/chat/Makefile.am
-@@ -21,8 +21,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
--chat_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
--chat_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+chat_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+chat_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = chat.cpp ajax.cpp getchat.cpp putchat.cpp \
-diff --git a/sdk/demos/comp/Makefile.am b/sdk/demos/comp/Makefile.am
-index e60bdb1..be56430 100644
---- a/sdk/demos/comp/Makefile.am
-+++ b/sdk/demos/comp/Makefile.am
-@@ -14,10 +14,10 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
--comp_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
--comp_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
--extlib_la_LDFLAGS = -module $(PTHREAD_LIBS)
--extlib_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+comp_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+comp_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
-+extlib_la_LDFLAGS = -module
-+extlib_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = comp.cpp subcomp.cpp extcomp.cpp \
-diff --git a/sdk/demos/config/Makefile.am b/sdk/demos/config/Makefile.am
-index 824341c..94282df 100644
---- a/sdk/demos/config/Makefile.am
-+++ b/sdk/demos/config/Makefile.am
-@@ -8,8 +8,8 @@ nodist_config_la_SOURCES = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
--config_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
--config_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+config_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+config_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = config.cpp tntnet.conf tntnet.properties
-diff --git a/sdk/demos/controls/Makefile.am b/sdk/demos/controls/Makefile.am
-index 34dabd3..f7f414b 100644
---- a/sdk/demos/controls/Makefile.am
-+++ b/sdk/demos/controls/Makefile.am
-@@ -35,8 +35,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
--controls_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
--controls_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+controls_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+controls_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = tntnet.properties \
-diff --git a/sdk/demos/cookie/Makefile.am b/sdk/demos/cookie/Makefile.am
-index a604e47..6360e8f 100644
---- a/sdk/demos/cookie/Makefile.am
-+++ b/sdk/demos/cookie/Makefile.am
-@@ -8,8 +8,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
--cookie_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
--cookie_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+cookie_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+cookie_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = cookie.cpp tntnet.conf tntnet.properties
-diff --git a/sdk/demos/hello/Makefile.am b/sdk/demos/hello/Makefile.am
-index cb4c246..639894d 100644
---- a/sdk/demos/hello/Makefile.am
-+++ b/sdk/demos/hello/Makefile.am
-@@ -10,8 +10,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
--hello_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
--hello_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+hello_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+hello_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = hello.cpp tntnet.cpp tntnet.conf tntnet.properties
-diff --git a/sdk/demos/rajax-jquery/Makefile.am b/sdk/demos/rajax-jquery/Makefile.am
-index 259eac5..a1832fd 100644
---- a/sdk/demos/rajax-jquery/Makefile.am
-+++ b/sdk/demos/rajax-jquery/Makefile.am
-@@ -18,8 +18,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
--message_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
--message_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+message_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+message_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = get.cpp jquery.cpp message.cpp put.cpp tntnet.conf tntnet.properties
-diff --git a/sdk/demos/savepoint/Makefile.am b/sdk/demos/savepoint/Makefile.am
-index 0f4a5a2..a357d56 100644
---- a/sdk/demos/savepoint/Makefile.am
-+++ b/sdk/demos/savepoint/Makefile.am
-@@ -8,8 +8,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
--savepoint_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
--savepoint_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+savepoint_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+savepoint_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = savepoint.cpp tntnet.conf tntnet.properties
-diff --git a/sdk/demos/session/Makefile.am b/sdk/demos/session/Makefile.am
-index 1809d64..b30dd03 100644
---- a/sdk/demos/session/Makefile.am
-+++ b/sdk/demos/session/Makefile.am
-@@ -10,8 +10,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
--session_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
--session_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+session_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+session_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = session.cpp appsession.cpp \
-diff --git a/sdk/demos/sprintf/Makefile.am b/sdk/demos/sprintf/Makefile.am
-index bd0ac73..7b0a0af 100644
---- a/sdk/demos/sprintf/Makefile.am
-+++ b/sdk/demos/sprintf/Makefile.am
-@@ -10,8 +10,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
--sprintf_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
--sprintf_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+sprintf_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+sprintf_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = sprintf.cpp subcomp.cpp tntnet.conf tntnet.properties
-diff --git a/sdk/demos/strings/Makefile.am b/sdk/demos/strings/Makefile.am
-index 804a177..4f8b876 100644
---- a/sdk/demos/strings/Makefile.am
-+++ b/sdk/demos/strings/Makefile.am
-@@ -8,8 +8,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
--strings_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
--strings_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+strings_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+strings_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = strings.cpp tntnet.conf tntnet.properties
-diff --git a/sdk/demos/upload/Makefile.am b/sdk/demos/upload/Makefile.am
-index 7082caa..da4ea88 100644
---- a/sdk/demos/upload/Makefile.am
-+++ b/sdk/demos/upload/Makefile.am
-@@ -8,8 +8,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
--upload_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
--upload_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+upload_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+upload_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = upload.cpp tntnet.conf tntnet.properties
-diff --git a/sdk/tools/common/Makefile.am b/sdk/tools/common/Makefile.am
-index a107070..d1b68a8 100644
---- a/sdk/tools/common/Makefile.am
-+++ b/sdk/tools/common/Makefile.am
-@@ -16,4 +16,5 @@ libtntnet_sdk_la_SOURCES = \
- 	tnt/stringescaper.h
- 
- libtntnet_sdk_la_CXXFLAGS = $(PTHREAD_CFLAGS)
--libtntnet_sdk_la_LDFLAGS = -version-info @sonumber@ -lcxxtools $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
-+libtntnet_sdk_la_LDFLAGS = -version-info @sonumber@ @SHARED_LIB_FLAG@
-+libtntnet_sdk_la_LIBADD = -lcxxtools $(PTHREAD_LIBS)
-diff --git a/sdk/tools/ecppc/Makefile.am b/sdk/tools/ecppc/Makefile.am
-index d740df6..e4b1166 100644
---- a/sdk/tools/ecppc/Makefile.am
-+++ b/sdk/tools/ecppc/Makefile.am
-@@ -20,8 +20,7 @@ ecppc_SOURCES = \
- 	tnt/ecppc/subcomponent.h \
- 	tnt/ecppc/variable.h
- 
--ecppc_LDADD = $(top_builddir)/framework/common/libtntnet.la $(top_builddir)/sdk/tools/common/libtntnet_sdk.la
-+ecppc_LDADD = $(top_builddir)/framework/common/libtntnet.la $(top_builddir)/sdk/tools/common/libtntnet_sdk.la -lcxxtools $(PTHREAD_LIBS)
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common -I$(top_srcdir)/sdk/tools/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
--AM_LDFLAGS = -lcxxtools $(PTHREAD_LIBS)
-diff --git a/sdk/tools/ecppl/Makefile.am b/sdk/tools/ecppl/Makefile.am
-index b658f40..64d8a9f 100644
---- a/sdk/tools/ecppl/Makefile.am
-+++ b/sdk/tools/ecppl/Makefile.am
-@@ -5,8 +5,7 @@ ecppl_SOURCES = \
- 	ecpplang.cpp \
- 	ecpplang.h
- 
--ecppl_LDADD = $(top_builddir)/sdk/tools/common/libtntnet_sdk.la
-+ecppl_LDADD = $(top_builddir)/sdk/tools/common/libtntnet_sdk.la -lcxxtools $(PTHREAD_LIBS)
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common -I$(top_srcdir)/sdk/tools/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
--AM_LDFLAGS = -lcxxtools $(PTHREAD_LIBS)
-diff --git a/sdk/tools/ecppll/Makefile.am b/sdk/tools/ecppll/Makefile.am
-index 3782acb..85b24d1 100644
---- a/sdk/tools/ecppll/Makefile.am
-+++ b/sdk/tools/ecppll/Makefile.am
-@@ -3,8 +3,7 @@ bin_PROGRAMS = ecppll
- ecppll_SOURCES = \
- 	ecppll.cpp
- 
--ecppll_LDADD = $(top_builddir)/sdk/tools/common/libtntnet_sdk.la
-+ecppll_LDADD = $(top_builddir)/sdk/tools/common/libtntnet_sdk.la -lcxxtools $(PTHREAD_LIBS)
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common -I$(top_srcdir)/sdk/tools/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
--AM_LDFLAGS = -lcxxtools $(PTHREAD_LIBS)
-diff --git a/utest/Makefile.am b/utest/Makefile.am
-index 2f662ae..d4cdef1 100644
---- a/utest/Makefile.am
-+++ b/utest/Makefile.am
-@@ -7,5 +7,4 @@ utest_SOURCES = \
-     testmain.cpp \
-     strutest.cpp
- 
--utest_LDFLAGS = -lcxxtools-unit
--utest_LDADD = $(top_builddir)/framework/common/libtntnet.la
-+utest_LDADD = $(top_builddir)/framework/common/libtntnet.la -lcxxtools-unit
--- 
-1.7.3.4
-
diff --git a/dev-libs/tntnet/files/tntnet-2.0-gnutls.patch b/dev-libs/tntnet/files/tntnet-2.0-gnutls.patch
deleted file mode 100644
index 6301f580502d..000000000000
--- a/dev-libs/tntnet/files/tntnet-2.0-gnutls.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: framework/common/gnutls.cpp
-===================================================================
---- framework/common/gnutls.cpp	(revision 1256)
-+++ framework/common/gnutls.cpp	(working copy)
-@@ -35,7 +35,7 @@
- #include "tnt/gcryptinit.h"
- #include <sys/poll.h>
- #include <errno.h>
--#include <cxxtools/net/net.h>
-+#include <cxxtools/ioerror.h>
- 
- log_define("tntnet.ssl")
- 
-@@ -364,7 +364,7 @@
-           break;
- 
-         if (ret == GNUTLS_E_AGAIN)
--          throw cxxtools::net::Timeout();
-+          throw cxxtools::IOTimeout();
- 
-         if (ret < 0 && ret != GNUTLS_E_INTERRUPTED)
-           throw GnuTlsException("gnutls_record_recv", ret);
-@@ -403,7 +403,7 @@
-           break;
- 
-         if (ret == GNUTLS_E_AGAIN)
--          throw cxxtools::net::Timeout();
-+          throw cxxtools::IOTimeout();
- 
-         if (ret != GNUTLS_E_INTERRUPTED)
-           throw GnuTlsException("gnutls_record_send", ret);
diff --git a/dev-libs/tntnet/tntnet-2.2.1.ebuild b/dev-libs/tntnet/tntnet-2.2.1.ebuild
index c4f5b295060e..6bccbdbb1454 100644
--- a/dev-libs/tntnet/tntnet-2.2.1.ebuild
+++ b/dev-libs/tntnet/tntnet-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/tntnet-2.2.1.ebuild,v 1.3 2014/03/01 22:14:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/tntnet-2.2.1.ebuild,v 1.4 2014/06/11 18:55:12 hd_brummy Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc x86"
 IUSE="doc gnutls server ssl examples"
 
 RDEPEND=">=dev-libs/cxxtools-2.2.1
@@ -33,6 +33,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.0-zlib-minizip.patch
 	rm framework/common/{ioapi,unzip}.[ch] || die
 
+	# bug 423697
+	sed -e "s:unzip.h:minizip/unzip.h:" -i framework/defcomp/unzipcomp.cpp
+
 	eautoreconf
 
 	sed -i -e 's:@localstatedir@:/var:' etc/tntnet/tntnet.xml.in || die
diff --git a/dev-libs/tntnet/tntnet-2.2.ebuild b/dev-libs/tntnet/tntnet-2.2.ebuild
deleted file mode 100644
index 00e26fd3dd2e..000000000000
--- a/dev-libs/tntnet/tntnet-2.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/tntnet-2.2.ebuild,v 1.3 2014/03/01 22:14:27 mgorny Exp $
-
-EAPI="5"
-
-inherit autotools eutils
-
-DESCRIPTION="Modular, multithreaded webapplicationserver extensible with C++"
-HOMEPAGE="http://www.tntnet.org/"
-SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="cgi doc examples gnutls server sdk ssl"
-
-RDEPEND="=dev-libs/cxxtools-2.2*
-	sys-libs/zlib[minizip]
-	ssl? (
-		gnutls? (
-			>=net-libs/gnutls-1.2.0
-			dev-libs/libgcrypt:0
-		)
-		!gnutls? ( dev-libs/openssl )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-arch/zip"
-
-src_prepare() {
-	# Both fixed in the next release
-	epatch "${FILESDIR}"/${PN}-2.0-zlib-minizip.patch
-	rm framework/common/{ioapi,unzip}.[ch] || die
-
-	eautoreconf
-
-	sed -i -e 's:@localstatedir@:/var:' etc/tntnet/tntnet.xml.in || die
-}
-
-src_configure() {
-	local myconf=""
-
-	# Prefer gnutls above SSL
-	if use gnutls; then
-		einfo "Using gnutls for ssl support."
-		myconf="${myconf} --with-ssl=gnutls"
-	elif use ssl; then
-		einfo "Using openssl for ssl support."
-		myconf="${myconf} --with-ssl=openssl"
-	else
-		myconf="${myconf} --with-ssl=no"
-	fi
-
-	# demos/examples depend upon sdk
-	if use examples && ! use sdk; then
-		myconf="${myconf} --with-sdk"
-	fi
-
-	econf \
-		$(use_with examples demos) \
-		$(use_with sdk) \
-		$(use_with cgi) \
-		$(use_with server) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog README TODO
-	if use doc; then
-		dodoc doc/*.pdf || die
-	fi
-
-	if use examples; then
-		cd "${S}/sdk/demos"
-		emake clean
-		rm -rf .deps */.deps .libs */.libs
-		cd "${S}"
-
-		insinto /usr/share/doc/${PF}/examples
-		doins -r sdk/demos/* || die
-	fi
-
-	if use server; then
-		rm -f "${D}/etc/init.d/tntnet"
-		newinitd "${FILESDIR}/tntnet.initd" tntnet
-	fi
-}