public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/qu-prolog/, dev-lang/qu-prolog/files/
@ 2016-10-03 16:42 Keri Harris
  0 siblings, 0 replies; 6+ messages in thread
From: Keri Harris @ 2016-10-03 16:42 UTC (permalink / raw
  To: gentoo-commits

commit:     71d148bdef2578ba433562e8994963abcdc00843
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  3 16:41:49 2016 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Mon Oct  3 16:41:49 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71d148bd

dev-lang/qu-prolog: build-time fixes for USE=debug

 .../files/qu-prolog-10.0-associated-item.patch      | 11 +++++++++++
 .../qu-prolog/files/qu-prolog-10.0-configure.patch  | 21 +++++++++++++++++++++
 dev-lang/qu-prolog/qu-prolog-10.0.ebuild            |  5 +++++
 3 files changed, 37 insertions(+)

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 00000000..d5e992d
--- /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 00000000..b3c1096
--- /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/qu-prolog-10.0.ebuild b/dev-lang/qu-prolog/qu-prolog-10.0.ebuild
index 14d1f11..4914f07 100644
--- a/dev-lang/qu-prolog/qu-prolog-10.0.ebuild
+++ b/dev-lang/qu-prolog/qu-prolog-10.0.ebuild
@@ -28,6 +28,11 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/${MY_P}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-configure.patch
+	epatch "${FILESDIR}"/${P}-associated-item.patch
+}
+
 src_configure() {
 	econf \
 		--libdir=/usr/$(get_libdir) \


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/qu-prolog/, dev-lang/qu-prolog/files/
@ 2016-10-20 10:04 Keri Harris
  0 siblings, 0 replies; 6+ messages in thread
From: Keri Harris @ 2016-10-20 10:04 UTC (permalink / raw
  To: gentoo-commits

commit:     ea50a5c77edf7bbd82ddf026a90c77c4865bb740
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 20 10:03:09 2016 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 10:03:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea50a5c7

dev-lang/qu-prolog: fix compile with GCCv6

Package-Manager: portage-2.3.0

 dev-lang/qu-prolog/files/qu-prolog-10.0-gcc6.patch | 38 ++++++++++++++++++++++
 dev-lang/qu-prolog/qu-prolog-10.0.ebuild           |  1 +
 2 files changed, 39 insertions(+)

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 00000000..626a15b
--- /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/qu-prolog-10.0.ebuild b/dev-lang/qu-prolog/qu-prolog-10.0.ebuild
index 4914f07..bb4fb1f 100644
--- a/dev-lang/qu-prolog/qu-prolog-10.0.ebuild
+++ b/dev-lang/qu-prolog/qu-prolog-10.0.ebuild
@@ -31,6 +31,7 @@ S="${WORKDIR}"/${MY_P}
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-configure.patch
 	epatch "${FILESDIR}"/${P}-associated-item.patch
+	epatch "${FILESDIR}"/${P}-gcc6.patch
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/qu-prolog/, dev-lang/qu-prolog/files/
@ 2017-10-29 17:36 Keri Harris
  0 siblings, 0 replies; 6+ messages in thread
From: Keri Harris @ 2017-10-29 17:36 UTC (permalink / raw
  To: gentoo-commits

commit:     4853a0a4bf999eedf284a019f3a358d9840fefbc
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 29 17:35:55 2017 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun Oct 29 17:36:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4853a0a4

dev-lang/qu-prolog: remove old versions

Package-Manager: Portage-2.3.8, Repoman-2.3.1

 dev-lang/qu-prolog/Manifest                        |   4 -
 .../qu-prolog/files/qu-prolog-9.1-cerr-ptr.patch   |  40 --------
 .../qu-prolog/files/qu-prolog-9.1-cflags.patch     |  34 -------
 dev-lang/qu-prolog/files/qu-prolog-9.1-gcc.patch   |  33 -------
 .../qu-prolog/files/qu-prolog-9.1-portage.patch    |  32 -------
 .../qu-prolog/files/qu-prolog-9.5-cflags.patch     |  34 -------
 .../qu-prolog/files/qu-prolog-9.5-portage.patch    |  32 -------
 dev-lang/qu-prolog/qu-prolog-9.1-r1.ebuild         |  95 -------------------
 dev-lang/qu-prolog/qu-prolog-9.1.ebuild            | 102 ---------------------
 dev-lang/qu-prolog/qu-prolog-9.5.ebuild            |  93 -------------------
 dev-lang/qu-prolog/qu-prolog-9.6.ebuild            |  90 ------------------
 dev-lang/qu-prolog/qu-prolog-9.7.ebuild            |  90 ------------------
 12 files changed, 679 deletions(-)

diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest
index e20903fea30..a887f3083a6 100644
--- a/dev-lang/qu-prolog/Manifest
+++ b/dev-lang/qu-prolog/Manifest
@@ -1,5 +1 @@
 DIST qp10.0.tar.gz 1521469 SHA256 f3968e0ea5f9da80475b8298cbac0c70d3684fb8e68ddc0961a2d8c739aa9f07 SHA512 491ef9cc01f0d34163d47163b3103dcbd52cc5672f64057b898c2d234384ac2e3b64b4e59a1795765ff92de4c97ebdb11a82d394213685c387e4dd7d598c5c60 WHIRLPOOL 675a46d6ce428456e1055b8192c84e488ea1b6a3715f9f3e267d9df0637e304982f933e6078e5912c025eceb02dc79c08bd6744d181269b210ff3233ce69fa37
-DIST qp9.1.tar.gz 1460679 SHA256 1f3052f2700d537b33207943a3ade48b2b3aa5cd01cafc0475bcf26c645bc9af SHA512 44590be9d1ecec97fa6c82b657e9ecc3778f833644055ee87c9a6a36996663d139ffd7b583d72f8ac317648e0f22ccbc2a1da9c3a5eabd23381c668e5d073cbb WHIRLPOOL 37ec4e25c2284b267f72c016b4ea1e542d735c9da5f6532d1f6b439af2b91422ddc251d31e1a17b6366ee6af0e754acdbf8a0c44ef03f46a2515f14b1259b732
-DIST qp9.5.tar.gz 1537445 SHA256 7e4b9883fad00b16c919620033da48482b2eccc875b37f8170d674ce9f72aee2 SHA512 7a79090a6e3f0263e38cf5e5724a5c35c63c8cca2842fa8c07f9ff84011ef7ac9a22b195713aeb626a787c9391c612f3fea0ff38c084634a2f62258feb3eb6e2 WHIRLPOOL 3f589998f3480925fa3ad3c54f1f0ba4122cfa12c48d9bf1269e92a0fdf52d1823cd8dae8851e36d2c97ec2f869da10ff6ee7f2663b752d1d396e1b5a95ca982
-DIST qp9.6.tar.gz 1539483 SHA256 631ab73af271279d583c5ecf19e5542dd8dff097179e3bb34ac2624aeb029f7a SHA512 a15d3f2254d9ed9a2032f7e2902363f2ed2dbf0a7ba67a89aae79202d38954a195e93725aa828d19d50d7a891d8cea4f0d23af66ffd55984738db9b612467cd8 WHIRLPOOL 3dcc746da3283044267abd7aa00795b1bff79bffd206c1bf227087281d94f2dc4a390a5ccd85933641aea150313b2f62e0e9fbe491ef4fafa73e4fdd9b35d7d1
-DIST qp9.7.tar.gz 1539804 SHA256 9b77c97e0cb981669cf27df0f68875ba44958e67cc82ac71a4f5d2665b96708b SHA512 20a7a00eab2ec489489f95d78eb4dc8edf71d99fae2f23807158ca78d0bbd1b66d03460f0e06f91ac4ecafd9aab2bbdd109368ba8d3cc2c8452e17c634035c19 WHIRLPOOL 20a790902848790cfedefc6434eda01bb4b0ed2cfdf26c7d1a7914cef9916d161fcd397001a7f5a0aadf2d710112446bd99103f161ef22ad7b3567b45b33ac6d

diff --git a/dev-lang/qu-prolog/files/qu-prolog-9.1-cerr-ptr.patch b/dev-lang/qu-prolog/files/qu-prolog-9.1-cerr-ptr.patch
deleted file mode 100644
index 1fde09843e6..00000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-9.1-cerr-ptr.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ur qp9.1.orig/src/gc.cc qp9.1/src/gc.cc
---- qp9.1.orig/src/gc.cc	2011-08-23 11:17:44.000000000 +1200
-+++ qp9.1/src/gc.cc	2011-11-20 07:14:14.000000000 +1300
-@@ -152,7 +152,7 @@
-     {
-       cerr << size << endl;
-       heapobject* ptr = reinterpret_cast<heapobject*>(term);
--      cerr << hex << (u_int)(ptr) << " : " << *ptr << " " << *(ptr+1) << dec << endl;
-+      cerr << hex << (wordptr)(ptr) << " : " << *ptr << " " << *(ptr+1) << dec << endl;
-       return false;
-     }
-   return true;
-diff -ur qp9.1.orig/src/objects.h qp9.1/src/objects.h
---- qp9.1.orig/src/objects.h	2011-08-23 11:17:44.000000000 +1200
-+++ qp9.1/src/objects.h	2011-11-20 07:14:14.000000000 +1300
-@@ -1242,18 +1242,12 @@
-        << this->getName() << "\" ";
-   
- #ifndef WIN32
--  switch (hasAssociatedItem())
--    {
--    case AssociatedNone:
--	    std::cerr << "(no info)";
--      break;
--    case AssociatedInteger:
--      std::cerr << "int: " << getAssociatedInteger();
--      break;
--    case AssociatedAtom:
--      std::cerr << "atom: [" << std::hex << (wordptr) getAssociatedAtom() << std::dec << "]";
--      break;
--    }
-+  if (hasAssociatedInteger())
-+    std::cerr << "int: " << getAssociatedInteger();
-+  else if (hasAssociatedAtom())
-+    std::cerr << "atom: [" << std::hex << (wordptr) getAssociatedAtom() << std::dec << "]";
-+  else
-+    std::cerr << "(no info)";
- #endif
- }
- #endif

diff --git a/dev-lang/qu-prolog/files/qu-prolog-9.1-cflags.patch b/dev-lang/qu-prolog/files/qu-prolog-9.1-cflags.patch
deleted file mode 100644
index f53eb067b1f..00000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-9.1-cflags.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ur qp9.1.orig/Makefile.in qp9.1/Makefile.in
---- qp9.1.orig/Makefile.in	2011-08-23 11:17:54.000000000 +1200
-+++ qp9.1/Makefile.in	2012-01-14 12:57:16.000000000 +1300
-@@ -23,7 +23,7 @@
- 
- export PROLOG		= prolog
- 
--
-+export CXX=@CXX@
- 
- .PHONY: all
- all:	objects
-diff -ur qp9.1.orig/src/Makefile.in qp9.1/src/Makefile.in
---- qp9.1.orig/src/Makefile.in	2011-08-23 11:17:54.000000000 +1200
-+++ qp9.1/src/Makefile.in	2012-01-14 12:48:33.000000000 +1300
-@@ -40,7 +40,7 @@
- 
- #export DEBUGGING=
- 
--export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
-+#export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
- export QACXXFLAGS = -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
- 
- .PHONY: all
-@@ -79,6 +79,9 @@
- 
- # Targets
- 
-+.cc.o:
-+	$(CXX) $(CXXFLAGS) @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized -c $<
-+
- .PHONY: commands
- commands: $(GENERATED) $(LIBRARIES) $(BIG_LIBRARY)
- 	@$(MAKE) $(ALL_COMMANDS)

diff --git a/dev-lang/qu-prolog/files/qu-prolog-9.1-gcc.patch b/dev-lang/qu-prolog/files/qu-prolog-9.1-gcc.patch
deleted file mode 100644
index 82d5bc7f7eb..00000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-9.1-gcc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur qp9.1.orig/src/pile.h qp9.1/src/pile.h
---- qp9.1.orig/src/pile.h	2011-08-23 01:17:44.000000000 +0200
-+++ qp9.1/src/pile.h	2013-01-09 12:07:44.000000000 +0100
-@@ -75,7 +75,7 @@
- 	//
- 	// Push a StoredType onto the pile.
- 	//
--	void	push(const StoredType s){ pushElement(s); }
-+	void	push(const StoredType s){ this->pushElement(s); }
- 
- 	//
- 	// Pop a StoredType off the pile.
-@@ -85,7 +85,7 @@
- 	//
- 	// Pop n entries of StoredType off the pile.
- 	//
--	void	popNEntries(word32 n)	{ setTopOfStack(this->getTopOfStack() - n); }
-+	void	popNEntries(word32 n)	{ this->setTopOfStack(this->getTopOfStack() - n); }
- 
- 	//
- 	// Check whether the pile is empty or not.
-diff -ur qp9.1.orig/src/system_support.cc qp9.1/src/system_support.cc
---- qp9.1.orig/src/system_support.cc	2011-08-23 01:17:44.000000000 +0200
-+++ qp9.1/src/system_support.cc	2013-01-09 12:07:16.000000000 +0100
-@@ -61,6 +61,8 @@
- #include <iostream>
- #ifdef WIN32
- #include <direct.h>
-+#else
-+#include <unistd.h>
- #endif //WIN32
- 
- using namespace std;

diff --git a/dev-lang/qu-prolog/files/qu-prolog-9.1-portage.patch b/dev-lang/qu-prolog/files/qu-prolog-9.1-portage.patch
deleted file mode 100644
index 4a1aa23607a..00000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-9.1-portage.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ur qp9.1.orig/bin/qc.in qp9.1/bin/qc.in
---- qp9.1.orig/bin/qc.in	2011-08-23 11:17:28.000000000 +1200
-+++ qp9.1/bin/qc.in	2011-11-20 07:16:18.000000000 +1300
-@@ -27,13 +27,13 @@
- 
- ##############################
- 
--preprocess='@QPHOME@/bin/qppp'
--expand='@QPHOME@/bin/qg'
--qpcompile='@QPHOME@/bin/qc1'
-+preprocess='qppp'
-+expand='qg'
-+qpcompile='qc1'
- compversion='qup'
--assemble='@QPHOME@/bin/qa'
--link='@QPHOME@/bin/ql'
--execute='@QPHOME@/bin/qem'
-+assemble='qa'
-+link='ql'
-+execute='qem'
- libqofiles="@QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo"
- 
- ##############################
-diff -ur qp9.1.orig/prolog/Makefile.in qp9.1/prolog/Makefile.in
---- qp9.1.orig/prolog/Makefile.in	2006-04-06 16:01:45.000000000 +1200
-+++ qp9.1/prolog/Makefile.in	2011-11-20 07:16:18.000000000 +1300
-@@ -1,3 +1,5 @@
-+PATH:=$(PATH):@QPHOME@/bin
-+
- .DEFAULT:
- 	@$(MAKE) -C compiler	$@
- 	@$(MAKE) -C library	$@

diff --git a/dev-lang/qu-prolog/files/qu-prolog-9.5-cflags.patch b/dev-lang/qu-prolog/files/qu-prolog-9.5-cflags.patch
deleted file mode 100644
index 5bcce94d9b6..00000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-9.5-cflags.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ur qp9.5.orig/Makefile.in qp9.5/Makefile.in
---- qp9.5.orig/Makefile.in	2014-11-17 06:46:22.000000000 +0100
-+++ qp9.5/Makefile.in	2015-05-03 11:29:52.000000000 +0200
-@@ -23,7 +23,7 @@
- 
- export PROLOG		= prolog
- 
--
-+export CXX=@CXX@
- 
- .PHONY: all
- all:	objects
-diff -ur qp9.5.orig/src/Makefile.in qp9.5/src/Makefile.in
---- qp9.5.orig/src/Makefile.in	2014-11-17 06:46:22.000000000 +0100
-+++ qp9.5/src/Makefile.in	2015-05-03 11:29:52.000000000 +0200
-@@ -40,7 +40,7 @@
- 
- #export DEBUGGING=
- 
--export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
-+#export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
- export QACXXFLAGS = -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
- 
- .PHONY: all
-@@ -79,6 +79,9 @@
- 
- # Targets
- 
-+.cc.o:
-+	$(CXX) $(CXXFLAGS) @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized -c $<
-+
- .PHONY: commands
- commands: $(GENERATED) $(LIBRARIES) $(BIG_LIBRARY)
- 	@$(MAKE) $(ALL_COMMANDS)

diff --git a/dev-lang/qu-prolog/files/qu-prolog-9.5-portage.patch b/dev-lang/qu-prolog/files/qu-prolog-9.5-portage.patch
deleted file mode 100644
index 55dc08ffe47..00000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-9.5-portage.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ur qp9.5.orig/bin/qc.in qp9.5/bin/qc.in
---- qp9.5.orig/bin/qc.in	2014-11-17 06:45:59.000000000 +0100
-+++ qp9.5/bin/qc.in	2015-05-03 11:31:54.000000000 +0200
-@@ -27,13 +27,13 @@
- 
- ##############################
- 
--preprocess='@QPHOME@/bin/qppp'
--expand='@QPHOME@/bin/qg'
--qpcompile='@QPHOME@/bin/qc1'
-+preprocess='qppp'
-+expand='qg'
-+qpcompile='qc1'
- compversion='qup'
--assemble='@QPHOME@/bin/qa'
--link='@QPHOME@/bin/ql'
--execute='@QPHOME@/bin/qem'
-+assemble='qa'
-+link='ql'
-+execute='qem'
- libqofiles="@QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo"
- 
- ##############################
-diff -ur qp9.5.orig/prolog/Makefile.in qp9.5/prolog/Makefile.in
---- qp9.5.orig/prolog/Makefile.in	2006-04-06 06:01:45.000000000 +0200
-+++ qp9.5/prolog/Makefile.in	2015-05-03 11:31:54.000000000 +0200
-@@ -1,3 +1,5 @@
-+PATH:=$(PATH):@QPHOME@/bin
-+
- .DEFAULT:
- 	@$(MAKE) -C compiler	$@
- 	@$(MAKE) -C library	$@

diff --git a/dev-lang/qu-prolog/qu-prolog-9.1-r1.ebuild b/dev-lang/qu-prolog/qu-prolog-9.1-r1.ebuild
deleted file mode 100644
index 3b0035ad477..00000000000
--- a/dev-lang/qu-prolog/qu-prolog-9.1-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 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="Qu-Prolog GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc examples pedro qt4 readline threads"
-
-RDEPEND="
-	!dev-util/mpatch
-	!dev-util/rej
-	qt4? ( dev-qt/qtgui:4 )
-	pedro? ( net-misc/pedro )
-	readline? ( app-misc/rlwrap )"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-portage.patch \
-		"${FILESDIR}"/${P}-cflags.patch \
-		"${FILESDIR}"/${P}-cerr-ptr.patch \
-		"${FILESDIR}"/${P}-gcc.patch
-}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable debug) \
-		$(use_enable threads multiple-threads)
-
-	if use qt4; then
-		cd "${S}"/src/xqp || die
-		eqmake4 xqp.pro
-	fi
-}
-
-src_compile() {
-	emake
-
-	if use qt4; 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/{qa,qdeal,qem,ql,qc,qc1.qup,qecat,qg,qp,qppp,kq}
-
-	use qt4 && dobin src/xqp/xqp
-
-	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
-}

