From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- dev-games/ogre/Manifest | 3 +- dev-games/ogre/ogre-1.9.0-r1.ebuild | 133 ------------------------------------ dev-games/ogre/ogre-1.9.0-r2.ebuild | 2 +- 3 files changed, 2 insertions(+), 136 deletions(-) delete mode 100644 dev-games/ogre/ogre-1.9.0-r1.ebuild (limited to 'dev-games/ogre') diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest index ad81df47a88e..a6db09ff7894 100644 --- a/dev-games/ogre/Manifest +++ b/dev-games/ogre/Manifest @@ -21,7 +21,6 @@ DIST ogre-1.12.9.tar.gz 125955067 BLAKE2B 5676690d2d9db8c4c903b7bf3e7660ddf5c067 DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde DIST ogre-2.1.tar.gz 157457252 BLAKE2B 97e83cb93a07de5bd5f4fd778604e6146105e70045a6019f0fcdd7f96fe20f6ad495e19988dcd5e4c4073a0bcdeb5ce2afb06fae6945363c397a882672c80520 SHA512 9802e3bf20ddb09453524d1ddafa7a2083dfd0e609563f478fe31b087dd06d463f69800b9c6485cb3db92d98f282ef67ace3e272c1ef531e982ea9f719617fb5 EBUILD ogre-1.12.9.ebuild 5879 BLAKE2B 40ca82f07bade00a108b257ca17e04e14b96f1455e7145a67a93258c06e7f649c786503a4c2a6cd7362f576f33e33ce41088d17d87e27bfc936963ec41d08c08 SHA512 2ebd8d777ff2145fbd6987835dbd57be177aca764cf213c04d3547ecc069fa00eeda5ea1bd7bec20d22a6d0bd42140340c800427ed2b78a4aba39449a7aab1b9 -EBUILD ogre-1.9.0-r1.ebuild 3791 BLAKE2B cea064e4607e7892d2af6a375b4a7b6845ca27490b0bff72a08beb898d5ff62eff0777f407f5038771bc9181e822a8bc3c825cae9fb59a5aebbe0e20d09b83e9 SHA512 16839c39f7295f039fb59fd2e7422e0e9545070e0cf33b393c7eacdb57e9b84afa8238415f043dc25f7b2eaa20e38f63fc152e63c3e0d1dbf68cdb00bee35c23 -EBUILD ogre-1.9.0-r2.ebuild 3588 BLAKE2B 47bb143db16be151b75c3024c96b9b25cccee64381f5392ffc365cf27f786760fb0a9c23e680288eb17334a6f4350b3b1dcb13632a2cbec590c392a1dbfde919 SHA512 c4449e3d24df82bc27a2b1ea0c9b7c2f5bdaeed63e7d793e4dd99fb34dceaa3d19cbdde3cc70dc0a3d78721e68584c7c468e0ef895704908064bfb3788f2eac1 +EBUILD ogre-1.9.0-r2.ebuild 3587 BLAKE2B 5b28800160c637df4ecb3ce2a8733910a4e9fa36f2c89496cc00cc2c51d2a96dd28266b7305fa061c7b2a175ce15fef63998d5e18415266440270c54396a3d7b SHA512 2e13f773cda15f598bebff3b4f8cc25d013becc75d971420cedad661d837d7bfe7af9288c1d9e11d9330b739ab77b7ef615cffb21413ec59a499416dcf30c707 EBUILD ogre-2.1.ebuild 5949 BLAKE2B 26522e0c5d3ca1e01a9a533a1fb21d8ca21632abb3d05f26993a32a6c60aba27af8626cb88d537e968981f18429aaa3d2a400447baf4ddaafb962297ca269298 SHA512 50fd86fdc82b252c7ef9fab7c8c2bf99319d838efe4e8e124719658122a4c35213e723ec2d89dba0a8ae06c706867806caf4ae5e11920844a81bbc5323457769 MISC metadata.xml 6849 BLAKE2B 078f3c5dbe0c558dab497c79b1698e3f9244b0cefadd7f0e2aa2126cc44a98b4dcc8059250765d2e8c662286de5519b7705e7167fd18fb2f4ba59b2dc2ed2c53 SHA512 0b41e4fe3601f07ca51954dd902d33ccc61b07834f8b98539e2f9b039bc9f9371ee58dd69736263a3f517063143fc9cffd0c985dde8696812e1a077bc213cf41 diff --git a/dev-games/ogre/ogre-1.9.0-r1.ebuild b/dev-games/ogre/ogre-1.9.0-r1.ebuild deleted file mode 100644 index dd3d2ee065a3..000000000000 --- a/dev-games/ogre/ogre-1.9.0-r1.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -CMAKE_REMOVE_MODULES="yes" -CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB" - -inherit eutils cmake-utils vcs-snapshot - -DESCRIPTION="Object-oriented Graphics Rendering Engine" -HOMEPAGE="https://www.ogre3d.org/" -SRC_URI="https://bitbucket.org/sinbad/ogre/get/v${PV//./-}.tar.bz2 -> ${P}.tar.bz2" - -LICENSE="MIT public-domain" -SLOT="0/1.9.0" -KEYWORDS="amd64 ~arm x86" - -# gles1 currently broken wrt bug #418201 -# gles1 does not even build wrt bug #506058 -IUSE="+boost cg doc double-precision examples +freeimage gl3plus gles2 gles3 ois +opengl poco profile tbb threads tools +zip" - -REQUIRED_USE="threads? ( ^^ ( boost poco tbb ) ) - examples? ( ois ) - poco? ( threads ) - tbb? ( threads ) - gl3plus? ( !gles2 !gles3 ) - gles3? ( gles2 ) - gl3plus? ( opengl )" - -RESTRICT="test" #139905 - -RDEPEND=" - media-libs/freetype:2 - virtual/opengl - virtual/glu - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXrandr - x11-libs/libXt - boost? ( dev-libs/boost:= ) - cg? ( media-gfx/nvidia-cg-toolkit ) - freeimage? ( media-libs/freeimage ) - gles2? ( >=media-libs/mesa-9.0.0[gles2] ) - gles3? ( >=media-libs/mesa-10.0.0[gles2] ) - gl3plus? ( >=media-libs/mesa-9.2.5 ) - ois? ( dev-games/ois ) - threads? ( - poco? ( dev-libs/poco ) - tbb? ( dev-cpp/tbb ) - ) - tools? ( dev-libs/tinyxml[stl] ) - zip? ( sys-libs/zlib dev-libs/zziplib )" -DEPEND="${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto - doc? ( app-doc/doxygen )" - -PATCHES=( - "${FILESDIR}/${P}-remove_resource_path_to_bindir.patch" - "${FILESDIR}/${P}-remove_media_path_to_bindir.patch" - "${FILESDIR}/${P}-gcc52.patch" - "${FILESDIR}/${P}-samples.patch" -) - -src_prepare() { - sed -i \ - -e "s:share/OGRE/docs:share/doc/${PF}:" \ - Docs/CMakeLists.txt || die - # Stupid build system hardcodes release names - sed -i \ - -e '/CONFIGURATIONS/s:CONFIGURATIONS Release.*::' \ - CMake/Utils/OgreConfigTargets.cmake || die - - # make sure we're not using the included tinyxml - rm -f Tools/XMLConverter/{include,src}/tiny*.* - - # Fix some path issues - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DOGRE_FULL_RPATH=NO - $(cmake-utils_use boost OGRE_USE_BOOST) - $(cmake-utils_use cg OGRE_BUILD_PLUGIN_CG) - $(cmake-utils_use doc OGRE_INSTALL_DOCS) - $(cmake-utils_use double-precision OGRE_CONFIG_DOUBLE) - $(cmake-utils_use freeimage OGRE_CONFIG_ENABLE_FREEIMAGE) - $(cmake-utils_use opengl OGRE_BUILD_RENDERSYSTEM_GL) - $(cmake-utils_use gl3plus OGRE_BUILD_RENDERSYSTEM_GL3PLUS) - -DOGRE_BUILD_RENDERSYSTEM_GLES=FALSE - $(cmake-utils_use gles2 OGRE_BUILD_RENDERSYSTEM_GLES2) - $(cmake-utils_use gles3 OGRE_CONFIG_ENABLE_GLES3_SUPPORT) - $(cmake-utils_use profile OGRE_PROFILING) - $(cmake-utils_use examples OGRE_BUILD_SAMPLES) - $(cmake-utils_use examples OGRE_INSTALL_SAMPLES) - $(cmake-utils_use examples OGRE_INSTALL_SAMPLES_SOURCE) - -DOGRE_BUILD_TESTS=FALSE - -DOGRE_CONFIG_THREADS=$(usex threads 2 0) - $(cmake-utils_use tools OGRE_BUILD_TOOLS) - $(cmake-utils_use zip OGRE_CONFIG_ENABLE_ZIP) - ) - - if use threads ; then - local f - for f in boost poco tbb ; do - use ${f} || continue - mycmakeargs+=( -DOGRE_CONFIG_THREAD_PROVIDER=${f} ) - break - done - fi - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - CONFIGDIR=/etc/OGRE - SHAREDIR=/usr/share/OGRE - - # plugins and resources are the main configuration - insinto "${CONFIGDIR}" - doins "${CMAKE_BUILD_DIR}"/bin/plugins.cfg - doins "${CMAKE_BUILD_DIR}"/bin/resources.cfg - dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg - dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg - - # These are only for the sample browser - insinto "${SHAREDIR}" - doins "${CMAKE_BUILD_DIR}"/bin/quakemap.cfg - doins "${CMAKE_BUILD_DIR}"/bin/samples.cfg -} diff --git a/dev-games/ogre/ogre-1.9.0-r2.ebuild b/dev-games/ogre/ogre-1.9.0-r2.ebuild index 4e296d965a36..3201d8cebedf 100644 --- a/dev-games/ogre/ogre-1.9.0-r2.ebuild +++ b/dev-games/ogre/ogre-1.9.0-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://bitbucket.org/sinbad/ogre/get/v${PV//./-}.tar.bz2 -> ${P}.tar.b LICENSE="MIT public-domain" SLOT="0/1.9.0" -KEYWORDS="~amd64 ~arm x86" +KEYWORDS="amd64 ~arm x86" # gles1 currently broken wrt bug #418201 # gles1 does not even build wrt bug #506058 -- cgit v1.2.3