Enable multilib support.

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

3 files changed, 89 insertions, 18 deletions

diff --git a/media-libs/libofa/ChangeLog b/media-libs/libofa/ChangeLog
index fed4afe5b4f4..f2c33857aaac 100644
--- a/media-libs/libofa/ChangeLog
+++ b/media-libs/libofa/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libofa
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libofa/ChangeLog,v 1.24 2012/06/04 12:51:28 jlec Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libofa/ChangeLog,v 1.25 2014/06/07 15:27:00 mgorny Exp $
+
+*libofa-0.9.3-r1 (07 Jun 2014)
+
+  07 Jun 2014; Michał Górny <mgorny@gentoo.org> +libofa-0.9.3-r1.ebuild:
+  Enable multilib support.
 
   04 Jun 2012; Justin Lecher <jlec@gentoo.org> libofa-0.9.3.ebuild,
   +files/libofa-0.9.3-gcc-4.7.patch:
@@ -82,4 +87,3 @@
   27 Aug 2006; Carsten Lohrke <carlo@gentoo.org> +metadata.xml,
   +libofa-0.9.3.ebuild:
   Initial commit. Thanks to Maxwell Gender-Jones, bug #126069.
-
diff --git a/media-libs/libofa/Manifest b/media-libs/libofa/Manifest
index f4deafd28d08..fc1673fa28a6 100644
--- a/media-libs/libofa/Manifest
+++ b/media-libs/libofa/Manifest
@@ -1,20 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX libofa-0.9.3-curl-7.21.patch 394 RMD160 09eb2b67586b2c8eb2b8065bb96d716aa0819de6 SHA1 6a8c841ebe2cc4e3800f9ef5ec9373563ed84992 SHA256 2fa49ced7b47cf05641d1413965244693ffd514ec9d409a784b92751ae4d1c90
-AUX libofa-0.9.3-gcc-4.3.patch 1254 RMD160 a435c893b3594d3c622588f87bac5a2a6cfbf69d SHA1 cae08bdc12de923d5e032696702a0530ae6eafc1 SHA256 99fb50907d98640b21a42d00fccee1fa33a02dfabf94a40374766fcc823f5dd3
-AUX libofa-0.9.3-gcc-4.4.patch 281 RMD160 eb0637ea02892ae9faa165114048f8ebe4d6672a SHA1 5f5d8fe172a2f3aaece09aa486a3bd787b916db3 SHA256 f8c5f3ab8e5a62cc5524a527555be7108e27e020193c70e47df5330a9164631a
-AUX libofa-0.9.3-gcc-4.7.patch 763 RMD160 4788ab917ca47cab175d7662d44fce9abf666949 SHA1 3c2be57980e9ff732c236f8f5b378b3d877fa69c SHA256 e0c28752df197ce38f9762aded5df12e1ba1181f721f42fddb83ec1178e90c58
-AUX libofa-0.9.3-gcc-4.patch 819 RMD160 438764c9c9ab5a1a9ede64c505c140cc53aabf9b SHA1 cb19377d0634c03d2a49cfc61915cec918c341f7 SHA256 29955fe97cdb3cc2eb72b7b05f1ae38cc5c98b1740a0db96d61f51a13d380cd8
-DIST libofa-0.9.3.tar.gz 384043 RMD160 77f393570bb5356026c4b9c7195236bd96cb9143 SHA1 3dec8e1dcea937f74b4165e9ffd4d4f355e4594a SHA256 0216466153e92058c5202dea03390ddc7601d916b983f71ce4f4d034405590a0
-EBUILD libofa-0.9.3.ebuild 996 RMD160 b30e6c2800879f67485a8de9750ab586ad530e6d SHA1 326a55050ef69d4216a6421d9549c02c21a66b20 SHA256 462ace8cc93154da78c34e33b35af6b1dad8b5e01a4b2d22d55c8addc0547901
-MISC ChangeLog 3125 RMD160 0edc120aadec078c743f4b313106e59cfe07b642 SHA1 4a132e927238a49a5033835ad34fc58a594efb2d SHA256 a7ce85f290ba2488e59ef902cedfbea9fce8611fde5754fbfda16737376a9e78
-MISC metadata.xml 243 RMD160 c5832968c5230dd88ca29e36b3ce5ecf42936743 SHA1 7f8446034b2ea27137536ee1a22ea26393cdef56 SHA256 074d5e5fa20090f4d5450c1b7ebf8a45a22445ab8e35b2bcefdfd24163b0f8f5
+AUX libofa-0.9.3-curl-7.21.patch 394 SHA256 2fa49ced7b47cf05641d1413965244693ffd514ec9d409a784b92751ae4d1c90 SHA512 6742d05cb4ee57886b7f782f1f3a4dc33a6ff18a72f7bed1b3ad0bb99dab6df9c1d286c2dc2dffa236d0aa9808b55a978e9f3f47eb2f89d3b1ccd99cc0ceff49 WHIRLPOOL 025037940d20f639d493f1b02466f234ab4a9883245c0771555fb117f482a024adc3a7314b1f4f4305d0853843e0cdd86ef5ea4d009ba34d59dfa855b9c5e4a8
+AUX libofa-0.9.3-gcc-4.3.patch 1254 SHA256 99fb50907d98640b21a42d00fccee1fa33a02dfabf94a40374766fcc823f5dd3 SHA512 6d8d4732bd1735fef8cbabbb0fedce326f45e14f8b9d6ee89d2f03dc159e45bf84eddaedaff6c898eb9270cc7a783ef8b59036dbbfec80fd4c17c4564ed1e4c4 WHIRLPOOL 0498fa6b4ab285b07ecf640d5a8f23ff139d8fdf1480b51f555a9eb47f0c35a027be422e96c94204cb41e6744371ccab4f0fd0a2a95b1d459fefe21d0c3fcf84
+AUX libofa-0.9.3-gcc-4.4.patch 281 SHA256 f8c5f3ab8e5a62cc5524a527555be7108e27e020193c70e47df5330a9164631a SHA512 c9346733bd4529530af8026c4a27d5ee0b7883d2a604a84b4619a96f66ca8c7f1ba98203481c52750b942049324434e9fff84496bbaca03fc4104ac1248f1fe2 WHIRLPOOL ad03e86ec71376120736e12474e2e58debe3c12aa6d1a771a9547321037cd88fe6cd5b0ffd8e1783c106fa16e1b815d4dcd8e41785dabc121cfac6c2e879c651
+AUX libofa-0.9.3-gcc-4.7.patch 763 SHA256 e0c28752df197ce38f9762aded5df12e1ba1181f721f42fddb83ec1178e90c58 SHA512 932c938c2fb6676f0026c23b593ecad9c54f8718ff7c544cb26ee2f991850a213c61ce87ec93814c762e148df7d87a09809fd14b5cc07be3e43304059cfaa8a7 WHIRLPOOL a867632ad8929c303a0353f456e91606ef995431a1c4966f8dd02be4856bb246ea2c3fca0d2889387d11d6cfe886c6085eab5bf02d8ebfaab22259ce09c0fd89
+AUX libofa-0.9.3-gcc-4.patch 819 SHA256 29955fe97cdb3cc2eb72b7b05f1ae38cc5c98b1740a0db96d61f51a13d380cd8 SHA512 d07a50ddf5434d28a3c3fab639232e72be756eceac50846d9ad51a00bf26bfd5b29a93e0e4298bb78e0719d0cd1a152818e71b02b270c58729a63b4fcc41d2ef WHIRLPOOL f8082a3f816df7c5c6dcb975089407c79f4de662f13c26a3eeb2abb4e4cf3388895340762c95120d7648a954e3311324c061992c3aa5c218d3bb9b9b252330b0
+DIST libofa-0.9.3.tar.gz 384043 SHA256 0216466153e92058c5202dea03390ddc7601d916b983f71ce4f4d034405590a0 SHA512 058fb43ea296325d2f7ad1762e1fd3f2ad772754b5d53dbaa1c5cd91ac5041ef82c7ea9ac580825e2391fa7db6803ff7fd5b24faf319280211a4641516126967 WHIRLPOOL bc9adb3346cbb017e6d50364d4710b03c0dd5c48556ac636484fc2ed663a3fa72f93d86317087a50baf2b04d9c516c02688215df4032db2eb435348c752a5f15
+EBUILD libofa-0.9.3-r1.ebuild 1476 SHA256 181177f173d755f5041cf0cc3a12d594ead9e5775ed569073380ba85faebff0f SHA512 d518ece3f284c5862ca3f47d2d74634d1d36772243e147036d61522d136dc4feecfb36bdc64174fc96d1893cc7187e00e14f4d2526d18c6ce1524b1bfe53b97e WHIRLPOOL f1ff2b5f6169385213e3c451512ff0952b6f065a2ea983975433974afce6911e5e2003263294f5b6bba620ce9f1ce7dc6514f535db8ee0289ddd8072ea01a2af
+EBUILD libofa-0.9.3.ebuild 996 SHA256 462ace8cc93154da78c34e33b35af6b1dad8b5e01a4b2d22d55c8addc0547901 SHA512 bc044c5713d506db1ac22a2bbd3f7b2270b9d528b0d54da387506731a680cd0afa093b98f55d9d725c8e91e12c825c88ef6df9b2f89ed586005c68aff115ed69 WHIRLPOOL ccdd962c269ee635264d810cf734166d8a28899bfdc545da403c7d2a5eba556d8dc46ffc938fd0b0809b087df2cbf53f9abc28106afb25e39f180e1a9a433ca6
+MISC ChangeLog 3261 SHA256 b4943ccd59065c22b49814cf65f1e1a55d60170d1de15768aa6ccdc348eeb814 SHA512 bd056c6836f812fdbe5304c32ea58080ae17635571d1bf7402842ff0d90f8c2cd62436b78867166d2f5e63f99ecbf6d58a9f78ff31299dabb5560c68d37e0de4 WHIRLPOOL 8b1f199c49afea09aeac15c75392b24e5ba81cc53cfcf435a8746897df4440333099d298e51d34bb6cc495c0b42334605ee6f6dfeb4b6df492fd5b5dcc306319
+MISC metadata.xml 243 SHA256 074d5e5fa20090f4d5450c1b7ebf8a45a22445ab8e35b2bcefdfd24163b0f8f5 SHA512 f7dac2ba7f90e4f10b0772f59ff4ff507423b71183b29ba4325ed63ac5d321291f371fb89c4ef85a019099b1fde2b2b0177bbdaac461f30b9d61368d467e8848 WHIRLPOOL e2405848adf610358389950c708825b6b7b9387ee40d2b9634f5c65b52c72aa659664d7ece7e8874b8e5213009417f438812a2e540d7f881d9c0e3d7539ab31c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
+Version: GnuPG v2
 
