gentoo resync : 03.03.2021

7 files changed, 57 insertions, 148 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index d0c6d2481d9d..9784ee15b82a 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/lurch/Manifest b/x11-plugins/lurch/Manifest
index 9c4417b2ed02..c81d547862dd 100644
--- a/x11-plugins/lurch/Manifest
+++ b/x11-plugins/lurch/Manifest
@@ -3,7 +3,7 @@ AUX lurch-0.6.8-libsignal-protocol-c.patch 2413 BLAKE2B 325972068267a455536b883e
 DIST axc-0.3.3.tar.gz 39497 BLAKE2B 7f13f2ee6bb98fecc3ff5ddb726e19d412d588613be50e6666e8bfdcf248e842b97c00cccbc19fef55c0df50053e0b80539f0573dfa7a54a8c88725735382bc6 SHA512 9fe494eb4a264a31c137a4f21e4a53358d55f6f6b3bd2fab0fbe43c0e85f2372127a2a85d00d2e308f3785b30cf8161de3f696aaf71c232f594ef3c54b8f6771
 DIST libomemo-0.7.0.tar.gz 23678 BLAKE2B 91b57f6c93d5f777996687ea0648d996950bc893314e4e3ee02973c70165a9e533ab6980a420bd270d7a4acaa45da7cf83b401b69e2b305b017a3fbb42d5b4d2 SHA512 f9843a35958e4a7930ed9e9f4bef1e765bd51721d6e79d2c092bad86d26f092d22d1cdd4df1c4017b9434bb84c33e226985136d35dfcbcf9b915eb3cae862fa5
 DIST lurch-0.6.8.tar.gz 398267 BLAKE2B 23211e82b80e26105f0d62510dc321abdd818eae21dd9f3e24f6ab01458748df64283acb99371a8ece34248f06e9e04edd35da30c771f45779474b3b43c3a53d SHA512 8b93523049d05a00f1d7286ec9d0d8d03c7ae46793ac72ea08c0d12cb5193324be4805fb6278d6c0f906d9c63db9d7ce6ca2a21442236df51e0ee0b48de6ef1d
-EBUILD lurch-0.6.8-r1.ebuild 2006 BLAKE2B 9baebff09485494eedbb088b70d05c3c856817fbeb6540a0b5e7d7f49fe1b66961df1800ba5f4acdff23dc589f54e2c65705bfda6d29d1f0f23e7eb8f80c5939 SHA512 e47e148356c1e7d5b06f493ae636e7ccc741d51dc5520d0fc20c34a7c8738617741566da3cd3c19638cfaf3b9ab7253f3eb68a30d042e7a8d6df84e43d0dac73
+DIST lurch-0.7.0.tar.gz 66885 BLAKE2B 1a3cc1dbfd8f999b677b23d02952a3c28c922d438cfe81a3bfd3a03cc49723fcc4d52a549bfc7ecb45616a0c939b0f78a39f73a4439bc5337d4da656e9d42b11 SHA512 082f85d25fbcb184b7b6d827e1e6bac073ad46064a144ca24245164558ca9e0cdfcdc4187ac3da5f8738e0476e759e67801d0fd24598b31e2d86053f8af576b6
 EBUILD lurch-0.6.8-r2.ebuild 2063 BLAKE2B 2742285436fab19c64317e57ea182e451966799a1724cf72e6b6977ef6d010f643e8ab32177cbeb0a69b96bfc8a37a16beea44b84b03e71fda61918853ea6edd SHA512 fdad83c1b8ee35ce10d87d1121c14e07661922095ddbbbc8529ec5692079d050f2de8f4481da6fbb309f963df8d692ee7d15507373244a9775a967df5b1d3690
-EBUILD lurch-0.6.8.ebuild 1718 BLAKE2B 5af54a0dc7bb979a814a93dde6b6b9afd05b3aa603599276db2983ecbd64fd129e8217b62cd1a2f8dea950def9da15242595f51f911eef9c3535dca67c26d1d2 SHA512 2fe714a97502f771a239937ba3af79610da1314ecd943f0ac1127afac2a143cf6b5cfe2181e4a01b8ef91979779a2b06ed46d0e1512396c2db8bf90d792b4d3b
+EBUILD lurch-0.7.0.ebuild 1221 BLAKE2B 143bd3bc6867957998c560f641f92e1bc8f30c4f24047ac6f00ef648b4f9f8e11be64bb074be9493f86f5d9f5f0088cc36fd5840c8e56b3480aeb49966cd4b5b SHA512 f77ec75ac4249a92257f20188206894504ded0db60e3626110d04f5686704311d60779113fecd84278b48341f2ae265c21045398d2894e43d7a649f65e635bdf
 MISC metadata.xml 249 BLAKE2B a4931a30c3947b238913053d611639235b076475e864914e684020d86ee1b4aa6da94e4cef59c53a0e5ccd3b3d15d3a4ae293800b17bbb89e0af9cff79314a70 SHA512 b1cb770984baef468e3d17e343acff395e1993b14f90def7f8582b5e5d1a512bd3c7727e03f1deca47f7359a8f8cc9a8360130923388a5c06fabbfb9b05d5138
