Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/link-grammar/, dev-libs/link-grammar/files/
Date: Mon, 28 Sep 2020 19:50:24
Message-Id: 1601322036.a948a0ca71cf73f153fbd0eaa61b09e0a469a2c2.mgorny@gentoo
1 commit: a948a0ca71cf73f153fbd0eaa61b09e0a469a2c2
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 28 19:40:36 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 28 19:40:36 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a948a0ca
7
8 dev-libs/link-grammar: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-libs/link-grammar/Manifest | 1 -
13 .../link-grammar-5.3.9-out-of-source-build.patch | 61 ---------
14 dev-libs/link-grammar/link-grammar-5.3.11.ebuild | 143 ---------------------
15 3 files changed, 205 deletions(-)
16
17 diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
18 index 8e5e8d34970..d2a2a33c0e8 100644
19 --- a/dev-libs/link-grammar/Manifest
20 +++ b/dev-libs/link-grammar/Manifest
21 @@ -1,2 +1 @@
22 -DIST link-grammar-5.3.11.tar.gz 3632617 BLAKE2B 07fe951743096a0d6b906c9b7174b58fcc54b0e2c54805d15731de783888327799fd77f64a2ae7f4e09327feb08d91cb95471e9c0c3c2fe00fca3553f40b1905 SHA512 09671d187deac3b9530dd63eb4497de9c2c9db32d79da06c677bdbccac015adef06813819692a92d15499c7cb347071c58b73c52505af154bdc8a8fcd409ddd2
23 DIST link-grammar-5.8.0.tar.gz 3782125 BLAKE2B 8027e91212d3269b8e3ceaa5c837ad961cd2dfd92849d3989094ab771d97d30f4b228cfc1e32e9e843676aa439d790fb444823f7db69004538ad068c7bf28a45 SHA512 1262e2faf1de6f05a62f9d622f43c02253b4c241342df9b443a70ae04bd328d1fc49cd2f91c881e694f67215005833fec8b1fa9d395b1e547985b376c7415d2e
24
25 diff --git a/dev-libs/link-grammar/files/link-grammar-5.3.9-out-of-source-build.patch b/dev-libs/link-grammar/files/link-grammar-5.3.9-out-of-source-build.patch
26 deleted file mode 100644
27 index 6eacc6610f9..00000000000
28 --- a/dev-libs/link-grammar/files/link-grammar-5.3.9-out-of-source-build.patch
29 +++ /dev/null
30 @@ -1,61 +0,0 @@
31 ---- a/bindings/python/Makefile.am 2016-08-26 04:28:48.000000000 +0200
32 -+++ b/bindings/python/Makefile.am 2016-09-10 16:13:33.554781694 +0200
33 -@@ -4,9 +4,8 @@
34 - # Created by Linas Vepstas February 2014
35 - #
36 -
37 --SWIG_SOURCES = ../swig/link_grammar.i
38 --# BUILT_C_SOURCES = $(top_builddir)/bindings/python/lg_python_wrap.cc
39 --BUILT_C_SOURCES = ../../bindings/python/lg_python_wrap.cc
40 -+SWIG_SOURCES = $(top_srcdir)/bindings/swig/link_grammar.i
41 -+BUILT_C_SOURCES = $(top_builddir)/bindings/python/lg_python_wrap.cc
42 - BUILT_PY_SOURCES = $(top_builddir)/bindings/python/clinkgrammar.py
43 -
44 - # Over-ride the install location, so as to remove the dash in the
45 -@@ -20,7 +19,7 @@
46 - pkgpython_PYTHON = \
47 -- linkgrammar.py \
48 -+ $(srcdir)/linkgrammar.py \
49 - $(top_builddir)/bindings/python/__init__.py \
50 -- $(top_builddir)/bindings/python/clinkgrammar.py
51 -+ $(BUILT_PY_SOURCES)
52 -
53 -
54 - # These are packaged in the tarball; make clean should not remove them.
55 ---- a/bindings/python3/Makefile.am 2016-08-26 04:28:48.000000000 +0200
56 -+++ b/bindings/python3/Makefile.am 2016-09-11 01:30:35.700926275 +0200
57 -@@ -4,9 +4,8 @@
58 - # Created by Linas Vepstas February 2014
59 - #
60 -
61 --SWIG_SOURCES = ../swig/link_grammar.i
62 --# BUILT_C_SOURCES = $(top_builddir)/bindings/python3/lg_python_wrap.cc
63 --BUILT_C_SOURCES = ../../bindings/python3/lg_python_wrap.cc
64 -+SWIG_SOURCES = $(top_srcdir)/bindings/swig/link_grammar.i
65 -+BUILT_C_SOURCES = $(top_builddir)/bindings/python3/lg_python_wrap.cc
66 - BUILT_PY_SOURCES = $(top_builddir)/bindings/python3/clinkgrammar.py
67 -
68 - # Over-ride the install location, so as to remove the dash in the
69 -@@ -18,9 +17,9 @@
70 -
71 - # Files that get installed in $pkgpythondir
72 - pkgpython3_PYTHON = \
73 -- ../../bindings/python/linkgrammar.py \
74 -+ $(top_srcdir)/bindings/python/linkgrammar.py \
75 - $(top_builddir)/bindings/python3/__init__.py \
76 -- $(top_builddir)/bindings/python3/clinkgrammar.py
77 -+ $(BUILT_PY_SOURCES)
78 -
79 -
80 - # Apparently, anaconda does not work without this!?
81 ---- a/bindings/python3/Makefile.am 2016-09-11 12:44:01.466971878 +0200
82 -+++ b/bindings/python3/Makefile.am 2016-09-11 12:44:22.385788941 +0200
83 -@@ -26,7 +26,7 @@
84 - # This seems wrong and lme to me, but see issue #298
85 - pkgpypathdir=$(pythondir)
86 - pkgpypath_PYTHON = \
87 -- linkgrammar.pth
88 -+ $(srcdir)/linkgrammar.pth
89 -
90 - # These are packaged in the tarball; make clean should not remove them.
91 - maintainer-clean-local:
92
93 diff --git a/dev-libs/link-grammar/link-grammar-5.3.11.ebuild b/dev-libs/link-grammar/link-grammar-5.3.11.ebuild
94 deleted file mode 100644
95 index ddab5316ca1..00000000000
96 --- a/dev-libs/link-grammar/link-grammar-5.3.11.ebuild
97 +++ /dev/null
98 @@ -1,143 +0,0 @@
99 -# Copyright 1999-2020 Gentoo Authors
100 -# Distributed under the terms of the GNU General Public License v2
101 -
102 -EAPI=6
103 -GNOME2_LA_PUNT="yes"
104 -PYTHON_COMPAT=( python3_6 )
105 -
106 -inherit autotools eutils gnome2 java-pkg-opt-2 python-r1
107 -
108 -DESCRIPTION="A Syntactic English parser"
109 -HOMEPAGE="https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/"
110 -SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
111 -
112 -LICENSE="LGPL-2.1"
113 -SLOT="0"
114 -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
115 -IUSE="aspell +hunspell java python static-libs threads" # pcre
116 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
117 -
118 -# XXX: sqlite is automagic
119 -# Does not build with >=sci-mathematics/minisat-2, bug #593662
120 -# add pcre support: pcre? ( dev-libs/libpcre )
121 -RDEPEND="
122 - dev-db/sqlite:3
123 - aspell? ( app-text/aspell )
124 - hunspell? ( app-text/hunspell )
125 - java? (
126 - >=virtual/jdk-1.6:*
127 - dev-java/ant-core )
128 - python? ( ${PYTHON_DEPS} )
129 - !sci-mathematics/minisat
130 -"
131 -DEPEND="${RDEPEND}
132 - dev-lang/swig:0
133 - sys-devel/autoconf-archive
134 - virtual/pkgconfig
135 -"
136 -
137 -NORMAL_BUILD_DIR="${WORKDIR}/${P}-normal"
138 -
139 -pkg_setup() {
140 - if use aspell && use hunspell; then
141 - ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist,"
142 - ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if"
143 - ewarn "you want aspell support."
144 - fi
145 - use java && java-pkg-opt-2_pkg_setup
146 -}
147 -
148 -src_prepare() {
149 - use java && java-pkg-opt-2_src_prepare
150 -
151 - # http://bugzilla.abisource.com/show_bug.cgi?id=13806
152 - eapply "${FILESDIR}"/${PN}-5.3.9-out-of-source-build.patch
153 - eapply_user
154 - eautoreconf
155 -
156 - if use python ; then
157 - prepare_python() {
158 - mkdir -p "${BUILD_DIR}" || die
159 - }
160 - python_foreach_impl prepare_python
161 - fi
162 -
163 - mkdir -p "${NORMAL_BUILD_DIR}" || die
164 - gnome2_src_prepare
165 -}
166 -
167 -src_configure() {
168 - local myconf=(
169 - --disable-editline
170 - --disable-perl-bindings
171 - --enable-shared
172 - --enable-sat-solver=bundled
173 - $(use_enable aspell)
174 - $(use_enable hunspell)
175 - $(usex hunspell --with-hunspell-dictdir=/usr/share/myspell)
176 - $(use_enable java java-bindings)
177 - # $(use_enable pcre regex-tokenizer)
178 - # $(use_with pcre)
179 - $(use_enable static-libs static)
180 - $(use_enable threads pthreads)
181 - )
182 -
183 - cd "${NORMAL_BUILD_DIR}" || die
184 - ECONF_SOURCE="${S}" gnome2_src_configure \
185 - --disable-python-bindings \
186 - --disable-python3-bindings \
187 - ${myconf[@]}
188 -
189 - if use python ; then
190 - prepare_python() {
191 - ECONF_SOURCE="${S}" gnome2_src_configure \
192 - --disable-python-bindings \
193 - --enable-python3-bindings \
194 - ${myconf[@]}
195 - }
196 - python_foreach_impl run_in_build_dir prepare_python
197 - fi
198 -}
199 -
200 -src_compile() {
201 - cd "${NORMAL_BUILD_DIR}" || die
202 - gnome2_src_compile
203 -
204 - if use python ; then
205 - compile_binding() {
206 - emake -C bindings/python3 \
207 - VPATH="${S}:${NORMAL_BUILD_DIR}" \
208 - _clinkgrammar_la_DEPENDENCIES="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la \
209 - _clinkgrammar_la_LIBADD="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la
210 - }
211 - python_foreach_impl run_in_build_dir compile_binding
212 - fi
213 -}
214 -
215 -src_test() {
216 - cd "${NORMAL_BUILD_DIR}" || die
217 - ln -s "${S}"/data tests/data || die
218 - emake check
219 -}
220 -
221 -src_install() {
222 - cd "${NORMAL_BUILD_DIR}" || die
223 - gnome2_src_install
224 -
225 - if use python ; then
226 - install_binding() {
227 - emake -C bindings/python3 \
228 - VPATH="${S}:${NORMAL_BUILD_DIR}" \
229 - _clinkgrammar_la_DEPENDENCIES="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la \
230 - _clinkgrammar_la_LIBADD="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la \
231 - DESTDIR="${D}" \
232 - install
233 - }
234 - python_foreach_impl run_in_build_dir install_binding
235 - fi
236 -}
237 -
238 -pkg_preinst() {
239 - use java && java-pkg-opt-2_pkg_preinst
240 - gnome2_pkg_preinst
241 -}