gentoo resync : 03.03.2021

3 files changed, 2 insertions, 58 deletions

diff --git a/dev-libs/liboil/Manifest b/dev-libs/liboil/Manifest
index 06585f19034a..ade749fe8941 100644
--- a/dev-libs/liboil/Manifest
+++ b/dev-libs/liboil/Manifest
@@ -1,6 +1,5 @@
 AUX liboil-0.3.17-amd64-cpuid.patch 1040 BLAKE2B 4cf2a34250d08175c7bf466b93fea90c0b4a793561b127a8658ab4bfa354cd8ad5124655a305ae6f4437c504092492151b18b02c7c32fbacafebc8608bd5e82c SHA512 f77100d5e8270cd137b3061904009c8f9f37648e85fa2d82bbeec08d58886dc7a8544a39331ad7854b9db17890092944a74ca12fadc73c24fbc40feacfc50e73
 AUX liboil-0.3.17-x32.patch 7762 BLAKE2B f3402d64fa9ef13e488aa07d7565782b38e585e7ab73e8c6d4c33882ba138734c1369b87ec549850f9cd9b9d2a85cfd0e3972eb038863c1b632fc5ad2c34a9fa SHA512 83201a8a03a3785f228d9bff916928d80fdbf8abeaa27f715956c09b2a2eaffcffcda97e680abbb7b29b3f207531ee935489c1f226796a34968284751ffbd8d5
 DIST liboil-0.3.17.tar.gz 912563 BLAKE2B c7ad7cc4db422fd2a3fd2be01b81a8a2f4c9acbc7407955e30b8ca6d39b79a235f383b4897e01a51a9ed47f4476e321a0bd6522951a125acc2da85f38ea40770 SHA512 26f60d37af8aae435ff17f2aa852a4e52cebd96ef7be04cb4dc14c61bc42160e333e317e5b33f05f6d4b6c819b15c4ecd1d4c03018515252daea26dd4ed60145
-EBUILD liboil-0.3.17-r2.ebuild 1604 BLAKE2B 7413e1821afbee9e6f7e671d3841a5261804c493a1e9fbf30e889c09a9581eb962e2e97669095fcd19c04b2ec81286010e213ba5cc94d0a65fec19374757494c SHA512 20004b9e395a5a2f6cf7935affd1e020531c45a7831c6581818b94d45f01dea83be3ba412591c2d4a470a8b9d28d47e904a2e2ad33081e2cc6fa3e05189979df
-EBUILD liboil-0.3.17-r3.ebuild 1749 BLAKE2B c752870927d8ef64a8843b9cc69cfb2600b390d3e372cc86c78ebb2a4ba7c9045e59731ebb98b9a2540f55c8b9dbf6a467b25a1693062a8097c53e439bfde01a SHA512 6fc93f64590b737a0ad0dfd085007d126e6d4bb09520629e9aaf18d3d2b4c39cd673b3daa9a10b4da964b19d7396cafc73a4510156a36821d0c1e1fd0188a4d8
+EBUILD liboil-0.3.17-r3.ebuild 1745 BLAKE2B fbea1004b30ef54222e46199ad6327993627ff66ba081b694b99ea17053f24ac93ea8c4333ea9b32d5b6a51e226c30908e35278756b2a981d6d9bb3180a66e09 SHA512 cdf065a30a8cdc71fdcb5bbcf26891949e6031e21067bf6abeeb67d65093c2f35b849d35ec46266f36665ef2f1bde4f903638ef74bb07f32dc34f37596ed0402
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/dev-libs/liboil/liboil-0.3.17-r2.ebuild b/dev-libs/liboil/liboil-0.3.17-r2.ebuild
deleted file mode 100644
index d46aa0f41d0a..000000000000
--- a/dev-libs/liboil/liboil-0.3.17-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic multilib autotools-multilib
-
-DESCRIPTION="Library of simple functions that are optimized for various CPUs"
-HOMEPAGE="https://liboil.freedesktop.org/"
-SRC_URI="https://liboil.freedesktop.org/download/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0.3"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="examples? ( dev-libs/glib:2 )"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig"
-DOCS=( AUTHORS BUG-REPORTING HACKING NEWS README )
-
-src_prepare() {
-	if ! use examples; then
-		sed "s/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/" \
-			-i Makefile.am Makefile.in || die
-	fi
-
-	if ! use test; then
-		sed "s/^\(SUBDIRS =.*\)testsuite\(.*\)$/\1\2/" \
-			-i Makefile.am Makefile.in || die
-	fi
-
-	epatch "${FILESDIR}/${P}-amd64-cpuid.patch"
-	has x32 $(get_all_abis) && epatch "${FILESDIR}"/${PN}-0.3.17-x32.patch
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -O?
-	append-flags -O2
-
-	# For use with Clang, which is the only compiler on OSX, bug #576646
-	[[ ${CHOST} == *-darwin* ]] && append-flags -fheinous-gnu-extensions
-
-	autotools-multilib_src_configure
-}
-
-pkg_postinst() {
-	if ! use examples; then
-		ewarn "You have disabled examples USE flag. Beware that upstream might"
-		ewarn "want the output of some utilities that are only built with"
-		ewarn "USE='examples' if you report bugs to them."
-	fi
-}
diff --git a/dev-libs/liboil/liboil-0.3.17-r3.ebuild b/dev-libs/liboil/liboil-0.3.17-r3.ebuild
index d31a433f0e08..35619ad3a606 100644
--- a/dev-libs/liboil/liboil-0.3.17-r3.ebuild
+++ b/dev-libs/liboil/liboil-0.3.17-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://liboil.freedesktop.org/download/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0.3"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+examples test"
 RESTRICT="!test? ( test )"