From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 75ED41396D9 for ; Sun, 19 Nov 2017 22:33:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E0D2E0F3B; Sun, 19 Nov 2017 22:33:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5D963E0F3B for ; Sun, 19 Nov 2017 22:33:20 +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 3FCE033BE19 for ; Sun, 19 Nov 2017 22:33:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 02071A0A9 for ; Sun, 19 Nov 2017 22:33:18 +0000 (UTC) From: "Andreas Sturmlechner" 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" Message-ID: <1511118466.68572f8a77699470a0ebfa68a2545bb05e940410.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.08.3_p20171029.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: 68572f8a77699470a0ebfa68a2545bb05e940410 X-VCS-Branch: master Date: Sun, 19 Nov 2017 22:33:18 +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: 66bbaa66-82d5-4bc5-ace2-a02f60c0bda0 X-Archives-Hash: 9ee4249497974084280075bb77f67a2f commit: 68572f8a77699470a0ebfa68a2545bb05e940410 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 19 19:07:46 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Nov 19 19:07:46 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=68572f8a kde-apps/kopete: Drop 17.08.3_p20171029 Moved to Gentoo main ebuild repository. Package-Manager: Portage-2.3.14, Repoman-2.3.6 kde-apps/kopete/kopete-17.08.3_p20171029.ebuild | 171 ------------------------ kde-apps/kopete/kopete-9999.ebuild | 6 +- 2 files changed, 3 insertions(+), 174 deletions(-) diff --git a/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild b/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild deleted file mode 100644 index ded0555be7..0000000000 --- a/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -COMMIT=d7dbacb483124d5d6a8ad30586ec126c8514a715 -KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional" -inherit kde5 vcs-snapshot - -DESCRIPTION="Multi-protocol IM client based on KDE Frameworks" -HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete" -SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -KEYWORDS="~amd64 ~x86" -IUSE="ssl v4l" - -# tests hang, last checked for 4.2.96 -RESTRICT+=" test" - -# Available plugins -# -# addbookmarks: NO DEPS -# alias: NO DEPS (disabled upstream) -# autoreplace: NO DEPS -# contactnotes: NO DEPS -# highlight: NO DEPS -# history: NO DEPS -# latex: virtual/latex as RDEPEND -# nowlistening: NO DEPS -# otr: libotr -# pipes: NO DEPS -# privacy: NO DEPS -# statistics: dev-db/sqlite:3 -# texteffect: NO DEPS -# translator: NO DEPS -# urlpicpreview: NO DEPS -# webpresence: libxml2 libxslt -# NOTE: By default we enable all plugins that don't have any dependencies -PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening -otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence" - -# Available protocols -# -# gadu: net-libs/libgadu @since 4.3 -# groupwise: app-crypt/qca:2 -# irc: NO DEPS, probably will fail so inform user about it -# xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK -# meanwhile: net-libs/meanwhile -# oscar: NO DEPS -# telepathy: net-libs/decibel -# testbed: NO DEPS -# winpopup: NO DEPS (we're adding samba as RDEPEND so it works) -# yahoo: media-libs/jasper -# zeroconf (bonjour): NO DEPS -# DISABLED until fixed: skype sms -PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp yahoo zeroconf" - -# disabled protocols -# telepathy: net-libs/decibel -# irc: NO DEPS -# msn: net-libs/libmsn -# qq: NO DEPS - -IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}" - -COMMONDEPEND=" - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep khtml) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep kemoticons) - $(add_frameworks_dep khtml) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kparts) - $(add_frameworks_dep ktexteditor) - $(add_kdeapps_dep kcontacts) - $(add_kdeapps_dep kidentitymanagement) - $(add_kdeapps_dep libkleo) - $(add_qt_dep qtgui) - $(add_qt_dep qtsql) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - app-crypt/gpgme[cxx,qt5] - dev-libs/libpcre - media-libs/phonon[qt5(+)] - x11-libs/libX11 - x11-libs/libXScrnSaver - gadu? ( >=net-libs/libgadu-1.8.0[threads] ) - groupwise? ( app-crypt/qca:2[qt5] ) - meanwhile? ( net-libs/meanwhile ) - otr? ( >=net-libs/libotr-4.0.0 ) - statistics? ( dev-db/sqlite:3 ) - v4l? ( media-libs/libv4l ) - webpresence? ( - dev-libs/libxml2 - dev-libs/libxslt - ) - xmpp? ( - app-crypt/qca:2[qt5] - net-dns/libidn - sys-libs/zlib - ) - yahoo? ( media-libs/jasper ) - zeroconf? ( - $(add_frameworks_dep kdnssd) - $(add_kdeapps_dep kidentitymanagement) - ) -" -RDEPEND="${COMMONDEPEND} - latex? ( - || ( - media-gfx/imagemagick - media-gfx/graphicsmagick[imagemagick] - ) - virtual/latex-base - ) - ssl? ( app-crypt/qca:2[ssl] ) -" -# sms? ( app-mobilephone/smssend ) -# winpopup? ( net-fs/samba ) -DEPEND="${COMMONDEPEND} - x11-proto/scrnsaverproto -" - -src_configure() { - local x x2 - # Handle common stuff - local mycmakeargs=( - -DDISABLE_VIDEOSUPPORT=$(usex !v4l) - ) - # enable protocols - for x in ${PROTOCOLS}; do - case ${x/+/} in - xmpp) x2=jabber ;; - zeroconf) x2=bonjour ;; - *) x2=${x/+/} ;; - esac - mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) ) - done - - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Libmsn=ON -DWITH_qq=OFF ) - - # disable until fixed: - mycmakeargs+=( -DWITH_{skype,sms}=OFF ) - - # enable plugins - for x in ${PLUGINS}; do - mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) ) - done - - kde5_src_configure -} - -pkg_postinst() { - kde5_pkg_postinst - - if ! use ssl; then - if use xmpp ; then - if ! has_version "app-crypt/qca:2[ssl]" ; then - elog "In order to use ssl in xmpp you'll need to" - elog "install app-crypt/qca package with USE=ssl." - fi - fi - fi -} diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild index 031314eee2..bc3daabc2d 100644 --- a/kde-apps/kopete/kopete-9999.ebuild +++ b/kde-apps/kopete/kopete-9999.ebuild @@ -141,6 +141,8 @@ src_configure() { local x x2 # Handle common stuff local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Libmsn=ON + -DWITH_qq=OFF -DDISABLE_VIDEOSUPPORT=$(usex !v4l) ) # $(cmake-utils_use_find_package jingle LiboRTP) @@ -158,10 +160,8 @@ src_configure() { mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) ) done - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Libmsn=ON -DWITH_qq=OFF ) - # disable until fixed: - mycmakeargs+=( -DWITH_{skype,sms}=OFF ) + mycmakeargs+=( -DWITH_{cryptography,libjingle,skype,sms}=OFF ) # enable plugins for x in ${PLUGINS}; do