From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- dev-lang/qu-prolog/Manifest | 7 ++ .../files/qu-prolog-10.0-associated-item.patch | 11 +++ .../qu-prolog/files/qu-prolog-10.0-configure.patch | 21 +++++ dev-lang/qu-prolog/files/qu-prolog-10.0-gcc6.patch | 38 ++++++++ dev-lang/qu-prolog/files/qu-prolog-10.0-qt5.patch | 35 +++++++ dev-lang/qu-prolog/metadata.xml | 11 +++ dev-lang/qu-prolog/qu-prolog-10.0-r1.ebuild | 101 +++++++++++++++++++++ 7 files changed, 224 insertions(+) create mode 100644 dev-lang/qu-prolog/Manifest create mode 100644 dev-lang/qu-prolog/files/qu-prolog-10.0-associated-item.patch create mode 100644 dev-lang/qu-prolog/files/qu-prolog-10.0-configure.patch create mode 100644 dev-lang/qu-prolog/files/qu-prolog-10.0-gcc6.patch create mode 100644 dev-lang/qu-prolog/files/qu-prolog-10.0-qt5.patch create mode 100644 dev-lang/qu-prolog/metadata.xml create mode 100644 dev-lang/qu-prolog/qu-prolog-10.0-r1.ebuild (limited to 'dev-lang/qu-prolog') diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest new file mode 100644 index 000000000000..902f3d440918 --- /dev/null +++ b/dev-lang/qu-prolog/Manifest @@ -0,0 +1,7 @@ +AUX qu-prolog-10.0-associated-item.patch 335 BLAKE2B f80af03e270ca823452a8fe88e83d915d394d9ba7d043d3afdee5bdb7bfdce1bdb1b268a13b65c024f75005b78126f1f0ae04c6eda7aba234acc47fd51a64298 SHA512 3b4cefaecacb1e1fb8df8804f198563e99ee69b2ffbdc421e56fb34faeb5ed1a87809b4acf917999ac5e25982e522c8b08775cf9bcf1c01675a77521d372913f +AUX qu-prolog-10.0-configure.patch 518 BLAKE2B f63f876b8b3048e74092bf398df89f951e976019e548e3563506c20aa69e9a08bd7d21a8a13240c7416a0b5edd592c8d86b43e13586acaa2366770729cf578b7 SHA512 85e484b8086054166740dd757b95547179afa5c199c240b43dcef531aeedd812f4fcb35003a888708c90db5d7bb1ffd22cf9bef1fd31f339ec0894ddde365cd9 +AUX qu-prolog-10.0-gcc6.patch 906 BLAKE2B 5d1e1b7632faa993c2a0bfc087cce0d73ed33e65997615aec0c053dbf2905e58506fbeed3934a4944ad0309bfbffc748285a75095ef5483703e33250cb617cc1 SHA512 bbf5a1d5749964bc5c0e8e530de3729bf1666e541f908ddc66debc696a6b6b4dc55373ef788348f02e33aa58afa5a350f7be866bfb1e4c31c917f334e9dc9ca6 +AUX qu-prolog-10.0-qt5.patch 1037 BLAKE2B d66f62aee4ad43eb400d33895c5222b6ccaa407dbb33d44326f7d29375b57ee846d90d48708915a31a9586481f354e65c93b2f7da06ccd2e49ab984850ec74e7 SHA512 8c82d180adfc290885273dd4dafbbb7cdcca3c2854854401f1123dd562699490c8fd77a54a5707425c852871091074ed4bbefa96b53782dbb06b6c1c57dfce53 +DIST qp10.0.tar.gz 1521469 BLAKE2B ab293e5b14529c3714ba123c5f37f7fe2ac4f6238ebaca00fa7781407ccf7df67515b1b6b3c80a358fae5988c799bf16b8f02eb52a9b3a690b155a150ac90063 SHA512 491ef9cc01f0d34163d47163b3103dcbd52cc5672f64057b898c2d234384ac2e3b64b4e59a1795765ff92de4c97ebdb11a82d394213685c387e4dd7d598c5c60 +EBUILD qu-prolog-10.0-r1.ebuild 2060 BLAKE2B fd1e87efd1d94a7e182b0a0e5d9d3c1e7a47dc14c63c1ccc53c3bf0f96aff4124300eab160c608a583b65eec0a63fb0f7f95e19cfc31650657e6a20985c50b92 SHA512 ed36521f4ac5148fa11526bd07037b46daa4bb3027c8e4e8d8b089397611e975abb334842d6717a7b513cdfcb8f813a85beaf3226ee4385742e0768f34fd606c +MISC metadata.xml 347 BLAKE2B d0d2ead501a46ff84953eceee649d58e406ebf5a83e7b7862b9501b2e665ad71b5c9c31f4790161074debb7b86ce7e53ff8d0904c39c37ddcac6250668685aca SHA512 7a7bb3ccaa42fa120c3702d963719d5fdfcf0a413685cad98bd34a515a4cc83a213a71e7f3b6b0ce67947fa347229caecf699879192f0d930c9c6577e0ce59cc diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.0-associated-item.patch b/dev-lang/qu-prolog/files/qu-prolog-10.0-associated-item.patch new file mode 100644 index 000000000000..d5e992d51c26 --- /dev/null +++ b/dev-lang/qu-prolog/files/qu-prolog-10.0-associated-item.patch @@ -0,0 +1,11 @@ +--- qp10.0.orig/src/objects.h 2016-06-07 02:54:35.000000000 +0200 ++++ qp10.0/src/objects.h 2016-10-03 18:26:49.924782008 +0200 +@@ -1210,7 +1210,7 @@ + << this->getName() << "\" "; + + #ifndef WIN32 +- switch (hasAssociatedItem()) ++ switch (tag & AssociatedMask) + { + case AssociatedNone: + std::cerr << "(no info)"; diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.0-configure.patch b/dev-lang/qu-prolog/files/qu-prolog-10.0-configure.patch new file mode 100644 index 000000000000..b3c109613912 --- /dev/null +++ b/dev-lang/qu-prolog/files/qu-prolog-10.0-configure.patch @@ -0,0 +1,21 @@ +--- qp10.0.orig/configure 2016-06-07 02:54:42.000000000 +0200 ++++ qp10.0/configure 2016-10-03 18:30:22.360786524 +0200 +@@ -2256,12 +2256,16 @@ + # + # Check for addtional command line options. + # +-DEBUGGING=" -DNDEBUG " + # Check whether --enable-debug was given. + if test "${enable_debug+set}" = set; then : +- enableval=$enable_debug; DEBUGGING= ++ enableval=$enable_debug; + fi + ++if test "$enable_debug" = yes; then ++ DEBUGGING= ++else ++ DEBUGGING=" -DNDEBUG " ++fi + + + # Single versus multiple thread configuraation. diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.0-gcc6.patch b/dev-lang/qu-prolog/files/qu-prolog-10.0-gcc6.patch new file mode 100644 index 000000000000..626a15b5de99 --- /dev/null +++ b/dev-lang/qu-prolog/files/qu-prolog-10.0-gcc6.patch @@ -0,0 +1,38 @@ +--- qp10.0/src/io_qp.h.old 2016-10-12 02:50:04.343499674 -0400 ++++ qp10.0/src/io_qp.h 2016-10-12 02:50:10.605264154 -0400 +@@ -662,7 +662,7 @@ + + bool seekp(streampos pos, ios::seekdir d = ios::beg) + { +- return stream->seekp(pos, d); ++ return !stream->seekp(pos, d).fail(); + } + + bool put(char ch) +@@ -736,7 +736,7 @@ + + bool seekp(streampos pos, ios::seekdir d = ios::beg) + { +- return stream.seekp(pos, d); ++ return !stream.seekp(pos, d).fail(); + } + + bool put(char ch) +@@ -816,7 +816,7 @@ + + bool seekp(streampos pos, ios::seekdir d = ios::beg) + { +- return stream.seekp(pos, d); ++ return !stream.seekp(pos, d).fail(); + } + + bool put(char ch); +@@ -876,7 +876,7 @@ + + bool seekp(streampos pos, ios::seekdir d = ios::beg) + { +- return stream.seekp(pos, d); ++ return !stream.seekp(pos, d).fail(); + } + + bool put(char ch); diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.0-qt5.patch b/dev-lang/qu-prolog/files/qu-prolog-10.0-qt5.patch new file mode 100644 index 000000000000..d82e78cada16 --- /dev/null +++ b/dev-lang/qu-prolog/files/qu-prolog-10.0-qt5.patch @@ -0,0 +1,35 @@ +diff -ur qp10.0.orig/src/xqp/term.cc qp10.0/src/xqp/term.cc +--- qp10.0.orig/src/xqp/term.cc 2008-07-09 07:32:37.000000000 +0200 ++++ qp10.0/src/xqp/term.cc 2018-01-27 14:06:54.101545854 +0100 +@@ -38,7 +38,7 @@ + + bool graphic_char(QChar c) + { +- switch (c.toAscii()) ++ switch (c.toLatin1()) + { + case '-': + case '/': +diff -ur qp10.0.orig/src/xqp/xqp.cc qp10.0/src/xqp/xqp.cc +--- qp10.0.orig/src/xqp/xqp.cc 2011-07-14 01:08:42.000000000 +0200 ++++ qp10.0/src/xqp/xqp.cc 2018-01-27 14:07:53.902543353 +0100 +@@ -167,7 +167,7 @@ + + void Xqp::send_cmd_to_qp(QString cmd) + { +- write(qp_stdin, cmd.toAscii(), cmd.length()); ++ write(qp_stdin, cmd.toLatin1(), cmd.length()); + } + + +diff -ur qp10.0.orig/src/xqp/xqp.pro qp10.0/src/xqp/xqp.pro +--- qp10.0.orig/src/xqp/xqp.pro 2008-07-09 07:32:37.000000000 +0200 ++++ qp10.0/src/xqp/xqp.pro 2018-01-27 14:01:24.764559627 +0100 +@@ -4,6 +4,7 @@ + + TEMPLATE = app + INCLUDEPATH += . ++QT += widgets + + # Input + HEADERS += interact.h qpconfig.h qthelp.h term.h xqp.h xqpqueries.h diff --git a/dev-lang/qu-prolog/metadata.xml b/dev-lang/qu-prolog/metadata.xml new file mode 100644 index 000000000000..8f04a5fdaa28 --- /dev/null +++ b/dev-lang/qu-prolog/metadata.xml @@ -0,0 +1,11 @@ + + + + + prolog@gentoo.org + Prolog + + + Pedro subscription/notification communications system + + diff --git a/dev-lang/qu-prolog/qu-prolog-10.0-r1.ebuild b/dev-lang/qu-prolog/qu-prolog-10.0-r1.ebuild new file mode 100644 index 000000000000..6506c3bce9f2 --- /dev/null +++ b/dev-lang/qu-prolog/qu-prolog-10.0-r1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit eutils multilib qmake-utils + +MY_P=qp${PV} + +DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions" +HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html" +SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz" + +LICENSE="Apache-2.0 GPL-2+" +SLOT="0" +KEYWORDS="amd64 ppc x86" +IUSE="debug doc examples pedro qt5 readline threads" + +RDEPEND=" + !dev-util/mpatch + !dev-util/rej + !games-rpg/kqlives + qt5? ( + dev-qt/qtwidgets:5 + dev-qt/qtgui:5 + ) + pedro? ( net-misc/pedro ) + readline? ( app-misc/rlwrap )" +DEPEND="${RDEPEND} + dev-lang/perl" + +S="${WORKDIR}"/${MY_P} + +src_prepare() { + epatch "${FILESDIR}"/${P}-configure.patch + epatch "${FILESDIR}"/${P}-associated-item.patch + epatch "${FILESDIR}"/${P}-gcc6.patch + epatch "${FILESDIR}"/${P}-qt5.patch +} + +src_configure() { + econf \ + --libdir=/usr/$(get_libdir) \ + $(use_enable debug) \ + $(use_enable threads multiple-threads) + + if use qt5; then + cd "${S}"/src/xqp || die + eqmake5 xqp.pro + fi +} + +src_compile() { + emake OPTIMISATION="${CXXFLAGS}" + + if use qt5; then + cd "${S}"/src/xqp || die + emake + fi +} + +src_install() { + sed \ + -e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \ + -i bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die + + dobin bin/{qc,qecat,qp,kq} + + use qt5 && dobin src/xqp/xqp + + into /usr/$(get_libdir)/${PN} + dobin bin/{qa,qc1.qup,qdeal,qem,qg,ql,qppp} + + insinto /usr/$(get_libdir)/${PN}/bin + doins bin/rl_commands + doins bin/{qc1.qup,qecat,qg,qp}.qx + + insinto /usr/$(get_libdir)/${PN}/library + doins prolog/library/*.qo + + insinto /usr/$(get_libdir)/${PN}/compiler + doins prolog/compiler/*.qo + + doman doc/man/man1/*.1 + + dodoc README + + if use doc ; then + docinto reference-manual + dodoc doc/manual/*.html + docinto user-guide + dodoc doc/user/main.pdf + fi + + if use examples ; then + insinto /usr/share/doc/${PF}/examples + doins examples/*.ql + docinto examples + newdoc examples/README README.examples + fi +} -- cgit v1.2.3