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