dev-libs/olm: treeclean

Signed-off-by: Alfred Wingate <parona@protonmail.com>

dev-libs/olm/metadata.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>parona@protonmail.com</email>
-    <name>Alfred Wingate</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>hedmoo@yahoo.com</email>
-    <name>Andreas Westman Dorcsak</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="gitlab">matrix-org/olm</remote-id>
-  </upstream>
-</pkgmetadata>

dev-libs/olm/olm-3.2.15.ebuild

@@ -1,112 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake distutils-r1
-
-DESCRIPTION="An implementation of the Double Ratchet cryptographic ratchet in C++"
-HOMEPAGE="https://git.matrix.org/git/olm/about/"
-
-if [[ "${PV}" == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.matrix.org/matrix-org/${PN}.git"
-else
-	SRC_URI="https://gitlab.matrix.org/matrix-org/${PN}/-/archive/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0/$(ver_cut 1)"
-IUSE="python test"
-REQUIRED_USE="
-	doc? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/cffi-1.0.0[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	${DISTUTILS_DEPS}
-	python? (
-		${RDEPEND}
-		test? (
-			dev-python/aspectlib[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx "${S}"/python/docs
-
-DOCS=( "${S}/docs/" )
-
-EPYTEST_DESELECT=(
-	# deselect tests using benchmark fixtures
-	"tests/group_session_test.py::TestClass::test_encrypt"
-	"tests/group_session_test.py::TestClass::test_decrypt"
-)
-
-src_prepare() {
-	sed -i '/flake8/,/^$/ d' python/setup.cfg || die
-
-	cmake_src_prepare
-	if use python; then
-		pushd python || die
-		distutils-r1_src_prepare
-		popd || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DOLM_TESTS=$(usex test)
-	)
-	cmake_src_configure
-	if use python; then
-		pushd python || die
-		distutils-r1_src_configure
-		popd || die
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-	if use python; then
-		pushd python || die
-		# Let python build find the already built libolm
-		export LIBRARY_PATH="${BUILD_DIR}/"
-		distutils-r1_src_compile
-		popd || die
-	fi
-}
-
-src_install() {
-	cmake_src_install
-	if use python; then
-		pushd python || die
-		distutils-r1_src_install
-		popd || die
-	fi
-	einstalldocs
-}
-
-src_test() {
-	# eclass doesnt appear to be to handle CTestTestfile.cmake in build root locations
-	BUILD_DIR="${BUILD_DIR}/tests" cmake_src_test
-
-	if use python; then
-		pushd "${S}"/python || die
-		LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" distutils-r1_src_test
-		popd || die
-	fi
-}

dev-python/matrix-nio/Manifest

@@ -1 +1,2 @@
 DIST matrix-nio-0.22.1.gh.tar.gz 251898 BLAKE2B a91020e85f2be5b0d5fc7722291bcb9e783bd3b6cc5b3e659e9efe7fd0e66ce03bd2a711d18e54eb5b34cb56385ef5e61a704113948a1266f107b011495754e8 SHA512 d5582ffba89ce3e8548b9b27accfae41ec83f8d86935d4cab7847560ad61533cf62a24407f5b46d8b466782c537bcd27c296188bbb05d4a8359ebfea5d2668ab
+DIST matrix-nio-0.23.0.gh.tar.gz 252986 BLAKE2B 7ca3d0e74a26d5f61439d63c44878c1df9858ade3fc0467188e1bc4a2cde25da70482613f8197e8e4017a2ceba5876d823d0f62975ed816e24ba1099bfe5b999 SHA512 7fe373342db348fa82e56221700b9c7086f67edaa998833a24ee50d8fe989b406b8d6a5361846cbcd62d3c67df2a01652239f1eeacc90edbe287543d93ec2a3b

dev-python/matrix-nio/matrix-nio-0.22.1-r1.ebuild

@@ -0,0 +1,62 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python Matrix client library, designed according to sans I/O principles"
+HOMEPAGE="https://github.com/poljar/matrix-nio"
+SRC_URI="https://github.com/poljar/matrix-nio/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	|| (
+		>=dev-python/python-olm-3.1.3[${PYTHON_USEDEP}]
+		>=dev-libs/olm-3.1.3[python(-),${PYTHON_USEDEP}]
+	)
+	>=dev-python/aiohttp-3.8.3[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-socks-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/aiofiles-23.1.0[${PYTHON_USEDEP}]
+	>=dev-python/atomicwrites-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/h11-0.14.0[${PYTHON_USEDEP}]
+	>=dev-python/h2-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/peewee-3.14.4[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.10.1[${PYTHON_USEDEP}]
+	>=dev-python/unpaddedbase64-2.1.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/aioresponses-0.7.2[${PYTHON_USEDEP}]
+		>=dev-python/Faker-8.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-aiohttp-0.3.0[${PYTHON_USEDEP}]
+		>=dev-python/hpack-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/hyperframe-6.0.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-6.8.9[${PYTHON_USEDEP}]
+		>=dev-python/mypy-0.812[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+# m2r2 mistune woes
+#distutils_enable_sphinx doc dev-python/sphinx-rtd-theme dev-python/m2r2
+
+EPYTEST_DESELECT=(
+	# requires pytest-benchmark, not much value in pass/no pass tests
+	"tests/key_export_test.py::TestClass::test_decrypt_rounds"
+	"tests/key_export_test.py::TestClass::test_encrypt_rounds"
+	# flaky
+	"tests/async_client_test.py::TestClass::test_transfer_monitor_callbacks"
+)

dev-python/matrix-nio/matrix-nio-0.23.0.ebuild

@@ -20,7 +20,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-libs/olm-3.1.3[python(-),${PYTHON_USEDEP}]
+	>=dev-python/python-olm-3.2.15[${PYTHON_USEDEP}]
 	>=dev-python/aiohttp-3.8.3[${PYTHON_USEDEP}]
 	>=dev-python/aiohttp-socks-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/aiofiles-23.1.0[${PYTHON_USEDEP}]
@@ -29,7 +29,7 @@ RDEPEND="
 	>=dev-python/h11-0.14.0[${PYTHON_USEDEP}]
 	>=dev-python/h2-4.0.0[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/peewee-3.14.4[${PYTHON_USEDEP}]
+	>=dev-python/peewee-3.17.0[${PYTHON_USEDEP}]
 	>=dev-python/pycryptodome-3.10.1[${PYTHON_USEDEP}]
 	>=dev-python/unpaddedbase64-2.1.0[${PYTHON_USEDEP}]
 "

dev-python/python-olm/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>parona@protonmail.com</email>
+		<name>Alfred Wingate</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">python-olm</remote-id>
+	</upstream>
+</pkgmetadata>

dev-python/python-olm/python-olm-3.2.15.ebuild

@@ -0,0 +1,40 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="python CFFI bindings for the olm cryptographic ratchet library"
+HOMEPAGE="
+	https://gitlab.matrix.org/matrix-org/olm
+	https://pypi.org/project/python-olm/
+"
+SRC_URI="https://gitlab.matrix.org/matrix-org/olm/-/archive/${PV}/olm-${PV}.tar.bz2"
+S="${WORKDIR}/olm-${PV}/python/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	~dev-libs/olm-${PV}[-python(-)]
+	dev-python/cffi[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	test? (
+		dev-python/aspectlib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# deselect tests using benchmark fixtures
+	"tests/group_session_test.py::TestClass::test_encrypt"
+	"tests/group_session_test.py::TestClass::test_decrypt"
+)

profiles/package.mask

@@ -1,7 +1,3 @@
-# Alfred Wingate <paronta@protonmail.com> (2023-09-26)
-# Uses php-7 which has been removed from tree
-www-apps/icecoder
-
 # Alfred Wingate <parona@protonmail.com> (2023-08-31)
 # Indiscriminate mask of packages with NonsolvableDepsInStable
 # Fix or remove

www-apps/icecoder/Manifest

@@ -1 +0,0 @@
-DIST icecoder-8.0.tar.gz 732264 BLAKE2B 6e8ae9ab61875276acb6044e4f7ee8e42dd1b70cac6729056e7cee4663c49a9cf8c1b3016b9733620da4577ecd61085703646192cb15e991caa948cbfb32eb01 SHA512 1997921f5643394bbe73ca37931584cebcfea1638026697d485cadf4600a79a76472207410b987b42d46b7f44fd2b54480a67c2063a6cd018dd1317073422226

www-apps/icecoder/icecoder-8.0.ebuild

@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="ICEcoder"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-inherit webapp
-
-DESCRIPTION="Browser code editor awesomeness"
-HOMEPAGE="https://icecoder.net/"
-SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-RESTRICT="mirror test"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-lang/php:7.4
-	virtual/httpd-php
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}

www-apps/icecoder/metadata.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <maintainer type="person">
-        <email>xgqt@protonmail.com</email>
-        <name>Maciej Barć</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">icecoder/ICEcoder</remote-id>
-    </upstream>
-</pkgmetadata>

www-client/icecat/files/icecat-115.4.0-icu-74.patch

@@ -0,0 +1,41 @@
+https://bugs.gentoo.org/917599
+https://bugzilla.mozilla.org/show_bug.cgi?id=1862601
+https://hg.mozilla.org/try/rev/d5f3b0c4f08a426ce00a153c04e177eecb6820e2
+
+# HG changeset patch
+# User André Bargull <andre.bargull@gmail.com>
+# Date 1697435923 -7200
+# Node ID d5f3b0c4f08a426ce00a153c04e177eecb6820e2
+# Parent  c63994f8259efdf6e745c960aa9e1409d5477049
+Bug xxx - Part 12: Add new line break classes. r?
+
+diff --git a/intl/lwbrk/LineBreaker.cpp b/intl/lwbrk/LineBreaker.cpp
+--- a/intl/lwbrk/LineBreaker.cpp
++++ b/intl/lwbrk/LineBreaker.cpp
+@@ -443,17 +443,23 @@ static int8_t GetClass(uint32_t u, LineB
+       /* JT = 34,                           [JT] */ CLASS_CHARACTER,
+       /* JV = 35,                           [JV] */ CLASS_CHARACTER,
+       /* CLOSE_PARENTHESIS = 36,            [CP] */ CLASS_CLOSE_LIKE_CHARACTER,
+       /* CONDITIONAL_JAPANESE_STARTER = 37, [CJ] */ CLASS_CLOSE,
+       /* HEBREW_LETTER = 38,                [HL] */ CLASS_CHARACTER,
+       /* REGIONAL_INDICATOR = 39,           [RI] */ CLASS_CHARACTER,
+       /* E_BASE = 40,                       [EB] */ CLASS_BREAKABLE,
+       /* E_MODIFIER = 41,                   [EM] */ CLASS_CHARACTER,
+-      /* ZWJ = 42,                          [ZWJ]*/ CLASS_CHARACTER};
++      /* ZWJ = 42,                          [ZWJ]*/ CLASS_CHARACTER,
++      /* AKSARA = 43,                       [AK] */ CLASS_CHARACTER,
++      /* AKSARA_PREBASE = 44,               [AP] */ CLASS_CHARACTER,
++      /* AKSARA_START = 45,                 [AS] */ CLASS_CHARACTER,
++      /* VIRAMA_FINAL = 46,                 [VF] */ CLASS_CHARACTER,
++      /* VIRAMA = 47,                       [VI] */ CLASS_CHARACTER,
++  };
+ 
+   static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass),
+                 "Gecko vs ICU LineBreak class mismatch");
+ 
+   auto cls = GetLineBreakClass(u);
+   MOZ_ASSERT(cls < mozilla::ArrayLength(sUnicodeLineBreakToClass));
+ 
+   // Overrides based on rules for the different line-break values given in
+
+

www-client/icecat/icecat-115.4.0.ebuild

@@ -614,6 +614,11 @@ src_prepare() {
 
 	eapply "${WORKDIR}/firefox-patches"
 
+	# Workaround for bgo#917599
+	if has_version ">=dev-libs/icu-74.1" && use system-icu ; then
+		eapply "${FILESDIR}"/icecat-115.4.0-icu-74.patch
+	fi
+
 	# Allow user to apply any additional patches without modifing ebuild
 	eapply_user