Enable multilib support for libfl.a.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 89 insertions, 9 deletions

diff --git a/sys-devel/flex/ChangeLog b/sys-devel/flex/ChangeLog
index 4348197f276b..ba25ac339c46 100644
--- a/sys-devel/flex/ChangeLog
+++ b/sys-devel/flex/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/flex
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.116 2014/03/29 02:44:21 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.117 2014/05/30 14:25:06 mgorny Exp $
+
+*flex-2.5.39-r1 (30 May 2014)
+
+  30 May 2014; Michał Górny <mgorny@gentoo.org> +flex-2.5.39-r1.ebuild:
+  Enable multilib support for libfl.a.
 
 *flex-2.5.39 (29 Mar 2014)
 
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index aaaa2fbf1e73..adfaae569dda 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -16,17 +16,26 @@ EBUILD flex-2.5.35.ebuild 1296 SHA256 15883b37613fcdd1dd86b7bb7968a371f94345e0e1
 EBUILD flex-2.5.35_p10.ebuild 1331 SHA256 1746432f631397c5819a6940df6519d690722609c113f49c44a8fc8f687e7061 SHA512 cdfc0c7aa5be6cf40d993a15c24b1b253d7335a9ef535befbc9f42384e9f0f34291ba41930009c13d7937b7adef768211072a41f178ddaba160faf5b3ba6e183 WHIRLPOOL d75ef1540a221a8b24e15bd8b99005a00e74fae3ee9f9ece67d475db52dc881fbb84fd62bedf1a722a82887d96f31cd5daf69827588e34a19fa5cdbaf817d27c
 EBUILD flex-2.5.37.ebuild 1473 SHA256 a1c20f9c4b87a921e3d0bbbf0dcfd339a908d3c33ebcbbcbb1cd235adbf65ed3 SHA512 dfffac5047e188e6f11b4bf572ceb6dcbf0ea816d932abbb29b3f2de84f089626644fb35bc260bd689a98fa633ffdd91dd7ec9e5920ced7c63e7c29127ecd5e9 WHIRLPOOL 4392d3b1ea56313422b4db367853a33ba963daa80bc9e1bfcb66d5523497ed15c46a82aa7062f2c63837d74563dfe34bafaf9162f6765a878a0868d980907502
 EBUILD flex-2.5.38-r1.ebuild 1298 SHA256 7000f4dc8554dcbf24b7c86607c22751ac64877331a630daf1d8bf2bf898370e SHA512 b15be298d76494561cff8af2d938be4b5a032a81041e4c89aa73acb96d6332ebfd7d98ba37d6b00f45dff25745e7041c36ea6bb514b0ba66b4160c035254bf2b WHIRLPOOL 940e0455e6da3bc5e7a52a0e6c4004641ceebec2253fc2f51a65c716d58801c9fe080ef2e31ddde49f573494e9983a68459bd2130169cd9bd6ef50a65e01a7c8
+EBUILD flex-2.5.39-r1.ebuild 1770 SHA256 b48fae46061ece7f7fd9b717c2b2f39e730561db29b6478a21dee860f6c2fc03 SHA512 1bc17da12a56d77d77395e30c1ad3c12a08980813c8d37ce4ce462ea3e6f977abed28c70f58de9e12a3975fbaefffe3959c6ed138a1023347a085e3e7c4afa05 WHIRLPOOL a04dc53c93cd1230b2f30074730ce822da37a3392fb9083ec243a8af3c97975b123135ab33742e93fc0f8d6ef90c07307bd73eb569f12cfdebc57bf6228a4904
 EBUILD flex-2.5.39.ebuild 1298 SHA256 6d3d9e8cbbfe3ed332048d426e294992cc57b11ea0a4d47e6cb3b43852a0603a SHA512 a5b2ae8c8d7ce9264a02e11e979e9036a45747eebb5e2e12c8a932a56405313ed6403b76a124b42748a76b41752e421999d4a38003aafee03501dd3b81ea811a WHIRLPOOL 6d4286c28626313d1d8f2125a39f1ce7caefda1596ebaf183798ddc1ac15294f7f81ca694c1630f760bcbf433f2fd9b422572731291f9af9c0bea2ae59474b13
-MISC ChangeLog 12913 SHA256 c1892cb03a91420e0f88af9dcab3ae669deb6f482ceb64176f385308cf34f585 SHA512 5ed9e42ef2394f118d95d4e61314d5aa9d1938aa2b46ea86defdce819b800fd65fd2149becdc322c9c5918a989a0d89c1d1b3583b0bf456993f2823837adad9c WHIRLPOOL ebbf918bf1134f5a2dcf633b03c8d1e347a823b3508e6d4a69d4fd8c660a38a1bc966b821b31cf48872951fea916602add80ba2f42839db3468b4435e3b5cab3
+MISC ChangeLog 13055 SHA256 51b9655182f2cf136683e0fb47378976a079d6fe405179c34b0598ecc0dfc246 SHA512 6dbbe3c3ac75c752c00f95aaf282faca98db3a912bcf6e27a7e691a50138d32c7a4f325bff8db1fc3f52e5db1ba6a5206d031fb55202e40302d01d76ad06987e WHIRLPOOL d425d88a363aa6bb35d9ad014859980f02d509cdec09280daf2ff6ba6aa9dbedd5dca0d6037c53c19f5c8abc0121311c2b5317340876e0e2c717056e1474fa26
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTNjOIAAoJEEqz6FtPBkyjaFoH/1VNBvnSbtSj7hum/9KPoPFG
-8yrz9lhq7ZSW8EaQnD8FtuNJt2EMFHWxGKt1lakG1tPKGKxxWkxkN+kjybpZKG4O
-UAI6kvCQPoW4YGtygz1R/OxgGY+n0EBCiIO9YDFbO9Q6TwlsRtLGfNygRJHHDANQ
-cLvFWXn4VaJeQ6jhQwxtwIshpoKy5XZwGUZXLtKcCKOeEyTPqifZWMGHte0XGzO8
-FGP4FGR3Aw5mAt23GBZTCZDrCx0fcnr8sMHB9tF9P0XxtbyGMrLsYPGF/Wlatty3
-+Pk/Wpby0677tAbwOngMC+Cvli1RCwuy4ggkGJ/FI0E6cPUZgQKeTCrDzbJEPpE=
-=TrGO
+iQJ8BAEBCABmBQJTiJTEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO1ekQAJ+is3rUVUd0kaBTezYy0uvF
++/0BNgCXvlxx/fw6mUu/uGllS2uIsUwL6qQgi4YLxhz/MlD1fyr/K1KH7GtbDEIN
+c37ATrisDLoVUDEcDje6kv3iXoJrYrPlVtKto7n96cVtS9ow2SexzC6QWlwO99Wb
+JJxP9dl7uAKCXDq/T9umzmRmozwMxlMr8BqM7YTQnfdUhiBqQYTGzcdcTl4xJOMj
+4HuuPK61xSjfW6bAsOtW2BZD2U60+ti7O9G6We9SSfKygdM7PEKZbbEVBZqJ5DO8
+HNk/SyOwhzdMfVmca0BluglFBZdoOThGZ9WcBR1EllcpILYeNPe8ocH+V8+Fj6eV
+M2po3TIbml94MacvYbGGsSDHB1vKmceP06Y+MAgeONHcHnK+vV9pPtjnGOsX8o+E
+5a412tegVKwH1BFKJjkHprq9jl3OWKsuAqS6X+aJ3bydOt/ultclXl2TmiOYbMAI
+r98SW9LsY4CP3WxRp5yAJ8MwLGXaf4AvL8j1mlNYA/+DQ1cksAl3WIrGT53KIBek
+seUqHE3IR9VIKyJHETZJAVAugdbm+8ibwjrNzuEH469yRBoQUEnlEzACTb3B67me
+KxVZgpmlpwKf9e2yv7Qt6Hmo11ICHLTSD1A9RhmTxYvw1vi2MUrdpoY8L+gR7RRW
+F3xSy05M9C6lf5ILazmu
+=B+7h
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/flex/flex-2.5.39-r1.ebuild b/sys-devel/flex/flex-2.5.39-r1.ebuild
new file mode 100644
index 000000000000..c02b829d83ad
--- /dev/null
+++ b/sys-devel/flex/flex-2.5.39-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.39-r1.ebuild,v 1.1 2014/05/30 14:25:06 mgorny Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic multilib-minimal
+
+DESCRIPTION="The Fast Lexical Analyzer"
+HOMEPAGE="http://flex.sourceforge.net/"
+SRC_URI="mirror://sourceforge/flex/${P}.tar.xz"
+
+LICENSE="FLEX"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls static test"
+
+# We want bison explicitly and not yacc in general #381273
+RDEPEND="sys-devel/m4"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )
+	test? ( sys-devel/bison )"
+
+src_configure() {
+	use static && append-ldflags -static
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# Do not install shared libs #503522
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-shared \
+		$(use_enable nls) \
+		--docdir='$(datarootdir)/doc/'${PF}
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake -f Makefile -f - lib <<< 'lib: $(lib_LTLIBRARIES)'
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake DESTDIR="${D}" install-libLTLIBRARIES install-includeHEADERS
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc ONEWS
+	prune_libtool_files --all
+	rm "${ED}"/usr/share/doc/${PF}/{COPYING,flex.pdf} || die
+	dosym flex /usr/bin/lex
+}