gentoo resync : 05.03.2021

5 files changed, 6 insertions, 36 deletions

diff --git a/dev-games/ois/Manifest b/dev-games/ois/Manifest
index bb3efa183d44..b795032d52f9 100644
--- a/dev-games/ois/Manifest
+++ b/dev-games/ois/Manifest
@@ -1,9 +1,8 @@
 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
+AUX ois-1.5-libdir.patch 759 BLAKE2B 76d81ea7ee45bfcdb508fd83707e7509925610376134e3a97143533309752b1225b72ac6be873d78c1e1d66eef419c80c6bb331c7deb703b88890ec21d8e5b82 SHA512 069649b25d3eab86f78a9c65aace43d45c954b0857ee814d45b67130dac880c7393720281a0bddbd3e310ab7df1c21f2605be4860521f6f91c9da1eef3c74649
 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
-EBUILD ois-1.5.ebuild 505 BLAKE2B 6b7c0b14cb2369b8b55b52109a8924a2be69ff1f712293c9f31f18e76bcd19d07bee2b6261b16001f6ab8e60f4853394105b5e0901fa70234bedc4860922daba SHA512 916fc2a0bfa99d7978bc77a439912dc1760e4d6907a948027baa9f49a1531dd3b7293729d844973cf023487cbacb41ca1e7539f7b31613adeb142570b4131b8e
+EBUILD ois-1.3-r1.ebuild 613 BLAKE2B 7f3c42b517ec592d693c0ce54a7cf0582ca181a3f8049f466b8465e0e9edcecfdf67d3092707e4c7a1f1eb1b7ee394bdb26ef5b9b8da0bc466e221f34869f119 SHA512 b7afdadc166810462135c61a1b067c11637688392765a7e874cf548129073a467d6a2b53ea731a3ba91c8f67259ccfe9c62fca2ef65d8f01328e7df34c5cfba5
+EBUILD ois-1.5.ebuild 500 BLAKE2B d1ed0ec853adfdb037d0f00adb4eeee9a73975affd2b6df10584e70488b9925ea402f1cca3eef6fd1f50839316f26f43d1c5ba4d5b1c70bc497a99fc2aae89c4 SHA512 9211784fb799175b0f954543471b8569896eacc31ed94d809ecf21596fce23367e7fb852414efdd3a33792f3b2678cabaaa0445bc55b685a5ff14563aab1e73d
 MISC metadata.xml 377 BLAKE2B 6bf12a2da0459bbe02d99361f77fa759217ede6da059fe7f23c97436c45927cc481cbc910af4509f4e432a0bf3dd98a4d534600f406721a5e36bb74bc9e24ff8 SHA512 646270ba21d37a69e9aa1880851af5fa729b64848a60e298bba684af783185ec73e9a6013176fb758acfd782af7f044aee54f2539fd11f64ba8e190f0dccc262
diff --git a/dev-games/ois/files/ois-1.5-libdir.patch b/dev-games/ois/files/ois-1.5-libdir.patch
index f7f3efbc8370..71157bca59cc 100644
--- a/dev-games/ois/files/ois-1.5-libdir.patch
+++ b/dev-games/ois/files/ois-1.5-libdir.patch
@@ -1,6 +1,4 @@
-https://github.com/wgois/OIS/pull/69
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 56b1c49..c4ce5a8 100644
+https://github.com/wgois/OIS/commit/0536741549a157627d4306f6e19f1cc5cb52cef8
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -229,7 +229,13 @@ if (OIS_BUILD_DEMOS)
@@ -28,4 +26,3 @@ index 56b1c49..c4ce5a8 100644
 +  ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
    FRAMEWORK DESTINATION Library/Frameworks
  )
- 
diff --git a/dev-games/ois/ois-1.3-r1.ebuild b/dev-games/ois/ois-1.3-r1.ebuild
index 5b5f0127621b..7f4570d22647 100644
--- a/dev-games/ois/ois-1.3-r1.ebuild
+++ b/dev-games/ois/ois-1.3-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="static-libs"
 
 DEPEND="x11-libs/libXaw
diff --git a/dev-games/ois/ois-1.3.ebuild b/dev-games/ois/ois-1.3.ebuild
deleted file mode 100644
index a7572e973690..000000000000
--- a/dev-games/ois/ois-1.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools autotools-utils
-
-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"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="static-libs"
-
-DEPEND="x11-libs/libXaw
-	x11-libs/libX11"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc47.patch \
-		"${FILESDIR}"/${P}-automake-1.13.patch
-	eautoreconf
-}
diff --git a/dev-games/ois/ois-1.5.ebuild b/dev-games/ois/ois-1.5.ebuild
index 42b171168830..2b19afc068f1 100644
--- a/dev-games/ois/ois-1.5.ebuild
+++ b/dev-games/ois/ois-1.5.ebuild
@@ -20,5 +20,5 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.5-libdir.patch"
+	"${FILESDIR}/${P}-libdir.patch"
 )