public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libccd/
@ 2016-03-01 10:07 Alexis Ballier
  0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier @ 2016-03-01 10:07 UTC (permalink / raw
  To: gentoo-commits

commit:     429fb9f828068e68b7558101010c3f2de1f315c0
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  1 10:06:36 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 10:06:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=429fb9f8

sci-libs/libccd: README has been renamed to README.md in git; bug #574906 by Alessandro Barbieri

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 sci-libs/libccd/libccd-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/libccd/libccd-9999.ebuild b/sci-libs/libccd/libccd-9999.ebuild
index 18bb1fe..5f3f8c2 100644
--- a/sci-libs/libccd/libccd-9999.ebuild
+++ b/sci-libs/libccd/libccd-9999.ebuild
@@ -29,7 +29,7 @@ IUSE="double doc"
 RDEPEND=""
 DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx )"
-DOCS=( README )
+DOCS=( README.md )
 
 src_configure() {
 	local mycmakeargs=(


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libccd/
@ 2020-07-23  7:06 Dennis Lamm
  0 siblings, 0 replies; 5+ messages in thread
From: Dennis Lamm @ 2020-07-23  7:06 UTC (permalink / raw
  To: gentoo-commits

commit:     53682bf62e3c247e5c49229bf7abd1698d99a1de
Author:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 23 07:03:56 2020 +0000
Commit:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Thu Jul 23 07:06:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53682bf6

sci-libs/libccd: bump to 0.2.1

Bug: https://bugs.gentoo.org/615672

Bug: https://bugs.gentoo.org/682176

Bug: https://bugs.gentoo.org/725422

Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/16783
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>

 sci-libs/libccd/Manifest           |  1 +
 sci-libs/libccd/libccd-2.1.ebuild  | 59 +++++++++++++++++++++++++++++++++++
 sci-libs/libccd/libccd-9999.ebuild | 63 ++++++++++++++++----------------------
 sci-libs/libccd/metadata.xml       | 21 ++++++++++---
 4 files changed, 103 insertions(+), 41 deletions(-)

diff --git a/sci-libs/libccd/Manifest b/sci-libs/libccd/Manifest
index 3dc09689b81..59ed2f7be0f 100644
--- a/sci-libs/libccd/Manifest
+++ b/sci-libs/libccd/Manifest
@@ -1 +1,2 @@
 DIST libccd-2.0.tar.gz 68103 BLAKE2B 30a91dba9b5dec5edc40d014dd0cba23d75e99f296918b6e58199890508c39813f5170456b1301e9304c433ca3531b1f23c4cdbfc0f20fca21eeafe53991467d SHA512 627426f1acd24779e7d596fd5b18dede4cf3c13d3cceda87a8b2d0195b72d9ada45290fd41baa20d6e3adafda75074db355cb95a60f80023c32b5ad4e72235bf
+DIST libccd-2.1.tar.gz 73971 BLAKE2B 77feeb42426e72cfc1392351acf84f4c4670ea7f6a555a2b15dd8927e49b855423c4262e319b06774a8d887423238b8d018021ebeba5ee188e52accf5aeb48a1 SHA512 ff037d9c4df50f09600cf9b3514b259b2850ff43f74817853f5665d22812891168f70bd3cc3969b2c9e3c706f6254991a65421476349607fbd04d894b217456d

diff --git a/sci-libs/libccd/libccd-2.1.ebuild b/sci-libs/libccd/libccd-2.1.ebuild
new file mode 100644
index 00000000000..8691045954d
--- /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 6d2690e84ba..6f8c7c9f77b 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 20ea537dd9a..62004119dcc 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>


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libccd/
@ 2020-12-28 15:17 David Seifert
  0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2020-12-28 15:17 UTC (permalink / raw
  To: gentoo-commits

commit:     665810256bb91588c6cee21b1d007db1685c68d4
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Dec 28 15:17:08 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 15:17:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66581025

sci-libs/libccd: Disable static libs

Closes: https://bugs.gentoo.org/725422
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-libs/libccd/libccd-2.1.ebuild | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/sci-libs/libccd/libccd-2.1.ebuild b/sci-libs/libccd/libccd-2.1.ebuild
index 8691045954d..cdc23db2921 100644
--- a/sci-libs/libccd/libccd-2.1.ebuild
+++ b/sci-libs/libccd/libccd-2.1.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 
 inherit cmake
 
-if [ "${PV}" = "9999" ] ; then
+if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/danfis/libccd/${PN}.git"
+	EGIT_REPO_URI="https://github.com/danfis/libccd.git"
 else
 	SRC_URI="https://github.com/danfis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
@@ -19,14 +19,10 @@ HOMEPAGE="http://libccd.danfis.cz/
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="+double-precision doc +shared test"
+IUSE="+double-precision doc test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-"
+BDEPEND="doc? ( dev-python/sphinx )"
 
 src_prepare() {
 	# upstream issue 72
@@ -40,11 +36,9 @@ 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
 }
 


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libccd/
@ 2020-12-28 15:17 David Seifert
  0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2020-12-28 15:17 UTC (permalink / raw
  To: gentoo-commits

commit:     b1b980bb9c9e02372c3db1a0d193caf17a375b13
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Dec 28 15:17:10 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 15:17:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1b980bb

sci-libs/libccd: Cleanup old

Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-libs/libccd/Manifest          |  1 -
 sci-libs/libccd/libccd-2.0.ebuild | 59 ---------------------------------------
 sci-libs/libccd/metadata.xml      |  1 -
 3 files changed, 61 deletions(-)

diff --git a/sci-libs/libccd/Manifest b/sci-libs/libccd/Manifest
index 59ed2f7be0f..6c8f3bc992e 100644
--- a/sci-libs/libccd/Manifest
+++ b/sci-libs/libccd/Manifest
@@ -1,2 +1 @@
-DIST libccd-2.0.tar.gz 68103 BLAKE2B 30a91dba9b5dec5edc40d014dd0cba23d75e99f296918b6e58199890508c39813f5170456b1301e9304c433ca3531b1f23c4cdbfc0f20fca21eeafe53991467d SHA512 627426f1acd24779e7d596fd5b18dede4cf3c13d3cceda87a8b2d0195b72d9ada45290fd41baa20d6e3adafda75074db355cb95a60f80023c32b5ad4e72235bf
 DIST libccd-2.1.tar.gz 73971 BLAKE2B 77feeb42426e72cfc1392351acf84f4c4670ea7f6a555a2b15dd8927e49b855423c4262e319b06774a8d887423238b8d018021ebeba5ee188e52accf5aeb48a1 SHA512 ff037d9c4df50f09600cf9b3514b259b2850ff43f74817853f5665d22812891168f70bd3cc3969b2c9e3c706f6254991a65421476349607fbd04d894b217456d

diff --git a/sci-libs/libccd/libccd-2.0.ebuild b/sci-libs/libccd/libccd-2.0.ebuild
deleted file mode 100644
index 894309a2623..00000000000
--- a/sci-libs/libccd/libccd-2.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/danfis/libccd"
-fi
-
-inherit ${SCM} cmake-utils toolchain-funcs
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-else
-	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/"
-LICENSE="BSD"
-SLOT="0"
-IUSE="double doc"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-DOCS=( README )
-
-src_configure() {
-	local mycmakeargs=(
-		"-DCCD_DOUBLE=$(usex double TRUE FALSE)"
-	)
-	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
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dohtml -r "${S}/doc/_build/html/"*
-}

diff --git a/sci-libs/libccd/metadata.xml b/sci-libs/libccd/metadata.xml
index 30cf22a0286..8f3764e4475 100644
--- a/sci-libs/libccd/metadata.xml
+++ b/sci-libs/libccd/metadata.xml
@@ -11,7 +11,6 @@
     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="double-precision">More precise calculations at the expense of speed</flag>
   </use>
   <upstream>


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libccd/
@ 2020-12-28 15:17 David Seifert
  0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2020-12-28 15:17 UTC (permalink / raw
  To: gentoo-commits

commit:     e4c17b8522686b57636ec9fd26d60141fd4d2662
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Dec 28 15:17:09 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 15:17:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4c17b85

sci-libs/libccd: Sync live ebuild, fix incorrect EGIT_REPO_URI

Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-libs/libccd/libccd-9999.ebuild | 14 ++++----------
 sci-libs/libccd/metadata.xml       |  1 -
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/sci-libs/libccd/libccd-9999.ebuild b/sci-libs/libccd/libccd-9999.ebuild
index 6f8c7c9f77b..8c95229c774 100644
--- a/sci-libs/libccd/libccd-9999.ebuild
+++ b/sci-libs/libccd/libccd-9999.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 
 inherit cmake
 
-if [ "${PV}" = "9999" ] ; then
+if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/danfis/libccd/${PN}.git"
+	EGIT_REPO_URI="https://github.com/danfis/libccd.git"
 else
 	SRC_URI="https://github.com/danfis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
@@ -19,23 +19,17 @@ HOMEPAGE="http://libccd.danfis.cz/
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="+double-precision doc +shared test"
+IUSE="+double-precision doc test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-"
+BDEPEND="doc? ( dev-python/sphinx )"
 
 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
 }
 

diff --git a/sci-libs/libccd/metadata.xml b/sci-libs/libccd/metadata.xml
index 62004119dcc..30cf22a0286 100644
--- a/sci-libs/libccd/metadata.xml
+++ b/sci-libs/libccd/metadata.xml
@@ -11,7 +11,6 @@
     implements algorithm Minkowski Portal Refinement (MPR, a.k.a. XenoCollide) as described in Game Programming Gems 7.
   </longdescription>
   <use>
-    <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>


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2020-12-28 15:17 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-28 15:17 [gentoo-commits] repo/gentoo:master commit in: sci-libs/libccd/ David Seifert
  -- strict thread matches above, loose matches on Subject: below --
2020-12-28 15:17 David Seifert
2020-12-28 15:17 David Seifert
2020-07-23  7:06 Dennis Lamm
2016-03-01 10:07 Alexis Ballier

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox