diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2013-03-07 08:14:08 +0000 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2013-03-07 08:14:08 +0000 |
commit | 7cd71d34480a41fb0dc239fd7851c65f89437ded (patch) | |
tree | 518a6ef4fd14cf59c453120c6c7b4561cd3a9ddf /gnome-base | |
parent | Clean up old revisions. (diff) | |
download | gentoo-2-7cd71d34480a41fb0dc239fd7851c65f89437ded.tar.gz gentoo-2-7cd71d34480a41fb0dc239fd7851c65f89437ded.tar.bz2 gentoo-2-7cd71d34480a41fb0dc239fd7851c65f89437ded.zip |
Clean up old revisions.
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key C6085806)
Diffstat (limited to 'gnome-base')
-rw-r--r-- | gnome-base/dconf/ChangeLog | 7 | ||||
-rw-r--r-- | gnome-base/dconf/dconf-0.10.0.ebuild | 74 | ||||
-rw-r--r-- | gnome-base/dconf/dconf-0.14.0.ebuild | 68 | ||||
-rw-r--r-- | gnome-base/dconf/files/dconf-0.8.0-automagic-vala.patch | 19 |
4 files changed, 6 insertions, 162 deletions
diff --git a/gnome-base/dconf/ChangeLog b/gnome-base/dconf/ChangeLog index ba99ab062abf..7a44056903e0 100644 --- a/gnome-base/dconf/ChangeLog +++ b/gnome-base/dconf/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-base/dconf # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/ChangeLog,v 1.43 2013/02/25 09:10:55 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/ChangeLog,v 1.44 2013/03/07 08:14:08 eva Exp $ + + 07 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> + -files/dconf-0.8.0-automagic-vala.patch, -dconf-0.10.0.ebuild, + -dconf-0.14.0.ebuild: + Clean up old revisions. 25 Feb 2013; Zac Medico <zmedico@gentoo.org> dconf-0.14.1.ebuild: Add ~arm-linux and ~x86-linux keywords. diff --git a/gnome-base/dconf/dconf-0.10.0.ebuild b/gnome-base/dconf/dconf-0.10.0.ebuild deleted file mode 100644 index a45ead860a32..000000000000 --- a/gnome-base/dconf/dconf-0.10.0.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/dconf-0.10.0.ebuild,v 1.10 2012/09/27 22:59:19 tetromino Exp $ - -EAPI="4" -GCONF_DEBUG="no" - -inherit autotools eutils gnome2 bash-completion-r1 - -DESCRIPTION="Simple low-level configuration system" -HOMEPAGE="http://live.gnome.org/dconf" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="doc vala +X" - -RDEPEND=">=dev-libs/glib-2.29.90:2 - sys-apps/dbus - X? ( >=dev-libs/libxml2-2.7.7:2 - x11-libs/gtk+:3 )" -# vala:0.14 due to an automagic version-check #ifdef (commit a15d9621) -DEPEND="${RDEPEND} - dev-util/gtk-doc-am - virtual/pkgconfig - doc? ( >=dev-util/gtk-doc-1.15 ) - vala? ( dev-lang/vala:0.14 )" -# eautoreconf requires gtk-doc-am - -pkg_setup() { - G2CONF="${G2CONF} - --disable-schemas-compile - $(use_enable vala) - $(use_enable X editor) - VALAC=$(type -p valac-0.14)" -} - -src_prepare() { - # Fix vala automagic support, upstream bug #634171 - epatch "${FILESDIR}/${PN}-0.8.0-automagic-vala.patch" - - mkdir -p m4 || die - eautoreconf - - gnome2_src_prepare -} - -src_install() { - gnome2_src_install - - # GSettings backend may be one of: memory, gconf, dconf - # Only dconf is really considered functional by upstream - # must have it enabled over gconf if both are installed - echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf - echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf - doenvd 51dconf - - # Remove bash-completion file installed by build system - rm -rv "${ED}/etc/bash_completion.d/" || die - newbashcomp "${S}/bin/dconf-bash-completion.sh" ${PN} -} - -pkg_postinst() { - gnome2_pkg_postinst - # Kill existing dconf-service processes as recommended by upstream due to - # possible changes in the dconf private dbus API. - # dconf-service will be dbus-activated on next use. - pids=$(pgrep -x dconf-service) - if [[ $? == 0 ]]; then - ebegin "Stopping dconf-service; it will automatically restart on demand" - kill ${pids} - eend $? - fi -} diff --git a/gnome-base/dconf/dconf-0.14.0.ebuild b/gnome-base/dconf/dconf-0.14.0.ebuild deleted file mode 100644 index 23142ae8a3dc..000000000000 --- a/gnome-base/dconf/dconf-0.14.0.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/dconf-0.14.0.ebuild,v 1.1 2012/09/27 22:59:19 tetromino Exp $ - -EAPI="4" -GCONF_DEBUG="no" - -inherit gnome2 bash-completion-r1 virtualx - -DESCRIPTION="Simple low-level configuration system" -HOMEPAGE="http://live.gnome.org/dconf" - -LICENSE="LGPL-2.1+" -SLOT="0" -# TODO: coverage ? -IUSE="doc test +X" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND=">=dev-libs/glib-2.33.3:2 - sys-apps/dbus - X? ( >=dev-libs/libxml2-2.7.7:2 - x11-libs/gtk+:3 )" -DEPEND="${RDEPEND} - dev-libs/libxslt - sys-devel/gettext - >=dev-util/intltool-0.50 - virtual/pkgconfig - doc? ( >=dev-util/gtk-doc-1.15 )" - -pkg_setup() { - G2CONF="${G2CONF} - --disable-schemas-compile - --disable-gcov - $(use_enable X editor) - VALAC=$(type -P valac-0.18)" # harmless even if valac-0.18 not found -} - -src_test() { - Xemake check -} - -src_install() { - gnome2_src_install - - # GSettings backend may be one of: memory, gconf, dconf - # Only dconf is really considered functional by upstream - # must have it enabled over gconf if both are installed - echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf - echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf - doenvd 51dconf - - # Install bash-completion file properly to the system - rm -rv "${ED}usr/share/bash-completion" || die - dobashcomp "${S}/bin/completion/dconf" -} - -pkg_postinst() { - gnome2_pkg_postinst - # Kill existing dconf-service processes as recommended by upstream due to - # possible changes in the dconf private dbus API. - # dconf-service will be dbus-activated on next use. - pids=$(pgrep -x dconf-service) - if [[ $? == 0 ]]; then - ebegin "Stopping dconf-service; it will automatically restart on demand" - kill ${pids} - eend $? - fi -} diff --git a/gnome-base/dconf/files/dconf-0.8.0-automagic-vala.patch b/gnome-base/dconf/files/dconf-0.8.0-automagic-vala.patch deleted file mode 100644 index 9f680a05c499..000000000000 --- a/gnome-base/dconf/files/dconf-0.8.0-automagic-vala.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- configure.ac.orig 2010-11-06 16:24:36.000000000 +0100 -+++ configure.ac 2010-11-06 16:24:19.000000000 +0100 -@@ -12,7 +12,15 @@ - - # Check for programs - AC_PROG_CC --AM_PROG_VALAC([0.11.7]) -+ -+AC_ARG_ENABLE(vala, -+ AC_HELP_STRING([--disable-vala], -+ [Disable vala support])) -+AM_CONDITIONAL(ENABLE_VALA, test "x$enable_vala" != "xno") -+ -+if test "x$enable_vala" != "xno"; then -+ AM_PROG_VALAC([0.11.7]) -+fi - - # Use GSettings - GLIB_GSETTINGS |