1 |
commit: ff64a19e56dfc971e4feea4ab86c36c1651c7340 |
2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 7 16:39:50 2020 +0000 |
4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 8 12:20:37 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff64a19e |
7 |
|
8 |
sci-libs/coinor-vol: new EAPI=7 version 1.5.4. |
9 |
|
10 |
A standard version/EAPI bump, with the usual coinor-* weirdness now |
11 |
somewhat documented. Portage is complaining about the precompressed |
12 |
example data, but I think that's a portage problem since I've |
13 |
explicitly excluded it with "docompress -x". |
14 |
|
15 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
16 |
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> |
17 |
|
18 |
sci-libs/coinor-vol/Manifest | 2 +- |
19 |
sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild | 68 ------------------------ |
20 |
sci-libs/coinor-vol/coinor-vol-1.5.4.ebuild | 82 +++++++++++++++++++++++++++++ |
21 |
3 files changed, 83 insertions(+), 69 deletions(-) |
22 |
|
23 |
diff --git a/sci-libs/coinor-vol/Manifest b/sci-libs/coinor-vol/Manifest |
24 |
index e0e1c257f50..d3fe7651453 100644 |
25 |
--- a/sci-libs/coinor-vol/Manifest |
26 |
+++ b/sci-libs/coinor-vol/Manifest |
27 |
@@ -1 +1 @@ |
28 |
-DIST Vol-1.4.4.tgz 3205621 BLAKE2B 187b8522d6fbcc287e3eb63e00553d2f90bb7c9add17e2ed604cef3e2ab2ba214a0d6e27ecd28457a983d0d11193ba31914f5defd841848fb9c2486d80ca4935 SHA512 20e04efac09694ddfa035496ec9b2920ef702e5a2ec4515cd88c52129c783efd3c25e044e6c2cec67ad800b297ebd03f3c3c377f58829790109d8d6dcb40cc39 |
29 |
+DIST coinor-vol-1.5.4.tar.gz 983625 BLAKE2B b1c78f94d1232d773aa325227ac01ad469d3ff56571119ae95ddb9a34eb7d55d004111e81dc89bb4bae1b5754da29cd4e93983772e158afa131a4da0b187b03c SHA512 ba489b909dab45a9a48a32804a571fc9ad966b268ce8a81a391a743b523bce393bd649aaf15c51f401267fe05fb2ff7623a1f7208c0b9d6c24af9b659a230780 |
30 |
|
31 |
diff --git a/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild b/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild |
32 |
deleted file mode 100644 |
33 |
index ea1df608c97..00000000000 |
34 |
--- a/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,68 +0,0 @@ |
37 |
-# Copyright 1999-2019 Gentoo Authors |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI=5 |
41 |
- |
42 |
-inherit autotools-utils multilib |
43 |
- |
44 |
-MYPN=Vol |
45 |
- |
46 |
-DESCRIPTION="COIN-OR Volume algorithm linear programming solver" |
47 |
-HOMEPAGE="https://projects.coin-or.org/Vol" |
48 |
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz" |
49 |
- |
50 |
-LICENSE="EPL-1.0" |
51 |
-SLOT="0/1" |
52 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
53 |
-IUSE="doc examples static-libs test" |
54 |
-RESTRICT="!test? ( test )" |
55 |
- |
56 |
-RDEPEND=" |
57 |
- sci-libs/coinor-osi:= |
58 |
- sci-libs/coinor-utils:=" |
59 |
-DEPEND="${RDEPEND} |
60 |
- virtual/pkgconfig |
61 |
- doc? ( app-doc/doxygen[dot] ) |
62 |
- test? ( sci-libs/coinor-sample )" |
63 |
- |
64 |
-S="${WORKDIR}/${MYPN}-${PV}/${MYPN}" |
65 |
- |
66 |
-src_prepare() { |
67 |
- # needed for the --with-coin-instdir |
68 |
- dodir /usr |
69 |
- sed -i \ |
70 |
- -e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \ |
71 |
- configure || die |
72 |
- autotools-utils_src_prepare |
73 |
-} |
74 |
- |
75 |
-src_configure() { |
76 |
- local myeconfargs=( |
77 |
- --enable-dependency-linking |
78 |
- --with-coin-instdir="${ED}"/usr |
79 |
- $(use_with doc dot) |
80 |
- ) |
81 |
- autotools-utils_src_configure |
82 |
-} |
83 |
- |
84 |
-src_compile() { |
85 |
- # hack for parallel build, to overcome not patching Makefile.am above |
86 |
- autotools-utils_src_compile -C src libVol.la |
87 |
- autotools-utils_src_compile all $(usex doc doxydoc "") |
88 |
-} |
89 |
- |
90 |
-src_test() { |
91 |
- autotools-utils_src_test test |
92 |
-} |
93 |
- |
94 |
-src_install() { |
95 |
- use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/") |
96 |
- autotools-utils_src_install -C src install-am |
97 |
- autotools-utils_src_install |
98 |
- # already installed |
99 |
- rm "${ED}"/usr/share/coin/doc/${MYPN}/{README,AUTHORS,LICENSE} || die |
100 |
- if use examples; then |
101 |
- insinto /usr/share/doc/${PF} |
102 |
- doins -r examples |
103 |
- fi |
104 |
-} |
105 |
|
106 |
diff --git a/sci-libs/coinor-vol/coinor-vol-1.5.4.ebuild b/sci-libs/coinor-vol/coinor-vol-1.5.4.ebuild |
107 |
new file mode 100644 |
108 |
index 00000000000..53276b0f38c |
109 |
--- /dev/null |
110 |
+++ b/sci-libs/coinor-vol/coinor-vol-1.5.4.ebuild |
111 |
@@ -0,0 +1,82 @@ |
112 |
+# Copyright 1999-2020 Gentoo Authors |
113 |
+# Distributed under the terms of the GNU General Public License v2 |
114 |
+ |
115 |
+EAPI=7 |
116 |
+ |
117 |
+MY_PN=Vol |
118 |
+ |
119 |
+DESCRIPTION="COIN-OR volume algorithm linear program solver" |
120 |
+HOMEPAGE="https://github.com/coin-or/Vol/" |
121 |
+SRC_URI="https://github.com/coin-or/${MY_PN}/archive/releases/${PV}.tar.gz |
122 |
+ -> ${P}.tar.gz" |
123 |
+LICENSE="EPL-1.0" |
124 |
+ |
125 |
+# major soname component |
126 |
+SLOT="0/1" |
127 |
+ |
128 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
129 |
+IUSE="doc examples static-libs test" |
130 |
+RESTRICT="!test? ( test )" |
131 |
+ |
132 |
+# Fortran is NOT needed, but the ./configure scripts for all of the CoinOR |
133 |
+# packages contain a check for it. Gentoo bug 601648 and upstream issue, |
134 |
+# |
135 |
+# https://github.com/coin-or/CoinUtils/issues/132 |
136 |
+# |
137 |
+BDEPEND="virtual/fortran |
138 |
+ virtual/pkgconfig |
139 |
+ doc? ( app-doc/doxygen[dot] ) |
140 |
+ test? ( sci-libs/coinor-sample )" |
141 |
+ |
142 |
+DEPEND="sci-libs/coinor-osi:= |
143 |
+ sci-libs/coinor-utils:=" |
144 |
+RDEPEND="${DEPEND}" |
145 |
+ |
146 |
+S="${WORKDIR}/${MY_PN}-releases-${PV}/${MY_PN}" |
147 |
+ |
148 |
+src_prepare() { |
149 |
+ # Needed to make the --with-coin-instdir in src_configure happy. |
150 |
+ dodir /usr |
151 |
+ |
152 |
+ # They don't need to guess at this, but they do, and get it wrong... |
153 |
+ sed -e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \ |
154 |
+ -i configure \ |
155 |
+ || die "failed to fix the pkgconfig path in ${S}/configure" |
156 |
+ |
157 |
+ default |
158 |
+} |
159 |
+ |
160 |
+src_configure() { |
161 |
+ local myeconfargs=( |
162 |
+ --enable-dependency-linking |
163 |
+ --with-coin-instdir="${ED}/usr" |
164 |
+ $(use_with doc dot) |
165 |
+ ) |
166 |
+ |
167 |
+ econf "${myeconfargs[@]}" |
168 |
+} |
169 |
+ |
170 |
+src_compile() { |
171 |
+ emake all $(usex doc doxydoc "") |
172 |
+} |
173 |
+ |
174 |
+src_test() { |
175 |
+ # NOT redundant! The build system has a "make check" target that does |
176 |
+ # nothing, so if you don't specify "test" here, you'll get a no-op. |
177 |
+ emake test |
178 |
+} |
179 |
+ |
180 |
+src_install() { |
181 |
+ use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/") |
182 |
+ |
183 |
+ emake DESTDIR="${D}" install |
184 |
+ |
185 |
+ # Duplicate junk, and in the wrong location. |
186 |
+ rm -r "${ED}/usr/share/coin/doc/${MY_PN}" || die |
187 |
+ |
188 |
+ # Portage still throws a warning for these, but it's a bug |
189 |
+ # as far as I can tell: https://bugs.gentoo.org/721516 |
190 |
+ docompress -x "/usr/share/doc/${PF}/examples/Volume-LP/data.mps.gz" |
191 |
+ docompress -x "/usr/share/doc/${PF}/examples/VolUfl/data.gz" |
192 |
+ use examples && dodoc -r examples |
193 |
+} |