Add multilib build support.

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

6 files changed, 158 insertions, 22 deletions

diff --git a/dev-cpp/glog/ChangeLog b/dev-cpp/glog/ChangeLog
index cae3eac976dd..9c3309b63b12 100644
--- a/dev-cpp/glog/ChangeLog
+++ b/dev-cpp/glog/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-cpp/glog
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glog/ChangeLog,v 1.14 2013/10/19 01:59:01 vapier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glog/ChangeLog,v 1.15 2014/03/27 02:37:51 vapier Exp $
+
+*glog-0.3.3-r1 (27 Mar 2014)
+
+  27 Mar 2014; Mike Frysinger <vapier@gentoo.org> +glog-0.3.3-r1.ebuild:
+  Add multilib build support.
 
   19 Oct 2013; Mike Frysinger <vapier@gentoo.org> glog-0.3.3.ebuild:
   Add keywords for everyone.
diff --git a/dev-cpp/glog/Manifest b/dev-cpp/glog/Manifest
index 75b43538ff3b..be5393e4eb82 100644
--- a/dev-cpp/glog/Manifest
+++ b/dev-cpp/glog/Manifest
@@ -7,23 +7,24 @@ DIST glog-0.3.2.tar.gz 478666 SHA256 5e47f9437e97cb1621930dea3c557a2801ddac3b5db
 DIST glog-0.3.3.tar.gz 509676 SHA256 fbf90c2285ba0561db7a40f8a4eefb9aa963e7d399bd450363e959929fe849d0 SHA512 95418ff0857415a0fbc15caeb22a13f3b6736618adcc3c30e054626f1397bc58399c45f68784c70b1f5dc594ebc6ea66e386896beab5c20be72dd53b25f5a4ac WHIRLPOOL 7ba26a936e3ac18afbccf141b888a885f3f9847d4f19c0ebad416d16fcff936b9622e03aec155f77622759a40e8684673c29648c026426326239f4485113c6cf
 EBUILD glog-0.3.1.ebuild 808 SHA256 d9dcd2ab292654db61887bfa096fb9094df6c67a1a35013aef61b92313ed053f SHA512 0b3e5fa9dbce90d0b05ba90c3188a7306013c2d2dce3159a92276bd735a313a4a0236714db6524c13a2340fea15c62c9ffbb99362d9c5f17545bce6b3e68a3ba WHIRLPOOL 6621d2db45e3f50e347a5657913de0f76c4095cf92c22e964930bdf9511b6d5892162481614af5e526bc449fe603d2bd1b5cab9ac9f1effbb860bf6c805861c9
 EBUILD glog-0.3.2.ebuild 1381 SHA256 dfdb35444402e1d95932f29395996da7affa5cabbbe730f24a8b6a7fc601bf38 SHA512 fc0c0df0cd8a7c04799a1eebf8a4e700b98af35af057a42cef8b02c5ec73e28ba6e7096cf88f668ec5bff583a90dc7dd088bf70ca3631a362ddb5d3c5cabf46b WHIRLPOOL 8e98bc119fc89e13f3166b818bcdc1642a5ba64a51e97d3e37ab99cd25f403690cd51a1ab71aec758e64179d9bc54d7b7e629aea34b18e38e80981ab56a5fe69
+EBUILD glog-0.3.3-r1.ebuild 1914 SHA256 655cde9ca11bdd5e63ea45bcfb13f13a32eaf8af79251053a85af0be6f5472ec SHA512 c7c41090703dcd952f9a3584f65c44c008f835311916a7d77d3515e4040dc4f511c4b898a8b5ec25f1d5dc8b50bbda78f4aa286289023edeba50c6cac1356873 WHIRLPOOL 327b8d913b99f1653598f3004ed5acc86745b314bcb5189be822082e7c1b6ece78aa7ca507de3d0723f3add7a6da048ba5bfe027e1ee05a1a1aa307e8ec6e862
 EBUILD glog-0.3.3.ebuild 1445 SHA256 fd1b7c46ea365f28a89a111b51fa28518208eed3bded95d91a86a836dcb9df49 SHA512 92fc535769c9032ae1a8a1ebd2cb5811a283b1fba9f675120b8d3b4dfebf0a423143b2d735a98a12a4eb8da0858e230bf8ca915b2ae056ee6206f300a9500028 WHIRLPOOL 04207f1006234af0c8f41e407fcc85672d1e8a11ec96e475df3abd3b3d5a4a5b0573603aea69dbec84da24967a36ff1ad44ac51a36e981cca02e1ca7a17a3013
