gentoo resync : 12.03.2021

5 files changed, 16 insertions, 132 deletions

diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index 2c39683569aa..8b72e1e99db9 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -1,8 +1,3 @@
-AUX uriparser-0.9.3-tests.patch 724 BLAKE2B de0681eaa68e4d846853d58804646c2a528f9a2be9bf317111d4b54521fa07fb6834df375c512c8bfa2b48832591706c01beedead9f1e199df5df3526606a205 SHA512 bde6f137503540dcc8a84eba2f97b8c21244d1d0dbf132b9bea07430e615804c4ad639663497955dc97e6bb8292bf2f1ac87b349dbbfc04f6230ce82b8077c17
-DIST uriparser-0.9.1.tar.bz2 372722 BLAKE2B 6fe21d1f5a98564f3e08094b1e27a13ea00baff3c4e09645236d8b08cba5455d49862a2d66fec02057efbb3b3d2e36040aeab31630f516eedd1ef36c84211638 SHA512 c6a4f3b737d4c53ba14148a5be363d93947c8c32755b369726ccdd6e01e8a2293d2c94d448700fc97bb56092696b67965646ae07c9ef31be253e2279d0bc3821
-DIST uriparser-0.9.3.tar.bz2 173073 BLAKE2B daf4d4ef2801850b8b4b3622ec195c7bfdc105cca085ea4a9d3ed9427bf7cf2eedcce4954b679a0ed1a79b7c57c98a1998b0cac27bd2b1de540aa79fdd4b160d SHA512 424419ea7b5f945b37ea06091d59e731c6a7ee76e7998f8a4e598036b3de8b593d62d1af6c6ddc7c31b43fc6795d4a5fa8d50da2508ca19de100a2222106fa3e
 DIST uriparser-0.9.4.tar.bz2 174551 BLAKE2B b95f270685757052fca02fae0a029f08de8bc14bea733bd56e62f0bcdc6592f015453ed38c87171cea9054618328dc94a512ff816519f70594653451f751c4f8 SHA512 c5e671ce2589aacd2c562e66facbee9e1cad3101e840f40b7ebdb917fa669e0c3ae7ed75623692f601655c0b82c10bcfe3086ad628beac8f965e613228e67ecd
-EBUILD uriparser-0.9.1.ebuild 929 BLAKE2B ad4f6452fabff09e9d7307ac3ab412bd10c67a69c8e96acfe79b47e57ca08ca2afde276992de3a46d4b13845f4ad087a242389e3f36903c8f79f03cf3252c34d SHA512 93bf1fc1b036ff7ed3ccfbeae76ecb764333926c5fe74cd813e5bb12ca6ae72c443aefcbc92f31f831b2a22427f0c021404ee0bae5e780b7fd21912b85df8ac5
-EBUILD uriparser-0.9.3.ebuild 1199 BLAKE2B 253164cb9593781e1c797e6808a33ee19201ba8abf41b54f95bb41b293c6959b87b69cb6fa0233e0b1348597231b4517ad3d38b605dc723c03e2fa0a6ffcc729 SHA512 ad96686a67e71aa0e31fc87f38a2574a86b3e3c28f6f344efe645896128ca8abb03366c232441e6e7062540e9187789367341750593215a5f7cd8a4e44a32bd6
-EBUILD uriparser-0.9.4.ebuild 1165 BLAKE2B 8d5f75f1e2f6b49d0c840351837bb21f5966e93bb2216b70f5f6c0c9af2f45c958ffe2e0d4c3ac0a3aabceb119b812fe2dca514b5828c63bea48c37007503f3c SHA512 f3ad2a08062cf7b59550139502d1eabac41e2dbae551f54e5bb5222b825e14f78dd081917aed991c9f4a4f9721d53468cb0923cac0e731ca2fcdc9198c137844
+EBUILD uriparser-0.9.4.ebuild 1114 BLAKE2B eeef9c2c0dc64680be9608407af7eee2bf7dcc93acf558857acfdcb16bdf6cccbe8ef8653098c77e5db9851fb1df0383d8e272affd6eef9c30b6cf7db647ca15 SHA512 a53fb91fbf4a9b274cd78e6f592f191a51f17a8c80a4d3b9be5d0ad815a4ed2389e3fb54e6bfa95a2a1bcd9725fd9cdda6bf6a5d52b4720024cd632c9a7758eb
 MISC metadata.xml 542 BLAKE2B ea02a2f11456940eeab83ac904b7b8893c0c41428161f0391eeb9aecbeb51f7d22ec215455837932f0a2b193e937ce41290d5e795ab0cc434b23e13b37dc7146 SHA512 6798e6f833cbbb1ebd80cf04bc5950e5bafd8b689d79211a0a778467b9785b18720918b1822106dadcb96044df2ec8f681c3cda049b1bf3ca1fa072f409dfc45
