| 1 |
commit: 867b831dfa1fbf0653aab866b06d026d8affc1f0 |
| 2 |
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 27 22:31:54 2012 +0000 |
| 4 |
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 27 22:31:54 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=867b831d |
| 7 |
|
| 8 |
gnome-base/libgnome-keyring: 3.5.6 → 3.6.0; add vala support |
| 9 |
|
| 10 |
--- |
| 11 |
...-3.5.6.ebuild => libgnome-keyring-3.6.0.ebuild} | 13 +++++++------ |
| 12 |
.../libgnome-keyring/libgnome-keyring-9999.ebuild | 13 +++++++------ |
| 13 |
2 files changed, 14 insertions(+), 12 deletions(-) |
| 14 |
|
| 15 |
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.5.6.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.6.0.ebuild |
| 16 |
similarity index 85% |
| 17 |
rename from gnome-base/libgnome-keyring/libgnome-keyring-3.5.6.ebuild |
| 18 |
rename to gnome-base/libgnome-keyring/libgnome-keyring-3.6.0.ebuild |
| 19 |
index e8419ed..3fcbeee 100644 |
| 20 |
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.5.6.ebuild |
| 21 |
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.6.0.ebuild |
| 22 |
@@ -5,8 +5,9 @@ |
| 23 |
EAPI="4" |
| 24 |
GCONF_DEBUG="yes" |
| 25 |
GNOME2_LA_PUNT="yes" |
| 26 |
+VALA_MIN_API_VERSION="0.16" |
| 27 |
|
| 28 |
-inherit gnome2 python |
| 29 |
+inherit gnome2 python vala |
| 30 |
if [[ ${PV} = 9999 ]]; then |
| 31 |
inherit gnome2-live |
| 32 |
fi |
| 33 |
@@ -21,7 +22,7 @@ if [[ ${PV} = 9999 ]]; then |
| 34 |
else |
| 35 |
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris" |
| 36 |
fi |
| 37 |
-IUSE="debug doc +introspection test" |
| 38 |
+IUSE="debug doc +introspection test vala" |
| 39 |
|
| 40 |
RDEPEND=">=sys-apps/dbus-1.0 |
| 41 |
>=gnome-base/gnome-keyring-3.1.92 |
| 42 |
@@ -31,12 +32,11 @@ DEPEND="${RDEPEND} |
| 43 |
>=dev-util/intltool-0.35 |
| 44 |
virtual/pkgconfig |
| 45 |
doc? ( >=dev-util/gtk-doc-1.9 ) |
| 46 |
- test? ( =dev-lang/python-2* )" |
| 47 |
+ test? ( =dev-lang/python-2* ) |
| 48 |
+ vala? ( $(vala_depend) )" |
| 49 |
|
| 50 |
pkg_setup() { |
| 51 |
- # Disable vala till vala.eclass makes it into portage |
| 52 |
- # Uses VAPIGEN_CHECK |
| 53 |
- G2CONF="--disable-vala" |
| 54 |
+ G2CONF="$(use_enable vala)" |
| 55 |
DOCS="AUTHORS ChangeLog NEWS README" |
| 56 |
|
| 57 |
if use test; then |
| 58 |
@@ -46,6 +46,7 @@ pkg_setup() { |
| 59 |
} |
| 60 |
|
| 61 |
src_prepare() { |
| 62 |
+ use vala && vala_src_prepare |
| 63 |
gnome2_src_prepare |
| 64 |
|
| 65 |
# FIXME: Remove silly CFLAGS |
| 66 |
|
| 67 |
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-9999.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-9999.ebuild |
| 68 |
index e8419ed..3fcbeee 100644 |
| 69 |
--- a/gnome-base/libgnome-keyring/libgnome-keyring-9999.ebuild |
| 70 |
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-9999.ebuild |
| 71 |
@@ -5,8 +5,9 @@ |
| 72 |
EAPI="4" |
| 73 |
GCONF_DEBUG="yes" |
| 74 |
GNOME2_LA_PUNT="yes" |
| 75 |
+VALA_MIN_API_VERSION="0.16" |
| 76 |
|
| 77 |
-inherit gnome2 python |
| 78 |
+inherit gnome2 python vala |
| 79 |
if [[ ${PV} = 9999 ]]; then |
| 80 |
inherit gnome2-live |
| 81 |
fi |
| 82 |
@@ -21,7 +22,7 @@ if [[ ${PV} = 9999 ]]; then |
| 83 |
else |
| 84 |
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris" |
| 85 |
fi |
| 86 |
-IUSE="debug doc +introspection test" |
| 87 |
+IUSE="debug doc +introspection test vala" |
| 88 |
|
| 89 |
RDEPEND=">=sys-apps/dbus-1.0 |
| 90 |
>=gnome-base/gnome-keyring-3.1.92 |
| 91 |
@@ -31,12 +32,11 @@ DEPEND="${RDEPEND} |
| 92 |
>=dev-util/intltool-0.35 |
| 93 |
virtual/pkgconfig |
| 94 |
doc? ( >=dev-util/gtk-doc-1.9 ) |
| 95 |
- test? ( =dev-lang/python-2* )" |
| 96 |
+ test? ( =dev-lang/python-2* ) |
| 97 |
+ vala? ( $(vala_depend) )" |
| 98 |
|
| 99 |
pkg_setup() { |
| 100 |
- # Disable vala till vala.eclass makes it into portage |
| 101 |
- # Uses VAPIGEN_CHECK |
| 102 |
- G2CONF="--disable-vala" |
| 103 |
+ G2CONF="$(use_enable vala)" |
| 104 |
DOCS="AUTHORS ChangeLog NEWS README" |
| 105 |
|
| 106 |
if use test; then |
| 107 |
@@ -46,6 +46,7 @@ pkg_setup() { |
| 108 |
} |
| 109 |
|
| 110 |
src_prepare() { |
| 111 |
+ use vala && vala_src_prepare |
| 112 |
gnome2_src_prepare |
| 113 |
|
| 114 |
# FIXME: Remove silly CFLAGS |
Archives