summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-libs/tntnet
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-libs/tntnet')
-rw-r--r--dev-libs/tntnet/Manifest2
-rw-r--r--dev-libs/tntnet/files/tntnet-1.6.3-gcc43.patch11
-rw-r--r--dev-libs/tntnet/files/tntnet-1.6.3-gnutls-2.8.patch13
-rw-r--r--dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch65
-rw-r--r--dev-libs/tntnet/files/tntnet.initd30
-rw-r--r--dev-libs/tntnet/metadata.xml12
-rw-r--r--dev-libs/tntnet/tntnet-1.6.3.ebuild72
-rw-r--r--dev-libs/tntnet/tntnet-2.2.1.ebuild88
8 files changed, 293 insertions, 0 deletions
diff --git a/dev-libs/tntnet/Manifest b/dev-libs/tntnet/Manifest
new file mode 100644
index 000000000000..4af8b75d8f77
--- /dev/null
+++ b/dev-libs/tntnet/Manifest
@@ -0,0 +1,2 @@
+DIST tntnet-1.6.3.tar.gz 1952122 SHA256 1c16547e4fe6c07f8fe1b9d2eeb750cb2061032f31880f93f2080b049d54a3a4 SHA512 e1652b7c0165aacb6b53502df6b56bdc14cf5c582bce7952a0ec515c0468104b8b9aab75cc8ae355af7438a9df8419cfe2dc035bae340f4b3e692198e3981602 WHIRLPOOL 83d4bbcf4109578e8cf68c13a530c8455c2b43b8a508e6d1401dcd5278ae59ae3c2e2613403414cd66d27172bcb517d5c45f02c9ffd6165052d481ccd8d40dd9
+DIST tntnet-2.2.1.tar.gz 1127500 SHA256 c83170d08ef04c5868051e1c28c74b9562fe71e9e8263828e755ad5bd3547521 SHA512 78a26713498fd6eabb0b4a247bb20c130ce967ed22ce5c54da4b1300534dd40155aa62a2dc770be4eca720cadeceac283978a5dc3ce418728994af72e4d8eac1 WHIRLPOOL 7429d49b0c48456fb1540c1528cb4edfd629f94a0719688efd771ea85f027d6b8c2fb3d20be3e8f17543339d0cbdf20df3c3c5799351070c8665a5b022bbccf7
diff --git a/dev-libs/tntnet/files/tntnet-1.6.3-gcc43.patch b/dev-libs/tntnet/files/tntnet-1.6.3-gcc43.patch
new file mode 100644
index 000000000000..699861c0d446
--- /dev/null
+++ b/dev-libs/tntnet/files/tntnet-1.6.3-gcc43.patch
@@ -0,0 +1,11 @@
+--- sdk/tools/ecppc/scopevar.cpp.orig 2008-06-13 16:09:16.000000000 +0000
++++ sdk/tools/ecppc/scopevar.cpp 2008-06-13 16:13:04.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <tnt/stringescaper.h>
+ #include <iterator>
+ #include <iostream>
++#include <algorithm>
+
+ namespace tnt
+ {
+
diff --git a/dev-libs/tntnet/files/tntnet-1.6.3-gnutls-2.8.patch b/dev-libs/tntnet/files/tntnet-1.6.3-gnutls-2.8.patch
new file mode 100644
index 000000000000..1d63c820f1ea
--- /dev/null
+++ b/dev-libs/tntnet/files/tntnet-1.6.3-gnutls-2.8.patch
@@ -0,0 +1,13 @@
+--- framework/common/Makefile.am
++++ framework/common/Makefile.am
+@@ -117,8 +117,8 @@
+ tnt/gcryptinit.h \
+ tnt/gnutls.h
+
+-libtntnet_la_LDFLAGS += `libgnutls-config --libs`
+-libtntnet_la_CXXFLAGS += `libgnutls-config --cflags`
++libtntnet_la_LDFLAGS += `pkg-config gnutls --libs`
++libtntnet_la_CXXFLAGS += `pkg-config gnutls --cflags`
+ endif
+
+ if MAKE_OPENSSL
diff --git a/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch b/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch
new file mode 100644
index 000000000000..07b4836319d4
--- /dev/null
+++ b/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch
@@ -0,0 +1,65 @@
+--- a/configure.in
++++ b/configure.in
+@@ -18,6 +18,7 @@
+
+ AC_PROG_CXX
+ AC_PROG_LIBTOOL
++PKG_PROG_PKG_CONFIG
+
+ AC_LANG(C++)
+ ACX_PTHREAD
+@@ -25,6 +26,12 @@
+ AC_CHECK_HEADER([zlib.h], , AC_MSG_ERROR([zlib not found]))
+ AC_CHECK_HEADER([cxxtools/net/tcpsocket.h], , AC_MSG_ERROR([cxxtools headers not found]))
+
++PKG_CHECK_MODULES([MINIZIP], [minizip],
++ [HAVE_MINIZIP=true], [HAVE_MINIZIP=false])
++AC_SUBST([MINIZIP_CFLAGS])
++AC_SUBST([MINIZIP_LIBS])
++AM_CONDITIONAL([HAVE_MINIZIP], [test $HAVE_MINIZIP = true])
++
+ AC_ARG_WITH([epoll],
+ AS_HELP_STRING([--with-epoll=yes|no|probe], [use epoll]),
+ [epoll_option=$withval],
+--- a/framework/common/Makefile.am
++++ b/framework/common/Makefile.am
+@@ -23,7 +23,6 @@ libtntnet_la_SOURCES = \
+ httpparser.cpp \
+ httprequest.cpp \
+ httpreply.cpp \
+- ioapi.c \
+ job.cpp \
+ langlib.cpp \
+ listener.cpp \
+@@ -41,16 +40,13 @@ libtntnet_la_SOURCES = \
+ stringlessignorecase.cpp \
+ tntconfig.cpp \
+ tntnet.cpp \
+- unzip.c \
+ unzipfile.cpp \
+ urlescostream.cpp \
+ urlmapper.cpp \
+ util.cpp \
+ worker.cpp \
+ zdata.cpp \
+- crypt.h \
+- ioapi.h \
+- unzip.h
++ crypt.h
+
+ nobase_include_HEADERS = \
+ tnt/applicationunlocker.h \
+@@ -145,3 +141,13 @@ noinst_HEADERS += \
+ tnt/stressjob.h
+ endif
+
++if HAVE_MINIZIP
++libtntnet_la_CXXFLAGS += $(MINIZIP_CFLAGS)
++libtntnet_la_LDFLAGS += $(MINIZIP_LIBS)
++else
++libtntnet_la_SOURCES += \
++ ioapi.c \
++ ioapi.h \
++ unzip.c \
++ unzip.h
++endif
diff --git a/dev-libs/tntnet/files/tntnet.initd b/dev-libs/tntnet/files/tntnet.initd
new file mode 100644
index 000000000000..a7038b16d1fb
--- /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
+# $Id$
+
+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
new file mode 100644
index 000000000000..5a94337ca559
--- /dev/null
+++ b/dev-libs/tntnet/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>hd_brummy@gentoo.org</email>
+ <name>Joerg Bornkessel</name>
+ </maintainer>
+ <herd>media-tv</herd>
+ <use>
+ <flag name="server">Enable tntnet server daemon</flag>
+ </use>
+</pkgmetadata>
diff --git a/dev-libs/tntnet/tntnet-1.6.3.ebuild b/dev-libs/tntnet/tntnet-1.6.3.ebuild
new file mode 100644
index 000000000000..7b8904dfc19c
--- /dev/null
+++ b/dev-libs/tntnet/tntnet-1.6.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit autotools eutils
+
+DESCRIPTION="A 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="ssl gnutls examples"
+
+RDEPEND="=dev-libs/cxxtools-1*
+ sys-libs/zlib
+ ssl? (
+ gnutls? ( >=net-libs/gnutls-1.2.0 )
+ !gnutls? ( dev-libs/openssl )
+ )"
+DEPEND="${RDEPEND}
+ app-arch/zip
+ ssl? ( gnutls? ( virtual/pkgconfig ) )"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-gcc43.patch"
+ epatch "${FILESDIR}/${P}-gnutls-2.8.patch"
+
+ 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
+}
diff --git a/dev-libs/tntnet/tntnet-2.2.1.ebuild b/dev-libs/tntnet/tntnet-2.2.1.ebuild
new file mode 100644
index 000000000000..ec8558d20c8a
--- /dev/null
+++ b/dev-libs/tntnet/tntnet-2.2.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="doc gnutls server ssl examples"
+
+RDEPEND=">=dev-libs/cxxtools-2.2.1
+ 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
+
+ # 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
+}
+
+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
+
+ # default enabled, will not compile without sdk
+ myconf="${myconf} --with-sdk"
+
+ econf \
+ $(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
+}