gentoo auto-resync : 07:08:2024 - 12:37:20

4 files changed, 150 insertions, 7 deletions

diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest
index b5f37fbe3e4b..3f131eb99223 100644
--- a/dev-lang/qu-prolog/Manifest
+++ b/dev-lang/qu-prolog/Manifest
@@ -1,8 +1,11 @@
+AUX qu-prolog-10.8-compiler-flags.patch 762 BLAKE2B c1a760a4a2243f19170485a64838da52a9a9f9257f12cfe029e3d738162de33dea0ed0315d0321206baef465e54e6ffd40b2906e64af7afeb1c8005754fb4ea5 SHA512 3f273df669eaff0329c3c8b57e2e30cb75b6c884a79aff55fc6421b8875a84fa0288c71709fbbd0d274b3d80c0d0ec10f07cc42a2d1aafbb024cd6d5d200b442
 AUX qu-prolog-10.x-compiler-flags.patch 762 BLAKE2B 1b96597015aeae67aa92caf5913e81f2bf11e86c73ce6acaaeee1f2663871471fd595eaccfb00cdd10cedf9677c03095bc37ddc2a8d4a370d38439896f16e72b SHA512 c09286d76692a125d98b6bf3684df0d6dd57cd5ef70387fdbd5184493d978c8d5b9c1ce63c4305986df28382e0201abb53af3a6451f802d677dbc22b1741237e
 AUX qu-prolog-10.x-qa-compiler-flags.patch 995 BLAKE2B 1a35bd4eecc08cb9b4d861b65710a38fcada73e5ceed4cd02cc196541ec7417990788179022c1b12c7a545df5f5e074178745d70d97e960e1dfb4747556f2963 SHA512 e766c099f53e66f3775d8b50cc4f659770369001f78689b41c5a8e4ddcc4249bd7aaba678bcd60b879688d1b2525135454ff03e01d4d4b43bb1f2f357561ee55
 AUX qu-prolog-10.x-qt5.patch 1037 BLAKE2B 91287f26c97c0c2f1c9cd3bae3a007cf27e4b8121aca4a42cabbbb37c224b7399ed06468b7a725977f27bad2fcda8d2165bfeb569f36491d227dd472036de5ed SHA512 9dd1c8245f725d552bf23ad9ef1bb858a06c69b66778fa851013775081751a77923e2145f6575966e8394666b8dc2e04724d102be28b32efaa44b7e474b3dd7f
 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
 EBUILD qu-prolog-10.6.ebuild 2058 BLAKE2B 60e865b6e4ca924bd8e7335108d71362d3bca82ea8669b3419fd81db1da800d4bf3287c8fe9aa5e5cdab49e104ed33d6f4ab6112921d87fa1532b5d95b1b5da5 SHA512 3f7d7758cef24570a01e180c765783dc489d9171ed85260b8944d925006026626e2dac3ecdc7cb834258ac6092d2c9284cf8f14d8ac3e9ed6aab7bfccbdc34ff
-EBUILD qu-prolog-10.7.ebuild 2164 BLAKE2B 2069a2f1519e6d7b421ae2f39377c2281c93100ffe0793a31dd50b8aed5cac6634fcd03f74aa1f7edc9609e2f1a06463080b0b15ee0c8a059a9a9f410f733e83 SHA512 80d6e11953f791fd351dcada58c28d0fdb910da568d891582df3b97d52f911032b19e37f86b80dfd9758929b63913e6f1d77e1c69f3c4c5c5a83c207b2da7695
+EBUILD qu-prolog-10.7.ebuild 2513 BLAKE2B af53027edd33393fd2df9205d2d0ae11dbf1dd7d7245a2c47bf62ffdf66436825f3bb577ae785fa08964e6c77a947427fb9ec5e23d95d24f6771569648045ef9 SHA512 8209ca5590fbdb965181e78a2ddfa0426299dcb14328d5e53bdc5adc91dbbab525a827befeb4adfd33b748091374f73e8c6b55737b04428c9e6143f5f3946e01
+EBUILD qu-prolog-10.8.ebuild 2476 BLAKE2B 6b78946300691101bc268ad2fcb3af6ede31ad6d7ffd1f56b28e91110ccccada355a534a6117823b75ceea115b4624eadab7b9436289e865d348a4f885ef8030 SHA512 f9c57f37f11a18d51ead78b7c458c9450e4e114d1d9cd79c8ece32338d2d5ccb0a87edf1fbbf8b511b66aeec4837a14b755e09194831d48d5514d0cd1022a21a
 MISC metadata.xml 348 BLAKE2B ca5e1c4b76b62f23822a7a8c4f666faa96e4eabfb4a4477f40b49984dedee39d911d1ac5fd811e340af4b3ce556073baa6fa40949925419996b7c41c04605efa SHA512 5e41fd540a4897642a392bc0eea54762142f80f9523e0abd497e10d4c4cc83f0c0784063383b53c363d7e55ffbb75829201dd93cc73cbfbf4e7c5e8419ae337c
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.7.ebuild b/dev-lang/qu-prolog/qu-prolog-10.7.ebuild
index 9a5c4599174f..a9b27bccbba7 100644
--- a/dev-lang/qu-prolog/qu-prolog-10.7.ebuild
+++ b/dev-lang/qu-prolog/qu-prolog-10.7.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
-inherit autotools python-any-r1 qmake-utils
+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"
+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"
@@ -46,6 +46,14 @@ src_prepare() {
 }
 
 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) \
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..bb5358c114ed
--- /dev/null
+++ b/dev-lang/qu-prolog/qu-prolog-10.8.ebuild
@@ -0,0 +1,114 @@
+# 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.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 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
+}