gentoo resync : 29.03.2018

4 files changed, 12 insertions, 15 deletions

diff --git a/games-sports/Manifest.gz b/games-sports/Manifest.gz
index d5906c1d7d14..24e856bb2891 100644
--- a/games-sports/Manifest.gz
+++ b/games-sports/Manifest.gz
diff --git a/games-sports/xmoto/Manifest b/games-sports/xmoto/Manifest
index d6107a375531..94a95ef5052b 100644
--- a/games-sports/xmoto/Manifest
+++ b/games-sports/xmoto/Manifest
@@ -1,5 +1,5 @@
 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-6.debian.tar.xz 25240 BLAKE2B a1509cc25eca4f56e6bdad04aecf2cd63d9a2515b7dc7cebce64cde09de770636707a8344efda1e73d078185abdbaf0eaddeb1466081e4465e779f702866f8c2 SHA512 961f97a3427e77cf020d73820ff99fdc0ca81e5953a18ed9386a1b476eb2af897073adcd7141e993fbf4f8fdca9efdab8cf20b89bfc31196afdcb4f2095ab390
-EBUILD xmoto-0.5.11-r1.ebuild 2604 BLAKE2B 1599aeb703f0b7077eea1c96598f1780cbf2a78570e7f2dc71670eb149ec12bdbc9d932c422a67b7ebbc04f02504d19fbd8399fca93aeeb93b485c296edd28e4 SHA512 4b8e1c280fe9bd3d1dd1bc1f3f54201cf7564fe67080462335c16fca93bc24ab302713fbe3278aef404fe2f2952dd70968365736194f57db29d8569b1a4d2c1d
-MISC metadata.xml 369 BLAKE2B 982ebe973be2bb3d72718d5f714854fdeb083ae23535fbd80d3c0c3c8016dd5a6f1f83c104afd0e71e21df9c2c9d1c32b2069d2065816be1bc6b902190ceb548 SHA512 392f5a45194ba2a42e56516d171862c7255094d88b5cce82a3e8135441399b02dd4d35c98e3649de3a4c7fd3212f31582a00a6118acee7216e6537ea17388cd8
+DIST xmoto_0.5.11+dfsg-7.debian.tar.xz 25708 BLAKE2B e4029d9c66b176c6eebbf68c973cb726ef7b2522c6245ce626c7a61c13492f2e599c5a7deff4f2c853bc58d21afb4e53072a0ddc25a4e7bdb8b89b93fd44159a SHA512 d430fa37fdde90ac68e8ff4b7d2707ea5fc73fa8fab241f7a97b27e803a88321f0ea01b094a5f77ac7e43b2202113842b4f69a745e9212eead7ce4a0a5cd220c
+EBUILD xmoto-0.5.11-r2.ebuild 2459 BLAKE2B 7a8e5fe54a7b1465bea36fdd341589d5d541f2a234685cf9736a10af625868ff5503c0d080af5f80ffe8fb6e789959546f181d326709ce8b8690cf2436e32c52 SHA512 01834822995df2ac663cee63121f93cfae467cd2f549adbdd398975569aad91fbaa346968c50d5731b40fbd974a502fae9a3bc033ca34405b6faad0aa741702d
+MISC metadata.xml 460 BLAKE2B 785042b620610aec6eebea61013723069e30dc1fd29cd64a74a59c721c55d6590131fd2c99094768b36917bded227c63f7560518e40367e0b295bb4c563956db SHA512 fa39571c69e439d293450292417de087a4f7da52a291b0d105e6c08af0c380b5d0bce20ac29851f837716d92152e77155c41fae58c38d31b941b0700ad0df2f8
diff --git a/games-sports/xmoto/metadata.xml b/games-sports/xmoto/metadata.xml
index 23c7b787914a..5b72e0102ede 100644
--- a/games-sports/xmoto/metadata.xml
+++ b/games-sports/xmoto/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Games Project</name>
   </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-r1.ebuild b/games-sports/xmoto/xmoto-0.5.11-r2.ebuild
index b6e40c184637..4a48f02abbc4 100644
--- a/games-sports/xmoto/xmoto-0.5.11-r1.ebuild
+++ b/games-sports/xmoto/xmoto-0.5.11-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ 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=6
+DEB_PV=7
 DESCRIPTION="A challenging 2D motocross platform game"
 HOMEPAGE="http://xmoto.tuxfamily.org"
 SRC_URI="http://download.tuxfamily.org/xmoto/xmoto/${PV}/${P}-src.tar.gz
@@ -16,12 +16,12 @@ SRC_URI="http://download.tuxfamily.org/xmoto/xmoto/${PV}/${P}-src.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="editor nls"
+IUSE="double-precision editor nls"
 
 RDEPEND="
 	app-arch/bzip2
 	dev-db/sqlite:3
-	dev-games/ode
+	dev-games/ode[double-precision=]
 	dev-lang/lua:0[deprecated]
 	dev-libs/libxdg-basedir
 	dev-libs/libxml2
@@ -53,15 +53,11 @@ src_prepare() {
 		po/Makefile.in.in || die
 	mv configure.{in,ac} || die
 	eautoreconf
+
+	rm -r "${S}"/src/ode || die
 }
 
 src_configure() {
-	# bug #289792
-	filter-flags -DdDOUBLE -DdSINGLE
-
-	# bug #569624 - ode-0.13 needs one or the other defined
-	append-cppflags -Dd$(has_version 'dev-games/ode[double-precision]' && echo DOUBLE || echo SINGLE)
-
 	econf \
 		--enable-threads=posix \
 		$(use_enable nls) \
@@ -75,8 +71,8 @@ src_install() {
 	default
 
 	rm -f "${D}/usr/share/xmoto"/Textures/Fonts/DejaVu*.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/xmoto/Textures/Fonts/DejaVuSans.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf /usr/share/xmoto/Textures/Fonts/DejaVuSansMono.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