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 C26BB138010 for ; Sun, 9 Sep 2012 12:44:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4610FE03E4; Sun, 9 Sep 2012 12:43:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id F3A72E03E4 for ; Sun, 9 Sep 2012 12:43:31 +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 389B233C559 for ; Sun, 9 Sep 2012 12:43:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 177E5E543C for ; Sun, 9 Sep 2012 12:43:29 +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: <1347192667.acca29502fb4123b71a50e1e2fe50de266969481.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-contacts/, gnome-extra/gnome-contacts/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-extra/gnome-contacts/files/gnome-contacts-3.5.4.1-gst-flag.patch gnome-extra/gnome-contacts/gnome-contacts-3.5.4.1.ebuild gnome-extra/gnome-contacts/gnome-contacts-3.5.91.ebuild gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild X-VCS-Directories: gnome-extra/gnome-contacts/ gnome-extra/gnome-contacts/files/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: acca29502fb4123b71a50e1e2fe50de266969481 X-VCS-Branch: master Date: Sun, 9 Sep 2012 12:43:29 +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: 9e4f8cce-2d8d-4a79-93a5-6e8fb48595b1 X-Archives-Hash: ab66d19b2115134e2bba0b4e43e1cd59 commit: acca29502fb4123b71a50e1e2fe50de266969481 Author: Nirbheek Chauhan gentoo org> AuthorDate: Sun Sep 9 06:04:52 2012 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Sun Sep 9 12:11:07 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=acca2950 gnome-extra/gnome-contacts: 3.5.4.1 → 3.5.91 --- .../files/gnome-contacts-3.5.4.1-gst-flag.patch | 52 -------------------- ...3.5.4.1.ebuild => gnome-contacts-3.5.91.ebuild} | 36 ++++++------- .../gnome-contacts/gnome-contacts-9999.ebuild | 29 ++++++----- 3 files changed, 34 insertions(+), 83 deletions(-) diff --git a/gnome-extra/gnome-contacts/files/gnome-contacts-3.5.4.1-gst-flag.patch b/gnome-extra/gnome-contacts/files/gnome-contacts-3.5.4.1-gst-flag.patch deleted file mode 100644 index ea69b83..0000000 --- a/gnome-extra/gnome-contacts/files/gnome-contacts-3.5.4.1-gst-flag.patch +++ /dev/null @@ -1,52 +0,0 @@ -From d67be14782eebfdc0685936071516de39ce4ce09 Mon Sep 17 00:00:00 2001 -From: Priit Laes -Date: Sat, 18 Aug 2012 13:25:07 +0300 -Subject: [PATCH] Add --{en,dis}able-gst flag to configure - -https://bugzilla.gnome.org/show_bug.cgi?id=682146 ---- - configure.ac | 26 +++++++++++++++++++++++--- - 1 files changed, 23 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 445a30e..3520f61 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -57,11 +57,31 @@ gstreamers_modules="gdk-x11-3.0 - cheese-gtk >= 3.3.5 - cheese - " --PKG_CHECK_MODULES(CONTACTS_GSTREAMER, -+ -+AC_MSG_CHECKING([whether to enable gstreamer/cheese support]) -+AC_ARG_ENABLE([gst], -+ AS_HELP_STRING([--enable-gst], [Whether to enable gstreamer and cheese support @<:@default=auto@:>@]), -+ [], [enable_gst=auto]) -+AC_MSG_RESULT([$enable_gst]) -+if test "$enable_gst" != "no"; then -+ PKG_CHECK_MODULES(CONTACTS_GSTREAMER, - [$gstreamers_modules], -- AM_CONDITIONAL(USE_GSTREAMER, true), -- AM_CONDITIONAL(USE_GSTREAMER, false)) -+ [have_gst=yes], [have_gst=no]) -+ if test "$enable_gst" = "yes" -a "$have_gst" = "no"; then -+ AC_MSG_ERROR([GStreamer/Cheese support was requested but requirements were not met]) -+ elif test "$have_gst" = "yes"; then -+ enable_gst=yes -+ else -+ enable_gst=no -+ fi -+fi -+ -+if test "$enable_gst" = "yes"; then -+ AC_DEFINE([USE_GSTREAMER], 1, -+ [Define to enable gstreamer/cheese support]) -+fi - -+AM_CONDITIONAL(USE_GSTREAMER, test "$enable_gst" = "yes") - CONTACTS_GSTREAMER_PACKAGES="--pkg gdk-x11-3.0 --pkg gstreamer-0.10 --pkg gstreamer-interfaces-0.10" - AC_SUBST(CONTACTS_GSTREAMER_PACKAGES) - --- -1.7.8.6 - diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.5.4.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.5.91.ebuild similarity index 66% rename from gnome-extra/gnome-contacts/gnome-contacts-3.5.4.1.ebuild rename to gnome-extra/gnome-contacts/gnome-contacts-3.5.91.ebuild index 5653f11..6f7c8de 100644 --- a/gnome-extra/gnome-contacts/gnome-contacts-3.5.4.1.ebuild +++ b/gnome-extra/gnome-contacts/gnome-contacts-3.5.91.ebuild @@ -15,24 +15,25 @@ HOMEPAGE="https://live.gnome.org/Design/Apps/Contacts" LICENSE="GPL-2" SLOT="0" -IUSE="gstreamer" +IUSE="v4l" if [[ ${PV} = 9999 ]]; then KEYWORDS="" else KEYWORDS="~amd64 ~x86" fi -RDEPEND=">=dev-libs/folks-0.7.2[eds] +RDEPEND=" >=dev-libs/glib-2.31.10:2 >=x11-libs/gtk+-3.4:3 >=gnome-extra/evolution-data-server-3.5.3[gnome-online-accounts] >=gnome-base/gnome-desktop-3.0:3 >=net-libs/telepathy-glib-0.17.5 + >=dev-libs/folks-0.7.2[eds] - gstreamer? ( media-libs/gstreamer - media-libs/gst-plugins-base - >=media-video/cheese-3.3.5 - ) + v4l? ( + media-libs/gstreamer + media-libs/gst-plugins-base + >=media-video/cheese-3.3.5 ) dev-libs/libgee:0 net-libs/gnome-online-accounts @@ -44,22 +45,19 @@ DEPEND="${RDEPEND} >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig" -# Regenerating C from vala sources requires: -# >=dev-lang/vala-0.17.2:0.18 -# net-libs/telepathy-glib[vala] + +if [[ ${PV} = 9999 ]]; then + DEPEND="${DEPEND} + >=dev-lang/vala-0.17.2:0.18 + net-libs/telepathy-glib[vala]" +fi pkg_setup() { DOCS="AUTHORS ChangeLog NEWS" # README is empty # 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) - $(use_enable gstreamer gst)" -} - -src_prepare() { - gnome2_src_prepare - # Automagic gstreamer - # https://bugzilla.gnome.org/show_bug.cgi?id=682146 - epatch "${FILESDIR}/${P}-gst-flag.patch" - eautoreconf + G2CONF="${G2CONF} + VALAC=$(type -P valac-0.18) + $(use_with v4l cheese)" + # FIXME: Fails to compile with USE=-v4l } diff --git a/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild index 2ed69b1..326f5c3 100644 --- a/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild +++ b/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild @@ -5,7 +5,7 @@ EAPI="4" GCONF_DEBUG="no" -inherit gnome2 +inherit autotools eutils gnome2 if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi @@ -15,24 +15,25 @@ HOMEPAGE="https://live.gnome.org/Design/Apps/Contacts" LICENSE="GPL-2" SLOT="0" -IUSE="gstreamer" +IUSE="v4l" if [[ ${PV} = 9999 ]]; then KEYWORDS="" else KEYWORDS="~amd64 ~x86" fi -RDEPEND=">=dev-libs/folks-0.7.2[eds] +RDEPEND=" >=dev-libs/glib-2.31.10:2 >=x11-libs/gtk+-3.4:3 >=gnome-extra/evolution-data-server-3.5.3[gnome-online-accounts] >=gnome-base/gnome-desktop-3.0:3 >=net-libs/telepathy-glib-0.17.5 + >=dev-libs/folks-0.7.2[eds] - gstreamer? ( media-libs/gstreamer - media-libs/gst-plugins-base - >=media-video/cheese-3.3.5 - ) + v4l? ( + media-libs/gstreamer + media-libs/gst-plugins-base + >=media-video/cheese-3.3.5 ) dev-libs/libgee:0 net-libs/gnome-online-accounts @@ -44,14 +45,18 @@ DEPEND="${RDEPEND} >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig" -# Regenerating C from vala sources requires: -# >=dev-lang/vala-0.17.2:0.18 -# net-libs/telepathy-glib[vala] + +if [[ ${PV} = 9999 ]]; then + DEPEND="${DEPEND} + >=dev-lang/vala-0.17.2:0.18 + net-libs/telepathy-glib[vala]" +fi pkg_setup() { DOCS="AUTHORS ChangeLog NEWS" # README is empty # 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) - $(use_enable gstreamer gst)" + G2CONF="${G2CONF} + VALAC=$(type -P valac-0.18) + $(use_with v4l cheese)" }