5 files changed, 119 insertions, 38 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index c01fbfe6fabe..2711262dae75 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/libxmlpp/Manifest b/dev-cpp/libxmlpp/Manifest
index 8d1da0cdb896..8446622ca386 100644
--- a/dev-cpp/libxmlpp/Manifest
+++ b/dev-cpp/libxmlpp/Manifest
@@ -1,5 +1,7 @@
 DIST libxml++-2.40.1.tar.xz 955220 BLAKE2B 44c55ab0e9018af859097e1a753c1457f5694b282f8f5187b32ce908d34f7953b8e73f1e41750ddf5f5c912712539e32f608a33ab79f22644e15010f75be6c51 SHA512 a4ec2e8182d981c57bdcb8f0a203a3161f8c735ceb59fd212408b7a539d1dc826adf6717bed8f4d544ab08afd9c2fc861efe518e24bbd3a1c4b158e2ca48183a
-DIST libxml++-3.0.1.tar.xz 948796 BLAKE2B cdfa37f3aebdd8109653c50d6e977a443173fe4ff18b3644a030bba065c7ced01bedc98a273ab3a8def73f78efd2458afd16ec68df9f9109b816527383904025 SHA512 9b8ccea9df11d70bb23d7d9983b18d28c648aa0107f9654a79d1cfe97db4633b69dd4b97b76d155aca8553d014a314247851f18d0371717e44a056ee804ccd95
+DIST libxml++-2.42.2.tar.xz 848924 BLAKE2B 75c28447b41e50f1484a8670042af819f90619acd36eaea3bf68ed197745836c3ede38c208a851e59a345cb2657989f569fd0129724916f87d90105ec3c0fc2c SHA512 214da4c8120fedc96adf6ad965b65be9f4deb53d86f41667c236c52e1e3aace819fc61b096815879cc38aaf12ac77fbccb050088ce6bc3ff03030dcc81e4a8c9
+DIST libxml++-5.0.2.tar.xz 796484 BLAKE2B 57809c52ab38c359b453515805fff9631c1c7614f313fe8234384fa485c08a166dad66dad0c3caabc8c8698111c6702e568f73472269855c5290956e9d130bdb SHA512 f0fc0d2e2bc14eeefb9d4a6bec661a2377a60874c877cdddaadadce1d22e5186516a37587fc67ed570858e1871164e30535b779fd2fac12475ef6fdfcc2e3469
 EBUILD libxmlpp-2.40.1-r2.ebuild 823 BLAKE2B 6ec040a8204a91bfc25ec328ac5faee112c5ea8c5d9e817fc1672750d622ae1080790279a75301b64c843dde7d055e32e05551ceac7be709c44f8bed682dc583 SHA512 ea6684a160055b6ae5b9cfe8ec6f38ac7f06098c8e081acc636c597f0d1011f8b0fe905800393b525e6cd8136b6aa7f5d650f5030f038cc511e109a5d0d78202