diff --git a/dev-libs/uriparser/files/uriparser-0.9.3-tests.patch b/dev-libs/uriparser/files/uriparser-0.9.3-tests.patch
deleted file mode 100644
index ad6f1c1311d7..000000000000
--- a/dev-libs/uriparser/files/uriparser-0.9.3-tests.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f870e6c68696a6018702caa5c8a2feba9b0f99fa Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 28 Apr 2019 17:35:31 +0200
-Subject: [PATCH] tests: No longer crash when compiled with -DNDEBUG (fixes
- #67)
-
----
- test/MemoryManagerSuite.cpp | 2 ++
- 1 files changed, 2 insertions(+)
-
-diff --git a/test/MemoryManagerSuite.cpp b/test/MemoryManagerSuite.cpp
-index 85f498b..4cda664 100644
---- a/test/MemoryManagerSuite.cpp
-+++ b/test/MemoryManagerSuite.cpp
-@@ -19,6 +19,8 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-  */
- 
-+#undef NDEBUG  // because we rely on assert(3) further down
-+
- #include <cassert>
- #include <cerrno>
- #include <cstring>  // memcpy
diff --git a/dev-libs/uriparser/uriparser-0.9.1.ebuild b/dev-libs/uriparser/uriparser-0.9.1.ebuild
deleted file mode 100644
index 8af0a3c0d760..000000000000
--- a/dev-libs/uriparser/uriparser-0.9.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
-HOMEPAGE="https://uriparser.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc qt5 test unicode"
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig
-	doc? ( >=app-doc/doxygen-1.5.8
-		qt5? ( dev-qt/qthelp:5 ) )
-	test? ( >=dev-cpp/gtest-1.8.1 )"
-
-REQUIRED_USE="test? ( unicode )"
-RESTRICT="!test? ( test )"
-
-DOCS=( AUTHORS ChangeLog THANKS )
-
-src_configure() {
-	econf \
-		$(use_enable test) \
-		--enable-char \
-		$(use_enable unicode wchar_t) \
-		$(use_enable doc)
-}
-
-src_install() {
-	default
-
-	if use doc && use qt5; then
-		dodoc doc/*.qch
-		docompress -x /usr/share/doc/${PF}/${P}.qch
-	fi
-}
diff --git a/dev-libs/uriparser/uriparser-0.9.3.ebuild b/dev-libs/uriparser/uriparser-0.9.3.ebuild
deleted file mode 100644
index 54a967442dc8..000000000000
--- a/dev-libs/uriparser/uriparser-0.9.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
-HOMEPAGE="https://uriparser.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc qt5 test unicode"
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig
-	doc? ( >=app-doc/doxygen-1.5.8
-		qt5? ( dev-qt/qthelp:5 ) )
-	test? ( >=dev-cpp/gtest-1.8.1 )"
-
-REQUIRED_USE="test? ( unicode )"
-RESTRICT="!test? ( test )"
-
-DOCS=( AUTHORS ChangeLog THANKS )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tests.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DURIPARSER_BUILD_CHAR=ON
-		-DURIPARSER_BUILD_DOCS=$(usex doc ON OFF)
-		-DURIPARSER_BUILD_TESTS=$(usex test ON OFF)
-		-DURIPARSER_BUILD_TOOLS=ON
-		-DURIPARSER_BUILD_WCHAR_T=$(usex unicode ON OFF)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc && use qt5; then
-		dodoc "${BUILD_DIR}"/doc/*.qch
-		docompress -x /usr/share/doc/${PF}/${P}.qch
-	fi
-}
diff --git a/dev-libs/uriparser/uriparser-0.9.4.ebuild b/dev-libs/uriparser/uriparser-0.9.4.ebuild
index d814ac60e353..5eefe6b42f01 100644
--- a/dev-libs/uriparser/uriparser-0.9.4.ebuild
+++ b/dev-libs/uriparser/uriparser-0.9.4.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
-DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
+DESCRIPTION="Strictly RFC 3986 compliant URI parsing library in C"
 HOMEPAGE="https://uriparser.github.io/"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
@@ -14,31 +14,35 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="doc qt5 test unicode"
 
-RDEPEND=""
-DEPEND="virtual/pkgconfig
-	doc? ( >=app-doc/doxygen-1.5.8
-		qt5? ( dev-qt/qthelp:5 ) )
-	test? ( >=dev-cpp/gtest-1.8.1 )"
-
 REQUIRED_USE="test? ( unicode )"
 RESTRICT="!test? ( test )"
 
+DEPEND="
+	test? ( >=dev-cpp/gtest-1.8.1 )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.5.8
+		qt5? ( dev-qt/qthelp:5 )
+	)
+"
+
 DOCS=( AUTHORS ChangeLog THANKS )
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
 		-DURIPARSER_BUILD_CHAR=ON
 		-DURIPARSER_BUILD_DOCS=$(usex doc ON OFF)
 		-DURIPARSER_BUILD_TESTS=$(usex test ON OFF)
 		-DURIPARSER_BUILD_TOOLS=ON
 		-DURIPARSER_BUILD_WCHAR_T=$(usex unicode ON OFF)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use doc && use qt5; then
 		dodoc "${BUILD_DIR}"/doc/*.qch