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.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 DE8D3158020 for ; Sun, 13 Nov 2022 17:12:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C43AFE094A; Sun, 13 Nov 2022 17:12:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 7F897E094A for ; Sun, 13 Nov 2022 17:12:09 +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 84764340FBF for ; Sun, 13 Nov 2022 17:12:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E9CFA5D6 for ; Sun, 13 Nov 2022 17:12:06 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1668359511.41d43de3f4d395f57cb34db2a66e00218e0b1fee.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/link-grammar/, dev-libs/link-grammar/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/link-grammar/Manifest dev-libs/link-grammar/files/link-grammar-5.8.1-lld.patch dev-libs/link-grammar/link-grammar-5.10.5-r1.ebuild X-VCS-Directories: dev-libs/link-grammar/ dev-libs/link-grammar/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 41d43de3f4d395f57cb34db2a66e00218e0b1fee X-VCS-Branch: master Date: Sun, 13 Nov 2022 17:12:06 +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: d71616cb-bcce-4685-a5c3-86256b570fee X-Archives-Hash: 5ca4931feba610ca51263e6274bd9918 commit: 41d43de3f4d395f57cb34db2a66e00218e0b1fee Author: David Seifert gentoo org> AuthorDate: Sun Nov 13 17:11:51 2022 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Nov 13 17:11:51 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41d43de3 dev-libs/link-grammar: drop 5.10.5-r1 Signed-off-by: David Seifert gentoo.org> dev-libs/link-grammar/Manifest | 1 - .../files/link-grammar-5.8.1-lld.patch | 13 --- .../link-grammar/link-grammar-5.10.5-r1.ebuild | 111 --------------------- 3 files changed, 125 deletions(-) diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest index 57fee7077469..05c86a167613 100644 --- a/dev-libs/link-grammar/Manifest +++ b/dev-libs/link-grammar/Manifest @@ -1,2 +1 @@ -DIST link-grammar-5.10.5.tar.gz 4637765 BLAKE2B d280a06492462725c9c62352b6bf4fb0a11a09b2b3049e41d9a078fa2ad37c8ef0f0e99e05039e355e81d127c168024068319a4fcf64caa840c00c165ed22f11 SHA512 09774f7ce01bc7ec9912162297c9b7be176e655b70981a147d53245c015f62581e7f45c005d0590d1a65e870e3c2ac4288517012fd9caa9887e4fd86d8e6aa05 DIST link-grammar-5.11.0.tar.gz 4672430 BLAKE2B 35892e05805a83ebbd700611d19aaa9ad1ede4ba3baf60c85ef8e5abbc40134fcb71d9cb9f41518f663c60ad11aac7bd0b316c8c95a12631032f5ad79564d686 SHA512 6a24bc8d5c9f0dd63460c092fc46880503018e949aa277148f8f551d6cc9d929d3a981eeaba00afc6e618c1e4505438d0c7e9a57dfe7a8deb7d3a8f183c56636 diff --git a/dev-libs/link-grammar/files/link-grammar-5.8.1-lld.patch b/dev-libs/link-grammar/files/link-grammar-5.8.1-lld.patch deleted file mode 100644 index af48d251046b..000000000000 --- a/dev-libs/link-grammar/files/link-grammar-5.8.1-lld.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -324,9 +324,7 @@ - dnl 1. Abort and notify if no zlib.h. 2. Adapt for non-standard location. - AC_MSG_NOTICE([The minisat2 headers include zlib.h]) - dnl The bundled library doesn't actually need -lz -- AX_CHECK_ZLIB([ZLIB_CPPFLAGS="-isystem $ZLIB_HOME/include"], -- [AC_MSG_NOTICE([No zlib library found - not building sat solver]) -- enable_sat_solver=no]) -+ PKG_CHECK_MODULES([ZLIB], [zlib], [ZLIB_CPPFLAGS="${ZLIB_CFLAGS}"]) - fi - - # If zlib not found, then don't continue with minisat. diff --git a/dev-libs/link-grammar/link-grammar-5.10.5-r1.ebuild b/dev-libs/link-grammar/link-grammar-5.10.5-r1.ebuild deleted file mode 100644 index 9de3fa2672c1..000000000000 --- a/dev-libs/link-grammar/link-grammar-5.10.5-r1.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..11} ) - -inherit autotools python-r1 out-of-source - -DESCRIPTION="A Syntactic English parser" -HOMEPAGE="https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/" -SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0/5" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86" -IUSE="aspell +hunspell python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# XXX: sqlite is automagic -# Does not build with >=sci-mathematics/minisat-2, bug #593662 -RDEPEND=" - dev-db/sqlite:3 - dev-libs/libpcre2:= - aspell? ( app-text/aspell ) - hunspell? ( app-text/hunspell ) - python? ( ${PYTHON_DEPS} ) - !sci-mathematics/minisat" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-lang/swig:0 - sys-devel/autoconf-archive - virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/${PN}-5.8.1-lld.patch ) - -pkg_setup() { - if use aspell && use hunspell; then - ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist," - ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if" - ewarn "you want aspell support." - fi -} - -src_prepare() { - default - eautoreconf -} - -my_src_configure() { - local myconf=( - --disable-maintainer-mode - --disable-editline - # java is hopelessly broken, invokes maven at build time (bug #806157) - --disable-java-bindings - --disable-perl-bindings - --enable-sat-solver=bundled - --with-regexlib=pcre2 - $(use_enable aspell) - $(use_enable hunspell) - $(usev hunspell --with-hunspell-dictdir="${EPREFIX}"/usr/share/myspell) - ) - - econf \ - --disable-python-bindings \ - "${myconf[@]}" - - if use python; then - python_configure() { - econf \ - --enable-python-bindings \ - "${myconf[@]}" - } - python_foreach_impl run_in_build_dir python_configure - fi -} - -my_src_compile() { - local -x MAIN_BUILD_DIR="${BUILD_DIR}" - default - - if use python; then - python_compile() { - emake -C bindings/python \ - VPATH="${S}:${MAIN_BUILD_DIR}" \ - _clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \ - _clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la - } - python_foreach_impl run_in_build_dir python_compile - fi -} - -my_src_install() { - local -x MAIN_BUILD_DIR="${BUILD_DIR}" - default - - if use python; then - python_install() { - emake -C bindings/python \ - VPATH="${S}:${MAIN_BUILD_DIR}" \ - _clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \ - _clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \ - DESTDIR="${D}" \ - install - } - python_foreach_impl run_in_build_dir python_install - fi - - # no static archives - find "${ED}" -name '*.la' -delete || die -}