Add multilib support, thanks to Karol Herbst. Part of https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/65.

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

4 files changed, 125 insertions, 11 deletions

diff --git a/dev-libs/libindicator/ChangeLog b/dev-libs/libindicator/ChangeLog
index 60ce0189ed29..0addd5c9a14e 100644
--- a/dev-libs/libindicator/ChangeLog
+++ b/dev-libs/libindicator/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libindicator
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicator/ChangeLog,v 1.16 2014/03/15 14:03:58 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicator/ChangeLog,v 1.17 2015/05/07 18:32:21 mgorny Exp $
+
+*libindicator-12.10.1-r301 (07 May 2015)
+*libindicator-12.10.1-r201 (07 May 2015)
+
+  07 May 2015; Michał Górny <mgorny@gentoo.org>
+  +libindicator-12.10.1-r201.ebuild, +libindicator-12.10.1-r301.ebuild:
+  Add multilib support, thanks to Karol Herbst. Part of
+  https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/65.
 
 *libindicator-12.10.1-r200 (15 Mar 2014)
 *libindicator-12.10.1-r300 (15 Mar 2014)
diff --git a/dev-libs/libindicator/Manifest b/dev-libs/libindicator/Manifest
index e465bb67a68a..e32862635a14 100644
--- a/dev-libs/libindicator/Manifest
+++ b/dev-libs/libindicator/Manifest
@@ -6,17 +6,27 @@ DIST libindicator-12.10.1.tar.gz 427764 SHA256 b2d2e44c10313d5c9cd60db455d520f80
 EBUILD libindicator-12.10.0-r200.ebuild 1027 SHA256 4e222cda4a50f4617becf336af1f11c6d550c2513a673bf730c230a0f581c556 SHA512 588ee18aaf5b28e9a324d30c85f850dbcb73edd3a40e430ac8c471a70718ece42e56fdef3364c23d7dcf898643b335636334fecc7e06e69f2e21c00e923e1615 WHIRLPOOL 7a38986f9cc0dae7dff2cc2c2e9384c6cc6cc56ad49773df1e2506a7b756cb792d00c27b54a2a36552ec6fc0763984da7df1213ae1624bb7266b2fe2faf9d132
 EBUILD libindicator-12.10.0-r300.ebuild 956 SHA256 93dde5091361fed197ba1728e60d02df9fba648a5b4c8013ae339809cc58ece0 SHA512 bc0a7af666ac3b864c10e852a236d0fe1a41dcfb72a423bc7f5de16a9732aca10f31ff963679a19fd13ae7e91464b932ff958ecf0d5c0f473967510f962415bc WHIRLPOOL 6428380dc95d523fc0efe2a3e0ba44e0de9a25158174c054eb442fe8d802ada2ba59e70178ad6e2804776c02cac7faeb42c76beb4e01202c620e0c461911ee37
 EBUILD libindicator-12.10.1-r200.ebuild 1027 SHA256 6b81ee57020fd1bc261e1a172b18a2963a8f03c2f7068dee6fdd699b40f9abef SHA512 f8ac6ad373ae4a0e0a9279e0f1e5067217c516127c79cd2fe5edb84cd915042948eb7852cfa01ca1b43d146a79d6123de92426648ee40b9b6fc18ee5fbd4d713 WHIRLPOOL 8ad7aedf399f9d8ff715591c1e4cfd2a2a2595c45dfad3ce1e1bbe87f8321792abb2075e20e03fb80a2a86b82a1905db5c7ce643f99952ca3d22901b9f717423
+EBUILD libindicator-12.10.1-r201.ebuild 1221 SHA256 ea24c48e23410e1d23faf66ec0db291ddfcf8d11767cea011240e9e34cbe5b07 SHA512 72d1040384cd51ee1727be9c7cf8d00c96b885591c0ff7bc139d18107fcb5ef2f916e2646710456824cc9ded03f654c0e7f4e1f322c90e72ef45c356eea50665 WHIRLPOOL b04ee8d5193763f2880be5ecc61a03c33b95927ef67f2faa30b516b8a178d5986281b2fcff446fa120accddee56399809ce4d3d8d1f9e8b398bcaf5fe7e209ff
 EBUILD libindicator-12.10.1-r300.ebuild 956 SHA256 f2766f2988bfa42c743a795f44ab8de3ad195a351651b2e72377275bc308e0f9 SHA512 41f965fa8d3ad6e2d7bc1b21f3a4943f96801f4ad74a351dc68cf53c94bc0d84550c37c7eb66260db742295b094a9077521c35a08274099646d21c9104e60afb WHIRLPOOL 5d8e58d8e163b6b883e463d739267e36cc15e2a4085b9fda9dbdf6da4e22d7990412650befde10e7f295fdd1db7c664fcfaf1d948b17d2fa0b6f2d0dc33a3837
-MISC ChangeLog 2981 SHA256 442a730221f2facf3d372322a46abe8c30468e2a94057c402be1ffecd502637e SHA512 6a990049270b874f244cb6232f0fbf1022e54acb45b6e9661a7e95d48aad95e0095c8d4e57fcae27127a4738e2b6d9e486a1db6e2105e492cc255e81aa70ce47 WHIRLPOOL 7b6bad20bdcba4109f01521165955604e6edb5361b918a4da2c194b92ef3533509bb9cee7c3ed381cb108c8ac1c64509535d4d29463e59e7bf0fafcf915fa916
+EBUILD libindicator-12.10.1-r301.ebuild 1120 SHA256 cb6e4d7b2a606253ba2e0872ca4a73df46834643b5e149401dc2884f05c647ec SHA512 dc5d05430a95349faefbe9cb14f08b438cc5feb8970ac39557918144784622067df5e7843bf1b98f98a6e92c0ef17b600852bbc30e2718ed492ac0dd2d9985fc WHIRLPOOL b7cf5d51e9ab2276633f5698e42d571212294f2d45dc9a9fd9baffe457a166d136f2f87ec1c212bb83628fe2b3a73ea3291252339c95e91b625dfe504ce3bb22
+MISC ChangeLog 3305 SHA256 8a99445ffee9a0f34af9f9e2a4019d79cb8f1ea56d35eb00d99f0eb03163f878 SHA512 15568d0221dfd57dca1af6bd447df7b3949b1a074dde488d038db3545e2801ca5215bc3e2d181b441918916befc7e17893019576617ecf71cb1580633234acfc WHIRLPOOL d0bf2d3c767591f2f60e4af97881d3441252a158a4db6a3478d6e6e33b9d0500f095d3a08640c80762ef0b09d133debd21122be95f05d83c04361ecdf1faa2cd
 MISC metadata.xml 236 SHA256 841c7a751616fb3cc745c4e54baac7f0b57ab7214bd9b29fee2dcb9d563d68db SHA512 e5350552b5cf14c15a068ae18dfb9755ca547f27cc52ce507b78929cdaf51113a8cedeea0ea68eb7b518052105d572adb9f6d655922586234b3ed7204f48a49a WHIRLPOOL 88638c1accf1b9e8f50f638f67399baadeff5cc0646acfab1f76d894605f4102533391769f604ddd7cceab1bf3b01044265be9c1df252cc922c00e4bf0fc2d4a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTJFzhAAoJEEdUh39IaPFNiNQIAIgg0FVuF/FF5JgRa1WXWUZc
