add multilib support, thanks to Karl Lindén (bug 464702)

Package-Manager: portage-2.1.11.60/cvs/Linux x86_64
Manifest-Sign-Key: 0x89DEB219565C32BC!

3 files changed, 77 insertions, 15 deletions

diff --git a/dev-cpp/gtest/ChangeLog b/dev-cpp/gtest/ChangeLog
index fffda6244f8f..3a9e9fd1dd88 100644
--- a/dev-cpp/gtest/ChangeLog
+++ b/dev-cpp/gtest/ChangeLog
@@ -1,5 +1,10 @@
 # ChangeLog for dev-cpp/gtest
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/ChangeLog,v 1.30 2013/03/29 01:55:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/ChangeLog,v 1.31 2013/04/06 07:45:16 tomka Exp $
+
+*gtest-1.6.0-r2 (06 Apr 2013)
+
+  06 Apr 2013; Thomas Kahle <tomka@gentoo.org> +gtest-1.6.0-r2.ebuild:
+  add multilib support, thanks to Karl Lindén (bug 464702)
 
   29 Mar 2013; Mike Frysinger <vapier@gentoo.org> gtest-1.6.0-r1.ebuild:
   Remove pointless die with epatch.
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 959d93594d0a..0891348820f0 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -4,23 +4,14 @@ Hash: SHA256
 AUX configure-fix-pthread-linking.patch 3142 SHA256 501f42dd4f4f4412fcb18fc4eb5f1100f5c5a6b19610f6548bccc84989c6f83e SHA512 4347570606853c75e43d3d1abe449cd562538e531136658e6742f8e2dddcc1767932b427a063f711b868467ca85ff947f24c4ed3e328319bd0a739bb66093016 WHIRLPOOL 5ab7be10a9bd675398884f2a4ad8c30fef17412ff3fbaae5d14cf290ebf723ccc005d2ea1dd7ad68c8bd8db57d06cc0fadd79d7f9f2ab46ea5ed0a87df8201fb
 DIST gtest-1.6.0.zip 1121697 SHA256 5ec97df8e75b4ee796604e74716d1b50582beba22c5502edd055a7e67a3965d8 SHA512 f4718dfbfa3339bb9449c3f14e5b44ae405ea7df64c10a0957a6300985b71c4642981d069a1382e27ae041a4e2873527a9e442aff978447e795a190f99fac115 WHIRLPOOL 745a49020d4353ed2fa38adfc80bbd777358c831719bbe3b7c90d243f84256615222ba5f04d48d98b9e1a803bb40766799b3aedd575024c19d853d9239a12f8a
 EBUILD gtest-1.6.0-r1.ebuild 1323 SHA256 a25e2db4552fa335ac8a044e750b2b6fa4920515307ee6f114fd42fd113a25db SHA512 27869b4a124ebcba0679944e537107cc334d5bad17482707700253d04b639c420168de66a0a5b4e66b1142e3edb06ce3a32f185cf418ca7167a55813af32d8a4 WHIRLPOOL e60cb80ac90595d606865002449beaeba674752249466c673bc9a805cafb8c05d476769826703c3ac533433582f6c874753981d193dc1bf90b685a29969577c9
+EBUILD gtest-1.6.0-r2.ebuild 1484 SHA256 c87b022ee9816a1db01d912665fd9e9d7d6a3a604c85bd12c0169211adfc58e6 SHA512 f54d7c3a52874c7e93d60285023ff937b06f1732284d498eb2b3ad340a2d1c01d31dd490d8af98f809f67d0eb013458d0867900c759974eac3ac1a4d53179bef WHIRLPOOL 44659378b0fa21ac79e634bec082f05adc801916229e0c9278295a1432f474ff99ef093fa374b218c48d7f1122d9c7a22edf803f1102295554988ef57be7205c
 EBUILD gtest-1.6.0.ebuild 1281 SHA256 9bccd7abfa3d8fafeeb786e975fe3183fa41e2b2428e8887b4b68413e7fc7aad SHA512 8246b7bb2dc68657bda9e7a0fa32f29a6f5b475f127a6450b92467ea3b641fff240282a28e9c2678d9900dc576cd8eca353aaea7a943aebe921e8d6ccd2025d7 WHIRLPOOL 63b2b736ccced1a0bb86b016229fcb58bb9287c54979412a0271dc81de2110f1cf1a9ba5aaeff4bc79dc70882d3379514b84cbf289a93ed9a2c1e2aa46b21632
