Make gsettings-schema-convert support multiple python, needed for correct build of ibus-1.5.

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

3 files changed, 128 insertions, 6 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 5cd31215bbd1..c7eadba725ed 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.278 2013/04/03 18:43:29 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.279 2013/04/07 11:46:49 eva Exp $
+
+*gconf-3.2.6-r1 (07 Apr 2013)
+
+  07 Apr 2013; Gilles Dartiguelongue <eva@gentoo.org> +gconf-3.2.6-r1.ebuild:
+  Make gsettings-schema-convert support multiple python, needed for correct
+  build of ibus-1.5.
 
   03 Apr 2013; Fabian Groffen <grobian@gentoo.org> gconf-3.2.6.ebuild:
   No EPREFIX in CONFIG_PROTECT*
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 817d4d7fd6f7..1cba1e230c01 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -6,13 +6,14 @@ AUX gconf-2.28.0-entry-set-value-sigsegv.patch 533 SHA256 e58c0981491e794de05dd7
 DIST GConf-2.32.4.tar.xz 1326600 SHA256 f36f4a01a5ac898b5ec49a04a43b051d3809f07c3d0841188fd6a5c512389025 SHA512 fabcd35ae9dd50969dc60219172e613fdb9f81ecaf182003a7e9d81745ffa9931fc279383dae9d6eb25817f594ab38e1ec2e910e14df402a1cb515eae258358f WHIRLPOOL 836491977e5af62a02fa8e70c92f2c2a07c350aabd44b75b0e9ab203c36d0fd53ed7605e26c81a01e498c8bb7d5e3089427ede8d7583964b65aecc46ddac7faf
 DIST GConf-3.2.6.tar.xz 1559904 SHA256 1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c SHA512 35f5f659f9d03f7531a7102adacbda0eb310d8a55a831c768c91a82e07dae21247726e00e0e411f63b1de9ade0f042ded572a3ea4a4b2ad3135231f344540b58 WHIRLPOOL ef38b5fb25b3cf915052ce00f926a0a9bf8ecb5771c2db0fd6f5f11531a8edb1c098a036eaaa20490e3de87a0a5eb411542f86d8c6a2be8ac45dcae0b29d3414
 EBUILD gconf-2.32.4.ebuild 2410 SHA256 58d516de6b1a099754db979aa2404f4e8f42c850cc0e4b90a68cf1570220f05c SHA512 68266a5c973854d4d17fcc2c841891039efea845b6df161e1acb07a43a07a99470b7cebf1e5123855d269f91d8c131b93739fab8370f2dec1ea1c6706c4877d9 WHIRLPOOL d4464d649ca3b8392080ef4511aa0e3f88461055eb88657bc45e11a4751b154e07785cbcfa66aea6bb64ac3186e8441c6b24cc79320b8e30abaf39c8e82bfa4e
+EBUILD gconf-3.2.6-r1.ebuild 3185 SHA256 7f8cad6c956b2a993dddf47af9cd41a6f0780dd954e90542793c0d72c0c038b5 SHA512 d9dd9347de5b08721958d2a884602d6ceb2ce230e87beef3f4185b116ae061904ed6ba4d5e8b3beeb106b032d7633ac360f84859473e123131c29ea6768ed4bb WHIRLPOOL de2546489d7a092dcb3810e5de736b014674bc5d0cfb56e99ff5aef0d5614b811d4646b91aa722ef2b5fdc6ae81042efea9731aa9fddfbd3275e4dab5278ed53
 EBUILD gconf-3.2.6.ebuild 3028 SHA256 6881daa12893607240ee15ed73130856df378647411d8c31a4ebb9eb6fd1539b SHA512 b9c6a3be32f6c754a87e483aeef0ab4356415577caf5d85de056b3165dec73866177756c3acf94d5f482d99e40a22c300fe281a9256d19c474aa04540073c376 WHIRLPOOL ff393f2ea6c0bc97d11e9e34cc967a7d8416c8b4867e2558901671a102993f3027b28f9321bdcb81c9237a05e023e4e3417b9f9d1ba8568bf17a317022fd5c8e
-MISC ChangeLog 37497 SHA256 94923483c92345215e396c8e3759c7b0a17f95efebe54eb17a0fc13c9825ff77 SHA512 f65594b3f00cbbf299562b480a173079c3a9ed7f5864f67c4b25d0a348e8c8f2611aa63a8dc67c6bcee9b9c8adfbd22840cecbe41a68026629bd77ce4c3bb5d6 WHIRLPOOL a0f9e5836506361521dd64499796ee0497d92b6c17f19b15af1e080b2e2f29d3985531984d9a80d729018ec5e1c8c120928c06cbdf7256061a43d3c97674c0eb
+MISC ChangeLog 37700 SHA256 e21bc3252a29bdeacad7fa9b9dc9e4d672ad5a2d6db66b279810bbbb04ee5b89 SHA512 240330ca2f23efa1a07e1501546b7d81e33443cd5db78f3806a21998160e9632475de559e349d828fa5eac490523b14cb4579d51c93f5e8716b24d2cd3633337 WHIRLPOOL 0745cb01f810edae7efc8d04dab5e02fb63bfce79239d4fd9133a46d0dfc565fc96270f4a045b9fd87dfc0bff69a0d57016f03c8c3b4c62786b3e029be189eee
 MISC metadata.xml 429 SHA256 ff1cdff3275ccf7ecf64d87d5929fa31dcb9c6d16647e39bc45348a665e49cb6 SHA512 b911347c41a8957ba77c82f59f9a2d90c1f39b89b85457c157e7e164bdd9d545f12be95dfe10ac0fe10e57c327ef90be81ed67cbdf16f588242ef443c2d3c6a3 WHIRLPOOL dd892feb28b9320dc5bc7cb4e92cae26926e7a3d3b0201bd64c9c73417a214e12e2e3ea067d5670cfec80c4c719841d90601ea0d99ab6db4ffa9be6a9c8916f5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (Darwin)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFceFIACgkQX3X2B8XHTolZMQCePVbiWvm/sOT1KJihag+CzFS8
-6RgAoI0zsWw+s64ihXvvIb11nfoxi37f
-=rk/v
+iEYEAREIAAYFAlFhXKoACgkQ1fmVwcYIWAYhugCgjx3iPMf0j/H2SYEG6MlATlde
+No8AnjDzqvGJqzrOcQ8eGWh4K2sDib3h
+=BbZd
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gconf/gconf-3.2.6-r1.ebuild b/gnome-base/gconf/gconf-3.2.6-r1.ebuild
new file mode 100644
index 000000000000..b565524bc9db
--- /dev/null
+++ b/gnome-base/gconf/gconf-3.2.6-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2013 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-r1.ebuild,v 1.1 2013/04/07 11:46:49 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME_ORG_MODULE="GConf"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils gnome2 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 gtk +introspection ldap orbit policykit"
+
+RDEPEND="
+	>=dev-libs/glib-2.31:2
+	>=dev-libs/dbus-glib-0.74:=
+	>=sys-apps/dbus-1:=
+	>=dev-libs/libxml2-2:2
+	gtk? ( >=x11-libs/gtk+-2.90:3 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	ldap? ( net-nds/openldap:= )
+	orbit? ( >=gnome-base/orbit-2.4:2 )
+	policykit? ( sys-auth/polkit:= )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-libs/libxslt
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+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"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-gsettings-backend \
+		$(use_enable gtk) \
+		$(usex gtk --with-gtk=3.0 "") \
+		$(use_enable introspection) \
+		$(use_with ldap openldap) \
+		$(use_enable orbit) \
+		$(use_enable policykit defaults-service) \
+		ORBIT_IDL=$(type -P orbit-idl-2)
+}
+
+src_install() {
+	gnome2_src_install
+	python_replicate_script "${ED}"/usr/bin/gsettings-schema-convert || die
+
+	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 "{}" \;
+
+	if ! use orbit; then
+		ewarn "You are using dbus for GConf's IPC. If you are upgrading from"
+		ewarn "<=gconf-3.2.3, or were previously using gconf with USE=orbit,"
+		ewarn "you will need to now restart your desktop session (for example,"
+		ewarn "by logging out and then back in)."
+		ewarn "Otherwise, gconf-based applications may crash with 'Method ..."
+		ewarn "on interface \"org.gnome.GConf.Server\" doesn't exist' errors."
+	fi
+}
+
+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
+}