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/+/}) )
