gentoo resync : 28.04.2021

3 files changed, 76 insertions, 81 deletions

diff --git a/games-strategy/naev/Manifest b/games-strategy/naev/Manifest
index 08bbf4784d5e..bad28ceba79d 100644
--- a/games-strategy/naev/Manifest
+++ b/games-strategy/naev/Manifest
@@ -1,6 +1,5 @@
-DIST naev-0.7.0-ndata.zip 319608404 BLAKE2B e6edd79282171d4b327d220b33af37720e09f7137a26697de472e3494587525de5d9509865bfccc1093f5d4befa11faa10e0d4f4c59ea8621ecd8d564eb546fe SHA512 5fa8faad36e410f0d2af1c80e6fedbffdd020da72dc96b329ce623e9836490cfb515c1bb88719045491366ca96a32888374029eec6cd14ed86ac8597750995ca
-DIST naev-0.7.0.tar.bz2 1076658 BLAKE2B 582bbfbc16e33d16600c19928ed6810dfe5fd3165930e6a51ec9b65d25305cd0bbfaf6f4cced12c5b7f76163ed4dc36b7108e81f4a4e82dc626c6045d3fe769f SHA512 9f8a2912e9f4f29ed6e276b008d4010da3ccdd309de5bb4360c393f2704aa7aff6e18db9e5d3657b4229e911ddec9b2a3312cf182c3c48a91a007a91138d84ae
 DIST naev-0.8.1-source.tar.gz 359781119 BLAKE2B 021824b0af031af8ff2aa565989c3d7811fcbcdc082649f208e8318b0d69b1c3c27492936a6afdc38de9448aa0dcca2f8ef73879155217e34968f81246017aa6 SHA512 8f9aede300d06b0beae12d4809cc58ac740bc1934c2fa5fdb04452cd2eb63de697e0bbf2aacf5af4878b62eee30878ed50388ee8386fbb19f9d56cb7cad8d7f2
-EBUILD naev-0.7.0-r100.ebuild 1762 BLAKE2B a12a17eb355d9eee407e8d7f7ad67336f7d7fe67c91a1172edce75bc4f02f82ca617648690a66c3355306c89fec00824f367a1dd495da42cdb263ba5ffbfad63 SHA512 4999ea6b00f059bc257c5c2e13201cf2ad6f02e55d1b36251b2010ecb9b3739f493d333f231506317e1b719d2517541e089248ad3dfc088b78c1820530ed2ac5
+DIST naev-0.8.2-source.tar.gz 394232958 BLAKE2B 2e109636cb1d282bc8236c84ee40b9b96224baf70bf315677b6a02bf9c4c0059d34c5225c31b925a8c66c5995fd9ab8fc022816b66a7e1c174e017e3ebf5e956 SHA512 2ad120639efc13635370bb498d0a4100b2306779cf593e6aecffd331e0f4dec1b8af4729b2c4d484af1be9069d2ac7e47e17ebdc8ce65af878fcff9484f810b0
 EBUILD naev-0.8.1.ebuild 1552 BLAKE2B d398392bf128e0c2f64913d7225f8f46bc1e8e9e934a8e2bf6376339936a0341fc6c9beae7995bcdb55dab5b64cd7f788f820d23e8ea7f2a4ec9dc1a0fc8604c SHA512 e87e1bdd566a5fd1ad0b34955b258b8b75ff099102fcf74cd7885b3b8276b68c9ca66b9a9710e04164c71e792ec935f88cf092d57cd2adcdb1791657080039f7
+EBUILD naev-0.8.2.ebuild 1734 BLAKE2B 4820a0ba8a88f935ef6e96b948871c503224cdfcdecce2d0e25a266881343d02e514ca068f1bbdd64511289d872ff35a61150a8e5e2c976c1685b10a21aa5c85 SHA512 1e4028e470263c4a548a97f1a9281c5ff79b077a1dea0ac5a9a426296f4ce3a4925324c34e1ec5253e1cf2885a2fb4aa7fbe501408f82c940ac4097629cf18e8
 MISC metadata.xml 480 BLAKE2B 4d01de527c3e9c5d5b97dfc169be7b0639be97a2cfa75564b6f2f3f0543c783f9b2403b15471191ecd0b1cf6ddc97eb87d9e04d7f53fe9534fd3626398f02425 SHA512 48c3f9af6ccc92e0cd032f169c8febe7a954cc3b304717e329d2bc9f8d4fff4d9be72bcab2cbfa2c3b75c46ab85a044fe76c786638c062c2a8a9005f1fff6b54
