gentoo resync : 25.08.2020

3 files changed, 11 insertions, 25 deletions

diff --git a/media-libs/libdiscid/Manifest b/media-libs/libdiscid/Manifest
index ad6430930ebe..5968e60a54ae 100644
--- a/media-libs/libdiscid/Manifest
+++ b/media-libs/libdiscid/Manifest
@@ -1,5 +1,3 @@
-DIST libdiscid-0.6.1.tar.gz 366393 BLAKE2B 551616a817922af5f90991690ea6d35523b3fb6606ab26ae7e0e4c51258fab5b653dbac96842526d9a4a51c81b5dfb63c9ec9b4fe723e88e758855cea381d46e SHA512 12808040b6bac7dd513d32b2f7a8424f0d9753a89c5703ede0454d0d8dea508a446adba20d899c3499e8621d2a752b3e8ca787b92e3ae92402c6df7bc2a3819d
 DIST libdiscid-0.6.2.tar.gz 401455 BLAKE2B 0b122f08de89af7863ed21158637e961d8cdbf4dc926e5ff641aad4f23e8b02d8e970221f51caae44d2943b894922134baeb9e99595dee74c085e31b0daefc99 SHA512 7ce9bb589f64644ef44400620bd3e65a329e52c5698b44c3dc1569fb143d9af15d540b95fbdce1b87db0263e2ff55c81133213ed1708cdb25af1b38a46c4e1ac
-EBUILD libdiscid-0.6.1.ebuild 521 BLAKE2B c2c1e8875bc4fa2a024e319bb4c7a8d21d942e25938a90b136ecf9555503e36462a55cdb70ba9854bf1b246ef9fb151136340a7e8aee8321a83e038ade56e115 SHA512 e24eda57c7f6671455aa58ea37006106636850c8c77389bc929d5d5879ca03229bc2f69e9981626235b712ab983e834019523e98b86209fa431c0590594d728b
-EBUILD libdiscid-0.6.2.ebuild 564 BLAKE2B 2c6a20879765b169b25103e1432d683b6c99f5744dc1cff4fb2492fe98829ecaf5e53a41624d873471bec75d009a868904fe9a74bb1e438ec4e7433099eb3917 SHA512 e26a8c930b9191e1c69b5d544ec157f8d8021516f151eb39410e59a561aa2bae5c27d79f97d804e80ec44c442dd73cad0f20d17703d248917c9858568d54bfc3
+EBUILD libdiscid-0.6.2.ebuild 593 BLAKE2B 706018f8cd63740355b396e39f4ce0ac9cfc5d2375938a0748bfa6c616204c650a40f29e17a9acc2701240a96e2dc405b72a822087c90ff29cf0dce93d4698a8 SHA512 9aafc27faf46c79015ded55d289122ce27547757eb666fa665a8d66eb1750ba51d038e1fda799a0aa41f1bca3cb5e6a79da4135f8e91ab8944b0017e9720411c
 MISC metadata.xml 587 BLAKE2B e5d8e996c7015f2796f2ec687989c777e85dff7c64e14cedeb8067604841d13256d73ce81ba4601ecea644e1fa5a7ba05b18749b1233498ca193932952510c3c SHA512 02616572b6782adc2285210f4d3fcfcb1e188012eb97a322468e93755a0ccd0a6760885b345bb7845ef6aaaba114b22afcfd02ae5572fb2e4140209adc6db570
diff --git a/media-libs/libdiscid/libdiscid-0.6.1.ebuild b/media-libs/libdiscid/libdiscid-0.6.1.ebuild
deleted file mode 100644
index 2666155696fa..000000000000
--- a/media-libs/libdiscid/libdiscid-0.6.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Client library to create MusicBrainz enabled tagging applications"
-HOMEPAGE="http://musicbrainz.org/doc/libdiscid"
-SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DOCS=( AUTHORS ChangeLog examples/discid.c README )
diff --git a/media-libs/libdiscid/libdiscid-0.6.2.ebuild b/media-libs/libdiscid/libdiscid-0.6.2.ebuild
index f00d72a58c00..1c9e122c303b 100644
--- a/media-libs/libdiscid/libdiscid-0.6.2.ebuild
+++ b/media-libs/libdiscid/libdiscid-0.6.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Client library to create MusicBrainz enabled tagging applications"
 HOMEPAGE="http://musicbrainz.org/doc/libdiscid"
@@ -10,10 +10,15 @@ SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DOCS=( AUTHORS ChangeLog examples/discid.c README )
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
+}
+
+src_install() {
+	default
+	dodoc examples/discid.c
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }