From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 901AC138359 for ; Sat, 7 Nov 2020 00:49:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B961FE0831; Sat, 7 Nov 2020 00:49:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 74A17E0831 for ; Sat, 7 Nov 2020 00:49:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AFF3A340E1C for ; Sat, 7 Nov 2020 00:49:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E9D333BE for ; Sat, 7 Nov 2020 00:49:54 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1604710127.c01a70bc4a6beb35a9abd6f23bc6da671c6d931b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/oniguruma/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/oniguruma/Manifest dev-libs/oniguruma/oniguruma-6.9.6.ebuild dev-libs/oniguruma/oniguruma-9999.ebuild X-VCS-Directories: dev-libs/oniguruma/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c01a70bc4a6beb35a9abd6f23bc6da671c6d931b X-VCS-Branch: master Date: Sat, 7 Nov 2020 00:49:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c488765c-fa91-4fbd-8bba-df497c323df2 X-Archives-Hash: 38baca9d70d8759bbaf741674cd62d0a commit: c01a70bc4a6beb35a9abd6f23bc6da671c6d931b Author: Sam James gentoo org> AuthorDate: Sat Nov 7 00:36:03 2020 +0000 Commit: Sam James gentoo org> CommitDate: Sat Nov 7 00:48:47 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c01a70bc dev-libs/oniguruma: bump to 6.9.6 Signed-off-by: Sam James gentoo.org> dev-libs/oniguruma/Manifest | 1 + ...niguruma-9999.ebuild => oniguruma-6.9.6.ebuild} | 23 ++++++++-------------- dev-libs/oniguruma/oniguruma-9999.ebuild | 23 ++++++++-------------- 3 files changed, 17 insertions(+), 30 deletions(-) diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest index 78f1b0aef45..05a244cee06 100644 --- a/dev-libs/oniguruma/Manifest +++ b/dev-libs/oniguruma/Manifest @@ -1 +1,2 @@ DIST onig-6.9.4.tar.gz 908702 BLAKE2B e6e9939f284569408ba01b8551960bc939bbfdca425f8470499f5bb83ead7b6b09898f6f6a09d5d8c26d74d5416f6e5e9e2f00fbe7aa9eb820edb8aa4a3050cc SHA512 ed8f42f6893966c0ee3c168b4fdbcb04b2286ad69ecab43a754c1dbc8fc4656e01319991d776d7144b6a3f90d050781b321432278d83c74c9565c2743851c85b +DIST onig-6.9.6.tar.gz 926459 BLAKE2B 7a5fb49b35abe11fb91e7e4529855411fa0eb357897a2b327ddb5696a2c1e5f9fe7eb653fe84dbaeeff9c77e5489fd042d65e84f5b8e3e907bd30d60a0b75914 SHA512 eb44f70347f49945fe054ad65370dbfd6b30b2e8442fb90b6c72413b7f9a8cb77ca98d1a4714d1d32b763551430436cc0175c0efaf2c73268363a9b6ecb5e3bc diff --git a/dev-libs/oniguruma/oniguruma-9999.ebuild b/dev-libs/oniguruma/oniguruma-6.9.6.ebuild similarity index 67% copy from dev-libs/oniguruma/oniguruma-9999.ebuild copy to dev-libs/oniguruma/oniguruma-6.9.6.ebuild index 8efae939440..4c0eebf2c0c 100644 --- a/dev-libs/oniguruma/oniguruma-9999.ebuild +++ b/dev-libs/oniguruma/oniguruma-6.9.6.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 } diff --git a/dev-libs/oniguruma/oniguruma-9999.ebuild b/dev-libs/oniguruma/oniguruma-9999.ebuild index 8efae939440..4c0eebf2c0c 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 }