[gentoo-commits] proj/gnome:master commit in: gnome-base/dconf/

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     f8a76b2f625b2c08576f8c2f65ae2d9eb6d5eb8f
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon May  9 10:40:19 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon May  9 10:40:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f8a76b2f

gnome-base/dconf: 0.7.3 → 0.7.5

---
 .../{dconf-0.7.3-r1.ebuild => dconf-0.7.5.ebuild}  |   14 +++++++++++++-
 gnome-base/dconf/dconf-9999.ebuild                 |   14 +++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/gnome-base/dconf/dconf-0.7.3-r1.ebuild b/gnome-base/dconf/dconf-0.7.5.ebuild
similarity index 82%
rename from gnome-base/dconf/dconf-0.7.3-r1.ebuild
rename to gnome-base/dconf/dconf-0.7.5.ebuild
index 4e865c3..0f3ba6e 100644
--- a/gnome-base/dconf/dconf-0.7.3-r1.ebuild
+++ b/gnome-base/dconf/dconf-0.7.5.ebuild
@@ -5,7 +5,7 @@
 EAPI="3"
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit gnome2 bash-completion
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -33,6 +33,7 @@ DEPEND="${COMMON_DEPEND}
 
 pkg_setup() {
 	G2CONF="${G2CONF}
+		--disable-schemas-compile
 		VALAC=$(type -p valac-0.12)
 		$(use_enable X editor)"
 		#$(use_enable vala)
@@ -62,4 +63,15 @@ src_install() {
 	echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf
 	echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf
 	doenvd 51dconf || die "doenvd failed"
+
+	# Remove bash-completion file installed by build system
+	rm -rv "${ED}/etc/bash_completion.d/" || die
+
+	use bash-completion && \
+		dobashcompletion "${S}/bin/dconf-bash-completion.sh" ${PN}
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	use bashcompletion && bash-completion_pkg_postinst
 }

diff --git a/gnome-base/dconf/dconf-9999.ebuild b/gnome-base/dconf/dconf-9999.ebuild
index 4e865c3..0f3ba6e 100644
--- a/gnome-base/dconf/dconf-9999.ebuild
+++ b/gnome-base/dconf/dconf-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI="3"
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit gnome2 bash-completion
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -33,6 +33,7 @@ DEPEND="${COMMON_DEPEND}
 
 pkg_setup() {
 	G2CONF="${G2CONF}
+		--disable-schemas-compile
 		VALAC=$(type -p valac-0.12)
 		$(use_enable X editor)"
 		#$(use_enable vala)
@@ -62,4 +63,15 @@ src_install() {
 	echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf
 	echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf
 	doenvd 51dconf || die "doenvd failed"
+
+	# Remove bash-completion file installed by build system
+	rm -rv "${ED}/etc/bash_completion.d/" || die
+
+	use bash-completion && \
+		dobashcompletion "${S}/bin/dconf-bash-completion.sh" ${PN}
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	use bashcompletion && bash-completion_pkg_postinst
 }