Add multilib support (bug #480396 by David Heidelberger).

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 74 insertions, 15 deletions

diff --git a/dev-libs/libgpg-error/ChangeLog b/dev-libs/libgpg-error/ChangeLog
index 47c4c392ace8..c8e13785065a 100644
--- a/dev-libs/libgpg-error/ChangeLog
+++ b/dev-libs/libgpg-error/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libgpg-error
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgpg-error/ChangeLog,v 1.101 2014/01/18 05:05:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgpg-error/ChangeLog,v 1.102 2014/02/06 00:22:51 radhermit Exp $
+
+*libgpg-error-1.12-r1 (06 Feb 2014)
+
+  06 Feb 2014; Tim Harder <radhermit@gentoo.org> +libgpg-error-1.12-r1.ebuild:
+  Add multilib support (bug #480396 by David Heidelberger).
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> libgpg-error-1.12.ebuild:
   Add arm64 love.
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 236f54f1c7f4..22d4dff0b0d0 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -8,23 +8,18 @@ DIST libgpg-error-1.12.tar.bz2 489266 SHA256 cafc9ed6a87c53a35175d5a1220a96ca386
 EBUILD libgpg-error-1.10-r1.ebuild 1273 SHA256 8ce5bd18a304032d63a321aad92110afd1cf6ff999346a810add23eb1bd2f077 SHA512 bda6d0fed15d92750da0c662e3dabf4e49743282789d82fe84278417a224302d4a63d3368e1976d33ef42dccbe6a75d1b49e930cdd1a895dc2461130164a9827 WHIRLPOOL 4cd0d606a4fe500b05cfed4eeaba8136127e9f524a6bf0f37f0c9f25262c26fd2f3235ecbf9ce340824f02b244ba0ab827c3f8f84e2a30a80b388eb22137f7e2
 EBUILD libgpg-error-1.10.ebuild 1201 SHA256 d318f83a8e95550663327ca7b345bf7165b9bbd5a072456f9522a249f079a3b7 SHA512 217d0f91951204fb1bfb8a0d5b04e46cf44b2f271c5530348ba89a373f5cabfd5fec819c142c491014d098b834f289602dc45ba33fd6799b18f9383107bdda35 WHIRLPOOL 903eac9c10b9bc0566fdf090cc6fce1fbcdf27b9a51c66bff9f34ed841fe653e320d765bd8875002b02ebb807a6824e1dc2688ffad4a7742cae4c4bd0b02f770
 EBUILD libgpg-error-1.11.ebuild 1200 SHA256 64b05f95d08b037ca0d70db37672ef67aa6a60148f9ca3ac9a75199a3b88703d SHA512 9d2577d2d739a5bd22ae5d167fd2554fb9693baae3a95add98e8fa0af17161e35fb28b6bc07b62be2a9b63d1d7d2a903dfeb43758d8b57160dc69c1044947a08 WHIRLPOOL 5b134fac581e7119d848c5c3bff0a48b51ca1d71ad73df05bc5a65c7862b53aa1e35143fa22f5759015fb9888fbfd0af9fd4635959b7f7229962b14a69790dca
+EBUILD libgpg-error-1.12-r1.ebuild 1725 SHA256 2b6b97cb97f032e8b4baaa4f7c1e08ecad10a58cc48184fd30cb6c7cc91654da SHA512 03e6c1f10a870949f56397369c04efb729f3bc83115551025e597de383274df68a8c2471a31d12a572a792f37c35ddc86e444bd8def3f0cd0ca99b7f244506a2 WHIRLPOOL 525c396e7af08d20263dea7627dbff197e0950681de760efa1dbf513959440e61cd5f38979dd7118bbdb5532ff5136e1db32353791d13adc21511c474820c419
 EBUILD libgpg-error-1.12.ebuild 1162 SHA256 e79c470e7c51a3506a19838ba6b07e926a6a85157217d11ce4b799f8d24e15ae SHA512 cea74d197312cb867653066fb1a9cea5478f65c1a607dfb179e6707f3ba749b7d69485cbe095ec7f369bd0e9a642857be9a7150261ac3cde812e2120cd9b568d WHIRLPOOL 6aa7b09f8a696b13ada945e94864006c61748b03b4c9656dcfdac69878893680e9f944e48c0053ac1ee52a28b71deac62042f6c551b3c72c1a9c3acd93eb83bb
-MISC ChangeLog 13226 SHA256 dc75648958ac31ceb9ace28b9f7b7bfbcb6646ecbfcc54e3685f3994004ff596 SHA512 4ce7d30b110dd65715570c7d4eaff07ac401a54c8baa08c567c28fbf1bad8fcdd529fdb0eb5e92796981c952ed61c9c5d853255b2ac02cf6a9d94a03f0075668 WHIRLPOOL 47888129eef033393c6c5acf83209dadc36c785777a64e2ee542aeceba63b63a8d930b1ea98e0877a2181ad55e2da2be9a51cf19f351becaae39926fd17f8a22
+MISC ChangeLog 13406 SHA256 b3fad5617dbc604594849da3be602b3f7657ebff49f4da0ad8a8f7f68351b4bf SHA512 543ec9b2845b27a8ca65ace54bc09ba9b6d0562b8296dbaef26406550e630ad28582c805c52d9bb0dfb4404e0f38f50331d13ddfa464768b315c2df20e7a031e WHIRLPOOL c3fd17ecb74d4de77902efb9df4c09d9e5f3582714feda446552609ffa5b189f6775500633173d8888715e6a1526734d3e549d9ed8266ae947f62b8b34210a37
 MISC metadata.xml 235 SHA256 457ae31679e09fa587eb1ce494f8bed85d9057e2a1c2b72462b4c02186067e26 SHA512 49cfc0288e90fe1a8a71517d5964b727212b84603afc37faec0101ca947631e288aba3e1c84b7b33b4e24509d0e798fe9d2d6aba1a1209c16cadc8b7b18d9908 WHIRLPOOL de990675240b800437b9549239a7a2f4707bff47793a70a03828ff1af0b43d237f2284d426cf284f156fd15beab1ad59961d0033e2542d309878fe6f6864e423
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS2gupAAoJEPGu1DbS6WIAJS0QAJROey3T0z3NRQrdlB/UFoHk
-Q1usd5lBE/zWBYe7K+4wVS0lDH9pegxan6iMgplb4A+w5rleHugv9sW7zJc1ncX9
-excO5/f3g0kE6E2KyVYGZzo0sMSvAjbpfdK1pXddV/xZZ73uu1bbhMhF5WDxjBZ6
-8+5f3Dc2BBV6sA9IFcIooPLGtw+Ku28W56B761EjlZaoY3XDvQFoe6vSbEisr+wW
-Z/VFKS1pvx49tCvXipsCEERus1i3y/riy10fr5K5kacvwQzVtxDABijVrCZ2SqCV
-uOpG34tr5TgF8cBGVwX8eBvOnVhWr3AGZT7PQ4IHe+000hkYc5LKQqi+sBxEqLuq
-8X7/ybNJyxYQ3T8z6NjkMrdKsPFFjFyromgAL20Mm4RvVHAvIJIuhrcoPhVd8us+
-nMA1EoUhcqcuOZ1BrUdYP/dna+9dLGF4ocsSIDTh2I546gF+cswDskk/V2P7dwbu
-fOTJ81CPkJPeQvKQBuATmBO8/6rCcaL2ji5mrD2TIVyUELZJmlXdPxvSrCxzuJan
-vxywmnEU7IBqUnwxGiFkT8WAL5OYFzMaivs/S/vWmORKD4aMiwBwBC2g/yDVH8Sj
-cXnASBvD2RKdVJd1p5r+bT7qm/bmIr3oYEJywcXfsFLAU4tsKf1HNBjdiIYgSR4b
-25l1S5lykZJl4bIq6GOS
-=PjaV
+iQEcBAEBCAAGBQJS8tXeAAoJEEqz6FtPBkyjWoMIAJqnAlioRwQHohQHnHGfHAIx
+syeXTwQ7+qMBCSexC3yB11GMhdQ2mSo4TtYf80b976aQiRlBrdHOv+Ikz4c+/Pif
+B759+3w/E3/mHY+Dlgf/sO2LdjnagR2ylXBCvwpbhqhH3xLQ2PsiWHkmNcLx7dI6
+/UbqjprmCwPmy8LFFGu8ub+GJxBQH9K7DJqciMYFMDQxzWYrvEMI1bGcl5INj82n
+UyV8WkJxxAPVDI4Vb0k651SGlL3y2MLmvfna4gOqtJuPwRXhCAmGrSNAYQpUHWVs
+j5Ih2afrPuu/lxNcuBxS8S9GVvJqulEv/6SCq99Vvz3biR60Qyd6CrHjuZtptUE=
+=7+89
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libgpg-error/libgpg-error-1.12-r1.ebuild b/dev-libs/libgpg-error/libgpg-error-1.12-r1.ebuild
new file mode 100644
index 000000000000..98c57475be77
--- /dev/null
+++ b/dev-libs/libgpg-error/libgpg-error-1.12-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgpg-error/libgpg-error-1.12-r1.ebuild,v 1.1 2014/02/06 00:22:51 radhermit Exp $
+
+EAPI=5
+
+inherit eutils libtool multilib-minimal
+
+DESCRIPTION="Contains error handling functions used by GnuPG software"
+HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+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 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp nls static-libs"
+
+RDEPEND="nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r12
+	)"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch_user
+	elibtoolize
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable nls)
+		$(use_enable static-libs static)
+		$(use_enable common-lisp languages)
+	)
+
+	multilib_build_binaries || myeconfargs+=(
+		--disable-languages
+	)
+
+	ECONF_SOURCE=${S} \
+		econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	default
+	mv "${ED}"/usr/bin/{,"${CHOST}"-}gpg-error-config || die
+	if multilib_build_binaries; then
+		dosym "${CHOST}"-gpg-error-config /usr/bin/gpg-error-config
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# library has no dependencies, so it does not need the .la file
+	prune_libtool_files --all
+}