From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- dev-games/ois/Manifest | 7 ----- dev-games/ois/files/ois-1.3-automake-1.13.patch | 11 ------- dev-games/ois/files/ois-1.3-gcc47.patch | 40 ------------------------- dev-games/ois/files/ois-1.5-libdir.patch | 28 ----------------- dev-games/ois/ois-1.3-r1.ebuild | 31 ------------------- dev-games/ois/ois-1.5.ebuild | 24 --------------- 6 files changed, 141 deletions(-) delete mode 100644 dev-games/ois/files/ois-1.3-automake-1.13.patch delete mode 100644 dev-games/ois/files/ois-1.3-gcc47.patch delete mode 100644 dev-games/ois/files/ois-1.5-libdir.patch delete mode 100644 dev-games/ois/ois-1.3-r1.ebuild delete mode 100644 dev-games/ois/ois-1.5.ebuild (limited to 'dev-games/ois') diff --git a/dev-games/ois/Manifest b/dev-games/ois/Manifest index d59db5b81c7e..087321eebb04 100644 --- a/dev-games/ois/Manifest +++ b/dev-games/ois/Manifest @@ -1,10 +1,3 @@ -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 759 BLAKE2B 76d81ea7ee45bfcdb508fd83707e7509925610376134e3a97143533309752b1225b72ac6be873d78c1e1d66eef419c80c6bb331c7deb703b88890ec21d8e5b82 SHA512 069649b25d3eab86f78a9c65aace43d45c954b0857ee814d45b67130dac880c7393720281a0bddbd3e310ab7df1c21f2605be4860521f6f91c9da1eef3c74649 DIST ois-1.5.1.tar.gz 554124 BLAKE2B a975cbd629b86618a607b275bfcd35fedfd897c8aec00ab1caad992762d2fef4197af5eb052ffd122c135b610f5611c76c9cce937ca002668e3c313bf08a1d4a SHA512 20598aef999a70900cb7f75ffaf62059acf8e811822971cb21986b5d25d28dacb79e4b4cf4770c70e00d3c55cdd01ef3e68a77c2dd148677784fc4df38891340 -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 613 BLAKE2B 7f3c42b517ec592d693c0ce54a7cf0582ca181a3f8049f466b8465e0e9edcecfdf67d3092707e4c7a1f1eb1b7ee394bdb26ef5b9b8da0bc466e221f34869f119 SHA512 b7afdadc166810462135c61a1b067c11637688392765a7e874cf548129073a467d6a2b53ea731a3ba91c8f67259ccfe9c62fca2ef65d8f01328e7df34c5cfba5 EBUILD ois-1.5.1.ebuild 479 BLAKE2B 6026fc130cd85aa9832bd5b4b367e9ca978fc078957ebe3aca60d20517bac69634370360d710dc7d5dde9356d8303dfc0baca549705dcf0486554bff08ff9166 SHA512 744662aea0a97364d8ac4d7a764babaab30e271db2d4a76a9835eb8d89d852e109e940e46c338595c779b504096429a56a80050a9eaf1d3806cf7ea5e50b9c98 -EBUILD ois-1.5.ebuild 498 BLAKE2B d15400a1caf013163870b17c3fe1848e7173a6f302854baa4d91b0f179452276248c22888e695ac80cd47cbae5b20f303f6f1e41e0754d9315cbc97f8298efb8 SHA512 d1bc5f379067bf033896fd43e943d6aa1976965cd93b35cfea808572e64ad0f52ae7a520c8b80bc96e3bd8a6dc36b9d3c493dc2ae7a20055d13163568b752afc MISC metadata.xml 378 BLAKE2B b17db51054c90cfc4dc19c8ffd9852ff2219853a08949995894cdc8a7f4291db4b5c93c923b0e6ab2abbcdf6e36e1ce46246e97e726432d853ee60e6942e5905 SHA512 95aa21ac48ec86ebc59b047a6bcc9b5116110ba169bbd46f5706223ecc7875e60464ad8780d091c7277e34316ff58717ed56d97d1c4a0649248fe398c97a3375 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 deleted file mode 100644 index af7aa641e6ae..000000000000 --- a/dev-games/ois/files/ois-1.3-automake-1.13.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -5,7 +5,7 @@ - - AC_CANONICAL_TARGET - AM_INIT_AUTOMAKE( [OIS], 1.3.0 ) --AM_CONFIG_HEADER([includes/config.h]) -+AC_CONFIG_HEADERS([includes/config.h]) - - dnl Check for programs - AC_PROG_CC diff --git a/dev-games/ois/files/ois-1.3-gcc47.patch b/dev-games/ois/files/ois-1.3-gcc47.patch deleted file mode 100644 index 71c7565e17df..000000000000 --- a/dev-games/ois/files/ois-1.3-gcc47.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- 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 - #include - #include -+#include - - using namespace std; - ---- 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 - #include - #include -+#include - - ////////////////////////////////////Needed Windows Headers//////////// - #if defined OIS_WIN32_PLATFORM ---- 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 //Needed to Open a file descriptor - #include - #include -+#include - - - #include ---- 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 - #include - #include -+#include - - using namespace OIS; - diff --git a/dev-games/ois/files/ois-1.5-libdir.patch b/dev-games/ois/files/ois-1.5-libdir.patch deleted file mode 100644 index 71157bca59cc..000000000000 --- a/dev-games/ois/files/ois-1.5-libdir.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://github.com/wgois/OIS/commit/0536741549a157627d4306f6e19f1cc5cb52cef8 ---- 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/ois-1.3-r1.ebuild b/dev-games/ois/ois-1.3-r1.ebuild deleted file mode 100644 index 7f4570d22647..000000000000 --- a/dev-games/ois/ois-1.3-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# 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 deleted file mode 100644 index a19595f71612..000000000000 --- a/dev-games/ois/ois-1.5.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# 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}/${P}-libdir.patch" -) -- cgit v1.2.3