1 |
commit: 15e2a359852b0253e6249d8215494123de9529cc |
2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 27 21:18:51 2017 +0000 |
4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 27 21:19:18 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15e2a359 |
7 |
|
8 |
sci-mathematics/glpk: bump. |
9 |
|
10 |
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=626224 |
11 |
Package-Manager: portage-2.3.6 |
12 |
|
13 |
sci-mathematics/glpk/Manifest | 1 + |
14 |
.../files/glpk-4.63-debundle-system-libs.patch | 94 ++++++++++++++++++++++ |
15 |
sci-mathematics/glpk/glpk-4.63.ebuild | 62 ++++++++++++++ |
16 |
3 files changed, 157 insertions(+) |
17 |
|
18 |
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest |
19 |
index 4cd6181920b..871b1b8e1ea 100644 |
20 |
--- a/sci-mathematics/glpk/Manifest |
21 |
+++ b/sci-mathematics/glpk/Manifest |
22 |
@@ -5,3 +5,4 @@ DIST glpk-4.55.tar.gz 3424345 SHA256 37090d7f16796ec1034496e182a39d5cc8bb7c9fb5d |
23 |
DIST glpk-4.57.tar.gz 3782998 SHA256 7323b2a7cc1f13e45fc845f0fdca74f4daea2af716f5ad2d4d55b41e8394275c SHA512 1979e59b96ce359168a81b720207045916f66c5755023b02c2e197e5a713d456165d94f1e40830547dc072de865f94e3b3a4d8e66d5d15aeb93f304f1893fe48 WHIRLPOOL 225760810ae9efbff31d0238dff08d966db5167e9b61a79f960d03b6d6bdaa2ed7d9b1e7608a99418d5346d3e8ddbe8b58f0d561aaacb292decf235b821fbc62 |
24 |
DIST glpk-4.60.tar.gz 4160915 SHA256 1356620cb0a0d33ac3411dd49d9fd40d53ece73eaec8f6b8d19a77887ff5e297 SHA512 521bc48c588318fe6075eb66b1c43465200039f64b105b4a24f9f6eb9bb4742c7ebc96750ce999f64c60d6531486476386467dd41e949f1a00cba0cf00fbe20a WHIRLPOOL dfde976f9a32ba1751d1a0748c21023e0df802a1f22501c70091cbfb273bde8b73951eceb2a0768bc5634d6786c1cdb109e36af78e72ac7825fa9743737721f4 |
25 |
DIST glpk-4.61.tar.gz 4116291 SHA256 9866de41777782d4ce21da11b88573b66bb7858574f89c28be6967ac22dfaba9 SHA512 0bcf89b62a2b3f565356b7ae538c5af6f3b4283234827c4212284d4924ce93980f6971f51313f1c08790e23e860771545dc58fdb8b35405d37404589683f40a1 WHIRLPOOL 01228c555ba7d17668a35a80bdf37dba00a1a105291288aa5ebef43c3ea3999e81042e0f98b5bfbfd7d44804a79014281120aaf10ca181be1b0615b97925407c |
26 |
+DIST glpk-4.63.tar.gz 4131787 SHA256 914d27f1a51c2bf4a51f1bd4a507f875fcca99db7b219380b836a25b29b3e7f6 SHA512 3ee9b9ec5322282a9c62b2ee209fc7760383a6a764ef3816445ffb66f15ed4d00309bff1b98d50c243b58aa74f83072afde45c389799e637e11e86f4db45276c WHIRLPOOL 30facc4776e3db4232ff2924452ee0601bda78b3888f162a12e84af2f2232fbcbd986a9e849a6ce38fa19688c45eb6c6852ca76cc277ea5324e8a55fe899088e |
27 |
|
28 |
diff --git a/sci-mathematics/glpk/files/glpk-4.63-debundle-system-libs.patch b/sci-mathematics/glpk/files/glpk-4.63-debundle-system-libs.patch |
29 |
new file mode 100644 |
30 |
index 00000000000..e836219d0ad |
31 |
--- /dev/null |
32 |
+++ b/sci-mathematics/glpk/files/glpk-4.63-debundle-system-libs.patch |
33 |
@@ -0,0 +1,94 @@ |
34 |
+Remove suitesparse (camd,colamd) and zlib bundles |
35 |
+bicatali - apr 2014 |
36 |
+Updated for 4.57 by soap (Jan 2016) |
37 |
+Updated for 4.60 by bicatali (Dec 2016) |
38 |
+Updated for 4.63 by bicatali (Jul 2017) |
39 |
+ |
40 |
+diff -Nuar --exclude '*.orig' --exclude '*.rej' --exclude '*~' glpk-4.63.orig/configure.ac glpk-4.63/configure.ac |
41 |
+--- glpk-4.63.orig/configure.ac 2017-07-25 00:00:00.000000000 -0700 |
42 |
++++ glpk-4.63/configure.ac 2017-07-27 14:10:47.986520907 -0700 |
43 |
+@@ -69,6 +69,11 @@ |
44 |
+ dnl Check for math library |
45 |
+ AC_CHECK_LIB([m], [exp]) |
46 |
+ |
47 |
++AC_CHECK_LIB([amd], [amd_1]) |
48 |
++AC_CHECK_LIB([colamd], [colamd]) |
49 |
++AC_CHECK_HEADER([amd.h]) |
50 |
++AC_CHECK_LIB([z], [gzopen]) |
51 |
++ |
52 |
+ dnl Check for <sys/time.h> header |
53 |
+ AC_CHECK_HEADER([sys/time.h], |
54 |
+ AC_DEFINE([HAVE_SYS_TIME_H], [1], [N/A])) |
55 |
+diff -Nuar --exclude '*.orig' --exclude '*.rej' --exclude '*~' glpk-4.63.orig/src/Makefile.am glpk-4.63/src/Makefile.am |
56 |
+--- glpk-4.63.orig/src/Makefile.am 2017-07-25 00:00:00.000000000 -0700 |
57 |
++++ glpk-4.63/src/Makefile.am 2017-07-27 14:11:30.841536062 -0700 |
58 |
+@@ -6,18 +6,15 @@ |
59 |
+ |
60 |
+ libglpk_la_CPPFLAGS = \ |
61 |
+ -I$(srcdir) \ |
62 |
+--I$(srcdir)/amd \ |
63 |
+ -I$(srcdir)/api \ |
64 |
+ -I$(srcdir)/bflib \ |
65 |
+ -I$(srcdir)/cglib \ |
66 |
+--I$(srcdir)/colamd \ |
67 |
+ -I$(srcdir)/env \ |
68 |
+ -I$(srcdir)/minisat \ |
69 |
+ -I$(srcdir)/misc \ |
70 |
+ -I$(srcdir)/mpl \ |
71 |
+ -I$(srcdir)/proxy \ |
72 |
+--I$(srcdir)/simplex \ |
73 |
+--I$(srcdir)/zlib |
74 |
++-I$(srcdir)/simplex |
75 |
+ |
76 |
+ libglpk_la_LDFLAGS = \ |
77 |
+ -version-info 42:2:2 \ |
78 |
+@@ -57,18 +54,6 @@ |
79 |
+ glpssx01.c \ |
80 |
+ glpssx02.c \ |
81 |
+ lux.c \ |
82 |
+-amd/amd_1.c \ |
83 |
+-amd/amd_2.c \ |
84 |
+-amd/amd_aat.c \ |
85 |
+-amd/amd_control.c \ |
86 |
+-amd/amd_defaults.c \ |
87 |
+-amd/amd_dump.c \ |
88 |
+-amd/amd_info.c \ |
89 |
+-amd/amd_order.c \ |
90 |
+-amd/amd_post_tree.c \ |
91 |
+-amd/amd_postorder.c \ |
92 |
+-amd/amd_preprocess.c \ |
93 |
+-amd/amd_valid.c \ |
94 |
+ api/advbas.c \ |
95 |
+ api/asnhall.c \ |
96 |
+ api/asnlp.c \ |
97 |
+@@ -142,7 +127,6 @@ |
98 |
+ cglib/gmigen.c \ |
99 |
+ cglib/mirgen.c \ |
100 |
+ cglib/spv.c \ |
101 |
+-colamd/colamd.c \ |
102 |
+ env/alloc.c \ |
103 |
+ env/dlsup.c \ |
104 |
+ env/env.c \ |
105 |
+@@ -196,21 +180,6 @@ |
106 |
+ simplex/spxprob.c \ |
107 |
+ simplex/spychuzc.c \ |
108 |
+ simplex/spychuzr.c \ |
109 |
+-simplex/spydual.c \ |
110 |
+-zlib/adler32.c \ |
111 |
+-zlib/compress.c \ |
112 |
+-zlib/crc32.c \ |
113 |
+-zlib/deflate.c \ |
114 |
+-zlib/gzclose.c \ |
115 |
+-zlib/gzlib.c \ |
116 |
+-zlib/gzread.c \ |
117 |
+-zlib/gzwrite.c \ |
118 |
+-zlib/inffast.c \ |
119 |
+-zlib/inflate.c \ |
120 |
+-zlib/inftrees.c \ |
121 |
+-zlib/trees.c \ |
122 |
+-zlib/uncompr.c \ |
123 |
+-zlib/zio.c \ |
124 |
+-zlib/zutil.c |
125 |
++simplex/spydual.c |
126 |
+ |
127 |
+ ## eof ## |
128 |
|
129 |
diff --git a/sci-mathematics/glpk/glpk-4.63.ebuild b/sci-mathematics/glpk/glpk-4.63.ebuild |
130 |
new file mode 100644 |
131 |
index 00000000000..9c15f085e03 |
132 |
--- /dev/null |
133 |
+++ b/sci-mathematics/glpk/glpk-4.63.ebuild |
134 |
@@ -0,0 +1,62 @@ |
135 |
+# Copyright 1999-2017 Gentoo Foundation |
136 |
+# Distributed under the terms of the GNU General Public License v2 |
137 |
+ |
138 |
+EAPI=6 |
139 |
+ |
140 |
+inherit autotools flag-o-matic toolchain-funcs |
141 |
+ |
142 |
+DESCRIPTION="GNU Linear Programming Kit" |
143 |
+LICENSE="GPL-3" |
144 |
+HOMEPAGE="https://www.gnu.org/software/glpk/" |
145 |
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" |
146 |
+ |
147 |
+SLOT="0/40" |
148 |
+IUSE="doc examples gmp odbc mysql static-libs" |
149 |
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" |
150 |
+ |
151 |
+RDEPEND=" |
152 |
+ sci-libs/amd:0= |
153 |
+ sci-libs/colamd:= |
154 |
+ sys-libs/zlib:0= |
155 |
+ gmp? ( dev-libs/gmp:0= ) |
156 |
+ mysql? ( virtual/mysql ) |
157 |
+ odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )" |
158 |
+DEPEND="${RDEPEND} |
159 |
+ virtual/pkgconfig" |
160 |
+ |
161 |
+PATCHES=( |
162 |
+ "${FILESDIR}"/${PN}-4.63-debundle-system-libs.patch |
163 |
+) |
164 |
+ |
165 |
+src_prepare() { |
166 |
+ use odbc && [[ -z $(type -P odbc_config) ]] && \ |
167 |
+ append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc) |
168 |
+ |
169 |
+ default |
170 |
+ eautoreconf |
171 |
+} |
172 |
+ |
173 |
+src_configure() { |
174 |
+ local myconf |
175 |
+ if use mysql || use odbc; then |
176 |
+ myconf="--enable-dl" |
177 |
+ else |
178 |
+ myconf="--disable-dl" |
179 |
+ fi |
180 |
+ |
181 |
+ econf ${myconf} \ |
182 |
+ $(use_enable mysql) \ |
183 |
+ $(use_enable odbc) \ |
184 |
+ $(use_enable static-libs static) \ |
185 |
+ $(use_with gmp) |
186 |
+} |
187 |
+ |
188 |
+src_install() { |
189 |
+ default |
190 |
+ if use examples; then |
191 |
+ insinto /usr/share/doc/${PF} |
192 |
+ doins -r examples |
193 |
+ docompress -x /usr/share/doc/${PF}/examples |
194 |
+ fi |
195 |
+ use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt |
196 |
+} |