Version bump.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

3 files changed, 199 insertions, 15 deletions

diff --git a/net-libs/axtls/ChangeLog b/net-libs/axtls/ChangeLog
index 1032f7e63cc8..d3797599b1c9 100644
--- a/net-libs/axtls/ChangeLog
+++ b/net-libs/axtls/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/axtls
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/axtls/ChangeLog,v 1.43 2015/01/21 18:50:20 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/axtls/ChangeLog,v 1.44 2015/04/14 11:27:43 blueness Exp $
+
+*axtls-1.5.2 (14 Apr 2015)
+
+  14 Apr 2015; Anthony G. Basile <blueness@gentoo.org> +axtls-1.5.2.ebuild:
+  Version bump.
 
 *axtls-1.5.1 (21 Jan 2015)
 
diff --git a/net-libs/axtls/Manifest b/net-libs/axtls/Manifest
index 67bca7d71d92..87433a04ff4a 100644
--- a/net-libs/axtls/Manifest
+++ b/net-libs/axtls/Manifest
@@ -10,27 +10,29 @@ DIST axTLS-1.4.8.tar.gz 1298539 SHA256 e2679c8b42a840a9df8fef03a306b65fe06b43f72
 DIST axTLS-1.4.9.tar.gz 1300593 SHA256 9bc08f4c7a6bda3079af8e3f5ceee6b2ee92af34e8efbc9acfeee6c27b1f7cc3 SHA512 006a8c08c29f22e3992df9ccd94e19d5e98a6a350cf23c53710d72d3aba9f7375bad74124e5f09864c1cf193c592013dfccff3ba86ece496e5c0b85a771acef4 WHIRLPOOL a3c3d3ffa89a72f49ba7c8c3b11b471668253f9e3e07865558634c3b4dc7cb15f4bb4e7bbee34a4b3e9602dda13b31482082c367ff4cea97b3edec2a7cb973e1
 DIST axTLS-1.5.0.tar.gz 1302393 SHA256 7ff27d1eb1ad1630e1a3431278d72857c1124edd9a15a07a79709bc77d8bb710 SHA512 526e3c408c960e7e48dd791c6cf94a3dbc62a36c0453e4705529490160cacd5ca1c663fab153a899618e78516714e3afb7a93dae075d2717eb9a91e63f3e9c04 WHIRLPOOL 5fc0e9f4d3f8994dc2909f85261aac538b9563b3dee787d8d6a0942f087041893217a0b9237d5c0824c3a64bb8272bb30d2c4fcdbd11a879107f20892c8f180f
 DIST axTLS-1.5.1.tar.gz 1305575 SHA256 860a2754c497109854889e78eb2efdf00661f3b5dbb5e130bd5d8441a2f6ea50 SHA512 4b35e151d222496f5e4ab9c849ca9b14a245590a07f07132eab2fa633dac4cf7abfe29344f643fa182c9c443a139d3230d4b3554d3ff0932410ab36ae3666d92 WHIRLPOOL c1072aa94a7916db38d26902bac175d17e4f8fe1a431956d0b366f9cd913c89c145d119c823d9c1bfa51d54aa191ca43386b4312bea3a16f61d9df4ff2eb6b68
