box2d: bump

4 files changed, 46 insertions, 109 deletions

diff --git a/dev-libs/box2d/Manifest b/dev-libs/box2d/Manifest
index 0e3c01c..6e69396 100644
--- a/dev-libs/box2d/Manifest
+++ b/dev-libs/box2d/Manifest
@@ -1,22 +1 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST Box2D_v2.0.1.zip 866019 SHA256 62857048aa089b558561074154430883cee491eedd71247f75f488cba859e21f
-DIST Box2D_v2.1.2.zip 3100922 SHA256 3b351c3e51c6bf78c3e48a2b51260297f3f309fde389c9bfc21ebd484efbba54
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQlghaAAoJECZQPTSbOzNLRZMP/jGBi5TxszGGbDld63XR7HZm
-bN1iGFq1IppOvwyJfOdGip4qU/NiZnN1dal3fdohestoaG4CbM0uQOp6fUZDibeR
-G1i3WgOQusS2VVc62L4sYUdCOuoKEYE7svjMmbzdvs/ySe1PIf0jX3Izd3oQ4sMU
-jMAJen+0qL/Wt1r8fmaNFiJlGikOKEIb0uD9AGaeV/SIzINNW3LeXGv8QOnRkz5R
-MVS1oj6VT0KTtdC+VQUNHQzkrUdGIOFSj9Y7bHh+kwkOBAKBKRi0iC7/MyBzWV3F
-cTUnjZwZdbpR/PNaM1g8SkaVlftXeFXVIqE60SggSjSgQ1s+qvVuqekff/XRFl+e
-qITufU6kz6iX+0WE1thmAn8Lzu8LWAqPG8n6ARgt+7a72eKrpg3NRFEiFUrdgXXC
-yvjsbMTh6hFR5dez1QOmXSMtI7z8QzMnN0zQ/sDitvJYWZfxEU5UBF0gX7ezBFyS
-zRO81WDvYNaT5iSNvck4PSybaXXftZe2k+Vx+dK71Pnt++zZyShhMAmwglX6hKs2
-97sh7yDK1Yzv5Vs+ywR8JV0TmagrYV/4wj6ktM2RvwQmJi3mrqfyDoxZ5CWwn2pt
-KBV1mA/h/DScS0TxRCNQfrMrxxF0yt9xf2s6U1z4yAhD6jtmQofRHaffZAX1hvXh
-hKnps4/mkhIaJLrb6BDj
-=dYK1
------END PGP SIGNATURE-----
+DIST box2d-2.3.1.tar.gz 1553222 SHA256 75d62738b13d2836cd56647581b6e574d4005a6e077ddefa5d727d445d649752 SHA512 22e31005644ae1f5a947149dee832286b0d5a96648a0e9766c32a9a047ae839b4354403eaf7040895074cf3bd33bb298e65053cf1b5b67a6a23fbf3fd5777dd5 WHIRLPOOL d1ffd38ce0b50fe27765220a3306476bff580d82c85ee329664a888f1382baf2722cde839b39830825c3c49de918f3eede3b36e999b28e8f8a0b4ca36a18531f
diff --git a/dev-libs/box2d/box2d-2.0.1.ebuild b/dev-libs/box2d/box2d-2.0.1.ebuild
deleted file mode 100644
index 1114c8b..0000000
--- a/dev-libs/box2d/box2d-2.0.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-MY_PN=Box2D
-
-inherit eutils
-
-IUSE=""
-
-DESCRIPTION="Box2D is an open source physics engine written primarily for games."
-HOMEPAGE="http://www.box2d.org"
-SRC_URI="http://box2d.googlecode.com/files/${MY_PN}_v${PV}.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/freeglut
-	app-arch/unzip"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_PN}_v${PV}/${MY_PN}/Source
-
-src_prepare(){
-	epatch "${FILESDIR}"/${P}-gcc4.patch
-	sed -i -e "s:../Source/::g" -i ../Include/Box2D.h || die sed failed
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dodoc ../Readme.txt
-
-	dolib.a Gen/float/lib${PN}.a
-
-	insinto /usr/include/${MY_PN}/
-	doins ../Include/${MY_PN}.h
-	insinto /usr/include/${MY_PN}/Collision/
-	doins Collision/*.h
-	insinto /usr/include/${MY_PN}/Collision/Shapes/
-	doins Collision/Shapes/*.h
-	insinto /usr/include/${MY_PN}/Common/
-	doins Common/*.h
-	insinto /usr/include/${MY_PN}/Dynamics/
-	doins Dynamics/*.h
-	insinto /usr/include/${MY_PN}/Dynamics/Contacts/
-	doins Dynamics/Contacts/*.h
-	insinto /usr/include/${MY_PN}/Dynamics/Joints/
-	doins Dynamics/Joints/*.h
-}
diff --git a/dev-libs/box2d/box2d-2.1.2.ebuild b/dev-libs/box2d/box2d-2.1.2.ebuild
deleted file mode 100644
index 4f6402a..0000000
--- a/dev-libs/box2d/box2d-2.1.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-MY_PN=Box2D
-
-CMAKE_MIN_VERSION=2.8
-inherit cmake-utils eutils
-
-DESCRIPTION="Box2D is an open source physics engine written primarily for games."
-HOMEPAGE="http://www.box2d.org"
-SRC_URI="http://box2d.googlecode.com/files/${MY_PN}_v${PV}.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/freeglut
-	app-arch/unzip"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_PN}_v${PV}/${MY_PN}
-
-src_configure() {
-	mycmakeargs="${mycmakeargs} -DBOX2D_BUILD_SHARED=ON"
-
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/box2d/box2d-2.3.1.ebuild b/dev-libs/box2d/box2d-2.3.1.ebuild
new file mode 100644
index 0000000..1105a8a
--- /dev/null
+++ b/dev-libs/box2d/box2d-2.3.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN=Box2D
+
+CMAKE_MIN_VERSION=2.8
+inherit cmake-utils eutils
+
+DESCRIPTION="Box2D is an open source physics engine written primarily for games."
+HOMEPAGE="http://www.box2d.org"
+SRC_URI="https://github.com/erincatto/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs examples"
+
+RDEPEND="
+	media-libs/freeglut
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}/${MY_PN}"
+
+usx() {
+	usex "${1}" "ON" "OFF"
+}
+#nusx() {
+#	usex "${1}" "OFF" "ON"
+#}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBOX2D_BUILD_SHARED=ON # no-shared build?
+		-DBOX2D_BUILD_STATIC=$(usx static-libs)
+		-DBOX2D_INSTALL_DOC=$(usx doc)
+# Broken:
+#		-DBOX2D_BUILD_EXAMPLES=$(usx examples)
+# So:
+		-DBOX2D_BUILD_EXAMPLES=OFF
+	)
+	cmake-utils_src_configure
+}