commit: d5b996d08fc0b98c8c59cb7853390e0be6efab3d Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Nov 19 18:01:56 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Nov 19 18:01:56 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d5b996d0
kde-apps/kopete: Disable broken cryptography, jingle Package-Manager: Portage-2.3.14, Repoman-2.3.6 kde-apps/kopete/kopete-17.08.3_p20171029.ebuild | 24 ++-------------- kde-apps/kopete/kopete-9999.ebuild | 38 ++++++++++++------------- kde-apps/kopete/metadata.xml | 1 - 3 files changed, 21 insertions(+), 42 deletions(-) diff --git a/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild b/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild index 2cc8c33ec6..2e91d8471d 100644 --- a/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild +++ b/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild @@ -24,7 +24,6 @@ RESTRICT+=" test" # alias: NO DEPS (disabled upstream) # autoreplace: NO DEPS # contactnotes: NO DEPS -# cryptography: app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5 # highlight: NO DEPS # history: NO DEPS # latex: virtual/latex as RDEPEND @@ -38,9 +37,8 @@ RESTRICT+=" test" # urlpicpreview: NO DEPS # webpresence: libxml2 libxslt # NOTE: By default we enable all plugins that don't have any dependencies -PLUGINS="+addbookmarks +autoreplace +contactnotes +cryptography +highlight -history latex nowlistening otr pipes +privacy +statistics +texteffect -translator +urlpicpreview webpresence" +PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening +otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence" # Available protocols # @@ -48,7 +46,6 @@ translator +urlpicpreview webpresence" # 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 -# jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM # meanwhile: net-libs/meanwhile # oscar: NO DEPS # telepathy: net-libs/decibel @@ -57,8 +54,7 @@ translator +urlpicpreview webpresence" # yahoo: media-libs/jasper # zeroconf (bonjour): NO DEPS # DISABLED until fixed: skype sms -PROTOCOLS="gadu groupwise jingle meanwhile oscar -testbed winpopup +xmpp yahoo zeroconf" +PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp yahoo zeroconf" # disabled protocols # telepathy: net-libs/decibel @@ -68,7 +64,6 @@ testbed winpopup +xmpp yahoo zeroconf" IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}" -# media-libs/qimageblitz COMMONDEPEND=" $(add_frameworks_dep kcmutils) $(add_frameworks_dep kconfig) @@ -98,14 +93,6 @@ COMMONDEPEND=" x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5] ) - jingle? ( - dev-libs/expat - dev-libs/openssl:0 - >=media-libs/mediastreamer-2.3.0 - media-libs/speex - net-libs/libsrtp:= - net-libs/ortp:= - ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) @@ -139,22 +126,17 @@ RDEPEND="${COMMONDEPEND} # winpopup? ( net-fs/samba ) DEPEND="${COMMONDEPEND} x11-proto/scrnsaverproto - jingle? ( dev-libs/jsoncpp ) " src_configure() { local x x2 # Handle common stuff local mycmakeargs=( - $(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 - jingle) x2=libjingle ;; xmpp) x2=jabber ;; zeroconf) x2=bonjour ;; *) x2=${x/+/} ;; diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild index 5b143ac46c..031314eee2 100644 --- a/kde-apps/kopete/kopete-9999.ebuild +++ b/kde-apps/kopete/kopete-9999.ebuild @@ -22,7 +22,7 @@ RESTRICT+=" test" # alias: NO DEPS (disabled upstream) # autoreplace: NO DEPS # contactnotes: NO DEPS -# cryptography: app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5 +# cryptography: BROKEN (app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5) # highlight: NO DEPS # history: NO DEPS # latex: virtual/latex as RDEPEND @@ -36,9 +36,8 @@ RESTRICT+=" test" # urlpicpreview: NO DEPS # webpresence: libxml2 libxslt # NOTE: By default we enable all plugins that don't have any dependencies -PLUGINS="+addbookmarks +autoreplace +contactnotes +cryptography +highlight -history latex nowlistening otr pipes +privacy +statistics +texteffect -translator +urlpicpreview webpresence" +PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening +otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence" # Available protocols # @@ -46,7 +45,7 @@ translator +urlpicpreview webpresence" # 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 -# jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM +# jingle: BROKEN (media-libs/speex net-libs/ortp) DISABLED BY UPSTREAM # meanwhile: net-libs/meanwhile # oscar: NO DEPS # telepathy: net-libs/decibel @@ -55,8 +54,7 @@ translator +urlpicpreview webpresence" # yahoo: media-libs/jasper # zeroconf (bonjour): NO DEPS # DISABLED until fixed: skype sms -PROTOCOLS="gadu groupwise jingle meanwhile oscar -testbed winpopup +xmpp yahoo zeroconf" +PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp yahoo zeroconf" # disabled protocols # telepathy: net-libs/decibel @@ -66,7 +64,6 @@ testbed winpopup +xmpp yahoo zeroconf" IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}" -# media-libs/qimageblitz COMMONDEPEND=" $(add_frameworks_dep kcmutils) $(add_frameworks_dep kconfig) @@ -96,14 +93,6 @@ COMMONDEPEND=" x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5] ) - jingle? ( - dev-libs/expat - dev-libs/openssl:0 - >=media-libs/mediastreamer-2.3.0 - media-libs/speex - net-libs/libsrtp:= - net-libs/ortp:= - ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) @@ -123,6 +112,14 @@ COMMONDEPEND=" $(add_kdeapps_dep kidentitymanagement) ) " +# jingle? ( +# dev-libs/expat +# dev-libs/openssl:0 +# >=media-libs/mediastreamer-2.3.0 +# media-libs/speex +# net-libs/libsrtp:= +# net-libs/ortp:= +# ) RDEPEND="${COMMONDEPEND} latex? ( || ( @@ -137,18 +134,19 @@ RDEPEND="${COMMONDEPEND} # winpopup? ( net-fs/samba ) DEPEND="${COMMONDEPEND} x11-proto/scrnsaverproto - jingle? ( dev-libs/jsoncpp ) " +# jingle? ( dev-libs/jsoncpp ) src_configure() { local x x2 # Handle common stuff local mycmakeargs=( - $(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) ) +# $(cmake-utils_use_find_package jingle LiboRTP) +# $(cmake-utils_use_find_package jingle Mediastreamer) +# $(cmake-utils_use_find_package jingle Speex) + # enable protocols for x in ${PROTOCOLS}; do case ${x/+/} in diff --git a/kde-apps/kopete/metadata.xml b/kde-apps/kopete/metadata.xml index 2b6a3b5d29..22e128fe4d 100644 --- a/kde-apps/kopete/metadata.xml +++ b/kde-apps/kopete/metadata.xml @@ -6,7 +6,6 @@ <flag name="addbookmarks">Automatically add incoming urls to bookmarks.</flag> <flag name="autoreplace">Automatically replace selected text</flag> <flag name="contactnotes">Enables writing personal notes for contacts.</flag> - <flag name="cryptography">Enable cryptography plugin</flag> <flag name="highlight">Allows you to specify highlights on specific events.</flag> <flag name="history">Enables saving chat history.</flag> <flag name="latex">Embed latex formatted text into messages.</flag>