mgorny      14/06/11 16:31:58

  Modified:             ChangeLog
  Added:                gconf-3.2.6-r3.ebuild
  Log:
  Enable multilib support.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
EFB4464E!)

Revision  Changes    Path
1.296                gnome-base/gconf/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/ChangeLog?rev=1.296&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/ChangeLog?rev=1.296&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/ChangeLog?r1=1.295&r2=1.296

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- ChangeLog   17 May 2014 15:31:17 -0000      1.295
+++ ChangeLog   11 Jun 2014 16:31:58 -0000      1.296
@@ -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 <[email protected]> +gconf-3.2.6-r3.ebuild:
+  Enable multilib support.
 
   17 May 2014; Agostino Sarubbo <[email protected]> gconf-3.2.6-r2.ebuild:
   Stable for alpha, wrt bug #508862



1.1                  gnome-base/gconf/gconf-3.2.6-r3.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/gconf-3.2.6-r3.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/gconf-3.2.6-r3.ebuild?rev=1.1&content-type=text/plain

Index: gconf-3.2.6-r3.ebuild
===================================================================
# 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
}




Reply via email to