[gentoo-commits] repo/gentoo:master commit in: dev-libs/oniguruma/

[Mike Gilbert]

commit:     d903684ed2f3ba757cb13cb98386608c4f839188
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Fri Dec  6 20:08:36 2019 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Dec  6 20:24:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d903684e

dev-libs/oniguruma: Minor fixes.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 dev-libs/oniguruma/oniguruma-6.9.4.ebuild | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/dev-libs/oniguruma/oniguruma-6.9.4.ebuild 
b/dev-libs/oniguruma/oniguruma-6.9.4.ebuild
index 89ceadf4472..d5ee1bbf47d 100644
--- a/dev-libs/oniguruma/oniguruma-6.9.4.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.9.4.ebuild
@@ -5,21 +5,43 @@ EAPI="7"
 
 inherit multilib-minimal
 
-MY_P="onig-${PV}"
+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";
-SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz";
+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 ~sh 
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x86-solaris"
 IUSE="crnl-as-line-terminator static-libs"
 
-S="${WORKDIR}/${MY_P}"
+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/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
+               eautoreconf
+       fi
+}
+
 multilib_src_configure() {
        ECONF_SOURCE="${S}" econf \
                $(use_enable crnl-as-line-terminator) \