[gentoo-commits] gentoo-x86 commit in gnome-base/gconf: ChangeLog gconf-2.20.1-r1.ebuild gconf-2.16.0.ebuild gconf-2.20.0.ebuild

[Gilles Dartiguelongue (eva)]

eva         08/01/01 21:45:46

  Modified:             ChangeLog
  Added:                gconf-2.20.1-r1.ebuild
  Removed:              gconf-2.16.0.ebuild gconf-2.20.0.ebuild
  Log:
  prune old releases
  add a patch to remove automagic dependency on ldap
  (Portage version: 2.1.4_rc11)

Revision  Changes    Path
1.179                gnome-base/gconf/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gconf/ChangeLog?rev=1.179&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gconf/ChangeLog?rev=1.179&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gconf/ChangeLog?r1=1.178&r2=1.179

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- ChangeLog	29 Nov 2007 05:10:29 -0000	1.178
+++ ChangeLog	1 Jan 2008 21:45:46 -0000	1.179
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gconf
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.178 2007/11/29 05:10:29 jer Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.179 2008/01/01 21:45:46 eva Exp $
+
+*gconf-2.20.1-r1 (01 Jan 2008)
+
+  01 Jan 2008; Gilles Dartiguelongue <eva@g.o>
+  +files/gconf-2.20.1-automagic-ldap.patch, -gconf-2.16.0.ebuild,
+  -gconf-2.20.0.ebuild, +gconf-2.20.1-r1.ebuild:
+  prune old releases
+  add a patch to remove automagic dependency on ldap
 
   29 Nov 2007; Jeroen Roovers <jer@g.o> gconf-2.20.1.ebuild:
   Stable for HPPA (bug #199740).



1.1                  gnome-base/gconf/gconf-2.20.1-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gconf/gconf-2.20.1-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gconf/gconf-2.20.1-r1.ebuild?rev=1.1&content-type=text/plain

Index: gconf-2.20.1-r1.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.20.1-r1.ebuild,v 1.1 2008/01/01 21:45:46 eva Exp $

inherit gnome2 autotools

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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="debug doc"

RDEPEND=">=dev-libs/glib-2.10
		 >=x11-libs/gtk+-2.8.16
		 >=gnome-base/orbit-2.4
		 >=dev-libs/libxml2-2"
DEPEND="${RDEPEND}
		>=dev-util/intltool-0.35
		>=dev-util/pkgconfig-0.9
		doc? ( >=dev-util/gtk-doc-1 )"

# FIXME : consider merging the tree (?)
DOCS="AUTHORS ChangeLog NEWS README TODO"

S="${WORKDIR}/${MY_P}"

pkg_setup() {
	G2CONF="${G2CONF} --enable-gtk $(use_enable debug)"
	kill_gconf
}

src_unpack() {
	gnome2_src_unpack

	# fix bug #193442
	epatch "${FILESDIR}/${P}-automagic-ldap.patch"

	cp aclocal.m4 old.m4
	AT_M4DIR="." eautoreconf
}

src_install() {
	gnome2_src_install

	# hack hack
	dodir /etc/gconf/gconf.xml.mandatory
	dodir /etc/gconf/gconf.xml.defaults
	touch "${D}"/etc/gconf/gconf.xml.mandatory/.keep${SLOT}
	touch "${D}"/etc/gconf/gconf.xml.defaults/.keep${SLOT}

	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > 50gconf
	doenvd 50gconf || die
	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  /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 that could be causing troubles
	if [ -x /usr/bin/gconftool ]
	then
		/usr/bin/gconftool --shutdown
	fi
	if [ -x /usr/bin/gconftool-1 ]
	then
		/usr/bin/gconftool-1 --shutdown
	fi

	# and for gconf 2
	if [ -x /usr/bin/gconftool-2 ]
	then
		/usr/bin/gconftool-2 --shutdown
	fi
	return 0
}



-- 
gentoo-commits@g.o mailing list