gentoo resync : 03.03.2021

7 files changed, 104 insertions, 13 deletions

diff --git a/dev-games/ois/Manifest b/dev-games/ois/Manifest
index d78f0fcda848..bb3efa183d44 100644
--- a/dev-games/ois/Manifest
+++ b/dev-games/ois/Manifest
@@ -1,5 +1,9 @@
-AUX ois-1.3-automake-1.13.patch 242 BLAKE2B 63aa87256fb3c79d466edca5d88495f6c698ed9dabfa2e6bca3860521eed1ecab19ef1437a98f2db197e1db8162fc3dccf7e08743814de0517cd5e0abd7b4848 SHA512 c3f386d1a6d62df22408bd7c3ed639b87e91ec4fd6a663fafda9f9e399e1c08e38018967301afb432362d6944cbae4828adf22ee6649343be0848449aed6e029
-AUX ois-1.3-gcc47.patch 1209 BLAKE2B 462cad1fc694d85a118c4b9dce5e75c3199bd991a3b41a2f131ca87e129d564e310ec49086d8a8e61cddae27f9e708fbf518ab41aedf2f594336438b033d898c SHA512 499b960c29eb6be7adce5fe475af61f1a4cc6a3cdf8939eb4a690265f9c83923f3d365b8cd312e224b9f1c22606d607a45ecf05efd85edf87be3e89ede93c6d3
+AUX ois-1.3-automake-1.13.patch 228 BLAKE2B c15d551e4b62a11435699c9ea8a5fc4632a5c6dd7af06f911288de2af20335e05bccb1546b806f4f3618cc34ca7be5c240dcf282df9cc90f35878c83bf75304d SHA512 af4d4e28abfe273517114cb6802f96091a0d0df0e36bbbdca39129e45b74c8af7d07cbcca25e03a1d7492704c271c64a17228eeefb7abe0cf764e261b1422ff5
+AUX ois-1.3-gcc47.patch 1225 BLAKE2B beaf1557e034d88cdcfea1e13112858494fb5a5276b3156398add5a4b756f5c6ff92adfc37fd8bec2c2471df1160da3d33369bbd406640782ee0d6e8b9495bca SHA512 4ef6ebfc4d2d446b221d576ba850cae4bdc2e3dce3d9c59c9e07421982a3d9ab9c663f3db8c7a45ce5411866f2670d920f27a022ff66be886f73c26154263df7
+AUX ois-1.5-libdir.patch 796 BLAKE2B cbc25a3b6e138ef0c4ca0f2cfe0766cbf0e11b06a08b4eb8a58f6fea7b84a44ca7bd6e231772674ab622ef96366badb397a2b6abf865acace45099b9365b1922 SHA512 847a3df9c833ce7ffb2a899ed5101b6064f201559f84dc392c94607f74131d580e9770814b668f2d8df7474559291f969849bdfaeb38fd23c60b03996f511444
+DIST ois-1.5.tar.gz 552786 BLAKE2B 2ac2d1d74c03804cdc1c0b8cd1e2a3661d9edfc8ae230d036f108dbffd6d8aa5778e2f708b468fd3364c0ba403d07b04c1744eb5a11b39d658ef5a21943a9df3 SHA512 5ab1dda7c25c1959ccbbb758ea3fda36bd62ad65f46e2c6b418317a5eb39e0bace52a44ae079dfb69fc58c90df54f8e50d589daae1100ec615325363c9d77513
 DIST ois_v1-3.tar.gz 136739 BLAKE2B 88dd3af2c8b253d9cacc5c65510c150ba50c6a47c1c2cd241bf366f38fba0560a7cef08392e338984e8b172020c4a4c37e5eab024fabc695b2f06f93393850ed SHA512 48b7355a9be9c66233691aa5461192fb6e537d284e4366ebf931a76ee3be30f2cf17a4aa350fce6b433eaecf4259414062b9dd5854eaf872b9a18294cfc640c3
