gentoo resync : 13.06.2020

3 files changed, 2 insertions, 61 deletions

diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index f0f434b61cc4..de1d85619604 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,7 +1,5 @@
 AUX liborcus-0.15.4-bashism.patch 640 BLAKE2B 4ccb09840325fb59756b806c1be68bd327757899ba904e9c3b83bafe167c61ac3e94b9779e2df547b2427f622532c86ebba56d20d853095c215a0a15d7b179bf SHA512 0d7605eea0594b81b45faa0120e7fc37021efbae8b676ee0a1262923aa69511203927163785a8648ab23ac8df8ea5b4bb08ca8f0dda436b81ec287dbe2064951
-DIST liborcus-0.14.1.tar.xz 1894680 BLAKE2B 0070baf319bf35275f36f3082141f154404ad43d8143588b35c00b8b536f0c1cf5bf38fd9e997c4be45a454f16de1cc1a25186da40e3ed0606a87e9a6a968053 SHA512 a32dc5a652ce99cff37273c38fb9460e13e7bfb562f40c8d0c79b65c33e340daaeeb2c796308ca700b85bfc13cc8215641563b9e9f6d44b7d61adb8e8a3c950f
 DIST liborcus-0.15.4.tar.xz 1590048 BLAKE2B b2edff8a00439154c2850e49fff151f59c0c5a43163cebe5cac84b627fcf87c89a0a522797d8a5bc39eaca9205d74ff3f0bdf9ba77561c5cc7aefe98f35a4c8b SHA512 edbe1d6f86a249e43915e7fb960e6b269fa8703e3f571a023e811dd3f9b5d9c9a36edff491faa7ed7ea3490bf5afe1999e26d05c658a0a393b3ffd08b311b76f
-EBUILD liborcus-0.14.1-r1.ebuild 1244 BLAKE2B 0732a37541b1fff62423a0ff2bf5bf31802c1c1b5b10a0c0147984957119e5898398a146cf55201c66bff31115c9add5d3df03b8a8638e667bbaed8e1a7e1004 SHA512 5632ae0533067bf40858f8997510c1cc07f051095146ae57c89cc54cd7119693cec2eae63378e9cebc70bce5b2e0039d4edac813c7de961765a7a5a1f03fac9c
-EBUILD liborcus-0.15.4.ebuild 1285 BLAKE2B e64c9e75330c1191f7d512baded7464254f6ef14e68e1c74ab1e75d04a529c39f95a7e53ce6ea3c5b37e8771c856571bc1c80d7b33509a459cd1d78b0d28cf3f SHA512 2e94350986379449d0fcd1d05637a8d22ec46bdc5420779da62114f7af843cc1fe02ada8be6685e77e71af00de2bf3ca8a5b959ac327ff0dee1db6f95866590b
+EBUILD liborcus-0.15.4.ebuild 1284 BLAKE2B c1dec92a1c6db0482e8a7383aac54f0657f5f97a67ecfac4fc22801c3caf429c035f593fafe83919d2afa92d2117a642958e2df223eee30bce4372561b101879 SHA512 a9c9035e71cb37339e2d1d963dcd66a67651983b079a41a3e7b865a7e22c4bf5dbac4603292ba2685ae2212fa64c8d9bb6937f4c3fad3b2305cb6b5a28bb6802
 EBUILD liborcus-9999.ebuild 1298 BLAKE2B b52cee71e2fcb7065bcf5cb5ea5aa94159a0b0b75718bda35fd3066fb95013b23e29617718c7377a3d13df01a9c016f0ccd30a2d236458e7b3f765ac3966b92d SHA512 c262623856b8e4ad196f5657b17717bdff2de6f8c334cb9b1a6bb46a4220047674f65864511f993672e98a5ab570c1371700f95c41bd4d7ccf2040e397ab2ee4
 MISC metadata.xml 556 BLAKE2B f60b17901e0ac564d2d495122a673c6c397e8ca78cc5035b53be81e48d6653d9804fbd337a5e308fb993a28f39aec13f0b8da85bc8e3bf213f0411e08f977a60 SHA512 c16a1b111116eddfdf0095b3b8c6e44e3dd60ec9049907459eef7906cc3f9673ee099651bdec081efe86abf2afc0340afcf204b7439481201188ac682eb11bf2
diff --git a/dev-libs/liborcus/liborcus-0.14.1-r1.ebuild b/dev-libs/liborcus/liborcus-0.14.1-r1.ebuild
deleted file mode 100644
index 1c14dc041dcd..000000000000
--- a/dev-libs/liborcus/liborcus-0.14.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-single-r1
-
-DESCRIPTION="Standalone file import filter library for spreadsheet documents"
-HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/0.14" # based on SONAME of liborcus.so
-IUSE="python +spreadsheet-model static-libs tools"
-
-RDEPEND="
-	dev-libs/boost:=[zlib(+)]
-	sys-libs/zlib
-	python? ( ${PYTHON_DEPS} )
-	spreadsheet-model? ( dev-libs/libixion:${SLOT} )
-"
-DEPEND="${RDEPEND}
-	=dev-util/mdds-1.4*:1
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable python) \
-		$(use_enable spreadsheet-model) \
-		$(use_enable static-libs static) \
-		$(use_with tools)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/dev-libs/liborcus/liborcus-0.15.4.ebuild b/dev-libs/liborcus/liborcus-0.15.4.ebuild
index 999baa80ea0f..4ed618d5956c 100644
--- a/dev-libs/liborcus/liborcus-0.15.4.ebuild
+++ b/dev-libs/liborcus/liborcus-0.15.4.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="MIT"