[gentoo-commits] repo/gentoo:master commit in: dev-libs/tntnet/
commit: 00c564eaa6d7dbec1b2f932db238f9a592690ed0
Author: Sam James gentoo org>
AuthorDate: Sat May 27 05:18:25 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat May 27 06:12:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00c564ea
dev-libs/tntnet: wire up tests
Signed-off-by: Sam James gentoo.org>
dev-libs/tntnet/tntnet-3.0.ebuild | 25 ++---
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/dev-libs/tntnet/tntnet-3.0.ebuild
b/dev-libs/tntnet/tntnet-3.0.ebuild
index 24ed5d0c4ea1..af01d14155c8 100644
--- a/dev-libs/tntnet/tntnet-3.0.ebuild
+++ b/dev-libs/tntnet/tntnet-3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,9 +12,11 @@ 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"
+IUSE="doc gnutls server ssl test"
+RESTRICT="!test? ( test )"
-RDEPEND=">=dev-libs/cxxtools-3.0
+RDEPEND="
+ >=dev-libs/cxxtools-3.0
sys-libs/zlib[minizip]
ssl? (
gnutls? (
@@ -24,10 +26,13 @@ RDEPEND=">=dev-libs/cxxtools-3.0
!gnutls? (
dev-libs/openssl:0=
)
- )"
+ )
+"
DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
- app-arch/zip"
+BDEPEND="
+ app-arch/zip
+ virtual/pkgconfig
+"
PATCHES=(
"${FILESDIR}/${PN}-3.0-autoconf-2.70.patch"
@@ -48,7 +53,7 @@ src_prepare() {
}
src_configure() {
- local myconf=""
+ local myconf="$(use_enable test unittest)"
if ! use server; then
myconf="${myconf} --disable-server"
@@ -57,6 +62,12 @@ src_configure() {
econf ${myconf}
}
+src_test() {
+ cd test || die
+ emake || die
+ ./tntnet-test || die
+}
+
src_install() {
emake DESTDIR="${D}" install
[gentoo-commits] repo/gentoo:master commit in: dev-libs/tntnet/, dev-libs/tntnet/files/
commit: 55ff201201a26661501c515fda5316fde452e7b7
Author: Joerg Bornkessel gentoo org>
AuthorDate: Mon May 10 16:32:57 2021 +
Commit: Jörg Bornkessel gentoo org>
CommitDate: Mon May 10 16:36:27 2021 +
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 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..000
--- 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..000
--- 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..000
--- 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;
-
[gentoo-commits] repo/gentoo:master commit in: dev-libs/tntnet/
commit: 009bad9d7bbb96eb1694294f4652dbe47d1d95a8
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sat May 1 18:17:49 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sat May 1 18:19:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=009bad9d
dev-libs/tntnet: amd64 stable wrt bug #783708
Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-libs/tntnet/tntnet-3.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/tntnet/tntnet-3.0.ebuild
b/dev-libs/tntnet/tntnet-3.0.ebuild
index d51184a56a7..2dd289308ca 100644
--- a/dev-libs/tntnet/tntnet-3.0.ebuild
+++ b/dev-libs/tntnet/tntnet-3.0.ebuild
@@ -11,7 +11,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"
RDEPEND=">=dev-libs/cxxtools-3.0
[gentoo-commits] repo/gentoo:master commit in: dev-libs/tntnet/
commit: 99843f49272164f2922d8e9a10617e063b4a880d
Author: Mikle Kolyada gentoo org>
AuthorDate: Sat May 1 07:24:26 2021 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sat May 1 07:24:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99843f49
dev-libs/tntnet: remove libressl support
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada gentoo.org>
dev-libs/tntnet/tntnet-2.2.1-r3.ebuild | 7 +++
dev-libs/tntnet/tntnet-3.0.ebuild | 5 ++---
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild
b/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild
index 6012e52da3e..bb9f702a21e 100644
--- a/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild
+++ b/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="http://www.tntnet.org/download/${P}.tar.gz;
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="gnutls libressl server ssl examples"
+IUSE="gnutls server ssl examples"
RDEPEND="
>=dev-libs/cxxtools-2.2.1
@@ -23,8 +23,7 @@ RDEPEND="
dev-libs/libgcrypt:0
)
!gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
)
)"
DEPEND="${RDEPEND}"
diff --git a/dev-libs/tntnet/tntnet-3.0.ebuild
b/dev-libs/tntnet/tntnet-3.0.ebuild
index 07f7369d5a4..d51184a56a7 100644
--- a/dev-libs/tntnet/tntnet-3.0.ebuild
+++ b/dev-libs/tntnet/tntnet-3.0.ebuild
@@ -12,7 +12,7 @@ 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"
+IUSE="doc gnutls server ssl"
RDEPEND=">=dev-libs/cxxtools-3.0
sys-libs/zlib[minizip]
@@ -22,8 +22,7 @@ RDEPEND=">=dev-libs/cxxtools-3.0
dev-libs/libgcrypt:0
)
!gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
)
)"
DEPEND="${RDEPEND}"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/tntnet/, dev-libs/tntnet/files/
commit: f00e032a6c338c13afbdd6358e2371f12b5dc782
Author: Lars Wendler gentoo org>
AuthorDate: Mon Mar 15 12:43:39 2021 +
Commit: Lars Wendler gentoo org>
CommitDate: Mon Mar 15 12:43:39 2021 +
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 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 000..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
[gentoo-commits] repo/gentoo:master commit in: dev-libs/tntnet/, dev-libs/tntnet/files/
commit: 62bbcee37d9d89edd2392a141218b515cffe3c84
Author: Joerg Bornkessel gentoo org>
AuthorDate: Sun Feb 14 17:13:41 2021 +
Commit: Jörg Bornkessel gentoo org>
CommitDate: Sun Feb 14 17:14:33 2021 +
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 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 000..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 000..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
+}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/tntnet/files/, dev-libs/tntnet/
commit: dd52419b82ae922b54c7a79e1ff02bba20fa0a7d
Author: David Seifert gentoo org>
AuthorDate: Sat Aug 29 13:12:51 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sat Aug 29 13:12:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd52419b
dev-libs/tntnet: [QA] Many fixes
* Do not build static archives
* Add missing `|| die`
* Add missing sub-slot operators
* Clean examples properly
* Rebase patch
* Use `default` correctly
* Remove `eutils.eclass`
* Use bash-arrays for `econf` arguments
Closes: https://bugs.gentoo.org/737184
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: David Seifert gentoo.org>
.../tntnet/files/tntnet-2.0-zlib-minizip.patch | 12 ++---
dev-libs/tntnet/tntnet-2.2.1-r3.ebuild | 62 ++
2 files changed, 34 insertions(+), 40 deletions(-)
diff --git a/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch
b/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch
index 07b4836319d..5e046506089 100644
--- a/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch
+++ b/dev-libs/tntnet/files/tntnet-2.0-zlib-minizip.patch
@@ -8,9 +8,9 @@
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]))
+@@ -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])
@@ -23,7 +23,7 @@
[epoll_option=$withval],
--- a/framework/common/Makefile.am
+++ b/framework/common/Makefile.am
-@@ -23,7 +23,6 @@ libtntnet_la_SOURCES = \
+@@ -23,7 +23,6 @@
httpparser.cpp \
httprequest.cpp \
httpreply.cpp \
@@ -31,7 +31,7 @@
job.cpp \
langlib.cpp \
listener.cpp \
-@@ -41,16 +40,13 @@ libtntnet_la_SOURCES = \
+@@ -40,16 +39,13 @@
stringlessignorecase.cpp \
tntconfig.cpp \
tntnet.cpp \
@@ -49,7 +49,7 @@
nobase_include_HEADERS = \
tnt/applicationunlocker.h \
-@@ -145,3 +141,13 @@ noinst_HEADERS += \
+@@ -144,3 +140,13 @@
tnt/stressjob.h
endif
diff --git a/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild
b/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild
index 8f1ea542f98..6012e52da3e 100644
--- a/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild
+++ b/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit autotools eutils
+inherit autotools
DESCRIPTION="Modular, multithreaded web application server extensible with C++"
HOMEPAGE="http://www.tntnet.org/;
@@ -12,13 +12,14 @@ SRC_URI="http://www.tntnet.org/download/${P}.tar.gz;
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="gnutls libressl server ssl examples static-libs"
+IUSE="gnutls libressl server ssl examples"
-RDEPEND=">=dev-libs/cxxtools-2.2.1
+RDEPEND="
+ >=dev-libs/cxxtools-2.2.1
sys-libs/zlib[minizip]
ssl? (
gnutls? (
- >=net-libs/gnutls-1.2.0
+ net-libs/gnutls:0=
dev-libs/libgcrypt:0
)
!gnutls? (
@@ -27,18 +28,19 @@ RDEPEND=">=dev-libs/cxxtools-2.2.1
)
)"
DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
- app-arch/zip"
+BDEPEND="
+ app-arch/zip
+ virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0-zlib-minizip.patch )
src_prepare() {
# Both fixed in the next release
- eapply "${FILESDIR}"/${PN}-2.0-zlib-minizip.patch
+ default
rm framework/common/{ioapi,unzip}.[ch] || die
# bug 426262
- if has_version ">sys-devel/autoconf-2.13"; then
- mv configure.in configure.ac
- fi
+ mv configure.{in,ac} || die
# bug 423697
sed -e "s:unzip.h:minizip/unzip.h:" -i framework/defcomp/unzipcomp.cpp
|| die
@@ -46,54 +48,46 @@ src_prepare() {
eautoreconf
sed -i -e 's:@localstatedir@:/var:' etc/tntnet/tntnet.xml.in || die
-
- default
}
src_configure() {
- local myconf=""
+ # default enabled, will not compile without sdk
+ local myconf=( --with-sdk )
- # Prefer gnutls above SSL
+ # Prefer gnutls over SSL
if use gnutls; then
einfo "Using gnutls for ssl support."
- myconf="${myconf} --with-ssl=gnutls"
+ myconf+=( --with-ssl=gnutls )
elif use ssl; then
einfo "Using openssl for ssl support."
- myconf="${myconf} --with-ssl=openssl"
+ myconf+=( --with-ssl=openssl )
else
- myconf="${myconf} --with-ssl=no"
+ myconf+=( --with-ssl=no )
fi
- # default enabled, will not compile without sdk
- myconf="${myconf} --with-sdk"
-
econf \
+ --disable-static \
$(use_with server) \
-
[gentoo-commits] repo/gentoo:master commit in: dev-libs/tntnet/
commit: 9686d9bc86cbc02fccce616245d2edfdac17be24
Author: Joerg Bornkessel gentoo org>
AuthorDate: Thu Aug 27 21:31:57 2020 +
Commit: Jörg Bornkessel gentoo org>
CommitDate: Thu Aug 27 21:31:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9686d9bc
dev-libs/tntnet: cleanup old, use=static-lib and installs '.a' files
better handling for .a and .la files by use flag handling
Closes: https://bugs.gentoo.org/737184
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Joerg Bornkessel gentoo.org>
dev-libs/tntnet/tntnet-2.2.1-r1.ebuild | 92 --
...tnet-2.2.1-r2.ebuild => tntnet-2.2.1-r3.ebuild} | 7 +-
2 files changed, 6 insertions(+), 93 deletions(-)
diff --git a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
b/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
deleted file mode 100644
index 617f01ca9a9..000
--- a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-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 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? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl: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
-}
-
-# @stable ~26may2020
\ No newline at end of file
diff --git a/dev-libs/tntnet/tntnet-2.2.1-r2.ebuild
b/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild
similarity index 91%
rename from dev-libs/tntnet/tntnet-2.2.1-r2.ebuild
rename to dev-libs/tntnet/tntnet-2.2.1-r3.ebuild
index 2a1e7bb6230..8f1ea542f98 100644
--- a/dev-libs/tntnet/tntnet-2.2.1-r2.ebuild
+++ b/dev-libs/tntnet/tntnet-2.2.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.tntnet.org/download/${P}.tar.gz;
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="gnutls libressl server ssl examples"
+IUSE="gnutls libressl server ssl examples static-libs"
RDEPEND=">=dev-libs/cxxtools-2.2.1
sys-libs/zlib[minizip]
@@ -91,4 +91,9 @@ src_install() {
rm -f "${D}/etc/init.d/tntnet"
newinitd "${FILESDIR}/tntnet.initd" tntnet
fi
+
+ # bug 737184
+ if ! use static-libs; then
+ find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+ fi
}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/tntnet/
commit: 511ac15bcb7ea3b8035b66096c783c870c6bd019
Author: Joerg Bornkessel gentoo org>
AuthorDate: Sun Apr 26 16:44:07 2020 +
Commit: Jörg Bornkessel gentoo org>
CommitDate: Sun Apr 26 16:44:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=511ac15b
dev-libs/tntnet: moved to eapi-7
this commit fix also bug 426262
autotools rename configure.in to configure.ac
Package-Manager: Portage-2.3.90, Repoman-2.3.20
Signed-off-by: Joerg Bornkessel gentoo.org>
dev-libs/tntnet/tntnet-2.2.1-r1.ebuild | 2 ++
...tnet-2.2.1-r1.ebuild => tntnet-2.2.1-r2.ebuild} | 28 --
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
b/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
index 50046a85221..617f01ca9a9 100644
--- a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
+++ b/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
@@ -88,3 +88,5 @@ src_install() {
newinitd "${FILESDIR}/tntnet.initd" tntnet
fi
}
+
+# @stable ~26may2020
\ No newline at end of file
diff --git a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
b/dev-libs/tntnet/tntnet-2.2.1-r2.ebuild
similarity index 81%
copy from dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
copy to dev-libs/tntnet/tntnet-2.2.1-r2.ebuild
index 50046a85221..2a1e7bb6230 100644
--- a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
+++ b/dev-libs/tntnet/tntnet-2.2.1-r2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
inherit autotools eutils
@@ -12,7 +12,7 @@ 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 examples"
+IUSE="gnutls libressl server ssl examples"
RDEPEND=">=dev-libs/cxxtools-2.2.1
sys-libs/zlib[minizip]
@@ -26,21 +26,28 @@ RDEPEND=">=dev-libs/cxxtools-2.2.1
libressl? ( dev-libs/libressl:0= )
)
)"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
app-arch/zip"
src_prepare() {
# Both fixed in the next release
- epatch "${FILESDIR}"/${PN}-2.0-zlib-minizip.patch
+ eapply "${FILESDIR}"/${PN}-2.0-zlib-minizip.patch
rm framework/common/{ioapi,unzip}.[ch] || die
+ # bug 426262
+ if has_version ">sys-devel/autoconf-2.13"; then
+ mv configure.in configure.ac
+ fi
+
# bug 423697
- sed -e "s:unzip.h:minizip/unzip.h:" -i framework/defcomp/unzipcomp.cpp
+ 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
+
+ default
}
src_configure() {
@@ -68,10 +75,7 @@ src_configure() {
src_install() {
emake DESTDIR="${D}" install
- dodoc AUTHORS ChangeLog README TODO
- if use doc; then
- dodoc doc/*.pdf
- fi
+ dodoc AUTHORS ChangeLog README TODO doc/tntnet.pdf
if use examples; then
cd "${S}/sdk/demos"
@@ -79,8 +83,8 @@ src_install() {
rm -rf .deps */.deps .libs */.libs
cd "${S}"
- insinto /usr/share/doc/${PF}/examples
- doins -r sdk/demos/*
+ docinto examples
+ dodoc -r sdk/demos/*
fi
if use server; then
[gentoo-commits] repo/gentoo:master commit in: dev-libs/tntnet/
commit: 302fc8a2e34c56dda2a086f90baa6230b6a5438c Author: Joerg Bornkessel gentoo org> AuthorDate: Sat Jan 25 19:28:29 2020 + Commit: Jörg Bornkessel gentoo org> CommitDate: Sat Jan 25 19:28:29 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=302fc8a2 dev-libs/tntnet: reassing package to myself Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Joerg Bornkessel gentoo.org> dev-libs/tntnet/metadata.xml | 5 - dev-libs/tntnet/tntnet-2.2.1-r1.ebuild | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dev-libs/tntnet/metadata.xml b/dev-libs/tntnet/metadata.xml index 77d1be7cc24..dec3d3816a1 100644 --- a/dev-libs/tntnet/metadata.xml +++ b/dev-libs/tntnet/metadata.xml @@ -1,7 +1,10 @@ http://www.gentoo.org/dtd/metadata.dtd;> - + + Joerg Bornkessel + hd_bru...@gentoo.org + Enable tntnet server daemon diff --git a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild b/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild index 0b0c372cdd8..50046a85221 100644 --- a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild +++ b/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5
[gentoo-commits] repo/gentoo:master commit in: dev-libs/tntnet/
commit: 1d32fdff7c65f7be11fbb6a81b5de21f81b81361
Author: Lars Wendler gentoo org>
AuthorDate: Mon Jan 7 18:03:01 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Mon Jan 7 19:15:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d32fdff
dev-libs/tntnet: Adjusted (sub-)slot dep on dev-libs/openssl
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Lars Wendler gentoo.org>
dev-libs/tntnet/tntnet-2.2.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-libs/tntnet/tntnet-2.2.1.ebuild
b/dev-libs/tntnet/tntnet-2.2.1.ebuild
index 6102ea7fb03..bd46d16526d 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-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -21,7 +21,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:0= )
)"
DEPEND="${RDEPEND}
virtual/pkgconfig
[gentoo-commits] repo/gentoo:master commit in: dev-libs/tntnet/
commit: 4060330057ed4f63dfc6e38a7440b7ffa2ede641
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Apr 21 15:04:35 2017 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Apr 21 15:06:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40603300
dev-libs/tntnet: Fix DESCRIPTION.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-libs/tntnet/tntnet-2.2.1-r1.ebuild | 4 ++--
dev-libs/tntnet/tntnet-2.2.1.ebuild| 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
b/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
index f437c2a5501..cc25ab03fdf 100644
--- a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
+++ b/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit autotools eutils
-DESCRIPTION="Modular, multithreaded webapplicationserver extensible with C++"
+DESCRIPTION="Modular, multithreaded web application server extensible with C++"
HOMEPAGE="http://www.tntnet.org/;
SRC_URI="http://www.tntnet.org/download/${P}.tar.gz;
diff --git a/dev-libs/tntnet/tntnet-2.2.1.ebuild
b/dev-libs/tntnet/tntnet-2.2.1.ebuild
index 8c88cd45570..6102ea7fb03 100644
--- a/dev-libs/tntnet/tntnet-2.2.1.ebuild
+++ b/dev-libs/tntnet/tntnet-2.2.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit autotools eutils
-DESCRIPTION="Modular, multithreaded webapplicationserver extensible with C++"
+DESCRIPTION="Modular, multithreaded web application server extensible with C++"
HOMEPAGE="http://www.tntnet.org/;
SRC_URI="http://www.tntnet.org/download/${P}.tar.gz;
[gentoo-commits] repo/gentoo:master commit in: dev-libs/tntnet/
commit: 3122f370c4c1257536eca09844fcaa952092ed23
Author: Anthony G. Basile gentoo org>
AuthorDate: Sun Jun 26 00:11:26 2016 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Sun Jun 26 00:11:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3122f370
dev-libs/tntnet: add libressl support
Package-Manager: portage-2.2.28
dev-libs/tntnet/tntnet-2.2.1-r1.ebuild | 91 ++
1 file changed, 91 insertions(+)
diff --git a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
b/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
new file mode 100644
index 000..43aae68
--- /dev/null
+++ b/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2016 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 libressl 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? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl: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 || 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
+}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/tntnet/, dev-libs/tntnet/files/
commit: 267c3fe3cec44676734bb504c1c93a5a2a87e426
Author: Joerg Bornkessel gentoo org>
AuthorDate: Mon May 16 18:45:45 2016 +
Commit: Joerg Bornkessel gentoo org>
CommitDate: Mon May 16 18:51:36 2016 +
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..000
--- 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.0 +
-+++ sdk/tools/ecppc/scopevar.cpp 2008-06-13 16:13:04.0 +
-@@ -22,6 +22,7 @@
- #include
- #include
- #include
-+#include
-
- 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..000
--- 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..000
--- 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}"
-