diff --git a/dev-lang/qu-prolog/qu-prolog-9.1.ebuild b/dev-lang/qu-prolog/qu-prolog-9.1.ebuild
deleted file mode 100644
index cf59aef3bbe..00000000000
--- a/dev-lang/qu-prolog/qu-prolog-9.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-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="Qu-Prolog GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug doc examples pedro qt4 readline threads"
-
-RDEPEND="
-	!dev-util/mpatch
-	!dev-util/rej
-	qt4? ( dev-qt/qtgui:4 )
-	pedro? ( net-misc/pedro )
-	readline? ( app-misc/rlwrap )"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-portage.patch \
-		"${FILESDIR}"/${P}-cflags.patch \
-		"${FILESDIR}"/${P}-cerr-ptr.patch \
-		"${FILESDIR}"/${P}-gcc.patch
-}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable debug) \
-		$(use_enable threads multiple-threads)
-
-	if use qt4; then
-		cd "${S}"/src/xqp || die
-		eqmake4 xqp.pro
-	fi
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use qt4; then
-		cd "${S}"/src/xqp || die
-		emake || die "emake xqp failed"
-	fi
-}
-
-src_install() {
-	sed -i -e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \
-		bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die
-
-	dobin bin/qa bin/qdeal bin/qem bin/ql || die
-	dobin bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp bin/qppp || die
-	dobin bin/kq || die
-
-	if use qt4; then
-		dobin src/xqp/xqp || die
-	fi
-
-	insinto /usr/$(get_libdir)/${PN}/bin
-	doins bin/rl_commands
-	doins bin/qc1.qup.qx \
-		bin/qecat.qx \
-		bin/qg.qx \
-		bin/qp.qx || die
-
-	insinto /usr/$(get_libdir)/${PN}/library
-	doins prolog/library/*.qo || die
-
-	insinto /usr/$(get_libdir)/${PN}/compiler
-	doins prolog/compiler/*.qo || die
-
-	doman doc/man/man1/*.1 || die
-
-	dodoc README || die
-
-	if use doc ; then
-		docinto reference-manual
-		dodoc doc/manual/*.html || die
-		docinto user-guide
-		dodoc doc/user/main.pdf || die
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.ql || die
-		docinto examples
-		dodoc examples/README || die
-	fi
-}

diff --git a/dev-lang/qu-prolog/qu-prolog-9.5.ebuild b/dev-lang/qu-prolog/qu-prolog-9.5.ebuild
deleted file mode 100644
index b8b4cd271e0..00000000000
--- a/dev-lang/qu-prolog/qu-prolog-9.5.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2015 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="Qu-Prolog GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc examples pedro qt4 readline threads"
-
-RDEPEND="
-	!dev-util/mpatch
-	!dev-util/rej
-	qt4? ( dev-qt/qtgui:4 )
-	pedro? ( net-misc/pedro )
-	readline? ( app-misc/rlwrap )"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-portage.patch \
-		"${FILESDIR}"/${P}-cflags.patch
-}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable debug) \
-		$(use_enable threads multiple-threads)
-
-	if use qt4; then
-		cd "${S}"/src/xqp || die
-		eqmake4 xqp.pro
-	fi
-}
-
-src_compile() {
-	emake
-
-	if use qt4; 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/{qa,qdeal,qem,ql,qc,qc1.qup,qecat,qg,qp,qppp,kq}
-
-	use qt4 && dobin src/xqp/xqp
-
-	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
-}

diff --git a/dev-lang/qu-prolog/qu-prolog-9.6.ebuild b/dev-lang/qu-prolog/qu-prolog-9.6.ebuild
deleted file mode 100644
index 39c0124558d..00000000000
--- a/dev-lang/qu-prolog/qu-prolog-9.6.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2016 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="Qu-Prolog GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc examples pedro qt4 readline threads"
-
-RDEPEND="
-	!dev-util/mpatch
-	!dev-util/rej
-	qt4? ( dev-qt/qtgui:4 )
-	pedro? ( net-misc/pedro )
-	readline? ( app-misc/rlwrap )"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}"/${MY_P}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable debug) \
-		$(use_enable threads multiple-threads)
-
-	if use qt4; then
-		cd "${S}"/src/xqp || die
-		eqmake4 xqp.pro
-	fi
-}
-
-src_compile() {
-	emake OPTIMISATION="${CXXFLAGS}"
-
-	if use qt4; 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}
-
-	into /usr/$(get_libdir)/${PN}
-	dobin bin/{qa,qc1.qup,qdeal,qem,qg,ql,qppp}
-
-	use qt4 && dobin src/xqp/xqp
-
-	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
-}

diff --git a/dev-lang/qu-prolog/qu-prolog-9.7.ebuild b/dev-lang/qu-prolog/qu-prolog-9.7.ebuild
deleted file mode 100644
index 39c0124558d..00000000000
--- a/dev-lang/qu-prolog/qu-prolog-9.7.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2016 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="Qu-Prolog GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc examples pedro qt4 readline threads"
-
-RDEPEND="
-	!dev-util/mpatch
-	!dev-util/rej
-	qt4? ( dev-qt/qtgui:4 )
-	pedro? ( net-misc/pedro )
-	readline? ( app-misc/rlwrap )"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}"/${MY_P}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable debug) \
-		$(use_enable threads multiple-threads)
-
-	if use qt4; then
-		cd "${S}"/src/xqp || die
-		eqmake4 xqp.pro
-	fi
-}
-
-src_compile() {
-	emake OPTIMISATION="${CXXFLAGS}"
-
-	if use qt4; 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}
-
-	into /usr/$(get_libdir)/${PN}
-	dobin bin/{qa,qc1.qup,qdeal,qem,qg,ql,qppp}
-
-	use qt4 && dobin src/xqp/xqp
-
-	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
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/qu-prolog/, dev-lang/qu-prolog/files/
@ 2021-05-15 16:43 Keri Harris
  0 siblings, 0 replies; 6+ messages in thread
From: Keri Harris @ 2021-05-15 16:43 UTC (permalink / raw
  To: gentoo-commits

commit:     c02daa97546d19e63fd688653bb7d0da946b6eae
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sat May 15 16:43:14 2021 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sat May 15 16:43:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c02daa97

dev-lang/qu-prolog: compiler-portable CXXFLAGS check. Closes 766072

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Keri Harris <keri <AT> gentoo.org>

 .../files/qu-prolog-10.x-compiler-flags.patch          | 18 ++++++++++++++++++
 dev-lang/qu-prolog/qu-prolog-10.6.ebuild               |  1 +
 2 files changed, 19 insertions(+)

diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.x-compiler-flags.patch b/dev-lang/qu-prolog/files/qu-prolog-10.x-compiler-flags.patch
new file mode 100644
index 00000000000..3d07947a497
--- /dev/null
+++ b/dev-lang/qu-prolog/files/qu-prolog-10.x-compiler-flags.patch
@@ -0,0 +1,18 @@
+--- qp10.6.orig/configure.in	2020-06-24 23:37:02.000000000 -0000
++++ qp10.6/configure.in	2021-05-15 16:36:32.504585122 -0000
+@@ -228,9 +228,12 @@
+ #-----------------------------------------------------------------------------
+ dnl Check for -fno-strict-aliasing
+ AC_MSG_CHECKING([for -fno-strict-aliasing])
+-echo "int i;" > aliasing_test.cc
+-qp_alias=[`gcc -fno-strict-aliasing -c aliasing_test.cc`]
+-rm aliasing_test.*
++ac_saved_cflags=$[]_AC_LANG_PREFIX[]FLAGS
++_AC_LANG_PREFIX[]FLAGS="-Werror -fno-strict-aliasing"
++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int main(void) { return 0; }]])],
++    [qp_alias=""],
++    [qp_alias="not-found"])
++_AC_LANG_PREFIX[]FLAGS="$ac_saved_cflags"
+ if test -n "$qp_alias"; then
+     AC_MSG_RESULT(not found)
+     GCC_ALIAS_FLAG=

diff --git a/dev-lang/qu-prolog/qu-prolog-10.6.ebuild b/dev-lang/qu-prolog/qu-prolog-10.6.ebuild
index 31053be8494..2cbbe513552 100644
--- a/dev-lang/qu-prolog/qu-prolog-10.6.ebuild
+++ b/dev-lang/qu-prolog/qu-prolog-10.6.ebuild
@@ -35,6 +35,7 @@ S="${WORKDIR}"/${MY_P}
 
 src_prepare() {
 	eapply "${FILESDIR}"/${PN}-10.x-qt5.patch
+	eapply "${FILESDIR}"/${PN}-10.x-compiler-flags.patch
 	eapply_user
 
 	eautoconf


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/qu-prolog/, dev-lang/qu-prolog/files/
@ 2024-08-07  2:17 Eli Schwartz
  0 siblings, 0 replies; 6+ messages in thread
From: Eli Schwartz @ 2024-08-07  2:17 UTC (permalink / raw
  To: gentoo-commits

commit:     e747148898aeeb0a4815de3ec91b912b5840d9e9
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  7 02:07:44 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Wed Aug  7 02:17:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7471488

dev-lang/qu-prolog: add 10.8

Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 dev-lang/qu-prolog/Manifest                        |   1 +
 .../files/qu-prolog-10.8-compiler-flags.patch      |  18 ++++
 dev-lang/qu-prolog/qu-prolog-10.8.ebuild           | 113 +++++++++++++++++++++
 3 files changed, 132 insertions(+)

diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest
index 0a7cf61496ad..46d24648f75e 100644
--- a/dev-lang/qu-prolog/Manifest
+++ b/dev-lang/qu-prolog/Manifest
@@ -1,2 +1,3 @@
 DIST qp10.6.tar.gz 1671349 BLAKE2B 189ddd733a0bbf939387de60ec76e8e41a430af5f4684a9a3b8cc3effa4e402cfd4471c955f4d626d2de8cf14eb93c2977540ad209d06ce9b562325a4b984fea SHA512 425b35c758ba86cc14a1faf5c19f2c091142be6c42261323dc6f551efd6c80f7223584cd2be239748539eaf25308f777d95fd5bfdc65b33ca3245377e1766299
 DIST qp10.7.tar.gz 1857589 BLAKE2B 986f0d8744d5b0a3974191d154a2ca0efa97f6c02483d975b4bb43bd7ae44d9d4233f6bffc1947d03ac3db9c0181953254e66bc62d55add6b0debbed1ad21de6 SHA512 305c89710e02167bb37e999b5af182b9dbca710d32c79149782a90f29b2e80f6a5462e9fb22153e770cef7484c5181bde31f1fe680b786f0f253ced13a3df830
+DIST qp10.8.tar.gz 1707106 BLAKE2B aaba3e722c3aa3f566e7e4469f581fa854fc865066173664a18421c3de32ba7be804896812191b3bcdb2f4e713e9886f12765e0fc1bc3f5f609e0c679cdb4374 SHA512 7c677a9b9cac0c1de626f213be158297844fd403deb62ec976684926c287827734c27a89771b6e48dfc5822033aeb24aafc2c34cd13cada88db49ee1f9612fc7

diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.8-compiler-flags.patch b/dev-lang/qu-prolog/files/qu-prolog-10.8-compiler-flags.patch
new file mode 100644
index 000000000000..28eedb06e077
--- /dev/null
+++ b/dev-lang/qu-prolog/files/qu-prolog-10.8-compiler-flags.patch
@@ -0,0 +1,18 @@
+--- qp10.6.orig/configure.ac	2020-06-24 23:37:02.000000000 -0000
++++ qp10.6/configure.ac	2021-05-15 16:36:32.504585122 -0000
+@@ -228,9 +228,12 @@
+ #-----------------------------------------------------------------------------
+ dnl Check for -fno-strict-aliasing
+ AC_MSG_CHECKING([for -fno-strict-aliasing])
+-echo "int i;" > aliasing_test.cc
+-qp_alias=[`gcc -fno-strict-aliasing -c aliasing_test.cc`]
+-rm aliasing_test.*
++ac_saved_cflags=$[]_AC_LANG_PREFIX[]FLAGS
++_AC_LANG_PREFIX[]FLAGS="-Werror -fno-strict-aliasing"
++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int main(void) { return 0; }]])],
++    [qp_alias=""],
++    [qp_alias="not-found"])
++_AC_LANG_PREFIX[]FLAGS="$ac_saved_cflags"
+ if test -n "$qp_alias"; then
+     AC_MSG_RESULT(not found)
+     GCC_ALIAS_FLAG=

diff --git a/dev-lang/qu-prolog/qu-prolog-10.8.ebuild b/dev-lang/qu-prolog/qu-prolog-10.8.ebuild
new file mode 100644
index 000000000000..137265e4db1f
--- /dev/null
+++ b/dev-lang/qu-prolog/qu-prolog-10.8.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit autotools flag-o-matic python-any-r1 qmake-utils
+
+MY_P=qp${PV}
+
+DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions"
+HOMEPAGE="http://staff.itee.uq.edu.au/pjr/HomePages/QuPrologHome.html"
+SRC_URI="http://staff.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 pcre pedro qt5 readline threads"
+
+RDEPEND="
+	!dev-util/rej
+	qt5? (
+		dev-qt/qtwidgets:5
+		dev-qt/qtgui:5
+	 )
+	pcre? ( dev-libs/libpcre2 )
+	pedro? ( net-misc/pedro )
+	readline? ( app-misc/rlwrap )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/perl"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-10.x-qt5.patch
+	eapply "${FILESDIR}"/${PN}-10.8-compiler-flags.patch
+	eapply "${FILESDIR}"/${PN}-10.x-qa-compiler-flags.patch
+	eapply_user
+
+	eautoconf
+
+	python_fix_shebang "${S}"/bin/qc.in
+}
+
+src_configure() {
+	# -Werror=strict-aliasing
+	# https://bugs.gentoo.org/924768
+	# Upstream's sole provided contact method is email. I have sent an email
+	# describing the issue. -- Eli
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	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
+		docinto examples
+		newdoc examples/README README.examples
+		dodoc examples/*.ql
+	fi
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/qu-prolog/, dev-lang/qu-prolog/files/
@ 2025-01-06 22:58 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2025-01-06 22:58 UTC (permalink / raw
  To: gentoo-commits

commit:     8ac6292c00979a343428678f195f210f6e70f128
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  6 20:22:43 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 22:55:03 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ac6292c

dev-lang/qu-prolog: drop 10.6, 10.7

Closes: https://bugs.gentoo.org/947624
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-lang/qu-prolog/Manifest                        |   2 -
 .../files/qu-prolog-10.x-compiler-flags.patch      |  18 ----
 dev-lang/qu-prolog/qu-prolog-10.6.ebuild           | 105 -------------------
 dev-lang/qu-prolog/qu-prolog-10.7.ebuild           | 115 ---------------------
 4 files changed, 240 deletions(-)

diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest
index 46d24648f75e..f4152926aa96 100644
--- a/dev-lang/qu-prolog/Manifest
+++ b/dev-lang/qu-prolog/Manifest
@@ -1,3 +1 @@
-DIST qp10.6.tar.gz 1671349 BLAKE2B 189ddd733a0bbf939387de60ec76e8e41a430af5f4684a9a3b8cc3effa4e402cfd4471c955f4d626d2de8cf14eb93c2977540ad209d06ce9b562325a4b984fea SHA512 425b35c758ba86cc14a1faf5c19f2c091142be6c42261323dc6f551efd6c80f7223584cd2be239748539eaf25308f777d95fd5bfdc65b33ca3245377e1766299
-DIST qp10.7.tar.gz 1857589 BLAKE2B 986f0d8744d5b0a3974191d154a2ca0efa97f6c02483d975b4bb43bd7ae44d9d4233f6bffc1947d03ac3db9c0181953254e66bc62d55add6b0debbed1ad21de6 SHA512 305c89710e02167bb37e999b5af182b9dbca710d32c79149782a90f29b2e80f6a5462e9fb22153e770cef7484c5181bde31f1fe680b786f0f253ced13a3df830
 DIST qp10.8.tar.gz 1707106 BLAKE2B aaba3e722c3aa3f566e7e4469f581fa854fc865066173664a18421c3de32ba7be804896812191b3bcdb2f4e713e9886f12765e0fc1bc3f5f609e0c679cdb4374 SHA512 7c677a9b9cac0c1de626f213be158297844fd403deb62ec976684926c287827734c27a89771b6e48dfc5822033aeb24aafc2c34cd13cada88db49ee1f9612fc7

diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.x-compiler-flags.patch b/dev-lang/qu-prolog/files/qu-prolog-10.x-compiler-flags.patch
deleted file mode 100644
index 3d07947a4977..000000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-10.x-compiler-flags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- qp10.6.orig/configure.in	2020-06-24 23:37:02.000000000 -0000
-+++ qp10.6/configure.in	2021-05-15 16:36:32.504585122 -0000
-@@ -228,9 +228,12 @@
- #-----------------------------------------------------------------------------
- dnl Check for -fno-strict-aliasing
- AC_MSG_CHECKING([for -fno-strict-aliasing])
--echo "int i;" > aliasing_test.cc
--qp_alias=[`gcc -fno-strict-aliasing -c aliasing_test.cc`]
--rm aliasing_test.*
-+ac_saved_cflags=$[]_AC_LANG_PREFIX[]FLAGS
-+_AC_LANG_PREFIX[]FLAGS="-Werror -fno-strict-aliasing"
-+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int main(void) { return 0; }]])],
-+    [qp_alias=""],
-+    [qp_alias="not-found"])
-+_AC_LANG_PREFIX[]FLAGS="$ac_saved_cflags"
- if test -n "$qp_alias"; then
-     AC_MSG_RESULT(not found)
-     GCC_ALIAS_FLAG=

diff --git a/dev-lang/qu-prolog/qu-prolog-10.6.ebuild b/dev-lang/qu-prolog/qu-prolog-10.6.ebuild
deleted file mode 100644
index cc10e9da950d..000000000000
--- a/dev-lang/qu-prolog/qu-prolog-10.6.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit autotools multilib python-any-r1 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
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtgui:5
-	 )
-	pedro? ( net-misc/pedro )
-	readline? ( app-misc/rlwrap )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/perl"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-10.x-qt5.patch
-	eapply "${FILESDIR}"/${PN}-10.x-compiler-flags.patch
-	eapply_user
-
-	eautoconf
-
-	python_fix_shebang "${S}"/bin/qc.in
-}
-
-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
-		docinto examples
-		newdoc examples/README README.examples
-		dodoc examples/*.ql
-	fi
-}

diff --git a/dev-lang/qu-prolog/qu-prolog-10.7.ebuild b/dev-lang/qu-prolog/qu-prolog-10.7.ebuild
deleted file mode 100644
index a9b27bccbba7..000000000000
--- a/dev-lang/qu-prolog/qu-prolog-10.7.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit autotools flag-o-matic python-any-r1 qmake-utils
-
-MY_P=qp${PV}
-
-DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions"
-HOMEPAGE="https://staff.itee.uq.edu.au/pjr/HomePages/QuPrologHome.html"
-SRC_URI="https://staff.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 pcre pedro qt5 readline threads"
-
-RDEPEND="
-	!dev-util/rej
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtgui:5
-	 )
-	pcre? ( dev-libs/libpcre2 )
-	pedro? ( net-misc/pedro )
-	readline? ( app-misc/rlwrap )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/perl"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-10.x-qt5.patch
-	eapply "${FILESDIR}"/${PN}-10.x-compiler-flags.patch
-	eapply "${FILESDIR}"/${PN}-10.x-qa-compiler-flags.patch
-	eapply_user
-
-	mv configure.in configure.ac || die
-	eautoconf
-
-	python_fix_shebang "${S}"/bin/qc.in
-}
-
-src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/924768
-	# Upstream's sole provided contact method is email. I have sent an email
-	# describing the issue with a fairly rapid response saying there will be
-	# a new release "shortly" and that hopefully it will include a fix. -- Eli
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	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
-		docinto examples
-		newdoc examples/README README.examples
-		dodoc examples/*.ql
-	fi
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-01-06 22:58 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-03 16:42 [gentoo-commits] repo/gentoo:master commit in: dev-lang/qu-prolog/, dev-lang/qu-prolog/files/ Keri Harris
  -- strict thread matches above, loose matches on Subject: below --
2016-10-20 10:04 Keri Harris
2017-10-29 17:36 Keri Harris
2021-05-15 16:43 Keri Harris
2024-08-07  2:17 Eli Schwartz
2025-01-06 22:58 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox