gentoo resync : 28.04.2021

4 files changed, 29 insertions, 25 deletions

diff --git a/dev-libs/libcoyotl/Manifest b/dev-libs/libcoyotl/Manifest
index 1ce11b5811b2..33d07565fdc7 100644
--- a/dev-libs/libcoyotl/Manifest
+++ b/dev-libs/libcoyotl/Manifest
@@ -1,5 +1,5 @@
-AUX 3.1.0-gcc-4.3.patch 1106 BLAKE2B 1fbd61c40ccff44e3122ec297a645651f4288b13f6c5ae44e8c407a79db29197077bea0cbf0f2fef722c476b3c2dc446a6c6522037e3ee2ced5d9b37fcbc20ef SHA512 4db742551b39ce51b804588e22ef7c3691f3cece1414c6fc361c69f79682c91c06a9d58dfaa2d75c0654fbf75a80dd30c8f9b86de7192399f3601d145e84d1a8
-AUX 3.1.0-gcc-4.7.patch 286 BLAKE2B 760411a919d57e0209d520225c7b73524a4fa7a9d96c1d07b57ac8aa7dec8de56aa243b69f0bcf9ef361e1b7e555b5778c3241e2154880ac2f7eed3f95bc5d2e SHA512 616ddbebe40254ac0d4b04f7f7633c3ae77a88d261ea8c74f4105f803c2bfffcf5eeb50822d65a9a3aab58cde020464b8ce7ff56a3e8551b9a04f33ecf35398f
+AUX 3.1.0-gcc-4.3.patch 704 BLAKE2B ca080c51b1892e264fc7221255e5583b94e3a5dcb0ae978d34480991e6bcca71250759078381aef46a450f527ac46f7bea5484a6cb553568876ff35d361645e3 SHA512 f7b971314024466f699572385803bcc6845d538d2a20286fdebac96019491b7e6d17c05e49af45f5e55de9ce92abf967e83bb5c2af0b4369ebe4e3d11d396d60
+AUX 3.1.0-gcc-4.7.patch 213 BLAKE2B f2b8d6138693e80632cc96ad1f832cec646d39489b30a3217ce2d00e406b3f5317a39b1289c15510dc09b04dfb595a494dbac74a972fd1410263a15a1246e6c9 SHA512 13f9b79181ddc795ba0b392e7d1aceb6b0d804cc2dd01d28fdb240dbbbb6cde08a88e641c13b8c033fd6d3a13a3fb2c602ff99e12d57613721b3d22217a4ef76
 DIST libcoyotl-3.1.0.tar.gz 346384 BLAKE2B 7b3b63e5cd629bc5a53e95d6fb35f9f8d64df593eca95bafce71934560e38d37b89efa3fa8a0b12a50e570d761609cda4bbdfbd0a1577d062a8c4fa5e12a07a1 SHA512 18d0a71204dc57d44f73fe03fd88c2a040e83615557cf1f018c22ad7c9a11d793c7f71df8e10a156b9fd4fae910882ed6cec37f9e57efd3546ffc15fa82a51b5
-EBUILD libcoyotl-3.1.0-r2.ebuild 969 BLAKE2B 7b44c40141b3ed82086d07bca82a90d81a3ae0ea82fd49784601b3aafd4580da333945b73e7208a4b67c4ff879dc5f506c2c2a8cf7dc96a73056b0da77ea05b7 SHA512 689d02caa09e7f60f28f6a08ee8144d5198118035a2d3e799cfb83cbd8abdb34360cbb5442b831cd4afd870a49ba6f888c881ba54c4cab123e9d0514a5ff934e
+EBUILD libcoyotl-3.1.0-r2.ebuild 972 BLAKE2B 91e15bcb3aff35df8b79223d939783b3360d2640972cc4abcf780176bfb1a9ac260e06ddef60eca098744f8c008cd6d2415ceac1beb1638096d787f8786427b6 SHA512 c735f97e2ac385eb503e1d69d5cbb1b33df8e41a482298e6335cee8ab3cf99a366a312c0eefc1251624f87f6859de3725c27e4703dcf3db71978eb809d4d41d0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libcoyotl/files/3.1.0-gcc-4.3.patch b/dev-libs/libcoyotl/files/3.1.0-gcc-4.3.patch
index 4d3391e21161..e81476565e3a 100644
--- a/dev-libs/libcoyotl/files/3.1.0-gcc-4.3.patch
+++ b/dev-libs/libcoyotl/files/3.1.0-gcc-4.3.patch
@@ -1,6 +1,5 @@
-diff -NrU5 libcoyotl-3.1.0.orig/libcoyotl/command_line.cpp libcoyotl-3.1.0/libcoyotl/command_line.cpp
---- libcoyotl-3.1.0.orig/libcoyotl/command_line.cpp	2008-03-21 22:41:41.000000000 +0100
-+++ libcoyotl-3.1.0/libcoyotl/command_line.cpp	2008-03-21 22:41:59.000000000 +0100
+--- a/libcoyotl/command_line.cpp
++++ b/libcoyotl/command_line.cpp
 @@ -30,10 +30,13 @@
  //      http://www.coyotegulch.com
  //  
