gentoo resync : 20.03.2021

5 files changed, 27 insertions, 139 deletions

diff --git a/games-engines/box2d/Manifest b/games-engines/box2d/Manifest
index c98ec46a49fa..52d92e12f4ac 100644
--- a/games-engines/box2d/Manifest
+++ b/games-engines/box2d/Manifest
@@ -1,7 +1,3 @@
-DIST Box2D_v2.1.2.zip 3100922 BLAKE2B 1f2d2b201517ef2adb1b1a2c1f62f94b2f7cde6f857935dba11544b931481a2b87e036269f34571b99f5272b9dd985dcf463d153b628c54163166e2ae77d95d5 SHA512 cc50be6db8d02a4ddbb61208f67b05c264e24ab96885debc708b1b284957f18193b6a57d84d378cb0ba33ab3fc9a0f5c534b8ca9f8982e7e0fe656115cb5a82f
-DIST Box2D_v2.2.1.zip 3637276 BLAKE2B 844b589b43b916e20cb594ba160c4a025b2fb98bacb7c856884ec728c7b67f44ed86151df0b005ce1c813d74c8c55ce93e5060b4b9387662870cdcda9cdea76e SHA512 3d0d4eb06d9e2c425ffafb26839032cae897a4a82f27356ccad2fc764a02c3ca6dd53b24c51196291f5492f795356fb03575f8c75e599467577ba19165ccdcb4
-DIST box2d-2.3.1.tar.gz 1553222 BLAKE2B e21eafb9d807c5f241486c875bd8ee350c3e44601801b98d9ee35e2343244f5c72998cbc1e9f687d3a72033a76361a1ff7dd3bacad50f21212fca3618e887bb6 SHA512 22e31005644ae1f5a947149dee832286b0d5a96648a0e9766c32a9a047ae839b4354403eaf7040895074cf3bd33bb298e65053cf1b5b67a6a23fbf3fd5777dd5
-EBUILD box2d-2.1.2.ebuild 1136 BLAKE2B b5d377912d1a7d89bd97339230397b968d5c24611b088163c9c74c417bc460c5b39a40338645f1a2b7dab229e53c84a9affc5bdd36bd7bdf52b76c8d33e62dd5 SHA512 29ee13578761733925b56646d9059a92e2a707968389b848f93c5dfc994c4ffd1765b1387a329765c8bb94fe44dd4b52d0d0fcc3c1147ca4688cf1dcb4ca0f58
-EBUILD box2d-2.2.1.ebuild 1127 BLAKE2B b6722c13e2eaeac8435344b19358a43b7543cf679de708b050e5e7781a10d4ffd75841dfd4f586a44528951f2ddf24a6aa23e7cc88be2884512776ef75c10b82 SHA512 d9fd63afd1d8dc17a1915faa0d9b97bd3cb6a8c000124707f2a8983b74c56fd0328f12d271454a93988eaea88121d5f93530fc27bf80466cfe97078e59537de9
-EBUILD box2d-2.3.1.ebuild 1088 BLAKE2B 1cc2a9aeaab19c31d474f1f61174496630f57dba82b7781f66ec9e517b2bad0d3794a31e07c6b58027dfaea1278760fba538e103bd2ef6810fae8e8d906fc434 SHA512 abf079a59dd9170c073bdb3dcb0c56d812836bd8b9afd160f6079fae60e4b4cb441663590eb242e74b6aa1c8faade69acc032a178d9596f44b797ddddf4f8ff9
+DIST box2d-2.4.1.tar.gz 1224516 BLAKE2B 4f268c082d6c51d574fe6974351a64e98693e7eb71aa36626561fe23cb5fa890c77946e34d91fce92298af7e723c34306dfc6a934251a8566f431821397d1b82 SHA512 d900f925b77906777719c91488bdc5e2df1ad1f4a8ca39a574229f5e57070e3a843bdd7530e817112605fde6d82145c872d8afdfc65b84531a73199098c81162
+EBUILD box2d-2.4.1.ebuild 574 BLAKE2B 3307f240c56e80e5fd715551b18fe7a41b9d7afbd5afec2dbf1dbeec470dea259c59715121062f966fa40e9826f651d1b281f02aab3b0ba9c9ebb4b47cd5adf7 SHA512 a92abbf1ea2430dc34e70fe820fc69ea7acf77779ea57282d07df51f75241e4cf1234f8e2b6f8143f4ab9d2834ab17d0ce052c6e12ba8764b28a276d938462f9
 MISC metadata.xml 333 BLAKE2B 8744749fd1f8ee25c33a64b870a484d69549b738d2f5d663bd0e10fc09eeb40b347e1bc32cc80b7623c2aef4c4b37d185cc06f42159396f368ca2917b0f06d84 SHA512 27fa995f144fdde8f6e62aed1d6bc68e830ab912f34a2f4f24b4fa0882a42f3cabd5f1d5f81361a1ce8311a5cc56156408782e16cae8c9faa621c98c2b64bcce
diff --git a/games-engines/box2d/box2d-2.1.2.ebuild b/games-engines/box2d/box2d-2.1.2.ebuild
deleted file mode 100644
index 953853c49214..000000000000
--- a/games-engines/box2d/box2d-2.1.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson multilib
-
-MY_PN="Box2D"
-DESCRIPTION="A C++ engine for simulating rigid bodies in 2D games"
-HOMEPAGE="https://box2d.org/"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${MY_PN}_v${PV}.zip"
-LICENSE="ZLIB"
-SLOT="$(ver_cut 1-2).0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}_v${PV}/${MY_PN}"
-
-src_prepare() {
-	# This version supports CMake but upstream has dropped it since this
-	# release. They now use Premake but this Meson file is actually
-	# simpler! Installation is manual but that's true for Premake too.
-	cat > meson.build <<EOF || die
-project('${MY_PN}', 'cpp')
-shared_library(
-	'${MY_PN}',
-	$(find ${MY_PN} -name "*.cpp" -printf "'%p', ")
-	soversion: '${SLOT}', install : true
-)
-EOF
-
-	default
-}
-
-src_install() {
-	dodoc Readme.txt
-	dolib.so "${BUILD_DIR}"/lib${MY_PN}$(get_libname ${SLOT})
-
-	local FILE
-	for FILE in $(find ${MY_PN} -name *.h); do
-		insinto "/usr/include/${MY_PN}-${SLOT}/${FILE%/*}"
-		doins "${FILE}"
-	done
-}
diff --git a/games-engines/box2d/box2d-2.2.1.ebuild b/games-engines/box2d/box2d-2.2.1.ebuild
deleted file mode 100644
index 5663da2c4f6e..000000000000
--- a/games-engines/box2d/box2d-2.2.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson multilib
-
-MY_PN="Box2D"
-DESCRIPTION="A C++ engine for simulating rigid bodies in 2D games"
-HOMEPAGE="https://box2d.org/"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${MY_PN}_v${PV}.zip"
-LICENSE="ZLIB"
-SLOT="$(ver_cut 1-2).0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}_v${PV}"
-
-src_prepare() {
-	# This version supports CMake but upstream has dropped it since this
-	# release. They now use Premake but this Meson file is actually
-	# simpler! Installation is manual but that's true for Premake too.
-	cat > meson.build <<EOF || die
-project('${MY_PN}', 'cpp')
-shared_library(
-	'${MY_PN}',
-	$(find ${MY_PN} -name "*.cpp" -printf "'%p', ")
-	soversion: '${SLOT}', install : true
-)
-EOF
-
-	default
-}
-
-src_install() {
-	dodoc Readme.txt
-	dolib.so "${BUILD_DIR}"/lib${MY_PN}$(get_libname ${SLOT})
-
-	local FILE
-	for FILE in $(find ${MY_PN} -name *.h); do
-		insinto "/usr/include/${MY_PN}-${SLOT}/${FILE%/*}"
-		doins "${FILE}"
-	done
-}
diff --git a/games-engines/box2d/box2d-2.3.1.ebuild b/games-engines/box2d/box2d-2.3.1.ebuild
deleted file mode 100644
index 9a083d4ffb02..000000000000
--- a/games-engines/box2d/box2d-2.3.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson multilib
-
-MY_PN="Box2D"
-DESCRIPTION="A C++ engine for simulating rigid bodies in 2D games"
-HOMEPAGE="https://box2d.org/"
-SRC_URI="https://github.com/erincatto/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="ZLIB"
-SLOT="$(ver_cut 1-2).0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${MY_PN}-${PV}/${MY_PN}"
-
-src_prepare() {
-	# This version supports CMake but upstream has dropped it since this
-	# release. They now use Premake but this Meson file is actually
-	# simpler! Installation is manual but that's true for Premake too.
-	cat > meson.build <<EOF || die
-project('${MY_PN}', 'cpp')
-shared_library(
-	'${MY_PN}',
-	$(find ${MY_PN} -name "*.cpp" -printf "'%p', ")
-	soversion: '${SLOT}', install : true
-)
-EOF
-
-	default
-}
-
-src_install() {
-	dodoc {Changes,Readme}.txt
-	dolib.so "${BUILD_DIR}"/lib${MY_PN}$(get_libname ${SLOT})
-
-	local FILE
-	for FILE in $(find ${MY_PN} -name *.h); do
-		insinto "/usr/include/${MY_PN}-${SLOT}/${FILE%/*}"
-		doins "${FILE}"
-	done
-}
diff --git a/games-engines/box2d/box2d-2.4.1.ebuild b/games-engines/box2d/box2d-2.4.1.ebuild
new file mode 100644
index 000000000000..63093288e008
--- /dev/null
+++ b/games-engines/box2d/box2d-2.4.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="C++ engine for simulating rigid bodies in 2D games"
+HOMEPAGE="https://box2d.org/"
+SRC_URI="https://github.com/erincatto/Box2D/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBOX2D_BUILD_TESTBED=OFF # bundled libs, broken anyway right now
+		-DBOX2D_BUILD_DOCS=$(usex doc)
+	)
+	cmake_src_configure
+}