gentoo resync : 22.01.2021

3 files changed, 56 insertions, 9 deletions

diff --git a/dev-libs/d0_blind_id/Manifest b/dev-libs/d0_blind_id/Manifest
index f2e040e3d651..1596689d9462 100644
--- a/dev-libs/d0_blind_id/Manifest
+++ b/dev-libs/d0_blind_id/Manifest
@@ -1,5 +1,6 @@
+AUX d0_blind_id-1.0-slibtool.patch 1564 BLAKE2B 60aa46c04897ac10b57b67cdaf0efcf93468a089d0b0bf735abc0d97af734821d24139825600e20520e6a15359de236a0e010aa2a8d5dffb3c7502662dba6fa8 SHA512 b0c082358bae52efcac9774198a2c8f75d804e9cdb88922a81548c19bbc9b03f1c4cc20c70e5b75eec3ca822d297ba01092d72fc49e4d41023fc384320818a5c
 DIST d0_blind_id-0.5.tar.gz 344460 BLAKE2B 9b77061e35b37bcdc009ea82989b0fe18ca6ddaebfcf7c3a4bd35523ae683fc0f05c3886f1c7904afbb5120a013dab2bbb1031c3c5dba9c435258e0b7fe960e9 SHA512 0a7735269a41108f191c4143b52eff2179889d94239be5be0c2406c6ed789b68e2d545250f9964e97f8c86a0653296bacdbe9b8d9db89a79ca6922d7c1a90162
 DIST d0_blind_id-1.0.tar.gz 49110 BLAKE2B 1977bb9c71d6655e8a84aab9daf5aee470ac3f3e140e7beff3555a41a81baebab5e4e5019b0550594b8c6e8b936706bb9790e5e3171c1348abf3212349d07109 SHA512 dbee0bec44a008a6843ec367211e4cdfa25f6c4577b48d942d19301d5ff885d4fde8d40ea304a114d349d8e90283a50854afb2fb322bf19640842ded025849f2
 EBUILD d0_blind_id-0.5.ebuild 837 BLAKE2B 326a06fb0ae0c2d3743734c9b7c73cba54e52e6d1cdfeb7de7c81a892a9df9072a8807e862e9f1264a1f0a6348338104416c03bf2ff89b34931492926e2f160c SHA512 d3121ad66661a67e15ecbb1775c76dfd50f6ff0247b60947ff8aa767b2bcbbad5acad419192ea777393b6dce10502e0eeca8bc4225a6d918a7aa5daf5044df42
-EBUILD d0_blind_id-1.0.ebuild 990 BLAKE2B 35be5c9c8829c20c09a8ea38fd037c959eba2f20b0df090b6e354ac8c9508a7aa3e499173e1c6b10b690a314025ac2e206ac895c812f0511fe2395485621239e SHA512 5c18e7be28c6508659dcc42d879195cf61f1a9b4d72fb990daef12e50a35847a3307cf8c8ce168d4bd4234c0ae5ba59628bfd62a644ecf1d35f98347719fedad
+EBUILD d0_blind_id-1.0.ebuild 991 BLAKE2B da58c17c2bff8fec435d7050e2e1d7fda1d9db0c7e2c23a93b152073153ed26315354507f6e030a6f85c30ee402feadcc504c077a4235e870afc3a90f933ea3a SHA512 6e943cd9696e8c6a587a5f6dc2e33bf1e601f3d0a8d9b59492028affc71b7b143dafa7bf32212c24a999dc7d4de8ccfc83cbacc91223609bbd37238b9d12695b
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/dev-libs/d0_blind_id/d0_blind_id-1.0.ebuild b/dev-libs/d0_blind_id/d0_blind_id-1.0.ebuild
index e6a95402a2c0..013b70c77ca0 100644
--- a/dev-libs/d0_blind_id/d0_blind_id-1.0.ebuild
+++ b/dev-libs/d0_blind_id/d0_blind_id-1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -15,11 +15,17 @@ KEYWORDS="~amd64 ~x86"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/gmp:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 DOCS=( d0_blind_id.txt )
 
+PATCHES=(
+	"${FILESDIR}/${P}-slibtool.patch"
+)
+
 src_prepare() {
 	default
 
@@ -44,8 +50,5 @@ src_configure() {
 
 src_install() {
 	default
-
-	if ! use static-libs ; then
-		find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-	fi
+	find "${ED}" -name "*.la" -delete || die
 }
diff --git a/dev-libs/d0_blind_id/files/d0_blind_id-1.0-slibtool.patch b/dev-libs/d0_blind_id/files/d0_blind_id-1.0-slibtool.patch
new file mode 100644
index 000000000000..62ae318315fa
--- /dev/null
+++ b/dev-libs/d0_blind_id/files/d0_blind_id-1.0-slibtool.patch
@@ -0,0 +1,43 @@
+From 0d3d1f2655901776b2fc3e911eb78478412f789a Mon Sep 17 00:00:00 2001
+From: Lyberta <lyberta@lyberta.net>
+Date: Sat, 7 Oct 2017 19:26:40 +0300
+Subject: [PATCH] Fixed version-info.
+
+---
+ Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index d21887d..07338eb 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,7 +5,7 @@ blind_id_SOURCES = main.c
+ blind_id_LDADD = libd0_blind_id.la
+ 
+ lib_LTLIBRARIES = libd0_blind_id.la
+-# versioninfo:
++# version-info:
+ #   - compatible interface change: c:r:a -> c+1:0:a+1
+ #   - incompatible interface change: c:r:a -> c+1:0:0
+ #   - internal change: c:r:a -> c:r+1:a
+@@ -29,7 +29,7 @@ libd0_blind_id_la_SOURCES += d0_bignum-gmp.c
+ endif
+ endif
+ endif
+-libd0_blind_id_la_LDFLAGS = -versioninfo 7:1:7
++libd0_blind_id_la_LDFLAGS = -version-info 7:1:7
+ libd0_blind_id_la_CFLAGS = -fvisibility=hidden -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement
+ library_includedir = $(includedir)/d0_blind_id
+ library_include_HEADERS = d0_blind_id.h d0.h
+@@ -40,7 +40,7 @@ if ENABLE_RIJNDAEL
+ lib_LTLIBRARIES += libd0_rijndael.la
+ libd0_rijndael_la_SOURCES = d0_rijndael.c \
+                             d0_rijndael.h
+-libd0_rijndael_la_LDFLAGS = -versioninfo 0:0:0
++libd0_rijndael_la_LDFLAGS = -version-info 0:0:0
+ libd0_rijndael_la_CFLAGS = -fvisibility=hidden -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement
+ library_include_HEADERS += d0_rijndael.h
+ pkgconfig_HEADERS += d0_rijndael.pc
+-- 
+2.20.1
+