gentoo resync : 02.05.2018

4 files changed, 30 insertions, 30 deletions

diff --git a/games-puzzle/construo/Manifest b/games-puzzle/construo/Manifest
index f0a61e4ed5f8..6f0031e82025 100644
--- a/games-puzzle/construo/Manifest
+++ b/games-puzzle/construo/Manifest
@@ -1,5 +1,5 @@
-AUX construo-0.2.2-gcc43.patch 1785 BLAKE2B 5dcfbdfcc63bf4150e4d3667527660bf715fbb5fa588250cec5be8ca0451b814f966267fd88e5fc5c4776d9fa0aed2a776baea69d9c4db58c2b4640b3ff31cc0 SHA512 25b226897804de23fa45f89a2b94bc86f69766916180f61d6c59e7a47c69b6b574fe649a9d6e37d8488600747210e06adde7a5fed26b4fea4663e32e46d13d42
-AUX construo-0.2.2-lGLU.patch 425 BLAKE2B a231ac485cdb9af52479199795674a2d87d60bdc81e870224dfdc08a92e56353dfd58b3521673e683a3ad2c6d32c112c8fc682410c6d2d55a420a78bd71b85a9 SHA512 a450d5dee7f71d649b2d7d853875576701311de7c6dee2f21217d07dce59f19226dabe3be99d85f74454a690ce409cf7450c8f1cbe942f7388cfde2be5a05208
+AUX construo-0.2.2-gcc43.patch 1813 BLAKE2B 514c17651894fa7f991abe397696fae5de567579730635d6b115cfe18099bd98a575e7bb104f73607b0809be90b7e882d41a72875fc4d34801694ec4c6479c6d SHA512 5865311df15e510a4212778cf7bfc2cf82c60449841f3d9717b4d04a2a241977319296b7696567a39c95e16b1f94fe2959c9eb8775b3b56b0e804335c73159ed
+AUX construo-0.2.2-lGLU.patch 429 BLAKE2B da44fd32544394f66fd0ab5f5cda3cccf0cbe65646b73d38b672902cc639355ddb9bbbfe8f6255fc9253fe78444468593dfffc7d6bf9c6b69aa16dfa0027a314 SHA512 2fcba9fdc7f96bd802341a42bba33ca659152421d1ba7f6a1d56a5de75f5811ee08298831f1c3951e364600146364e64efdc9a67a45bb9f946ab19867bff27b2
 DIST construo-0.2.2.tar.gz 442626 BLAKE2B c6c9c566c8e4014aba1e06d12af2c3c3076d533a9f11513e903a6fff027ecbd3b492c1ca35a50b42dbd0aea5064614147529f2dcfd6b75af2376a7a410fdc470 SHA512 b73854a64aedcb9ddcd8f2c3e809f975ef3d2f63bdefd2e126c808a4154d7ff3d402457f9da5f866e6b9d74c6010ffc58d44b04277976fe1a9aeabc20ea786a9
-EBUILD construo-0.2.2.ebuild 821 BLAKE2B 4b053fc9d4e98183075bf8d87d3ec72b4befd062c357f870cba9bd7761b39391a4c7aa878701f628cfb225c242e5e2764a4f829c12b5823eff551149ed0fdc63 SHA512 70f125e1ce726ec0e78f304956d947dbed0931057871cf11d7e5337434063ab31c454946f3efb1f156098a76b4fc96ffcfbaa1a0e9d53cf4074ae373c030373a
+EBUILD construo-0.2.2-r1.ebuild 836 BLAKE2B 4268fff99a65022d6d2903b831e4ecb09d2583cdacaf0511d06bb422e94004bde92e323afdee1ed4999cdb376b933ac7d7b907db292618c509e8a6fb9fc969a3 SHA512 64de5fbaddb4a5287cebf8b609b5fb9f820ad2e2295e19369211e3334e6ac9f64dd857d953b92a6134f3d93c4c0fb54636a8ab90b47cd68e860055b1838824d0
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/construo/construo-0.2.2.ebuild b/games-puzzle/construo/construo-0.2.2-r1.ebuild
index d74b179844e6..1f7406534412 100644
--- a/games-puzzle/construo/construo-0.2.2.ebuild
+++ b/games-puzzle/construo/construo-0.2.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils autotools games
+EAPI=6
+inherit autotools desktop
 
 DESCRIPTION="2d construction toy with objects that react on physical forces"
 HOMEPAGE="http://www.nongnu.org/construo/"