diff --git a/games-strategy/naev/naev-0.7.0-r100.ebuild b/games-strategy/naev/naev-0.7.0-r100.ebuild
deleted file mode 100644
index b3122510f64c..000000000000
--- a/games-strategy/naev/naev-0.7.0-r100.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 luajit )
-
-inherit lua-single xdg-utils
-
-DESCRIPTION="A 2D space trading and combat game, in a similar vein to Escape Velocity"
-HOMEPAGE="https://naev.org/ https://github.com/naev/naev"
-SRC_URI="https://github.com/naev/naev/releases/download/v${PV}/${P}.tar.bz2
-	https://github.com/naev/naev/releases/download/v${PV}/${P}-ndata.zip"
-
-LICENSE="GPL-2 GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +mixer +openal"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="${LUA_DEPS}
-	media-libs/libsdl2[X,sound,video]
-	dev-libs/libzip
-	dev-libs/libxml2
-	>=media-libs/freetype-2:2
-	>=media-libs/libvorbis-1.2.1
-	>=media-libs/libpng-1.2:0=
-	virtual/glu
-	virtual/opengl
-	mixer? ( media-libs/sdl2-mixer )
-	openal? ( media-libs/openal )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-
-# This is so that only the source tarball is unpacked - the data file
-# is supposed to be installed *zipped*. This is why we do not need unzip
-# in BDEPEND in spite of what repoman/pkgcheck might say.
-src_unpack() {
-	unpack ${P}.tar.bz2
-}
-
-src_configure() {
-	econf \
-		--enable-lua=$(usex lua_single_target_luajit luajit shared) \
-		$(use_enable debug) \
-		$(use_with openal) \
-		$(use_with mixer sdlmixer)
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		appicondir=/usr/share/pixmaps \
-		appdatadir=/usr/share/metainfo \
-		Graphicsdir=/usr/share/applications \
-		install
-	insinto /usr/share/${PN}
-	newins "${DISTDIR}/${P}-ndata.zip" ndata
-
-	rm -f "${D}/usr/share/doc/${PF}/LICENSE"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-strategy/naev/naev-0.8.2.ebuild b/games-strategy/naev/naev-0.8.2.ebuild
new file mode 100644
index 000000000000..22f730350b05
--- /dev/null
+++ b/games-strategy/naev/naev-0.8.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{7..9} )
+inherit lua-single meson python-any-r1 virtualx xdg
+
+DESCRIPTION="A 2D space trading and combat game, in a similar vein to Escape Velocity"
+HOMEPAGE="https://naev.org/ https://github.com/naev/naev"
+SRC_URI="https://github.com/naev/naev/releases/download/v${PV}/${P}-source.tar.gz"
+
+LICENSE="GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +mixer nls +openal"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	${LUA_DEPS}
+	dev-libs/libzip
+	dev-libs/libxml2
+	media-libs/libsdl2[opengl,sound,video,X]
+	media-libs/libpng:0=
+	media-libs/freetype:2
+	sci-libs/suitesparse
+	virtual/glu
+	virtual/opengl
+	mixer? ( media-libs/sdl2-mixer )
+	nls? ( virtual/libintl )
+	openal? (
+		media-libs/libvorbis
+		media-libs/openal
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? (
+		app-doc/doxygen
+		dev-lua/ldoc
+	)
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	lua-single_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:lua51:lua5.1:g" meson.build || die
+	# meson can't into docdir!
+	sed -i -e "s:doc/naev:doc/${PF}:g" meson.build || die
+	sed -i -e "s:'doc/naev':get_option('datadir') / 'doc/${PF}':g" docs/meson.build || die
+	# remove license file from install
+	sed -i -e "/'LICENSE'/d" meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature doc docs_c)
+		$(meson_feature doc docs_lua)
+		$(meson_feature lua_single_target_luajit luajit)
+		$(meson_feature nls)
+		$(meson_feature openal)
+		$(meson_feature mixer sdl_mixer)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}