From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1519892-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 1B45E15806E
	for <garchives@archives.gentoo.org>; Sat, 20 May 2023 05:09:35 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 0FF59E07B3;
	Sat, 20 May 2023 05:09:34 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 95BB4E07B3
	for <gentoo-commits@lists.gentoo.org>; Sat, 20 May 2023 05:09:33 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 72973340E64
	for <gentoo-commits@lists.gentoo.org>; Sat, 20 May 2023 05:09:32 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id A1754A6C
	for <gentoo-commits@lists.gentoo.org>; Sat, 20 May 2023 05:09:30 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1684558603.6693c3cc856e6328d7054c2e8224a4c93bf1315f.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/colm/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-util/colm/colm-0.14.7-r3.ebuild
X-VCS-Directories: dev-util/colm/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 6693c3cc856e6328d7054c2e8224a4c93bf1315f
X-VCS-Branch: master
Date: Sat, 20 May 2023 05:09:30 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: d3efc0d0-9233-406a-b583-184f7c12d69f
X-Archives-Hash: 0b14a8565a3087807d88be6259e8858b

commit:     6693c3cc856e6328d7054c2e8224a4c93bf1315f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 20 04:56:43 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 20 04:56:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6693c3cc

dev-util/colm: don't inject CFLAGS to main.cc

Causes crashes with some combinations.

Closes: https://bugs.gentoo.org/883993
Bug: https://bugs.gentoo.org/766069
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/colm/colm-0.14.7-r3.ebuild | 69 +++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/dev-util/colm/colm-0.14.7-r3.ebuild b/dev-util/colm/colm-0.14.7-r3.ebuild
new file mode 100644
index 000000000000..19e1284d28ca
--- /dev/null
+++ b/dev-util/colm/colm-0.14.7-r3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="COmputer Language Manipulation"
+HOMEPAGE="https://www.colm.net/open-source/colm/"
+SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+BDEPEND="
+	doc? (
+		|| ( app-text/asciidoc dev-ruby/asciidoctor )
+		dev-python/pygments
+	)
+"
+# libfsm moved from ragel -> colm, bug #766108
+RDEPEND="!<dev-util/ragel-7.0.3"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.14.7-drop-julia-check.patch
+	"${FILESDIR}"/${PN}-0.14.7-disable-static-lib.patch
+	"${FILESDIR}"/${PN}-0.14.7-solaris.patch
+)
+
+src_prepare() {
+	default
+
+	# bug #733426
+	sed -i -e 's/(\[ASCIIDOC\], \[asciidoc\], \[asciidoc\]/S([ASCIIDOC], [asciidoc asciidoctor]/' configure.ac || die
+
+	# Respect CC/CXX (bug #766069), we also omit CFLAGS here because
+	# it seems to crash with some combinations and the software is fragile
+	# (bug #883993).
+	sed -i -e "s|gcc|$(tc-getCC)|" src/main.cc || die
+	sed -i -e "s|gcc|$(tc-getCC)|" test/colm.d/gentests.sh || die
+	sed -i -e "s|g++|$(tc-getCXX)|" test/colm.d/gentests.sh || die
+
+	# fix linkage on Darwin from colm itself during build
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/libcolm\.so/libcolm.dylib/' src/main.cc || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable doc manual)
+}
+
+src_test() {
+	# Build tests
+	default
+
+	# Run them
+	cd test || die
+	./runtests || die
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}