+EBUILD ois-1.3-r1.ebuild 615 BLAKE2B ac53ae3461af41453c647e9dc5f15df18f3e8337b97dfca92d356663988c75dd968b366c04358989d7250903bcba770b8a619c258f67e703b1f3df0748523db4 SHA512 cea8446118daaf01b7b0fb2853aee6cfc558be8018178ccb7b6f2e5ca0e713aa61f71bceda55716caa5c68ade319a2b858e372b995efcac6e02031cf094dfb03
 EBUILD ois-1.3.ebuild 617 BLAKE2B 5a9485c2223610823117c57f6660e7007971aba7832e6eb0342720e8155813de9219a8fd1369e8f6c8f1f6601d7e873c8fb315b80fb08523de99337e391c025d SHA512 a0ae76bb48b80baa47e7a9a6e3e566fb1b86f01ea9783f80bbbc4c4c3aee9709d2f938f411dd2c5dad64319d34c4a515334e7cac3a7a4b0dff8f51bf07e74b33
-MISC metadata.xml 328 BLAKE2B b575ed476350e61e180f865c8f9711fd873b4a6e8e3ece407fe248fd33dc37edc7fe1e84262b0e364e5b313fc2e9b41a11d6dd860e9e816bbd5a4787326fad91 SHA512 3ff57cfd54985a9b278904738d8911322385025eb0e4e3f44742a19f5781761fef047e695927b2890e1311f567130cb2efdbae26b3afd69764bb70d48690d70c
+EBUILD ois-1.5.ebuild 505 BLAKE2B 6b7c0b14cb2369b8b55b52109a8924a2be69ff1f712293c9f31f18e76bcd19d07bee2b6261b16001f6ab8e60f4853394105b5e0901fa70234bedc4860922daba SHA512 916fc2a0bfa99d7978bc77a439912dc1760e4d6907a948027baa9f49a1531dd3b7293729d844973cf023487cbacb41ca1e7539f7b31613adeb142570b4131b8e
+MISC metadata.xml 377 BLAKE2B 6bf12a2da0459bbe02d99361f77fa759217ede6da059fe7f23c97436c45927cc481cbc910af4509f4e432a0bf3dd98a4d534600f406721a5e36bb74bc9e24ff8 SHA512 646270ba21d37a69e9aa1880851af5fa729b64848a60e298bba684af783185ec73e9a6013176fb758acfd782af7f044aee54f2539fd11f64ba8e190f0dccc262
diff --git a/dev-games/ois/files/ois-1.3-automake-1.13.patch b/dev-games/ois/files/ois-1.3-automake-1.13.patch
index fb103e40335a..af7aa641e6ae 100644
--- a/dev-games/ois/files/ois-1.3-automake-1.13.patch
+++ b/dev-games/ois/files/ois-1.3-automake-1.13.patch
@@ -1,5 +1,5 @@
---- ois-v1-3/configure.ac
-+++ ois-v1-3/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -5,7 +5,7 @@
  
  AC_CANONICAL_TARGET
diff --git a/dev-games/ois/files/ois-1.3-gcc47.patch b/dev-games/ois/files/ois-1.3-gcc47.patch
index d002ec3cffb5..71c7565e17df 100644
--- a/dev-games/ois/files/ois-1.3-gcc47.patch
+++ b/dev-games/ois/files/ois-1.3-gcc47.patch
@@ -1,5 +1,5 @@
---- demos/FFConsoleDemo.cpp.old	2012-07-17 08:41:33.667876985 +0200
-+++ demos/FFConsoleDemo.cpp	2012-07-17 08:42:01.415928693 +0200
+--- a/demos/FFConsoleDemo.cpp.old	2012-07-17 08:41:33.667876985 +0200
++++ b/demos/FFConsoleDemo.cpp	2012-07-17 08:42:01.415928693 +0200
 @@ -7,6 +7,7 @@
  #include <ios>

  #include <sstream>

@@ -8,8 +8,8 @@
  

  using namespace std;

  

---- demos/OISConsole.cpp.old	2012-07-17 08:43:44.637681119 +0200
-+++ demos/OISConsole.cpp	2012-07-17 08:44:06.653135337 +0200
+--- a/demos/OISConsole.cpp.old	2012-07-17 08:43:44.637681119 +0200
++++ b/demos/OISConsole.cpp	2012-07-17 08:44:06.653135337 +0200
 @@ -12,6 +12,7 @@
  #include <iostream>

  #include <vector>

