3 files changed, 15 insertions, 55 deletions
diff --git a/dev-libs/yajl/Manifest b/dev-libs/yajl/Manifest
index 168bdab07a3b..409ee8ee074e 100644
--- a/dev-libs/yajl/Manifest
+++ b/dev-libs/yajl/Manifest
@@ -1,6 +1,5 @@
 AUX yajl-2.1.0-pkg-config.patch 2299 BLAKE2B 1de5b3d183b692b8be1fe37d0f05e97141b82dcfce7770e9b4e27ed2443b8506efb8a6cff2bbc5ebac640ba87819833d0e6eb5d8cd8139a973861904afbea648 SHA512 0cc7f685b80280af209c8b3d9443711174a0439dc59f3e81dbd1f78b8aecca3eb29b2c8b88d94b8a4200a1248fb03948a1e51206373af49a55fb2eb32e9d7dde
 AUX yajl-2.1.0-uclibc.patch 487 BLAKE2B 873f1c4d4c53ff155814d960301f0932267ce277bfe772593853234c446ef949a7bd424c7db8f97c9dbc14428b03210b1c740a51b5379dbcebefbb311144a826 SHA512 7d81f13329da5fa81c31b07763b50153197760c93ceaf14d3b87232a377fb0871dc522f73a7d556131d1272496d7e8082eaef8ec968b8004e2d2c5e74987167d
 DIST yajl-2.1.0.tar.gz 84039 BLAKE2B 53cfa60994a478050ef1ab35ecfe60cc51f166bc101ee81f42122b134cc30afd1277c3c2661f5c03dc8c8117fcfdaab8ec7c6d735a6810ea4700f1afaea60e1a SHA512 671c06081e01584d170b614dc0685f49c6d7448b673d8ed99749ce4e0ca73875af9f62df7787b919ceaecab213668ac1d2a5800b6831731ec146353552f36985
-EBUILD yajl-2.1.0-r1.ebuild 899 BLAKE2B dbdca93bb1768ef01786859f37dc7b901cfd544889585065a935ff69987f6d8cd94c32a6a65b943706d6f8de92c3c607fb784973deddb64b540d4a29b06d75f7 SHA512 ad92abd03993bc6ac875d18da789acbdc8a2f34a9e12e8424a312fcf4bae176b2de34f9625bcb70ed08e5de4916e3d6c5ca5707274628347bafa41ccae44605f
-EBUILD yajl-2.1.0-r2.ebuild 934 BLAKE2B 3bfa7cb1155560e9fca1734e1d1b47cc55b84d9c3557179d97128eba3014c9a67e92066b40bfcb6a6ec7e15c950b725523e18dea1f83ddac5f9769c9d0beaf47 SHA512 64dce8bf0574b584542c74fd5c396889539471f05c271b320b07b1c39319ab827370a19551f6f9bfc402022e93571ce479edad930774b7050b274bbc4d787295
+EBUILD yajl-2.1.0-r3.ebuild 951 BLAKE2B 87db0e670510662ea67c386e28a5e1e19c6c102044aa80cea1c4dc6f803044acb01a1be5e1cd0348bcdc8855448df8a1f5e4f311fe28d3b6a96ea17c6073ae20 SHA512 a51be6909954b36554263a0c7af42e04db4fc897ffe1168ad045ec1e4bbf72954313c3e60f7e4faa54daa67daf5d79bfa36182297742b3081574f7855f579187
 MISC metadata.xml 336 BLAKE2B cfff08a4c7fbc2990928356c47d5110c6e6de6278ec3a45ac89f7dc1ae5f247a12214c41c884e622d264142b3f487fb82ff0457e15a0d39080e7680ad72d790e SHA512 c01c9b3ba695bb76ef55ede76c3e4b2e6843b27d4148aca7c290ac909aa8800541f0b85c043c5a74e518e4e84a0d3c6907cc4f93bbe8d0addfaaa40ede3a347d
diff --git a/dev-libs/yajl/yajl-2.1.0-r1.ebuild b/dev-libs/yajl/yajl-2.1.0-r1.ebuild
deleted file mode 100644
index f1613406c0b4..000000000000
--- a/dev-libs/yajl/yajl-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib vcs-snapshot
-
-DESCRIPTION="Small event-driven (SAX-style) JSON parser"
-HOMEPAGE="https://lloyd.github.com/yajl/"
-SRC_URI="https://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-PATCHES=( "${FILESDIR}"/${P}-uclibc.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	multilib_copy_sources
-}
-
-src_test() {
-	run_test() {
-		cd "${BUILD_DIR}"/test/parsing
-		./run_tests.sh ./yajl_test || die
-	}
-	multilib_parallel_foreach_abi run_test
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	use static-libs || \
-		find "${D}" -name libyajl_s.a -delete
-}
diff --git a/dev-libs/yajl/yajl-2.1.0-r2.ebuild b/dev-libs/yajl/yajl-2.1.0-r3.ebuild
index 93d4f3063c1b..a4afdebe761f 100644
--- a/dev-libs/yajl/yajl-2.1.0-r2.ebuild
+++ b/dev-libs/yajl/yajl-2.1.0-r3.ebuild
@@ -1,38 +1,37 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-multilib vcs-snapshot
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
 
 DESCRIPTION="Small event-driven (SAX-style) JSON parser"
 HOMEPAGE="https://lloyd.github.com/yajl/"
 SRC_URI="https://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz"
+S="${WORKDIR}/lloyd-yajl-66cb08c"
 
 LICENSE="ISC"
 SLOT="0/2"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
+IUSE=""
 
-PATCHES=( "${FILESDIR}"/${P}-uclibc.patch "${FILESDIR}"/${P}-pkg-config.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-uclibc.patch # git master 5d4bf525
+	"${FILESDIR}"/${P}-pkg-config.patch # downstream
+)
 
 src_prepare() {
-	cmake-utils_src_prepare
-
+	cmake_src_prepare
 	multilib_copy_sources
 }
 
-src_test() {
-	run_test() {
-		cd "${BUILD_DIR}"/test/parsing
-		./run_tests.sh ./yajl_test || die
-	}
-	multilib_parallel_foreach_abi run_test
+multilib_src_test() {
+	cd "${S}"/test/parsing || die
+	./run_tests.sh "${BUILD_DIR}"/test/parsing/yajl_test || die
 }
 
 src_install() {
 	cmake-multilib_src_install
-
-	use static-libs || \
-		find "${D}" -name libyajl_s.a -delete
+	find "${D}" -name libyajl_s.a -delete || die
 }