* [gentoo-commits] repo/gentoo:master commit in: dev-libs/tntnet/, dev-libs/tntnet/files/
@ 2016-05-16 18:51 Joerg Bornkessel
0 siblings, 0 replies; 4+ messages in thread
From: Joerg Bornkessel @ 2016-05-16 18:51 UTC (permalink / raw
To: gentoo-commits
commit: 267c3fe3cec44676734bb504c1c93a5a2a87e426
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 18:45:45 2016 +0000
Commit: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Mon May 16 18:51:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=267c3fe3
dev-libs/tntnet: clean up old; fixed slot operator
Package-Manager: portage-2.3.0_rc1
dev-libs/tntnet/Manifest | 1 -
dev-libs/tntnet/files/tntnet-1.6.3-gcc43.patch | 11 ----
.../tntnet/files/tntnet-1.6.3-gnutls-2.8.patch | 13 ----
dev-libs/tntnet/tntnet-1.6.3.ebuild | 72 ----------------------
dev-libs/tntnet/tntnet-2.2.1.ebuild | 4 +-
5 files changed, 2 insertions(+), 99 deletions(-)
diff --git a/dev-libs/tntnet/Manifest b/dev-libs/tntnet/Manifest
index 4af8b75..1fdfabc 100644
--- a/dev-libs/tntnet/Manifest
+++ b/dev-libs/tntnet/Manifest
@@ -1,2 +1 @@
-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
deleted file mode 100644
index 699861c..0000000
--- a/dev-libs/tntnet/files/tntnet-1.6.3-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 1d63c82..0000000
--- a/dev-libs/tntnet/files/tntnet-1.6.3-gnutls-2.8.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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/tntnet-1.6.3.ebuild b/dev-libs/tntnet/tntnet-1.6.3.ebuild
deleted file mode 100644
index 7b8904d..0000000
--- a/dev-libs/tntnet/tntnet-1.6.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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
index ec8558d..1caf6e1 100644
--- a/dev-libs/tntnet/tntnet-2.2.1.ebuild
+++ b/dev-libs/tntnet/tntnet-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -22,7 +22,7 @@ RDEPEND=">=dev-libs/cxxtools-2.2.1
>=net-libs/gnutls-1.2.0
dev-libs/libgcrypt:0
)
- !gnutls? ( dev-libs/openssl )
+ !gnutls? ( dev-libs/openssl:* )
)"
DEPEND="${RDEPEND}
virtual/pkgconfig
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/tntnet/, dev-libs/tntnet/files/
@ 2021-02-14 17:14 Jörg Bornkessel
0 siblings, 0 replies; 4+ messages in thread
From: Jörg Bornkessel @ 2021-02-14 17:14 UTC (permalink / raw
To: gentoo-commits
commit: 62bbcee37d9d89edd2392a141218b515cffe3c84
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 17:13:41 2021 +0000
Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 17:14:33 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62bbcee3
dev-libs/tntnet: version bump
- upstream fixed the bundeld zlib handling in some parts
we still need a walkaround for this
- droped use-flag example, as it depends on dev-libs/tntdb
it not exist in the tree (yet)
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>
dev-libs/tntnet/Manifest | 1 +
dev-libs/tntnet/files/tntnet-3.initd | 27 ++++++++++++++
dev-libs/tntnet/tntnet-3.0.ebuild | 71 ++++++++++++++++++++++++++++++++++++
3 files changed, 99 insertions(+)
diff --git a/dev-libs/tntnet/Manifest b/dev-libs/tntnet/Manifest
index 19d04595095..c0186637b7e 100644
--- a/dev-libs/tntnet/Manifest
+++ b/dev-libs/tntnet/Manifest
@@ -1 +1,2 @@
DIST tntnet-2.2.1.tar.gz 1127500 BLAKE2B bdb55c879ed00afdde1bfe1560ad4228effaa05b35996df3860631c90c93e57096f590b5ddfd8e8ff0356837e839e2f6ed8f4f6fe8ed478275926dd1143b2051 SHA512 78a26713498fd6eabb0b4a247bb20c130ce967ed22ce5c54da4b1300534dd40155aa62a2dc770be4eca720cadeceac283978a5dc3ce418728994af72e4d8eac1
+DIST tntnet-3.0.tar.gz 879598 BLAKE2B 34cbabc52eb28be051da8593eb32d66aa701785be4002056d9be34d28871ae886a87eb1d66e71393a9f9d96110a3d826acead6c6db5c6f2829db797ac449b82e SHA512 5fe1f8750e10537919174e953be92b73e12a9227c50a02dcf2f23a266304ad3ad77d29823e8cdd3e2fa92dba936c2624f140943d021790e8137609bbeb0d3d81
diff --git a/dev-libs/tntnet/files/tntnet-3.initd b/dev-libs/tntnet/files/tntnet-3.initd
new file mode 100644
index 00000000000..b5c0f630703
--- /dev/null
+++ b/dev-libs/tntnet/files/tntnet-3.initd
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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() {
+ ebegin "Reloading tntnet configuration"
+ start-stop-daemon --pidfile $PIDFILE --signal HUP --exec /usr/bin/tntnet
+ eend $?
+}
diff --git a/dev-libs/tntnet/tntnet-3.0.ebuild b/dev-libs/tntnet/tntnet-3.0.ebuild
new file mode 100644
index 00000000000..e09bb6e710d
--- /dev/null
+++ b/dev-libs/tntnet/tntnet-3.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Modular, multithreaded web application server 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 libressl server ssl"
+
+RDEPEND=">=dev-libs/cxxtools-3.0
+ sys-libs/zlib[minizip]
+ ssl? (
+ gnutls? (
+ >=net-libs/gnutls-1.2.0
+ dev-libs/libgcrypt:0
+ )
+ !gnutls? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+ app-arch/zip"
+
+src_prepare() {
+ default
+
+ eautoreconf
+
+ sed -i -e 's:@localstatedir@:/var:' etc/tntnet/tntnet.xml.in || die
+
+ # bug 423697
+ sed -e "s:unzip.h:minizip/unzip.h:" -i framework/defcomp/unzipcomp.cpp || die
+
+ # upstream still use bundeld zlib here
+ sed -e "s:unzip.h:minizip/unzip.h:" -i framework/common/unzipfile.cpp || die
+}
+
+src_configure() {
+ local myconf=""
+
+ if ! use server; then
+ myconf="${myconf} --disable-server"
+ fi
+
+ econf ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ dodoc AUTHORS ChangeLog README
+
+ doman doc/man/{ecpp.7,ecppc.1,tntnet.8,tntnet.xml.7}
+
+ if use server; then
+ rm -f "${D}/etc/init.d/tntnet"
+ newinitd "${FILESDIR}/tntnet-3.initd" tntnet
+ fi
+
+ # remove static libs
+ rm -f "${ED}"/usr/$(get_libdir)/libtntnet{,_sdk}.la || die
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/tntnet/, dev-libs/tntnet/files/
@ 2021-03-15 12:44 Lars Wendler
0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2021-03-15 12:44 UTC (permalink / raw
To: gentoo-commits
commit: f00e032a6c338c13afbdd6358e2371f12b5dc782
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 12:43:39 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 12:43:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f00e032a
dev-libs/tntnet: Fixed build with >=sys-devel/autoconf-2.70
Bug: https://bugs.gentoo.org/775479
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../tntnet/files/tntnet-3.0-autoconf-2.70.patch | 78 ++++++++++++++++++++++
dev-libs/tntnet/tntnet-3.0.ebuild | 4 ++
2 files changed, 82 insertions(+)
diff --git a/dev-libs/tntnet/files/tntnet-3.0-autoconf-2.70.patch b/dev-libs/tntnet/files/tntnet-3.0-autoconf-2.70.patch
new file mode 100644
index 00000000000..6e25e683da1
--- /dev/null
+++ b/dev-libs/tntnet/files/tntnet-3.0-autoconf-2.70.patch
@@ -0,0 +1,78 @@
+diff --git a/configure.ac b/configure.ac
+index 0c7732c4..52227db0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -74,21 +74,21 @@ AC_CHECK_HEADERS([sys/sendfile.h])
+ # optional components
+ #
+ AC_ARG_ENABLE([server],
+- AS_HELP_STRING([--disable-server], [disable building tntnet server]),
++ [AS_HELP_STRING([--disable-server], [disable building tntnet server])],
+ [enable_server=$enableval],
+ [enable_server=yes])
+
+ AM_CONDITIONAL(MAKE_SERVER, test x$enable_server = xyes)
+
+ AC_ARG_ENABLE([sdk],
+- AS_HELP_STRING([--disable-sdk], [disable building sdk]),
++ [AS_HELP_STRING([--disable-sdk], [disable building sdk])],
+ [enable_sdk=$enableval],
+ [enable_sdk=yes])
+
+ AM_CONDITIONAL(MAKE_SDK, test x$enable_sdk = xyes)
+
+ AC_ARG_ENABLE([demos],
+- AS_HELP_STRING([--enable-demos], [enable building demos]),
++ [AS_HELP_STRING([--enable-demos], [enable building demos])],
+ [enable_demos=$enableval],
+ [enable_demos=no])
+
+@@ -105,17 +105,16 @@ AS_IF([test "$enable_demos" = "yes"],
+ )
+
+ AC_ARG_WITH([md2man],
+- AS_HELP_STRING([--with-md2man], [use go-md2man tool to generate man pages from markdown])
++ [AS_HELP_STRING([--with-md2man], [use go-md2man tool to generate man pages from markdown])],
+ [with_md2man=$withval])
+
+ AS_IF(
+ [test "$with_md2man"],
+- AC_CHECK_PROG(MD2MAN, [go-md2man], [go-md2man])
++ [AC_CHECK_PROG(MD2MAN, [go-md2man], [go-md2man])
+ AS_IF(
+ [test -z "$MD2MAN"],
+ AC_MSG_ERROR([go-md2man not found])
+- )
+-
++ )]
+ )
+
+ AM_CONDITIONAL(GENERATE_MAN, test ! -z "$with_md2man")
+@@ -125,21 +124,15 @@ AM_CONDITIONAL(GENERATE_MAN, test ! -z "$with_md2man")
+ #
+ AC_CHECK_FUNCS([setenv])
+
+-case "${host_cpu}-${host_os}" in
+-*-aix*)
+- SHARED_LIB_FLAG=-qmkshrobj
+- ;;
+-*-darwin*)
+- SHARED_LIB_FLAG=-dynamiclib
+- ;;
+-*)
+- SHARED_LIB_FLAG=-shared
+- ;;
+-esac
++AS_CASE(["${host_cpu}-${host_os}"],
++ [*-aix*], [SHARED_LIB_FLAG=-qmkshrobj],
++ [*-darwin*], [SHARED_LIB_FLAG=-dynamiclib],
++ [SHARED_LIB_FLAG=-shared]
++)
+ AC_SUBST(SHARED_LIB_FLAG)
+
+ AC_ARG_ENABLE([unittest],
+- AS_HELP_STRING([--disable-unittest], [disable unittest]),
++ [AS_HELP_STRING([--disable-unittest], [disable unittest])],
+ [enable_unittest=$enableval],
+ [enable_unittest=enable_unittest])
+
diff --git a/dev-libs/tntnet/tntnet-3.0.ebuild b/dev-libs/tntnet/tntnet-3.0.ebuild
index e09bb6e710d..07f7369d5a4 100644
--- a/dev-libs/tntnet/tntnet-3.0.ebuild
+++ b/dev-libs/tntnet/tntnet-3.0.ebuild
@@ -30,6 +30,10 @@ DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig
app-arch/zip"
+PATCHES=(
+ "${FILESDIR}/${PN}-3.0-autoconf-2.70.patch"
+)
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/tntnet/, dev-libs/tntnet/files/
@ 2021-05-10 16:36 Jörg Bornkessel
0 siblings, 0 replies; 4+ messages in thread
From: Jörg Bornkessel @ 2021-05-10 16:36 UTC (permalink / raw
To: gentoo-commits
commit: 55ff201201a26661501c515fda5316fde452e7b7
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Mon May 10 16:32:57 2021 +0000
Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Mon May 10 16:36:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55ff2012
dev-libs/tntnet: cleanup old
this commit will also cleanup the last
eapi 5 depend ebuild
Closes: https://bugs.gentoo.org/783708
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>
dev-libs/tntnet/Manifest | 1 -
.../tntnet/files/tntnet-2.0-zlib-minizip.patch | 65 ---------------
dev-libs/tntnet/files/tntnet.initd | 29 -------
dev-libs/tntnet/tntnet-2.2.1-r3.ebuild | 92 ----------------------
dev-libs/tntnet/tntnet-2.2.1.ebuild | 87 --------------------
5 files changed, 274 deletions(-)
diff --git a/dev-libs/tntnet/Manifest b/dev-libs/tntnet/Manifest
index c0186637b7e..923dfd8c213 100644
--- a/dev-libs/tntnet/Manifest
+++ b/dev-libs/tntnet/Manifest
@@ -1,2 +1 @@
-DIST tntnet-2.2.1.tar.gz 1127500 BLAKE2B bdb55c879ed00afdde1bfe1560ad4228effaa05b35996df3860631c90c93e57096f590b5ddfd8e8ff0356837e839e2f6ed8f4f6fe8ed478275926dd1143b2051 SHA512 78a26713498fd6eabb0b4a247bb20c130ce967ed22ce5c54da4b1300534dd40155aa62a2dc770be4eca720cadeceac283978a5dc3ce418728994af72e4d8eac1
DIST tntnet-3.0.tar.gz 879598 BLAKE2B 34cbabc52eb28be051da8593eb32d66aa701785be4002056d9be34d28871ae886a87eb1d66e71393a9f9d96110a3d826acead6c6db5c6f2829db797ac449b82e SHA512 5fe1f8750e10537919174e953be92b73e12a9227c50a02dcf2f23a266304ad3ad77d29823e8cdd3e2fa92dba936c2624f140943d021790e8137609bbeb0d3d81
diff --git a/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch b/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch
deleted file mode 100644
index 5e046506089..00000000000
--- a/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- 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
-@@ -40,6 +41,12 @@
- AC_CHECK_FUNCS([fopen64], ,[AM_CFLAGS=-DUSE_FILE32API])
- AC_SUBST(AM_CFLAGS)
-
-+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 @@
- httpparser.cpp \
- httprequest.cpp \
- httpreply.cpp \
-- ioapi.c \
- job.cpp \
- langlib.cpp \
- listener.cpp \
-@@ -40,16 +39,13 @@
- 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 \
-@@ -144,3 +140,13 @@
- 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
deleted file mode 100644
index 54982bddd6e..00000000000
--- a/dev-libs/tntnet/files/tntnet.initd
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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/tntnet-2.2.1-r3.ebuild b/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild
deleted file mode 100644
index bb9f702a21e..00000000000
--- a/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Modular, multithreaded web application server 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="gnutls server ssl examples"
-
-RDEPEND="
- >=dev-libs/cxxtools-2.2.1
- sys-libs/zlib[minizip]
- ssl? (
- gnutls? (
- net-libs/gnutls:0=
- dev-libs/libgcrypt:0
- )
- !gnutls? (
- dev-libs/openssl:0=
- )
- )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- app-arch/zip
- virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0-zlib-minizip.patch )
-
-src_prepare() {
- # Both fixed in the next release
- default
- rm framework/common/{ioapi,unzip}.[ch] || die
-
- # bug 426262
- mv configure.{in,ac} || die
-
- # bug 423697
- sed -e "s:unzip.h:minizip/unzip.h:" -i framework/defcomp/unzipcomp.cpp || die
-
- eautoreconf
-
- sed -i -e 's:@localstatedir@:/var:' etc/tntnet/tntnet.xml.in || die
-}
-
-src_configure() {
- # default enabled, will not compile without sdk
- local myconf=( --with-sdk )
-
- # Prefer gnutls over SSL
- if use gnutls; then
- einfo "Using gnutls for ssl support."
- myconf+=( --with-ssl=gnutls )
- elif use ssl; then
- einfo "Using openssl for ssl support."
- myconf+=( --with-ssl=openssl )
- else
- myconf+=( --with-ssl=no )
- fi
-
- econf \
- --disable-static \
- $(use_with server) \
- "${myconf[@]}"
-}
-
-src_install() {
- default
- dodoc doc/tntnet.pdf
-
- if use examples; then
- emake -C sdk/demos maintainer-clean
- rm -r sdk/demos/{Makefile*,*/Makefile*,*/*.{la,lo},*/.libs} || die
-
- docinto examples
- dodoc -r sdk/demos/.
- fi
-
- if use server; then
- rm -f "${ED}"/etc/init.d/tntnet || die
- newinitd "${FILESDIR}"/tntnet.initd tntnet
- fi
-
- # bug 737184
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/tntnet/tntnet-2.2.1.ebuild b/dev-libs/tntnet/tntnet-2.2.1.ebuild
deleted file mode 100644
index ec2ac1e5af6..00000000000
--- a/dev-libs/tntnet/tntnet-2.2.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools epatch
-
-DESCRIPTION="Modular, multithreaded web application server 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:0= )
- )"
-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
-
- dodoc AUTHORS ChangeLog README TODO
- if use doc; then
- dodoc doc/*.pdf
- 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/*
- fi
-
- if use server; then
- rm -f "${D}/etc/init.d/tntnet"
- newinitd "${FILESDIR}/tntnet.initd" tntnet
- fi
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-05-10 16:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-16 18:51 [gentoo-commits] repo/gentoo:master commit in: dev-libs/tntnet/, dev-libs/tntnet/files/ Joerg Bornkessel
-- strict thread matches above, loose matches on Subject: below --
2021-02-14 17:14 Jörg Bornkessel
2021-03-15 12:44 Lars Wendler
2021-05-10 16:36 Jörg Bornkessel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox