gentoo resync : 25.11.2020

5 files changed, 134 insertions, 38 deletions

diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 6382df656204..935c74c94351 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,4 +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-9999.ebuild 1103 BLAKE2B 82646a83124feadc0ff37f9cec6f9664ca188814596bd2c4b739abf7055a133be7025710fcc195b4940d9637a552f75516f84a4054fe058b2af0bbaca982dd00 SHA512 65e62e9721012a8c8f582f90680246bbaa9050767a085ff0a87c809f818f2f5e7f501ae6e48a19129feb9279b884ce5bbebe9d9f691229ae8c655f66a9d908b0
-MISC metadata.xml 799 BLAKE2B 862b6b8ec3f6707fa10fd2cb79858481e9537a542632c26828b52ea7afc099c315e3cdac59fc3c55aa384288735e653104a3fe7abd165482d1c443ea128b24a3 SHA512 62bb6686582652a9215a0548d3400e0f864e86040625dc608eea9d644937738b6fcb9c060034a85d27b31797068c05dcf78b18d8b411c3f8b3ef96e2cec99d2c
+EBUILD oniguruma-6.9.6-r1.ebuild 1506 BLAKE2B a40ade4c00a47ba79b03f21f02ca641153fffd1f262b60946cee62e77212243024b70fa794f53936e71001d43a25c135d5a3f12a1aeeef02501b299dcc4740ea SHA512 a18a9b97c2beec525ef292f82c7e54c05ffc5af1c1d70bb1b73abe58c650a941b82d78752c75ed6c67e09540825c67216bd77e7487b598f847f251687201431e
+EBUILD oniguruma-6.9.6.ebuild 1162 BLAKE2B 4c5643a2f49e351065eff41cabd6b3a28caa9f0f1c34b14be1daf7718d15b30c7f04f6cb02f04a1470ddc33eff61a25e26948e6b433a848f25d7363f24e382aa SHA512 d77b7cf3064ec297591da2a8fe874578461d7d55c734ba1bdd22694295338cf483a796e44a5733728ef01dbb60c77123cb90bbb87cd3e3b9c1b81b1617fcf769
+EBUILD oniguruma-9999.ebuild 1162 BLAKE2B 4c5643a2f49e351065eff41cabd6b3a28caa9f0f1c34b14be1daf7718d15b30c7f04f6cb02f04a1470ddc33eff61a25e26948e6b433a848f25d7363f24e382aa SHA512 d77b7cf3064ec297591da2a8fe874578461d7d55c734ba1bdd22694295338cf483a796e44a5733728ef01dbb60c77123cb90bbb87cd3e3b9c1b81b1617fcf769
+MISC metadata.xml 899 BLAKE2B 3410f5e417f4f7e946b8f0485d39a9a03f8f007c3b37f329958939674a6d4648719d9d0366c4de2f06ded2a8e5b5f088f3830fde351a5f0c4a3b40f58b7ba01f SHA512 ed6a20a44390801a201994802059b22e4df1b2d3735e36cefb60ef91990d19a63486f09f5d5915d0f4d88f18b376df62a20a4b0dfd37ed77256691077f490ff5
diff --git a/dev-libs/oniguruma/metadata.xml b/dev-libs/oniguruma/metadata.xml
index 2dc293268b64..597c459467b1 100644
--- a/dev-libs/oniguruma/metadata.xml
+++ b/dev-libs/oniguruma/metadata.xml
@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <longdescription>
-    Oniguruma is a regular expression library.  The characteristics of
-    this library is that different character encoding for every regular
-    expression object can be specified.  (Supported character encodings:
-    ASCII, UTF-8, EUC-JP, Shift_JIS)
-  </longdescription>
-  <slots>
-    <subslots>Reflect ABI of libonig.so.</subslots>
-  </slots>
-  <use>
-    <flag name="crnl-as-line-terminator">
-      enable CR+NL as line terminator
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="github">kkos/oniguruma</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<longdescription>
+		Oniguruma is a regular expression library.  The characteristics of
+		this library is that different character encoding for every regular
+		expression object can be specified.  (Supported character encodings:
+		ASCII, UTF-8, EUC-JP, Shift_JIS)
+	</longdescription>
+	<slots>
+		<subslots>libonig.so soname version number</subslots>
+	</slots>
+	<use>
+		<flag name="crnl-as-line-terminator">Enable CR+NL as line terminator</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">kkos/oniguruma</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild b/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild
new file mode 100644
index 000000000000..e0a1c8d371cf
--- /dev/null
+++ b/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2003-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib-minimal
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit autotools git-r3
+
+	EGIT_REPO_URI="https://github.com/kkos/oniguruma"
+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="~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
+	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() {
+	# https://github.com/kkos/oniguruma/issues/223
+	# https://github.com/kkos/oniguruma/commit/d177786282a618c76cdf2e993e3d0d9a684e9666
+	sed -e "/^AM_LDFLAGS[[:space:]]*=/s:-L\$(prefix)/lib:-L\$(libdir):" -i {sample,test}/Makefile.{am,in} || die
+
+	default
+
+	if [[ "${PV}" == "9999" ]]; then
+		eautoreconf
+	fi
+}
+
+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" -delete || die
+}
diff --git a/dev-libs/oniguruma/oniguruma-6.9.6.ebuild b/dev-libs/oniguruma/oniguruma-6.9.6.ebuild
new file mode 100644
index 000000000000..4c0eebf2c0ca
--- /dev/null
+++ b/dev-libs/oniguruma/oniguruma-6.9.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2003-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+
+LICENSE="BSD-2"
+SLOT="0/5"
+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} )
+
+src_prepare() {
+	default
+
+	if [[ "${PV}" == "9999" ]]; then
+		eautoreconf
+	fi
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable crnl-as-line-terminator) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -type f -delete || die
+}
diff --git a/dev-libs/oniguruma/oniguruma-9999.ebuild b/dev-libs/oniguruma/oniguruma-9999.ebuild
index 8efae9394402..4c0eebf2c0ca 100644
--- a/dev-libs/oniguruma/oniguruma-9999.ebuild
+++ b/dev-libs/oniguruma/oniguruma-9999.ebuild
@@ -1,34 +1,27 @@
-# Copyright 2003-2019 Gentoo Authors
+# 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"
 
-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})
+DOCS=( AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES} )
 
 src_prepare() {
 	default
@@ -46,5 +39,5 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${D}" -name "*.la" -type f -delete || die
+	find "${ED}" -name "*.la" -type f -delete || die
 }