@@ -15,9 +14,8 @@ diff -NrU5 libcoyotl-3.1.0.orig/libcoyotl/command_line.cpp libcoyotl-3.1.0/libco
  command_line::command_line(int argc, char * argv[], const set<string> & bool_opts)
    : m_options(),
      m_inputs(),
-diff -NrU5 libcoyotl-3.1.0.orig/libcoyotl/sortutil.h libcoyotl-3.1.0/libcoyotl/sortutil.h
---- libcoyotl-3.1.0.orig/libcoyotl/sortutil.h	2008-03-21 22:41:41.000000000 +0100
-+++ libcoyotl-3.1.0/libcoyotl/sortutil.h	2008-03-21 22:41:59.000000000 +0100
+--- a/libcoyotl/sortutil.h
++++ b/libcoyotl/sortutil.h
 @@ -34,10 +34,11 @@
  //-----------------------------------------------------------------------

  

diff --git a/dev-libs/libcoyotl/files/3.1.0-gcc-4.7.patch b/dev-libs/libcoyotl/files/3.1.0-gcc-4.7.patch
index 443cbe2a8657..266a5631fec9 100644
--- a/dev-libs/libcoyotl/files/3.1.0-gcc-4.7.patch
+++ b/dev-libs/libcoyotl/files/3.1.0-gcc-4.7.patch
@@ -1,5 +1,5 @@
---- libcoyotl/maze_renderer.cpp.ORIG	2005-10-10 06:48:30.000000000 +0200
-+++ libcoyotl/maze_renderer.cpp	2013-04-12 10:29:31.127689828 +0200
+--- a/libcoyotl/maze_renderer.cpp
++++ b/libcoyotl/maze_renderer.cpp
 @@ -36,6 +36,8 @@
  #include "maze_renderer.h"
  using namespace libcoyotl;
diff --git a/dev-libs/libcoyotl/libcoyotl-3.1.0-r2.ebuild b/dev-libs/libcoyotl/libcoyotl-3.1.0-r2.ebuild
index 2f05d1305b60..0e59b18b7752 100644
--- a/dev-libs/libcoyotl/libcoyotl-3.1.0-r2.ebuild
+++ b/dev-libs/libcoyotl/libcoyotl-3.1.0-r2.ebuild
@@ -1,9 +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"
+EAPI=7
 
-inherit eutils autotools ltprune
+inherit autotools
 
 DESCRIPTION="A collection of portable C++ classes"
 HOMEPAGE="http://www.coyotegulch.com/products/libcoyotl/"
@@ -12,39 +12,45 @@ SRC_URI="http://www.coyotegulch.com/distfiles/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-
-IUSE="doc static-libs"
+IUSE="doc"
 
 RDEPEND="media-libs/libpng:0="
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-gcc-4.3.patch
+	"${FILESDIR}"/${PV}-gcc-4.7.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${PV}-gcc-4.3.patch"
-	epatch "${FILESDIR}/${PV}-gcc-4.7.patch"
-	epatch_user
+	default
+
 	eautoreconf
 }
 
 src_configure() {
-	ac_cv_prog_HAVE_DOXYGEN="false" econf $(use_enable static-libs static)
+	ac_cv_prog_HAVE_DOXYGEN="false" econf --disable-static
 }
 
 src_compile() {
 	emake
 
 	if use doc ; then
-		cd docs
+		cd docs || die
 		doxygen libcoyotl.doxygen || die "generating docs failed"
 	fi
 }
 
 src_install() {
 	default
-	prune_libtool_files
+
+	find "${ED}" -name '*.la' -delete || die
+
 	if use doc ; then
-		dohtml docs/html/*
+		docinto html
+		dodoc docs/html/*
 	fi
 }