diff options
| -rw-r--r-- | gnome-base/gconf/ChangeLog | 8 | ||||
| -rw-r--r-- | gnome-base/gconf/gconf-2.26.0.ebuild | 106 | ||||
| -rw-r--r-- | gnome-base/gconf/gconf-2.28.0.ebuild (renamed from gnome-base/gconf/gconf-2.26.2.ebuild) | 7 |
3 files changed, 10 insertions, 111 deletions
diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog index 01fcc952b8cb..a18c027e82a7 100644 --- a/gnome-base/gconf/ChangeLog +++ b/gnome-base/gconf/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnome-base/gconf # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.214 2009/10/24 16:27:06 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.215 2009/10/29 23:38:50 eva Exp $ + +*gconf-2.28.0 (29 Oct 2009) + + 29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org> -gconf-2.26.0.ebuild, + -gconf-2.26.2.ebuild, +gconf-2.28.0.ebuild: + New version for GNOME 2.28. Clean up old revision. 24 Oct 2009; nixnut <nixnut@gentoo.org> gconf-2.26.2-r1.ebuild: ppc stable #281427 diff --git a/gnome-base/gconf/gconf-2.26.0.ebuild b/gnome-base/gconf/gconf-2.26.0.ebuild deleted file mode 100644 index daf9ef793646..000000000000 --- a/gnome-base/gconf/gconf-2.26.0.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.26.0.ebuild,v 1.2 2009/05/01 11:39:25 eva Exp $ - -inherit autotools 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="debug doc ldap policykit" - -RDEPEND=">=dev-libs/glib-2.14 - >=x11-libs/gtk+-2.8.16 - >=dev-libs/dbus-glib-0.74 - >=sys-apps/dbus-1 - >=gnome-base/orbit-2.4 - >=dev-libs/libxml2-2 - ldap? ( net-nds/openldap ) - policykit? ( >=sys-auth/policykit-0.7 )" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.35 - >=dev-util/pkgconfig-0.9 - >=dev-util/gtk-doc-am-1.10 - doc? ( >=dev-util/gtk-doc-1 )" - -DOCS="AUTHORS ChangeLog NEWS README TODO" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - G2CONF="${G2CONF} - --enable-gtk - --disable-defaults-service - --disable-static - $(use_enable debug) - $(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_unpack() { - gnome2_src_unpack - - # fix bug #193442, GNOME bug #498934 - epatch "${FILESDIR}/${PN}-2.24.0-automagic-ldap.patch" - - # fix bug #238276 - epatch "${FILESDIR}/${PN}-2.24.0-no-gconfd.patch" - - eautoreconf -} - -# Can't run tests, missing script. -#src_test() { -# emake -C tests || die "make tests failed" -# sh "${S}"/tests/runtests.sh || die "running tests failed" -#} - -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 - doenvd 50gconf || die "doenv failed" - 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-2 that could be causing troubles - if [ -x /usr/bin/gconftool-2 ] - then - /usr/bin/gconftool-2 --shutdown - fi - - return 0 -} diff --git a/gnome-base/gconf/gconf-2.26.2.ebuild b/gnome-base/gconf/gconf-2.28.0.ebuild index 1d498d1a99a3..38d88a497347 100644 --- a/gnome-base/gconf/gconf-2.26.2.ebuild +++ b/gnome-base/gconf/gconf-2.28.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.26.2.ebuild,v 1.1 2009/05/16 09:47:56 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.28.0.ebuild,v 1.1 2009/10/29 23:38:50 eva Exp $ EAPI="2" @@ -16,7 +16,7 @@ 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" +KEYWORDS="~amd64 ~x86" IUSE="debug doc ldap policykit" RDEPEND=">=dev-libs/glib-2.14 @@ -26,7 +26,7 @@ RDEPEND=">=dev-libs/glib-2.14 >=gnome-base/orbit-2.4 >=dev-libs/libxml2-2 ldap? ( net-nds/openldap ) - policykit? ( >=sys-auth/policykit-0.7 )" + policykit? ( sys-auth/polkit )" DEPEND="${RDEPEND} >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.9 @@ -41,7 +41,6 @@ pkg_setup() { G2CONF="${G2CONF} --enable-gtk --disable-static - $(use_enable debug) $(use_with ldap openldap) $(use_enable policykit defaults-service)" kill_gconf |