gentoo auto-resync : 05:04:2023 - 05:24:13

4 files changed, 1 insertions, 201 deletions

diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest
index 3122237688c9..e4a02fa5697f 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1,6 +1,3 @@
-AUX kopete-22.08.3-fix-kf-5.100-version-check.patch 760 BLAKE2B cf212bdd78f300f6857278dc3806c6fc5874818355f73b5ccfe30c6c5d4f749e42de4445a1794f2d19c18aad1414e993b1eb56697309d08b95fb103824cae819 SHA512 cf891d369a6890f46d0ef09233bddde60e809bde6808e681991f7871ac43ec1bb6fd501012b78dc2fa57e29019ed5911070281c537c8b7e861c7a1c54038c0f3
-DIST kopete-22.08.3.tar.xz 9668280 BLAKE2B f844bbd82e196507c16c568c32994b5d06077075f53a5d2fb99e74f2bcd972eb6350bdb38f597a937fdb6040bd7c232689bf2eef1b903dbccb919f3ed3b63cf6 SHA512 91e9a0e76e5b633e7e0454e7eba6fd163a912ad72675f3a2e049aba1f7cd306e54383894e783d417dde3961e91ec9b96f5b55772b4f29cd9c107acc185ef346c
 DIST kopete-22.12.3.tar.xz 10280244 BLAKE2B 9eada862291d164e0c0dd3ea583e72002fa5480acf178dd6fd152df338f5884eaa802efe0f4a6dd118f3d09960a77178b914131766e5b3ad785ff91384fd8dec SHA512 74ba83115c02936631f907ec52ff8b4bc0e637f43dcef597db84e222a34506e7a0325f9457b04383e8ae328fcbd663be113fc93c1804bed7d5e4262f171c0c8d
-EBUILD kopete-22.08.3.ebuild 4471 BLAKE2B 0b58ba2be8d617c276048fb0ea5687940d6bd838c2b893ce2b1d6e7a4c703f9674f91d1b0cfa4ce1e9ed292735cc245c419d8ea06b1f777c4ae35f81261b676f SHA512 0f2c5653458a8f19c67b1459980984915a33d07fce6ea452b88572bb2afbaafcdecfd0d7d2c3483fc052401201c30aa123b4a1b98fee99b72624a693e2508f75
 EBUILD kopete-22.12.3.ebuild 4590 BLAKE2B 90dd4e410b7f25ae99cca871f1720165c987574df389beada47667c80cae2571caf45bcf5a65632fa66c2524db19b224c1e3ef2779df3d48b7bacd7fd5c9a1a1 SHA512 aee458257bf8763ff52e7a771d5f0a2681debd1ecb4fcc4b2c5eb41500f51de85b8a33907b3fde90ed9da9d792e2cc4d115e46adb4d6e7e4566be0fc8058b622