-iEYEAREKAAYFAk/Mr1UACgkQgAnW8HDreRYX5QCfUQZrood8Maw1COcnXFoaqHQW
-uIEAnjJtyZFN+XA7Qi6PIQKQJ4BKTSrz
-=8+Vt
+iQJ8BAEBCABmBQJTky9FXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOwWUQAN7ieOGF76TSkPl6nuLy2O1R
+B2BTcjRXrqtPdDJCXcyT4IAQeryEEf7E/Nbg7bTHUT2Fq6KhnqqENo3hvtx9ftht
+AGcJwCJ3q6dnog7rHMSwp0INs4jyYGY1a1iS4xHNeaWOjBc0QTbtlQQKxF8mMjGK
+++7DteUpxjK8YMDsxmi3Mtwf7ZP6CybzUwZjJU3m5XkOtnbFDi6VB2rAdAHIBXd2
+kf6R9tTM0jgWk1qlrvrs3X2L597/RF/PEvABV/a+6OEzZ70x2UI43BMXypJDGp+e
+C06p3AM0EQh0S19HHlxjFu4qofRY5e5u3ub1Xi4IE1KgO+CyCleEM3InLOZBpmDP
+hMCxRGrMmlmZoMiHzgsqcA4JmTmZpZqkdsAcu/UcyiN2VHVu4k6Pke/A1NDrS7qt
+WFh62ldmuy9n2sv+B7iMcJ48UHPDJVCyVYXZ/nM6fLf1n9Z8KCp/tau50XAMBlBc
+6p9kX2WgTjSH43jvXUx2hJQGECsclE/251x7Lp0f0vNHB4s1i2IeyHBzpCDH8WPe
+EB66/CEZavlnDKs22kxaUsOna7cwcrso5urM/J/g+z78kiHfLoaKkc2GtzzdUpq2
+wZah/oikhDWGAyONYB5IDWD3lk+tOsgn6s/gLZWH+He5kR4MenltDMh5yuLAvFbV
+mmieqNo4XWwAnmivlM42
+=Led2
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libofa/libofa-0.9.3-r1.ebuild b/media-libs/libofa/libofa-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..0e85d804a305
--- /dev/null
+++ b/media-libs/libofa/libofa-0.9.3-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libofa/libofa-0.9.3-r1.ebuild,v 1.1 2014/06/07 15:27:00 mgorny Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib-minimal
+
+DESCRIPTION="Open Fingerprint Architecture"
+HOMEPAGE="http://code.google.com/p/musicip-libofa/"
+SRC_URI="http://musicip-libofa.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="|| ( APL-1.0 GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-libs/expat
+	net-misc/curl
+	>=sci-libs/fftw-3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r2
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-4.patch
+	"${FILESDIR}"/${P}-gcc-4.3.patch
+	"${FILESDIR}"/${P}-gcc-4.4.patch
+	"${FILESDIR}"/${P}-gcc-4.7.patch
+)
+
+src_prepare() {
+	# disable building non-installed examples
+	sed -i -e '/SUBDIRS/s:examples::' Makefile.{am,in} || die
+
+	epatch "${PATCHES[@]}"
+	epatch_user
+
+	is-flag -ffast-math && append-flags -fno-fast-math
+}
+
+multilib_src_configure() {
+	# disable dependencies that were used for the noinst_ example only
+
+	ECONF_SOURCE=${S} \
+	econf \
+		ac_cv_lib_expat_XML_ExpatVersion=yes \
+		ac_cv_lib_curl_curl_global_init=yes
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS README
+}