8 files changed, 63 insertions, 114 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index dccc5d2ab73e..41c2840cc050 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 566f454d085e..1f2f81a9ba89 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,10 +1,6 @@
 AUX ell-0.51-musl-build-time.patch 1449 BLAKE2B 7012ac17e87b9e2cb1a4a16b723bc7b77022921ac1b2a6610ad68380ba73bc07bfbd4508ad18e53d70a4247a6720e6e8ab4082209c7046a00257715731ec0ba9 SHA512 cbeda9501f8ce2ceed0043416dc06e705aa8e07e0897ee866b8892290ba255ffb1dcba3e4e09a22c9e98386214f83bc33df770bfc502286f828e19a0da6c7d40
-DIST ell-0.49.tar.xz 530072 BLAKE2B 76823742261b319a60fa34a086e4f328459c12fa2e53c2fc0397968a7c5914eac019598f927853697c3aa3c8afc389758bf4ca31f3b6315b09d6bdccf0244a88 SHA512 9bac4312ebe85bd6903bd9665551e9f1de4cfc6914659cea28355363502f8968ac842b3579ac8efcb0721cb5a1f3f16dca80f02235f3675a24f13eb250ed3aea
-DIST ell-0.50.tar.xz 534092 BLAKE2B 0f217f2f8a438f9d7e7862b5b2c45fecab3468bad3dc5912a87473f3237bdc3c541cec518bcea9ea5f45e6584793984ae822e6650676f2d22e10d84b7c30a08b SHA512 95dcfb34ece3bb7d6dc6f808c3df785cbb6966e7ac5533b9fd939a64288e6a584542cd69a6484da0f6ef752a62a87c143892d8f461d8389e4a12a1167bfa0590
 DIST ell-0.51.tar.xz 544744 BLAKE2B ae9cd3bc2d892109f5ae1a602f0f711b350ceb10ce2a7fcced5ce4bca63986a69c350013fc08eed29c9c626cc892b70ba997dda321d7c6c089d465850fabd5e1 SHA512 c2fd2ea9858542e23d46eba96045e1c924531b6a436401e86d838ffee39d0062923861c2898dae76ec9bfb325327c97b13799d81a2324982928b07b1fb898595
 DIST ell-0.52.tar.xz 548816 BLAKE2B 9c2ac4128fe770c1d1a1532fca8a5e36fcb620b9908177acb4fa8f35cea733374199fbe55ae78aac25ff5e37ee71044b6296a38fbbf7ff23fa867e2a338b8287 SHA512 e3cad20e42b71a7c1aae2c8bebe025f7a2bd0e594738aba96ffe8b316e216eb57dc86a5f0b0837d8141b16cae4f150c7b472c60d455feec5d7eb340b960c26d4
-EBUILD ell-0.49.ebuild 1169 BLAKE2B d44f4abaf7a26e2433528ad3d118791af1de8416332e29e882151c093c01df4e8702cb38ffa3fd89009e0592bf2d741fd1aed584215e6df42c6f5046d66b5aa2 SHA512 51423dd686bc1d06ad15ca1cf179b6aa1e5adf70fb843acd1a96586b9ae92bed64ca23032f6100e9d0e5a130bc11083c69aff24f5af6d5a64b720f8b644aaac0
-EBUILD ell-0.50.ebuild 1170 BLAKE2B 1bcd395848f82b6758f1856148f825b76d8c130adaccd2f8b523be59f661a5180845a45215070a5c89f495e8805c68ae811ccf9d524d804794cf9698d15527a9 SHA512 bf883196acc3f95895ebdef568c08f2d7add05f9f8c972b5c7a25fd0da45187f6d4ee39a283404e354baa80692744a775ee8f28694804508bb1fa116ef08ea94
 EBUILD ell-0.51.ebuild 1331 BLAKE2B 7d6a254dbf13ae781be3f9f4e4240590cac8f9bc36267bb84f5fda9d7035b01007bc4106d04537daa5fd2828cda7f1343a5f3ccc8258349c01cbdc41344981cf SHA512 287bfa2f891a9097fb7fbf11c96037fa7f875afe1a268863a8a21d77d0c0bcdfb8a7a83044c010a5fa767cd1bf21b7187e8ead14719428db074c8588b1c24cf8
 EBUILD ell-0.52.ebuild 1282 BLAKE2B b91d32ee2de447eb85849db27729d1befa2bd697be4057280fb054b944659a619bb30d03180ed8466f9b380b42597811cde2fde934ff508207a1ceea60d1c25e SHA512 8dbbd6ffaea8119771e97a803a0e8d56e2bfbce59dd86aab6c868d06cbdbb5b4e594fc31826832f5e5e93c248d24984ec6fefc1b1f5d759991db033d8a201d02
 EBUILD ell-9999.ebuild 1175 BLAKE2B c91500654e555bb6023ac37c0715d240e93d57d5f1e48f1c3a3b6083360a8a2eadcb37a8750730905b9a73abfd0d9e42e55928d884801711ca65ca947629e6a3 SHA512 a402b13afb81a1cb481464581c2210961a5ecb239ac68a638c0f3e117c1e1490cc4ae17c939d25995b1e647104a9713ed628fee4eeb9c396ddbb9dd9e86f6b8b
diff --git a/dev-libs/ell/ell-0.49.ebuild b/dev-libs/ell/ell-0.49.ebuild
deleted file mode 100644
index 1ef74d66e58c..000000000000
--- a/dev-libs/ell/ell-0.49.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info multilib-minimal
-
-DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
-HOMEPAGE="https://01.org/ell"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
-fi
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="pie test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="test? ( sys-apps/dbus )"
-
-CONFIG_CHECK="
-	~TIMERFD
-	~EVENTFD
-	~CRYPTO_USER_API
-	~CRYPTO_USER_API_HASH
-	~CRYPTO_MD5
-	~CRYPTO_SHA1
-	~KEY_DH_OPERATIONS
-"
-
-src_prepare() {
-	default
-	[[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	append-cflags "-fsigned-char" #662694
-	local myeconfargs=(
-		$(use_enable pie)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	local DOCS=( ChangeLog README )
-	einstalldocs
-
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/ell/ell-0.50.ebuild b/dev-libs/ell/ell-0.50.ebuild
deleted file mode 100644
index f1cfddb3a006..000000000000
--- a/dev-libs/ell/ell-0.50.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info multilib-minimal
-
-DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
-HOMEPAGE="https://01.org/ell"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
-fi
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="pie test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="test? ( sys-apps/dbus )"
-
-CONFIG_CHECK="
-	~TIMERFD
-	~EVENTFD
-	~CRYPTO_USER_API
-	~CRYPTO_USER_API_HASH
-	~CRYPTO_MD5
-	~CRYPTO_SHA1
-	~KEY_DH_OPERATIONS
-"
-
-src_prepare() {
-	default
-	[[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	append-cflags "-fsigned-char" #662694
-	local myeconfargs=(
-		$(use_enable pie)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	local DOCS=( ChangeLog README )
-	einstalldocs
-
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/mxml/Manifest b/dev-libs/mxml/Manifest
index 8ce555167deb..f9b53b29e021 100644
--- a/dev-libs/mxml/Manifest
+++ b/dev-libs/mxml/Manifest
@@ -1,3 +1,5 @@
+DIST mxml-3.3.1.tar.gz 1554784 BLAKE2B e0d599fd947dfef72edae40c1e70ea76c92105128dd46e772a7c71f9293cab3339c980396dffe105246cad64d0474935cc1939005ad9a2bffc8e8107f025a466 SHA512 43e6a92806d9c3f5db39fbf960c15ebfa6d92ef98274b7ce39b57724d6c26ad4362d6d8f3c1023efda92e6a815df068e5038a0cd479562b6be9dbdda8e827a41
 DIST mxml-3.3.tar.gz 1550358 BLAKE2B 2b815cd8c2031099e2767caad93cc389962ec547fadade92b0a7fb48a2352fd0940c9e434c2081b7419e0cfb489266d7116dacefd6fb9d7ce40d6de0f49cb2a6 SHA512 5a8453bec17e46afc9b100df03dba2219353a076152f34a5dc41b7f042fa570723effc3472680a4380674c412c3ab31e017f6704b1e8308227a4d9b3f13cb197
+EBUILD mxml-3.3.1.ebuild 1349 BLAKE2B 0df503d97d6c95b10e070472cc3da4db0f404d3d7f9a2e226f8b57dd3c7635ad53e906fe588ede2f66ef28ffa667409e9b851a830e10c6b829e97e96303ab347 SHA512 b0459b71a912ace9e9fb6c51ebe2b0e4725d1607e5fcf9f339716cf5805ba94ea5f6dd2079e5ac9f79e1a15c364150acb38e23aba0a29e730ac711b7f0359455
 EBUILD mxml-3.3.ebuild 1347 BLAKE2B 5a90de864906aaf60f3b3c685de49033cbb170e92b82ef9281a110706c08c9cfb1f7374668e859c2a86fc7e89f78f96cca3ec3f516a9611d0c3131ffe0e11f26 SHA512 d745e253e43e9a49a4eb63fabb1698e925a82127a6ab2e545512e4a2248cd50e52a090992243d8ac1ee42938f86a11911794b3af81fe481e1e24633b831649e1
 MISC metadata.xml 1380 BLAKE2B ba169e7d7bf4572b56e2cc8923a48fce4b31af61107bd908d77f4a211aa096b4f0adfed9ae1d52cbad6b4309793f545cbd562a553e0c5aa1d0786b088f472cd7 SHA512 2895d86c62cb799302ba1515a3b638d52ca253f78e07bcc542bbb99338b84bc2079d48f42fb85a627e9252a545a853629943f9a904ead600aff161a24e1f1658
diff --git a/dev-libs/mxml/mxml-3.3.1.ebuild b/dev-libs/mxml/mxml-3.3.1.ebuild
new file mode 100644
index 000000000000..e7c70782ab52
--- /dev/null
+++ b/dev-libs/mxml/mxml-3.3.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A small XML parsing library that you can use to read XML data files or strings"
+HOMEPAGE="
+	https://github.com/michaelrsweet/mxml
+	https://www.msweet.org/mxml/
+"
+SRC_URI="https://github.com/michaelrsweet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Mini-XML"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+IUSE="static-libs threads"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# Don't run always tests
+	# Enable verbose compiling
+	sed -e '/ALLTARGETS/s/testmxml//g' -e '/.SILENT:/d' -i Makefile.in || die
+
+	# Build only static-libs, when requested by user, also build docs without static-libs in that case
+	if ! use static-libs; then
+		local mysedopts=(
+			-e '/^install:/s/install-libmxml.a//g'
+			-e '/^mxml.xml:/s/-static//g'
+			-e '/^mxml.epub:/s/-static//g'
+			-e '/^valgrind/s/-static//g'
+			-e 's/.\/mxmldoc-static/LD_LIBRARY_PATH="." .\/mxmldoc/g'
+		)
+		sed "${mysedopts[@]}" -i Makefile.in || die
+	fi
+
+	eautoconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable threads)
+		--with-docdir=/usr/share/doc/"${PF}"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake testmxml
+}
+
+src_install() {
+	emake DSTROOT="${ED}" install
+}
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index 837839ac3e51..ec84494091c0 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -7,5 +7,5 @@ AUX newt-0.52.21_p20210816-makefile-LDFLAGS-ordering.patch 1221 BLAKE2B 410dfe51
 DIST newt-0.52.21.tar.gz 174895 BLAKE2B a0d6a15f87fe04dc535e65fcd28606cd666142d006a53b6ee0c8387a6295215e44f1815ac56ceb56b561ca9b5bc8f3cab2d04b5decd62642f46b744333dc7e34 SHA512 d53d927996d17223e688bf54dccfabb2a3dc02bfe38ffc455964e86feaca3cd9f9ab5b19774433be430fa4d761cd9b6680b558f297acb86f80daeb6942f7d23c
 DIST newt-0.52.21_p20210816.tar.gz 128555 BLAKE2B 97c791d7301b657bec68045f2cd9bbe16eef0b099a6304e2336414837b36492bd794be04d0bbcd9eadc6fcd000ba2563a5ab90be5d61249390a6ea5435091f97 SHA512 06c1d5634d88a6126de5eddd1c4d436639a4d739b100f391638b0429a3941eabcaa0ff7398f498d735ec0af5e88deb14178110ab11bf5301ef661f7953692bc4
 EBUILD newt-0.52.21-r1.ebuild 2229 BLAKE2B 974b87429d91ba6d6a9565e13e5c1d569c02d244638ec99e4dc2a620098687942596b54deb9a4662e4c9f8ad16f7feae38faad0e6b9ba48ce7df1892fedc235f SHA512 4d5baa9a7179d6853b19cb6a8157a32105a697079985d39cc244efa0278270399dc3f511bea2ff250eb6b3bd4997d3ebf095dc3a2a245f51fae731e39fb5a533
-EBUILD newt-0.52.21_p20210816.ebuild 2362 BLAKE2B eb9ffd99f263976b40cb62d9bd8188adcb51b9bcb199019beebc7416091093f5e57f9d58cdae275d9df60e69aa74729656b3ef751abcf1507a7fc7bbae2f245c SHA512 8d206ebe5a472f406f05b573fb2814d4a9e8c69c718247bc3e8b1f58db5c666dd217e16258992a97ab9538f08da2a6890798914d6ddd5d54fc1cf4034c860966
+EBUILD newt-0.52.21_p20210816.ebuild 2362 BLAKE2B 599f18a5aaf23cc89bdb51034fd966115489defede1223f3c6f2d1be5cb3f42f8b794c74b46ce644cede0b58f214b78d9f6d9b90d2ec39a168a7f2597b0ee55a SHA512 7b21ba61faae7f4bf86582a9aedf505ac7230d531a579b4ff45ddcb9bbb0ae3b2dc2385694173c81dba4dcc386b92dba3e865dc636be4eb888e35b7dd9a9fa74
 MISC metadata.xml 251 BLAKE2B a9af03a4a233a890a554ab68f1876580e3720a72c1f946ea6dbb82c49afd94243ea4017cd8a392fa2adea53c588646fd0ebccb948dde0340ec2ff05c0381fb99 SHA512 0837c31655f6a725b0fad20c8998a3a4645dc8049e14980b0097776cf59b4288276489dfddc149893f29844175eeb187a54af7d28690de4afe18ef9fd4c1f98f
diff --git a/dev-libs/newt/newt-0.52.21_p20210816.ebuild b/dev-libs/newt/newt-0.52.21_p20210816.ebuild
index d6c71471e388..57ed161c4cfd 100644
--- a/dev-libs/newt/newt-0.52.21_p20210816.ebuild
+++ b/dev-libs/newt/newt-0.52.21_p20210816.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit autotools python-r1 toolchain-funcs