diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2010-12-16 22:44:54 +0000 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2010-12-16 22:44:54 +0000 |
commit | 3718a249948a845fd8890f7e05f9594c5475abb0 (patch) | |
tree | 0994b41fdfe9a6586431d9e82751f12d8d3bc977 /gnome-base/gconf | |
parent | Version bump, add USE static-libs, migrate to autotools-utils.eclass (diff) | |
download | historical-3718a249948a845fd8890f7e05f9594c5475abb0.tar.gz historical-3718a249948a845fd8890f7e05f9594c5475abb0.tar.bz2 historical-3718a249948a845fd8890f7e05f9594c5475abb0.zip |
Version bump. Add env variable to make sure GSettings use gconf in the absence of dconf so user settings are not lost on each reboot.
Package-Manager: portage-2.2.0_alpha8/cvs/Linux x86_64
Diffstat (limited to 'gnome-base/gconf')
-rw-r--r-- | gnome-base/gconf/ChangeLog | 8 | ||||
-rw-r--r-- | gnome-base/gconf/Manifest | 9 | ||||
-rw-r--r-- | gnome-base/gconf/gconf-2.32.0-r1.ebuild | 101 |
3 files changed, 113 insertions, 5 deletions
diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog index d2159fef8db3..3507ba5be9be 100644 --- a/gnome-base/gconf/ChangeLog +++ b/gnome-base/gconf/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnome-base/gconf # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.236 2010/10/22 18:06:13 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.237 2010/12/16 22:44:54 eva Exp $ + +*gconf-2.32.0-r1 (16 Dec 2010) + + 16 Dec 2010; Gilles Dartiguelongue <eva@gentoo.org> +gconf-2.32.0-r1.ebuild: + Version bump. Add env variable to make sure GSettings use gconf in the + absence of dconf so user settings are not lost on each reboot. 22 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org> gconf-2.32.0.ebuild: Pin glib/gtk+ dependencies to slot 2. diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest index 4ba5a1dd46d4..382e844a79ed 100644 --- a/gnome-base/gconf/Manifest +++ b/gnome-base/gconf/Manifest @@ -8,13 +8,14 @@ DIST GConf-2.28.1.tar.bz2 1476141 RMD160 9ee3b6e68553997a128ca2b49992ddfbe157609 DIST GConf-2.32.0.tar.bz2 1541688 RMD160 9ef6adca69e5ac8e2386f28f5af8e8c5c9fbb52e SHA1 2711c7b53761d2c789112bb1f989f1c1a6de5265 SHA256 54dd1dd7f49928a9cc42574bef6ef0481753770fc19986dc2004bbb7fac977a0 EBUILD gconf-2.26.2-r1.ebuild 2599 RMD160 b8c407651d1e8997931bbaf78a8e42a245328c96 SHA1 49515bb55e2c3242795a133ac36cd08d82383ee4 SHA256 00de89e14cc3f013d89b73faa9e628097cf9c5e159822d66b05de72c47a5e9fe EBUILD gconf-2.28.1.ebuild 2720 RMD160 0310462704540d7a17f929aab0c239e27c289f6a SHA1 da4691ecb6f0999f308135b6ea5e6102c414b037 SHA256 4fcafbf1b82317502618374121ac41e54950cffaf4b94edaad5f32459aca9cd5 +EBUILD gconf-2.32.0-r1.ebuild 2636 RMD160 7d823e346dccc91fc37acb550a4ddb725d698c43 SHA1 07461e7a83d0b6d6971ebf89b8a302dd6bd38d67 SHA256 2ad345322160482ef08ec2246b8371f9c27750e75f1c32c20df82d80af449555 EBUILD gconf-2.32.0.ebuild 2616 RMD160 a83f137b2b44a85bcbcf25545222036f66b4aba0 SHA1 e519adc5366bd32bf041a6c484460983b5470894 SHA256 6e5e69fad2ae715073f6f61ecceaecded1e7436f73ed25be00b84929fc2338cb -MISC ChangeLog 31048 RMD160 928e47f0db774bcc611fbaf2ee416a6be15332db SHA1 7161d36eb505536590b7c6c5112882b0a33e3c20 SHA256 a34821f11cc3da512c36600f3e0ffb35751f67ad66540c80f86b539cd0accbf6 +MISC ChangeLog 31298 RMD160 4b4a87497ac6aad7a92f7664a2e6fa5ec73edd65 SHA1 7997ddb1ba74993b76ce502a3edfacf11d8cdc91 SHA256 254caaeb40ddc0cc847c61599b84e43f9cacf3e0627bbff2991645843d84ef0c MISC metadata.xml 271 RMD160 e40f6a4275515a716f4f9ebd453f40385873fa9c SHA1 5da5e829df17818099633d3ebe2880a830088f63 SHA256 091ef40c3b351c464d5718aee2e63cc81da0674a41a052d2c3a0a247b548ea88 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkzB0qcACgkQ1fmVwcYIWAZ0+ACggTawbfChLVEhDGgUsgcalgN6 -JdQAoOBUxF+AOWP7nJm9F0NS0v4RE8BT -=g+L0 +iEYEARECAAYFAk0KlmwACgkQ1fmVwcYIWAbpQgCg04iNfJevXhIAGySbaoQ7r2DA +Nh4An0U+GYY8Xgo7rBxjd7czmiLtoCUS +=il/o -----END PGP SIGNATURE----- diff --git a/gnome-base/gconf/gconf-2.32.0-r1.ebuild b/gnome-base/gconf/gconf-2.32.0-r1.ebuild new file mode 100644 index 000000000000..c7f3d51e0c40 --- /dev/null +++ b/gnome-base/gconf/gconf-2.32.0-r1.ebuild @@ -0,0 +1,101 @@ +# 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.ebuild,v 1.1 2010/12/16 22:44:54 eva Exp $ + +EAPI="3" +GCONF_DEBUG="yes" + +inherit eutils gnome2 + +MY_PN=GConf +MY_P=${MY_PN}-${PV} +PVP=(${PV//[-\._]/ }) + +DESCRIPTION="Gnome Configuration System and Daemon" +HOMEPAGE="http://www.gnome.org/" +SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2" + +LICENSE="LGPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="debug doc +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 + >=dev-libs/libxml2-2 + introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) + ldap? ( net-nds/openldap ) + policykit? ( sys-auth/polkit )" +DEPEND="${RDEPEND} + >=dev-util/intltool-0.35 + >=dev-util/pkgconfig-0.9 + doc? ( >=dev-util/gtk-doc-1 )" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + DOCS="AUTHORS ChangeLog NEWS README TODO" + G2CONF="${G2CONF} + --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="${EXTRA_EMAKE} ORBIT_IDL=/usr/bin/orbit-idl-2" +} + +src_prepare() { + gnome2_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" +} + +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 || 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 troubles + if [ -x /usr/bin/gconftool-2 ] + then + /usr/bin/gconftool-2 --shutdown + fi + + return 0 +} |