Enable multilib support.

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

3 files changed, 90 insertions, 10 deletions

diff --git a/net-libs/glib-networking/ChangeLog b/net-libs/glib-networking/ChangeLog
index 4d2dc6f65b26..87832b0595bd 100644
--- a/net-libs/glib-networking/ChangeLog
+++ b/net-libs/glib-networking/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/glib-networking
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/ChangeLog,v 1.82 2014/04/27 22:18:05 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/ChangeLog,v 1.83 2014/06/08 09:11:45 mgorny Exp $
+
+*glib-networking-2.40.1-r1 (08 Jun 2014)
+
+  08 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  +glib-networking-2.40.1-r1.ebuild:
+  Enable multilib support.
 
   27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org>
   glib-networking-2.40.1.ebuild:
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 1db90b067cd0..a9abee7326a0 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -5,17 +5,26 @@ AUX glib-networking-2.40.1-unittests.patch 1204 SHA256 7891e3ee3403efb3d22d459a4
 DIST glib-networking-2.38.2.tar.xz 362524 SHA256 e8e2fe919d3236169c9bfaec807966ec81b844fc28b11bddc9f8256cfa949fc7 SHA512 299649fbb7df0821695b812e7d4f97ccfc8d63231fb3b9f6c8c1b0ea69d03bb1de80b1e6c7ca295837b210bca57620c9cbe2150fe1a36d9238604ad5d2412e33 WHIRLPOOL fb42e5e41245cae54ae32467896fb18d07e06e3ad2cc0bbfc00ec71c9ca8991dc277bceac43175bf5355284db1be7f5d6212abad59f29d2339af9bb1558e9897
 DIST glib-networking-2.40.1.tar.xz 368444 SHA256 9fb3e54d049a480afdb814ff7452e7ab67e5d5f607ade230d7713f19922b5a28 SHA512 5d6485b486e1e51fc4f5ac27b3d7455ecf34989a9204cc372926cb202d532711fa57a76aac9f77ca9ba70acade7453d3831111cc86e24669dea2f8fc3e87c822 WHIRLPOOL 2a60ed6f971595496864e3f8f01970a88c8bb558125371a2dee4ff8eb51435cf7146c4edfe07de6850d5156c1c9bd34e5be74c69154157ed92c74dcda893cd84
 EBUILD glib-networking-2.38.2.ebuild 1400 SHA256 3a60ca4730d58e481458ffe0b2984b1724c332cfd6ace505342e9ff539189293 SHA512 0354851780dd5c2859392999ebbf1c793cb1ed92a49d074517ab6ee7075738e2e153e7048e6618ab56b268093ee849bc2f7d5332b7bb1eada2bdd987dc520b16 WHIRLPOOL e44c026f92058ee6565deb479b5b47bde584abd5e936414901bd86434f508e015d096d5cefa3599ae34672016c8902ffd13d5fd6d55922abb1677aba1718299c
+EBUILD glib-networking-2.40.1-r1.ebuild 1912 SHA256 a61756a66d0173655c4056ea119dac76e9255fdb93a4d7fc9f1f4d03481a2550 SHA512 c8d3b2f9d9b64df3c7185a5c9edd18f6f12a46e55e04b763fc9a3e67c1f81ac09eb7320bba18869b6d8941f5fe21735d527abeb7ba57518e7bc8926d2b999afc WHIRLPOOL 38b1221fc0788bf680e958bc1121dea67861fdef4cd9a8e92a950a6a8267a05dbd4e8ffd5cc79e95cafb4d67c2d98a11bd6bc77b4baf859a4052f4432c8fb40b
 EBUILD glib-networking-2.40.1.ebuild 1522 SHA256 eda883e3e231a737c2668e1cd6fddf6a9f0ae0c581a2e79cbed6cc061cdd1222 SHA512 7107ca9bf7c65f6a55d080f647cd7528ad2f1ef2c9503d9aacb8e2510395fc2094e7ed856e6d2b7acb9cb816d25653e93fc64419580344300d622754460b2828 WHIRLPOOL 054a29d9cffad622529197b222b669bfe2a9d9ba32118d9deb0db859b31e677d612ec512245a010e5da3fbd8af0a63849727312069c9a13faa2a85c79dd20a98
-MISC ChangeLog 12371 SHA256 5217e27adc5979bb80ee3cd2ec8ead05da9da283b0556f0a395c058ec27c3f50 SHA512 f9d2045ba07477587b65716195ac4546eec46effbece7fcab68d7f41f54b844b46752d16691cc2a03696cb553bac4551a2922fb05e7951fef5ee773e75c4def6 WHIRLPOOL edb4c75a3f7d5d34a0e0a6032101bbb60697fb82acd515d846365b8084b8672d5b409d28b096043c22e6dd4a658118e0f54c9e2aef9a7954941055be3c226f78
+MISC ChangeLog 12531 SHA256 87c6565bb927ad9349e2325ae06a8215a67a31cfb3b2bab0c7f0a0b3990ed490 SHA512 79e891cedd8fb36de891b4e17833a34946577ac0f85c6da9cd13aaa0e3dce031582ce3882cb8ecae0e930b45b61636684b29b33cb80e5396bda2a89d5f144c89 WHIRLPOOL 9eae468638275418dcb9a1bb1a5cfa1f4f23210f4367b6c8d9717dde37ef9c2038292f5326a8919c86dc3ad33c99cc21197dd83e9e5b12723fd3cb3d5f4ade77
 MISC metadata.xml 395 SHA256 a55b4f7f8a8d4bffa2ec51ee271f2f9360e8bafe955871a253f32c16911a395e SHA512 302a9f2dff08e1925f57d3384875f2397f70998736d8b70f0d46f7f3abe37f6aaad192ae593395333e8f5118043a47dbdd1675dcdb4a6f84500d7d58b1e9af31 WHIRLPOOL 89498cd69c69b219da5cb20c337d2be0187e9db702c8a83b0f7ffcc6a0d1ded8a753a05dc28cd304f5098aa821be8fd8aa774b38818d370c3a56cbec01d8d6a2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTXa6NAAoJEJ0WA1zPCt1hafQH/iwEA183YUJQHRcxzm4gKMQO
-wUqKBKi3ZYO2mfwMIlT2wTYCoQpP3OMG+QqxNYn1ouInDWpn2AAwzsAyf4Ye1ZCB
-P98rzMQM6+Gk5oM3krsldvfZyM4JuJrTXK5wgwq2RIdAp1SvDr00JBqmWtwZ9O4o
-att0jNEUuD8RoD8BaRM+9XiYGrLKsdI0cMZDHyb2jnb/SEYH/I8PCHmxK176tLnr
-3bd7/2nQjfznOzfxMNB/Y5q0wqHNr3aBxhdIEtuNl+HPk1OVuDZPe78GbZ2hkfmA
-irSq2O9Qf3ILa9IxfA16PgkfjuHlWti0x9Frf1tH5fcYcjKnsLdrw+os9NXzKr4=
-=oWqj
+iQJ8BAEBCABmBQJTlCjTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOMSYQAITiFnV9M86RwoOetU5MokTp
+H3Ux5NdjTePjqJgF9m2dS/0zpHsRH7CwovudMC7Rul8ZvXtDhHgooe2j9evXgUOZ
+Rmtuyytj9VeLfMg9kbvJJy+hfI8108YXP/cDkoUjVzViTAmvBV5Mv48VGySdB1CL
+KzMd/quYUK4T3y0gSPD0uA1QTNrtHnH+ILf44TQVM0LuZafFr0jsK17emjk581lY
+r+AQyNvoCjaLkVBcRm8DiIYnhNkUPkE8kahonwXHtoWipfUfys//wNRlgTY4kvOs
+Hhwpa20J/6AXF935iR+CRlQTEXxZCOjOMoBQl5yU6r2UrAJvYoLBp8uN+AmfLk/B
+eTAPbwCPmPrFSdZWtNsi+6m+gBlg4OXNi4yI7vqjijqGr6NOcgC53wobp9VF7hcp
+f2BDvhe1dpguucGRSNvEbri+OKJopoV0o0fcS3aptFVbzCj9tPYhnCa3Ym88akve
+LJjBDqYXBzsQTqQmdquwdPnhKG9AiS0AjbnvR3ws4NDkNYU2DB5Z4XlJUMBL4jHu
+/OAfWoqYtNugLXJyisa3+3h6PBP4c9m4mNii/+nzy3IeHdBRzHX7qUj3TXBDJvvH
++xdHoAMiJiXrMn+ycKzatGf9kvsrMcmK0nuCeZ2L/tPuDao+Crook8/Fkb1eWm/t
+f6iOU1WEsuyxp3h6OrYY
+=9kJ8
 -----END PGP SIGNATURE-----
diff --git a/net-libs/glib-networking/glib-networking-2.40.1-r1.ebuild b/net-libs/glib-networking/glib-networking-2.40.1-r1.ebuild
new file mode 100644
index 000000000000..bef7148b75bc
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.40.1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.40.1-r1.ebuild,v 1.1 2014/06/08 09:11:45 mgorny Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 multilib-minimal virtualx
+
+DESCRIPTION="Network-related giomodules for glib"
+HOMEPAGE="http://git.gnome.org/browse/glib-networking/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE="+gnome +libproxy smartcard +ssl test"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.39.1:2[${MULTILIB_USEDEP}]
+	gnome? ( gnome-base/gsettings-desktop-schemas )
+	libproxy? ( >=net-libs/libproxy-0.4.6-r3:=[${MULTILIB_USEDEP}] )
+	smartcard? (
+		>=app-crypt/p11-kit-0.8[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12.8:=[pkcs11,${MULTILIB_USEDEP}] )
+	ssl? (
+		app-misc/ca-certificates
+		>=net-libs/gnutls-2.12.8:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( sys-apps/dbus[X] )
+"
+# eautoreconf needs >=sys-devel/autoconf-2.65:2.5
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-unittests.patch
+	eautoreconf
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-static \
+		--with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
+		$(use_with gnome gnome-proxy) \
+		$(use_with libproxy) \
+		$(use_with smartcard pkcs11) \
+		$(use_with ssl gnutls)
+}
+
+multilib_src_test() {
+	# non-native tests fail if glib-networking is already installed.
+	# have no idea what's wrong. would appreciate some help.
+	multilib_is_native_abi || return 0
+
+	Xemake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}