gentoo resync : 21.06.2020

5 files changed, 65 insertions, 102 deletions

diff --git a/games-sports/Manifest.gz b/games-sports/Manifest.gz
index 4f5dc2ee6e0c..c782e1898df3 100644
--- a/games-sports/Manifest.gz
+++ b/games-sports/Manifest.gz
diff --git a/games-sports/xmoto/Manifest b/games-sports/xmoto/Manifest
index 84df4095389e..02d3f938402b 100644
--- a/games-sports/xmoto/Manifest
+++ b/games-sports/xmoto/Manifest
@@ -1,5 +1,3 @@
-DIST inksmoto-0.7.0.tar.gz 2628941 BLAKE2B b8469739e6368f7b36b9a5b766522c295de43c001fba00975fb3c761ba6df34bf97e684ddf51aa83a6a41a1b800d64d6d6fe77358cf1244f193d3aad4746c6b5 SHA512 af0ae49ea160a2274f6835abd82ccaa00dc9ff81875b7d4ea29789388c131b519cb77e6da42efeaf51d52b97090c67320af38145204a1d5418781c99cb23a704
-DIST xmoto-0.5.11-src.tar.gz 40785573 BLAKE2B a1c19656ec5b206417ebdf5ac80e134ce7f29258d8a76f47bad4084ce4d2cdaeeecde1cf6cef1254a0832f21c50a49049947c1896681fe2dd8f3531ba22e7627 SHA512 7046745e8f7a045fa2ce1deb3fd75b73b233dc1092f5ecd6dd4e42938f70269a93a3a623a39a1f0520c90643a42dc1ce93c43ad07bf225ff6c50741cc02511f6
-DIST xmoto_0.5.11+dfsg-7.debian.tar.xz 25708 BLAKE2B e4029d9c66b176c6eebbf68c973cb726ef7b2522c6245ce626c7a61c13492f2e599c5a7deff4f2c853bc58d21afb4e53072a0ddc25a4e7bdb8b89b93fd44159a SHA512 d430fa37fdde90ac68e8ff4b7d2707ea5fc73fa8fab241f7a97b27e803a88321f0ea01b094a5f77ac7e43b2202113842b4f69a745e9212eead7ce4a0a5cd220c
-EBUILD xmoto-0.5.11-r2.ebuild 2537 BLAKE2B c111fd419e33e8857b213388b929228c0f38ebf7e40362d56361424dde60dd2a06c9263e3b244be94efc9f2ffc27e818333332bf32d35f8d88083b786fb65063 SHA512 2fbcc08d89ee592cc67d335a85ad500844a35bafcf3318e66fa5ece1e42e04c617099cbdd4ae87f0578ae7cdc37e6799ecbea8ae0ccf540c56c371820001ade3
-MISC metadata.xml 460 BLAKE2B 785042b620610aec6eebea61013723069e30dc1fd29cd64a74a59c721c55d6590131fd2c99094768b36917bded227c63f7560518e40367e0b295bb4c563956db SHA512 fa39571c69e439d293450292417de087a4f7da52a291b0d105e6c08af0c380b5d0bce20ac29851f837716d92152e77155c41fae58c38d31b941b0700ad0df2f8
+DIST xmoto-0.6.0.tar.gz 41635478 BLAKE2B 26db7b5664ea5f999f8fe481f58aede57319a75f7d7c6e9eb74c6b8d058137b44e3d00621995d8ff05dfe8d18b25d9688d80a1f12b54cdaf19920684a23c5fa3 SHA512 dad5183dec547db60f65a6461b59373890d11a4d984b1bbabc560a1ee3b5fbcb0fc53a5f2f52a5bdc29144d65ffa194f395b4f47f593b81a87de807ff79ba9cc
+EBUILD xmoto-0.6.0.ebuild 1565 BLAKE2B 9d1473210c81087cd8e4b38b776bf6db1637c45c585ccc49776310224df713cc7ea9394d98478990a0c58628d80f511c244082926eed575ca4b2dc4329603c49 SHA512 96cfe990e15a27af70c71502f8f3a3dbcc880ab6b399fc5e63bbd471bc4f4bed8566901fc2ae130a669d538f536fdd2a6f5fab108b5485601fbe907eb11801de
+MISC metadata.xml 367 BLAKE2B 269dd3789a9d4f6e39eb22ffc8193ab01d0345336f524e78f6ee9ec8fddeeb2add7f4b0cd7185bb4aaff043cc2f815e532de9762e00abb6100e87a2de1d5610d SHA512 953abe473876ce33a963dfd9c6752982413d8e0c47f0895156d7428a3a9b4ebc271b9ef993f3e9b65e4cd083220d8d09175aa31c7d5de009a07a93c89554b026
diff --git a/games-sports/xmoto/metadata.xml b/games-sports/xmoto/metadata.xml
index 5b72e0102ede..e62095b01817 100644
--- a/games-sports/xmoto/metadata.xml
+++ b/games-sports/xmoto/metadata.xml
@@ -7,6 +7,5 @@
   </maintainer>
   <use>
     <flag name="double-precision">more precise calculations at the expense of speed</flag>
-    <flag name="editor">Depend on inkscape, scripts to convert svg to level (svg2lvl)</flag>
   </use>
 </pkgmetadata>
diff --git a/games-sports/xmoto/xmoto-0.5.11-r2.ebuild b/games-sports/xmoto/xmoto-0.5.11-r2.ebuild
deleted file mode 100644
index 961735c04998..000000000000
--- a/games-sports/xmoto/xmoto-0.5.11-r2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic
-
-LVL_PV="0.7.0" #they unfortunately don't release both at the same time, why ~ as separator :(
-LVL="inksmoto-${LVL_PV}"
-DEB_PV=7
-DESCRIPTION="A challenging 2D motocross platform game"
-HOMEPAGE="https://xmoto.tuxfamily.org"
-SRC_URI="http://download.tuxfamily.org/xmoto/xmoto/${PV}/${P}-src.tar.gz
-	mirror://debian/pool/main/x/${PN}/${PN}_${PV}+dfsg-${DEB_PV}.debian.tar.xz
-	editor? ( http://download.tuxfamily.org/xmoto/svg2lvl/${LVL_PV}/${LVL}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="double-precision editor nls"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-db/sqlite:3
-	dev-games/ode[double-precision=]
-	dev-lang/lua:0[deprecated]
-	dev-libs/libxdg-basedir
-	dev-libs/libxml2
-	media-fonts/dejavu
-	media-libs/libpng:0
-	media-libs/libsdl[joystick,opengl]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-net
-	media-libs/sdl-ttf
-	net-misc/curl
-	virtual/jpeg:0
-	virtual/opengl
-	virtual/glu
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-RDEPEND="${RDEPEND}
-	editor? ( media-gfx/inkscape )"
-
-src_prepare() {
-	default
-
-	EPATCH_SOURCE="${WORKDIR}/debian/patches" \
-		epatch $(cat ${WORKDIR}/debian/patches/series)
-	use editor && rm -vf "${WORKDIR}"/extensions/{bezmisc,inkex}.py
-	sed -i \
-		-e '/^gettextsrcdir/s:=.*:= @localedir@/gettext/po:' \
-		po/Makefile.in.in || die
-	mv configure.{in,ac} || die
-	eautoreconf
-
-	rm -r "${S}"/src/ode || die
-}
-
-src_configure() {
-	# bug 653404
-	# due to ICU 59 requiring C++11 now
-	append-cxxflags -std=c++11
-
-	econf \
-		--enable-threads=posix \
-		$(use_enable nls) \
-		--localedir=/usr/share/locale \
-		--with-localesdir=/usr/share/locale \
-		--with-renderer-sdlGfx=0 \
-		--with-renderer-openGl=1
-}
-
-src_install() {
-	default
-
-	rm -f "${D}/usr/share/xmoto"/Textures/Fonts/DejaVu*.ttf
-	dosym ../../../fonts/dejavu/DejaVuSans.ttf /usr/share/xmoto/Textures/Fonts/DejaVuSans.ttf
-	dosym ../../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/xmoto/Textures/Fonts/DejaVuSansMono.ttf
-	doicon extra/xmoto.xpm
-	make_desktop_entry xmoto Xmoto
-
-	if use editor; then
-		insinto /usr/share/inkscape/
-		doins -r "${WORKDIR}"/extensions/
-	fi
-}
-
-pkg_postinst() {
-	if use editor; then
-		elog "If you want to know how to create Xmoto levels"
-		elog "have a look at this Tutorial:"
-		elog "    http://wiki.xmoto.tuxfamily.org/index.php?title=Inksmoto-${LVL_PV}"
-		elog "You can share your levels on the Xmoto homepage."
-	fi
-}
diff --git a/games-sports/xmoto/xmoto-0.6.0.ebuild b/games-sports/xmoto/xmoto-0.6.0.ebuild
new file mode 100644
index 000000000000..c09b474d57ff
--- /dev/null
+++ b/games-sports/xmoto/xmoto-0.6.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A challenging 2D motocross platform game, where physics play an important role"
+HOMEPAGE="https://xmoto.tuxfamily.org"
+SRC_URI="https://github.com/xmoto/xmoto/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="double-precision +nls"
+
+RDEPEND="app-arch/bzip2
+	dev-db/sqlite:3
+	dev-games/ode[double-precision=]
+	dev-lang/lua:0[deprecated]
+	dev-libs/libxdg-basedir
+	dev-libs/libxml2
+	media-fonts/dejavu
+	media-libs/libpng:0=
+	media-libs/libsdl[joystick,opengl]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-net
+	media-libs/sdl-ttf
+	net-misc/curl
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	virtual/glu
+	virtual/opengl
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	sed -e "/^Icon/s/.xpm//" -i extra/xmoto.desktop || die
+	sed -e "/add_subdirectory.*\(bzip2\|libccd\|lua\|ode\|xdgbasedir\)/d" -i src/CMakeLists.txt || die
+	rm -rf vendor/{bzip2,lua,ode,xdgbasedir} || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_GETTEXT=$(usex nls)
+		-DOpenGL_GL_PREFERENCE=GLVND
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	rm -f "${ED}/usr/share/xmoto"/Textures/Fonts/DejaVuSans{Mono,}.ttf || die
+	dosym ../../../fonts/dejavu/DejaVuSans.ttf /usr/share/xmoto/Textures/Fonts/DejaVuSans.ttf
+	dosym ../../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/xmoto/Textures/Fonts/DejaVuSansMono.ttf
+}