gentoo resync : 25.08.2020

4 files changed, 106 insertions, 43 deletions

diff --git a/sci-libs/libccd/Manifest b/sci-libs/libccd/Manifest
index 2b8b5a97061b..345ddaa4b510 100644
--- a/sci-libs/libccd/Manifest
+++ b/sci-libs/libccd/Manifest
@@ -1,4 +1,6 @@
 DIST libccd-2.0.tar.gz 68103 BLAKE2B 30a91dba9b5dec5edc40d014dd0cba23d75e99f296918b6e58199890508c39813f5170456b1301e9304c433ca3531b1f23c4cdbfc0f20fca21eeafe53991467d SHA512 627426f1acd24779e7d596fd5b18dede4cf3c13d3cceda87a8b2d0195b72d9ada45290fd41baa20d6e3adafda75074db355cb95a60f80023c32b5ad4e72235bf
+DIST libccd-2.1.tar.gz 73971 BLAKE2B 77feeb42426e72cfc1392351acf84f4c4670ea7f6a555a2b15dd8927e49b855423c4262e319b06774a8d887423238b8d018021ebeba5ee188e52accf5aeb48a1 SHA512 ff037d9c4df50f09600cf9b3514b259b2850ff43f74817853f5665d22812891168f70bd3cc3969b2c9e3c706f6254991a65421476349607fbd04d894b217456d
 EBUILD libccd-2.0.ebuild 1129 BLAKE2B 656f1592c08b5747a911939696afb80d8b85a1668b462d8dbc4ef91845bb45ea1a2f62e8540d7ac0939a1569b6f28c951bb968815b1fd5d1974f452959fa9522 SHA512 bb7d70c13dd6871be004c309c5adb92953ecd4fb73613fe34abad10dc8050dace2169d10f8da49d7ba96edd11153149b1edef5078cebeba4d5fa41e82292c7e3
