gentoo resync : 08.07.2021

6 files changed, 68 insertions, 115 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 6bba06d0aeee..2c5e52836078 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/construo/Manifest b/games-puzzle/construo/Manifest
index da7032b36ddf..62e02eb491b3 100644
--- a/games-puzzle/construo/Manifest
+++ b/games-puzzle/construo/Manifest
@@ -1,5 +1,4 @@
-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-r1.ebuild 829 BLAKE2B 865546804f13c8a201789d3d13d6b60605d4b3ea14c5e7f4b40d67c0f807e5576cb042d18dc642d10befbb026edf0c322a449f2a739678de73edf01faf0986ba SHA512 268821a99a0f74fb7d33e3105a41cdcac1f430f0253ab1050f9b03c1ac49d5bd9f7c07a5f1f3de401ff710a2e2fdad3248446f8e02a46774ca0217f35224550b
+AUX construo-0.2.3-clang.patch 1944 BLAKE2B 670f9f5c7607872b303ab756cf04ea91020c8a7f8adbf1ae0026330c08fb62571d8ace6f4beca631a23564cfcb4f1959c23eba887d58ccc0b115af907679ae7a SHA512 ce9213ef6526e453bfa4a37bd095520ef821e02a22c963ec0af0bf8b1821c7134ecf7f30a7de568f03c60f6bb82c4a19649567838a2cbf8be8dbff33d403ca71
+DIST construo-0.2.3.tar.gz 585891 BLAKE2B 6970d9ce30553a72d59784d0e356705913fceaf8a7cf39873054f8122b29ffcda6757af8ce494fe989253e0e00de54d1d0c543d71403b65580ece6c1e8483be2 SHA512 b3b723e914fa3c08763b73cbd6ec340f70efefd28e2ff79e738cc5d71109304a90d2d0ddbd0277e587e4e134c5bd497dde15aebea2b318e5d3c07f339b769bf3
+EBUILD construo-0.2.3.ebuild 869 BLAKE2B 37f25cf2d0f5b46bed1c9bec7b657d63d99af0f5e587f7dd72cd403eec56d9a67f99321bec50faedfff0ba30d9f03436d0a78afc52c3e8601c25b3b552e426f4 SHA512 a3bd669066930866e34852b7f5badaecc0294782fc81905a0f198a51679f4bbc6203316c9e6a3d2f42cd95af150d74e8e800861c47dd4db921a159a08798c453
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/construo/construo-0.2.2-r1.ebuild b/games-puzzle/construo/construo-0.2.3.ebuild
index 4370d583ab81..89c4de46b053 100644
--- a/games-puzzle/construo/construo-0.2.2-r1.ebuild
+++ b/games-puzzle/construo/construo-0.2.3.ebuild
@@ -1,36 +1,40 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools desktop
+EAPI=7
+inherit autotools desktop toolchain-funcs
 
 DESCRIPTION="2d construction toy with objects that react on physical forces"
 HOMEPAGE="http://www.nongnu.org/construo/"
-SRC_URI="http://freesoftware.fsf.org/download/construo/construo.pkg/${PV}/${P}.tar.gz"
+SRC_URI="http://download-mirror.savannah.gnu.org/releases/construo/construo.pkg/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
-	virtual/opengl
-	virtual/glu
 	media-libs/freeglut
+	virtual/glu
+	virtual/opengl
 	x11-libs/libXxf86vm
 "
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
+PATCHES=(
+	"${FILESDIR}/construo-0.2.3-clang.patch"
+)
+
 src_prepare() {
 	default
-	eapply \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-lGLU.patch
-	sed -i -e 's/^bindir=.*/bindir=@bindir@/' Makefile.am || die
+	sed -i -e 's/^bindir=.*/bindir=@bindir@/' src/Makefile.am || die
 	eautoreconf
 }
 
