| 1 |
commit: c2fce046409a4776133f79c0a52979f4d3dc0278 |
| 2 |
Author: Mark Wright <gienah <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 11 12:10:08 2019 +0000 |
| 4 |
Commit: Mark Wright <gienah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 11 12:10:08 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2fce046 |
| 7 |
|
| 8 |
sci-mathematics/e: Bump to 2.3, fix HOMEPAGE and SRC_URI |
| 9 |
|
| 10 |
Thanks to yuLya for reporting, Ian Zimmerman for finding the homepage. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/680690 |
| 13 |
Package-Manager: Portage-2.3.75, Repoman-2.3.17 |
| 14 |
Signed-off-by: Mark Wright <gienah <AT> gentoo.org> |
| 15 |
|
| 16 |
sci-mathematics/e/Manifest | 3 +- |
| 17 |
sci-mathematics/e/e-1.5.ebuild | 127 ----------------------- |
| 18 |
sci-mathematics/e/e-1.6.ebuild | 127 ----------------------- |
| 19 |
sci-mathematics/e/e-2.3.ebuild | 75 +++++++++++++ |
| 20 |
sci-mathematics/e/files/e-2.3-build-system.patch | 8 ++ |
| 21 |
5 files changed, 84 insertions(+), 256 deletions(-) |
| 22 |
|
| 23 |
diff --git a/sci-mathematics/e/Manifest b/sci-mathematics/e/Manifest |
| 24 |
index dd492916287..13f262a533c 100644 |
| 25 |
--- a/sci-mathematics/e/Manifest |
| 26 |
+++ b/sci-mathematics/e/Manifest |
| 27 |
@@ -1,3 +1,2 @@ |
| 28 |
-DIST E-1.5.tgz 1689077 BLAKE2B cff108cae0924d288227e106e9798d204ce5334b7cc9be67763980b26389c4dae735592f06d5f4a9f29bf1e6cf7e281a3d3cd4de9f7222596ad714ff163c3230 SHA512 a2534c9e278741fed2f0005f5fa2b4ea60d71babd4e38c207a48f496df6916bf9ff4bf0ba41ae899eaeeeec7235ff1d759629dbcb627dd8766168f9bc98a4894 |
| 29 |
-DIST E-1.6.tgz 1627003 BLAKE2B 3c2ee24d716968802dff81f749a0b8425bbb836823aaf6609804866af417b06ce0042bceb5d2d9399a7eb26c155832d51658af5a1deccd49bcec8ae6380fdc9b SHA512 769aa4d04595181285be49c1f21d7e8a47936fab78b5d6f2975910a64d4928cd2be97d781c4092dadab48d213a6bc788b8247a2310cf71042b1339129fe0cdf2 |
| 30 |
DIST E-1.8.tgz 1832975 BLAKE2B ebac17f157f591874107009d1ad45d03449c8d440f3ad6dabda308193775cd69d01f6ffb159ef8acbc73fbd41e5b38f2eb61a1c734d638d4a045e068cc63fc90 SHA512 1b4358c636e8ea564ca942e1221e78234a9f0f793991f637bd7ec4d92eb9aa4a408a14c707405271fc017a9d63884d70bdfb0ed1b878383a1a44cfa57a7bdd51 |
| 31 |
+DIST E-2.3.tgz 2176351 BLAKE2B cb234d5d6ed9d098b9f1b3def44de570c2014dd017e2e39de58bfe8ea47f539008e30213eab78c61e042d04529cfdbc647706ae71707e306cf51f5189c5dad30 SHA512 9e0f22a174f9f0fae401d8556d0b825c17d06e48e40d027003a89ff8cc637e3a14e14af70e6a65ecf2a11a52d59388c6c36b129a123511b958c152f58fd06a16 |
| 32 |
|
| 33 |
diff --git a/sci-mathematics/e/e-1.5.ebuild b/sci-mathematics/e/e-1.5.ebuild |
| 34 |
deleted file mode 100644 |
| 35 |
index 82fd6f490d9..00000000000 |
| 36 |
--- a/sci-mathematics/e/e-1.5.ebuild |
| 37 |
+++ /dev/null |
| 38 |
@@ -1,127 +0,0 @@ |
| 39 |
-# Copyright 1999-2012 Gentoo Foundation |
| 40 |
-# Distributed under the terms of the GNU General Public License v2 |
| 41 |
- |
| 42 |
-EAPI="5" |
| 43 |
- |
| 44 |
-MY_PN="E" |
| 45 |
-MY_P="${MY_PN}-${PV}" |
| 46 |
- |
| 47 |
-DESCRIPTION="E is a theorem prover for full first-order logic with equality" |
| 48 |
-HOMEPAGE="http://www4.informatik.tu-muenchen.de/~schulz/E/E.html" |
| 49 |
-SRC_URI="http://www4.in.tum.de/~schulz/WORK/E_DOWNLOAD/V_${PV}/${MY_PN}.tgz -> ${MY_P}.tgz" |
| 50 |
- |
| 51 |
-LICENSE="GPL-2" |
| 52 |
-SLOT="0/${PV}" |
| 53 |
-KEYWORDS="~amd64 ~x86" |
| 54 |
-IUSE="doc examples isabelle" |
| 55 |
- |
| 56 |
-RDEPEND="isabelle? ( |
| 57 |
- >=sci-mathematics/isabelle-2011.1-r1:= |
| 58 |
- )" |
| 59 |
-DEPEND="${RDEPEND}" |
| 60 |
- |
| 61 |
-S="${WORKDIR}"/${MY_PN} |
| 62 |
- |
| 63 |
-src_configure() { |
| 64 |
- ./configure --prefix="${ROOT}usr" \ |
| 65 |
- --man-prefix="${ROOT}share/man" \ |
| 66 |
- || die "E configure failed" |
| 67 |
- |
| 68 |
- sed -e "s@CFLAGS = @CFLAGS = ${CFLAGS} @" \ |
| 69 |
- -e "s@LD = \$(CC) @LD = \$(CC) ${LDFLAGS} @" \ |
| 70 |
- -i "${S}/Makefile.vars" \ |
| 71 |
- || die "Could not add our flags to Makefile.vars" |
| 72 |
-} |
| 73 |
- |
| 74 |
-src_install() { |
| 75 |
- for i in "${S}/PROVER/eprover" \ |
| 76 |
- "${S}/PROVER/epclextract" \ |
| 77 |
- "${S}/PROVER/eproof" \ |
| 78 |
- "${S}/PROVER/eproof_ram" \ |
| 79 |
- "${S}/PROVER/eground" \ |
| 80 |
- "${S}/PROVER/e_ltb_runner" \ |
| 81 |
- "${S}/PROVER/e_axfilter" \ |
| 82 |
- "${S}/PROVER/checkproof" \ |
| 83 |
- "${S}/PROVER/ekb_create" \ |
| 84 |
- "${S}/PROVER/ekb_delete" \ |
| 85 |
- "${S}/PROVER/ekb_ginsert" \ |
| 86 |
- "${S}/PROVER/ekb_insert" |
| 87 |
- do |
| 88 |
- dobin "${i}" |
| 89 |
- done |
| 90 |
- |
| 91 |
- for i in "${S}/DOC/man/eprover.1" \ |
| 92 |
- "${S}/DOC/man/epclextract.1" \ |
| 93 |
- "${S}/DOC/man/eproof.1" \ |
| 94 |
- "${S}/DOC/man/eproof_ram.1" \ |
| 95 |
- "${S}/DOC/man/eground.1" \ |
| 96 |
- "${S}/DOC/man/e_ltb_runner.1" \ |
| 97 |
- "${S}/DOC/man/e_axfilter.1" \ |
| 98 |
- "${S}/DOC/man/checkproof.1" \ |
| 99 |
- "${S}/DOC/man/ekb_create.1" \ |
| 100 |
- "${S}/DOC/man/ekb_delete.1" \ |
| 101 |
- "${S}/DOC/man/ekb_ginsert.1" \ |
| 102 |
- "${S}/DOC/man/ekb_insert.1" |
| 103 |
- do |
| 104 |
- doman "${i}" |
| 105 |
- done |
| 106 |
- |
| 107 |
- if use doc; then |
| 108 |
- pushd "${S}"/DOC || die "Could not cd to DOC" |
| 109 |
- dodoc ANNOUNCE CREDITS DONE E-REMARKS E-REMARKS.english E-USERS \ |
| 110 |
- HISTORY NEWS PORTING ReadMe THINKME TODO TPTP_SUBMISSION \ |
| 111 |
- WISHLIST eprover.pdf |
| 112 |
- dohtml *.html |
| 113 |
- insinto /usr/share/doc/${PF}/html |
| 114 |
- doins estyle.sty |
| 115 |
- popd |
| 116 |
- fi |
| 117 |
- |
| 118 |
- if use examples; then |
| 119 |
- dodir /usr/share/${MY_PN}/examples |
| 120 |
- insinto /usr/share/${MY_PN}/examples |
| 121 |
- doins -r EXAMPLE_PROBLEMS |
| 122 |
- doins -r SIMPLE_APPS |
| 123 |
- fi |
| 124 |
- |
| 125 |
- if use isabelle; then |
| 126 |
- ISABELLE_HOME="$(isabelle getenv ISABELLE_HOME | cut -d'=' -f 2)" \ |
| 127 |
- || die "isabelle getenv ISABELLE_HOME failed" |
| 128 |
- [[ -n "${ISABELLE_HOME}" ]] || die "ISABELLE_HOME empty" |
| 129 |
- dodir "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc" |
| 130 |
- cat <<- EOF >> "${S}/settings" |
| 131 |
- E_HOME="${ROOT}usr/bin" |
| 132 |
- E_VERSION="${PV}" |
| 133 |
- EOF |
| 134 |
- insinto "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc" |
| 135 |
- doins "${S}/settings" |
| 136 |
- fi |
| 137 |
-} |
| 138 |
- |
| 139 |
-pkg_postinst() { |
| 140 |
- if use isabelle; then |
| 141 |
- if [ -f "${ROOT}etc/isabelle/components" ]; then |
| 142 |
- if egrep "contrib/${PN}-[0-9.]*" "${ROOT}etc/isabelle/components"; then |
| 143 |
- sed -e "/contrib\/${PN}-[0-9.]*/d" \ |
| 144 |
- -i "${ROOT}etc/isabelle/components" |
| 145 |
- fi |
| 146 |
- cat <<- EOF >> "${ROOT}etc/isabelle/components" |
| 147 |
- contrib/${PN}-${PV} |
| 148 |
- EOF |
| 149 |
- fi |
| 150 |
- fi |
| 151 |
-} |
| 152 |
- |
| 153 |
-pkg_postrm() { |
| 154 |
- if use isabelle; then |
| 155 |
- if [ ! -f "${ROOT}usr/bin/eproof" ]; then |
| 156 |
- if [ -f "${ROOT}etc/isabelle/components" ]; then |
| 157 |
- # Note: this sed should only match the version of this ebuild |
| 158 |
- # Which is what we want as we do not want to remove the line |
| 159 |
- # of a new E being installed during an upgrade. |
| 160 |
- sed -e "/contrib\/${PN}-${PV}/d" \ |
| 161 |
- -i "${ROOT}etc/isabelle/components" |
| 162 |
- fi |
| 163 |
- fi |
| 164 |
- fi |
| 165 |
-} |
| 166 |
|
| 167 |
diff --git a/sci-mathematics/e/e-1.6.ebuild b/sci-mathematics/e/e-1.6.ebuild |
| 168 |
deleted file mode 100644 |
| 169 |
index 39cde267248..00000000000 |
| 170 |
--- a/sci-mathematics/e/e-1.6.ebuild |
| 171 |
+++ /dev/null |
| 172 |
@@ -1,127 +0,0 @@ |
| 173 |
-# Copyright 1999-2013 Gentoo Foundation |
| 174 |
-# Distributed under the terms of the GNU General Public License v2 |
| 175 |
- |
| 176 |
-EAPI="5" |
| 177 |
- |
| 178 |
-MY_PN="E" |
| 179 |
-MY_P="${MY_PN}-${PV}" |
| 180 |
- |
| 181 |
-DESCRIPTION="E is a theorem prover for full first-order logic with equality" |
| 182 |
-HOMEPAGE="http://www4.informatik.tu-muenchen.de/~schulz/E/E.html" |
| 183 |
-SRC_URI="http://www4.in.tum.de/~schulz/WORK/E_DOWNLOAD/V_${PV}/${MY_PN}.tgz -> ${MY_P}.tgz" |
| 184 |
- |
| 185 |
-LICENSE="GPL-2" |
| 186 |
-SLOT="0/${PV}" |
| 187 |
-KEYWORDS="~amd64 ~x86" |
| 188 |
-IUSE="doc examples isabelle" |
| 189 |
- |
| 190 |
-RDEPEND="isabelle? ( |
| 191 |
- >=sci-mathematics/isabelle-2011.1-r1:= |
| 192 |
- )" |
| 193 |
-DEPEND="${RDEPEND}" |
| 194 |
- |
| 195 |
-S="${WORKDIR}"/${MY_PN} |
| 196 |
- |
| 197 |
-src_configure() { |
| 198 |
- ./configure --prefix="${ROOT}usr" \ |
| 199 |
- --man-prefix="${ROOT}share/man" \ |
| 200 |
- || die "E configure failed" |
| 201 |
- |
| 202 |
- sed -e "s@CFLAGS = @CFLAGS = ${CFLAGS} @" \ |
| 203 |
- -e "s@LD = \$(CC) @LD = \$(CC) ${LDFLAGS} @" \ |
| 204 |
- -i "${S}/Makefile.vars" \ |
| 205 |
- || die "Could not add our flags to Makefile.vars" |
| 206 |
-} |
| 207 |
- |
| 208 |
-src_install() { |
| 209 |
- for i in "${S}/PROVER/eprover" \ |
| 210 |
- "${S}/PROVER/epclextract" \ |
| 211 |
- "${S}/PROVER/eproof" \ |
| 212 |
- "${S}/PROVER/eproof_ram" \ |
| 213 |
- "${S}/PROVER/eground" \ |
| 214 |
- "${S}/PROVER/e_ltb_runner" \ |
| 215 |
- "${S}/PROVER/e_axfilter" \ |
| 216 |
- "${S}/PROVER/checkproof" \ |
| 217 |
- "${S}/PROVER/ekb_create" \ |
| 218 |
- "${S}/PROVER/ekb_delete" \ |
| 219 |
- "${S}/PROVER/ekb_ginsert" \ |
| 220 |
- "${S}/PROVER/ekb_insert" |
| 221 |
- do |
| 222 |
- dobin "${i}" |
| 223 |
- done |
| 224 |
- |
| 225 |
- for i in "${S}/DOC/man/eprover.1" \ |
| 226 |
- "${S}/DOC/man/epclextract.1" \ |
| 227 |
- "${S}/DOC/man/eproof.1" \ |
| 228 |
- "${S}/DOC/man/eproof_ram.1" \ |
| 229 |
- "${S}/DOC/man/eground.1" \ |
| 230 |
- "${S}/DOC/man/e_ltb_runner.1" \ |
| 231 |
- "${S}/DOC/man/e_axfilter.1" \ |
| 232 |
- "${S}/DOC/man/checkproof.1" \ |
| 233 |
- "${S}/DOC/man/ekb_create.1" \ |
| 234 |
- "${S}/DOC/man/ekb_delete.1" \ |
| 235 |
- "${S}/DOC/man/ekb_ginsert.1" \ |
| 236 |
- "${S}/DOC/man/ekb_insert.1" |
| 237 |
- do |
| 238 |
- doman "${i}" |
| 239 |
- done |
| 240 |
- |
| 241 |
- if use doc; then |
| 242 |
- pushd "${S}"/DOC || die "Could not cd to DOC" |
| 243 |
- dodoc ANNOUNCE CREDITS DONE E-REMARKS E-REMARKS.english E-USERS \ |
| 244 |
- HISTORY NEWS PORTING ReadMe THINKME TODO TPTP_SUBMISSION \ |
| 245 |
- WISHLIST eprover.pdf |
| 246 |
- dohtml *.html |
| 247 |
- insinto /usr/share/doc/${PF}/html |
| 248 |
- doins estyle.sty |
| 249 |
- popd |
| 250 |
- fi |
| 251 |
- |
| 252 |
- if use examples; then |
| 253 |
- dodir /usr/share/${MY_PN}/examples |
| 254 |
- insinto /usr/share/${MY_PN}/examples |
| 255 |
- doins -r EXAMPLE_PROBLEMS |
| 256 |
- doins -r SIMPLE_APPS |
| 257 |
- fi |
| 258 |
- |
| 259 |
- if use isabelle; then |
| 260 |
- ISABELLE_HOME="$(isabelle getenv ISABELLE_HOME | cut -d'=' -f 2)" \ |
| 261 |
- || die "isabelle getenv ISABELLE_HOME failed" |
| 262 |
- [[ -n "${ISABELLE_HOME}" ]] || die "ISABELLE_HOME empty" |
| 263 |
- dodir "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc" |
| 264 |
- cat <<- EOF >> "${S}/settings" |
| 265 |
- E_HOME="${ROOT}usr/bin" |
| 266 |
- E_VERSION="${PV}" |
| 267 |
- EOF |
| 268 |
- insinto "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc" |
| 269 |
- doins "${S}/settings" |
| 270 |
- fi |
| 271 |
-} |
| 272 |
- |
| 273 |
-pkg_postinst() { |
| 274 |
- if use isabelle; then |
| 275 |
- if [ -f "${ROOT}etc/isabelle/components" ]; then |
| 276 |
- if egrep "contrib/${PN}-[0-9.]*" "${ROOT}etc/isabelle/components"; then |
| 277 |
- sed -e "/contrib\/${PN}-[0-9.]*/d" \ |
| 278 |
- -i "${ROOT}etc/isabelle/components" |
| 279 |
- fi |
| 280 |
- cat <<- EOF >> "${ROOT}etc/isabelle/components" |
| 281 |
- contrib/${PN}-${PV} |
| 282 |
- EOF |
| 283 |
- fi |
| 284 |
- fi |
| 285 |
-} |
| 286 |
- |
| 287 |
-pkg_postrm() { |
| 288 |
- if use isabelle; then |
| 289 |
- if [ ! -f "${ROOT}usr/bin/eproof" ]; then |
| 290 |
- if [ -f "${ROOT}etc/isabelle/components" ]; then |
| 291 |
- # Note: this sed should only match the version of this ebuild |
| 292 |
- # Which is what we want as we do not want to remove the line |
| 293 |
- # of a new E being installed during an upgrade. |
| 294 |
- sed -e "/contrib\/${PN}-${PV}/d" \ |
| 295 |
- -i "${ROOT}etc/isabelle/components" |
| 296 |
- fi |
| 297 |
- fi |
| 298 |
- fi |
| 299 |
-} |
| 300 |
|
| 301 |
diff --git a/sci-mathematics/e/e-2.3.ebuild b/sci-mathematics/e/e-2.3.ebuild |
| 302 |
new file mode 100644 |
| 303 |
index 00000000000..2b9f7875941 |
| 304 |
--- /dev/null |
| 305 |
+++ b/sci-mathematics/e/e-2.3.ebuild |
| 306 |
@@ -0,0 +1,75 @@ |
| 307 |
+# Copyright 1999-2019 Gentoo Authors |
| 308 |
+# Distributed under the terms of the GNU General Public License v2 |
| 309 |
+ |
| 310 |
+EAPI="7" |
| 311 |
+ |
| 312 |
+MY_PN="E" |
| 313 |
+MY_P="${MY_PN}-${PV}" |
| 314 |
+ |
| 315 |
+DESCRIPTION="E is a theorem prover for full first-order logic with equality" |
| 316 |
+HOMEPAGE="https://wwwlehre.dhbw-stuttgart.de/~sschulz/E/E.html" |
| 317 |
+SRC_URI="http://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${PV}/${MY_PN}.tgz -> ${MY_P}.tgz" |
| 318 |
+LICENSE="GPL-2" |
| 319 |
+SLOT="0/${PV}" |
| 320 |
+KEYWORDS="~amd64 ~x86" |
| 321 |
+IUSE="doc examples" |
| 322 |
+ |
| 323 |
+RDEPEND="" |
| 324 |
+DEPEND="${RDEPEND} |
| 325 |
+ doc? ( dev-texlive/texlive-latex )" |
| 326 |
+ |
| 327 |
+S="${WORKDIR}"/${MY_PN} |
| 328 |
+ |
| 329 |
+PATCHES=( "${FILESDIR}"/${PN}-2.3-build-system.patch ) |
| 330 |
+ |
| 331 |
+src_prepare() { |
| 332 |
+ default |
| 333 |
+ rm -f DOC/eprover.pdf |
| 334 |
+} |
| 335 |
+ |
| 336 |
+src_configure() { |
| 337 |
+ ./configure --prefix="${ED}/usr" \ |
| 338 |
+ --man-prefix="${ED}/usr/share/man" \ |
| 339 |
+ || die "E configure failed" |
| 340 |
+ |
| 341 |
+ sed -e "s@CFLAGS = @CFLAGS = ${CFLAGS} @" \ |
| 342 |
+ -e "s@LD = \$(CC) @LD = \$(CC) ${LDFLAGS} @" \ |
| 343 |
+ -i "${S}/Makefile.vars" \ |
| 344 |
+ || die "Could not add our flags to Makefile.vars" |
| 345 |
+} |
| 346 |
+ |
| 347 |
+src_compile() { |
| 348 |
+ default |
| 349 |
+ use doc && emake documentation |
| 350 |
+} |
| 351 |
+ |
| 352 |
+src_install() { |
| 353 |
+ default |
| 354 |
+ |
| 355 |
+ local DOCS=( |
| 356 |
+ "README.md" |
| 357 |
+ "DOC/ANNOUNCE" |
| 358 |
+ "DOC/CONTRIBUTORS" |
| 359 |
+ "DOC/DONE" |
| 360 |
+ "DOC/E-REMARKS" |
| 361 |
+ "DOC/E-REMARKS.english" |
| 362 |
+ "DOC/E-USERS" |
| 363 |
+ "DOC/HISTORY" |
| 364 |
+ "DOC/NEWS" |
| 365 |
+ "DOC/PORTING" |
| 366 |
+ "DOC/ReadMe" |
| 367 |
+ "DOC/THINKME" |
| 368 |
+ "DOC/TODO" |
| 369 |
+ "DOC/TPTP_SUBMISSION" |
| 370 |
+ "DOC/WISHLIST" |
| 371 |
+ "DOC/eprover.pdf" |
| 372 |
+ ) |
| 373 |
+ local HTML_DOCS=( "DOC" ) |
| 374 |
+ einstalldocs |
| 375 |
+ |
| 376 |
+ if use examples; then |
| 377 |
+ insinto /usr/share/${MY_PN}/examples |
| 378 |
+ doins -r EXAMPLE_PROBLEMS |
| 379 |
+ doins -r SIMPLE_APPS |
| 380 |
+ fi |
| 381 |
+} |
| 382 |
|
| 383 |
diff --git a/sci-mathematics/e/files/e-2.3-build-system.patch b/sci-mathematics/e/files/e-2.3-build-system.patch |
| 384 |
new file mode 100644 |
| 385 |
index 00000000000..8031c20e026 |
| 386 |
--- /dev/null |
| 387 |
+++ b/sci-mathematics/e/files/e-2.3-build-system.patch |
| 388 |
@@ -0,0 +1,8 @@ |
| 389 |
+--- E-orig/development_tools/e_install 2019-03-13 04:55:13.000000000 +1100 |
| 390 |
++++ E/development_tools/e_install 2019-09-11 21:11:37.628045114 +1000 |
| 391 |
+@@ -13,4 +13,4 @@ |
| 392 |
+ fi |
| 393 |
+ } |
| 394 |
+ |
| 395 |
+-testinstall $1 $2 |
| 396 |
++install $1 $2 |
Archives