summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-Antoine Perennou <Marc-Antoine@Perennou.com>2010-06-29 14:58:09 +0200
committerMarc-Antoine Perennou <Marc-Antoine@Perennou.com>2010-06-29 14:58:09 +0200
commit965f3ad9499212a0fd8a8e754e633fc802412af9 (patch)
treeeb2bb89c9f9e0b7b6f20d203bab19f49efdc05ad /gnome-base/gconf
parentupdate mutter ebuild (diff)
downloadkeruspe-965f3ad9499212a0fd8a8e754e633fc802412af9.tar.gz
keruspe-965f3ad9499212a0fd8a8e754e633fc802412af9.tar.bz2
keruspe-965f3ad9499212a0fd8a8e754e633fc802412af9.zip
depend on gnome overlay and start cleaning
Diffstat (limited to 'gnome-base/gconf')
-rw-r--r--gnome-base/gconf/Manifest4
-rw-r--r--gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch19
-rw-r--r--gnome-base/gconf/files/gconf-2.28.0-entry-set-value-sigsegv.patch18
-rw-r--r--gnome-base/gconf/gconf-2.31.4.ebuild95
4 files changed, 0 insertions, 136 deletions
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
deleted file mode 100644
index 83d75960..00000000
--- a/gnome-base/gconf/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gconf-2.24.0-no-gconfd.patch 787 RMD160 bbcd0e1dd0f49053522e703c33a9befb392b2203 SHA1 ccc94c4766a29f1bb3f16c1d1995996ba682686a SHA256 f8352648276d2a2dab162ddade55ec0371e7c4f8bc3834de246fda8c32c66d3c
-AUX gconf-2.28.0-entry-set-value-sigsegv.patch 533 RMD160 77e4fae8a19a57904d9e6706238a94172da5c223 SHA1 9deb172ce170e7333931e61e3cf2ae6ade24bb33 SHA256 e58c0981491e794de05dd71562e0a9675433469e87c7149088ebea432c9619b0
-EBUILD gconf-2.31.4.ebuild 2087 RMD160 02c1ffec1977fc295711a150579b314f54b35904 SHA1 9b815e712449402f9278aaeaf2386d3a60cc1633 SHA256 5a5409cdc6ec2585ad07ff9020e0497edcf199cbc7e2d071702502b7a79e7565
-DIST GConf-2.31.4.tar.bz2 1502939 RMD160 5227e306102648297a062d7bca11ef52cce1f333 SHA1 d2323babc7a2f518c8caa13a44be799112070b9b SHA256 b03f2f53aacb559c66c58819fb0b2b191990ba9cf65049a9f278b8e30ef12ad2
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 8ca6a0d4..00000000
--- a/gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN GConf-2.23.2.old/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 -0400
-+++ 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 installing schemas\n"));
- makefile_install_mode = FALSE;
-+ return 0;
- }
-
- if (makefile_uninstall_mode &&
-@@ -863,6 +864,7 @@ main (int argc, char** argv)
- {
- g_print (_("GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n"));
- makefile_uninstall_mode = FALSE;
-+ return 0;
- }
-
- 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 680b1a15..00000000
--- a/gnome-base/gconf/files/gconf-2.28.0-entry-set-value-sigsegv.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Romain Perier <mrpouet@gentoo.org>
-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 != NULL);
- gconf_entry_set_value_nocopy (entry,
- val ? gconf_value_copy (val) : NULL);
- }
diff --git a/gnome-base/gconf/gconf-2.31.4.ebuild b/gnome-base/gconf/gconf-2.31.4.ebuild
deleted file mode 100644
index b5ea540e..00000000
--- a/gnome-base/gconf/gconf-2.31.4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-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="~amd64 ~x86"
-IUSE="debug doc introspection ldap policykit"
-
-RDEPEND=">=dev-libs/glib-2.25.1
- >=x11-libs/gtk+-2.14
- >=dev-libs/dbus-glib-0.74
- >=sys-apps/dbus-1
- >=gnome-base/orbit-2.4
- >=dev-libs/libxml2-2
- ldap? ( net-nds/openldap )
- introspection? ( dev-libs/gobject-introspection
- !!dev-libs/gir-repository[gconf] )
- policykit? ( sys-auth/polkit )"
-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-static
- $(use_enable introspection)
- $(use_with ldap openldap)
- $(use_enable policykit defaults-service)"
- kill_gconf
-
- export EXTRA_EMAKE="${EXTRA_EMAKE} ORBIT_IDL=/usr/bin/orbit-idl-2"
-}
-
-src_prepare() {
- gnome2_src_prepare
-
- epatch "${FILESDIR}/${PN}-2.24.0-no-gconfd.patch"
- epatch "${FILESDIR}/${PN}-2.28.0-entry-set-value-sigsegv.patch"
-
- sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-}
-
-src_install() {
- gnome2_src_install
-
- keepdir /etc/gconf/gconf.xml.mandatory
- keepdir /etc/gconf/gconf.xml.defaults
- 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
-
- 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() {
- if [ -x /usr/bin/gconftool-2 ]
- then
- /usr/bin/gconftool-2 --shutdown
- fi
-
- return 0
-}