[gentoo-commits] dev/blueness:master commit in: dev-libs/axTLS/files/, dev-libs/axTLS/

[Anthony G. Basile]

commit:     f3fea476aea4c3702d9af4a86d48dc4b5260961e
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  6 15:11:44 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Apr  6 15:11:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=f3fea476

dev-libs/axTLS: add USE=savedconfig and USE=doc code

---
 dev-libs/axTLS/Manifest           |    4 +-
 dev-libs/axTLS/axTLS-1.4.5.ebuild |   94 ++++++++++++++++++++++++++++++------
 dev-libs/axTLS/files/config       |    4 +-
 3 files changed, 82 insertions(+), 20 deletions(-)

diff --git a/dev-libs/axTLS/Manifest b/dev-libs/axTLS/Manifest
index f1bc27e..48fca04 100644
--- a/dev-libs/axTLS/Manifest
+++ b/dev-libs/axTLS/Manifest
@@ -1,4 +1,4 @@
-AUX config 3068 RMD160 cc43051398f7bfab7a429832b8aa748a82b413f8 SHA1 62693549c6c9b892debb628f9120e8804dc4aa71 SHA256 462ab8900abc31b518b49967905b6a081312af0b3a26b5920ce2e3face838d9a
+AUX config 3064 RMD160 50852bca5ca0e0d62af398805fd30133fd2361a3 SHA1 32de40d7e7300f0a43607a236f5890a38414fa3b SHA256 a2a52b3ca276755f3629d9b13685a52fc2415309afa9607d4ab361bc1360015f
 DIST axTLS-1.4.5.tar.gz 1299325 RMD160 fb8f78578a998ed0a88cfef18127e4d24ff35bfc SHA1 33b8c4b7babd433d78889218bc5fa6932bfd0a24 SHA256 04e9c235d59cff98c393c920d4d7975b7ba32979c1d9675cee73996d22d232f1
-EBUILD axTLS-1.4.5.ebuild 1993 RMD160 c7758f2af414ca08979cd9530a680b8d4c55f8d0 SHA1 c30cc1f43f26d017587f33fb673e2e2a91311e42 SHA256 2c696b605f274b8ef05f4c4ce060fe007e334a554d8f1bf067dd5f1d7ea05ba2
+EBUILD axTLS-1.4.5.ebuild 3732 RMD160 9b60fb66caf54369fc905efcff3de9e2c0b7e4c7 SHA1 71601a754f2a40cd110e617c9183373e7f9eaf9a SHA256 0ee53de947ab47770ce85adcf0b453ab727a9f15f4fdbd0ee09124555c3f4a51
 MISC metadata.xml 539 RMD160 66d2200563130d8af1e6b9ea42aac0098cca0ece SHA1 977793dc0d626b3c9144cdac6e85ec137efd3e72 SHA256 678ce846bdfbf9df350ed0ba25520abe1588a12c229cbc54642269cf2fbe0966

diff --git a/dev-libs/axTLS/axTLS-1.4.5.ebuild b/dev-libs/axTLS/axTLS-1.4.5.ebuild
index 25c17da..c1f12d0 100644
--- a/dev-libs/axTLS/axTLS-1.4.5.ebuild
+++ b/dev-libs/axTLS/axTLS-1.4.5.ebuild
@@ -4,17 +4,40 @@
 
 EAPI="4"
 
-inherit user toolchain-funcs
+inherit user savedconfig toolchain-funcs
+
+################################################################################
+# axTLS CONFIG MINI-HOWTO
+#
+# Note: axTLS is highly configurable and uses mconf, much like busybox or the
+# the linux kernel.  You may configure it in two ways:
+#
+# 1) USE="-savedconfig" and set/unset the remaining use flags to obtain the
+# configuration you want.
+#
+# 2) Do
+#
+#       FEATURES="keepwork" USE="savedconfig -*" emerge axTLS
+#
+# then 
+#
+#		cd /var/tmp/portage/busybox*/work/busybox-*
+#
+#
+################################################################################
 
 DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server"
 HOMEPAGE="http://axtls.sourceforge.net/"
 SRC_URI="mirror://sourceforge/axtls/${PN}-1.4.5.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="httpd cgi-lua cgi-php static"
+IUSE="httpd cgi-lua cgi-php static doc"
 
+# TODO: add ipv6, and c#, java, lua, perl bindings
+# Currently these all have some issue
 DEPEND=""
 RDEPEND="${DEPEND}
 	httpd? (
@@ -22,13 +45,12 @@ RDEPEND="${DEPEND}
 		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 )"
 
-S="${WORKDIR}/${PN}"
-
 AXTLS_GROUP="axtls"
 AXTLS_USER="axtls"
 
@@ -42,55 +64,95 @@ pkg_setup() {
 
 src_prepare() {
 	tc-export CC
+
+	#Use CC as the host compiler for mconf
 	sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \
 		"${S}"/config/Rules.mak
-}
 
-src_configure() {
-	tc-export CC
+	#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
+}
 
-	yes "n" | emake -j1 oldconfig
+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
-	use httpd && mv "${ED}"/usr/bin/{,ax}htpasswd
+	if [ -f "${ED}"/usr/bin/htpasswd ]; then
+		mv "${ED}"/usr/bin/{,ax}htpasswd
+	fi
+
+	docompress -x /usr/share/doc/${PF}/README
+	dodoc -r README
+
+	if use doc; then
+		dodoc -r docsrc/html
+	fi
 }

diff --git a/dev-libs/axTLS/files/config b/dev-libs/axTLS/files/config
index 4e80653..7cfaab7 100644
--- a/dev-libs/axTLS/files/config
+++ b/dev-libs/axTLS/files/config
@@ -62,7 +62,7 @@ CONFIG_HTTP_STATIC_BUILD=y
 CONFIG_HTTP_PORT=8080
 CONFIG_HTTP_HTTPS_PORT=4343
 CONFIG_HTTP_SESSION_CACHE_SIZE=5
-CONFIG_HTTP_WEBROOT="/var/www/localhost"
+CONFIG_HTTP_WEBROOT="/var/www/localhost/htdocs"
 CONFIG_HTTP_TIMEOUT=300
 
 #
@@ -101,7 +101,7 @@ CONFIG_LUA_CORE=""
 # Samples
 #
 CONFIG_SAMPLES=y
-# CONFIG_C_SAMPLES is not set
+CONFIG_C_SAMPLES=y
 # CONFIG_CSHARP_SAMPLES is not set
 # CONFIG_VBNET_SAMPLES is not set
 # CONFIG_JAVA_SAMPLES is not set