gentoo resync : 20.10.2021

7 files changed, 60 insertions, 37 deletions

diff --git a/media-libs/cal3d/Manifest b/media-libs/cal3d/Manifest
index e120ecc9ea09..41decbaeda23 100644
--- a/media-libs/cal3d/Manifest
+++ b/media-libs/cal3d/Manifest
@@ -1,7 +1,8 @@
-AUX cal3d-0.11.0-gcc43.patch 269 BLAKE2B 931141ed133a3e48a0473844d8d52e33ff76b6721cb81d050b90730f0d8b37d09d124b8f86b6caee099302bb6b90e397a7432579b24f4dba76c25610ff9cf2c8 SHA512 daf0d3621e20ed47d24270e526ddac8059c2f13da37d7f9f9c4e3edad60ae4d8ab94a132179a42505b5164ce12e37cd96ec77e3128087f73625a53c396d18cda
-AUX cal3d-0.11.0-gcc6.patch 19938 BLAKE2B bb2cd317a004e33fdcd9a1d73f563a933b7b4ae42566f0d3891ac75ea9f5362d7edfa4b58ea8d5f45bd8e65f12c77666558d6d4eec98f240db02f983cba6ce02 SHA512 6779ff0315b333cc10dde49eea2c84f8c985314618d6188b0dd8be63a195071103cc60f6492a7b5c60f8aef7deb0765fb10ee49c5b666f29d895d1b650476fd7
-AUX cal3d-0.11.0-tests.patch 352 BLAKE2B af4d33ccb48a89c45e3de3dab7860ff3a60e29756681b63a0da9c886591ebc6e7cb41caacdd5bb5f477b65edb4d3f7ad147b224eb8309a546187606a5ae8cd9b SHA512 bf605596206935d7882ee878e6fd1bb42e474f2c59f5bb76e8f8f92c606fa7258271eabd14fa30793aee6cb55dd95fb8592ddf7895f513363c22d91d80099857
-AUX cal3d-0.11.0-verbose.patch 503 BLAKE2B 8efdf4a56cd1430b9632f9ba85172024f700afea081b896bfcd50fc126a85748b5fdf53dfee1d9b2c4b8a8d43593bb68c733b3c1b7ef15c52bf7b75eb1d84fb2 SHA512 e0dc8a17b644012f4c291d9ba667ba6c7c8c3f34491f35490ab92573c137d1a6a1d1bf88c846b457a0310aff1aef27eabbf8c92b8477685b5828930f68416793
+AUX cal3d-0.11.0-docbook2html.patch 664 BLAKE2B a91108ab140b5e2284ef281175deeffb311eb36822bb30a5bd49449716f74c7cdaff13efdcb6800f1ab88993a2d9871778e4f0750c2730ae4cc21ef9d9bcdfbe SHA512 cead9ddc48045d9e59559a48a4266731aa02171b9d595981079a8bdeaaa60394092fa37ef675d15eced70d6aeec2238760e11080dead79bac3e956f959fc3577
+AUX cal3d-0.11.0-gcc43.patch 197 BLAKE2B ff12f3ac6aa32b68d848b137522c78356d4ee27c1709770d138ec4b1a9523cb083677489f140a8490913c4dee7832429c137b6e1094801041af158930a7674f7 SHA512 1a12756bccb20855a5761f16a01891b2182521e3c24f04eda2835fec02d2eea5509a084298c82aaf0b5c21bc1a37d10bcb9cafd3933792d196b06d1c357b77e0
+AUX cal3d-0.11.0-gcc6.patch 19840 BLAKE2B f5534040342c07174b0ff26a730331c390a036f9b6a628eabd59d329b263129512b924745bf1e4f6aa738cffeb2ea57d961ba08017a922ed19282cb85647fe1d SHA512 f6dda6218790d6361d2e518da3c8612af2d42b4ee26e68a88c263ce486b30efd762520a95cca5e37fe4976d1c57c3eca27f9692119667e29fc16f2b2ac0f09c3
+AUX cal3d-0.11.0-tests.patch 280 BLAKE2B f5216a9ed24ea1596252ec7f321cd18d2c90f45380852826e6cd331703c9891e508f918a00bd6918c7c203f334df42fc23c944c375c750be55bb0b225a0e116e SHA512 552f2ce605302b870431d3efabeabcfded91866d91675121047228d02668780e7446f704a18fbcdf8b4d5b8348a208e763c570b5d48eaac6a72f2db47b9385c2
+AUX cal3d-0.11.0-verbose.patch 431 BLAKE2B bf2e2fd9b60ed276846681b96a1c972783306a128f8075065f46d6a2cfe2a82d56bec948114e75b9ef445f9594b855c9142f0e9c07b8116a2fd811a70906c585 SHA512 38ff9b00458162fce21f66a2a0dd117af31bfb16a1cfe1357516261a63b86acc4ee5d399b0e620289796d27c5af9773240ae156c2d26ae67b691603c48183581
 DIST cal3d-0.11.0.tar.gz 568532 BLAKE2B 6730b9d623c9fa3dddb9f90d3cdcfc70a80ea1d2decb3bc5e8e3137142565c2fa570512b59c807996c6dfb04edc92f21301aaffa064bd41e6de7809223167ccd SHA512 4dc4b36b8f18760bfe6f8c80cbd941c14e2ebe596d0cd514fdb1ae4175bf2706e125665272d67ff21d33bb4b34e7be22bad9c00d488c1da21f442550bf3f204f
-EBUILD cal3d-0.11.0-r1.ebuild 1115 BLAKE2B 860ffda2c31fd870836316c7bee4ac53a9df77235022d21996338f08792b632cdd2e2fbdebe3af8404deb765d728180aea1b20a3ac67086c733443236f3c37a2 SHA512 bb0316247908249e371c802750fb3d4b4d9edc8534db3c451d17418fca5a9f30fb4ccdd481d8680dddd7667befbe4fd6917bc1403e91f69543d0057f5ebd953a
+EBUILD cal3d-0.11.0-r1.ebuild 1026 BLAKE2B 0dbb6aa211d1c82e402771cd011c31045911d4daf2bfca58cabf2213986d6c48b71b05e57fbcabc9371ef634a010c4c36a107fa741b231917fd21877a8602103 SHA512 a922094faa70452bcd2b82039ee431794a47f80b2c2636cf03923d1f22d170f755bb65068a7b1fed450775ad1dcaec93cd1648ae19bb3f01aa83ce32c67de999
 MISC metadata.xml 253 BLAKE2B 3c0e9c3c5f281d6e4e4325ed00c0ba65d7a882e798f5c18d02520dec99a494bfc8912036d4078540a86ea5f9107c579c89629f641b6dbc6f9440d2ee695bbc22 SHA512 81b82ada4d8d565c3aab65dbc79585e73f41736714c37100524ef624a42cb51329bd5430f41e701fc261f68b7266c2d2873c2029be777eb1cfb1d093a3413b02
diff --git a/media-libs/cal3d/cal3d-0.11.0-r1.ebuild b/media-libs/cal3d/cal3d-0.11.0-r1.ebuild
index 4ed4f9c971d4..14ba7aa6fe82 100644
--- a/media-libs/cal3d/cal3d-0.11.0-r1.ebuild
+++ b/media-libs/cal3d/cal3d-0.11.0-r1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit epatch autotools
+EAPI=8
+
+inherit autotools
 
 DESCRIPTION="Cal3D is a skeletal based character animation library"
-HOMEPAGE="http://home.gna.org/cal3d"
+HOMEPAGE="https://mp3butcher.github.io/Cal3D/"
 SRC_URI="http://download.gna.org/cal3d/sources/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
@@ -13,23 +14,22 @@ SLOT="0"
 KEYWORDS="amd64 ~ia64 ppc x86"
 IUSE="16bit-indices debug doc"
 
-DEPEND="doc? (
+BDEPEND="
+	doc? (
 		app-doc/doxygen
 		app-text/docbook-sgml-utils
 	)"
-RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-tests.patch
+	"${FILESDIR}"/${P}-verbose.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-docbook2html.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-	    "${FILESDIR}"/${P}-tests.patch \
-	    "${FILESDIR}"/${P}-verbose.patch \
-	    "${FILESDIR}"/${P}-gcc6.patch
-	sed -i \
-		-e "s:db2html:docbook2html:g" \
-		configure.in \
-		docs/Makefile.am \
-		|| die "sed for doc failed"
+	default
 	eautoreconf
 }
 