+DIST axTLS-1.5.2.tar.gz 1309632 SHA256 c4568cdf3e326c6fee2d7d16b4e13e05a29cecf49c1774c7858fe83cde01f8bb SHA512 138c1134c949fb85335454907c8fa74f18860d16371aba7d4d46faa4fb0e9cbf41d259cf72389f439d8d6436dc200951001a53e996793ba59254f5ddefe99999 WHIRLPOOL 36b889c4aa5e3c2c0da20a189ec7342db86b757acbb5c9c8a12262d95ceabb490ac97fa608efd66757e74e6347e0f5ff5bd5c76ac453d9dbdc115c45b8e35ad4
 EBUILD axtls-1.4.8.ebuild 4590 SHA256 ba848742b31983b2a689aab8509476f381f13c5596f835ee81d75784a95facc6 SHA512 614e14911e33b5f5f5555d8b1f720907cefe1b4c0b6f1f244b76bf556e919d85b500d3038cfd46715a60a033e0034dd307684b5011a811f6f9e6f6cb3e07b8c4 WHIRLPOOL 5da12ccd5222cd7716eba4243e2885d99d5b84b0f771d347acd571c12b4c68d51d72d500cb64f50351e289358926cd22d4e66a2d059090ea96d99973ace8cc2b
 EBUILD axtls-1.4.9-r1.ebuild 4769 SHA256 e6a616450f007e383da265d5aa714c54fabd81252bd388aad2ee0365bb78d53d SHA512 f0f29c3a027a32a972ecc0c08093836ccebee946628a1cdd0470535eee0e06b0a99874d8b659b7a8ed48f58d56385f85fba11d8c1f914ec411f018dab3c9618a WHIRLPOOL 94d3b93d4684b5d15075a4a7af992e57ed60c289a00e3562127f0cde2f7a40b70b0681323fc1b1f2e77603a5dc8a12bfa7831619fd436019e7df02f50d31147a
 EBUILD axtls-1.4.9.ebuild 4577 SHA256 cc732f0e41595acf59ad9720547ef2e831d23c14e119c040f6336d5450aceb62 SHA512 ff61973076417daeff6836b3ebaa7330c2a23a0815d9ba8254486729f473429254f0c76a34ae4efde7eb86150d11822018715ad05393f7827b6289041ed987a8 WHIRLPOOL 3d66c02aaad3eb93b41a6f8009f4e6ae0214bbef4832afc9371531e12b13839390d696b907af861ed125f9c612d3a4f325ea7e6730c2e1ff1c53ef26c9f41e47
 EBUILD axtls-1.5.0.ebuild 4763 SHA256 607587dfabb530771e1b0f1c7d857296014dafa15705545280d673e5bfb34e49 SHA512 613b3f6c3b0b099102e3f64cdb9d38e79fda26788b70716be0b30cb1f9b047f2c7679e2eb5e1363b706ab93b9d414b28b880ef25c569648a886471b991620e0a WHIRLPOOL 30b42182e8071b56bbe59664ea15812c4b007233041bcef94df1602eacdf52d315801c3d8a74020124303c4015a8bd2667ff224915cf8072b5763d69c0fc8c4d
 EBUILD axtls-1.5.1.ebuild 4774 SHA256 26920d7939dff71c01b686318eb9d84eb57c6e612c0d6c4dcc5e16f17adb50c3 SHA512 1eb2747e1eaade9bea2ea9e1be1615a9d2567827055f44680a65904b67ee83620cad1eff80bab65b5291b5678eeb5f4d70344521d911c16d3a4f0ba312c56f8e WHIRLPOOL e38babda218d8bd17d4cec7d856384e638537404e770c9f815cf35bc09f05ad6b735cfc8adffedb64f63c66b247787cce64710fb60009cdd473f7b89388a22c8
-MISC ChangeLog 6251 SHA256 6d2d8f01975bd6f5f88b5f6cf008e56d64b9e395b315b7cd723100f082ec03e4 SHA512 eafaa9fa8723a3ab9e365cd8418477d09a2fe260ec1974abb51fc7b7fda05f84b13552312bb8222f6b9ed3b9b9d59c33115e2d2eb6d00c638fcdf103fbf4c424 WHIRLPOOL 9c5bbff493514e265b0d95a65cb400c965fa961c6b92ae281f27135b5a8ff3348755cf9de48fa97770ec7c101f7d1d8866cecb4f0d9ab80ff68acd439ee9a30b
+EBUILD axtls-1.5.2.ebuild 4774 SHA256 ad1c7adceb7b52ca1558a897730427214a9ccfb00f4fd39a3c0411f8039a7093 SHA512 5ee170d66c8878c06325240757a3818dc4723a1550e4c81364dfeeb01e5ec5280c6c503e620317792938c93305a14e50aae99fd84f860e13778bb6c36af92bbd WHIRLPOOL fc6d89b7cac7217c7fa2f20598fb31af9494ad3cb97d367bb4ccfc6537fd49cbbf66653ce0ba4fc9730b427bb6f80aefbe53e028ab91b90917ec1943c0a76f1b
+MISC ChangeLog 6372 SHA256 91ea2174eb89b45cc3b1039ad44044517c7aa973e0468b3b4c69a430def573f7 SHA512 0fdbcb8b57f94e026bc40a56101db4b821dd8d1b1f3173aa37be4cf27380dd7e8aa95c3707232627ba9d3313c0c4d8b21409cbb88d729231072114c6fa7bcd09 WHIRLPOOL 6280c7a697ea24eac45f390baae4435a2faad1299c1ce1cf9f821adcdf35f0bd5ac26da47d20da3a6f1044f9d5f89d49246971a48a2c4f1363cb2eb91e9dbee2
 MISC metadata.xml 539 SHA256 678ce846bdfbf9df350ed0ba25520abe1588a12c229cbc54642269cf2fbe0966 SHA512 66019369788d013f2b9f541affea0e528ff544606ed19b5faaa1ca8c9681c05321ca0505ad98f120490a500cf9fb9bd5d659958d3666b766c74edb242c3913cf WHIRLPOOL a5a2f029e4b06b6f3dd7313182da640ae698ad5de07a4a4a4175b07966b67150cca8f98591b000c51b97596f99a4761f7969322a97c127305b73423726461a4b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUv/WWAAoJEJOE+m71LUu6MDMP/0+/GEAem0POSTN0NDpyAtGO
