bump; use-flag cgi removed, support removed in source; useflag sdk removed, --with-skd enabled by default, will not compile without sdk support

Package-Manager: portage-2.2.1/cvs/Linux i686
Manifest-Sign-Key: 0x34C2808A

3 files changed, 101 insertions, 7 deletions

diff --git a/dev-libs/tntnet/ChangeLog b/dev-libs/tntnet/ChangeLog
index 9df92f97298f..96d58c9f0f88 100644
--- a/dev-libs/tntnet/ChangeLog
+++ b/dev-libs/tntnet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/tntnet
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/ChangeLog,v 1.22 2013/06/28 19:42:16 zzam Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/ChangeLog,v 1.23 2014/01/23 21:05:00 hd_brummy Exp $
+
+*tntnet-2.2.1 (23 Jan 2014)
+
+  23 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org> +tntnet-2.2.1.ebuild:
+  bump; use-flag cgi removed, support removed in source; useflag sdk removed,
+  --with-skd enabled by default, will not compile without sdk support
 
 *tntnet-2.2 (28 Jun 2013)
 
diff --git a/dev-libs/tntnet/Manifest b/dev-libs/tntnet/Manifest
index b7d02d4756a3..9067df066808 100644
--- a/dev-libs/tntnet/Manifest
+++ b/dev-libs/tntnet/Manifest
@@ -10,17 +10,20 @@ AUX tntnet.initd 776 SHA256 00da9fe7d92e3d5809411def8a2883e0c178dff8a2e34ef262e0
 DIST tntnet-1.6.3.tar.gz 1952122 SHA256 1c16547e4fe6c07f8fe1b9d2eeb750cb2061032f31880f93f2080b049d54a3a4 SHA512 e1652b7c0165aacb6b53502df6b56bdc14cf5c582bce7952a0ec515c0468104b8b9aab75cc8ae355af7438a9df8419cfe2dc035bae340f4b3e692198e3981602 WHIRLPOOL 83d4bbcf4109578e8cf68c13a530c8455c2b43b8a508e6d1401dcd5278ae59ae3c2e2613403414cd66d27172bcb517d5c45f02c9ffd6165052d481ccd8d40dd9
 DIST tntnet-2.0.tar.gz 1553215 SHA256 8e5daf06f9ae1ec05654c3f2b3c2a74cfd64cc2a9f6267f6e4bb604842315b1a SHA512 ee666d271e6f0784698c633e7400fdf45cf315c010534d18cb76bedecd3be5835ba8ed251183e4fd8398e9efcab79e43b15b800aeb2accd8aaaad46ac2cf0074 WHIRLPOOL 403fb985307b49e2d8fc71274d402cb390b3a41aa74cdea411b5e8fba968d926241a79efb0431cef085e0d868fc977045d2d70252c19f3cc3f0a8e7894f93d75
 DIST tntnet-2.1.tar.gz 1705181 SHA256 8623275f78e532a16f73a8b49b79a84fbf5eea314c22e8a7f7b8d50b3d081ab6 SHA512 ad662dec9d1dd373d4bc5a89678ffffa777a8cd02563c14aaf3b3850a43b940381f05a495c6c5307caf4bb08c2fe0ad907a59ffc472aef6e72b834713ed75c54 WHIRLPOOL dedf0979b3506d49d2c154196423592ba9ac6c1881486117b5e39f0d49db7b44e0b5c0eaa5f1b643043cb1ea17bd6db3dd5680e26178082db31832c6f051b405
+DIST tntnet-2.2.1.tar.gz 1127500 SHA256 c83170d08ef04c5868051e1c28c74b9562fe71e9e8263828e755ad5bd3547521 SHA512 78a26713498fd6eabb0b4a247bb20c130ce967ed22ce5c54da4b1300534dd40155aa62a2dc770be4eca720cadeceac283978a5dc3ce418728994af72e4d8eac1 WHIRLPOOL 7429d49b0c48456fb1540c1528cb4edfd629f94a0719688efd771ea85f027d6b8c2fb3d20be3e8f17543339d0cbdf20df3c3c5799351070c8665a5b022bbccf7
 DIST tntnet-2.2.tar.gz 1126784 SHA256 9bc09b0ea4e31b4cc6318ba6ada5bae5deadcfad3d9c0ad9466d8586cdc728f4 SHA512 6f6f8c6cd325d62e2fe8d1be5f85d374251735db9da9c4495b52888638c2cbe0ab4fccaaaadb9e1a92581a1b45bed0d8c0e43316dba60d4d141dd5c5202988f7 WHIRLPOOL 40b943e5c22c77bae1152073a68e4a7e7a654b7f83ccbfca9b6798d36d19b2d37b3d5659c8eb1b4ed94639bef5177a36bd5dc055b62eb523109c01aa07d6b390
 EBUILD tntnet-1.6.3.ebuild 1644 SHA256 c6bc685bd39576e697d4a09c66892b3daf970731862060b77de476481a253994 SHA512 3cbd93e07cdaf5b14db92a6c672d8ea99904c4c4468f6ec7a7562d47ca146f11adfdbc220fad5411bf96db653cbf33ee3a88d9d1f0fcb09bb603b6420835defc WHIRLPOOL 223b27a7007a7d4ceaa598b620753f838e0c23c7fba4ced7d070e15affdac2d6db8effa3d07fe9f4db292e24d772916778ab4595f7ceb449642acc6b455d2863
 EBUILD tntnet-2.0-r1.ebuild 2035 SHA256 7db95643071d99ae0c7d5aa2e2a1b7d132ba35fbe975fb99a1f585d77a867a2d SHA512 f2c894cb4cdac3f6e647589ec011611b41185db56e76e9ec0b20159efb768976dd484e6900639fc6c0574a9a5715bd43361561a584726808d6836993e3b53191 WHIRLPOOL aa4ca5deb16c0795d963ba75a35c68a9b66bc43c394814b937cb732291655c6313c5926c5d4fa8621ce5b9fd91a97f7a376fc5f574bfaaa297fa4bb2600579e1
 EBUILD tntnet-2.1.ebuild 1954 SHA256 ce5adb240c1c3873e24e26f955eeef3084ed090d131e98e96c0c94a7f0bd4447 SHA512 639bad115544c525dab5455ce27baeca9544ee6d97b50b67dafbd329f328cd333fed3f6e5bf52200da38d5113a99ee0745f06d9f32809c11c0ee8ca31dbbbca4 WHIRLPOOL 123c839ced978bed721cfbf5f7d21c94319dc92d4c626630d08acd844c776dafa190dcac4e51ffb0e49ada5bdad6390dd8693dec8a05b5a0605ab3699102d27e
