| 1 |
commit: 8a2ed13c8e2224817a58f3353d5b8a664f52c5b2 |
| 2 |
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 2 03:25:03 2012 +0000 |
| 4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
| 5 |
CommitDate: Mon Apr 2 03:28:54 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8a2ed13c |
| 7 |
|
| 8 |
gnome-base/dconf: moved to gx86 + simplify valac-0.16 fix |
| 9 |
|
| 10 |
--- |
| 11 |
gnome-base/dconf/dconf-0.12.0.ebuild | 76 ---------------------------------- |
| 12 |
gnome-base/dconf/dconf-9999.ebuild | 11 +---- |
| 13 |
2 files changed, 3 insertions(+), 84 deletions(-) |
| 14 |
|
| 15 |
diff --git a/gnome-base/dconf/dconf-0.12.0.ebuild b/gnome-base/dconf/dconf-0.12.0.ebuild |
| 16 |
deleted file mode 100644 |
| 17 |
index e58a8bd..0000000 |
| 18 |
--- a/gnome-base/dconf/dconf-0.12.0.ebuild |
| 19 |
+++ /dev/null |
| 20 |
@@ -1,76 +0,0 @@ |
| 21 |
-# Copyright 1999-2012 Gentoo Foundation |
| 22 |
-# Distributed under the terms of the GNU General Public License v2 |
| 23 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/dconf-0.10.0.ebuild,v 1.6 2012/01/18 20:33:49 maekke Exp $ |
| 24 |
- |
| 25 |
-EAPI="4" |
| 26 |
-GCONF_DEBUG="no" |
| 27 |
- |
| 28 |
-inherit eutils gnome2 bash-completion-r1 |
| 29 |
-if [[ ${PV} = 9999 ]]; then |
| 30 |
- inherit gnome2-live |
| 31 |
-fi |
| 32 |
- |
| 33 |
-DESCRIPTION="Simple low-level configuration system" |
| 34 |
-HOMEPAGE="http://live.gnome.org/dconf" |
| 35 |
- |
| 36 |
-LICENSE="LGPL-2.1" |
| 37 |
-SLOT="0" |
| 38 |
-IUSE="doc +X" |
| 39 |
-if [[ ${PV} = 9999 ]]; then |
| 40 |
- KEYWORDS="" |
| 41 |
-else |
| 42 |
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" |
| 43 |
-fi |
| 44 |
- |
| 45 |
-RDEPEND=">=dev-libs/glib-2.31.18:2 |
| 46 |
- sys-apps/dbus |
| 47 |
- X? ( >=dev-libs/libxml2-2.7.7:2 |
| 48 |
- x11-libs/gtk+:3 )" |
| 49 |
-DEPEND="${RDEPEND} |
| 50 |
- doc? ( >=dev-util/gtk-doc-1.15 )" |
| 51 |
- |
| 52 |
-if [[ ${PV} = 9999 ]]; then |
| 53 |
- DEPEND="${DEPEND} |
| 54 |
- dev-util/gtk-doc-am |
| 55 |
- >=dev-lang/vala-0.15.1:0.16 )" |
| 56 |
-fi |
| 57 |
- |
| 58 |
-pkg_setup() { |
| 59 |
- G2CONF="${G2CONF} |
| 60 |
- --disable-schemas-compile |
| 61 |
- VALAC=$(type -p false) |
| 62 |
- $(use_enable X editor)" |
| 63 |
- |
| 64 |
- if [[ ${PV} = 9999 ]]; then |
| 65 |
- G2CONF="${G2CONF} |
| 66 |
- VALAC=$(type -p valac-0.16)" |
| 67 |
- fi |
| 68 |
-} |
| 69 |
- |
| 70 |
-src_install() { |
| 71 |
- gnome2_src_install |
| 72 |
- |
| 73 |
- # GSettings backend may be one of: memory, gconf, dconf |
| 74 |
- # Only dconf is really considered functional by upstream |
| 75 |
- # must have it enabled over gconf if both are installed |
| 76 |
- echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf |
| 77 |
- echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf |
| 78 |
- doenvd 51dconf |
| 79 |
- |
| 80 |
- # Remove bash-completion file installed by build system |
| 81 |
- rm -rv "${ED}etc/bash_completion.d/" || die |
| 82 |
- newbashcomp "${S}/bin/dconf-bash-completion.sh" ${PN} |
| 83 |
-} |
| 84 |
- |
| 85 |
-pkg_postinst() { |
| 86 |
- gnome2_pkg_postinst |
| 87 |
- # Kill existing dconf-service processes as recommended by upstream due to |
| 88 |
- # possible changes in the dconf private dbus API. |
| 89 |
- # dconf-service will be dbus-activated on next use. |
| 90 |
- pids=$(pgrep -x dconf-service) |
| 91 |
- if [[ $? == 0 ]]; then |
| 92 |
- ebegin "Stopping dconf-service; it will automatically restart on demand" |
| 93 |
- kill ${pids} |
| 94 |
- eend $? |
| 95 |
- fi |
| 96 |
-} |
| 97 |
|
| 98 |
diff --git a/gnome-base/dconf/dconf-9999.ebuild b/gnome-base/dconf/dconf-9999.ebuild |
| 99 |
index e58a8bd..cfc3ffe 100644 |
| 100 |
--- a/gnome-base/dconf/dconf-9999.ebuild |
| 101 |
+++ b/gnome-base/dconf/dconf-9999.ebuild |
| 102 |
@@ -5,7 +5,7 @@ |
| 103 |
EAPI="4" |
| 104 |
GCONF_DEBUG="no" |
| 105 |
|
| 106 |
-inherit eutils gnome2 bash-completion-r1 |
| 107 |
+inherit gnome2 bash-completion-r1 |
| 108 |
if [[ ${PV} = 9999 ]]; then |
| 109 |
inherit gnome2-live |
| 110 |
fi |
| 111 |
@@ -38,13 +38,8 @@ fi |
| 112 |
pkg_setup() { |
| 113 |
G2CONF="${G2CONF} |
| 114 |
--disable-schemas-compile |
| 115 |
- VALAC=$(type -p false) |
| 116 |
- $(use_enable X editor)" |
| 117 |
- |
| 118 |
- if [[ ${PV} = 9999 ]]; then |
| 119 |
- G2CONF="${G2CONF} |
| 120 |
- VALAC=$(type -p valac-0.16)" |
| 121 |
- fi |
| 122 |
+ $(use_enable X editor) |
| 123 |
+ VALAC=$(type -P valac-0.16)" # harmless even if valac-0.16 not found |
| 124 |
} |
| 125 |
|
| 126 |
src_install() { |
Archives