dev-libs/tntnet: clean up old; fixed slot operator

Package-Manager: portage-2.3.0_rc1

5 files changed, 2 insertions, 99 deletions

diff --git a/dev-libs/tntnet/Manifest b/dev-libs/tntnet/Manifest
index 4af8b75d8f77..1fdfabc7b5d4 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 699861c0d446..000000000000
--- 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 1d63c820f1ea..000000000000
--- 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 7b8904dfc19c..000000000000
--- 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 ec8558d20c8a..1caf6e1a6c89 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