-MISC ChangeLog 5552 SHA256 aef85b7a15f8359b84c993c2188087513f297ca354181843075b531845fe58d2 SHA512 863306bdf33bce180d8898a41fd65ebd9f158c75d31c30130c2d1bed5e0eaa7d7a81c8841054bf7a905e164f8bdd604067a43a543f1277fed53977d4b85e2c70 WHIRLPOOL f30292080480eaec1b95a8792051956649a2c02c2d7d56f3738044f87fe000003e8799d08c3b48537a59b37b07d06c4e530fc29fcd67198c4d4d35f3e85aee7a
+MISC ChangeLog 5714 SHA256 972a8198db636a52f06e269d1675364d63695b48eff898c99dad8883c4a037f3 SHA512 68a0f3b86aa243d0f649af322846101e8a20492672055f6d822c2e8d2976474a2e75da933538385ee685cbc67b24a18e9c36b4d9120077b685d19f5fa2b78578 WHIRLPOOL a1b0d6baef7937bdafbd75fc8601fd118820f28ff553ac2a4cb1f1816e4980bc5beb7803cbd2841b4b32100cb76769db8f966a8bd6f860978206f922564ce650
 MISC metadata.xml 374 SHA256 776842821130b79f552271fe642b3e455006874c6eae5d1b9323e46a1670310a SHA512 a1248ebd1cc76617b425db3d91d8e96894561acb2fcca70c8524f50fa2f933e024d0d4a4d61797a90b42c00a6cfdce8a68057e94a82ce63dfd156037359a60cf WHIRLPOOL 99afc26196452541537ad72d29362547d3154c5f3772d5fd6fb9484ba499ed4b3567873b8eac3c5f2fa7f812b0466f2f3e5c5f25b168e9a069eb4ad2845fa99a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRVPWrAAoJELEHsLL7fEFWuBkQAKlv/+A5m43e8e7CCwDCb1JD
-mMtIQlbmBhxTdobG8CpI0frHfWPx0eQfzgF7BxW/wLy8asmALLNW2x7nQ9URm+nA
-OWdahW6+q/jj2/1UuuvYNdqJ+qqw/lk6hOacfaG9gmtTnf2nzETNe1hCn+7TU5yw
-VEJ8omyG8Q98TEAHrxunxKSkyVVyUucTgu+YdbF+6J5T3cveyBP1t3GpgQ0ruyPs
-CF6I5gPORwf5A9nbi9mhmDcRWWsa/QKEdBLJQh76q4C+nzKVEQ0e6xuzGxVqAure
-5C03eXtAIFTy+eyz+tUUBReVZL7R+izHV+B1cB9HepDuvvrFO3rcxn/MTNa1ayO+
-WkvVCZ/SFDH9N2Bj3RYINg8PQ9WKYANg0e3zfllqPWfoBDKWU28jx4G/Tsi8gIco
-x9xXw9DgBxQeB5TQNXqq6kc7jVJye6h2g1HM62vMcZrRKJZdFEWVHdSCe2UYUXbr
-5q4thTEQid9RKJa7nzzCa+f/eYrwiKx2tBniHjA1gV2PC3tLk03Ts70nlGMcHyHm
-krvVXoHkFLQ1xMetXtVkneq5MozieCfyVlcBsMNCvetAqm0qMn6eQMtco9PqCTz6
-ST6cpuFzp5e/bVVxY8xT7tr6LdJkQIEJ9y0/gM4nI1+rBn2Nh69JQI+uoiWEy3Or
-cOSObqptpWmrhX0Tey8C
-=ASXG
+iF4EAREIAAYFAlFf0qwACgkQid6yGVZcMrySfAEAyR4dg1O67gNbCNhnZpqFLISA
+B0coCGhxMHp7VTi63/0A/03AFKTMlHU+yT7YbWqEK0/4Vokl4jFjkSa7swvM8Znd
+=CMtg
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/gtest/gtest-1.6.0-r2.ebuild b/dev-cpp/gtest/gtest-1.6.0-r2.ebuild
new file mode 100644
index 000000000000..bf91bbb582da
--- /dev/null
+++ b/dev-cpp/gtest/gtest-1.6.0-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.6.0-r2.ebuild,v 1.1 2013/04/06 07:45:16 tomka Exp $
+
+EAPI="5"
+PYTHON_DEPEND="2"
+
+inherit eutils python autotools-multilib
+
+DESCRIPTION="Google C++ Testing Framework"
+HOMEPAGE="http://code.google.com/p/googletest/"
+SRC_URI="http://googletest.googlecode.com/files/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+IUSE="examples static-libs"
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/configure-fix-pthread-linking.patch" #371647
+)
+
+AUTOTOOLS_AUTORECONF="1"
+
+pkg_setup() {
+	python_pkg_setup
+	python_set_active_version 2
+}
+
+src_prepare() {
+	sed -i -e "s|/tmp|${T}|g" test/gtest-filepath_test.cc || die
+	sed -i -r \
+		-e '/^install-(data|exec)-local:/s|^.*$|&\ndisabled-&|' \
+		Makefile.am || die
+	autotools-multilib_src_prepare
+
+	python_convert_shebangs -r 2 .
+
+	multilib_copy_sources
+}
+
+src_configure() {
+	multilib_parallel_foreach_abi gtest_src_configure
+}
+
+src_install() {
+	autotools-multilib_src_install
+	multilib_for_best_abi gtest-config_install
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins samples/*.{cc,h}
+	fi
+}
+
+gtest_src_configure() {
+	ECONF_SOURCE="${BUILD_DIR}"
+	autotools-utils_src_configure
+}
+
+gtest-config_install() {
+	dobin "${BUILD_DIR}/scripts/gtest-config"
+}