gentoo (valentine's day) resync : 14.02.2021

4 files changed, 368 insertions, 9 deletions

diff --git a/games-arcade/jvgs/Manifest b/games-arcade/jvgs/Manifest
index e64eacb10d1a..df9502140c34 100644
--- a/games-arcade/jvgs/Manifest
+++ b/games-arcade/jvgs/Manifest
@@ -1,5 +1,6 @@
 AUX jvgs-0.5-fix-build-system.patch 1028 BLAKE2B 644c07ed7374ec7677ca0f744d08e10a08e1d49a1c0d4bab7d9b87ce78ebb138582238873353ce25471e4a95555b016010ca04fe5672ef8bf256cdb74ea3a378 SHA512 0f049df4b986d380634837e1e5bc4e21d0fb228a7c61cc6765ebec7cc74f3e37ef71260a2d7a7cc830ac9ea22258702f9cad29d3941bf2dff0f3f6ea56817dc8
+AUX jvgs-0.5-unbundle-tinyxml.patch 8652 BLAKE2B 0da26995149bb1918e6b6a6b7884b06e66728d0b931341a00aeea932d0c9ac235efe99f95648ad78900a53154f3b1dbdd8f1da6961fb1adf93b14694b4576694 SHA512 f652c855fa70f7f4e836b14c175c3a68c082976396e8d3722d92a89ec50574eb3f79bca2a8a0f5de365bd89856dba09025e341075169aaf1c918ef623dca48bf
 DIST jvgs-0.5-src.tar.gz 25917861 BLAKE2B 8b7716a16cd7dfdb3f8f7eb2292a121b142a4487f8fb58d046db81cc579b61b3db56728f5ecef8272ec74d8cf898da5c3ee12fa7c492fd219de977ea37bc9ee9 SHA512 0a0a8e7a0e7dce6f61bcd328f579212115eb95e3dce8ca223c1d8a3432d9083bf9a313f02f46b799991aa32f10cb9c14e8ecb63a4578b1ffaabc374ba139b28d
-EBUILD jvgs-0.5-r1.ebuild 807 BLAKE2B 3410af4b70a1e3e1e7d374276c84f0f5f8b8098625769daaff7a8f33ac9c841a2b93b586151a079f74e89cffab300eed1a6b3e69d07fe2a8e4552e5139f28b93 SHA512 5885bab4f0439df3e9f5bab47e57d6b55780da9bc4b4060a9da098677950a51db316afa22b86a7f670d63b3688374f1ccc40ce2266d32b497a0a44383c8413ba
-EBUILD jvgs-0.5-r100.ebuild 872 BLAKE2B e32f6ed61f923ec1b94a065c2d46c5294b88590d2e1bb70842062bbe10a6525d93497098710a2482513468dff80d0f6324b1ac51a53e27d2c274c0708c2ffa46 SHA512 4f8b9ae8a1bb364dcbd6c8c666abce20d17fb37d4d28ba2d3562a92f1c0d308028a197dc7075f75f2526fd7012d14a215a2e7d6ae05fe8e1638be049f5a643dd
+EBUILD jvgs-0.5-r1.ebuild 912 BLAKE2B 730c614d0ae0a3a125cd968a34679738fbb390da5fff9a252faf0d31091a6e6b05a518f7d95a94300dc2e379db04cefa7b71964af6f20491748f8017e7761e04 SHA512 a949652eb6da05eb0c458b9beca9c421665ddafc3fcf8c8e32ff5e5d859ad1ce31b734a38d0ea3c104015edaa6d55ca788c860d327117429f01d66e1167809ba
+EBUILD jvgs-0.5-r100.ebuild 1210 BLAKE2B a3aa5114ade74770a0fd14b11c7623e5845e39bb9e84795d3d5311a110cc374a842cf031465f3cbb9b06a4a418337240c10b4425bca1343bebe3ce308ce127ed SHA512 f6440f90003fd5214beea75d763f1f8b925b9203aaea2da8d6579dea85087ad01c16aeab1b83c1094f42775f863a64b144ba1e2abe07223afb5b377fc3433cbd
 MISC metadata.xml 327 BLAKE2B 3dfc4352c43df34b847d4ddbaefb6a830d685e7a4cdeabbc870665799e7d9b43a58b4e9c0c71bf1fbaafeb3148732dbb988971310041db7afb669a9235bf7994 SHA512 d37e6f081f28683f1071e57de49287534e6797902e24c681f87477af286a6227eb76abd63bd3091b077270e44061cd0676e49fecf4e74f54d455281fa67946bd
diff --git a/games-arcade/jvgs/files/jvgs-0.5-unbundle-tinyxml.patch b/games-arcade/jvgs/files/jvgs-0.5-unbundle-tinyxml.patch
new file mode 100644
index 000000000000..fd9c0d8702a9
--- /dev/null
+++ b/games-arcade/jvgs/files/jvgs-0.5-unbundle-tinyxml.patch
@@ -0,0 +1,333 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 87b28ab..2ec725c 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,10 +1,14 @@
+ SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTIXML_USE_STL" )
+ 
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(TinyXml REQUIRED tinyxml)
++
+ INCLUDE_DIRECTORIES(
+     ${SDL_INCLUDE_DIR}
+     ${LUA_INCLUDE_DIR}
+     ${FREETYPE_INCLUDE_DIRS}
+     ${SDLMIXER_INCLUDE_DIR}
++    ${TINYXML_INCLUDE_DIRS}
+     ${ZLIB_INCLUDE_DIRS}
+ )
+ 
+@@ -12,7 +16,6 @@ ADD_SUBDIRECTORY( input )
+ ADD_SUBDIRECTORY( core )
+ ADD_SUBDIRECTORY( game )
+ ADD_SUBDIRECTORY( math )
+-ADD_SUBDIRECTORY( tinyxml )
+ ADD_SUBDIRECTORY( video )
+ ADD_SUBDIRECTORY( audio )
+ ADD_SUBDIRECTORY( sketch )
+@@ -25,5 +28,5 @@ ADD_EXECUTABLE(
+ )
+ 
+ TARGET_LINK_LIBRARIES(
+-    jvgs bind input
++    jvgs bind input ${TINYXML_LIBRARIES}
+ )
+diff --git a/src/core/PropertyMap.cpp b/src/core/PropertyMap.cpp
+index 190b317..3f7dd1a 100644
+--- a/src/core/PropertyMap.cpp
++++ b/src/core/PropertyMap.cpp
+@@ -1,7 +1,7 @@
+ #include "PropertyMap.h"
+ #include "LogManager.h"
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ using namespace std;
+ 
+ namespace jvgs
+diff --git a/src/core/XMLLoadable.cpp b/src/core/XMLLoadable.cpp
+index f5cbc46..b819184 100644
+--- a/src/core/XMLLoadable.cpp
++++ b/src/core/XMLLoadable.cpp
+@@ -1,7 +1,7 @@
+ #include "XMLLoadable.h"
+ #include "LogManager.h"
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ using namespace std;
+ 
+diff --git a/src/game/AbstractCamera.cpp b/src/game/AbstractCamera.cpp
+index b349418..725a2e2 100644
+--- a/src/game/AbstractCamera.cpp
++++ b/src/game/AbstractCamera.cpp
+@@ -5,7 +5,7 @@ using namespace jvgs::video;
+ 
+ using namespace jvgs::math;
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ namespace jvgs
+ {
+diff --git a/src/game/Animation.cpp b/src/game/Animation.cpp
+index ac563a6..6aa3b10 100644
+--- a/src/game/Animation.cpp
++++ b/src/game/Animation.cpp
+@@ -7,7 +7,7 @@ using namespace jvgs::sketch;
+ #include "../core/LogManager.h"
+ using namespace jvgs::core;
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ using namespace std;
+ 
+diff --git a/src/game/BullController.cpp b/src/game/BullController.cpp
+index 78f81af..56930b4 100644
+--- a/src/game/BullController.cpp
++++ b/src/game/BullController.cpp
+@@ -8,7 +8,7 @@ using namespace jvgs::core;
+ #include "../math/Vector2D.h"
+ using namespace jvgs::math;
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ using namespace std;
+ 
+diff --git a/src/game/CollisionResponsePositioner.cpp b/src/game/CollisionResponsePositioner.cpp
+index 8065efe..657c1c6 100644
+--- a/src/game/CollisionResponsePositioner.cpp
++++ b/src/game/CollisionResponsePositioner.cpp
+@@ -15,7 +15,7 @@ using namespace jvgs::sketch;
+ #include "../math/QuadTree.h"
+ using namespace jvgs::math;
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ #include <iostream>
+ using namespace std;
+diff --git a/src/game/DefaultInputController.cpp b/src/game/DefaultInputController.cpp
+index a05aec9..c6da502 100644
+--- a/src/game/DefaultInputController.cpp
++++ b/src/game/DefaultInputController.cpp
+@@ -7,7 +7,7 @@
+ #include "../input/InputManager.h"
+ using namespace jvgs::input;
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ using namespace jvgs::math;
+ 
+diff --git a/src/game/Entity.cpp b/src/game/Entity.cpp
+index 914297f..f353541 100644
+--- a/src/game/Entity.cpp
++++ b/src/game/Entity.cpp
+@@ -27,7 +27,7 @@ using namespace jvgs::video;
+ #include "../bind/ScriptManager.h"
+ using namespace jvgs::bind;
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ using namespace std;
+ using namespace jvgs::math;
+diff --git a/src/game/FlyStraightController.cpp b/src/game/FlyStraightController.cpp
+index 1217b62..62f8c1a 100644
+--- a/src/game/FlyStraightController.cpp
++++ b/src/game/FlyStraightController.cpp
+@@ -5,7 +5,7 @@
+ #include "../math/Vector2D.h"
+ using namespace jvgs::math;
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ namespace jvgs
+ {
+diff --git a/src/game/FollowCamera.cpp b/src/game/FollowCamera.cpp
+index 4a1006b..4b1fe2c 100644
+--- a/src/game/FollowCamera.cpp
++++ b/src/game/FollowCamera.cpp
+@@ -12,7 +12,7 @@ using namespace jvgs::video;
+ 
+ using namespace jvgs::math;
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ namespace jvgs
+ {
+diff --git a/src/game/InputController.cpp b/src/game/InputController.cpp
+index 0d76dd7..1e07609 100644
+--- a/src/game/InputController.cpp
++++ b/src/game/InputController.cpp
+@@ -5,7 +5,7 @@
+ #include "../input/InputManager.h"
+ using namespace jvgs::input;
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ using namespace jvgs::math;
+ 
+diff --git a/src/game/Level.cpp b/src/game/Level.cpp
+index a02e818..bf0c485 100644
+--- a/src/game/Level.cpp
++++ b/src/game/Level.cpp
+@@ -14,7 +14,7 @@ using namespace jvgs::video;
+ #include "../audio/AudioManager.h"
+ using namespace jvgs::audio;
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ using namespace jvgs::sketch;
+ using namespace jvgs::math;
+diff --git a/src/game/PatrollingController.cpp b/src/game/PatrollingController.cpp
+index 74e5171..7d56754 100644
+--- a/src/game/PatrollingController.cpp
++++ b/src/game/PatrollingController.cpp
+@@ -5,7 +5,7 @@
+ #include "../math/MathManager.h"
+ using namespace jvgs::math;
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ namespace jvgs
+ {
+diff --git a/src/game/Positioner.cpp b/src/game/Positioner.cpp
+index 6297c09..5fb2f37 100644
+--- a/src/game/Positioner.cpp
++++ b/src/game/Positioner.cpp
+@@ -1,7 +1,7 @@
+ #include "Positioner.h"
+ #include "Entity.h"
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ using namespace jvgs::math;
+ 
+diff --git a/src/game/SillyController.cpp b/src/game/SillyController.cpp
+index 25070e5..4954091 100644
+--- a/src/game/SillyController.cpp
++++ b/src/game/SillyController.cpp
+@@ -1,7 +1,7 @@
+ #include "SillyController.h"
+ #include "Entity.h"
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ using namespace jvgs::math;
+ 
+diff --git a/src/game/SimpleBirdController.cpp b/src/game/SimpleBirdController.cpp
+index 54b95bc..82f371f 100644
+--- a/src/game/SimpleBirdController.cpp
++++ b/src/game/SimpleBirdController.cpp
+@@ -1,7 +1,7 @@
+ #include "SimpleBirdController.h"
+ #include "Entity.h"
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ using namespace std;
+ using namespace jvgs::math;
+diff --git a/src/game/SimpleCamera.cpp b/src/game/SimpleCamera.cpp
+index 00deb92..e640481 100644
+--- a/src/game/SimpleCamera.cpp
++++ b/src/game/SimpleCamera.cpp
+@@ -2,7 +2,7 @@
+ 
+ using namespace jvgs::math;
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ namespace jvgs
+ {
+diff --git a/src/game/Sprite.cpp b/src/game/Sprite.cpp
+index 19caa35..ee314df 100644
+--- a/src/game/Sprite.cpp
++++ b/src/game/Sprite.cpp
+@@ -1,7 +1,7 @@
+ #include "Sprite.h"
+ #include "Animation.h"
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ using namespace std;
+ 
+diff --git a/src/math/Vector2D.cpp b/src/math/Vector2D.cpp
+index ba8a05e..61673b3 100644
+--- a/src/math/Vector2D.cpp
++++ b/src/math/Vector2D.cpp
+@@ -2,7 +2,7 @@
+ #include <cmath>
+ #include "MathManager.h"
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ namespace jvgs
+ {
+diff --git a/src/sketch/GroupParser.cpp b/src/sketch/GroupParser.cpp
+index 0924f95..58d5584 100644
+--- a/src/sketch/GroupParser.cpp
++++ b/src/sketch/GroupParser.cpp
+@@ -3,7 +3,7 @@
+ #include "Group.h"
+ #include "SketchElement.h"
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ #include "../core/LogManager.h"
+ using namespace jvgs::core;
+diff --git a/src/sketch/Parser.cpp b/src/sketch/Parser.cpp
+index 2b55c16..390f9ae 100644
+--- a/src/sketch/Parser.cpp
++++ b/src/sketch/Parser.cpp
+@@ -13,7 +13,7 @@ using namespace jvgs::core;
+ #include "../math/Vector2D.h"
+ using namespace jvgs::math;
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ namespace jvgs
+ {
+diff --git a/src/sketch/PathParser.cpp b/src/sketch/PathParser.cpp
+index 1eb2027..eb63cf2 100644
+--- a/src/sketch/PathParser.cpp
++++ b/src/sketch/PathParser.cpp
+@@ -3,7 +3,7 @@
+ #include "Path.h"
+ #include "PathDataParser.h"
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ #include "../core/LogManager.h"
+ using namespace jvgs::core;
+diff --git a/src/sketch/SketchElementParser.cpp b/src/sketch/SketchElementParser.cpp
+index b7c4968..fc40dfb 100644
+--- a/src/sketch/SketchElementParser.cpp
++++ b/src/sketch/SketchElementParser.cpp
+@@ -3,7 +3,7 @@
+ #include "SketchElement.h"
+ #include "Parser.h"
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ #include "../core/LogManager.h"
+ using namespace jvgs::core;
diff --git a/games-arcade/jvgs/jvgs-0.5-r1.ebuild b/games-arcade/jvgs/jvgs-0.5-r1.ebuild
index 45d527c885be..6fa5af29b09c 100644
--- a/games-arcade/jvgs/jvgs-0.5-r1.ebuild
+++ b/games-arcade/jvgs/jvgs-0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,8 +26,14 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${P}-src
 PATCHES=( "${FILESDIR}"/${PN}-0.5-fix-build-system.patch )
 
+src_prepare() {
+	sed -i "s:main.lua:/usr/share/${PN}/&:" src/main.cpp
+	default
+	eapply_user
+}
+
 src_install() {
-	dobin src/${PN}
+	dobin ${BUILD_DIR}/src/${PN}
 
 	insinto /usr/share/${PN}
 	doins -r main.lua resources
diff --git a/games-arcade/jvgs/jvgs-0.5-r100.ebuild b/games-arcade/jvgs/jvgs-0.5-r100.ebuild
index cad514054763..7d3b9b8eb69b 100644
--- a/games-arcade/jvgs/jvgs-0.5-r100.ebuild
+++ b/games-arcade/jvgs/jvgs-0.5-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,6 +10,7 @@ inherit cmake desktop lua-single
 DESCRIPTION="An open-source platform game with a sketched and minimalistic look"
 HOMEPAGE="http://jvgs.sourceforge.net/"
 SRC_URI="mirror://sourceforge/jvgs/${P}-src.tar.gz"
+S="${WORKDIR}/${P}-src"
 
 LICENSE="WTFPL-2"
 SLOT="0"
@@ -18,19 +19,37 @@ KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="${LUA_DEPS}
+	dev-libs/tinyxml[stl]
 	media-libs/libsdl[video]
 	media-libs/sdl-mixer[vorbis]
 	media-libs/freetype:2
 	sys-libs/zlib:=
-	virtual/opengl"
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	virtual/opengl
+	virtual/glu
+"
 DEPEND="${RDEPEND}"
 BDEPEND="dev-lang/swig"
 
-S=${WORKDIR}/${P}-src
-PATCHES=( "${FILESDIR}"/${PN}-0.5-fix-build-system.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5-fix-build-system.patch
+	"${FILESDIR}"/${PN}-0.5-unbundle-tinyxml.patch
+)
+
+src_prepare() {
+	sed -i "s:main.lua:/usr/share/${PN}/&:" src/main.cpp || die
+
+	# Make sure we don't use bundled copy
+	rm -r src/tinyxml/ || die
+
+	cmake_src_prepare
+}
 
 src_install() {
-	dobin src/${PN}
+	dobin "${BUILD_DIR}"/src/${PN}
 
 	insinto /usr/share/${PN}
 	doins -r main.lua resources