gentoo resync : 25.11.2020

3 files changed, 18 insertions, 10 deletions

diff --git a/dev-libs/libdbh/Manifest b/dev-libs/libdbh/Manifest
index 097ecededad2..2b9380d40513 100644
--- a/dev-libs/libdbh/Manifest
+++ b/dev-libs/libdbh/Manifest
@@ -1,5 +1,5 @@
 DIST libdbh2-5.0.19.tar.gz 1608949 BLAKE2B 405a2903c8f4dddcd66153304bfff5084e549f650846cc2e8afecb6783cbb5fcf391cc251e4805486f9ad62cac4c59a3112fc7a6d0ced6e93e0e88be707e9a83 SHA512 35c368e82f8f7c4c7d4960731214ff3863530795b16716c0be7351e0ca10740ac26a99930369f4df78c8e108d929124c222b5942ce5f521ecb58afd38d55bbe9
 DIST libdbh2-5.0.22.tar.gz 1641669 BLAKE2B 835a1d112ac34ff025002c826fa6f1291a8da2442901396e79abbf5e3c315654cef2a9d45c852821fa373b132e0e8a04695c4cf5c830bac9a3b40dd32ce5b543 SHA512 d0cb69bbd3d54600cd14f4d1d7ee7f87c52c9bea9f475763b1d43c053a7571063f42b59cef8d08632b065f44cd85b5ccb0fcd31052202aa8f8a49f34669c7930
-EBUILD libdbh-5.0.19.ebuild 708 BLAKE2B 82ace046432d7666c421aaf9505369b3f1592837d9923de5e2b50d09df0cbcf29fe1a5896fa5dae05d01d07bfd755df8fde2a3e83ef80148534679231d8b0888 SHA512 31d810325ff995f78de3b75b8b7344fccd718a311127fe16fa2a49b103b09104a8e9136ad7ab5822442c2e2b48e93500a91e79d75ed759de666c49516b4a0fbf
-EBUILD libdbh-5.0.22.ebuild 705 BLAKE2B 8f346677cb5e394eec35d1aa223e57ba671b04bf16dc9d231eb11c3a6ffed1d241594af7ab5654dadb24590f97979197611e6ca69f6bb75a5464a64d74c84815 SHA512 2da38bb65e367e80e7ea78a5ecc89f4da8bff8d9120fed18f6329ab11a3aa017a6fed290fecadcdba19f0ab669285a0ca4456cc0849a6d321c5441a68b50ea5b
+EBUILD libdbh-5.0.19.ebuild 766 BLAKE2B 776458c68471e42a401937f8d6c8eeb05d7e1365412c00212ef9e32ceb0f06c8afac848b584066aea5a2d723557527cb9e805b5218ebc90e882544271509b859 SHA512 5f2a90307c5c7009efa691d2f0a5608f6f67df1ae95d8a95fd0e5758f21f4bbc2ef42b3bcb3ef19b46d2259a09090a0e33d742a377fae1d3af943de6e2aa6c28
+EBUILD libdbh-5.0.22.ebuild 743 BLAKE2B b6b0c9b0fd998adfc02e34b47edcf15b85562faaab3b0a8920d62b979c4a0367b620c95dd19737e3242f10a165addfc21d7879e0c0853e2e27858564de30c495 SHA512 a30978a83bf0a27ca44b6f50e8b24f271e199892acfba9000fbebb4a263cce680d23ff7f889c98bbb20ae8bab5750b7ea34aae1c3287ce188f85b258cd911133
 MISC metadata.xml 436 BLAKE2B 8817621c260b3c6153ddebeb5b7d3b0877340f4b2eafb10318713ed7b8ac07a7a76c09480d25fc33ecc900b27e7750c1ee3b538d2280241bea4f7bab3cd91c20 SHA512 a43a689f3355779e44fcbe6aefbebd84f1e339736a58b6783c9b62a35b00139250899adc62e633d8ba209d68245df46f4041aa68e8d13184a934f5ba4d834e79
diff --git a/dev-libs/libdbh/libdbh-5.0.19.ebuild b/dev-libs/libdbh/libdbh-5.0.19.ebuild
index d545dd68e5e6..81bdaa952a54 100644
--- a/dev-libs/libdbh/libdbh-5.0.19.ebuild
+++ b/dev-libs/libdbh/libdbh-5.0.19.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools eutils ltprune
+inherit autotools eutils
 
 MY_P=${PN}2-${PV}
 
@@ -31,7 +31,11 @@ src_prepare() {
 	eautoreconf
 }
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libdbh/libdbh-5.0.22.ebuild b/dev-libs/libdbh/libdbh-5.0.22.ebuild
index a32cdfb61dfe..e15065a43d35 100644
--- a/dev-libs/libdbh/libdbh-5.0.22.ebuild
+++ b/dev-libs/libdbh/libdbh-5.0.22.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools
 
 MY_P=${PN}2-${PV}
@@ -13,9 +14,9 @@ SRC_URI="mirror://sourceforge/dbh/dbh/${PV}/${MY_P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="dev-util/gtk-doc-am
+BDEPEND="
+	dev-util/gtk-doc-am
 	virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
@@ -28,8 +29,11 @@ src_prepare() {
 	eautoreconf
 }
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
 	default
-
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }