Enable multilib support.

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

3 files changed, 151 insertions, 16 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 4784b0c4ce24..2207534a9435 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.295 2014/05/17 15:31:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.296 2014/06/11 16:31:58 mgorny Exp $
+
+*gconf-3.2.6-r3 (11 Jun 2014)
+
+  11 Jun 2014; Michał Górny <mgorny@gentoo.org> +gconf-3.2.6-r3.ebuild:
+  Enable multilib support.
 
   17 May 2014; Agostino Sarubbo <ago@gentoo.org> gconf-3.2.6-r2.ebuild:
   Stable for alpha, wrt bug #508862
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index bac092eee864..99b601eee9dc 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -11,22 +11,25 @@ DIST GConf-3.2.6.tar.xz 1559904 SHA256 1912b91803ab09a5eed34d364bf09fe3a2a9c9675
 EBUILD gconf-2.32.4-r1.ebuild 2488 SHA256 29c75fbb6c8025623e14ddf84da1b0de338440d4484dc8c8098e28007b7e1198 SHA512 697746bfd1fbbef06c62b2088241d13d906939c0fb01bbd45fca6af16e8308e554ef699973e24e3ad28db019e50b97d4775e2e906dc4c6ecd31ce91cb4d01828 WHIRLPOOL f0e4837bc71a873424b194511a2155f6ebf64e9d7d178b88ddf6ad35a09687e3fd397f5885348cd57292df991774fba892c0120018fb76a34a1ef07012b8b68b
 EBUILD gconf-3.2.6-r1.ebuild 3222 SHA256 6634017c12c0a729f7b58dac8207b76c1b40fd53871d9ef97edf79a6e6e99b1d SHA512 721234c48d0f055fcb863dc1a717c564937f2d06cef7010eabd36d3431835d29a3ace8c70a70ac51e21e564ef25ecdcc860320e39d99646fd2a3c5c279cb312f WHIRLPOOL 58f3287de3373bde5d48c4ba20c5285ff15ba85266a5488c4bf9eecbaa7cf1a701985ef8bcac78aadac6a9163ad4c590fb807b1f6265aec4ceae5d3d74e88c01
 EBUILD gconf-3.2.6-r2.ebuild 3000 SHA256 c0ce230418e2ae178e7f90e9fa05bc4f0f8c95313cd4eaa78be03a335dd11673 SHA512 cc1202379e0363e9601570da060032a1ee220dfa7d0625ab080e964be3aa11c1b0b466ed4427c1f2fa5c81206e88fc5b1a7428eab7e49691e6538c80799c42af WHIRLPOOL a7789c89b855822e401a43c4c116802d38e17980a3b1b9cd9e4c6eb13a4a644a9125d2e5f8654b8f55ca970135e034905b198dc99ad02c8831240b739e43470a
-MISC ChangeLog 40073 SHA256 dfca0de43c01c24d41532d847ae04ff7398ea9ce6ab9dbda165c21ad775c3f7d SHA512 348a15b0ece8845c1ba3b837fed16514da36d5e28bf9f549bf991584f067f5a3ce26a1d3f5039fa021506ca38663ae83459d3b7904bee5e635d84917118f9981 WHIRLPOOL d102e54027fc70158253fb813dc4d576539006deab64aa80f935ec48b51f2b2c00e79499c9d0949277440011d86b0de5d8c1fe1c3148749cdd5c74135113ecbb
+EBUILD gconf-3.2.6-r3.ebuild 3482 SHA256 7cf103c01aeaa9c25ac2787fa5687e34bf7ceca928d69b56bb59f99bbb262785 SHA512 404ba783995c84851e29eec91a93d2f81fa17ca42879a7349ae8f551ff0d1601a741009f5de8e021a928152eae468736b93570f98c96a4e14fd13689b8d488a1 WHIRLPOOL 3487c593064986922bf530aea0ee6e4ba75b4d518d2b6c0add9bcfa80c8227326de4d9b83ae9308a98955db0a5be83cd187cafd0b827e52ed9ed6c9bdc1e13a5
+MISC ChangeLog 40209 SHA256 87df524511e98be1ed85544739ff06e60ecb7e2ee7377a2a237043703f4a6b90 SHA512 70cc078466e3723bf9efeafecb49525887fbadc5998e3747ee5e9012e2fe6e786a29615109ea0e9731640adb0af89cba91fa851aa6bada85aa1aa140e4f7e1f4 WHIRLPOOL 19f6ae69fe8db82a10761827e1a02fd0be05423234422d8d99bbfb042008c8cebc68fb6f1c324995bd30fcf220133afebbdd666e612413fd463b1d4e3268f8c3
 MISC metadata.xml 429 SHA256 ff1cdff3275ccf7ecf64d87d5929fa31dcb9c6d16647e39bc45348a665e49cb6 SHA512 b911347c41a8957ba77c82f59f9a2d90c1f39b89b85457c157e7e164bdd9d545f12be95dfe10ac0fe10e57c327ef90be81ed67cbdf16f588242ef443c2d3c6a3 WHIRLPOOL dd892feb28b9320dc5bc7cb4e92cae26926e7a3d3b0201bd64c9c73417a214e12e2e3ea067d5670cfec80c4c719841d90601ea0d99ab6db4ffa9be6a9c8916f5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTd4DGAAoJELp701BxlEWf4goP/RAGZ217Y0FlsL24s503e9VY
