pacho 14/04/05 07:48:52 Modified: ChangeLog Added: gconf-3.2.6-r2.ebuild Removed: gconf-3.2.6.ebuild gconf-2.32.4.ebuild Log: gtk is not really needed (#505444 by Rafal Muzylo), drop orbit as it's dead for ages, nothing needs it in the tree and we really want people to not use that and, instead, use dbus for GConf's IPC. Also apply patches from upstream master branch. Drop old. (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Revision Changes Path 1.288 gnome-base/gconf/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/ChangeLog?rev=1.288&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/ChangeLog?rev=1.288&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/ChangeLog?r1=1.287&r2=1.288 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v retrieving revision 1.287 retrieving revision 1.288 diff -u -r1.287 -r1.288 --- ChangeLog 22 Feb 2014 21:37:23 -0000 1.287 +++ ChangeLog 5 Apr 2014 07:48:52 -0000 1.288 @@ -1,6 +1,18 @@ # 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.287 2014/02/22 21:37:23 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.288 2014/04/05 07:48:52 pacho Exp $ + +*gconf-3.2.6-r2 (05 Apr 2014) + + 05 Apr 2014; Pacho Ramos <[email protected]> + +files/gconf-3.2.6-gsettings-data-convert-paths.patch, + +files/gconf-3.2.6-mconvert-crasher.patch, + +files/gconf-3.2.6-spew-console-error.patch, +gconf-3.2.6-r2.ebuild, + -gconf-2.32.4.ebuild, -gconf-3.2.6.ebuild: + gtk is not really needed (#505444 by Rafal Muzylo), drop orbit as it's dead + for ages, nothing needs it in the tree and we really want people to not use + that and, instead, use dbus for GConf's IPC. Also apply patches from upstream + master branch. Drop old. 22 Feb 2014; Pacho Ramos <[email protected]> gconf-3.2.6-r1.ebuild: Fix wrong commit, bug 502160 1.1 gnome-base/gconf/gconf-3.2.6-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/gconf-3.2.6-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/gconf-3.2.6-r2.ebuild?rev=1.1&content-type=text/plain Index: gconf-3.2.6-r2.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-r2.ebuild,v 1.1 2014/04/05 07:48:52 pacho 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 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 >=dev-libs/dbus-glib-0.74:= >=sys-apps/dbus-1:= >=dev-libs/libxml2-2:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) ldap? ( net-nds/openldap:= ) policykit? ( sys-auth/polkit:= ) " DEPEND="${RDEPEND} dev-libs/libxslt dev-util/gtk-doc-am >=dev-util/intltool-0.35 virtual/pkgconfig " 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 } src_configure() { gnome2_src_configure \ --disable-static \ --enable-gsettings-backend \ --with-gtk=3.0 \ --disable-orbit \ $(use_enable introspection) \ $(use_with ldap openldap) \ $(use_enable policykit defaults-service) } 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 "{}" \; } 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 }