+src_compile() {
+	emake AR=$(tc-getAR)
+}
+
 src_install() {
 	default
 	make_desktop_entry "${PN}.glut" "${PN}.glut"
diff --git a/games-puzzle/construo/files/construo-0.2.2-gcc43.patch b/games-puzzle/construo/files/construo-0.2.2-gcc43.patch
deleted file mode 100644
index 48165ed21df0..000000000000
--- a/games-puzzle/construo/files/construo-0.2.2-gcc43.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- a/command_line.cxx
-+++ b/command_line.cxx
-@@ -19,7 +19,9 @@
- 
- #include <config.h>
- #include <iostream>
--#include <stdio.h>
-+#include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
- #include "settings.hxx"
- #include "command_line.hxx"
- 
---- a/config.hxx
-+++ b/config.hxx
-@@ -21,6 +21,7 @@
- #define CONFIG_HH
- 
- #include <string>
-+#include <cstdlib>
- 
- class Config
- {
---- 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.
- 
-+#include <cstring>
- #include "construo_error.hxx"
- #include "lisp_reader.hxx"
- 
---- 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.
- 
--#include <stdio.h>
--#include <assert.h>
-+#include <cstdio>
-+#include <cassert>
-+#include <cstring>
- #include <unistd.h>
- #include <sys/time.h>
- #include <time.h>
---- a/vector.cxx
-+++ b/vector.cxx
-@@ -16,8 +16,8 @@
- 	totally replaced old CL_Vector with this code
- */
- 
--#include <assert.h>
--#include <math.h>
-+#include <cassert>
-+#include <cmath>
- #include "vector.hxx"
- 
- CL_Vector::CL_Vector(float x, float y, float z, float w)
---- 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.
- 
--#include <assert.h>
-+#include <cassert>
-+#include <cstring>
- #include <algorithm>
- #include "config.h"
- 
---- a/x11_display.cxx
-+++ b/x11_display.cxx
-@@ -19,6 +19,7 @@
- 
- #include <config.h>
- #include <iostream>
-+#include <cstring>
- #include <X11/Xutil.h>
- #include <X11/cursorfont.h>
- #include <X11/keysym.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
deleted file mode 100644
index be8e7b604d6f..000000000000
--- a/games-puzzle/construo/files/construo-0.2.2-lGLU.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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,
- [
-   ConstruoTargets="$ConstruoTargets construo.glut"
--  AC_SUBST(glut_LIBS,"-lglut")
-+  AC_SUBST(glut_LIBS,"-lglut -lGLU -lGL -lm")
- ],
- [])
- 
-@@ -158,4 +158,4 @@
- echo "  Ingo Ruhnke <grumbel@gmx.de>"
- echo ""
- 
--# EOF #
-\ No newline at end of file
-+# EOF #
diff --git a/games-puzzle/construo/files/construo-0.2.3-clang.patch b/games-puzzle/construo/files/construo-0.2.3-clang.patch
new file mode 100644
index 000000000000..abc812e9eb80
--- /dev/null
+++ b/games-puzzle/construo/files/construo-0.2.3-clang.patch
@@ -0,0 +1,50 @@
+Fix FTBFS with clang
+
+diff --git a/src/construo.hpp b/src/construo.hpp
+index fb77e3e..41aa650 100644
+--- a/src/construo.hpp
++++ b/src/construo.hpp
+@@ -19,7 +19,7 @@
+ 
+ #include <config.h>
+ 
+-#define CONSTRUO_DATADIR DATADIR"/games/"PACKAGE
++#define CONSTRUO_DATADIR DATADIR "/games/" PACKAGE
+ 
+ class SystemContext;
+ class InputContext;
+diff --git a/src/command_line.cpp b/src/command_line.cpp
+index df4669b..824a947 100644
+--- a/src/command_line.cpp
++++ b/src/command_line.cpp
+@@ -118,7 +118,7 @@ CommandLine::parse (int argc, char** argv)
+ void
+ CommandLine::print_help ()
+ {
+-  std::cout << "Construo "VERSION"\n\n"
++  std::cout << "Construo " VERSION "\n\n"
+             << "Usage: construo [OPTIONS] [FILENAME]\n\n"
+             << "  -h, --help                  display this help text\n"
+             << "  -v,--version                Print version number of the programm\n"
+@@ -135,7 +135,7 @@ CommandLine::print_help ()
+ void
+ CommandLine::print_version ()
+ {
+-  std::cout << "Construo "VERSION"\n"
++  std::cout << "Construo " VERSION "\n"
+             << "Written by Ingo Ruhnke <grumbel@gmx.de>\n\n"
+             << "Copyright (C) 2002 Ingo Ruhnke <grumbel@gmx.de>\n"
+             << "This is free software; see the source for copying conditions.  There is NO\n"
+diff --git a/src/world_gui_manager.cpp b/src/world_gui_manager.cpp
+index 9c6a5f4..4a7cef0 100644
+--- a/src/world_gui_manager.cpp
++++ b/src/world_gui_manager.cpp
+@@ -273,7 +273,7 @@ WorldGUIManager::draw_overlay ()
+   graphic_context->draw_string (410, bottom_line, "Zoom: ");
+   graphic_context->draw_string (480, bottom_line, to_string(WorldViewComponent::instance()->get_zoom()));
+ 
+-  graphic_context->draw_string (610, bottom_line, "..:: Construo V"VERSION" ::..");
++  graphic_context->draw_string (610, bottom_line, "..:: Construo V" VERSION " ::..");
+   //graphic_context->draw_string (680, bottom_line, to_string(WorldViewComponent::instance()->get_zoom()));
+ }
+