gentoo resync : 16.04.2018

3 files changed, 57 insertions, 2 deletions

diff --git a/dev-games/ode/Manifest b/dev-games/ode/Manifest
index 80e4b410810d..483a77d966f2 100644
--- a/dev-games/ode/Manifest
+++ b/dev-games/ode/Manifest
@@ -1,7 +1,8 @@
+AUX ode-0.14-gcc7.patch 2580 BLAKE2B 2f39faf4ad093cb8ec4ad17dc3a72212081f48386566d652bbdc9c2056605ac943144122ad56d5a2c3b797b5275a628e2160a5a02b1ddf7f248053518a73e536 SHA512 d758281bb2f390aab6b793871f8f7e3224e486e6e4d4bc7e9bd0e9e9a9d97ca6f0f7775c3c86478256870e6b76383a6792787f9135e2b7f61e8cea95e6141f8d
 DIST ode-0.11.1.tar.bz2 1720088 BLAKE2B 0908356d45e9b17af80cc2afefd3a09735c4955d0a03b502a60f0bd01023796c3b00b1caf379eac354d7754035db11bcdf802c1ecc72abd28a9fce7e1dd7eef1 SHA512 1e015231f4d01c68e7539144d197031cca23d4b58ea53733184a826ce23388956c428a53385254e7eed2c5d3fc28224a688eb13be7ea648bd78e186c8f203d37
 DIST ode-0.12.tar.bz2 1816246 BLAKE2B 7ac4b9158f6672775e0374a619f71a178cb8a3a1cf8c957d67c2547081a9dd660a091923fec364133dfbe4cd6b82cfe14961bda8994bb6241aa9e1af61ef22ef SHA512 303ffda8afcb89a87d09c44393f590f5646f10e8959ca06746121859ad2407709cd711ab185fed4817a9f74c9ca4ee13d1698a28577211bf65dbaad1141f6fc0
 DIST ode-0.14.tar.gz 2132897 BLAKE2B 840f7c368590f549b832a18ebda1a653a0a690b29951dcc4480b95e5dcd8105790ff8d79577fcc8d0cc7bef067f67b505645ec482b1417262ac154ba589020d8 SHA512 356c3edd10274a00516c459035180c74e611fffba42b7674fbf1ee5225a27b54dfeb5eeeaa2ff85ecd2fdea5f634e2732df38333b58c4a43f7befa25ba321927
 EBUILD ode-0.11.1.ebuild 1523 BLAKE2B 41b6f81d7678326a470a55d65a3a61fe4c02ae5e7c1069947949e764cc7c598533441bd677b1e950feefbbfffcb508de587e27bdddfd7c04e607d956a8d94711 SHA512 f95c9219f3893d8d50a1f2345bb90c5b4fc5e17d57d9efe95d01521fa2c0f55bfe9b4948530f348da36f72e592bdadad70e31cf092a52aa6bc0d8fe4d20060d6
 EBUILD ode-0.12.ebuild 1547 BLAKE2B acf20b75b3c3460c1284b2f8377b4b5b10bdc61d1fdd49ee55bdf1d3ac918890b36e207bd839a14a348f4c8cca8242d327a199d622e8068d106741a3631ba480 SHA512 5d10471b3c81236437ba5d380f6cf1796a5f5e3a84cb7b5f91dcfd0d6f4409302c6c5b212f3c51c552a0067ae3b94df91bbe6da8a20fe381026c25069cdba0e5
-EBUILD ode-0.14-r1.ebuild 1645 BLAKE2B 7ddde38a4070a02583ebdaa3f663364e41d4c05d8e33464d41ac77d2d04645c85eb3a0ff396647e8bc317ee0acabdad0f019aaeb143ad2e60a2240abc06525da SHA512 838033419f3ef7226ea7d5375b812d4dc2e8ecf74741f288b318449ce0724a22f5c2fc85008add57eeb7adf20b1d297a7d2afdc29e69f579b77aa5de3c94a712
+EBUILD ode-0.14-r1.ebuild 1690 BLAKE2B 0b17a98e215e9e64735a6c3dc0337adf5f468e0e6051fc205d38712e6237c9380d833059a837eb1d31364e8bbfee1dc301a9c6e63762fad4c15808c591445681 SHA512 2a0d6e98d8dc2f2e553b2f1760a23b1d39b5e598fcbcd1da8f5bd5af04077b34b34829005a3cbb15eb3ccd554abc7157a6d381ba49ef15246b1ad1967ac42bff
 MISC metadata.xml 917 BLAKE2B 09ae21e95ce0c14de1507aaeec9e40e0c231708dcc55d741a12cae6d55d1a29235c385432e2bb5cbf8a6928e22ff56382be73bce0f84c024e32643697ccd9240 SHA512 46b02d068b5ae22dd6a7cf7e56f4525c377e5c6f35476842f76523c0f0c8582342f46e0972a99195469d59d9f0136b255c35159f91dbe98004cb9c00ea24ca8e
