gnome-base/gconf: multlib-utize

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

3 files changed, 15 insertions, 117 deletions

diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 58119b6..7a688cf 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,8 +1,6 @@
 AUX gconf-2.24.0-no-gconfd.patch 787 SHA256 f8352648276d2a2dab162ddade55ec0371e7c4f8bc3834de246fda8c32c66d3c SHA512 c7f7437321d2afcbe75a8b8d819f04e5864cde3b2130f6dcff78c622b9bd336c66a30d666e0a4283d2fcf5c54afc741cc84f90401889127b03ef22b0752fb7b8 WHIRLPOOL 86c118fb0b571b5c47849fd4f7f09ade4ebf76324771fe9cccc64d95462cf3ab1a32de9a312412f843129025c41253d658a6546d7c3d9496451b9aacdf3b9451
 AUX gconf-2.28.0-entry-set-value-sigsegv.patch 533 SHA256 e58c0981491e794de05dd71562e0a9675433469e87c7149088ebea432c9619b0 SHA512 c0576004aa8c8b64750037183a5d3df5b4d8ba520c83f33a906a8549139e2167d08c1bcc56cbdfe202bb078a703bd561680af63588f7ee4eb42ad6077182a3fa WHIRLPOOL eddf3b88ddbec7e29f2a58e6ccf26859e0846ec9b01e821f28dc584a9ad297805f5313e29dca5e5d576cca704e1ddb458fd322a3380ed65ddd4bb7d6924d862c
-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-r2.ebuild 2390 SHA256 a4148e2c16c29f826b54cd5ce97e3278db357e2fba3cc61fceb93c8ad8470d20 SHA512 fc42858baa5abe2649e3114a54c067ba307b062e1353bedc655bca75e44bac63e4ff853a60ef94ebea1b81de357950b3b5c3d182dbdba8f584691b753ccc138a WHIRLPOOL eb6bdcc84790901b0175f29bd09922a650f7e0d753342d18a314a53df3c44d6f3b623f05b4b57146df87762edca8145eb505fc8ff4113b6b0b1fbfc00a9a2375
-EBUILD gconf-3.2.6-r2.ebuild 3123 SHA256 d0ffc115a8e9a06842a29cdc90489c5b367a87c1efbd8ab648ca099aa630f09d SHA512 2e10dfb6bfbdf58a67de9e059a8d18fc7d4ac48abc54e9636335bcfb83590a08ccf4ff650d4b3c38e8e9150f49a0ccb40fb1de156ddf02d9085967320cb881e1 WHIRLPOOL 0c1e3a4657c1f9f163cc0b8eefddb0329face98ef9b69c82c26fd8ae04f440ff2226f509c7afc4e2c64410a66e7487a910fd4f368f3ab64c7ab9b506834de755
+EBUILD gconf-3.2.6-r2.ebuild 3245 SHA256 5dca37502eb8531db950224eef0b2518558d5adee85edfc6612118a23632cb42 SHA512 0255299bbfbc7c030c038efe2711d51faadbae645344945ed3eaf90be565d9fdf0b53a450493b8619dfe73c42e5859d146beebbf7567fd1e9d6662a4b43838f3 WHIRLPOOL 87a38277cc866a80e5d759ceebc350dcad88b4fe6093fe75b2a1ab84a92e85d7732d3d08d9489754b1e08f55c0121e8772dab7827c42cb5299b9d27e3f55f2b9
 MISC ChangeLog 38588 SHA256 2eb6440b534a6cd8210e61715d562018ec027e99165d4aa4a79fefe5ceb2fb5a SHA512 358907b75a081f7384187c46d5cbd8cb83bc4c4efa45547e5ad3d1594432e1fb4be80779d4bfba060578d94fd1d4cbd6a41a1ba8fbce8328b5c47008f616248c WHIRLPOOL f7f6cd8d43e65cde6089c5c15b2648833880d376662b75d80813f7fa51727122100f923d3d0cbe02a3e2ea32b1df63bd3cbb0487d59266b5a0131e66e4589cda
 MISC metadata.xml 429 SHA256 ff1cdff3275ccf7ecf64d87d5929fa31dcb9c6d16647e39bc45348a665e49cb6 SHA512 b911347c41a8957ba77c82f59f9a2d90c1f39b89b85457c157e7e164bdd9d545f12be95dfe10ac0fe10e57c327ef90be81ed67cbdf16f588242ef443c2d3c6a3 WHIRLPOOL dd892feb28b9320dc5bc7cb4e92cae26926e7a3d3b0201bd64c9c73417a214e12e2e3ea067d5670cfec80c4c719841d90601ea0d99ab6db4ffa9be6a9c8916f5
diff --git a/gnome-base/gconf/gconf-2.32.4-r2.ebuild b/gnome-base/gconf/gconf-2.32.4-r2.ebuild
deleted file mode 100644
index 150b474..0000000
--- a/gnome-base/gconf/gconf-2.32.4-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME_ORG_MODULE="GConf"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2
-
-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 ~x86-fbsd"
-IUSE="debug gtk +introspection ldap policykit"
-
-RDEPEND="
-	>=dev-libs/glib-2.25.9:2
-	>=x11-libs/gtk+-2.14:2
-	>=dev-libs/dbus-glib-0.74:=
-	>=sys-apps/dbus-1:=
-	>=gnome-base/orbit-2.4:2
-	>=dev-libs/libxml2-2:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	ldap? ( net-nds/openldap:= )
-	policykit? ( sys-auth/polkit:= )
-"
-DEPEND="${RDEPEND}
-	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=2.0 "") \
-		$(use_enable introspection) \
-		$(use_with ldap openldap) \
-		$(use_enable policykit defaults-service) \
-		ORBIT_IDL=$(type -P orbit-idl-2)
-}
-
-src_install() {
-	gnome2_src_install
-
-	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
-}
diff --git a/gnome-base/gconf/gconf-3.2.6-r2.ebuild b/gnome-base/gconf/gconf-3.2.6-r2.ebuild
index d19cc9e..5eeb997 100644
--- a/gnome-base/gconf/gconf-3.2.6-r2.ebuild
+++ b/gnome-base/gconf/gconf-3.2.6-r2.ebuild
@@ -9,27 +9,27 @@ GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python2_{6,7} )
 PYTHON_REQ_USE="xml"
 
-inherit eutils gnome2 python-r1
+inherit eutils gnome2-multilib 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"
+KEYWORDS="~amd64"
 IUSE="debug gtk +introspection ldap orbit policykit"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=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:= )
+	>=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}]
+	gtk? ( >=x11-libs/gtk+-2.90:3[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	orbit? ( >=gnome-base/orbit-2.4:2[${MULTILIB_USEDEP}] )
+	policykit? ( sys-auth/polkit:=[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
 	dev-libs/libxslt
@@ -51,11 +51,11 @@ src_prepare() {
 	# 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
+	gnome2-multilib_src_prepare
 }
 
 src_configure() {
-	gnome2_src_configure \
+	gnome2-multilib_src_configure \
 		--disable-static \
 		--enable-gsettings-backend \
 		$(use_enable gtk) \
@@ -68,7 +68,7 @@ src_configure() {
 }
 
 src_install() {
-	gnome2_src_install
+	gnome2-multilib_src_install
 	python_replicate_script "${ED}"/usr/bin/gsettings-schema-convert || die
 
 	keepdir /etc/gconf/gconf.xml.mandatory