diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/Manifest index 78f1b0aef4..d08915a62e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/Manifest @@ -1 +1 @@ -DIST onig-6.9.4.tar.gz 908702 BLAKE2B e6e9939f284569408ba01b8551960bc939bbfdca425f8470499f5bb83ead7b6b09898f6f6a09d5d8c26d74d5416f6e5e9e2f00fbe7aa9eb820edb8aa4a3050cc SHA512 ed8f42f6893966c0ee3c168b4fdbcb04b2286ad69ecab43a754c1dbc8fc4656e01319991d776d7144b6a3f90d050781b321432278d83c74c9565c2743851c85b +DIST onig-6.9.7.1.tar.gz 935705 BLAKE2B 1042d5b211f53ad8983eb6b4e53beb165bc948bbef9a85ad12578a9237a804e3dcd0a8105914156230ec30e11f2c8a0372c37919cdde7b2be104c66a8b22fb52 SHA512 17711e0d451c41e74cb3f8ab4e78b0181578ef42cb35dc64e87871c82a41909334cb4eeb03eccdccf6904f699e6e82b0dbb54077138225b9b95471fcdeb8c486 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/metadata.xml index 2dc293268b..9525dd0504 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/metadata.xml @@ -1,25 +1,27 @@ - + - - cjk@gentoo.org - Cjk - - - 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) - - - Reflect ABI of libonig.so. - - - - enable CR+NL as line terminator - - - - kkos/oniguruma - + + arfrever.fta@gmail.com + Arfrever Frehtes Taifersar Arahesis + + + cjk@gentoo.org + Cjk + + + 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) + + + libonig.so soname version number + + + Enable CR+NL as line terminator + + + kkos/oniguruma + diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/oniguruma-6.9.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/oniguruma-6.9.7.1.ebuild similarity index 65% rename from sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/oniguruma-6.9.4.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/oniguruma-6.9.7.1.ebuild index e3be7fef9a..f8569eb11d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/oniguruma-6.9.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/oniguruma-6.9.7.1.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,20 +21,20 @@ 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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" IUSE="crnl-as-line-terminator static-libs" +BDEPEND="" +DEPEND="" +RDEPEND="" + if [[ "${PV}" != "9999" ]]; then - S="${WORKDIR}/onig-${PV}" + S="${WORKDIR}/onig-$(ver_cut 1-3)" 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/167 - # https://github.com/kkos/oniguruma/commit/603f4db48efb49307b7515500496e9e7a92fb779 - sed -e "/^#define MATCH_AT_ERROR_RETURN(err_code)/s/best_len = err_code; goto match_at_end/do {&;} while(0)/" -i src/regexec.c || die - default if [[ "${PV}" == "9999" ]]; then @@ -44,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 "${D}" -name "*.la" -type f -delete || die + find "${ED}" -name "*.la" -delete || die } diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/oniguruma-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/oniguruma-9999.ebuild index 8efae93944..405b066a53 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/oniguruma-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/oniguruma-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2003-2019 Gentoo Authors +# Copyright 2003-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -24,6 +24,10 @@ SLOT="0/5" KEYWORDS="" IUSE="crnl-as-line-terminator static-libs" +BDEPEND="" +DEPEND="" +RDEPEND="" + if [[ "${PV}" != "9999" ]]; then S="${WORKDIR}/onig-${PV}" fi @@ -40,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 "${D}" -name "*.la" -type f -delete || die + find "${ED}" -name "*.la" -delete || die }