-MISC ChangeLog 1989 SHA256 0a3535e7dd1bb512e2db6d5005f3f2b63dfd81923556a18f6ae53228affd46cf SHA512 e74a034d28f586d38bc5f2abc01f3b1094481eb764f7bced747ab626ff32c24f93c4fd04eff214a0131ac6718fe9c8b5a03303a2946c9c2bfbde21f372f01ad7 WHIRLPOOL 07d309e7372b87381177a08891d0b073cdb408bd3d566efc18dbe99f7affcc097a97f8360ff77715f7d0e8ce1732e548d8b8e0626636784ca8697849dc894a56
+MISC ChangeLog 2123 SHA256 dc77ae22268e77137047b27b2cecd0d4c4bdb97d3f9b2b578c4fb4085641704d SHA512 d9fdf5e4d90eee5c6c7f7e6e843266d41367f0732de8f1279034008d9bef741ab38084eeeb143f0fd1b49ca6cbc4e29f38e2f884230a4c6489d892de63b7499d WHIRLPOOL 966819aa64f355375bc14fb9e90e4a620210d97c8f46ea93f88c7c23c7c40ee8d4737a0c7c4ddec935e282b8304143d5753c53d5899443098d4adb34d77186d2
 MISC metadata.xml 530 SHA256 603f2288ca0f1591435b72b5d17e430ca3180cb7c4e9418b36ee2eae3adaed1f SHA512 fed8600db6bd522dbe3a3ef58e22a7cc20ace57eb3b8e9ca7b6be0cf9ff5a881f38c2b643c93ff26452b10ed30cacb65283fe289e193280dcecca19995bdfd45 WHIRLPOOL da6478c7cdf0b5d72953a243fb32eb71ca709768c4a3cf96565e24301919e651ffcbf06d71fde33f6c681c8f9c22c023180b6d8cbe07fa6a2e622787c48cf453
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSYedsAAoJELEHsLL7fEFWthQQAMKATMQ3hmCB0EEbFxtr4Dze
-InsY1m8UahfiPwitg4bLM053b/fOthB+Sm6eVywu98nDaOESGUViVCElJ5NalqJu
-0abnSAzubCPgLA4akqJFYs7M0MZiI/NVWwOydouLoRTvQ3ztzK66l0nKN6nE2BPu
-GRzVaqQtr65bZ9XJEXpnBF8aOz8O6eQftHoVEF9wU1OS01itfUxP0gyfjswAaDuE
-44yCnxpbgZHt9Yp1fWCCoDvb/oTHKZVCNSjlpNHzkOsChIkWrQ6uqCOxApgLbGgC
-UdwUzEDjZ9Ygi6/Ph4/oG6nlpoeZu5NkrmlAn0hAqs87VDG86UJphfOThhZ8hbId
-3TvlgS95mWhg182ztLTWq2EZ7vsHWBmcEMG90AvAaMU6cvJMrXfqqLl03+H+MHJJ
-KPYIfFWDdi2MQSlim0HAnf4QByu1zrjM9kU8ZqMyE6BlxmemS50BuIoYftM5HvVy
-UBZaO+VaKUR1Q46OTo5Acw1YW1zhhMi9eA5U3BE2i2dtsaYLYjmOhxTqaN+fUaPy
-WTf9Y6GJGd4PATqnqyKoLeiwO1XVk2GewZsEfPZJCjfiq73VFsAOeijg9zenKPdv
-gemc/9pmaYdO6frZihL63bBz34hTwynG+KeFuh4r+jsUMUXp9JELugumhtxkaeBd
-tpgDVyu5/DOAOBWZpTPR
-=Hj2n
+iQIcBAEBCAAGBQJTM48GAAoJEPGu1DbS6WIAofEP/iENc27DPJwb3SvuHeHcCFeI
+Y/QUbsl6tSZwY6R2R0XTMAHChjZZSGlZ+C34GTPf/Zmz/fqWOos2jLRNaTCmj1BG
+AfHyGR90Z6dgm6fUN8p9jAqPAAP7wc61XiPaCZZbKSjpUh3271qrwJIAj3q0dwnt
+xZLYem970cxe9O9GklKScQ/UGB3PMFFKmZ/7TNpNbqVqdPmewg/1eKJaLmHe+3b0
+0XiogObBiY3rMyMdDzUpNFQ6qh+Da0UroqazyRt12n7h0+CdoIjUS2kLdbpeBLxU
+5M7sVrKGP+5FNTL1X9xCjeqrfk7x+9rMsaQ8bT8YalT1Wv5/xW9tSzbdub+hwehl
+3rsU88yhdbamgZmZ5S3E7+KAE7rT0D6X43ZNXGbVxFFjdZ/R6V0qsFkBK78eTVa/
+XqIcqP0O524TmFnuuX5jX1sVCCKue0wvwZQMJ/zjKEdKaaGX5rGZsD+QmHIN9vAB
+ChfJFLoQhXA+TPqv+EUw8v/Yifh8NwGw3x67Xvc2HrRD98i1j8dP376IKXdPTp1S
+hoXjT+xAP84R/E1tLMl3DFSFbmD6QfUnMDf6J6iM/hj2soF9tYRjqs0aEPSe7VT5
+9hURXPSdu1hZZNTUjYOZ2/zzwoXnO3GlS78aRRzOyXIirUe5EI2Djr702Trh+yGM
+iY6oKWyrRw2uLgdWg9YN
+=G8BI
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/glog/glog-0.3.3-r1.ebuild b/dev-cpp/glog/glog-0.3.3-r1.ebuild
new file mode 100644
index 000000000000..fd207c596c15
--- /dev/null
+++ b/dev-cpp/glog/glog-0.3.3-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glog/glog-0.3.3-r1.ebuild,v 1.1 2014/03/27 02:37:51 vapier Exp $
+
+EAPI="4"
+inherit eutils multilib-minimal
+
+DESCRIPTION="Google's C++ logging library"
+HOMEPAGE="http://code.google.com/p/google-glog/"
+SRC_URI="http://google-glog.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="gflags static-libs unwind test"
+
+RDEPEND="gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
+	unwind? ( sys-libs/libunwind )"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gmock[${MULTILIB_USEDEP}]
+		dev-cpp/gtest[${MULTILIB_USEDEP}]
+	)"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.3.2-avoid-inline-asm.patch
+	# Fix the --dodcdir flag:
+	# https://code.google.com/p/google-glog/issues/detail?id=193
+	sed -i \
+		-e '/^docdir =/s:=.*:= @docdir@:' \
+		Makefile.in || die
+}
+
+multilib_src_configure() {
+	use test || export ac_cv_prog_GTEST_CONFIG=no
+	ECONF_SOURCE=${S} \
+	ac_cv_lib_gflags_main=$(usex gflags) \
+	ac_cv_lib_unwind_backtrace=$(usex unwind) \
+	econf \
+		--docdir="\$(datarootdir)/doc/${PF}" \
+		--htmldir='$(docdir)/html' \
+		$(use_enable static-libs static)
+}
+
+_emake() {
+	# The tests always get built ... disable them when unused.
+	emake $(usex test '' noinst_PROGRAMS=) "$@"
+}
+
+multilib_src_compile() {
+	_emake
+}
+
+multilib_src_install() {
+	_emake install DESTDIR="${D}"
+}
+
+multilib_src_install_all() {
+	# Punt docs we don't care about (NEWS is 0 bytes).
+	rm "${ED}"/usr/share/doc/${PF}/{COPYING,NEWS,README.windows} || die
+
+	# --htmldir doesn't work (yet):
+	# https://code.google.com/p/google-glog/issues/detail?id=144
+	dohtml "${ED}"/usr/share/doc/${PF}/*
+	rm "${ED}"/usr/share/doc/${PF}/*.{html,css}
+
+	use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/dev-cpp/gmock/ChangeLog b/dev-cpp/gmock/ChangeLog
index 55c06fc3020f..34c28d6cfde2 100644
--- a/dev-cpp/gmock/ChangeLog
+++ b/dev-cpp/gmock/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-cpp/gmock
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/ChangeLog,v 1.19 2014/02/14 15:46:56 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/ChangeLog,v 1.20 2014/03/27 02:35:20 vapier Exp $
+
+*gmock-1.7.0-r1 (27 Mar 2014)
+
+  27 Mar 2014; Mike Frysinger <vapier@gentoo.org> +gmock-1.7.0-r1.ebuild:
+  Add multilib build support.
 
   14 Feb 2014; Akinori Hattori <hattya@gentoo.org> gmock-1.6.0.ebuild:
   ia64 stable wrt bug #493400
diff --git a/dev-cpp/gmock/Manifest b/dev-cpp/gmock/Manifest
index ea6b50888991..140745a6c686 100644
--- a/dev-cpp/gmock/Manifest
+++ b/dev-cpp/gmock/Manifest
@@ -10,13 +10,24 @@ DIST gmock-1.7.0.zip 2167746 SHA256 26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492
 EBUILD gmock-1.4.0.ebuild 900 SHA256 ac6459b47610fabc4a1976a27b813a5d60bc2ed94b053e0f0f95eaa9317f2919 SHA512 dc4bd30c218906d7a43798dc4393d6b9201328185d6dc5e5fa591ec44419b71814d759e9061b2b7125d1efb41e670e9680c6ccd50be1835e7ae496020a5b6d33 WHIRLPOOL ebec651a934b28ecc628f6abfb3ebea8442b2eb572b5cd4cfafd86f1286454afff51de5260f0d5afe75253a52788b08253af08d7274283df52a7e9bef0b0b89c
 EBUILD gmock-1.5.0.ebuild 801 SHA256 da8e3eb98f7fc07b8909373b612700c8a861c5c92bb48ee27c5addf787848657 SHA512 d1813c15ecc635418c859f69ba49c4ff401daf56bef042d9d8e8abc1f072421af04579f0aea4e4ad6c650b60aaa2f1ccea65bd295a298f0cce5c3cfd5f9ddd52 WHIRLPOOL 47ed5fafcb25a3414bb06c8eb27688c571b42e7b52f84089414e82ac8944b736a66698023b9dd81d3201316af07fe5056c6741e925f185c85efaaa0bccf4dcaf
 EBUILD gmock-1.6.0.ebuild 995 SHA256 6258ae401f441e5d97a7e7fafa3af8e118ce8d673e9f91c30aae25ed95151836 SHA512 22188348514a7d0ab35f8befd290476ba188625b5d0e8adccd4859f6c912a719df47edcc0179e710efb8c8e8fc6a167af993991eec65dae8d06bbfa4827a2094 WHIRLPOOL 01e07ca21977d66958d932b33b36bc00aacd523d985db338f14388de00a0181b98f9f49715474ba67bf6de1fe238e2e8089f5a4397f57dd4b4def7e8edc3ba79
+EBUILD gmock-1.7.0-r1.ebuild 1109 SHA256 e18cbcf2d84a847611a089dfa8dd1192443261cc4b6fe43f08dab55f3d68b2b1 SHA512 4c34f3f94e4f57c1c2eaf0a4ad2ad3bff670b9c9d62f36edeed791a7385be37039549ec245bdbdd4289a3c04462e602bd511592ee4475b7753ea7f52348f32de WHIRLPOOL 4da87ca35558737ffb5ad4ae2312e52ebab4aa8c7e70106c63010e1a6c0cf834df937b0924aee8298dbbe4e825a84de82720173bf2dc441051acad98aa8b6814
 EBUILD gmock-1.7.0.ebuild 1003 SHA256 1544f2c85385de37a6a5494f67c38652eba49e67f494ef563143413f237b5fd8 SHA512 d7f4d52ec8280e7e2a4eefc33cdaacd1dd6bd18fdc8d7f4c9ba4ae3b9c49060ac303e486a59e0ab0adfaf5cb4e54f386a1df2f0465a85c7fefc461c419e16ba5 WHIRLPOOL f0b7b913e5ef102c7af733200db686d8bf0cbf4c07121369a1a72a5d9c8825f69b9ada3079bf76fa4754f76adebc96635fa9bb9e7074d89bcb4c6a85fef8675b
-MISC ChangeLog 2621 SHA256 390b3cc5af1242be2bdfb17a47df4e8e196cb7997dff74fb10bf65916478001d SHA512 4dd4588673e9a4bfc5d58be71a7b7e1a39d23def888c247c19b976b5836d0a459d55ec78ff93283f937fc883bb353cac3087fe2f94c2bcea638223268da23563 WHIRLPOOL 76e5e374b3bcd15ef6e46cb27d8f9b9c223588f26ba7ebebff6f6af4d22be09d58e387b7634a2576a1725a4a0c58c2f8fdb4598a5a63009f7c0cc0894abcc135
+MISC ChangeLog 2757 SHA256 4dbceb17f800ff608f692b0bcea3001578ad0e28a09410fc29984c55a2ce8b32 SHA512 d38e2601b4dc8a6fe331fceda71c53f1dd633ee047c57171df9f88adbef92da8860f2dccfa611d0269a6a695c6466c594bb27eda46bfa93fb11709ab0ba04e6d WHIRLPOOL 97383164bdf4306ec206baa0655973191a37a98c8067cec272cb47bba02073599d19a7a497bbfa1c4fad0c9e89827e65bf70da0d3d38c75e73cc21c951d62853
 MISC metadata.xml 283 SHA256 c34e015327f31293e860e8b2366e59e1d361c67f47d1c2cb010e16f43521a0f2 SHA512 e85ed05e67750a75476066754448e724ab3e65c91af152befff80c7f66423254311243fa213ba282bcc6456499964d4c969103cad829d8386ab3ef50138b5b81 WHIRLPOOL 3c504418a30332c69ad4282d204ff0ffeef35bc0aff4071d0c7f51704e7a1e091ce7e72826de354f8d1ded20920d61fa60bee4fafd3db8bd43acb9cdce9717bf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlL+OnMACgkQL46suuyRem1kjQCeLVTSmqLYme1J/cmTQ1AlFX6F
-iM4An3e2i+w68LZukJ8ptB1kyGu4iUAY
-=sPAN
+iQIcBAEBCAAGBQJTM45vAAoJEPGu1DbS6WIAO3sP/AzeKd61wiAyJB4V0XGqz7z9
+vevN79smtf3xVMHyivQDD1ncR9rYXnVBZlR0rvyxRbkyByQeykpTBrkVSX1sgdes
+hG0uWUPqi/jcfsrm2rhLTnUFY1pih7WTtTcWzEfTUe5xHBg91xfD59dF9N3izBa8
+v7GX0FCBOougBAp4dKxEsE3E9ifS36T+U/UdDDcLSWVvRu0mFq+TFRkTLRTAvv5+
+Yelz6uEPb9vnvrHoOx1eviWU8MvHEAU2+My8G+IxfeUNYb/9H3LtNu/Mq5DZRB26
+4Ohl66kflZWbVyWo5KqvyUG7K+KympAlHPot7MFj2RDXPPAdz1hByE5HJQ504Y7f
+Legwp9czv5Sqt3gkdO3Joqumj0PIdqG/yz8huBIriMZcIzTuZGgQAkENpihYAsd5
+jbp0nTRwAIN76CIEq2gn78vTqHeOg0aDp+8WqGH38+KpHRm5h3myxqHm4Wy/rqYD
+tKYcOtZ5UOrXJMUBJ2G6/00YXYLKt5jPPxNLGotRcn4Zplvhzd0VHw2edFCRmQdv
+W2sVJ3ajXYprnIjbCAXOBYwLsQ00TaY1RU+TPZYRO5MDAbAnn6THIx4EAW3KqN3k
+B1qon38XMnnUhaXGU2TJF7xuJdpSg5SLN8TA+VxW11w713e+xrr1srWBLPeYK74u
+yLNRG+jpYFYI9BIOAsOI
+=iTmD
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/gmock/gmock-1.7.0-r1.ebuild b/dev-cpp/gmock/gmock-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..f968d5f82b69
--- /dev/null
+++ b/dev-cpp/gmock/gmock-1.7.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.7.0-r1.ebuild,v 1.1 2014/03/27 02:35:20 vapier Exp $
+
+EAPI="4"
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="Google's C++ mocking framework"
+HOMEPAGE="http://code.google.com/p/googlemock/"
+SRC_URI="http://googlemock.googlecode.com/files/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND="=dev-cpp/gtest-${PV}*[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+src_unpack() {
+	default
+	# make sure we always use the system one
+	rm -r "${S}"/gtest/{Makefile,configure}* || die
+}
+
+src_prepare() {
+	sed -i -r \
+		-e '/^install-(data|exec)-local:/s|^.*$|&\ndisabled-&|' \
+		Makefile.in
+	elibtoolize
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	default
+	dobin scripts/gmock-config
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}" -name '*.la' -delete
+}