gentoo resync : 25.11.2020

3 files changed, 2 insertions, 43 deletions

diff --git a/dev-libs/libxls/Manifest b/dev-libs/libxls/Manifest
index beca70622f44..9a885ca1924b 100644
--- a/dev-libs/libxls/Manifest
+++ b/dev-libs/libxls/Manifest
@@ -1,6 +1,4 @@
 AUX libxls-1.4.0-asprintf.patch 190 BLAKE2B 36c39cce45025c5498fefae2de5f9fb78f377463b4a761ef1abe89d8194b90b798e03dfa82561bc7cecd505abbdd5412b75b05194991257c600e4bbb307167b1 SHA512 c5881d63742b50f923c74dcedb5d2149bb55ea19bc611ba51c879f9ae82b8f87d9ab477fae57ef40814bea42f27a27d3be272b1c9fbd5e6c04d69078c8e7c03d
-DIST libxls-1.5.3.tar.gz 442217 BLAKE2B 4aab9acfaab96cb25e00ada599f607e5f448820d9cb32605ccd51454fd9f819c1426810f300fbf4a1c7523d5409d6f4fcb08e827c95775f3ec95bc65d7f8315a SHA512 75943e7bd3f1dbc28cc50ff7e4f21a9b6a9c97299c7594e0807b06e0bca9cca3d83f3e52086950422d67f175ae0c7c677222a1f716c5297e2f072b8e7b4fc52d
 DIST libxls-1.6.1.tar.gz 443736 BLAKE2B 47ed31bb16a65c764ee5882435ce11701e51b6ee5f03aa57ee7991e5445dc477143df48d757c618043a1abd864c46dacedeb1a18a608db1d5ae2b8fcab4a712f SHA512 99d4aa911bc12a52698e11c0592ed8ecb16fa055d4634e6bcc3e0a3900fd8311bade70d2cc8d2f60abbe72d644b6f30757b284544ca589e85c35eeb6f158b8cd
-EBUILD libxls-1.5.3.ebuild 678 BLAKE2B 1fc9837da9af845430a516f4e5d16ef9454efd0cfcf3c40ac2f1ec0aa39b462617ff7f30396423fe079361e51e832324601f494ad63164671290a1220e8cc1b7 SHA512 124f7124d89918534327cb2e2c9d245d1614fd7b1d052b315f4d875363c320cb3f0c0e460459dc4fb3a6fd5ee88d2e5c7739e507f9b8d5406b90cbd9b32e73c2
-EBUILD libxls-1.6.1.ebuild 680 BLAKE2B 070063ec4ff0ad863a4b25731aa662a80f6e715e784d29506fd393506164f2d1d019ce10c9a1b030e767717d2dc2c7265623f05dab03efa2b7871b62cbbea5ef SHA512 d6fcef38bf9f374e22d4c2f3228a1e446d479bde04293b854f5603c5dfa93dbbb2121b521623960d2caf29f66019b6f01b746742e529465b125976631ba5247f
+EBUILD libxls-1.6.1.ebuild 678 BLAKE2B 8d2bfb9b828ebb21d08cbd23619923341f2fc735c1c544ba25930166fbf49f690448ed41a39e34589d56e910237173a33cefa52b09ca3cfd82abbdd143ec80f8 SHA512 56cc8948dd2324208272e4add158544282471766cbaafdd4ec8d1d9ab5666e61e2c5d4347dc42e101eb2e5acaf930bc0343d987ad35941a0d6757073d0054a0c
 MISC metadata.xml 392 BLAKE2B 77f7b66d8024437b9a7b2b07bb78f451fccc5636629e284d053be66efa136982d026f28912c0a7b407059f8f5e33618ae15c83113f8bd380a168dcc1032f96bf SHA512 ccf08982c319c4e2c3fa94d1920f012207f35c75c445555312d20976612436d21bfa1cf93cf6014697a0210fd549146ea0f3eb73fbeee45d09d15952286fe3aa
diff --git a/dev-libs/libxls/libxls-1.5.3.ebuild b/dev-libs/libxls/libxls-1.5.3.ebuild
deleted file mode 100644
index 4d19444a5b7a..000000000000
--- a/dev-libs/libxls/libxls-1.5.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils
-
-DESCRIPTION="A library which can read Excel (xls) files"
-HOMEPAGE="https://github.com/libxls/libxls"
-SRC_URI="https://github.com/libxls/libxls/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/1" # libxlsreader.so.1
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-
-RESTRICT=test # test driver is missing
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0-asprintf.patch
-)
-
-src_configure() {
-	econf \
-		--disable-static
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/dev-libs/libxls/libxls-1.6.1.ebuild b/dev-libs/libxls/libxls-1.6.1.ebuild
index 62b7241386cd..806445dbf160 100644
--- a/dev-libs/libxls/libxls-1.6.1.ebuild
+++ b/dev-libs/libxls/libxls-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libxls/libxls/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/8" # libxlsreader.so.8
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""