diff options
author | Pacho Ramos <pacho@gentoo.org> | 2013-05-28 18:55:33 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2013-05-28 18:55:33 +0000 |
commit | 5b814bb70fbba5fb24dea626e423b4bc49ea3066 (patch) | |
tree | 3370d3f2d1f1890ca5691109f6deb4603d2a2ec7 /gnome-extra/gnome-contacts | |
parent | patch to fix test in py2 (diff) | |
download | gentoo-2-5b814bb70fbba5fb24dea626e423b4bc49ea3066.tar.gz gentoo-2-5b814bb70fbba5fb24dea626e423b4bc49ea3066.tar.bz2 gentoo-2-5b814bb70fbba5fb24dea626e423b4bc49ea3066.zip |
Version bump, drop old, vala stuff is always needed at build time
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'gnome-extra/gnome-contacts')
-rw-r--r-- | gnome-extra/gnome-contacts/ChangeLog | 8 | ||||
-rw-r--r-- | gnome-extra/gnome-contacts/gnome-contacts-3.8.2.ebuild (renamed from gnome-extra/gnome-contacts/gnome-contacts-3.8.0.ebuild) | 25 |
2 files changed, 18 insertions, 15 deletions
diff --git a/gnome-extra/gnome-contacts/ChangeLog b/gnome-extra/gnome-contacts/ChangeLog index 785095b11042..1c4872baba29 100644 --- a/gnome-extra/gnome-contacts/ChangeLog +++ b/gnome-extra/gnome-contacts/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnome-extra/gnome-contacts # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-contacts/ChangeLog,v 1.16 2013/04/19 20:21:38 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-contacts/ChangeLog,v 1.17 2013/05/28 18:55:33 pacho Exp $ + +*gnome-contacts-3.8.2 (28 May 2013) + + 28 May 2013; Pacho Ramos <pacho@gentoo.org> +gnome-contacts-3.8.2.ebuild, + -gnome-contacts-3.8.0.ebuild: + Version bump, drop old, vala stuff is always needed at build time *gnome-contacts-3.8.1 (19 Apr 2013) diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.8.0.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.8.2.ebuild index f05cb28ca090..5db43143511a 100644 --- a/gnome-extra/gnome-contacts/gnome-contacts-3.8.0.ebuild +++ b/gnome-extra/gnome-contacts/gnome-contacts-3.8.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-contacts/gnome-contacts-3.8.0.ebuild,v 1.2 2013/03/30 15:01:39 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-contacts/gnome-contacts-3.8.2.ebuild,v 1.1 2013/05/28 18:55:33 pacho Exp $ EAPI="5" GCONF_DEBUG="no" @@ -16,13 +16,14 @@ SLOT="0" IUSE="v4l" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" -VALA_DEPEND="$(vala_depend) +VALA_DEPEND=" + $(vala_depend) dev-libs/folks[vala] gnome-base/gnome-desktop[introspection] gnome-extra/evolution-data-server[vala] net-libs/telepathy-glib[vala] - x11-libs/libnotify[introspection]" - + x11-libs/libnotify[introspection] +" # Configure is wrong; it needs cheese-3.5.91, not 3.3.91 RDEPEND=" >=dev-libs/folks-0.7.3:=[eds,telepathy] @@ -40,21 +41,17 @@ RDEPEND=" v4l? ( >=media-video/cheese-3.5.91:= ) " DEPEND="${RDEPEND} + ${VALA_DEPEND} >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig - !v4l? ( ${VALA_DEPEND} )" -# When !v4l, we regenerate the .c sources +" src_prepare() { - G2CONF="${G2CONF} - $(use_with v4l cheese)" - # FIXME: Fails to compile with USE=-v4l - - # Regenerate the pre-generated C sources - if ! use v4l; then - touch src/*.vala - fi gnome2_src_prepare vala_src_prepare } + +src_configure() { + gnome2_src_configure $(use_with v4l cheese) +} |