Make build system multilib aware, add USE=static-libs, for bug #421479

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

4 files changed, 64 insertions, 9 deletions

diff --git a/net-libs/axtls/ChangeLog b/net-libs/axtls/ChangeLog
index 6800b54ebff7..51bea3a06556 100644
--- a/net-libs/axtls/ChangeLog
+++ b/net-libs/axtls/ChangeLog
@@ -1,6 +1,10 @@
 # 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.3 2012/06/07 00:13:29 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/axtls/ChangeLog,v 1.4 2012/06/17 21:14:32 blueness Exp $
+
+  17 Jun 2012; Anthony G. Basile <blueness@gentoo.org> axtls-1.4.6-r1.ebuild,
+  +files/explicit-libdir.patch:
+  Make build system multilib aware, add USE=static-libs, for bug #421479
 
 *axtls-1.4.6-r1 (07 Jun 2012)
 
diff --git a/net-libs/axtls/Manifest b/net-libs/axtls/Manifest
index 7eff1d2cd7ca..1e2472f0e8fa 100644
--- a/net-libs/axtls/Manifest
+++ b/net-libs/axtls/Manifest
@@ -5,15 +5,16 @@ AUX axhttpd.confd 181 RMD160 489c7d0ff59a419061bcc246e1ca1ced1cfe2831 SHA1 4378b
 AUX axhttpd.initd 625 RMD160 c61494de1ff76d6a4e8591e460667efacd9f2b0b SHA1 1ba055001658a96c9a927c47edb05def1840694b SHA256 90a816f0807478d02e4b74d8532e3deda8cfe844980dadd8662e1969acf7217d
 AUX bigint_impl.h-add-missing-include.patch 891 RMD160 dd2254c099733e58f95b0cf00869c0c63494b74a SHA1 36ec04c2899b6cd63e789ab4ea09ee2bce0d9097 SHA256 223ff3221f7a4394cc47dcfedcbdc8abf638ae60d90d1382cdf6a51d793212d4
 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
-EBUILD axtls-1.4.6-r1.ebuild 4399 RMD160 34b59e2df9932bd09eb521100f08b610d8d9ef39 SHA1 4bc6cb7d241f1032a8320f26af458330cc50afc4 SHA256 4420dec459d669d8f7e3dc2853760383eeb2543af216f4bef38c0f816b0c3dfe
+EBUILD axtls-1.4.6-r1.ebuild 4629 RMD160 c3897582fbf46608c478f5cf8ec664b6ff5c9d70 SHA1 25c434e5f00e940201c094760b8da05d0dc33c5e SHA256 1a1d6ca4a1acbea4a3a27c888480aa4908832ecc918a66790c338e557b0bc2d3
 EBUILD axtls-1.4.6.ebuild 4321 RMD160 22e08cac4eab32e2daaae8b1c6b705a1cefd43c6 SHA1 0bad271153ce9da4723a70c54c11fa42d752b654 SHA256 82ef30282951514401206c144aaede572c9ba4a56d4cdac76871482bf5e13c9f
-MISC ChangeLog 1624 RMD160 378db5c5f41a45292d6d64b23a0c3ca1c4747066 SHA1 29ea2c8dc44b17dfba9c1f0bd406f65607c41541 SHA256 9a2d79fd2caa0f12c1bc49a40c7abe26cf335641cc50dbb4f795b4dbf98b57c0
+MISC ChangeLog 1808 RMD160 8fba42b70df6e64294c3a52f652e1030e49fe9bb SHA1 4539ba0101633d2d326da8b7d2bad91056c87864 SHA256 fb4d016b4484e29001c55774fe5dacf6cca8c28e9d3a644bf8fa99a1f58c42ec
 MISC metadata.xml 539 RMD160 66d2200563130d8af1e6b9ea42aac0098cca0ece SHA1 977793dc0d626b3c9144cdac6e85ec137efd3e72 SHA256 678ce846bdfbf9df350ed0ba25520abe1588a12c229cbc54642269cf2fbe0966
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk/P8jMACgkQl5yvQNBFVTUjKQCfZHKmbdRqilCprJ25WFoBB8nP
-kMQAnjQ10cnMj69DNbwNvIJQwIxWb5KQ
-=xzeg
+iEYEAREIAAYFAk/eSMIACgkQl5yvQNBFVTW8DwCfc23HLRl2fYBgWkkQyp70ukFY
+xFsAn22QDuAgKnaEz/rDq2wCJyjNOJEY
+=ud/1
 -----END PGP SIGNATURE-----
diff --git a/net-libs/axtls/axtls-1.4.6-r1.ebuild b/net-libs/axtls/axtls-1.4.6-r1.ebuild
index f3a4b68d014f..db55f38befd6 100644
--- a/net-libs/axtls/axtls-1.4.6-r1.ebuild
+++ b/net-libs/axtls/axtls-1.4.6-r1.ebuild
@@ -1,10 +1,10 @@
 # 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.6-r1.ebuild,v 1.1 2012/06/07 00:13:28 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/axtls/axtls-1.4.6-r1.ebuild,v 1.2 2012/06/17 21:14:32 blueness Exp $
 
 EAPI="4"
 
-inherit eutils savedconfig toolchain-funcs user
+inherit eutils multilib savedconfig toolchain-funcs user
 
 ################################################################################
 # axtls CONFIG MINI-HOWTO
@@ -42,7 +42,7 @@ S="${WORKDIR}/${MY_PN}"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="httpd cgi-lua cgi-php static doc"
+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
@@ -74,6 +74,10 @@ src_prepare() {
 	tc-export CC
 
 	epatch "${FILESDIR}/bigint_impl.h-add-missing-include.patch"
+	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}:" \
@@ -155,6 +159,11 @@ src_install() {
 	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
diff --git a/net-libs/axtls/files/explicit-libdir.patch b/net-libs/axtls/files/explicit-libdir.patch
new file mode 100644
index 000000000000..9a1bc7e250dc
--- /dev/null
+++ b/net-libs/axtls/files/explicit-libdir.patch
@@ -0,0 +1,41 @@
+diff -Naur axTLS.orig//Makefile axTLS/Makefile
+--- axTLS.orig//Makefile	2011-01-07 08:16:40.000000000 -0500
++++ axTLS/Makefile	2012-06-17 16:55:04.000000000 -0400
+@@ -60,6 +60,8 @@
+ 	$(MAKE) -C samples
+ endif
+ 
++LIBDIR = $(PREFIX)/lib
++
+ $(STAGE) : ssl/version.h
+ 	@mkdir -p $(STAGE)
+ 
+@@ -68,7 +70,7 @@
+ 	@echo "#define AXTLS_VERSION    \"(no version)\"" > ssl/version.h
+ 
+ $(PREFIX) :
+-	@mkdir -p $(PREFIX)/lib
++	@mkdir -p $(LIBDIR)
+ 	@mkdir -p $(PREFIX)/bin
+ 
+ release:
+@@ -89,8 +91,8 @@
+ 	$(MAKE) win32releaseconf
+ 
+ install: $(PREFIX) all
+-	cp --no-dereference $(STAGE)/libax* $(PREFIX)/lib
+-	chmod 755 $(PREFIX)/lib/libax* 
++	cp --no-dereference $(STAGE)/libax* $(LIBDIR)
++	chmod 755 $(LIBDIR)/libax* 
+ ifdef CONFIG_SAMPLES
+ 	install -m 755 $(STAGE)/ax* $(PREFIX)/bin 
+ endif
+@@ -112,7 +114,7 @@
+ 	install -m 644 config/config.h $(PREFIX)/include/axTLS
+ 
+ installclean:
+-	-@rm $(PREFIX)/lib/libax* > /dev/null 2>&1
++	-@rm $(LIBDIR)/libax* > /dev/null 2>&1
+ 	-@rm $(PREFIX)/bin/ax* > /dev/null 2>&1
+ 	-@rm $(PREFIX)/bin/axhttpd* > /dev/null 2>&1
+ 	-@rm `perl -e 'use Config; print $$Config{installarchlib};'`/axtlsp.pm > /dev/null 2>&1