Version bump, fixes bigint_impl.h missing include

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

3 files changed, 193 insertions, 5 deletions

diff --git a/net-libs/axtls/ChangeLog b/net-libs/axtls/ChangeLog
index fd28d2663c9c..0feaba469bed 100644
--- a/net-libs/axtls/ChangeLog
+++ b/net-libs/axtls/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/axtls
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/axtls/ChangeLog,v 1.7 2012/06/26 19:14:26 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/axtls/ChangeLog,v 1.8 2012/07/01 13:47:46 blueness Exp $
+
+*axtls-1.4.8 (01 Jul 2012)
+
+  01 Jul 2012; Anthony G. Basile <blueness@gentoo.org> +axtls-1.4.8.ebuild:
+  Version bump, fixes bigint_impl.h missing include
 
   26 Jun 2012; Anthony G. Basile <blueness@gentoo.org> -axtls-1.4.6.ebuild:
   Remove version with broken crypto/bigint_impl.h
diff --git a/net-libs/axtls/Manifest b/net-libs/axtls/Manifest
index 2ac34d41bc63..be2c5ac8fdf1 100644
--- a/net-libs/axtls/Manifest
+++ b/net-libs/axtls/Manifest
@@ -7,13 +7,15 @@ AUX bigint_impl.h-add-missing-include.patch 891 RMD160 dd2254c099733e58f95b0cf00
 AUX config 3064 RMD160 5087b627e11d34a81c8696022d2380faa244b8e2 SHA1 095708bd3c5fc4e3183e9f9857139d0e211d42a6 SHA256 e85c8bd84f34045b52cefc7e3df94373f87cab22d495efe7ca737b1e6cfaa7ed
 AUX explicit-libdir.patch 1141 RMD160 c67dd5eb7c9c748d3d68b2d17f851e7b9c88045a SHA1 bf497b853df8ac383c884ef850b55c7570aba2da SHA256 a12f357937f2d2c791df3d5adce2a2713ee7914b86b91c341fec094b75b2cf45
 DIST axTLS-1.4.6.tar.gz 1299349 RMD160 291c7c0e43bc278a712bcad557187417f4813d31 SHA1 611a6a549b2842cd5e78e3ced4556264f17aef43 SHA256 43ad99c1cb205bc0275637fd14094a2034e168cdd6f18f377e007abdbb233619
+DIST axTLS-1.4.8.tar.gz 1298539 RMD160 267912f83206bff303e988a3882a8993c28660e7 SHA1 1d5e4506301e244b05683897248c439676fbb809 SHA256 e2679c8b42a840a9df8fef03a306b65fe06b43f72b2f6ef9acc181488e145cdf
 EBUILD axtls-1.4.6-r1.ebuild 4622 RMD160 d7f701e448b16e222068bec1327f97c777bedd56 SHA1 d3597ef5b4b172294c25caed049cb6c6662a43c3 SHA256 5bbfed3153ab7a2969a0d1dc5792954e6a03bb94022c74660db987e3b3ce6ee5
-MISC ChangeLog 2148 RMD160 464a1cebefed029d0baf3dea590a5321621d1ede SHA1 603e94ed47e8c4a8d256b7a68971758b7890ef0d SHA256 78b6a9dd4099df931a4730ccb8e51f992cf88890a8250de91c74fff7156d8b83
+EBUILD axtls-1.4.8.ebuild 4564 RMD160 95a6b60cfd6f6c5fe3ab70ecc309b3d3e012674a SHA1 12d791be6393860e9fd73abc04a9aa32a1035997 SHA256 05ed9e6e9bf7f7133c0f2c1de2cc952f746310f3e39f0ebc578bd8386deed6a4
+MISC ChangeLog 2305 RMD160 49de7f811d01ceaaa7b1bd3b8c9dede99acc1690 SHA1 d692f86a11e878db7c034340e8dc91f0ae9647a1 SHA256 afb6e0ce4e7e70eddd934f2062dc60546abf1a30e81fb3c0ef56bcab2da44bb2
 MISC metadata.xml 539 RMD160 66d2200563130d8af1e6b9ea42aac0098cca0ece SHA1 977793dc0d626b3c9144cdac6e85ec137efd3e72 SHA256 678ce846bdfbf9df350ed0ba25520abe1588a12c229cbc54642269cf2fbe0966
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAk/qCh0ACgkQl5yvQNBFVTXbBQCfdYDwMMZrocVY5VcKFnYHs/gL
-f+EAn2npsjF8rDwEoYYe9YH/JDti1NKb
-=iTCs
+iEYEAREIAAYFAk/wVQwACgkQl5yvQNBFVTWebQCfed7QBKvUpvwK1n2UrfjO8KG/
+w14AnAihN9w1fsJH5AKTkkauCNoVP9l5
+=fTzO
 -----END PGP SIGNATURE-----
diff --git a/net-libs/axtls/axtls-1.4.8.ebuild b/net-libs/axtls/axtls-1.4.8.ebuild
new file mode 100644
index 000000000000..69f7e1c63a9b
--- /dev/null
+++ b/net-libs/axtls/axtls-1.4.8.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/axtls/axtls-1.4.8.ebuild,v 1.1 2012/07/01 13:47:46 blueness Exp $
+
+EAPI="4"
+
+inherit eutils multilib 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}/${MY_PN}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~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 CC
+
+	epatch "${FILESDIR}/explicit-libdir.patch"
+
+	sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \
+		"${S}"/Makefile
+
+	#Use CC as the host compiler for mconf
+	sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \
+		"${S}"/config/Rules.mak
+
+	#We want CONFIG_DEBUG to avoid stripping
+	#but not for debugging info
+	sed -i -e 's: -g::' \
+		"${S}"/config/Rules.mak
+	sed -i -e 's: -g::' \
+		"${S}"/config/makefile.conf
+}
+
+use_flag_config() {
+	cp "${FILESDIR}"/config "${S}"/config/.config
+
+	#Respect CFLAGS/LDFLAGS
+	sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \
+		"${S}"/config/.config
+	sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDLAGS}\":" \
+		"${S}"/config/.config
+
+	#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:' \
+				"${S}"/config/.config
+		fi
+		if ! use cgi-php && ! use cgi-lua; then
+			sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \
+				"${S}"/config/.config
+		fi
+		if ! use cgi-php; then
+			sed -i -e 's:,.php::' "${S}"/config/.config
+		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:' \
+				"${S}"/config/.config
+		fi
+	else
+		sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \
+			"${S}"/config/.config
+	fi
+
+	yes "n" | emake -j1 oldconfig > /dev/null
+}
+
+src_configure() {
+	tc-export CC
+
+	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 "${S}"/config/.config
+		fi
+		yes "" | emake -j1 oldconfig > /dev/null
+	else
+		use_flag_config
+	fi
+}
+
+src_compile() {
+	default
+	if use doc; then
+		emake docs
+		mv www README
+	fi
+}
+
+src_install() {
+	if 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
+	fi
+
+	if [ -f "${ED}"/usr/bin/htpasswd ]; then
+		mv "${ED}"/usr/bin/{,ax}htpasswd
+	fi
+
+	if use httpd; then
+		newinitd "${FILESDIR}"/axhttpd.initd axhttpd
+		newconfd "${FILESDIR}"/axhttpd.confd axhttpd
+	fi
+
+	docompress -x /usr/share/doc/${PF}/README
+	dodoc -r README
+
+	if use doc; then
+		dodoc -r docsrc/html
+	fi
+}