gentoo resync : 22.05.2021

3 files changed, 34 insertions, 11 deletions

diff --git a/sys-apps/dmapi/Manifest b/sys-apps/dmapi/Manifest
index 12f7c17d8a3b..d01e474379c6 100644
--- a/sys-apps/dmapi/Manifest
+++ b/sys-apps/dmapi/Manifest
@@ -1,4 +1,5 @@
 AUX dmapi-2.2.12-headers.patch 354 BLAKE2B 83a2e4de5882c30a1ead955768c8033099c461ee955fba2021808a288e552ab0c97f3b13198270e367cc7c2e035094a631c7bd1b1454b13c82b9d0b1737c15cd SHA512 b087227085d3e068323f2a01c1c7044e1885e47b04caa1050e8552ced50dddfab871608bdf67a027989c359f2852cbcedcffeb6708e182d6d5dc3bfc9609489e
+AUX dmapi-2.2.12-no-doc.patch 453 BLAKE2B 57e6a2b0bf043228564a515ac35aab09f3ebe85477f55c014292ab04bda8df4c61041f17a4d6c34e20f3dbe5e38f3c7abed49040426d0f812e23d3621bfdf393 SHA512 87dcac6577b992c22527a6c4a8c36a25c88af589f00d071815dc3c97f991512646a5be6ca898e1cecd258586f23ff175d768cf9a47db6c05b3e605d5bba4a247
 DIST dmapi-2.2.12.tar.gz 367318 BLAKE2B 7d74f3081f8430c43d3ea961bd4ad2743a3ab65a016b0653a68074353ed60fa0c1a01a77aa470326aa1b10e731a5058355ab887cae00d21196958563ae6c4ee8 SHA512 aa44c0c7857158fed198deb9d1e00abaab549e3c22a7ce0e24e6088146bde56ecf967405b1b61a589460981ddcfaffbb1e9a2e677088efec317e3a7cb44abe4f
-EBUILD dmapi-2.2.12-r1.ebuild 1097 BLAKE2B 635c50d44545b68a5534ee40cb544802083d1012e9f8b7341069ce77a60932dfc587fd59d4105052365d6aa948b52df3b2de29cb27ffe65aedbf43b8d655728e SHA512 6db14746dcca212eadef5bd89927628153b8ccc542aaf03af20d2faf915ca3d5272750b09a240036f3de25b777c2b063d2e372eb9e99d2ee5ff1e3080025e4db
+EBUILD dmapi-2.2.12-r2.ebuild 1056 BLAKE2B 4ad250ed4f1326641c42bfd505fd38641231c6aa85ccbd24d6b5f292d9ba2357400273fa9cd9751849282f56586b13e1a83f6ad1cbc23703836b4b0dc53428c1 SHA512 586d04a6e7183def00f7e334f9dc81b3c7231c46d85b41f038f31a489e9a5ea9d0f544f5affbd784ef586c9168cf703e8f9f2760d16ee757f2bd8ca5a7a75395
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild b/sys-apps/dmapi/dmapi-2.2.12-r2.ebuild
index 21619fe1a122..09a877413747 100644
--- a/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild
+++ b/sys-apps/dmapi/dmapi-2.2.12-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit epatch toolchain-funcs ltprune multilib multilib-minimal usr-ldscript
+inherit multilib-minimal usr-ldscript
 
 DESCRIPTION="XFS data management API library"
 HOMEPAGE="https://xfs.wiki.kernel.org/"
@@ -18,13 +18,15 @@ IUSE="static-libs"
 RDEPEND="sys-fs/xfsprogs"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		include/builddefs.in \
-		|| die
-	epatch "${FILESDIR}"/${P}-headers.patch
+DOCS=( doc/{CHANGES,PORTING} README )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-headers.patch
+	"${FILESDIR}"/${P}-no-doc.patch # bug 732042
+)
 
+src_prepare() {
+	default
 	multilib_copy_sources
 }
 
@@ -43,6 +45,6 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files --all
-	rm "${ED}"/usr/share/doc/${PF}/COPYING
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sys-apps/dmapi/files/dmapi-2.2.12-no-doc.patch b/sys-apps/dmapi/files/dmapi-2.2.12-no-doc.patch
new file mode 100644
index 000000000000..295bdb7c6572
--- /dev/null
+++ b/sys-apps/dmapi/files/dmapi-2.2.12-no-doc.patch
@@ -0,0 +1,20 @@
+--- a/Makefile
++++ b/Makefile
+@@ -19,7 +19,7 @@
+ 	libtool include/builddefs
+ 
+ LIB_SUBDIRS = include libdm
+-TOOL_SUBDIRS = m4 man doc debian build
++TOOL_SUBDIRS = m4 man debian build
+ 
+ SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS)
+ 
+@@ -66,7 +66,7 @@
+ 	touch .census
+ 
+ install: default $(addsuffix -install,$(SUBDIRS))
+-ifneq ($(PKG_DISTRIBUTION), debian)
++ifdef false
+ 	$(INSTALL) -m 755 -d $(PKG_DOC_DIR)
+ 	$(INSTALL) -m 644 README $(PKG_DOC_DIR)
+ endif