* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/dconf/
@ 2011-07-26 18:47 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-07-26 18:47 UTC (permalink / raw
To: gentoo-commits
commit: 1d49fb84f29e075f323358056a78adb4aea185e1
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Jul 26 18:39:27 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Jul 26 18:46:30 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1d49fb84
gnome-base/dconf: 0.7.5 → 0.9.0
Bump to the new unstable release. Depend on vala:0.14 due to an
automagic version-check #ifdef.
---
.../{dconf-0.7.5.ebuild => dconf-0.9.0.ebuild} | 7 ++++---
gnome-base/dconf/dconf-9999.ebuild | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/gnome-base/dconf/dconf-0.7.5.ebuild b/gnome-base/dconf/dconf-0.9.0.ebuild
similarity index 93%
rename from gnome-base/dconf/dconf-0.7.5.ebuild
rename to gnome-base/dconf/dconf-0.9.0.ebuild
index a40f5bc..013cc37 100644
--- a/gnome-base/dconf/dconf-0.7.5.ebuild
+++ b/gnome-base/dconf/dconf-0.9.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
GCONF_DEBUG="no"
inherit gnome2 bash-completion
@@ -27,14 +27,15 @@ COMMON_DEPEND=">=dev-libs/glib-2.27.2:2
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="${COMMON_DEPEND}
- >=dev-lang/vala-0.11.7:0.12
+ dev-lang/vala:0.14
doc? ( >=dev-util/gtk-doc-1.15 )"
pkg_setup() {
G2CONF="${G2CONF}
--disable-schemas-compile
- VALAC=$(type -p valac-0.12)
+ VALAC=$(type -p valac-0.14)
$(use_enable X editor)"
#$(use_enable vala)
}
diff --git a/gnome-base/dconf/dconf-9999.ebuild b/gnome-base/dconf/dconf-9999.ebuild
index a40f5bc..013cc37 100644
--- a/gnome-base/dconf/dconf-9999.ebuild
+++ b/gnome-base/dconf/dconf-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
GCONF_DEBUG="no"
inherit gnome2 bash-completion
@@ -27,14 +27,15 @@ COMMON_DEPEND=">=dev-libs/glib-2.27.2:2
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="${COMMON_DEPEND}
- >=dev-lang/vala-0.11.7:0.12
+ dev-lang/vala:0.14
doc? ( >=dev-util/gtk-doc-1.15 )"
pkg_setup() {
G2CONF="${G2CONF}
--disable-schemas-compile
- VALAC=$(type -p valac-0.12)
+ VALAC=$(type -p valac-0.14)
$(use_enable X editor)"
#$(use_enable vala)
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/dconf/
@ 2011-07-28 1:49 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-07-28 1:49 UTC (permalink / raw
To: gentoo-commits
commit: 3e79354f73b9c090eb59cf9fff3d77abf6094f87
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Thu Jul 28 01:46:50 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Jul 28 01:46:50 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3e79354f
gnome-base/dconf: make vala optional
Sync the tarball version of the ebuild with changes in gx86 and make
vala optional, since the patch apparently works (at least for the
tarball releases).
---
gnome-base/dconf/dconf-0.9.0.ebuild | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/gnome-base/dconf/dconf-0.9.0.ebuild b/gnome-base/dconf/dconf-0.9.0.ebuild
index 013cc37..f9a78e7 100644
--- a/gnome-base/dconf/dconf-0.9.0.ebuild
+++ b/gnome-base/dconf/dconf-0.9.0.ebuild
@@ -5,7 +5,7 @@
EAPI="4"
GCONF_DEBUG="no"
-inherit gnome2 bash-completion
+inherit autotools eutils gnome2 bash-completion
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -15,7 +15,7 @@ HOMEPAGE="http://live.gnome.org/dconf"
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="doc +X"
+IUSE="doc vala +X"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -29,15 +29,15 @@ COMMON_DEPEND=">=dev-libs/glib-2.27.2:2
x11-libs/gtk+:3 )"
# vala:0.14 due to an automagic version-check #ifdef (commit a15d9621)
DEPEND="${COMMON_DEPEND}
- dev-lang/vala:0.14
- doc? ( >=dev-util/gtk-doc-1.15 )"
+ doc? ( >=dev-util/gtk-doc-1.15 )
+ vala? ( dev-lang/vala:0.14 )"
pkg_setup() {
G2CONF="${G2CONF}
--disable-schemas-compile
- VALAC=$(type -p valac-0.14)
- $(use_enable X editor)"
- #$(use_enable vala)
+ $(use_enable vala)
+ $(use_enable X editor)
+ VALAC=$(type -p valac-0.14)"
}
src_prepare() {
@@ -49,9 +49,13 @@ src_prepare() {
fi
# Fix vala automagic support, upstream bug #634171
- # FIXME: patch doesn't actually work, forcing vala support above
- #epatch "${FILESDIR}/${PN}-automagic-vala.patch"
+ epatch "${FILESDIR}/${PN}-automagic-vala.patch"
+ if [[ ${PV} != 9999 ]]; then
+ mkdir -p m4 || die
+ AT_M4DIR="." eautoreconf
+ eautoreconf
+ fi
gnome2_src_prepare
}
@@ -63,11 +67,10 @@ src_install() {
# must have it enabled over gconf if both are installed
echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf
echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf
- doenvd 51dconf || die "doenvd failed"
+ doenvd 51dconf
# 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}
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/dconf/
@ 2011-09-28 0:43 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-09-28 0:43 UTC (permalink / raw
To: gentoo-commits
commit: ccf5de697adfdef8d0416f5f58e2ca60a28e9697
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Sep 28 00:36:45 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Sep 28 00:36:45 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ccf5de69
gnome-base/dconf: 0.9.0 → 0.10.0
Bump. Drops a lot of unsupported API.
---
.../{dconf-0.9.0.ebuild => dconf-0.10.0.ebuild} | 2 +-
gnome-base/dconf/dconf-9999.ebuild | 27 +++++++++++---------
2 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/gnome-base/dconf/dconf-0.9.0.ebuild b/gnome-base/dconf/dconf-0.10.0.ebuild
similarity index 97%
rename from gnome-base/dconf/dconf-0.9.0.ebuild
rename to gnome-base/dconf/dconf-0.10.0.ebuild
index f9a78e7..66809c7 100644
--- a/gnome-base/dconf/dconf-0.9.0.ebuild
+++ b/gnome-base/dconf/dconf-0.10.0.ebuild
@@ -22,7 +22,7 @@ else
KEYWORDS="~amd64 ~arm ~sparc ~x86"
fi
-COMMON_DEPEND=">=dev-libs/glib-2.27.2:2
+COMMON_DEPEND=">=dev-libs/glib-2.29.90:2
sys-apps/dbus
X? (
>=dev-libs/libxml2-2.7.7:2
diff --git a/gnome-base/dconf/dconf-9999.ebuild b/gnome-base/dconf/dconf-9999.ebuild
index 013cc37..66809c7 100644
--- a/gnome-base/dconf/dconf-9999.ebuild
+++ b/gnome-base/dconf/dconf-9999.ebuild
@@ -5,7 +5,7 @@
EAPI="4"
GCONF_DEBUG="no"
-inherit gnome2 bash-completion
+inherit autotools eutils gnome2 bash-completion
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -15,29 +15,29 @@ HOMEPAGE="http://live.gnome.org/dconf"
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="doc +X"
+IUSE="doc vala +X"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
KEYWORDS="~amd64 ~arm ~sparc ~x86"
fi
-COMMON_DEPEND=">=dev-libs/glib-2.27.2:2
+COMMON_DEPEND=">=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="${COMMON_DEPEND}
- dev-lang/vala:0.14
- doc? ( >=dev-util/gtk-doc-1.15 )"
+ doc? ( >=dev-util/gtk-doc-1.15 )
+ vala? ( dev-lang/vala:0.14 )"
pkg_setup() {
G2CONF="${G2CONF}
--disable-schemas-compile
- VALAC=$(type -p valac-0.14)
- $(use_enable X editor)"
- #$(use_enable vala)
+ $(use_enable vala)
+ $(use_enable X editor)
+ VALAC=$(type -p valac-0.14)"
}
src_prepare() {
@@ -49,9 +49,13 @@ src_prepare() {
fi
# Fix vala automagic support, upstream bug #634171
- # FIXME: patch doesn't actually work, forcing vala support above
- #epatch "${FILESDIR}/${PN}-automagic-vala.patch"
+ epatch "${FILESDIR}/${PN}-automagic-vala.patch"
+ if [[ ${PV} != 9999 ]]; then
+ mkdir -p m4 || die
+ AT_M4DIR="." eautoreconf
+ eautoreconf
+ fi
gnome2_src_prepare
}
@@ -63,11 +67,10 @@ src_install() {
# must have it enabled over gconf if both are installed
echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf
echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf
- doenvd 51dconf || die "doenvd failed"
+ doenvd 51dconf
# 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}
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-09-28 0:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-28 1:49 [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/dconf/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2011-09-28 0:43 Alexandre Restovtsev
2011-07-26 18:47 Alexandre Restovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox