gentoo resync : 16.01.2021

3 files changed, 3 insertions, 82 deletions

diff --git a/dev-util/libabigail/Manifest b/dev-util/libabigail/Manifest
index d89e195c184c..cdac49b05e03 100644
--- a/dev-util/libabigail/Manifest
+++ b/dev-util/libabigail/Manifest
@@ -1,7 +1,5 @@
-DIST libabigail-1.6.tar.gz 176133766 BLAKE2B 4a8fd6861f2213f45bbc5814a8a4e0941c236660ea6f84f09eedf6c08eff963c956f27967581501cd73b51057c3d36a74d53b6bf63d0be4d2c931d465d0564eb SHA512 2ba775bd836b53265dae60e66065fc2106e7f633e890cc70b6abacb8426e04ec0b7b38593c21336f5785cf5e4eb8d110fb15ce63124cddc59f660f31c7b25b3c
 DIST libabigail-1.8.2.tar.gz 258919334 BLAKE2B 6e06c888dcc3f5e0fc5d4046e69f14ba06b3a78206f89e32e4687b07aae1e1d798582285cff5ac9f43d6ba326fe11ec11552eefb5ed05813c25785e337092ba2 SHA512 fa8edaf39632e26430481f15e962a098459eac087074e85ca055293ba324ec5944c45880fcb36f1c54a64652605a439cbf9247dfea9bfd3ec502cc7292dd1c8d
 DIST libabigail-2.0.tar.gz 286383045 BLAKE2B 2ba6f59bcd7a1484c4a60c6c9f212ad76af239a552d2cc9e47748e0db52363afadd7a99ef3e123c263de34b416f71b9d679bf2a5c542c419bb38ee75f3d5c57b SHA512 288f63f3495f0cd38258c50b78f30a573e43ab60494fefa22c8cba6d6776c5f94742ffea26297a232b78d25f6804f1b3f51febd59ec487733e6ef683cef2c180
-EBUILD libabigail-1.6.ebuild 1505 BLAKE2B eaf813c7f56b0d703e03ae350885ed6beb54fa7dd08bc62eb58c7b935d4d4a9857f7c8f0e130ee74334bb52c1f967e334d835922ea52569f435df5857276adbf SHA512 5b6db24c5a22f369675f0a1e308ad42b4e79940a8e632503c28f43c528051227a2cb808e050c2cc5918fc519002bedcabb3f8a745bc7c3a125596650a57b84d4
 EBUILD libabigail-1.8.2.ebuild 1513 BLAKE2B e54abef6af668ccc017e137c8e592f6371f9348667d06c0aa332a327ac322308c6e4b3ef02ead3c7afef2dc5b5ca1f4c422db54ce65a46d85ee26c56ccf0b706 SHA512 6efb448acfd4f8c201f0fbd3c3aa5c49d8fce8aafa1dd366e32f9205aa10cacf6ccbb316f1faabce30179cde75ac9146c067e226218f84734c3e743a79fd65c1
-EBUILD libabigail-2.0.ebuild 1530 BLAKE2B 7e51e66029da59d810fc059e03b583d0886dbeb10db26b114f893ff640e7a5917e34e8b2af43edd08b8e320c084f3cf2445d20e5122a0889b362efe959df4162 SHA512 5b5743b028ba720afb32935ae3540352efa755c208cc1cb3a8b4496b749fd1e0a52b61c4cff81148cf19d1011b8ca8a685bddece3db5524b9b3ddb4f0d47f419
+EBUILD libabigail-2.0.ebuild 1529 BLAKE2B fddae7227ddbb54970363206f2728a346d537e1eabeadafc481d57636567e825a9e93c4820fb91e55e04d8a527a0b4cb0f18b42708dbd34c0adfd79104e56c73 SHA512 2e5f556c1eb020358dda35a5a4e5efe238f0b09e36105115ec6208050ad945230e9ea02c69476f9012d18c169fd1575bc324b3397f89bed36631117bf7f996d1
 MISC metadata.xml 245 BLAKE2B 4ac08132cfdd18d0ef2c38470da5045bca296f4975a8fa1e7094c1f6f524ebf02103d487ae7d6d0bb1c912d46eb207a74a417bbdc10bc92499331112f15392e6 SHA512 fa5b2d519f191de35a1f8719e8ba7ea346c54173c797e152df2aeefda32dfb0e0741ff171b87e1ee835c1d5383f424b8bb276d597bdf2fe911525bd5719cab9d
diff --git a/dev-util/libabigail/libabigail-1.6.ebuild b/dev-util/libabigail/libabigail-1.6.ebuild
deleted file mode 100644
index 639ff46eaed0..000000000000
--- a/dev-util/libabigail/libabigail-1.6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit autotools python-any-r1 out-of-source
-
-DESCRIPTION="Suite of tools for checking ABI differences between ELF objects"
-HOMEPAGE="https://sourceware.org/libabigail/"
-SRC_URI="https://mirrors.kernel.org/sourceware/libabigail/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/elfutils:=
-	dev-libs/libxml2:2="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-python/sphinx
-		sys-apps/texinfo
-	)
-	test? ( ${PYTHON_DEPS} )"
-
-src_prepare() {
-	default
-	# need to run our autotools, due to ltmain.sh including Redhat calls:
-	# cannot read spec file '/usr/lib/rpm/redhat/redhat-hardened-ld': No such file or directory
-	eautoreconf
-}
-
-my_src_configure() {
-	econf \
-		--disable-deb \
-		--disable-fedabipkgdiff \
-		--disable-rpm \
-		--disable-static \
-		--disable-zip-archive \
-		--enable-bash-completion \
-		--enable-cxx11 \
-		--enable-python3 \
-		$(use_enable doc apidoc) \
-		$(use_enable doc manual)
-}
-
-my_src_compile() {
-	default
-	use doc && emake doc
-}
-
-my_src_install() {
-	emake DESTDIR="${D}" install
-
-	if use doc; then
-		doman doc/manuals/man/*
-		doinfo doc/manuals/texinfo/abigail.info
-
-		dodoc -r doc/manuals/html
-
-		docinto html/api
-		dodoc -r doc/api/html/.
-	fi
-}
-
-my_src_install_all() {
-	einstalldocs
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-util/libabigail/libabigail-2.0.ebuild b/dev-util/libabigail/libabigail-2.0.ebuild
index d86f54a804e7..61ac2094d397 100644
--- a/dev-util/libabigail/libabigail-2.0.ebuild
+++ b/dev-util/libabigail/libabigail-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://mirrors.kernel.org/sourceware/libabigail/${P}.tar.gz"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv"
 IUSE="doc test"
 RESTRICT="!test? ( test )"