gentoo new year resync : 01.01.2021

3 files changed, 23 insertions, 11 deletions

diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 935c74c94351..ead3adf5fd79 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,7 +1,7 @@
 DIST onig-6.9.4.tar.gz 908702 BLAKE2B e6e9939f284569408ba01b8551960bc939bbfdca425f8470499f5bb83ead7b6b09898f6f6a09d5d8c26d74d5416f6e5e9e2f00fbe7aa9eb820edb8aa4a3050cc SHA512 ed8f42f6893966c0ee3c168b4fdbcb04b2286ad69ecab43a754c1dbc8fc4656e01319991d776d7144b6a3f90d050781b321432278d83c74c9565c2743851c85b
 DIST onig-6.9.6.tar.gz 926459 BLAKE2B 7a5fb49b35abe11fb91e7e4529855411fa0eb357897a2b327ddb5696a2c1e5f9fe7eb653fe84dbaeeff9c77e5489fd042d65e84f5b8e3e907bd30d60a0b75914 SHA512 eb44f70347f49945fe054ad65370dbfd6b30b2e8442fb90b6c72413b7f9a8cb77ca98d1a4714d1d32b763551430436cc0175c0efaf2c73268363a9b6ecb5e3bc
 EBUILD oniguruma-6.9.4.ebuild 1506 BLAKE2B ee403b48d1fe7194b4780ba5dc8221dda58a63e6bdef9acd6aaa1b872520e5dd942111b314692f595ac5e492c4990f2a09d5a1d7f520bb4567f777a8bf68b1d2 SHA512 e697c3c94b3a1de3cea291e07933bdfce5f4c4a6c0c4148c23e3b25f252a0b741b4e8cb65573daeaaae23a0321aa14cb664e43af5e5471d06840677e8c2cf42b
-EBUILD oniguruma-6.9.6-r1.ebuild 1506 BLAKE2B a40ade4c00a47ba79b03f21f02ca641153fffd1f262b60946cee62e77212243024b70fa794f53936e71001d43a25c135d5a3f12a1aeeef02501b299dcc4740ea SHA512 a18a9b97c2beec525ef292f82c7e54c05ffc5af1c1d70bb1b73abe58c650a941b82d78752c75ed6c67e09540825c67216bd77e7487b598f847f251687201431e
+EBUILD oniguruma-6.9.6-r1.ebuild 1500 BLAKE2B 80c26bc80c4b0a7ce800bd5d858af6cf4b72c2622c03e9237157577b99bc5ce80b37bc7d157aff0885903d5b3b077fcd5ac88c25ffe9c3116b3f8f5c49193bb8 SHA512 0e6a8ff24ee2cc71fd986e007c3c3787c45fdf243ec55e73b6383e522cc23cc2ce2a636281e70543954eb14c2e8ec634218db6cf22c530dca19a96c98f26e46e
 EBUILD oniguruma-6.9.6.ebuild 1162 BLAKE2B 4c5643a2f49e351065eff41cabd6b3a28caa9f0f1c34b14be1daf7718d15b30c7f04f6cb02f04a1470ddc33eff61a25e26948e6b433a848f25d7363f24e382aa SHA512 d77b7cf3064ec297591da2a8fe874578461d7d55c734ba1bdd22694295338cf483a796e44a5733728ef01dbb60c77123cb90bbb87cd3e3b9c1b81b1617fcf769
-EBUILD oniguruma-9999.ebuild 1162 BLAKE2B 4c5643a2f49e351065eff41cabd6b3a28caa9f0f1c34b14be1daf7718d15b30c7f04f6cb02f04a1470ddc33eff61a25e26948e6b433a848f25d7363f24e382aa SHA512 d77b7cf3064ec297591da2a8fe874578461d7d55c734ba1bdd22694295338cf483a796e44a5733728ef01dbb60c77123cb90bbb87cd3e3b9c1b81b1617fcf769
+EBUILD oniguruma-9999.ebuild 1152 BLAKE2B a501302d3a207054c966c8fb3bfc56fef6a301e8e33ffa406d4a2c5fc40d63d12babe0733a43322a7aed4894ab82f215a586b7f8038b4d38f0f73db6c855cc17 SHA512 1e261ffa3fa322957e5cbc4d78e7f7cc7b690f35e68af298d85bbefd673365a134d2b7c3637a741b427fc95b658e7e942f9cdf3a8958edb501d2098906ca025d
 MISC metadata.xml 899 BLAKE2B 3410f5e417f4f7e946b8f0485d39a9a03f8f007c3b37f329958939674a6d4648719d9d0366c4de2f06ded2a8e5b5f088f3830fde351a5f0c4a3b40f58b7ba01f SHA512 ed6a20a44390801a201994802059b22e4df1b2d3735e36cefb60ef91990d19a63486f09f5d5915d0f4d88f18b376df62a20a4b0dfd37ed77256691077f490ff5
diff --git a/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild b/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild
index e0a1c8d371cf..7cab6aca0170 100644
--- a/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2003-2020 Gentoo Authors
+# Copyright 2003-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="crnl-as-line-terminator static-libs"
 
 if [[ "${PV}" != "9999" ]]; then
diff --git a/dev-libs/oniguruma/oniguruma-9999.ebuild b/dev-libs/oniguruma/oniguruma-9999.ebuild
index 4c0eebf2c0ca..405b066a532a 100644
--- a/dev-libs/oniguruma/oniguruma-9999.ebuild
+++ b/dev-libs/oniguruma/oniguruma-9999.ebuild
@@ -1,27 +1,38 @@
 # Copyright 2003-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
 inherit multilib-minimal
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit autotools git-r3
+
 	EGIT_REPO_URI="https://github.com/kkos/oniguruma"
-else
-	SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/onig-${PV}.tar.gz"
-	S="${WORKDIR}/onig-${PV}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi
 
 DESCRIPTION="Regular expression library for different character encodings"
 HOMEPAGE="https://github.com/kkos/oniguruma"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/onig-${PV}.tar.gz"
+fi
 
 LICENSE="BSD-2"
 SLOT="0/5"
+KEYWORDS=""
 IUSE="crnl-as-line-terminator static-libs"
 
-DOCS=( AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES} )
+BDEPEND=""
+DEPEND=""
+RDEPEND=""
+
+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/onig-${PV}"
+fi
+
+DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES})
 
 src_prepare() {
 	default
@@ -33,11 +44,12 @@ src_prepare() {
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
+		--enable-posix-api \
 		$(use_enable crnl-as-line-terminator) \
 		$(use_enable static-libs static)
 }
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${ED}" -name "*.la" -type f -delete || die
+	find "${ED}" -name "*.la" -delete || die
 }