From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1FD3C138010 for ; Fri, 21 Sep 2012 00:28:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BEB1CE0512; Fri, 21 Sep 2012 00:27:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7B68CE0512 for ; Fri, 21 Sep 2012 00:27:48 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC5AC33D70D for ; Fri, 21 Sep 2012 00:27:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 67966E5452 for ; Fri, 21 Sep 2012 00:27:44 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <1348186101.cb8e812be603c6e59ad0ed48afda35bcddd849e5.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-contacts/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-extra/gnome-contacts/gnome-contacts-3.5.91.ebuild gnome-extra/gnome-contacts/gnome-contacts-3.5.92.ebuild gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild X-VCS-Directories: gnome-extra/gnome-contacts/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: cb8e812be603c6e59ad0ed48afda35bcddd849e5 X-VCS-Branch: master Date: Fri, 21 Sep 2012 00:27:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e1c1c803-c8f9-4d0f-944a-ad86c13b0acd X-Archives-Hash: a6a0b45a8da3acfe327874e1fe3cfa8a commit: cb8e812be603c6e59ad0ed48afda35bcddd849e5 Author: Nirbheek Chauhan gentoo org> AuthorDate: Thu Sep 20 23:38:35 2012 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Fri Sep 21 00:08:21 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=cb8e812b gnome-extra/gnome-contacts: 3.5.91 → 3.5.92 --- ...-3.5.91.ebuild => gnome-contacts-3.5.92.ebuild} | 32 ++++++++++++------ .../gnome-contacts/gnome-contacts-9999.ebuild | 33 +++++++++++++------ 2 files changed, 43 insertions(+), 22 deletions(-) diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.5.91.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.5.92.ebuild similarity index 68% rename from gnome-extra/gnome-contacts/gnome-contacts-3.5.91.ebuild rename to gnome-extra/gnome-contacts/gnome-contacts-3.5.92.ebuild index 6f7c8de..7bfeb5a 100644 --- a/gnome-extra/gnome-contacts/gnome-contacts-3.5.91.ebuild +++ b/gnome-extra/gnome-contacts/gnome-contacts-3.5.92.ebuild @@ -4,8 +4,9 @@ EAPI="4" GCONF_DEBUG="no" +VALA_MIN_API_VERSION="0.18" -inherit autotools eutils gnome2 +inherit gnome2 vala if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi @@ -21,7 +22,9 @@ if [[ ${PV} = 9999 ]]; then else KEYWORDS="~amd64 ~x86" fi - +VALA_DEPEND="$(vala_depend) + net-libs/telepathy-glib[vala]" +# Configure is wrong; it needs cheese-3.5.91, not 3.3.91 RDEPEND=" >=dev-libs/glib-2.31.10:2 >=x11-libs/gtk+-3.4:3 @@ -30,10 +33,7 @@ RDEPEND=" >=net-libs/telepathy-glib-0.17.5 >=dev-libs/folks-0.7.2[eds] - v4l? ( - media-libs/gstreamer - media-libs/gst-plugins-base - >=media-video/cheese-3.3.5 ) + v4l? ( >=media-video/cheese-3.5.91 ) dev-libs/libgee:0 net-libs/gnome-online-accounts @@ -44,12 +44,13 @@ RDEPEND=" DEPEND="${RDEPEND} >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 - virtual/pkgconfig" + virtual/pkgconfig + !v4l? ( ${VALA_DEPEND} )" +# When !v4l, we regenerate the .c sources if [[ ${PV} = 9999 ]]; then - DEPEND="${DEPEND} - >=dev-lang/vala-0.17.2:0.18 - net-libs/telepathy-glib[vala]" + DEPEND+=" + ${VALA_DEPEND}" fi pkg_setup() { @@ -57,7 +58,16 @@ pkg_setup() { # We do not need valac when building from pre-generated C sources, # but configure checks for it anyway G2CONF="${G2CONF} - VALAC=$(type -P valac-0.18) + VALAC=$(type -P valac-$(vala_best_api_version)) $(use_with v4l cheese)" # FIXME: Fails to compile with USE=-v4l } + +src_prepare() { + # Regenerate the pre-generated C sources + if ! use v4l; then + touch src/*.vala + fi + # We don't want vala_src_prepare + gnome2_src_prepare +} diff --git a/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild index 326f5c3..7bfeb5a 100644 --- a/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild +++ b/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild @@ -4,8 +4,9 @@ EAPI="4" GCONF_DEBUG="no" +VALA_MIN_API_VERSION="0.18" -inherit autotools eutils gnome2 +inherit gnome2 vala if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi @@ -21,7 +22,9 @@ if [[ ${PV} = 9999 ]]; then else KEYWORDS="~amd64 ~x86" fi - +VALA_DEPEND="$(vala_depend) + net-libs/telepathy-glib[vala]" +# Configure is wrong; it needs cheese-3.5.91, not 3.3.91 RDEPEND=" >=dev-libs/glib-2.31.10:2 >=x11-libs/gtk+-3.4:3 @@ -30,10 +33,7 @@ RDEPEND=" >=net-libs/telepathy-glib-0.17.5 >=dev-libs/folks-0.7.2[eds] - v4l? ( - media-libs/gstreamer - media-libs/gst-plugins-base - >=media-video/cheese-3.3.5 ) + v4l? ( >=media-video/cheese-3.5.91 ) dev-libs/libgee:0 net-libs/gnome-online-accounts @@ -44,12 +44,13 @@ RDEPEND=" DEPEND="${RDEPEND} >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 - virtual/pkgconfig" + virtual/pkgconfig + !v4l? ( ${VALA_DEPEND} )" +# When !v4l, we regenerate the .c sources if [[ ${PV} = 9999 ]]; then - DEPEND="${DEPEND} - >=dev-lang/vala-0.17.2:0.18 - net-libs/telepathy-glib[vala]" + DEPEND+=" + ${VALA_DEPEND}" fi pkg_setup() { @@ -57,6 +58,16 @@ pkg_setup() { # We do not need valac when building from pre-generated C sources, # but configure checks for it anyway G2CONF="${G2CONF} - VALAC=$(type -P valac-0.18) + VALAC=$(type -P valac-$(vala_best_api_version)) $(use_with v4l cheese)" + # FIXME: Fails to compile with USE=-v4l +} + +src_prepare() { + # Regenerate the pre-generated C sources + if ! use v4l; then + touch src/*.vala + fi + # We don't want vala_src_prepare + gnome2_src_prepare }