-RKrmLx3Pjx0+DonGIu29ztblliqIa+Qzg2s7UeWFlgdon9EVfWQWdFlF6jKgmtVn
-XMIMzTkY/C8JlpSKJauYaHNQJ8RGLkfYyhF4IR1LStqH2FZZa5jnhMBJ0A7MOzid
-xF1b5LYR4fXtm7HQl+eddNBH8uFmMxmGyz0DDugOVLD95CVU7KPKQP730wAss4rL
-wYr3ZR4lvDk7JOdPqrdTvrc+e8twaVy7qh70ZsmIB/6H9+SeTJWW2v0oyMtgeUJw
-/sySmtI8nG7Xs9LA+MljKLLwMqmS7GTfKEQRacjEMK49S515Jg6Hc+1HyblcSMeL
-iT592Vq35jk+nZrz9QfdzXQHdKH8fxIecWSyZqh3/KyzyAdL8e07yM/jGQc8nu+b
-Zdm5JsDC5JYG6rAUrrwM4ejPy75z/wqLaS/XFkvNz/9YsGEbOH4Ya+VfX18hw4t/
-FkXYJjT+Qr4uMxGLY2vqWdp8mpwbuzyppChvdkgDC38YzPyy7RM3pcHlIBWhyYe5
-T34nWHRF9Wst+kDvXd4pr8EMXerWTOqEF3aW1AJayE00P8safzlDwFd0c8K4eoix
-t73ic7f8sf+iP9W70DEhHRg1C8Y7EzpSCgB+QL/ozOUj21s8RLN7Db7Cs/udo4qB
-7CJQShwU5z+It1T6JSrW
-=r5tu
+iQIcBAEBCAAGBQJVLPpEAAoJEJOE+m71LUu6BjIQAIejiROjvgDN507a/qjE9v5j
+9PJYhpFSUk89IBFTjpkSv+A+Ufn6B5Ij4Dm2g0G4ijxztAbW3beL3aTq6Ud0OLsG
+/Bw8DPobsriluDCc0Pf9SE6lmp/wiMatBzT4Uim0sFf4q/I4Ly0DPAc/HVN9fZBy
+8rrdqctTYSVANrjWNNwPmiCCvpDE6xcS2Agkpw0W5bxMRPNo04tA+RwDpXoiz850
+OjCdVaMF0V5b1m/wuo2Jvap3qw2xwaaANyWmW6xNXXaCjP3+WSf1bdgGcCy3nLb1
+yhXLpn+WfCpCPyA51k2u89HQUnwY8iqSRIHL0xv7cAvpGHZysgly0UcQC9ZDF1md
+sbG1fWLUQFNYTfGQGYUR+w56Kvp3FlW1r+E3ACMTNu2I0X93PP0t8eu97fckPJ02
+KWasbLbC0kbqfJnLvrXv17AdqCPGCird9HigjiApxl7+otkUBccYqEyLkb+obEn5
+7MA36yuNSMDAH+Rc+w01/zaOjoPSvQ+E3Qi0KgvlJRhujrhbl4cuLqyykNSlNkX5
+ZxHWYjw4Ek2/MQgUGM26UH6qilFosaDx/rJO2jOmK4HdhrkCGMs/G71ugyHSQXGi
+FPAtSlLbjbDdAhXlfFs7bZyWzuTeeVL2tRmC7ttewjh6U1pz9dvUT6IiZEttHITK
+tFSeqdHVv30xbvwK/fqc
+=KRv+
 -----END PGP SIGNATURE-----
diff --git a/net-libs/axtls/axtls-1.5.2.ebuild b/net-libs/axtls/axtls-1.5.2.ebuild
new file mode 100644
index 000000000000..93a1f7057053
--- /dev/null
+++ b/net-libs/axtls/axtls-1.5.2.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/axtls/axtls-1.5.2.ebuild,v 1.1 2015/04/14 11:27:43 blueness Exp $
+
+EAPI="5"
+
+inherit eutils multilib multilib-minimal savedconfig toolchain-funcs user
+
+################################################################################
+# axtls CONFIG MINI-HOWTO
+#
+# Note: axtls is highly configurable and uses mconf, like the linux kernel.
+# You can configure it in a couple of ways:
+#
+# 1) USE="-savedconfig" and set/unset the remaining flags to obtain the features
+# you want, and possibly a lot more.
+#
+# 2) You can create your own configuration file by doing
+#
+#	FEATURES="keepwork" USE="savedconfig -*" emerge axtls
+#	cd /var/tmp/portage/net-libs/axtls*/work/axTLS
+#	make menuconfig
+#
+# Now configure axtls as you want.  Finally save your config file:
+#
+#	cp config/.config /etc/portage/savedconfig/net-libs/axtls-${PV}
+#
+# where ${PV} is the current version.  You can then run emerge again with
+# your configuration by doing
+#
+#	USE="savedconfig" emerge axtls
+#
+################################################################################
+
+MY_PN=${PN/tls/TLS}
+
+DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server"
+HOMEPAGE="http://axtls.sourceforge.net/"
+SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-code"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
+
+IUSE="httpd cgi-lua cgi-php static static-libs doc"
+
+# TODO: add ipv6, and c#, java, lua, perl bindings
+# Currently these all have some issue
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND="
+	httpd? (
+		cgi-lua? ( dev-lang/lua )
+		cgi-php? ( dev-lang/php[cgi] )
+	)"
+
+#Note1: static, cgi-* makes no sense if httpd is not given
+REQUIRED_USE="
+	static? ( httpd )
+	cgi-lua? ( httpd )
+	cgi-php? ( httpd )"
+
+AXTLS_GROUP="axtls"
+AXTLS_USER="axtls"
+
+pkg_setup() {
+	use httpd && {
+		ebegin "Creating axtls user and group"
+		enewgroup ${AXTLS_GROUP}
+		enewuser ${AXTLS_USER} -1 -1 -1 ${AXTLS_GROUP}
+	}
+}
+
+src_prepare() {
+	tc-export AR CC
+
+	epatch "${FILESDIR}/explicit-libdir-r1.patch"
+
+	#We want CONFIG_DEBUG to avoid stripping
+	#but not for debugging info
+	sed -i -e 's: -g::' config/Rules.mak || die
+	sed -i -e 's: -g::' config/makefile.conf || die
+
+	multilib_copy_sources
+}
+
+use_flag_config() {
+	cp "${FILESDIR}"/config config/.config || die
+
+	#Respect CFLAGS/LDFLAGS
+	sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \
+		config/.config || die
+	sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDLAGS}\":" \
+		config/.config || die
+
+	#The logic is that the default config file enables everything and we disable
+	#here with sed unless a USE flags says to keep it
+	if use httpd; then
+		if ! use static; then
+			sed -i -e 's:^CONFIG_HTTP_STATIC_BUILD:# CONFIG_HTTP_STATIC_BUILD:' \
+				config/.config || die
+		fi
+		if ! use cgi-php && ! use cgi-lua; then
+			sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \
+				config/.config || die
+		fi
+		if ! use cgi-php; then
+			sed -i -e 's:,.php::' config/.config || die
+		fi
+		if ! use cgi-lua; then
+			sed -i -e 's:\.lua,::' \
+				-e 's:lua:php:' \
+				-e 's:^CONFIG_HTTP_ENABLE_LUA:# CONFIG_HTTP_ENABLE_LUA:' \
+				config/.config || die
+		fi
+	else
+		sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \
+			config/.config || die
+	fi
+
+	yes "n" | emake -j1 oldconfig > /dev/null || die
+}
+
+multilib_src_configure() {
+	#Per-ABI substitutions.
+	sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \
+		Makefile || die
+
+	#Use CC as the host compiler for mconf
+	sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \
+		config/Rules.mak || die
+
+	if use savedconfig; then
+		restore_config config/.config
+		if [[ -f config/.config ]]; then
+			ewarn "Using saved config, all other USE flags ignored"
+		else
+			ewarn "No saved config, seeding with the default"
+			cp "${FILESDIR}"/config config/.config || die
+		fi
+		yes "" | emake -j1 oldconfig > /dev/null || die
+	else
+		use_flag_config
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use savedconfig; then
+		save_config config/.config
+	fi
+
+	emake PREFIX="${ED}/usr" install
+
+	if ! use static-libs; then
+		rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die
+	fi
+
+	# The build system needs to install before it builds docs
+	if multilib_is_native_abi && use doc; then
+		emake docs
+		dodoc -r docsrc/html
+	fi
+}
+
+multilib_src_install_all() {
+	if [[ -f "${ED}"/usr/bin/htpasswd ]]; then
+		mv "${ED}"/usr/bin/{,ax}htpasswd || die
+	fi
+
+	if use httpd; then
+		newinitd "${FILESDIR}"/axhttpd.initd axhttpd
+		newconfd "${FILESDIR}"/axhttpd.confd axhttpd
+	fi
+
+	docompress -x /usr/share/doc/${PF}/README
+	dodoc README
+}