-MISC metadata.xml 2225 BLAKE2B cf869557d330e74a95d97689986cb79a6b66e6a7c32563f49179c07d58c94743afa147b1276fcea236a3039c9bb2ab0dc8f258b7a8c16e57648c3a6a30ba0120 SHA512 b72b4f8dfb9a5f1ebac243d3fda9d3c45a36abe4b8b0c2fe29132317fd71c35f78fde6a173383c22ed44f620e09202b341e3da023bb71c2028e2b885280d501c
+MISC metadata.xml 2154 BLAKE2B 0d51e5ba8a5c4d8ae2cea1412e0353c61e18b44f110959c5ba55ff140e5b33fa62878e56b7138a471b92b9e1a742b6a78c529b97a5aeb945b4f3f6565b7ac173 SHA512 b68dd01c55317679bc20508910cfad4e5a202ace0674d79871e352413d70e6d49f0fc48f4f32d9a76bb09f57427f305effcf1306f3a7030f0cf911ae60f8faf7
diff --git a/kde-apps/kopete/files/kopete-22.08.3-fix-kf-5.100-version-check.patch b/kde-apps/kopete/files/kopete-22.08.3-fix-kf-5.100-version-check.patch
deleted file mode 100644
index 421986ee2b3b..000000000000
--- a/kde-apps/kopete/files/kopete-22.08.3-fix-kf-5.100-version-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 553fc241b5ec701421cd51ae08eef7cabdeca654 Mon Sep 17 00:00:00 2001
-From: Jonathan Esk-Riddell <jr@jriddell.org>
-Date: Fri, 21 Oct 2022 17:39:23 +0000
-Subject: [PATCH] Fix build with KF >= 5.100
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ef6090fd0..079d36a2f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -161,7 +161,7 @@ add_subdirectory(styles)
- add_subdirectory(doc)
- add_subdirectory(tests)
- 
--if (${ECM_VERSION} STRGREATER "5.58.0")
-+if (${ECM_VERSION} VERSION_GREATER "5.58.0")
-     install( FILES kopete.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR} )
- else()
-     install( FILES kopete.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
--- 
-GitLab
-
diff --git a/kde-apps/kopete/kopete-22.08.3.ebuild b/kde-apps/kopete/kopete-22.08.3.ebuild
deleted file mode 100644
index e2075b6e1c5a..000000000000
--- a/kde-apps/kopete/kopete-22.08.3.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.96.0
-QTMIN=5.15.5
-inherit ecm gear.kde.org
-
-DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/kopete/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE="ssl v4l"
-
-# Available plugins
-#	addbookmarks: NO DEPS
-#	alias: NO DEPS (disabled upstream)
-#	autoreplace: NO DEPS
-#	contactnotes: NO DEPS
-#	cryptography: BROKEN (app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5)
-#	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)
-#	zeroconf (bonjour): NO DEPS
-PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp zeroconf"
-
-# disabled protocols
-#	irc: NO DEPS
-#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
-#	qq: NO DEPS
-#	telepathy: net-libs/decibel
-#	skype, sms (until fixed)
-
-IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
-
-COMMON_DEPEND="
-	app-crypt/gpgme:=[cxx,qt5]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kemoticons-${KFMIN}:5
-	>=kde-frameworks/khtml-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
-	groupwise? ( >=app-crypt/qca-2.3.0: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.3.0:2[qt5(+)]
-		net-dns/libidn:0=
-		sys-libs/zlib
-	)
-	zeroconf? (
-		>=kde-apps/kidentitymanagement-${PVCUT}:5
-		>=kde-frameworks/kdnssd-${KFMIN}:5
-	)
-"
-#	jingle? (
-#		dev-libs/expat
-#		dev-libs/openssl:0=
-#		>=media-libs/mediastreamer-2.3.0
-#		media-libs/speex
-#		net-libs/libsrtp:0=
-#		net-libs/ortp:=
-#	)
-RDEPEND="${COMMON_DEPEND}
-	latex? (
-		|| (
-			media-gfx/imagemagick
-			media-gfx/graphicsmagick[imagemagick]
-		)
-		virtual/latex-base
-	)
-	ssl? ( >=app-crypt/qca-2.3.0:2[qt5(+),ssl] )
-	xmpp? ( >=app-crypt/qca-2.3.0:2[qt5(+),ssl?] )
-"
-#	sms? ( app-mobilephone/smssend )
-#	winpopup? ( net-fs/samba )
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-#	jingle? ( dev-libs/jsoncpp )
-
-# tests hang, last checked for 4.2.96
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${P}-fix-kf-5.100-version-check.patch" )
-
-src_configure() {
-	local x x2
-	# Handle common stuff
-	local mycmakeargs=(
-		-DWITH_qq=OFF
-		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
-	)
-#		$(cmake_use_find_package jingle LiboRTP)
-#		$(cmake_use_find_package jingle Mediastreamer)
-#		$(cmake_use_find_package jingle Speex)
-
-	# enable protocols
-	for x in ${PROTOCOLS}; do
-		case ${x/+/} in
-			jingle) x2=libjingle ;;
-			xmpp) x2=jabber ;;
-			zeroconf) x2=bonjour ;;
-			*) x2=${x/+/} ;;
-		esac
-		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
-	done
-
-	# disable until fixed:
-	mycmakeargs+=( -DWITH_{cryptography,libjingle,skype,sms}=OFF )
-
-	# enable plugins
-	for x in ${PLUGINS}; do
-		mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
-	done
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kopete/metadata.xml b/kde-apps/kopete/metadata.xml
index 0facf6ad41f2..9a1313563104 100644
--- a/kde-apps/kopete/metadata.xml
+++ b/kde-apps/kopete/metadata.xml
@@ -18,7 +18,6 @@
 		<flag name="history">Enables saving chat history.</flag>
 		<flag name="latex">Embed latex formatted text into messages.</flag>
 		<flag name="nowlistening">Shows song you currently listen to in your status/etc. Bindings for many players.</flag>
-		<flag name="oscar">Enable Oscar (AIM/ICQ) IM protocol support</flag>
 		<flag name="otr">Allows crypting your chat (drugs and talking nonsense are considered as good alternatives ;]).</flag>
 		<flag name="pipes">Send messages to external pipe.</flag>
 		<flag name="privacy">Filter for incoming messages</flag>