net-client/lagrange: add 1.18.0, drop 1.17.5

Signed-off-by: Anna (cybertailor) Vyalkova <[email protected]>
gentoo · Sep 22, 2024 · 3d7dd21 · 3d7dd21
1 parent f0b7687
commit 3d7dd21
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 17 deletions.
diff --git a/net-client/lagrange/Manifest b/net-client/lagrange/Manifest
@@ -1,4 +1,4 @@
-DIST lagrange-1.17.5.tar.gz 10213173 BLAKE2B 174d5d5065ecabf8fa4f5b7c2e5fe874349029ccec5b21e34fe43365ab6039dd512293274891f1acd0dcc031baa337841dd06c3afbd9832ba51ea8ff6140ef6e SHA512 64c145899c1cf48403af5c06b2ba529d8b8da9fa3ecb7aa2fb402c67a0e3ebb7011eff1fe5bb5f4f6e40edc70f13ec15719d8a8763f3a5809a49c45a6f75f6da
-DIST lagrange-1.17.5.tar.gz.sig 488 BLAKE2B 109f8250e40a83b2b1de7a0b1edc84278427e3ea19a244de61d360da7cff43e8ea3f77c6a5eeff220da3f3441a7f9bafea6513056bf409d3cb231f266fcacc21 SHA512 f0b338e676852cfface46b68d3b2b8622003ca269f47ffb93ffdf2dfd0159da0c9e4b7c118370207c8c887d71653e51df2065040b810c4a2115e612573400ee0
 DIST lagrange-1.17.6.tar.gz 10212490 BLAKE2B 1e1569fbdbfbec23af0e15ce44311851686e629a7e2a10365abdcdea91dc81edb2a8c6a28dd32c1049c169d2e6604216da6c8ddfa57b0e534265f2b1a5b1404b SHA512 d5f03d995557c676b9b540315c1cfb636f72382928d98a3e6f8d516295658a656a253fdc05327fe78b5a7d30121677a257e4fbfa0bcaa6b4bc2cf9ef617d8f32
 DIST lagrange-1.17.6.tar.gz.sig 488 BLAKE2B 497e27ed3b22dbc8a39859d81a515bca05352fb9b9a47e24752264053963c23e635623124dc2b7b4b21dcdfdbf1324e0eb8295fb8cda99efa4df9ef5f758eea1 SHA512 6d51665ce18c6bf488ad62822d8df648b1a0d6e1a512a304599642bfabb116f020beb71529c02b573a32e8fb276238c31f345016865882541adf374ccac36005
+DIST lagrange-1.18.0.tar.gz 10259982 BLAKE2B 41dbf36b9e2f6ba775ac5034230aac57ff7adbcf13eec34d226fe05a09133108465948c4df37e9b647dc1e30b57dd7d874a2a06f797d273381ccaef9f4e85485 SHA512 29f7e100f817c22a739ac6149ba59bc9271a834ae1f61586e4f2163137c562407d6af72c9ef2e07e37c0462662a6466a3f208d0213b4b2e2b3c8df76e61dd177
+DIST lagrange-1.18.0.tar.gz.sig 488 BLAKE2B 5fe97e8f97fff8fc4f683af43c5551ed68fbc8f6b653a738fbe88941a82ef4dc3998ffae4272fa3b5904ddc0cdd3f2cad6a6dc880a427093616b03af9d82c903 SHA512 69f49fe42f22f7c20f8f939a46e638513542ed45392099eb2d06e96c03e28d8788c0889f400240178871ae4e090d3d4df8dc824aa09461fee7c6f309cdd7bc8c
diff --git a/net-client/lagrange/lagrange-1.17.5.ebuild → net-client/lagrange/lagrange-1.18.0.ebuild b/net-client/lagrange/lagrange-1.17.5.ebuild → net-client/lagrange/lagrange-1.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,45 +13,53 @@ 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 +bidi debug gui +harfbuzz mp3 webp"
+IUSE="X +bidi debug +gui +harfbuzz mp3 ncurses opus webp"
+REQUIRED_USE="|| ( gui ncurses )"
 
 RDEPEND="
-	>=dev-libs/tfdn-1.7.0:=[ssl]
-	X? ( x11-libs/libX11 )
-	bidi? ( dev-libs/fribidi )
+	>=dev-libs/tfdn-1.9.0:=[ssl]
+	media-libs/libsdl2[X?,sound(+),video(+)]
 	gui? (
+		X? ( x11-libs/libX11 )
+		bidi? ( dev-libs/fribidi )
 		harfbuzz? ( media-libs/harfbuzz:=[truetype(+)] )
-		media-libs/libsdl2[X?,sound(+),video(+)]
+		mp3? ( media-sound/mpg123-base )
+		opus? ( media-libs/opusfile )
+		webp? ( media-libs/libwebp:= )
 	)
-	!gui? ( >=dev-libs/sealcurses-2.0.18_pre20230206:= )
-	mp3? ( media-sound/mpg123 )
-	webp? ( media-libs/libwebp:= )
+	ncurses? ( >=dev-libs/sealcurses-2.0.18_pre20230206:= )
 "
 DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
+	gui? (
+		X? ( x11-base/xorg-proto )
+	)
 "
 BDEPEND="
 	app-arch/zip
+	virtual/pkgconfig
 	verify-sig? ( sec-keys/openpgp-keys-skyjake )
 "
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/skyjake.asc"
 
 src_prepare() {
-	# checked by Depends.cmake
-	rm -r lib/the_Foundation/CMakeLists.txt || die
+	# remove libs that can be accidentally built by Depends.cmake
+	mv lib never-build-bundled-libs || die
 
 	cmake_src_prepare
 }
 
 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_GUI=$(usex gui)
+		-DENABLE_TUI=$(usex ncurses)
+
+		# note: do not add use flags that don't pull dependencies
+		# and only choose which files to compile (e.g. "ipc")
 		-DENABLE_FRIBIDI=$(usex bidi)
 		-DENABLE_HARFBUZZ=$(usex harfbuzz)
-		-DENABLE_TUI=$(usex !gui)
 		-DENABLE_MPG123=$(usex mp3)
+		-DENABLE_OPUS=$(usex opus)
 		-DENABLE_WEBP=$(usex webp)
 		-DENABLE_X11_XLIB=$(usex X)