diff --git a/dev-games/ode/files/ode-0.14-gcc7.patch b/dev-games/ode/files/ode-0.14-gcc7.patch
new file mode 100644
index 000000000000..aad0117f3bec
--- /dev/null
+++ b/dev-games/ode/files/ode-0.14-gcc7.patch
@@ -0,0 +1,52 @@
+Bug: https://bugs.gentoo.org/646538
+Upstream commit: https://bitbucket.org/odedevs/ode/commits/6f44023660dc830147a56314ea0627a23f11ad86
+
+# HG changeset patch
+# User oleh_derevenko <>
+# Date 1521993135 -10800
+# Node ID 6f44023660dc830147a56314ea0627a23f11ad86
+# Parent  6a68227619feebf85513331d7320b5a89eadf44f
+Fixed: Command line parameter validation errors have been fixed in some demos (reported by Peter Levine)
+
+diff --git a/ode/demo/demo_jointPR.cpp b/ode/demo/demo_jointPR.cpp
+--- a/ode/demo/demo_jointPR.cpp
++++ b/ode/demo/demo_jointPR.cpp
+@@ -328,8 +328,8 @@
+             if (0 == strcmp("-t", argv[i]) || 0 == strcmp("--texture-path", argv[i]))
+             {
+                 int j = i+1;
+-                if ( j+1 > argc      ||  // Check if we have enough arguments
+-                        argv[j] == '\0' ||  // We should have a path here
++                if ( j >= argc      ||  // Check if we have enough arguments
++                        argv[j][0] == '\0' ||  // We should have a path here
+                         argv[j][0] == '-' ) // We should have a path not a command line
+                     Help(argv);
+                 else
+diff --git a/ode/demo/demo_jointPU.cpp b/ode/demo/demo_jointPU.cpp
+--- a/ode/demo/demo_jointPU.cpp
++++ b/ode/demo/demo_jointPU.cpp
+@@ -575,8 +575,8 @@
+ 
+       if (0 == strcmp ("-t", argv[i]) || 0 == strcmp ("--texture-path", argv[i]) ) {
+         int j = i+1;
+-        if ( j+1 > argc      ||  // Check if we have enough arguments
+-             argv[j] == '\0' ||  // We should have a path here
++        if ( j >= argc      ||  // Check if we have enough arguments
++             argv[j][0] == '\0' ||  // We should have a path here
+              argv[j][0] == '-' ) // We should have a path not a command line
+           Help (argv);
+         else
+diff --git a/ode/demo/demo_piston.cpp b/ode/demo/demo_piston.cpp
+--- a/ode/demo/demo_piston.cpp
++++ b/ode/demo/demo_piston.cpp
+@@ -658,8 +658,8 @@
+                 if ( 0 == strcmp ("-t", argv[i]) || 0 == strcmp ("--texture-path", argv[i]) )
+                 {
+                     int j = i+1;
+-                    if ( j+1 > argc      ||  // Check if we have enough arguments
+-                            argv[j] == '\0' ||  // We should have a path here
++                    if ( j >= argc      ||  // Check if we have enough arguments
++                            argv[j][0] == '\0' ||  // We should have a path here
+                             argv[j][0] == '-' ) // We should have a path not a command line
+                         Help (argv);
+                     else
diff --git a/dev-games/ode/ode-0.14-r1.ebuild b/dev-games/ode/ode-0.14-r1.ebuild
index 08bd2181affa..6cb52f0998f7 100644
--- a/dev-games/ode/ode-0.14-r1.ebuild
+++ b/dev-games/ode/ode-0.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,6 +22,8 @@ DEPEND="${RDEPEND}
 MY_EXAMPLES_DIR=/usr/share/doc/${PF}/examples
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.14-gcc7.patch
+
 	sed -i \
 		-e "s:\$.*/drawstuff/textures:${MY_EXAMPLES_DIR}:" \
 		drawstuff/src/Makefile.am \