From: "Johannes Huber" <johu@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kopete/
Date: Thu, 7 Apr 2016 19:23:50 +0000 (UTC) [thread overview]
Message-ID: <1460057007.d353f20a60653029b84c4e91834688c39da3a4b4.johu@gentoo> (raw)
commit: d353f20a60653029b84c4e91834688c39da3a4b4
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 7 18:58:21 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Apr 7 19:23:27 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d353f20a
kde-apps/kopete: EAPI 6
Package-Manager: portage-2.2.28
kde-apps/kopete/kopete-16.03.90.ebuild | 25 +++++++++----------------
kde-apps/kopete/kopete-16.04.49.9999.ebuild | 25 +++++++++----------------
kde-apps/kopete/kopete-9999.ebuild | 25 +++++++++----------------
3 files changed, 27 insertions(+), 48 deletions(-)
diff --git a/kde-apps/kopete/kopete-16.03.90.ebuild b/kde-apps/kopete/kopete-16.03.90.ebuild
index 0685e5a..4113413 100644
--- a/kde-apps/kopete/kopete-16.03.90.ebuild
+++ b/kde-apps/kopete/kopete-16.03.90.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
KDE_HANDBOOK="optional"
inherit kde4-base
@@ -111,7 +111,6 @@ RDEPEND="${COMMONDEPEND}
ssl? ( app-crypt/qca:2[openssl] )
winpopup? ( net-fs/samba )
"
-# telepathy? ( net-libs/decibel )"
DEPEND="${COMMONDEPEND}
jingle? ( dev-libs/jsoncpp )
!aqua? ( x11-proto/scrnsaverproto )
@@ -121,27 +120,27 @@ src_configure() {
local x x2
# Handle common stuff
local mycmakeargs=(
- $(cmake-utils_use_with jingle GOOGLETALK)
- $(cmake-utils_use_with jingle LiboRTP)
- $(cmake-utils_use_with jingle Mediastreamer)
- $(cmake-utils_use_with jingle Speex)
- $(cmake-utils_use_disable v4l VIDEOSUPPORT)
+ -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 ;;
xmpp) x2=jabber ;;
- *) x2='' ;;
+ *) x2=${x/+/} ;;
esac
- mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
+ mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
done
mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF )
# enable plugins
for x in ${PLUGINS}; do
- mycmakeargs+=($(cmake-utils_use_with ${x/+/}))
+ mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
done
kde4-base_src_configure
@@ -150,12 +149,6 @@ src_configure() {
pkg_postinst() {
kde4-base_pkg_postinst
- #if use telepathy; then
- # elog "To use kopete telepathy plugins, you need to start gabble first:"
- # elog "GABBLE_PERSIST=1 telepathy-gabble &"
- # elog "export TELEPATHY_DATA_PATH='${EPREFIX}/usr/share/telepathy/managers/'"
- #fi
-
if ! use ssl; then
if use xmpp ; then # || use irc; then
if ! has_version "app-crypt/qca:2[openssl]" ; then
diff --git a/kde-apps/kopete/kopete-16.04.49.9999.ebuild b/kde-apps/kopete/kopete-16.04.49.9999.ebuild
index ea8ef2f..2430c97 100644
--- a/kde-apps/kopete/kopete-16.04.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
KDE_HANDBOOK="optional"
inherit kde4-base
@@ -111,7 +111,6 @@ RDEPEND="${COMMONDEPEND}
ssl? ( app-crypt/qca:2[openssl] )
winpopup? ( net-fs/samba )
"
-# telepathy? ( net-libs/decibel )"
DEPEND="${COMMONDEPEND}
jingle? ( dev-libs/jsoncpp )
!aqua? ( x11-proto/scrnsaverproto )
@@ -121,27 +120,27 @@ src_configure() {
local x x2
# Handle common stuff
local mycmakeargs=(
- $(cmake-utils_use_with jingle GOOGLETALK)
- $(cmake-utils_use_with jingle LiboRTP)
- $(cmake-utils_use_with jingle Mediastreamer)
- $(cmake-utils_use_with jingle Speex)
- $(cmake-utils_use_disable v4l VIDEOSUPPORT)
+ -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 ;;
xmpp) x2=jabber ;;
- *) x2='' ;;
+ *) x2=${x/+/} ;;
esac
- mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
+ mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
done
mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF )
# enable plugins
for x in ${PLUGINS}; do
- mycmakeargs+=($(cmake-utils_use_with ${x/+/}))
+ mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
done
kde4-base_src_configure
@@ -150,12 +149,6 @@ src_configure() {
pkg_postinst() {
kde4-base_pkg_postinst
- #if use telepathy; then
- # elog "To use kopete telepathy plugins, you need to start gabble first:"
- # elog "GABBLE_PERSIST=1 telepathy-gabble &"
- # elog "export TELEPATHY_DATA_PATH='${EPREFIX}/usr/share/telepathy/managers/'"
- #fi
-
if ! use ssl; then
if use xmpp ; then # || use irc; then
if ! has_version "app-crypt/qca:2[openssl]" ; then
diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index ea8ef2f..2430c97 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
KDE_HANDBOOK="optional"
inherit kde4-base
@@ -111,7 +111,6 @@ RDEPEND="${COMMONDEPEND}
ssl? ( app-crypt/qca:2[openssl] )
winpopup? ( net-fs/samba )
"
-# telepathy? ( net-libs/decibel )"
DEPEND="${COMMONDEPEND}
jingle? ( dev-libs/jsoncpp )
!aqua? ( x11-proto/scrnsaverproto )
@@ -121,27 +120,27 @@ src_configure() {
local x x2
# Handle common stuff
local mycmakeargs=(
- $(cmake-utils_use_with jingle GOOGLETALK)
- $(cmake-utils_use_with jingle LiboRTP)
- $(cmake-utils_use_with jingle Mediastreamer)
- $(cmake-utils_use_with jingle Speex)
- $(cmake-utils_use_disable v4l VIDEOSUPPORT)
+ -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 ;;
xmpp) x2=jabber ;;
- *) x2='' ;;
+ *) x2=${x/+/} ;;
esac
- mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
+ mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
done
mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF )
# enable plugins
for x in ${PLUGINS}; do
- mycmakeargs+=($(cmake-utils_use_with ${x/+/}))
+ mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
done
kde4-base_src_configure
@@ -150,12 +149,6 @@ src_configure() {
pkg_postinst() {
kde4-base_pkg_postinst
- #if use telepathy; then
- # elog "To use kopete telepathy plugins, you need to start gabble first:"
- # elog "GABBLE_PERSIST=1 telepathy-gabble &"
- # elog "export TELEPATHY_DATA_PATH='${EPREFIX}/usr/share/telepathy/managers/'"
- #fi
-
if ! use ssl; then
if use xmpp ; then # || use irc; then
if ! has_version "app-crypt/qca:2[openssl]" ; then
next reply other threads:[~2016-04-07 19:24 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-07 19:23 Johannes Huber [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-06-16 19:37 [gentoo-commits] proj/kde:master commit in: kde-apps/kopete/ Andreas Sturmlechner
2023-03-23 11:42 Andreas Sturmlechner
2023-01-30 21:01 Andreas Sturmlechner
2023-01-30 21:01 Andreas Sturmlechner
2022-10-06 9:02 Andreas Sturmlechner
2022-04-15 19:34 Andreas Sturmlechner
2022-02-17 19:00 Sam James
2021-05-07 15:24 Andreas Sturmlechner
2020-10-29 19:39 Andreas Sturmlechner
2019-11-24 17:47 Andreas Sturmlechner
2019-11-24 11:05 Andreas Sturmlechner
2019-11-24 11:05 Andreas Sturmlechner
2019-09-16 0:07 Andreas Sturmlechner
2019-09-16 0:07 Andreas Sturmlechner
2018-08-16 20:26 Andreas Sturmlechner
2018-08-09 21:41 Andreas Sturmlechner
2018-07-07 10:27 Andreas Sturmlechner
2018-06-16 20:25 Andreas Sturmlechner
2018-05-18 7:22 Andreas Sturmlechner
2018-02-22 13:17 Andreas Sturmlechner
2018-02-09 22:07 Andreas Sturmlechner
2018-01-18 13:28 Andreas Sturmlechner
2017-11-19 22:33 Andreas Sturmlechner
2017-11-19 18:03 Andreas Sturmlechner
2017-11-19 18:03 Andreas Sturmlechner
2017-11-11 22:05 Andreas Sturmlechner
2017-09-18 18:57 Johannes Huber
2017-08-11 14:16 Andreas Sturmlechner
2017-05-11 21:48 Andreas Sturmlechner
2017-04-05 20:15 Andreas Sturmlechner
2017-03-28 12:17 Andreas Sturmlechner
2017-03-26 20:19 Andreas Sturmlechner
2017-03-24 17:55 Andreas Sturmlechner
2017-03-21 22:23 Andreas Sturmlechner
2017-02-12 20:08 Johannes Huber
2016-11-12 10:55 Michael Palimaka
2016-08-10 19:36 Michael Palimaka
2015-08-26 21:43 Johannes Huber
2015-08-26 21:43 Johannes Huber
2015-02-22 21:57 Johannes Huber
2015-02-17 13:48 Michael Palimaka
2015-02-06 17:07 Michael Palimaka
2015-01-28 23:45 Johannes Huber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1460057007.d353f20a60653029b84c4e91834688c39da3a4b4.johu@gentoo \
--to=johu@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox