From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-941240-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 609A3139694
for <garchives@archives.gentoo.org>; Tue, 28 Mar 2017 12:17:07 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id AF99E21C0A0;
Tue, 28 Mar 2017 12:17:06 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 7CBB921C0A0
for <gentoo-commits@lists.gentoo.org>; Tue, 28 Mar 2017 12:17:06 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 0251834106E
for <gentoo-commits@lists.gentoo.org>; Tue, 28 Mar 2017 12:17:05 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id C576D7300
for <gentoo-commits@lists.gentoo.org>; Tue, 28 Mar 2017 12:17:03 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1490703205.c6c9c0bec5ffd2e381cbab26e519913f611a1b95.asturm@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kopete/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-apps/kopete/kopete-17.03.80.ebuild kde-apps/kopete/kopete-17.04.49.9999.ebuild kde-apps/kopete/kopete-5.9999.ebuild kde-apps/kopete/kopete-9999.ebuild
X-VCS-Directories: kde-apps/kopete/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: c6c9c0bec5ffd2e381cbab26e519913f611a1b95
X-VCS-Branch: master
Date: Tue, 28 Mar 2017 12:17:03 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 9c9b832a-bc61-434c-a0aa-4b8183915f84
X-Archives-Hash: 4011d831b8013068a94576b675ef79a1
commit: c6c9c0bec5ffd2e381cbab26e519913f611a1b95
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 28 12:13:25 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 28 12:13:25 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c6c9c0be
kde-apps/kopete: Fix DEPEND, build flags
Package-Manager: Portage-2.3.3, Repoman-2.3.1
kde-apps/kopete/kopete-17.03.80.ebuild | 7 +++----
kde-apps/kopete/kopete-17.04.49.9999.ebuild | 7 +++----
kde-apps/kopete/kopete-5.9999.ebuild | 12 ++++++------
kde-apps/kopete/kopete-9999.ebuild | 7 +++----
4 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/kde-apps/kopete/kopete-17.03.80.ebuild b/kde-apps/kopete/kopete-17.03.80.ebuild
index fb5807f931..be9563fab7 100644
--- a/kde-apps/kopete/kopete-17.03.80.ebuild
+++ b/kde-apps/kopete/kopete-17.03.80.ebuild
@@ -86,7 +86,6 @@ COMMONDEPEND="
dev-libs/expat
dev-libs/openssl:0
>=media-libs/mediastreamer-2.3.0
- media-libs/speex
net-libs/libsrtp:=
net-libs/ortp:=
)
@@ -107,6 +106,7 @@ COMMONDEPEND="
yahoo? ( media-libs/jasper )
"
RDEPEND="${COMMONDEPEND}
+ jingle? ( media-libs/speex )
latex? (
virtual/imagemagick-tools
virtual/latex-base
@@ -123,17 +123,16 @@ src_configure() {
local x x2
# Handle common stuff
local mycmakeargs=(
- -DWITH_GOOGLETALK=$(usex jingle)
-DWITH_LiboRTP=$(usex jingle)
-DWITH_Mediastreamer=$(usex jingle)
- -DWITH_Speex=$(usex jingle)
-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
)
# enable protocols
for x in ${PROTOCOLS}; do
case ${x/+/} in
- zeroconf) x2=bonjour ;;
+ jingle) x2=libjingle ;;
xmpp) x2=jabber ;;
+ zeroconf) x2=bonjour ;;
*) x2=${x/+/} ;;
esac
mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
diff --git a/kde-apps/kopete/kopete-17.04.49.9999.ebuild b/kde-apps/kopete/kopete-17.04.49.9999.ebuild
index 72c5b2f385..d51b05e789 100644
--- a/kde-apps/kopete/kopete-17.04.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-17.04.49.9999.ebuild
@@ -86,7 +86,6 @@ COMMONDEPEND="
dev-libs/expat
dev-libs/openssl:0
>=media-libs/mediastreamer-2.3.0
- media-libs/speex
net-libs/libsrtp:=
net-libs/ortp:=
)
@@ -107,6 +106,7 @@ COMMONDEPEND="
yahoo? ( media-libs/jasper )
"
RDEPEND="${COMMONDEPEND}
+ jingle? ( media-libs/speex )
latex? (
virtual/imagemagick-tools
virtual/latex-base
@@ -123,17 +123,16 @@ src_configure() {
local x x2
# Handle common stuff
local mycmakeargs=(
- -DWITH_GOOGLETALK=$(usex jingle)
-DWITH_LiboRTP=$(usex jingle)
-DWITH_Mediastreamer=$(usex jingle)
- -DWITH_Speex=$(usex jingle)
-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
)
# enable protocols
for x in ${PROTOCOLS}; do
case ${x/+/} in
- zeroconf) x2=bonjour ;;
+ jingle) x2=libjingle ;;
xmpp) x2=jabber ;;
+ zeroconf) x2=bonjour ;;
*) x2=${x/+/} ;;
esac
mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
diff --git a/kde-apps/kopete/kopete-5.9999.ebuild b/kde-apps/kopete/kopete-5.9999.ebuild
index b6441411dc..be07a028bc 100644
--- a/kde-apps/kopete/kopete-5.9999.ebuild
+++ b/kde-apps/kopete/kopete-5.9999.ebuild
@@ -139,23 +139,23 @@ src_configure() {
local x x2
# Handle common stuff
local mycmakeargs=(
- -DWITH_GOOGLETALK=$(usex jingle)
- -DWITH_LiboRTP=$(usex jingle)
- -DWITH_Mediastreamer=$(usex jingle)
- -DWITH_Speex=$(usex jingle)
+ $(cmake-utils_use_find_package jingle LiboRTP)
+ $(cmake-utils_use_find_package jingle Mediastreamer)
+ $(cmake-utils_use_find_package jingle Speex)
-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
)
# enable protocols
for x in ${PROTOCOLS}; do
case ${x/+/} in
- zeroconf) x2=bonjour ;;
+ jingle) x2=libjingle ;;
xmpp) x2=jabber ;;
+ zeroconf) x2=bonjour ;;
*) x2=${x/+/} ;;
esac
mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
done
- mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF )
+ mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Libmsn=ON -DWITH_qq=OFF )
# disable until fixed:
mycmakeargs+=( -DWITH_{skype,sms}=OFF )
diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index 72c5b2f385..d51b05e789 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -86,7 +86,6 @@ COMMONDEPEND="
dev-libs/expat
dev-libs/openssl:0
>=media-libs/mediastreamer-2.3.0
- media-libs/speex
net-libs/libsrtp:=
net-libs/ortp:=
)
@@ -107,6 +106,7 @@ COMMONDEPEND="
yahoo? ( media-libs/jasper )
"
RDEPEND="${COMMONDEPEND}
+ jingle? ( media-libs/speex )
latex? (
virtual/imagemagick-tools
virtual/latex-base
@@ -123,17 +123,16 @@ src_configure() {
local x x2
# Handle common stuff
local mycmakeargs=(
- -DWITH_GOOGLETALK=$(usex jingle)
-DWITH_LiboRTP=$(usex jingle)
-DWITH_Mediastreamer=$(usex jingle)
- -DWITH_Speex=$(usex jingle)
-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
)
# enable protocols
for x in ${PROTOCOLS}; do
case ${x/+/} in
- zeroconf) x2=bonjour ;;
+ jingle) x2=libjingle ;;
xmpp) x2=jabber ;;
+ zeroconf) x2=bonjour ;;
*) x2=${x/+/} ;;
esac
mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )