gentoo auto-resync : 27:01:2025 - 22:42:39

4 files changed, 49 insertions, 59 deletions

diff --git a/dev-lang/nprolog/Manifest b/dev-lang/nprolog/Manifest
index 7a543312791c..3a4be26e947a 100644
--- a/dev-lang/nprolog/Manifest
+++ b/dev-lang/nprolog/Manifest
@@ -1,8 +1,7 @@
 AUX nprolog-3.22-ncursesw.patch 270 BLAKE2B 4e412a1b42bea3e797ddb0f17a5d22bd0f22f5e9fd037bc199704c1abd664413df1adaafc35ed5f430b4da36279199b30b57d34cf459064efa3bc94a1f61a6ca SHA512 41c510be3afad45ba77d1882f864b62349c2d81fc4ac166d736506d14f1e9061ce4d1f9ec3a6adb15fbd4b377573b915f27efba0825701dc396848ce5e2d16e3
-DIST nprolog-3.36.tar.gz 598498 BLAKE2B 1cf2f1459698f2c7df01b4a2202e292b5c0918c363ebc761007f7996f405f7334e757678dbe510ea5c3a52dce8a5fa2b84cd898b04b3bfa4ab33d325ecd17401 SHA512 33ce46cec1c1d167b70ba0f59655f58d42e388d63f5515cec88086db1035d54700865ddfbe213f393d65180928c3951c11056471ef5499761182ea6536a0ddb2
-DIST nprolog-3.41.tar.gz 599368 BLAKE2B d335f87834ca9a6cb167416ebd8024e7122fc17c5b065997e1b88c003ab7f8d772d715d363c712d75fb81d5634993f1dd106593f90f3d375696b8c6826668e98 SHA512 d0927259a3a7b157c9d346cf99c4fb354c4ff4f71c92970c63439c016137437cd2ebcfef7b4bffe50befb3abc5f463abb68eb5b859fa52220e36aac57957321d
+AUX nprolog-3.88-makefile-CURSES_CFLAGS-edlog-rule.patch 780 BLAKE2B 95e6e7a10af3ac3debcec909debef34c28c360e15b48082b5eadd0f8530a633cd9028a0238152d27762db5c1d57ab1ca4b3f2ac10bb9b5756f078433b362afd5 SHA512 87b54236f9aee8fa7f69925765e33efe096a0fa47761faf05adf8335671b1730085311e1b7fe0f9983f12d9e710ce25c0663897ca6e9ecb0d3a5f2cb776f8fe6
 DIST nprolog-3.53.tar.gz 682333 BLAKE2B 827e6ff1b066e42fd10df8788a6752ef4df7692cc3d11ad6b1bb001b72d2e916997abae21e182c161ac1a1098362a2e8430a1b1500b4ad97ca74a00db19e70d2 SHA512 10de04a1737999203d23911b3c36ce506b112476238ec1c28bcade2a459cec6d8ac2310dd8ba3bd1af82aa390444ff5c37536585429faa7c12fa9ee154243087
-EBUILD nprolog-3.36.ebuild 888 BLAKE2B c0614eed790898637c575682580b6879192cb584bc11044d9af3270e919ce0d41c052326c2d1e9b9746051fb3cdee90552510029c9a2e8d64d14dedc607eb547 SHA512 5aa1cbeefdde67461fc2f08e5afb2d2b51bda61e18859ee1b65e11367fa06ce018e9001c94806f8518a5264a929407ed3b26d5e442115080771712fecdfc1a99
-EBUILD nprolog-3.41.ebuild 889 BLAKE2B 8b9ac031e349ee93be59b36a8654e718ac65954258ec03138b0e6e8c9b6ece5ef9378e7a6e641e716b2be75de337ef8d1e765d06ee2f5e685c5015cacd445523 SHA512 c3fe6314b02f2a6d9f6bc8ded5973f65e46061563a99a53a7aa8b7b7c134d95246ca6a70ac0cb51e6f8e56c23bb67d11809f05130795eb3f4659b219017d70fc
+DIST nprolog-3.88.gh.tar.gz 1337137 BLAKE2B 0d8f8d5e8242e3ab172f0a1256252ef99b6daf76a77fb75710c0286d55aa02e79e78601ec4347e42d88411cc7528d4e3b041496df04335496b71fc41cb3573c6 SHA512 12ef940792a6c9cd44cafad5440829d43b0c4736732341172255733f163d48b189233b62288e4fd59d36e5a378742f783a0400c2c4dc3d6b06570143b06685db
 EBUILD nprolog-3.53.ebuild 888 BLAKE2B 1a70453da30466404a14daa097c7df96cd95bcf759becad989cd538e6b17739f86a06301950ed1913314b750955c3c8f3a07f650ce41a3fab431102f414deaaf SHA512 8fc94200ca57c0a592500c1f10a8b58fafb41c8ee28f5dcfea20327784a1221a5440bf72f6a53e1c365dd3bc1006da99d8aa2e8b541d07956a8502f9187c68e5
+EBUILD nprolog-3.88.ebuild 1100 BLAKE2B 7f056d2d92d21e2d343f65f8aebee3934d7badd69aefe5fdeaf1230fb54cd13e09bee73c89f51c78fd2accbe9c91a8b2e2890133a567d8d9cd9a525c8eb79f64 SHA512 b697953177b8f268da8bdfa308750fa67be3b9b079c8ce2d1d01cc82db21771cd29daac509a8aed2013c24c2902e8c03acd9b415f40925010fb92e210583c811
 MISC metadata.xml 657 BLAKE2B 9331358542d57958385bc1218b4a1c5d38185ab0822d0cc68e51bcc5f8b00645a523a1a4f60d30188efc3ed7cb934f0a6a964d27bf0915c5956c69774c734590 SHA512 972ae4d1f2179887f77d8805f2e5482c17767e38b078fa9d9ee65a2f43e0b56b76fccd0166f4c5121de9a7cead4faa7683bd8e9076c257ffb2d1deb673eb276e
diff --git a/dev-lang/nprolog/files/nprolog-3.88-makefile-CURSES_CFLAGS-edlog-rule.patch b/dev-lang/nprolog/files/nprolog-3.88-makefile-CURSES_CFLAGS-edlog-rule.patch
new file mode 100644
index 000000000000..d46620dbcbfb
--- /dev/null
+++ b/dev-lang/nprolog/files/nprolog-3.88-makefile-CURSES_CFLAGS-edlog-rule.patch
@@ -0,0 +1,29 @@
+From 6e47a272b0a9491436ac732272be13431ee51161 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Bar=C4=87?= <xgqt@gentoo.org>
+Date: Mon, 27 Jan 2025 14:33:14 +0100
+Subject: [PATCH 1/2] makefile: add CURSES_CFLAGS to edlog rule
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Maciej Barć <xgqt@gentoo.org>
+---
+ makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/makefile b/makefile
+index 0d0734d..c2458e0 100644
+--- a/makefile
++++ b/makefile
+@@ -47,7 +47,7 @@ $(EDLOG): $(EDLOG_OBJS)
+ 	$(CC) $(LDFLAGS) $^ -o $@ $(CURSES_LIBS)
+ 
+ edlog.o: edlog.c edlog.h term.h
+-	$(CC) $(CFLAGS) -c edlog.c
++	$(CC) $(CFLAGS) -c edlog.c $(CURSES_CFLAGS)
+ 
+ install: $(NPL) $(EDLOG)
+ 	mkdir -p $(DEST)
+-- 
+2.45.3
+
diff --git a/dev-lang/nprolog/nprolog-3.36.ebuild b/dev-lang/nprolog/nprolog-3.36.ebuild
deleted file mode 100644
index 10615c8f8dda..000000000000
--- a/dev-lang/nprolog/nprolog-3.36.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Interpreter and compiler to be compatible with Arity/Prolog32"
-HOMEPAGE="https://github.com/sasagawa888/nprolog/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/sasagawa888/${PN}.git"
-else
-	SRC_URI="https://github.com/sasagawa888/nprolog/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-	KEYWORDS="amd64 ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-
-PATCHES=( "${FILESDIR}/${PN}-3.22-ncursesw.patch" )
-
-DOCS=( README{,-ja}.md document )
-
-src_prepare() {
-	if [[ -f edlog ]] ; then
-		rm edlog || die
-	fi
-
-	default
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe npl
-
-	insinto "/usr/share/${PN}"
-	doins -r example library
-
-	einstalldocs
-}
diff --git a/dev-lang/nprolog/nprolog-3.41.ebuild b/dev-lang/nprolog/nprolog-3.88.ebuild
index 39a1d076726e..439e10d62cbb 100644
--- a/dev-lang/nprolog/nprolog-3.41.ebuild
+++ b/dev-lang/nprolog/nprolog-3.88.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,20 +11,25 @@ HOMEPAGE="https://github.com/sasagawa888/nprolog/"
 if [[ "${PV}" == *9999* ]] ; then
 	inherit git-r3
 
-	EGIT_REPO_URI="https://github.com/sasagawa888/${PN}.git"
+	EGIT_REPO_URI="https://github.com/sasagawa888/${PN}"
 else
-	SRC_URI="https://github.com/sasagawa888/nprolog/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
+	SRC_URI="https://github.com/sasagawa888/${PN}/archive/refs/tags/%EF%BD%96${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+	S="${WORKDIR}/${PN}--${PV}"
 
 	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="BSD-2"
 SLOT="0"
+IUSE="doc"
 
-PATCHES=( "${FILESDIR}/${PN}-3.22-ncursesw.patch" )
+PATCHES=(
+	"${FILESDIR}/nprolog-3.22-ncursesw.patch"
+	"${FILESDIR}/nprolog-3.88-makefile-CURSES_CFLAGS-edlog-rule.patch"
+)
 
-DOCS=( README{,-ja}.md document )
+DOCS=( README{,-ja}.md )
 
 src_prepare() {
 	if [[ -f edlog ]] ; then
@@ -45,5 +50,11 @@ src_install() {
 	insinto "/usr/share/${PN}"
 	doins -r example library
 
+	if use doc ; then
+		DOCS+=( document )
+
+		docompress -x "/usr/share/doc/${PF}/document"
+	fi
+
 	einstalldocs
 }