Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-libs/tntnet/ChangeLog12
-rw-r--r--dev-libs/tntnet/files/tntnet-2.0-as-needed.patch429
-rw-r--r--dev-libs/tntnet/files/tntnet-2.0-gnutls.patch31
-rw-r--r--dev-libs/tntnet/files/tntnet.initd30
-rw-r--r--dev-libs/tntnet/metadata.xml11
-rw-r--r--dev-libs/tntnet/tntnet-2.0-r1.ebuild89
-rw-r--r--dev-libs/tntnet/tntnet-2.0.ebuild69
7 files changed, 595 insertions, 76 deletions
diff --git a/dev-libs/tntnet/ChangeLog b/dev-libs/tntnet/ChangeLog
index 882109ac8f82..b4ec3894f9b2 100644
--- a/dev-libs/tntnet/ChangeLog
+++ b/dev-libs/tntnet/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for dev-libs/tntnet
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/ChangeLog,v 1.15 2011/01/20 23:34:03 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/ChangeLog,v 1.16 2011/01/21 00:01:06 idl0r Exp $
+
+*tntnet-2.0-r1 (21 Jan 2011)
+
+ 21 Jan 2011; Christian Ruppert <idl0r@gentoo.org> -tntnet-2.0.ebuild,
+ +tntnet-2.0-r1.ebuild, +files/tntnet-2.0-as-needed.patch,
+ +files/tntnet-2.0-gnutls.patch, +files/tntnet.initd, metadata.xml:
+ Revision bump. Fix LDFLAGS usage (--as-needed). Use Gentoo init script
+ instead of the generic one, bug 335306. Fix compilation with gnutls. Some
+ refactoring of the ebuild and some new useflags. Fix dependencies. Remove vdr
+ from maintainer, bug 216445.
20 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
-tntnet-1.6.0-r1.ebuild, -tntnet-1.6.1.ebuild, -tntnet-1.6.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
new file mode 100644
index 000000000000..35d10a91f6d0
--- /dev/null
+++ b/dev-libs/tntnet/files/tntnet-2.0-as-needed.patch
@@ -0,0 +1,429 @@
+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
new file mode 100644
index 000000000000..6301f580502d
--- /dev/null
+++ b/dev-libs/tntnet/files/tntnet-2.0-gnutls.patch
@@ -0,0 +1,31 @@
+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/files/tntnet.initd b/dev-libs/tntnet/files/tntnet.initd
new file mode 100644
index 000000000000..46a9a5f92962
--- /dev/null
+++ b/dev-libs/tntnet/files/tntnet.initd
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/files/tntnet.initd,v 1.1 2011/01/21 00:01:06 idl0r Exp $
+
+PIDFILE="/var/run/tntnet.pid"
+
+depend() {
+ use net
+}
+
+start() {
+ ebegin "Starting tntnet"
+ start-stop-daemon --start --quiet --pidfile $PIDFILE --exec /usr/bin/tntnet
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping tntnet"
+ start-stop-daemon --stop --pidfile $PIDFILE --exec /usr/bin/tntnet
+ eend $?
+}
+
+reload() {
+ # FIXME: Remove --stop and --oknodo as soon as baselayout-1 has been removed...
+ # finally...
+ ebegin "Reloading tntnet configuration"
+ start-stop-daemon --stop --oknodo --pidfile $PIDFILE --signal HUP --exec /usr/bin/tntnet
+ eend $?
+}
diff --git a/dev-libs/tntnet/metadata.xml b/dev-libs/tntnet/metadata.xml
index 5f9f14619db8..99df37edf472 100644
--- a/dev-libs/tntnet/metadata.xml
+++ b/dev-libs/tntnet/metadata.xml
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>media-tv</herd>
-<maintainer>
-<email>vdr@gentoo.org</email>
-<name>Gentoo VDR Project</name>
-</maintainer>
+ <herd>media-tv</herd>
+ <use>
+ <flag name="server">Enable tntnet server daemon</flag>
+ <flag name="sdk">Enable tntnet SDK</flag>
+ </use>
</pkgmetadata>
-
diff --git a/dev-libs/tntnet/tntnet-2.0-r1.ebuild b/dev-libs/tntnet/tntnet-2.0-r1.ebuild
new file mode 100644
index 000000000000..0e738669917b
--- /dev/null
+++ b/dev-libs/tntnet/tntnet-2.0-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/tntnet-2.0-r1.ebuild,v 1.1 2011/01/21 00:01:06 idl0r Exp $
+
+EAPI="3"
+
+inherit autotools eutils
+
+DESCRIPTION="Modular, multithreaded webapplicationserver extensible with C++"
+HOMEPAGE="http://www.tntnet.org/index.hms"
+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.0
+ sys-libs/zlib
+ ssl? (
+ gnutls? (
+ >=net-libs/gnutls-1.2.0
+ dev-libs/libgcrypt
+ )
+ !gnutls? ( dev-libs/openssl )
+ )"
+DEPEND="${RDEPEND}
+ examples? ( app-arch/zip )"
+
+src_prepare() {
+ # Both fixed in the next release
+ epatch "${FILESDIR}/${P}-as-needed.patch"
+ epatch "${FILESDIR}/${P}-gnutls.patch"
+
+ eautoreconf
+
+ sed -i -e 's:@localstatedir@:/var:' etc/tntnet/tntnet.conf.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
+}
diff --git a/dev-libs/tntnet/tntnet-2.0.ebuild b/dev-libs/tntnet/tntnet-2.0.ebuild
deleted file mode 100644
index 462fb3055717..000000000000
--- a/dev-libs/tntnet/tntnet-2.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/tntnet-2.0.ebuild,v 1.1 2011/01/19 19:10:13 hd_brummy Exp $
-
-EAPI="2"
-
-inherit autotools eutils
-
-DESCRIPTION="A modular, multithreaded webapplicationserver extensible with C++."
-HOMEPAGE="http://www.tntnet.org/index.hms"
-SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="ssl gnutls examples"
-
-RDEPEND=">=dev-libs/cxxtools-2.0
- ssl? (
- gnutls? ( >=net-libs/gnutls-1.2.0 )
- !gnutls? ( dev-libs/openssl )
- )"
-DEPEND="${RDEPEND}
- app-arch/zip
- ssl? ( gnutls? ( dev-util/pkgconfig ) )"
-
-src_prepare() {
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=""
- if use ssl; then
- if use gnutls; then
- einfo "Using gnutls for ssl support."
- myconf="${myconf} --with-ssl=gnutls"
- else
- einfo "Using openssl for ssl support."
- myconf="${myconf} --with-ssl=openssl"
- fi
- else
- einfo "Disabled ssl"
- myconf="${myconf} --with-ssl=no"
- fi
- if use examples; then
- myconf="${myconf} --with-demos=yes"
- else
- myconf="${myconf} --with-demos=no"
- fi
-
- econf ${myconf} || die "econf failed"
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "Install failed"
- dodoc AUTHORS ChangeLog README TODO doc/*.pdf
-
- if use examples; then
- cd "${S}/sdk/demos"
- make clean
- rm -rf .deps */.deps .libs */.libs
-
- local dir="/usr/share/doc/${PF}/examples"
- dodir "${dir}"
- cp -r "${S}"/sdk/demos/* "${D}${dir}"
- fi
-}