From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QAUxH-0001vt-93 for garchives@archives.gentoo.org; Thu, 14 Apr 2011 22:24:03 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35D231C0E7; Thu, 14 Apr 2011 22:23:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E8BCC1C00F for ; Thu, 14 Apr 2011 22:23:55 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5C4321B4165 for ; Thu, 14 Apr 2011 22:23:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id AF87980065 for ; Thu, 14 Apr 2011 22:23:54 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <35f072fe3e3a7821c33a60e050cf9ca8871903fd.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gconf/, gnome-base/gconf/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch gnome-base/gconf/files/gconf-2.28.0-entry-set-value-sigsegv.patch gnome-base/gconf/gconf-2.32.2.ebuild X-VCS-Directories: gnome-base/gconf/ gnome-base/gconf/files/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 35f072fe3e3a7821c33a60e050cf9ca8871903fd Date: Thu, 14 Apr 2011 22:23:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 1691bc41e93b4e79285c8c3c89ed40df commit: 35f072fe3e3a7821c33a60e050cf9ca8871903fd Author: Gilles Dartiguelongue gentoo org> AuthorDate: Thu Apr 14 22:19:33 2011 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Thu Apr 14 22:19:33 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D35f072fe gnome-base/gconf: moved to gentoo-x86 --- .../gconf/files/gconf-2.24.0-no-gconfd.patch | 19 ---- .../gconf-2.28.0-entry-set-value-sigsegv.patch | 18 ---- gnome-base/gconf/gconf-2.32.2.ebuild | 101 --------------= ------ 3 files changed, 0 insertions(+), 138 deletions(-) diff --git a/gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch b/gnome-= base/gconf/files/gconf-2.24.0-no-gconfd.patch deleted file mode 100644 index 8ca6a0d..0000000 --- a/gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --exclude-from=3D/home/dang/.scripts/diffrc -up -ruN GConf-2.23.2.o= ld/gconf/gconftool.c GConf-2.23.2/gconf/gconftool.c ---- GConf-2.23.2.old/gconf/gconftool.c 2008-06-28 05:27:33.000000000 -04= 00 -+++ GConf-2.23.2/gconf/gconftool.c 2008-09-23 10:20:00.000000000 -0400 -@@ -856,6 +856,7 @@ main (int argc, char** argv) - { - g_print (_("GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not ins= talling schemas\n")); - makefile_install_mode =3D FALSE; -+ return 0; - } -=20 - if (makefile_uninstall_mode && -@@ -863,6 +864,7 @@ main (int argc, char** argv) - { - g_print (_("GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not u= ninstalling schemas\n")); - makefile_uninstall_mode =3D FALSE; -+ return 0; - } -=20 - if (makefile_install_mode || makefile_uninstall_mode) diff --git a/gnome-base/gconf/files/gconf-2.28.0-entry-set-value-sigsegv.= patch b/gnome-base/gconf/files/gconf-2.28.0-entry-set-value-sigsegv.patch deleted file mode 100644 index 680b1a1..0000000 --- a/gnome-base/gconf/files/gconf-2.28.0-entry-set-value-sigsegv.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Romain Perier -Date: Wed, 4 Nov 2009 11:58:25 +0100 -Subject: Do not segfault when entry is NULL - ---- - gconf/gconf-value.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - ---- a/gconf/gconf-value.c -+++ b/gconf/gconf-value.c -@@ -1609,6 +1609,7 @@ void - gconf_entry_set_value (GConfEntry *entry, - const GConfValue *val) - { -+ g_return_if_fail (entry !=3D NULL); - gconf_entry_set_value_nocopy (entry, - val ? gconf_value_copy (val) : NULL); - } diff --git a/gnome-base/gconf/gconf-2.32.2.ebuild b/gnome-base/gconf/gcon= f-2.32.2.ebuild deleted file mode 100644 index e45751a..0000000 --- a/gnome-base/gconf/gconf-2.32.2.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.32.0-r1.ebui= ld,v 1.1 2010/12/16 22:44:54 eva Exp $ - -EAPI=3D"3" -GCONF_DEBUG=3D"yes" - -inherit eutils gnome2 - -MY_PN=3DGConf -MY_P=3D${MY_PN}-${PV} -PVP=3D(${PV//[-\._]/ }) - -DESCRIPTION=3D"Gnome Configuration System and Daemon" -HOMEPAGE=3D"http://www.gnome.org/" -SRC_URI=3D"mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.t= ar.bz2" - -LICENSE=3D"LGPL-2" -SLOT=3D"2" -KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fb= sd" -IUSE=3D"debug doc +introspection ldap policykit" - -RDEPEND=3D">=3Ddev-libs/glib-2.25.9:2 - >=3Dx11-libs/gtk+-2.90:3 - >=3Ddev-libs/dbus-glib-0.74 - >=3Dsys-apps/dbus-1 - >=3Dgnome-base/orbit-2.4 - >=3Ddev-libs/libxml2-2 - introspection? ( >=3Ddev-libs/gobject-introspection-0.9.5 ) - ldap? ( net-nds/openldap ) - policykit? ( sys-auth/polkit )" -DEPEND=3D"${RDEPEND} - >=3Ddev-util/intltool-0.35 - >=3Ddev-util/pkgconfig-0.9 - doc? ( >=3Ddev-util/gtk-doc-1 )" - -S=3D"${WORKDIR}/${MY_P}" - -pkg_setup() { - DOCS=3D"AUTHORS ChangeLog NEWS README TODO" - G2CONF=3D"${G2CONF} - --with-gtk=3D3.0 - --enable-gtk - --disable-static - --enable-gsettings-backend - $(use_enable introspection) - $(use_with ldap openldap) - $(use_enable policykit defaults-service)" - kill_gconf - - # Need host's IDL compiler for cross or native build, bug #262747 - export EXTRA_EMAKE=3D"${EXTRA_EMAKE} ORBIT_IDL=3D/usr/bin/orbit-idl-2" -} - -src_prepare() { - gnome2_src_prepare - - # Do not start gconfd when installing schemas, fix bug #238276, upstrea= m #631983 - epatch "${FILESDIR}/${PN}-2.24.0-no-gconfd.patch" - - # Do not crash in gconf_entry_set_value() when entry pointer is NULL, u= pstream #631985 - epatch "${FILESDIR}/${PN}-2.28.0-entry-set-value-sigsegv.patch" -} - -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=3D"/etc/gconf"' > 50gconf - doenvd 50gconf || die "doenv failed" - dodir /root/.gconfd || die -} - -pkg_preinst() { - kill_gconf -} - -pkg_postinst() { - kill_gconf - - # change the permissions to avoid some gconf bugs - einfo "changing permissions for gconf dirs" - find /etc/gconf/ -type d -exec chmod ugo+rx "{}" \; - - einfo "changing permissions for gconf files" - find /etc/gconf/ -type f -exec chmod ugo+r "{}" \; -} - -kill_gconf() { - # This function will kill all running gconfd-2 that could be causing tr= oubles - if [ -x /usr/bin/gconftool-2 ] - then - /usr/bin/gconftool-2 --shutdown - fi - - return 0 -}