+EBUILD tntnet-2.2.1.ebuild 1855 SHA256 f2ee68eeff1c185585e5ef856e6f878e83a1c02d093ab7b7e1c01860e77361d5 SHA512 bf8103fceadd4ad45d08ef788aab1897f0f480fc50f07860013b36b8947dbe2f427eb6848ba9d313f1d01c9a5310c0c45cbdd1214a7c62deb39f7d97fac47c06 WHIRLPOOL 8e884641dfc8551897f1a82e831d7183150883ffb3fa32ad8356d32e16987de2ee7f84209f15177e5dc2d4bbaa9fb41df34f39e5eaf75ed6ef0c48c9f6441dfc
 EBUILD tntnet-2.2.ebuild 1953 SHA256 16b6f36b12104137a98c30681ece207a6e43176c8451579ba69819a6251015b8 SHA512 f9826aa0e91b995610e34b2d8ccf4f082d28c323bba3c8e5ec2c885690e6401098fecc154fcb5cff0d9cbf905c2c79e751c0edd2d5c24d3dddf2a1699fd4edaa WHIRLPOOL 5b6e73ef66bfb5efbd7125671d48081c92a795c7c4188610e5c651840d53cea1c92d82312fb5dfc0874aab753bd9d932c150f98e37212694067ec1e371a31968
-MISC ChangeLog 3767 SHA256 9dcb0c987eefb815dd5f2fecf3f667243d2b4ca47669f43f14ee180cbafcb8a2 SHA512 c6c49015de45ba3840adb3a2040e44afe90af0d51eb3d4e267d54641c3c34f11b31957e3113714213bbd1a79d2b91f2dcf51c19981471e3eaae176a138ef467c WHIRLPOOL da954f47af847345730f6c0311ccfa024f39210e9cbf2f0e722cf5fb170152ad1a2e62708bb92a3202ee0f56092527d7209c4e8872b282e17733f3e3709217a0
+MISC ChangeLog 4027 SHA256 711a44277e0b50e6a03e3decff52be2b14c092f83acf1236ccce7a9ccc08bd07 SHA512 5c1506a85ff3ed7abb0821130abdce702e7f37179b4716c067e7b49217a95ece92b5b896c7afb3b4e3fb7f3642c69d48e8b4ecaa970bb3a9f8d32475e0cb336e WHIRLPOOL c2484a8a0fefe33bb4b8eca1142b62c4a49fef3903305c696cc50b98e8bb5766e72e3117e3336d12f65a6bdb31225b99270e74e374697bbd971248cb6460c223
 MISC metadata.xml 936 SHA256 4fd6fbf7a1297d16bb28394fc842c5dd8f833394055b8e7e30c85f3bab259883 SHA512 70843335e92900dc21308eaeaf0eb32b9213ecf22f724f119e5c53f8c3cd0e458a571b7770ae60064a9fe306ea51f6584224c7e0797506a7904c43b1cdbdfd86 WHIRLPOOL 638a4d84a5b67e17fc45581e39e8cfe9a54bfe04c45bc361f9856f48b8b46a2ef5a6739348e7758c014457234b53fd60a0582b22789fd30b7ef572c7a50e0b75
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iEYEAREIAAYFAlHN5xkACgkQt2vP6XvVdOfhdwCcDYoN6PpUZMmSKHiE22o2bE9r
-EeAAoOFXiWXp8CmZf7BNH23cZh8XPWHT
-=q9Bf
+iD8DBQFS4YQCdn07HTTCgIoRCEgiAJ40xHV/L8FYij3LJUey4pbgVaH2/ACfd9hM
+BEaSDjpiDtLbmtZr14V+4es=
+=n9pe
 -----END PGP SIGNATURE-----
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..6394d07371b6
--- /dev/null
+++ b/dev-libs/tntnet/tntnet-2.2.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/tntnet-2.2.1.ebuild,v 1.1 2014/01/23 21:05:00 hd_brummy Exp $
+
+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
+		)
+		!gnutls? ( dev-libs/openssl )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	examples? ( 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
+
+	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
+}