@@ -41,17 +41,14 @@ src_configure() {
 
 src_compile() {
 	emake
+
 	if use doc; then
-		cd docs
+		cd docs || die
 		emake doc-api
 		emake doc-guide
-		mkdir -p html/{guide,api}
-		mv *.{html,gif} html/guide/
-		mv api/html/* html/api/
+		mkdir -p html/{guide,api} || die
+		mv *.{html,gif} html/guide/ || die
+		mv api/html/* html/api/ || die
+		HTML_DOCS=( docs/html/api docs/html/guide )
 	fi
 }
-
-src_install() {
-	default
-	use doc && dohtml -r docs/html/api docs/html/guide
-}
diff --git a/media-libs/cal3d/files/cal3d-0.11.0-docbook2html.patch b/media-libs/cal3d/files/cal3d-0.11.0-docbook2html.patch
new file mode 100644
index 000000000000..2e3e88e318eb
--- /dev/null
+++ b/media-libs/cal3d/files/cal3d-0.11.0-docbook2html.patch
@@ -0,0 +1,25 @@
+--- a/configure.in
++++ b/configure.in
+@@ -50,9 +50,9 @@
+   AC_MSG_WARN([cannot find doxygen, unable to generate Cal3D API Reference!])
+ fi
+ 
+-AC_CHECK_PROG(DB2HTML, db2html, true, false)
++AC_CHECK_PROG(DB2HTML, docbook2html, true, false)
+ if test "$DB2HTML" = false; then
+-  AC_MSG_WARN([cannot find db2html, unable to generate Cal3D User's Guide!])
++  AC_MSG_WARN([cannot find docbook2html, unable to generate Cal3D User's Guide!])
+ fi
+ 
+ AC_PATH_PROG(BLENDER, [blender])
+--- a/docs/Makefile.am
++++ b/docs/Makefile.am
+@@ -18,7 +18,7 @@
+ 	doxygen cal3d.doxygen
+ 
+ doc-guide:
+-	db2html guide.sgml
++	docbook2html guide.sgml
+ 
+ clean-local:
+ 	rm -rf guide guide.junk
diff --git a/media-libs/cal3d/files/cal3d-0.11.0-gcc43.patch b/media-libs/cal3d/files/cal3d-0.11.0-gcc43.patch
index 80d73b274742..6f5bad7293ea 100644
--- a/media-libs/cal3d/files/cal3d-0.11.0-gcc43.patch
+++ b/media-libs/cal3d/files/cal3d-0.11.0-gcc43.patch
@@ -1,5 +1,5 @@
---- src/cal3d/platform.h.old	2008-04-27 23:08:41.000000000 +0200
-+++ src/cal3d/platform.h	2008-04-27 23:08:56.000000000 +0200
+--- a/src/cal3d/platform.h
++++ b/src/cal3d/platform.h
 @@ -77,6 +77,7 @@
  // standard includes
  #include <stdlib.h>
diff --git a/media-libs/cal3d/files/cal3d-0.11.0-gcc6.patch b/media-libs/cal3d/files/cal3d-0.11.0-gcc6.patch
index 98fc546eace1..f17d063e935b 100644
--- a/media-libs/cal3d/files/cal3d-0.11.0-gcc6.patch
+++ b/media-libs/cal3d/files/cal3d-0.11.0-gcc6.patch
@@ -1,5 +1,5 @@
---- cal3d-0.11.0/src/cal3d/loader.cpp.old	2016-09-24 00:58:09.968689367 -0400
-+++ cal3d-0.11.0/src/cal3d/loader.cpp	2016-09-24 01:06:54.867068386 -0400
+--- a/src/cal3d/loader.cpp
++++ b/src/cal3d/loader.cpp
 @@ -886,7 +886,7 @@
    if(!dataSrc.ok())
    {
diff --git a/media-libs/cal3d/files/cal3d-0.11.0-tests.patch b/media-libs/cal3d/files/cal3d-0.11.0-tests.patch
index 3a6754f40155..d676d86f2d9d 100644
--- a/media-libs/cal3d/files/cal3d-0.11.0-tests.patch
+++ b/media-libs/cal3d/files/cal3d-0.11.0-tests.patch
@@ -1,5 +1,5 @@
---- tests/Makefile.am.old	2014-10-27 12:14:44.534607920 +0100
-+++ tests/Makefile.am	2014-10-27 12:16:00.825891248 +0100
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
 @@ -14,7 +14,7 @@
  EXTRA_DIST = \
  	$(wildcard cal3d_converter/base.??f)
diff --git a/media-libs/cal3d/files/cal3d-0.11.0-verbose.patch b/media-libs/cal3d/files/cal3d-0.11.0-verbose.patch
index a6dfbd677bff..c50918cd899f 100644
--- a/media-libs/cal3d/files/cal3d-0.11.0-verbose.patch
+++ b/media-libs/cal3d/files/cal3d-0.11.0-verbose.patch
@@ -1,5 +1,5 @@
---- tests/run.in.old	2012-06-29 13:27:55.413765822 +0200
-+++ tests/run.in	2012-06-29 13:29:02.092084095 +0200
+--- a/tests/run.in
++++ b/tests/run.in
 @@ -43,7 +43,7 @@
                  exit 1
                  ;;