gentoo resync : 16.09.2020

4 files changed, 59 insertions, 23 deletions

diff --git a/dev-libs/onigmo/Manifest b/dev-libs/onigmo/Manifest
index 7abc91caaee5..66ce046af7f2 100644
--- a/dev-libs/onigmo/Manifest
+++ b/dev-libs/onigmo/Manifest
@@ -1,3 +1,5 @@
 DIST onigmo-6.1.3.tar.gz 822127 BLAKE2B b2f020ba37c039022ee4ad0840006b7d84bd5c2b24975d3cc34a625379c478cdfacbb7247d5f2315da2e56beaa74fec5390140d4a3f0c29c66906d78d7207b8b SHA512 13ee0e97e5e7ea2a379cdfd8bab121ee116fc07495c6b3131621f6cd9b1748897e5e2c7dcf43845794b2ad4adef3b4076daf06f51aaf965e32cbac5d7bace1e6
-EBUILD onigmo-6.1.3.ebuild 874 BLAKE2B 262440b3e06a3956bfca717a13195f239952bc8a2d9ba39afad234ee548773c54ec2c221472b76000d420e8b930713d24a4f0192f17da8164760f1208844f19e SHA512 a9c29f664650d9ea42c3b8d6e4dc6bebb3395894545a86c8e1241c158cb6dda0d85f2ab08950a7aafc8d287a42b136f78a6bad00cff7698f64d635d4cf158cab
-MISC metadata.xml 607 BLAKE2B 0905f9762b2a1705657d992299cd1c793e019140257845437171497551028dc5056450daf14931e57621ddaac82216526fe0df101e08ac2e2deb26ca7467c4dc SHA512 6b734fe90fdb3ac48abdcd9941494190d90c1889ef43adeee93574c09a28b233c7eaa51b8600e2d220a3d1c54dc181e09c1a93a7d95eb76d25179faf6c9361ef
+DIST onigmo-6.2.0.tar.gz 844935 BLAKE2B 768918af337be0bbe9fd9c9f15a630ce0a74f081832ef84ba13e48f4e6ed692ff1250e20272c039d95bb4d9b847bfaac829addd7de3f50780b7620b1f105406c SHA512 651ab8c64d8b8c0d56e1549809030be79a751b9d1c06af6527f8cf6014fba1bafea593d572e1cf766099a10fb4e6506ca683ef48131f47471348b5cbd35a1a77
+EBUILD onigmo-6.1.3.ebuild 869 BLAKE2B e7cf04de463ef485df5f79c1ef3a3d9fdd82b1592511d67778b91e6a2cdfa20fb6304c1bd58fc954da6cd1fb69b08b899e2ad0e68153df73ab3c0212764fc12f SHA512 85f5a083ac4843c81a62a781d55f23e857c6c7675e7f33742c2544fa3e0ce783cd2c1844375fbf8e33c4f518ca999dacc07caadccc22512773d93b711c75e37a
+EBUILD onigmo-6.2.0.ebuild 871 BLAKE2B 3d52efc6d54a1f66ea9d9e927fcb19bccaeeb753a29fcf8d31fb57f87a2cfddddefac002516cb55c86b3b726ddb3832058c9f20a208efb1f0a66fc5d3eb4cad2 SHA512 b006179fa4f2b2ec957f546471fe994fb5b3946152066c33677a1898fb81eb19629e68354d8303dfdb323e8218b3ae999ce58ba7caf7e26dd3f870868d48cde0
+MISC metadata.xml 577 BLAKE2B cd1e0bd09e8b4a1f71dcde39b47a7dd78308786c8b9424111eddb3a6ba6b50181e6af722605db9cded62076434410325a795181a4adaaf2d837bcd74128dfee7 SHA512 7c1e07ac10f864fbc74ffdd4706792eb5978cc28449536900ab2c870d23e52f24c5de215b766238d0629cf4ef3cad77622f37e468b5295e57ec42f5912a54ac6
diff --git a/dev-libs/onigmo/metadata.xml b/dev-libs/onigmo/metadata.xml
index b1cea8c977b4..2914fe8f54bc 100644
--- a/dev-libs/onigmo/metadata.xml
+++ b/dev-libs/onigmo/metadata.xml
@@ -1,22 +1,22 @@
 <?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>
-  <slots>
-    <subslots>Reflect ABI of libonigmo.so.</subslots>
-  </slots>
-  <use>
-    <flag name="combination-explosion-check">
-      enable combination explosion check
-    </flag>
-    <flag name="crnl-as-line-terminator">
-      enable CR+NL as line terminator
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="github">k-takata/Onigmo</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<slots>
+		<subslots>Reflect ABI of libonigmo.so.</subslots>
+	</slots>
+	<use>
+		<flag name="combination-explosion-check">
+			enable combination explosion check
+		</flag>
+		<flag name="crnl-as-line-terminator">
+			enable CR+NL as line terminator
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">k-takata/Onigmo</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/onigmo/onigmo-6.1.3.ebuild b/dev-libs/onigmo/onigmo-6.1.3.ebuild
index 4c34afcf8ac8..fc5366e7b632 100644
--- a/dev-libs/onigmo/onigmo-6.1.3.ebuild
+++ b/dev-libs/onigmo/onigmo-6.1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit autotools multilib-minimal
 
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/k-takata/${PN^o}/releases/download/${P^o}/${P}.tar.g
 
 LICENSE="BSD-2"
 SLOT="0/6"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
 
 DOCS=( AUTHORS HISTORY README{,.ja} doc/{API,FAQ,RE}{,.ja} doc/UnicodeProps.txt )
diff --git a/dev-libs/onigmo/onigmo-6.2.0.ebuild b/dev-libs/onigmo/onigmo-6.2.0.ebuild
new file mode 100644
index 000000000000..43b020ab66c9
--- /dev/null
+++ b/dev-libs/onigmo/onigmo-6.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Onigmo is a regular expressions library forked from Oniguruma"
+HOMEPAGE="https://github.com/k-takata/Onigmo"
+SRC_URI="https://github.com/k-takata/${PN^o}/releases/download/${P^o}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
+
+DOCS=( AUTHORS HISTORY README{,.ja} doc/{API,FAQ,RE}{,.ja} doc/UnicodeProps.txt )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable combination-explosion-check) \
+		$(use_enable crnl-as-line-terminator) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name "*.la" -delete || die
+}