-NEMXlmtg1TAN9+MA7I1fOxeA+oMdrJJ2o3FcTgantJ39AsNvGGwNY+Y7XqCdtzGU
-A76OsaoGaAQuWRlJfflLp5GSW+8+M2GVNC4FV9Ud3hd8L9EOI6KIzhH2rtGq+BZg
-ts1tMPIc0DdkWUEqajHpbZqOgDG7E00T+wrLD4ty1ItKDloy+ft4TQa3VeaIVvZX
-oxAGV43bBBElbgKPoZOweLhOC2uU0aeg3imMC8s9umZgumed+ftMksIvNF6LZpyy
-6lp+WfnhxzXgp2KTjlPbL7XBTulCWjz+2+GHVI/9xheQCHjPaoLSFwel2BOViSU=
-=JCLa
+iQJ8BAEBCABmBQJVS6+3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO6Y8P/2i/3xCR/wQuLpRyh88N2gFG
+NQzMgt6RhbT3pO7N7DKr5mu+DVx8Jd9CCUWhS5uKCo7xuVTQvXtpHxDufxdbNFwb
+TCAABT2dv7cftcVDFvtdOgFZ/lELw4tHpK3p5e9NMM1t45sHJSU5W1QI7FzaXEPJ
+MnJU//1w3whb63TTZ9FwOT93Chstv2NRBqJZPqS7WGnjxz688OjJ3u6WiNr8LXxI
+A+2efTVNANMpoHSQ49qxb/FIPrrMmbMQsq8dDIuhEw8Pboyqq+JiNSsxZiOPnpK/
+mjEI6xQnOhVhZLjBt5Pv9+8YnKYt8/Al7981xgMcUcpLmEWQC+xZBoEOSt3tjor2
+evWzK4TgUIFlI4AppD0oBEV4EWixU4vHesqDLBDGfcNgnyXEO64qZUFujZtP9XcO
+Bg+Zr/UruizAZ8SyYxQFyEqp1pEEpwoedc+BpBhwimchJUVxepPCZI7bFnqYLhhf
+SJ5cYt7AldU2Zh2/GWZ4wUPUmU9+FiacjD+UaAIu6Z3xsvi1k1KK26vOIMo/DoMK
+vwFkd8OgrSq8MKZ1/zTwo1A9JoHH6xMBaS9smGve6SI2He5FNYi7bR+lwxZVuiFh
+ckAWEiDCrazBMvO53p4PPDEoU3M4jSTo1+V7qXQnO521aR6KGDMtpjs/AC5DhweM
+gh2SWUFuM86avDScXsbB
+=Dm3p
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
new file mode 100644
index 000000000000..cbbf8f95903b
--- /dev/null
+++ b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild,v 1.1 2015/05/07 18:32:21 mgorny Exp $
+
+EAPI=5
+inherit eutils flag-o-matic virtualx multilib-minimal
+
+DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
+HOMEPAGE="http://launchpad.net/libindicator"
+SRC_URI="http://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( dev-util/dbus-test-runner )"
+
+multilib_src_configure() {
+	append-flags -Wno-error
+
+	myconf=(
+		--disable-silent-rules
+		--disable-static
+		--with-gtk=2
+	)
+	local ECONF_SOURCE=${S}
+	econf "${myconf[@]}"
+}
+
+multilib_src_test() {
+	Xemake check #391179
+}
+
+multilib_src_install() {
+	emake -j1 DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	rm -vf \
+		"${ED}"/usr/lib*/libdummy-indicator-* \
+		"${ED}"/usr/share/${PN}/*indicator-debugging
+}
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
new file mode 100644
index 000000000000..e275bd258808
--- /dev/null
+++ b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild,v 1.1 2015/05/07 18:32:21 mgorny Exp $
+
+EAPI=5
+inherit eutils flag-o-matic virtualx multilib-minimal
+
+DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
+HOMEPAGE="http://launchpad.net/libindicator"
+SRC_URI="http://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( dev-util/dbus-test-runner )"
+
+multilib_src_configure() {
+	append-flags -Wno-error
+
+	myconf=(
+		--disable-silent-rules
+		--disable-static
+		--with-gtk=3
+	)
+	local ECONF_SOURCE=${S}
+	econf "${myconf[@]}"
+}
+
+multilib_src_test() {
+	Xemake check #391179
+}
+
+multilib_src_install() {
+	emake -j1 DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+}