gentoo resync : 28.04.2021

4 files changed, 99 insertions, 55 deletions

diff --git a/dev-games/ode/Manifest b/dev-games/ode/Manifest
index 046775074de5..6eeb4101ed6c 100644
--- a/dev-games/ode/Manifest
+++ b/dev-games/ode/Manifest
@@ -2,7 +2,7 @@ AUX ode-0.14-gcc7.patch 2580 BLAKE2B 2f39faf4ad093cb8ec4ad17dc3a72212081f4838656
 DIST ode-0.11.1.tar.bz2 1720088 BLAKE2B 0908356d45e9b17af80cc2afefd3a09735c4955d0a03b502a60f0bd01023796c3b00b1caf379eac354d7754035db11bcdf802c1ecc72abd28a9fce7e1dd7eef1 SHA512 1e015231f4d01c68e7539144d197031cca23d4b58ea53733184a826ce23388956c428a53385254e7eed2c5d3fc28224a688eb13be7ea648bd78e186c8f203d37
 DIST ode-0.12.tar.bz2 1816246 BLAKE2B 7ac4b9158f6672775e0374a619f71a178cb8a3a1cf8c957d67c2547081a9dd660a091923fec364133dfbe4cd6b82cfe14961bda8994bb6241aa9e1af61ef22ef SHA512 303ffda8afcb89a87d09c44393f590f5646f10e8959ca06746121859ad2407709cd711ab185fed4817a9f74c9ca4ee13d1698a28577211bf65dbaad1141f6fc0
 DIST ode-0.14.tar.gz 4018146 BLAKE2B 7dbb3d4cd673dabce176cf92d9d0b5fdd21dea25b751b8b43fd99a71e7806170fb97459dc2ecc7a9cbd14bf54bd32b4a3e631b78a1c3420ebc11c2d518f0eb45 SHA512 1f74c3c4687ee9665fa70e65a79100747fba577729830a90806e374115f1c161a2f4545cf591b0979054aa3e2f9a3673635668cb7362ab5c213ada0d39b1a03d
-EBUILD ode-0.11.1.ebuild 1512 BLAKE2B 4ab54d811f2aa0d4a162d1cff1284b1872cadca5ff9c325192113fecfe1dcf80c7196f64210a98dcad060c2169958feba83bdfe671d05ab2a89b460ed1a7b7d4 SHA512 ddc0984245aecf46358d2a23950861e172ce44a4ba27df46a05232c2ab14515d5495c70fd49ef549105c7a4f40db0fb31c35e4b110b00df45e62c07944028441
-EBUILD ode-0.12.ebuild 1536 BLAKE2B d860e8afa033a84e6fc317865009f9b7f6f081d00996c31baced0e8893e46167c5e579e4086b3d48492c5ba9487471c457044d3a67f04d07e682abf6a7e859ec SHA512 edd2b2f225afcc432fabeefc44ae8ae678040bfaf22b4d822870039e4da796d943b832150fe8d7ca77902412f054da966fc5c8b77f104ee7fc8ea5dd3bf3d58b
-EBUILD ode-0.14-r1.ebuild 1676 BLAKE2B a0ef16fbc8bfab3ca7d3edf814096bd96d7e64b04745d915379aa870c4e38b5d73226fba1507625f2cd336d06a1f0bd80ec3677f5249c3e69b64e1b402658167 SHA512 fe9325e95aa8efd81e7af01bb5b7733ab1957efcaa8853813e49ba15d3ae21ef7df3b3ca1606fb9300c5d39fb40322a33ce55242c728dce5bf33d36a0ade34d0
+EBUILD ode-0.11.1.ebuild 1548 BLAKE2B e67e4e91af66fc532e7619667bf3941405ab47b5587fb243d2f51118fe67d6d9149961d2028be251cdef5a391f47fc1c358e2de54f4f8a0d807f45756165255e SHA512 036b48d645a5159d4edae4d780553b09d9fbc76f796dd649abcfd61f7a9bcd2f538eb3044ae74b127c240666d46b3a4d6c0d77d64d4aaca867c6ee08732e6032
+EBUILD ode-0.12.ebuild 1578 BLAKE2B 65c40b29fd35f5454c8bc96d77cea929af4bf67a01b669550223ac0343914ac6331a61684e504671fe336b5a8365227523736d2b66ae5d9520506506a53c15ae SHA512 6939b75cbcb0f753bb37e361fb818cf1599dff861f3bff9b710ccc1b3925e6da6b3d1080d1dc10dc35ffc6fe46051125b7ab2f3a301febe76fbc9a4a93560a80
+EBUILD ode-0.14-r1.ebuild 1742 BLAKE2B 28787b881001b4d12c44d389864d3e467c7db39b54797d1330a668da3d3add03b2ff6a66908663f386550a7ce30c37796c53a0dca4613b48146eddc04848e41c SHA512 95f895f2a06479ceba278fa0f976853d989893d1986c4791e26f17f17d1bbab9496758cd57bb62d30d4e5eeca5f38b6da9130290d71e97f6427237d2b6b12bd6
 MISC metadata.xml 917 BLAKE2B 27118db0a3337cadc8a130bbc4c8fdbc6fa3b26b52ad357b94e0c17740cd4e886eb98652a7f4a17301868172d1306ed5b69fa239b7cfd8f7dc9be7a642aa2c10 SHA512 d9bc708ab08c0bb64565945f372ccfd7334447265e5115426200eb60a99bcbc6aa00c652f4a61d6401c24fe64cbc8a5819075cae3552de0c15f57ba2dd96c28d