-EBUILD libccd-9999.ebuild 1132 BLAKE2B dff0a19ab8ed0307c495c1ebc7f267239a47671433c57eb46d232657386bc1ae14d972dbbe22c322fbd26e233c148ad3972ff8171cac9ba4fb85ff4d8a79c5d6 SHA512 68295196d780ac574edc043165e51683258ad453d28a78a357ceb76a853e6532d653f5a11d39e033d0f24fa9e34f737d4c8c97351a524ae2bba2a196888bfce2
-MISC metadata.xml 320 BLAKE2B e5481a628c8ccd0751807384ad8bf4f8044e802a81a0b40fb8ea759bc46c268d8cc7237313f8a67fa93de1ec4acbe1a115a59867d5e324da48c3ecc3279a472a SHA512 76ac27595041183f73ae8b7c0a8c653ffd4609bfe780a3931b81a1222f9563b9af0e0c51fab757a16772f3ec285357772c3e5df36fb0058c34f21c8ae1b014bb
+EBUILD libccd-2.1.ebuild 1300 BLAKE2B 23cc9c165588a2d3a368a989f483dc06cd4586221ee364f8624426765c86908e2ddf0e0af17851169a3d450a9d8edcd91cf935b53f2ee2f3146740cb7d4c9780 SHA512 2964261d0268750a495f70e09b401d2656fa7c0c29dd86f150f1a658b09a0383f47138e34717ccd38f912aa245f48e562a7ee5e36de86e9a4650977f382a895f
+EBUILD libccd-9999.ebuild 1055 BLAKE2B 0f1a439abcc3f1a8963d4dae843865a8118209610df25e63f477508ac71a3ac54d00b2b1e3e4d30c286a8954911376bf811deb7031329e270937e4c8cd04c662 SHA512 5a4e556da14ab3980af8ad10c96692c2ade98636636838d1e1048a661e0d1ac4ccbf1fce1195533f62da7d1efe31b55f7f49dbf45d71e57122aa288b0581cc8f
+MISC metadata.xml 974 BLAKE2B 0f267202a50f7e56124878ff2f01990c83fb07b36f69db357b8e8786c3fb9720d0090adbb2916c40c1ab53b391af9f458d1732b3c907e256c06dcde9052750ef SHA512 b53567e44a76b4e123b7883fee66868f05ed25448c369ec77eae8ff4c4d93debf798d71db3623d3cc680cb2064cb96d20de8bd590b9d8f1f75eaadd0a8649238
diff --git a/sci-libs/libccd/libccd-2.1.ebuild b/sci-libs/libccd/libccd-2.1.ebuild
new file mode 100644
index 000000000000..8691045954d5
--- /dev/null
+++ b/sci-libs/libccd/libccd-2.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [ "${PV}" = "9999" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/danfis/libccd/${PN}.git"
+else
+	SRC_URI="https://github.com/danfis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+DESCRIPTION="Library for collision detection between two convex shapes"
+HOMEPAGE="http://libccd.danfis.cz/
+	https://github.com/danfis/libccd"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="+double-precision doc +shared test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+"
+
+src_prepare() {
+	# upstream issue 72
+	# https://github.com/danfis/libccd/issues/72
+	sed -i -e "s \${CMAKE_INSTALL_DATAROOTDIR}/doc/ccd \${CMAKE_INSTALL_DATAROOTDIR}/doc/${PF} g" \
+	CMakeLists.txt doc/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(usex doc ON OFF)
+		-DBUILD_SHARED_LIBS=$(usex shared ON OFF)
+		-DENABLE_DOUBLE_PRECISION=$(usex double-precision ON OFF)
+	)
+
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		local DOCS=( "${BUILD_DIR}"/doc/man )
+		local HTML_DOCS=( "${BUILD_DIR}"/doc/html )
+		einstalldocs
+	fi
+}
diff --git a/sci-libs/libccd/libccd-9999.ebuild b/sci-libs/libccd/libccd-9999.ebuild
index 6d2690e84ba0..6f8c7c9f77b5 100644
--- a/sci-libs/libccd/libccd-9999.ebuild
+++ b/sci-libs/libccd/libccd-9999.ebuild
@@ -1,59 +1,50 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/danfis/libccd"
-fi
-
-inherit ${SCM} cmake-utils toolchain-funcs
+inherit cmake
 
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
+if [ "${PV}" = "9999" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/danfis/libccd/${PN}.git"
 else
+	SRC_URI="https://github.com/danfis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
-	SRC_URI="http://libccd.danfis.cz/files/${P}.tar.gz"
 fi
 
 DESCRIPTION="Library for collision detection between two convex shapes"
-HOMEPAGE="http://libccd.danfis.cz/"
+HOMEPAGE="http://libccd.danfis.cz/
+	https://github.com/danfis/libccd"
+
 LICENSE="BSD"
 SLOT="0"
-IUSE="double doc"
+IUSE="+double-precision doc +shared test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
+
 DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-DOCS=( README.md )
+	doc? ( dev-python/sphinx )
+"
 
 src_configure() {
 	local mycmakeargs=(
-		"-DCCD_DOUBLE=$(usex double TRUE FALSE)"
+		-DBUILD_DOCUMENTATION=$(usex doc ON OFF)
+		-DBUILD_SHARED_LIBS=$(usex shared ON OFF)
+		-DENABLE_DOUBLE_PRECISION=$(usex double-precision ON OFF)
 	)
-	cmake-utils_src_configure
-}
 
-src_compile() {
-	cmake-utils_src_compile
-	if use doc ; then
-		cd "${S}/doc"
-		emake SPHINXBUILD=sphinx-build html
-	fi
-}
-
-src_test() {
-	cd src/testsuites
-	tc-export CC
-	LDFLAGS="-L${BUILD_DIR} ${LDFLAGS}" \
-	LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" \
-		emake check
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
-	use doc && dohtml -r "${S}/doc/_build/html/"*
+	cmake_src_install
+
+	if use doc; then
+		local DOCS=( "${BUILD_DIR}"/doc/man )
+		local HTML_DOCS=( "${BUILD_DIR}"/doc/html )
+		einstalldocs
+	fi
 }
diff --git a/sci-libs/libccd/metadata.xml b/sci-libs/libccd/metadata.xml
index 20ea537dd9ae..62004119dcce 100644
--- a/sci-libs/libccd/metadata.xml
+++ b/sci-libs/libccd/metadata.xml
@@ -1,11 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>aballier@gentoo.org</email>
-<name>Alexis Ballier</name>
-</maintainer>
+  <maintainer type="person">
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+  </maintainer>
+  <longdescription>
+    libccd is library for a collision detection between two convex shapes.
+    libccd implements variation on Gilbert–Johnson–Keerthi algorithm plus Expand Polytope Algorithm (EPA) and also
+    implements algorithm Minkowski Portal Refinement (MPR, a.k.a. XenoCollide) as described in Game Programming Gems 7.
+  </longdescription>
   <use>
-    <flag name="double">Use double precision floats.</flag>
+    <flag name="shared">Build shared library</flag>
+    <flag name="double">Use double precision floats</flag>
+    <flag name="double-precision">More precise calculations at the expense of speed</flag>
   </use>
+  <upstream>
+    <bugs-to>https://github.com/danfis/libccd/issues</bugs-to>
+    <remote-id type="github">danfis/libccd</remote-id>
+  </upstream>
 </pkgmetadata>