-EBUILD libxmlpp-3.0.1-r1.ebuild 815 BLAKE2B ce49512f2495409284286ce908618f310d37227831e64dc3a121132f1973676c27dec6004f6efcf2e7b5c8cef42cba924fbb5ecf33e35bf139849b31d1599736 SHA512 00554087ad811a80f3f5c81dca1b5dd1665dc42aaa9590423c7fae8ebe662c46b42290b53c95a1ea52b8b24ed045cda6ea7252e2d30751e3db5e7a088c4a0186
+EBUILD libxmlpp-2.42.2.ebuild 1304 BLAKE2B 632d5e29153f6961c256e6be0bac7e358d70ee71946a4a97813116881bedf34486e8787085108efc951bca5f7723649771bf152d27858b163df07c4d1d3dd0d5 SHA512 ff4c94627c091a6a494b07e1f720a36084f941b5f73afec7de46b50fefffa8294041b533c764bba4c0321c9d23529fb70bb4de731ba292b3707b8a6865f00df9
+EBUILD libxmlpp-5.0.2.ebuild 1207 BLAKE2B 8f62b05523c0db5d8005a984e5b07a3712ea9f2dfd9511df69aee2e8da896d77b5ac2a1be87f9cd3b6ed7511126af64bb7b6aab95e108d3912b2dd9f9bda2149 SHA512 c514eb12d2c1c0480a9e775b751f1d235a3adf452217b2b82c188a127e0a0a11b92b27a95ae1671609e339952cd813b5a9750485bbda92b995647f431da8a959
 MISC metadata.xml 358 BLAKE2B 8b582150db49d0c4ac43268c59fa182078c0c2d8e4b7db6f4a0008cc4bc0376038024de6adbbd438528025419d480c456d1eca6e4b27bf7cd610730ba2af5940 SHA512 fc5f35fa1bab9635e576db3cff7b5151ca60a74401cbe182dc2aa923717a10ca87002773339c2fbf234feddd8f16a7c7a2f6b47ea8fd14424cbf7f900effca57
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.42.2.ebuild b/dev-cpp/libxmlpp/libxmlpp-2.42.2.ebuild
new file mode 100644
index 000000000000..f373c399cec4
--- /dev/null
+++ b/dev-cpp/libxmlpp/libxmlpp-2.42.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME_ORG_MODULE="${PN/pp/++}"
+
+inherit gnome2 meson-multilib
+
+DESCRIPTION="C++ wrapper for the libxml2 XML parser library"
+HOMEPAGE="http://libxmlplusplus.sourceforge.net/"
+
+LICENSE="LGPL-2.1"
+SLOT="2.6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libxml2-2.7.7[${MULTILIB_USEDEP}]
+	>=dev-cpp/glibmm-2.32.0:2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		dev-cpp/mm-common
+		app-doc/doxygen
+		media-gfx/graphviz
+		dev-libs/libxslt
+	)
+"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "/install_docdir = /s/'doc'/'gtk-doc'/" \
+		docs/reference/meson.build || die
+	sed -i \
+		-e "/install_tutorialdir = /s/'doc'/'gtk-doc'/" \
+		docs/manual/meson.build || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dmaintainer-mode=false
+		-Dwarnings=min
+		-Ddist-warnings=max
+		-Dbuild-deprecated-api=true
+		$(meson_native_use_bool doc build-documentation)
+		-Dvalidation=false
+		-Dbuild-pdf=false
+		-Dbuild-examples=false
+		$(meson_use test build-tests)
+		-Dmsvc14x-parallel-installable=false
+	)
+	meson_src_configure
+}
diff --git a/dev-cpp/libxmlpp/libxmlpp-3.0.1-r1.ebuild b/dev-cpp/libxmlpp/libxmlpp-3.0.1-r1.ebuild
deleted file mode 100644
index cb65e2eb8aff..000000000000
--- a/dev-cpp/libxmlpp/libxmlpp-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="${PN/pp/++}"
-
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="C++ wrapper for the libxml2 XML parser library"
-HOMEPAGE="http://libxmlplusplus.sourceforge.net/"
-
-LICENSE="LGPL-2.1"
-SLOT="3.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-libs/libxml2-2.7.7[${MULTILIB_USEDEP}]
-	>=dev-cpp/glibmm-2.32:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-multilib_src_prepare() {
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		$(multilib_native_use_enable doc documentation)
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/dev-cpp/libxmlpp/libxmlpp-5.0.2.ebuild b/dev-cpp/libxmlpp/libxmlpp-5.0.2.ebuild
new file mode 100644
index 000000000000..7a9d793a15d0
--- /dev/null
+++ b/dev-cpp/libxmlpp/libxmlpp-5.0.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME_ORG_MODULE="${PN/pp/++}"
+
+inherit gnome2 meson
+
+DESCRIPTION="C++ wrapper for the libxml2 XML parser library"
+HOMEPAGE="http://libxmlplusplus.sourceforge.net/"
+
+LICENSE="LGPL-2.1"
+SLOT="5.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libxml2-2.7.7
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		dev-cpp/mm-common
+		app-doc/doxygen
+		media-gfx/graphviz
+		dev-libs/libxslt
+	)
+"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "/install_docdir = /s/'doc'/'gtk-doc'/" \
+		docs/reference/meson.build || die
+	sed -i \
+		-e "/install_tutorialdir = /s/'doc'/'gtk-doc'/" \
+		docs/manual/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dmaintainer-mode=false
+		-Dwarnings=min
+		-Ddist-warnings=max
+		-Dbuild-deprecated-api=true
+		$(meson_use doc build-documentation)
+		-Dvalidation=false
+		-Dbuild-pdf=false
+		-Dbuild-examples=false
+		$(meson_use test build-tests)
+		-Dmsvc14x-parallel-installable=false
+	)
+	meson_src_configure
+}