@@ -18,8 +18,8 @@
  

  ////////////////////////////////////Needed Windows Headers////////////

  #if defined OIS_WIN32_PLATFORM

---- src/linux/LinuxJoyStickEvents.cpp.old	2012-07-17 08:37:56.065155660 +0200
-+++ src/linux/LinuxJoyStickEvents.cpp	2012-07-17 08:38:33.236545721 +0200
+--- a/src/linux/LinuxJoyStickEvents.cpp.old	2012-07-17 08:37:56.065155660 +0200
++++ b/src/linux/LinuxJoyStickEvents.cpp	2012-07-17 08:38:33.236545721 +0200
 @@ -33,6 +33,7 @@
  #include <fcntl.h>        //Needed to Open a file descriptor

  #include <cassert>	

@@ -28,8 +28,8 @@
  

  

  #include <sstream>

---- src/linux/LinuxForceFeedback.cpp.old	2012-07-17 08:40:02.633268854 +0200
-+++ src/linux/LinuxForceFeedback.cpp	2012-07-17 08:40:28.642442655 +0200
+--- a/src/linux/LinuxForceFeedback.cpp.old	2012-07-17 08:40:02.633268854 +0200
++++ b/src/linux/LinuxForceFeedback.cpp	2012-07-17 08:40:28.642442655 +0200
 @@ -26,6 +26,7 @@
  #include <cstdlib>

  #include <errno.h>

diff --git a/dev-games/ois/files/ois-1.5-libdir.patch b/dev-games/ois/files/ois-1.5-libdir.patch
new file mode 100644
index 000000000000..f7f3efbc8370
--- /dev/null
+++ b/dev-games/ois/files/ois-1.5-libdir.patch
@@ -0,0 +1,31 @@
+https://github.com/wgois/OIS/pull/69
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 56b1c49..c4ce5a8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -229,7 +229,13 @@ if (OIS_BUILD_DEMOS)
+ 
+ endif()
+ 
+-set(LIB_INSTALL_DIR "lib")
++if(UNIX)
++	include(GNUInstallDirs)
++	set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
++else()
++	set(LIB_INSTALL_DIR "lib")
++endif()
++
+ set(OIS_LIB_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR})
+ 
+ file(GLOB PUBLIC_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/includes/*.h")
+@@ -240,8 +246,8 @@ install(FILES ${PUBLIC_HEADERS}
+ 
+ install(TARGETS OIS
+   RUNTIME DESTINATION bin
+-  LIBRARY DESTINATION lib
+-  ARCHIVE DESTINATION lib
++  LIBRARY DESTINATION ${LIB_INSTALL_DIR}
++  ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+   FRAMEWORK DESTINATION Library/Frameworks
+ )
+ 
diff --git a/dev-games/ois/metadata.xml b/dev-games/ois/metadata.xml
index 5d67c2e9bc85..345c7e168e79 100644
--- a/dev-games/ois/metadata.xml
+++ b/dev-games/ois/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">wgois/OIS</remote-id>
 		<remote-id type="sourceforge">wgois</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-games/ois/ois-1.3-r1.ebuild b/dev-games/ois/ois-1.3-r1.ebuild
new file mode 100644
index 000000000000..5b5f0127621b
--- /dev/null
+++ b/dev-games/ois/ois-1.3-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P=${PN}-v${PV/./-}
+DESCRIPTION="Object-oriented Input System - A cross-platform C++ input handling library"
+HOMEPAGE="https://sourceforge.net/projects/wgois/"
+SRC_URI="mirror://sourceforge/wgois/${MY_P/-/_}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static-libs"
+
+DEPEND="x11-libs/libXaw
+	x11-libs/libX11"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc47.patch
+	"${FILESDIR}"/${P}-automake-1.13.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
diff --git a/dev-games/ois/ois-1.5.ebuild b/dev-games/ois/ois-1.5.ebuild
new file mode 100644
index 000000000000..42b171168830
--- /dev/null
+++ b/dev-games/ois/ois-1.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Object-oriented Input System - A cross-platform C++ input handling library"
+HOMEPAGE="https://github.com/wgois/OIS"
+SRC_URI="https://github.com/wgois/OIS/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P^^}"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND="
+	x11-libs/libXaw
+	x11-libs/libX11
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.5-libdir.patch"
+)