1 |
commit: 6f692f268fdb5ab506c6a31519c78c33083c9f12 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 21 10:45:51 2016 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 21 10:45:51 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f692f26 |
7 |
|
8 |
dev-libs/link-grammar: Fix java dependency and ensure all phases from eclasses are really executed (#574872), it needs swig (#574888), and a few more fixes and cosmetic things |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
|
12 |
...r-5.3.3.ebuild => link-grammar-5.3.3-r1.ebuild} | 55 ++++++++++++---------- |
13 |
1 file changed, 29 insertions(+), 26 deletions(-) |
14 |
|
15 |
diff --git a/dev-libs/link-grammar/link-grammar-5.3.3.ebuild b/dev-libs/link-grammar/link-grammar-5.3.3-r1.ebuild |
16 |
similarity index 53% |
17 |
rename from dev-libs/link-grammar/link-grammar-5.3.3.ebuild |
18 |
rename to dev-libs/link-grammar/link-grammar-5.3.3-r1.ebuild |
19 |
index dbbbfc4..50dcbac 100644 |
20 |
--- a/dev-libs/link-grammar/link-grammar-5.3.3.ebuild |
21 |
+++ b/dev-libs/link-grammar/link-grammar-5.3.3-r1.ebuild |
22 |
@@ -3,9 +3,11 @@ |
23 |
# $Id$ |
24 |
|
25 |
EAPI=5 |
26 |
+GCONF_DEBUG="no" |
27 |
+GNOME2_LA_PUNT="yes" |
28 |
PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
29 |
|
30 |
-inherit eutils gnome2 java-pkg-opt-2 python-any-r1 |
31 |
+inherit autotools eutils gnome2 java-pkg-opt-2 python-any-r1 |
32 |
|
33 |
DESCRIPTION="A Syntactic English parser" |
34 |
HOMEPAGE="http://www.abisource.com/projects/link-grammar/ http://www.link.cs.cmu.edu/link/" |
35 |
@@ -15,51 +17,52 @@ LICENSE="LGPL-2.1" |
36 |
SLOT="0" |
37 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
38 |
|
39 |
-IUSE="aspell +hunspell +java python static-libs threads" |
40 |
+IUSE="aspell +hunspell java python static-libs threads" |
41 |
|
42 |
-DEPEND=" |
43 |
+RDEPEND=" |
44 |
aspell? ( app-text/aspell ) |
45 |
hunspell? ( app-text/hunspell ) |
46 |
- java? ( >=virtual/jdk-1.6:= |
47 |
- dev-java/ant-core ) |
48 |
- ${PYTHON_DEPS}" |
49 |
+ java? ( |
50 |
+ >=virtual/jdk-1.6:* |
51 |
+ dev-java/ant-core ) |
52 |
+ python? ( ${PYTHON_DEPS} ) |
53 |
+" |
54 |
+DEPEND="${RDEPEND} |
55 |
+ dev-lang/swig:0 |
56 |
+" |
57 |
|
58 |
-RDEPEND="${DEPEND}" |
59 |
+S="${WORKDIR}/${PN}-${P}" |
60 |
|
61 |
pkg_setup() { |
62 |
- if use java; then |
63 |
- java-pkg-opt-2_pkg_setup |
64 |
- fi |
65 |
if use aspell && use hunspell; then |
66 |
ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist," |
67 |
- ewarn "only aspell will be build. Press Ctrl+C and set only 'hunspell' USE flag if" |
68 |
- ewarn "you want hunspell support." |
69 |
+ ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if" |
70 |
+ ewarn "you want aspell support." |
71 |
fi |
72 |
-} |
73 |
- |
74 |
-src_unpack() { |
75 |
- unpack ${A} |
76 |
- S=${WORKDIR}/${PN}-${P} |
77 |
+ use java && java-pkg-opt-2_pkg_setup |
78 |
+ use python && python-any-r1_pkg_setup |
79 |
} |
80 |
|
81 |
src_prepare() { |
82 |
- if use java; then |
83 |
- java-pkg-opt-2_src_prepare |
84 |
- fi |
85 |
- ./autogen.sh || die |
86 |
+ use java && java-pkg-opt-2_src_prepare |
87 |
+ AT_M4DIR="ac-helpers/" eautoreconf |
88 |
+ gnome2_src_prepare |
89 |
} |
90 |
|
91 |
src_configure() { |
92 |
- local myconf |
93 |
- |
94 |
- use hunspell && myconf="${myconf} --with-hunspell-dictdir=/usr/share/myspell" |
95 |
gnome2_src_configure \ |
96 |
+ --disable-perl-bindings \ |
97 |
--enable-shared \ |
98 |
$(use_enable aspell) \ |
99 |
$(use_enable hunspell) \ |
100 |
+ $(usex hunspell --with-hunspell-dictdir=/usr/share/myspell) \ |
101 |
$(use_enable java java-bindings) \ |
102 |
$(use_enable python python-bindings) \ |
103 |
$(use_enable static-libs static) \ |
104 |
- $(use_enable threads pthreads) \ |
105 |
- ${myconf} |
106 |
+ $(use_enable threads pthreads) |
107 |
+} |
108 |
+ |
109 |
+pkg_preinst() { |
110 |
+ use java && java-pkg-opt-2_pkg_preinst |
111 |
+ gnome2_pkg_preinst |
112 |
} |