diff --git a/x11-plugins/lurch/lurch-0.6.8-r1.ebuild b/x11-plugins/lurch/lurch-0.6.8-r1.ebuild
deleted file mode 100644
index 67d6325288cf..000000000000
--- a/x11-plugins/lurch/lurch-0.6.8-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CMAKE_MAKEFILE_GENERATOR=emake  # since top-level Makefile expects a child Makefile
-
-inherit toolchain-funcs cmake-utils
-
-LIBOMEMO_PV=0.7.0
-DESCRIPTION="OMEMO encryption for libpurple (XEP-0384)"
-HOMEPAGE="https://github.com/gkdr/lurch"
-SRC_URI="https://github.com/gkdr/lurch/releases/download/v${PV}/lurch-${PV}-src.tar.gz -> ${P}.tar.gz
-	https://github.com/gkdr/libomemo/archive/v${LIBOMEMO_PV}.tar.gz -> libomemo-${LIBOMEMO_PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# NOTE
-# - We cannot unbundle net-libs/libsignal-protocol-c
-#   because upstream uses non-API/internal function
-#   session_builder_process_pre_key_signal_message
-# - The build systems of axc (ex-libaxolotl)
-#   at https://github.com/gkdr/axc and libomemo
-#   at https://github.com/gkdr/libomemo build static
-#   libraries only (*.a) so it is not clear when or
-#   how to best unbundle them, either
-RDEPEND="
-	dev-db/sqlite
-	dev-libs/glib
-	dev-libs/libgcrypt:=
-	dev-libs/libxml2
-	dev-libs/mxml
-	net-im/pidgin:=
-	"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	"
-
-CMAKE_USE_DIR="${S}"/lib/axc/lib/libsignal-protocol-c
-BUILD_DIR="${CMAKE_USE_DIR}"/build
-
-src_prepare() {
-	# Upgrade outdated bundle of libomemo
-	rm -R lib/libomemo || die
-	mv "${WORKDIR}"/libomemo-${LIBOMEMO_PV} lib/libomemo || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=OFF  # top-level Makefile expects .a file
-		-DCMAKE_C_FLAGS=-fPIC
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		LIBGCRYPT_CONFIG="$(tc-getPROG LIBGCRYPT_CONFIG libgcrypt-config)"
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-		XML2_CONFIG="$(tc-getPROG XML2_CONFIG xml2-config)"
-
-		CMAKE=/bin/true  # to stop Makefile from calling CMake, once more
-	)
-	emake "${makeargs[@]}"
-}
-
-src_install() {
-	default  # use top-level Makefile, not cmake-utils_src_install
-}
diff --git a/x11-plugins/lurch/lurch-0.6.8.ebuild b/x11-plugins/lurch/lurch-0.6.8.ebuild
deleted file mode 100644
index cb4e4a97bace..000000000000
--- a/x11-plugins/lurch/lurch-0.6.8.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CMAKE_MAKEFILE_GENERATOR=emake  # since top-level Makefile expects a child Makefile
-
-inherit toolchain-funcs cmake-utils
-
-DESCRIPTION="OMEMO encryption for libpurple (XEP-0384)"
-HOMEPAGE="https://github.com/gkdr/lurch"
-SRC_URI="https://github.com/gkdr/lurch/releases/download/v${PV}/lurch-${PV}-src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# NOTE
-# - We cannot unbundle net-libs/libsignal-protocol-c
-#   because upstream uses non-API/internal function
-#   session_builder_process_pre_key_signal_message
-# - The build systems of axc (ex-libaxolotl)
-#   at https://github.com/gkdr/axc and libomemo
-#   at https://github.com/gkdr/libomemo build static
-#   libraries only (*.a) so it is not clear when or
-#   how to best unbundle them, either
-RDEPEND="
-	dev-db/sqlite
-	dev-libs/glib
-	dev-libs/libgcrypt:=
-	dev-libs/libxml2
-	dev-libs/mxml
-	net-im/pidgin:=
-	"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	"
-
-CMAKE_USE_DIR="${S}"/lib/axc/lib/libsignal-protocol-c
-BUILD_DIR="${CMAKE_USE_DIR}"/build
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=OFF  # top-level Makefile expects .a file
-		-DCMAKE_C_FLAGS=-fPIC
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		LIBGCRYPT_CONFIG="$(tc-getPROG LIBGCRYPT_CONFIG libgcrypt-config)"
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-		XML2_CONFIG="$(tc-getPROG XML2_CONFIG xml2-config)"
-
-		CMAKE=/bin/true  # to stop Makefile from calling CMake, once more
-	)
-	emake "${makeargs[@]}"
-}
-
-src_install() {
-	default  # use top-level Makefile, not cmake-utils_src_install
-}
diff --git a/x11-plugins/lurch/lurch-0.7.0.ebuild b/x11-plugins/lurch/lurch-0.7.0.ebuild
new file mode 100644
index 000000000000..12f3106c5cca
--- /dev/null
+++ b/x11-plugins/lurch/lurch-0.7.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="OMEMO encryption for libpurple (XEP-0384)"
+HOMEPAGE="https://github.com/gkdr/lurch"
+SRC_URI="https://github.com/gkdr/lurch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"  # likely not GPL-3+, https://github.com/gkdr/lurch/issues/165
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# NOTE: Some of these dependencies seem like leftovers in the build system
+#       and can probably be dropped with lurch >=0.7.1
+#       (https://github.com/gkdr/lurch/issues/164)
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib
+	dev-libs/libgcrypt:=
+	dev-libs/libxml2
+	dev-libs/mxml
+	net-im/pidgin:=
+	net-libs/libaxc
+	net-libs/libomemo
+	>=net-libs/libsignal-protocol-c-2.3.2
+	"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-util/cmocka )
+	"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	rm -Rv lib/{axc,libomemo} || die  # unbundle
+	default
+}
+
+src_compile() {
+	local makeargs=(
+		CC="$(tc-getCC)"
+		LIBGCRYPT_CONFIG="$(tc-getPROG LIBGCRYPT_CONFIG libgcrypt-config)"
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+		XML2_CONFIG="$(tc-getPROG XML2_CONFIG xml2-config)"
+	)
+	emake "${makeargs[@]}"
+}
diff --git a/x11-plugins/purple-mattermost/Manifest b/x11-plugins/purple-mattermost/Manifest
index 9b08e61c52a7..6ce60e509158 100644
--- a/x11-plugins/purple-mattermost/Manifest
+++ b/x11-plugins/purple-mattermost/Manifest
@@ -1,3 +1,3 @@
-DIST purple-mattermost-1.2.tar.gz 65402 BLAKE2B c9f99d61622e0ce1a7aded42f3da44c414615f24a7265b9a2e2bda82dd6afa2ddf6a5063453eead902b140f7e415a043fee2d2f5ff1015bc34f746de5d1793ea SHA512 75e80c1021393c5fe78404a4439b5454f8a4495c1510bf8a3a449acdf1807b8620ac19680607de29bd1599eb0f1354f93c6fa7b21b4294b36649b6e1455760d6
-EBUILD purple-mattermost-1.2-r1.ebuild 549 BLAKE2B c17185412db9c22ea10b59fc16b2733c9e83b7ca16549cbf87ee2bfde82b33ecaa461d1ff8a6a33130a6ad47d582f4093be81147d607b9e62b3b9d2da86c83f3 SHA512 25f49e504cdacae0c546d7d286200f520c5ac403ae1e813123dac4f715434d35bac0be3e04bc6b5272cc5ddb87af25dc8cc8efd689f8e8811a81ec095ce691fc
+DIST purple-mattermost-2.0.tar.gz 99301 BLAKE2B e4de82581238b399fc1d5e77abd3c6c925d36e6012c5da354eecc26364b2e671c106e867b387b10ca82553b2bc4b11fd9f448ff744295fb81a4419086afdae4c SHA512 5f192e5c8f07a28f4ce568e1f07b023c4edafd5eb938beb2067925f3addbb1f920ee9c1a8f46a1e5a46518d201c979e2cf8be17cb38e2f652a4f34921e151f7b
+EBUILD purple-mattermost-2.0.ebuild 549 BLAKE2B 468dc23bb52957149baa75a487bdd109f05fd2bb8d04eb73fcd3178053a7dfa46eea68aaecc7df608697764dcbad355c7358761034fba8f7a9a5b594503404cd SHA512 844ee8f419a66a877bed09e2247278eaea1d575e973daeaf8743b9d0f3d9e75863d8aba5167ae99b14c0eb533265aaae14e4e2c951d7215628641f7ef57afb09
 MISC metadata.xml 342 BLAKE2B 442792746b7c1a6892cc0d86d47b23c5299887244fa49e1cde4748f4c175d3a2d6e81f979c33f92c3c861b3fbeae6306ef304169da367dc44b6c73db9e3d8fe8 SHA512 ab1ddf1a079239ac490e856785f73650a4b3e32d3f24a798d771347645899b23799f0eee76df8363858fb2f13e23769f0cf552ba12a276ce9ea68aa50ceef0e4
diff --git a/x11-plugins/purple-mattermost/purple-mattermost-1.2-r1.ebuild b/x11-plugins/purple-mattermost/purple-mattermost-2.0.ebuild
index b7032a565aa9..c6af4b1659f6 100644
--- a/x11-plugins/purple-mattermost/purple-mattermost-1.2-r1.ebuild
+++ b/x11-plugins/purple-mattermost/purple-mattermost-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7