@@ -13,26 +13,26 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="virtual/opengl
+RDEPEND="
+	virtual/opengl
 	virtual/glu
 	media-libs/freeglut
-	x11-libs/libXxf86vm"
+	x11-libs/libXxf86vm
+"
 DEPEND="${RDEPEND}
 	x11-proto/xf86vidmodeproto"
 
 src_prepare() {
-	epatch \
+	default
+	eapply \
 		"${FILESDIR}"/${P}-gcc43.patch \
 		"${FILESDIR}"/${P}-lGLU.patch
 	sed -i -e 's/^bindir=.*/bindir=@bindir@/' Makefile.am || die
 	eautoreconf
 }
 
-src_configure() {
-	egamesconf --datadir="${GAMES_DATADIR_BASE}"
-}
-
 src_install() {
 	default
-	prepgamesdirs
+	make_desktop_entry "${PN}.glut" "${PN}.glut"
+	make_desktop_entry "${PN}.x11" "${PN}.x11"
 }
diff --git a/games-puzzle/construo/files/construo-0.2.2-gcc43.patch b/games-puzzle/construo/files/construo-0.2.2-gcc43.patch
index cc946b043bae..48165ed21df0 100644
--- a/games-puzzle/construo/files/construo-0.2.2-gcc43.patch
+++ b/games-puzzle/construo/files/construo-0.2.2-gcc43.patch
@@ -1,5 +1,5 @@
---- command_line.cxx
-+++ command_line.cxx
+--- a/command_line.cxx
++++ b/command_line.cxx
 @@ -19,7 +19,9 @@
  
  #include <config.h>
@@ -11,8 +11,8 @@
  #include "settings.hxx"
  #include "command_line.hxx"
  
---- config.hxx
-+++ config.hxx
+--- a/config.hxx
++++ b/config.hxx
 @@ -21,6 +21,7 @@
  #define CONFIG_HH
  
@@ -21,8 +21,8 @@
  
  class Config
  {
---- lisp_reader.cxx
-+++ lisp_reader.cxx
+--- a/lisp_reader.cxx
++++ b/lisp_reader.cxx
 @@ -17,6 +17,7 @@
  //  along with this program; if not, write to the Free Software
  //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -31,8 +31,8 @@
  #include "construo_error.hxx"
  #include "lisp_reader.hxx"
  
---- unix_system.cxx
-+++ unix_system.cxx
+--- a/unix_system.cxx
++++ b/unix_system.cxx
 @@ -17,8 +17,9 @@
  //  along with this program; if not, write to the Free Software
  //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -45,8 +45,8 @@
  #include <unistd.h>
  #include <sys/time.h>
  #include <time.h>
---- vector.cxx
-+++ vector.cxx
+--- a/vector.cxx
++++ b/vector.cxx
 @@ -16,8 +16,8 @@
  	totally replaced old CL_Vector with this code
  */
@@ -58,8 +58,8 @@
  #include "vector.hxx"
  
  CL_Vector::CL_Vector(float x, float y, float z, float w)
---- world.cxx
-+++ world.cxx
+--- a/world.cxx
++++ b/world.cxx
 @@ -17,7 +17,8 @@
  //  along with this program; if not, write to the Free Software
  //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -70,8 +70,8 @@
  #include <algorithm>
  #include "config.h"
  
---- x11_display.cxx
-+++ x11_display.cxx
+--- a/x11_display.cxx
++++ b/x11_display.cxx
 @@ -19,6 +19,7 @@
  
  #include <config.h>
diff --git a/games-puzzle/construo/files/construo-0.2.2-lGLU.patch b/games-puzzle/construo/files/construo-0.2.2-lGLU.patch
index 4c0b018cfdc1..be8e7b604d6f 100644
--- a/games-puzzle/construo/files/construo-0.2.2-lGLU.patch
+++ b/games-puzzle/construo/files/construo-0.2.2-lGLU.patch
@@ -1,5 +1,5 @@
---- configure.ac.old	2009-11-24 18:27:48.000000000 +0100
-+++ configure.ac	2009-11-24 18:28:29.000000000 +0100
+--- a/configure.ac.old	2009-11-24 18:27:48.000000000 +0100
++++ b/configure.ac	2009-11-24 18:28:29.000000000 +0100
 @@ -114,7 +114,7 @@
  AC_CHECK_LIB(glut, glutMainLoop,
  [