diff --git a/dev-games/ode/ode-0.11.1.ebuild b/dev-games/ode/ode-0.11.1.ebuild
index b20a61d98648..03338b82af9b 100644
--- a/dev-games/ode/ode-0.11.1.ebuild
+++ b/dev-games/ode/ode-0.11.1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils ltprune
+EAPI=7
 
 DESCRIPTION="Open Dynamics Engine SDK"
 HOMEPAGE="http://ode.org/"
@@ -13,13 +12,19 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="debug doc double-precision examples gyroscopic static-libs"
 
-RDEPEND="examples? (
+RDEPEND="
+	examples? (
 		virtual/opengl
-	)"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( CHANGELOG.txt README.txt )
 
 src_prepare() {
+	default
+
 	sed -i \
 		-e "s:\$.*/drawstuff/textures:/usr/share/doc/${PF}/examples:" \
 		drawstuff/src/Makefile.in \
@@ -41,6 +46,7 @@ src_configure() {
 
 src_compile() {
 	emake
+
 	if use doc ; then
 		cd ode/doc
 		doxygen Doxyfile || die
@@ -48,23 +54,31 @@ src_compile() {
 }
 
 src_install() {
-	DOCS="CHANGELOG.txt README.txt" \
-		default
-	prune_libtool_files
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
 	if use doc ; then
-		dohtml docs/*
+		docinto html
+		dodoc docs/*
 	fi
-	if use examples; then
-		cd ode/demo
+
+	if use examples ; then
+		cd ode/demo || die
+
 		exeinto /usr/share/doc/${PF}/examples
+
 		local f
 		for f in *.c* ; do
 			doexe .libs/${f%.*}
 		done
-		cd ../..
+
+		cd ../.. || die
+
 		doexe drawstuff/dstest/dstest
-		insinto /usr/share/doc/${PF}/examples
-		doins ode/demo/*.{c,cpp,h} \
+
+		docinto examples
+		dodoc ode/demo/*.{c,cpp,h} \
 			drawstuff/textures/*.ppm \
 			drawstuff/dstest/dstest.cpp \
 			drawstuff/src/{drawstuff.cpp,internal.h,x11.cpp}
diff --git a/dev-games/ode/ode-0.12.ebuild b/dev-games/ode/ode-0.12.ebuild
index f9239dc91a8a..c5e93ccbf22c 100644
--- a/dev-games/ode/ode-0.12.ebuild
+++ b/dev-games/ode/ode-0.12.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils ltprune
+EAPI=7
 
 DESCRIPTION="Open Dynamics Engine SDK"
 HOMEPAGE="http://ode.org/"
@@ -13,13 +12,19 @@ SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc double-precision examples gyroscopic static-libs"
 
-RDEPEND="examples? (
+RDEPEND="
+	examples? (
 		virtual/opengl
-	)"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( CHANGELOG.txt README.txt )
 
 src_prepare() {
+	default
+
 	sed -i \
 		-e "s:\$.*/drawstuff/textures:/usr/share/doc/${PF}/examples:" \
 		drawstuff/src/Makefile.in \
@@ -41,30 +46,38 @@ src_configure() {
 
 src_compile() {
 	emake
+
 	if use doc ; then
-		cd ode/doc
+		cd ode/doc || die
 		doxygen Doxyfile || die
 	fi
 }
 
 src_install() {
-	DOCS="CHANGELOG.txt README.txt" \
-		default
-	prune_libtool_files
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
 	if use doc ; then
-		dohtml docs/*
+		docinto html
+		dodoc docs/*
 	fi
-	if use examples; then
-		cd ode/demo
+
+	if use examples ; then
+		cd ode/demo || die
+
 		exeinto /usr/share/doc/${PF}/examples
+
 		local f
 		for f in *.c* ; do
 			doexe .libs/${f%.*}
 		done
-		cd ../..
+
+		cd ../.. || die
+
 		doexe drawstuff/dstest/dstest
-		insinto /usr/share/doc/${PF}/examples
-		doins ode/demo/*.{c,cpp,h} \
+		docinto examples
+		dodoc ode/demo/*.{c,cpp,h} \
 			drawstuff/textures/*.ppm \
 			drawstuff/dstest/dstest.cpp \
 			drawstuff/src/{drawstuff.cpp,internal.h,x11.cpp}
diff --git a/dev-games/ode/ode-0.14-r1.ebuild b/dev-games/ode/ode-0.14-r1.ebuild
index 11a993ae006d..98865c663c91 100644
--- a/dev-games/ode/ode-0.14-r1.ebuild
+++ b/dev-games/ode/ode-0.14-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils ltprune
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Open Dynamics Engine SDK"
 HOMEPAGE="http://ode.org/"
@@ -13,16 +14,25 @@ SLOT="0/6"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc double-precision examples gyroscopic static-libs"
 
-RDEPEND="examples? (
-	virtual/glu
-	virtual/opengl )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+RDEPEND="
+	examples? (
+		virtual/glu
+		virtual/opengl
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 MY_EXAMPLES_DIR=/usr/share/doc/${PF}/examples
 
+DOCS=( CHANGELOG.txt README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.14-gcc7.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.14-gcc7.patch
+	default
 
 	sed -i \
 		-e "s:\$.*/drawstuff/textures:${MY_EXAMPLES_DIR}:" \
@@ -47,28 +57,35 @@ src_configure() {
 src_compile() {
 	emake
 	if use doc ; then
-		cd ode/doc
+		cd ode/doc || die
 		doxygen Doxyfile || die
 	fi
 }
 
 src_install() {
-	DOCS="CHANGELOG.txt README.md" \
-		default
-	prune_libtool_files
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
 	if use doc ; then
-		dohtml docs/*
+		docinto html
+		dodoc docs/*
 	fi
-	if use examples; then
-		docompress -x "${MY_EXAMPLES_DIR}"
-		insinto "${MY_EXAMPLES_DIR}"
-		exeinto "${MY_EXAMPLES_DIR}"
+
+	if use examples ; then
+		docompress -x ${MY_EXAMPLES_DIR}
+
+		insinto ${MY_EXAMPLES_DIR}
+		exeinto ${MY_EXAMPLES_DIR}
+
 		doexe drawstuff/dstest/dstest
 		doins ode/demo/*.{c,cpp,h} \
 			drawstuff/textures/*.ppm \
 			drawstuff/dstest/dstest.cpp \
 			drawstuff/src/{drawstuff.cpp,internal.h,x11.cpp}
-		cd ode/demo
+
+		cd ode/demo || die
+
 		local f
 		for f in *.c* ; do
 			doexe .libs/${f%.*}