[gentoo-commits] repo/proj/guru:master commit in: net-client/lagrange/

["Haelwenn Monnier" <contact@hacktivis.me>]

commit:     ed8238ddae1281d26653825696d5f9a054ef23a1
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Tue Nov  7 12:38:42 2023 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Tue Nov  7 12:45:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ed8238dd

net-client/lagrange: add 1.17.3, drop 1.16.5

* Rename "fribidi" flag to global "bidi"
* Add "debug" flag to toggle debug definitions on/off

Closes: https://bugs.gentoo.org/916843
Bug: https://bugs.gentoo.org/916604
Bug: https://bugs.gentoo.org/916603
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 net-client/lagrange/Manifest                            |  4 ++--
 .../{lagrange-1.16.5.ebuild => lagrange-1.17.3.ebuild}  | 17 +++++++++--------
 net-client/lagrange/metadata.xml                        |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/net-client/lagrange/Manifest b/net-client/lagrange/Manifest
index 7c694d5665..cb1cc6b8d8 100644
--- a/net-client/lagrange/Manifest
+++ b/net-client/lagrange/Manifest
@@ -1,4 +1,4 @@
-DIST lagrange-1.16.5.tar.gz 10141202 BLAKE2B 52c8142d88fb16435f2a55d40652e80a2f6bc310afc577aeb70f987bb7d0c630fac8cf350f643e40e2833fe9b717256571d9156f06f1f00fca9e4e8f86f96d54 SHA512 498934d2da6122e63eb6edd773dd5e556b5620192d2d6558113947a62bb73ec6078422947248a1446f640b4a8641cc88571d9de2b26a00ee5496be5c916aa1c3
-DIST lagrange-1.16.5.tar.gz.sig 488 BLAKE2B 34ce216b067eb325912227a75a93678ab251ceee5e157dc829e78616c49027eb00ac03a834be4043eab65afef866bee40aa8660de13d8654a0db46b403b6f306 SHA512 c282d30efb8b1afbead55ce9bf749ffd2fd312e41fc40fef5bc2e431dc238b64542458da0bcc87f57aee9bcf9c7ea9a40d4dc2c6de3af9bd2df4aa4caae4c435
 DIST lagrange-1.17.2.tar.gz 10205442 BLAKE2B 9b0e15e0c2dca86772d242f1ee13074374ad22f72268176bf0226ac17ffd8320194a89e66ab11a2685a482ba237f33c52deb381072e41e6ae56eb28d0fe6395f SHA512 f07f46711f906e4010b596f633978f0aec4a441c0bcc17182cada3af5550339d3743bb1c6ec537b0d99458ca87e8783bbc66477c45c31d467a152bc03bdf14ec
 DIST lagrange-1.17.2.tar.gz.sig 488 BLAKE2B ad8781826c60baa6cb4bd12b66f178659a3d1acde4edd2c2c0c12886496e7d97a2fd53a7d3934dd11cc4e416846d3b361b5fa39f6bf60f29ebbeb4f9a8a5864b SHA512 48c63340700e5596e02476fc87ec0f4d52880ffd6a2390ae6e282f4d17c956bfe924779bb7fd6a71ba99209ae3a0b1bd4515e1098948bb4cad1b50caa4823500
+DIST lagrange-1.17.3.tar.gz 10204884 BLAKE2B 58a634745ddf22f7ae3be339bb1cb28045218e9531ce2b9823a0cbab4a0fac468c7d2e7be1771a410c27309eab8379d2023aaa31fc1ab39d572591a68059737e SHA512 5ab916be3c53cde8538d389f5566cb11e699f9a2811fd3d2c6accacb7b794bea9d5121d595e739b07061e34d8f76113a6223053b0d05edb3dda7444df7bd731a
+DIST lagrange-1.17.3.tar.gz.sig 488 BLAKE2B 06f3caeb9ea44e412afd1baf324000fb781f3f39212cd5b4abb0b4eac4f8f1a3b6494226376d41f39e16eafb45c12f308821655eee648cd681dc3268a8069817 SHA512 82c83bfc1985bb5b6ceffe6dbed35a6eaae28e47d50cc4133a35343097837efbd92f06fd81aec4523fb5e3e949f8be3d6d210f24158a9113d354b789d046b418

diff --git a/net-client/lagrange/lagrange-1.16.5.ebuild b/net-client/lagrange/lagrange-1.17.3.ebuild
similarity index 81%
rename from net-client/lagrange/lagrange-1.16.5.ebuild
rename to net-client/lagrange/lagrange-1.17.3.ebuild
index 2efe2d463f..95ffe7a1f8 100644
--- a/net-client/lagrange/lagrange-1.16.5.ebuild
+++ b/net-client/lagrange/lagrange-1.17.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake verify-sig xdg
+inherit cmake flag-o-matic verify-sig xdg
 
 DESCRIPTION="Desktop GUI client for browsing Geminispace"
 HOMEPAGE="https://gmi.skyjake.fi/lagrange/ https://git.skyjake.fi/gemini/lagrange"
@@ -13,17 +13,17 @@ SRC_URI="https://git.skyjake.fi/gemini/${PN}/releases/download/v${PV}/${P}.tar.g
 LICENSE="|| ( MIT Unlicense ) Apache-2.0 BSD-2 CC-BY-SA-4.0 OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X +fribidi +harfbuzz mp3 ncurses webp"
+IUSE="X +bidi debug gui +harfbuzz mp3 webp"
 
 RDEPEND="
-	>=dev-libs/tfdn-1.4.0:=[ssl]
+	>=dev-libs/tfdn-1.7.0:=[ssl]
 	X? ( x11-libs/libX11 )
-	fribidi? ( dev-libs/fribidi )
-	ncurses? ( >=dev-libs/sealcurses-2.0.18_pre20230206:= )
-	!ncurses? (
+	bidi? ( dev-libs/fribidi )
+	gui? (
 		harfbuzz? ( media-libs/harfbuzz:=[truetype(+)] )
 		media-libs/libsdl2[X?,sound(+),video(+)]
 	)
+	!gui? ( >=dev-libs/sealcurses-2.0.18_pre20230206:= )
 	mp3? ( media-sound/mpg123 )
 	webp? ( media-libs/libwebp:= )
 "
@@ -48,9 +48,9 @@ src_configure() {
 	# note: do not add use flags that don't pull dependencies
 	# and only choose which files to compile (e.g. "ipc")
 	local -a mycmakeargs=(
-		-DENABLE_FRIBIDI=$(usex fribidi)
+		-DENABLE_FRIBIDI=$(usex bidi)
 		-DENABLE_HARFBUZZ=$(usex harfbuzz)
-		-DENABLE_TUI=$(usex ncurses)
+		-DENABLE_TUI=$(usex !gui)
 		-DENABLE_MPG123=$(usex mp3)
 		-DENABLE_WEBP=$(usex webp)
 		-DENABLE_X11_XLIB=$(usex X)
@@ -60,5 +60,6 @@ src_configure() {
 		-DENABLE_HARFBUZZ_MINIMAL=OFF
 	)
 
+	append-cppflags $(usex debug "-UNDEBUG" "-DNDEBUG")
 	cmake_src_configure
 }

diff --git a/net-client/lagrange/metadata.xml b/net-client/lagrange/metadata.xml
index bc45d9f2c6..e6d234b5ce 100644
--- a/net-client/lagrange/metadata.xml
+++ b/net-client/lagrange/metadata.xml
@@ -17,7 +17,7 @@
 	secure communications.
 </longdescription>
 <use>
-	<flag name="fribidi">Use <pkg>dev-libs/fribidi</pkg> for bidirectional text</flag>
+	<flag name="fribidi" restrict="&lt;net-client/lagrange-1.17.3">Use <pkg>dev-libs/fribidi</pkg> for bidirectional text</flag>
 	<flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> to shape text</flag>
 </use>
 <upstream>