-GWu8KouJAxQxdICS4wzUQNrhLI0ug5EnJCsBeyj9CQpVFOQtxFSOLMpo03my03G+
-Q9ElwAXod827FcSnmIkqCB1x9cJoMrfg0SrKCRlHudA8v/lXxmqcUeNMjntS+85Z
-M4FNJUMAwUeNPdzV3msGgPU+sRtJYlWhc8ca90NzoCsNcoFq4A7JlRSunW5g+sB3
-Pr+DJ2ETyMhmzR0Q48zCT5gVWN0w5teemHrq5ZU08EqQqcpp8UQF+2VZZ2fYUAhI
-x5Os/k7Wyzt8oqsYkMYQr+zWNhCU390CVOpCy2Fpe0ZYpu9d4r69h0DGhMC9uoD9
-K4kbC0ihDTAT3yfUcZqyDPiggBq3leZluQfLzcawgR/jiHYjuiB8ikgWy8Wm0UgF
-2NmGpg7PDI7UCt5DrbXwHnf5ggXlHIMPJs9p5KI1+8duMIdTR2KeIHmvg0ITs3yz
-YUtmQFowXharLD90qWSuJT9tBYBExszSQL37x99meRFP6kfHAQju3o4CjuUa+Ij3
-V0yqHxFBCNq2b2QceHrTqUZtc39PqjjBmWkkctGjhOxS0/uE3gQg7cvNhNG1o8NU
-dnvqAiaIsT/yoN/OcaTymyFNaPt+CbXe8KwEOPdxK29dgp3NqX1tfEO4RIUrIlH8
-EJB9Lvrqn/p9CqXZ7Xjb
-=DPsC
+iQJ8BAEBCABmBQJTmISAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOGS4P/2fTUipXdueBPZQx8x2C8B5W
+zXkhYiIIxXhFmTcMTzBnRoPcwCC2dqMPWf5aYTPK9bazf5OzHzyW3LaSyZ27Khlh
+DVGNtfTcyS04LMhv6ox9hjpZApn0k5d5Mk0F/xWXjSPIOf3z8JFThf2yJ9W7r7zR
+yCgOI6IatOX7+nvorGJpgj1W0sS/Fic9rzECPEAGz/SeECk/Lg+FsP2v9PjcJJUS
+OEsfl3ctKIPjC/qhZgd3bPr4Qri+kqNmEMFYvCAwKbFLSNORg+3zjEF3UKy+X6dV
+bGeYID5qKpZ5Aa8Wb258CeiNvuRRQvhEAlh9mLmZ5kEvHXI5WZbs6cqHb0Lq6B+O
+PIN9f3y28/wLNG5we09uFjJfki1VnH3ZGLS8zHq8TucwV+buVmPSdJH6MYFzQd2s
+vJZuIrfwojt1VvcVgNu2kyZESelxkJ33AbgXWZlTwZpRUrYo37LJK7h5M8on4MbM
+8iVnhhL3Jpondzlu+6VGW/hyIB+wjnqWw8jHC96AqpkJDmHSWM9JJQZiPvn1dIgv
+BGP1sS0o8o74de5dJxb185yVSb1Dm96fZwMT94bn+Uz9Ur/faH61TZu2cm/1VnGs
+0pA72y+kgc+Jzs+Fkqo9UXl/3RBYfF3JXUwO62qTPyzHwpMfGhAPhn0wbW7x9xjY
+eIEbZPvfsagVKbMoW8XL
+=7c8z
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gconf/gconf-3.2.6-r3.ebuild b/gnome-base/gconf/gconf-3.2.6-r3.ebuild
new file mode 100644
index 000000000000..fb564fe4f0f0
--- /dev/null
+++ b/gnome-base/gconf/gconf-3.2.6-r3.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.6-r3.ebuild,v 1.1 2014/06/11 16:31:58 mgorny Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME_ORG_MODULE="GConf"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils gnome2 multilib-minimal python-r1
+
+DESCRIPTION="GNOME configuration system and daemon"
+HOMEPAGE="http://projects.gnome.org/gconf/"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="debug +introspection ldap policykit"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.31:2[${MULTILIB_USEDEP}]
+	>=dev-libs/dbus-glib-0.74:=[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1:=[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	policykit? ( sys-auth/polkit:= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+RDEPEND="${RDEPEND}
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r1
+		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+	)"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_setup() {
+	kill_gconf
+}
+
+src_prepare() {
+	# Do not start gconfd when installing schemas, fix bug #238276, upstream #631983
+	epatch "${FILESDIR}/${PN}-2.24.0-no-gconfd.patch"
+
+	# Do not crash in gconf_entry_set_value() when entry pointer is NULL, upstream #631985
+	epatch "${FILESDIR}/${PN}-2.28.0-entry-set-value-sigsegv.patch"
+
+	# From 'master'
+	# mconvert: enable recursive scheme lookup and fix a crasher
+	epatch "${FILESDIR}/${P}-mconvert-crasher.patch"
+
+	# dbus: Don't spew to console when unable to connect to dbus daemon
+	epatch "${FILESDIR}/${P}-spew-console-error.patch"
+
+	# gsettings-data-convert: Warn (and fix) invalid schema paths
+	epatch "${FILESDIR}/${P}-gsettings-data-convert-paths.patch"
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-static \
+		--enable-gsettings-backend \
+		--with-gtk=3.0 \
+		--disable-orbit \
+		$(multilib_native_use_enable introspection) \
+		$(use_with ldap openldap) \
+		$(multilib_native_use_enable policykit defaults-service)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/gconf/html doc/gconf/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	python_replicate_script "${ED}"/usr/bin/gsettings-schema-convert
+
+	keepdir /etc/gconf/gconf.xml.mandatory
+	keepdir /etc/gconf/gconf.xml.defaults
+	# Make sure this directory exists, bug #268070, upstream #572027
+	keepdir /etc/gconf/gconf.xml.system
+
+	echo "CONFIG_PROTECT_MASK=\"/etc/gconf\"" > 50gconf
+	echo 'GSETTINGS_BACKEND="gconf"' >> 50gconf
+	doenvd 50gconf
+	dodir /root/.gconfd
+}
+
+pkg_preinst() {
+	kill_gconf
+}
+
+pkg_postinst() {
+	kill_gconf
+
+	# change the permissions to avoid some gconf bugs
+	einfo "changing permissions for gconf dirs"
+	find  "${EPREFIX}"/etc/gconf/ -type d -exec chmod ugo+rx "{}" \;
+
+	einfo "changing permissions for gconf files"
+	find  "${EPREFIX}"/etc/gconf/ -type f -exec chmod ugo+r "{}" \;
+}
+
+kill_gconf() {
+	# This function will kill all running gconfd-2 that could be causing troubles
+	if [ -x "${EPREFIX}"/usr/bin/gconftool-2 ]
+	then
+		"${EPREFIX}"/usr/bin/gconftool-2 --shutdown
+	fi
+
+	return 0
+}