1 |
commit: 16f2c13fa964bad248df33231fb2fff2a6b6e5ad |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 29 09:41:31 2016 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 29 10:16:43 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16f2c13f |
7 |
|
8 |
dev-libs/gecode: revision bump fixing numerous QA violations |
9 |
|
10 |
* Add missing dependencies |
11 |
|
12 |
* Avoid hard-coded CFLAGS |
13 |
|
14 |
* Do not install examples to system root |
15 |
|
16 |
* Install HTML documentation to the correct directory |
17 |
|
18 |
* Remove unused test USE flag |
19 |
|
20 |
* Do not allow sci-libs/mpir as a runtime alternative to sci-libs/mpir. This |
21 |
can only be selected at build time. |
22 |
|
23 |
* Force building libgecodegist.so against Qt 4 again. Careful consideration must |
24 |
be given to reverse dependencies before switching to Qt 5 due to the potential |
25 |
for symbol collisions and ABI breakage. Additionally, the existing approach |
26 |
is not valid because Qt versions are not interchangeable at runtime. |
27 |
|
28 |
Gentoo-bug: 488150 |
29 |
Gentoo-bug: 595442 |
30 |
|
31 |
Package-Manager: portage-2.3.1 |
32 |
|
33 |
.../gecode/files/gecode-4.4.0-no-examples.patch | 18 +++++ |
34 |
dev-libs/gecode/gecode-4.4.0-r1.ebuild | 82 ++++++++++++++++++++++ |
35 |
2 files changed, 100 insertions(+) |
36 |
|
37 |
diff --git a/dev-libs/gecode/files/gecode-4.4.0-no-examples.patch b/dev-libs/gecode/files/gecode-4.4.0-no-examples.patch |
38 |
new file mode 100644 |
39 |
index 00000000..2653566 |
40 |
--- /dev/null |
41 |
+++ b/dev-libs/gecode/files/gecode-4.4.0-no-examples.patch |
42 |
@@ -0,0 +1,18 @@ |
43 |
+Avoid installing examples to system root. |
44 |
+ |
45 |
+Patch from Fedora. |
46 |
+ |
47 |
+Gentoo-bug: 488150 |
48 |
+ |
49 |
+--- a/Makefile.in |
50 |
++++ b/Makefile.in |
51 |
+@@ -953,8 +953,7 @@ |
52 |
+ ALLGECODEHDR = \ |
53 |
+ $(SUPPORTHDR) $(KERNELHDR) $(SEARCHHDR) \ |
54 |
+ $(INTHDR) $(FLOATHDR) $(SETHDR) $(MMHDR) \ |
55 |
+- $(DRIVERHDR) $(ITERHDR) $(GISTHDR) $(FLATZINCHDR) \ |
56 |
+- $(INTEXAMPLEHDR) |
57 |
++ $(DRIVERHDR) $(ITERHDR) $(GISTHDR) $(FLATZINCHDR) |
58 |
+ ALLHDR = \ |
59 |
+ $(ALLGECODEHDR) $(THIRDHDR) |
60 |
+ ALLOBJ0 = $(ALLSRC:%.cpp=%$(OBJSUFFIX)) \ |
61 |
|
62 |
diff --git a/dev-libs/gecode/gecode-4.4.0-r1.ebuild b/dev-libs/gecode/gecode-4.4.0-r1.ebuild |
63 |
new file mode 100644 |
64 |
index 00000000..f43e46b |
65 |
--- /dev/null |
66 |
+++ b/dev-libs/gecode/gecode-4.4.0-r1.ebuild |
67 |
@@ -0,0 +1,82 @@ |
68 |
+# Copyright 1999-2016 Gentoo Foundation |
69 |
+# Distributed under the terms of the GNU General Public License v2 |
70 |
+# $Id$ |
71 |
+ |
72 |
+EAPI=6 |
73 |
+ |
74 |
+inherit autotools qmake-utils |
75 |
+ |
76 |
+DESCRIPTION="An environment for developing constraint-based applications" |
77 |
+HOMEPAGE="http://www.gecode.org/" |
78 |
+SRC_URI="http://www.gecode.org/download/${P}.tar.gz" |
79 |
+ |
80 |
+LICENSE="MIT" |
81 |
+SLOT="0" |
82 |
+KEYWORDS="~amd64 ~x86" |
83 |
+IUSE="doc examples gist gmp" |
84 |
+ |
85 |
+RDEPEND=" |
86 |
+ gist? ( |
87 |
+ dev-qt/qtcore:4 |
88 |
+ dev-qt/qtgui:4 |
89 |
+ ) |
90 |
+ gmp? ( |
91 |
+ dev-libs/gmp:0 |
92 |
+ dev-libs/mpfr:0 |
93 |
+ )" |
94 |
+DEPEND="${RDEPEND} |
95 |
+ sys-devel/bison |
96 |
+ sys-devel/flex |
97 |
+ doc? ( |
98 |
+ app-doc/doxygen |
99 |
+ media-gfx/graphviz |
100 |
+ )" |
101 |
+ |
102 |
+PATCHES=( "${FILESDIR}/${PN}-4.4.0-no-examples.patch" ) |
103 |
+ |
104 |
+src_prepare() { |
105 |
+ default |
106 |
+ |
107 |
+ sed -i gecode.m4 \ |
108 |
+ -e "s/-ggdb//" -e "s/-O3//" -e "s/-pipe//" \ |
109 |
+ -e "/AC_CHECK_PROGS(QMAKE/a AC_SUBST(QMAKE,$(qt4_get_bindir)/qmake)" \ |
110 |
+ -e "/AC_CHECK_PROGS(MOC/a AC_SUBST(MOC,$(qt4_get_bindir)/moc)" \ |
111 |
+ || die |
112 |
+ |
113 |
+ eautoreconf |
114 |
+} |
115 |
+ |
116 |
+src_configure() { |
117 |
+ # --disable-examples prevents COMPILING the examples. |
118 |
+ econf \ |
119 |
+ --docdir="/usr/share/doc/${PF}" \ |
120 |
+ --htmldir="/usr/share/doc/${PF}" \ |
121 |
+ --disable-examples \ |
122 |
+ $(use_enable doc doc-dot) \ |
123 |
+ $(use_enable doc doc-tagfile) \ |
124 |
+ $(use_enable gist qt) \ |
125 |
+ $(use_enable gist) \ |
126 |
+ $(use_enable gmp mpfr) |
127 |
+} |
128 |
+ |
129 |
+src_compile() { |
130 |
+ default |
131 |
+ use doc && emake doc |
132 |
+} |
133 |
+ |
134 |
+src_test() { |
135 |
+ LD_LIBRARY_PATH="${S}" emake test |
136 |
+ LD_LIBRARY_PATH="${S}" ./test/test || die "test suite failed" |
137 |
+} |
138 |
+ |
139 |
+src_install() { |
140 |
+ default |
141 |
+ |
142 |
+ # The --docdir and --htmldir that we pass to configure don't seem to |
143 |
+ # be respected... |
144 |
+ use doc && dodoc -r doc/html/ |
145 |
+ |
146 |
+ if use examples; then |
147 |
+ dodoc -r examples |
148 |
+ fi |
149 |
+} |