From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- dev-games/Manifest.gz | Bin 5915 -> 5913 bytes dev-games/freecell-solver/Manifest | 7 ++- .../files/freecell-solver-5.14.0-cmake.patch | 19 -------- .../freecell-solver-5.14.0-r1.ebuild | 54 --------------------- .../freecell-solver/freecell-solver-5.22.1.ebuild | 2 +- .../freecell-solver/freecell-solver-5.24.0.ebuild | 51 +++++++++++++++++++ dev-games/openscenegraph/Manifest | 6 +-- .../openscenegraph/openscenegraph-3.5.5.ebuild | 7 +-- .../openscenegraph/openscenegraph-3.6.4.ebuild | 7 +-- .../openscenegraph/openscenegraph-3.6.5.ebuild | 7 +-- 10 files changed, 64 insertions(+), 96 deletions(-) delete mode 100644 dev-games/freecell-solver/files/freecell-solver-5.14.0-cmake.patch delete mode 100644 dev-games/freecell-solver/freecell-solver-5.14.0-r1.ebuild create mode 100644 dev-games/freecell-solver/freecell-solver-5.24.0.ebuild (limited to 'dev-games') diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz index c2e0f7b5b697..6a37b7d9692b 100644 Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ diff --git a/dev-games/freecell-solver/Manifest b/dev-games/freecell-solver/Manifest index c1e6ab60efe3..0a0ee84bc330 100644 --- a/dev-games/freecell-solver/Manifest +++ b/dev-games/freecell-solver/Manifest @@ -1,7 +1,6 @@ -AUX freecell-solver-5.14.0-cmake.patch 463 BLAKE2B 12d0f5bd556a2ab70f8795b567d5e11346945828977ec0291b5010c3e6d872a66bb68816d712c444a8aac3c9010fa4052eea3241e0f2d581205b484351b453cc SHA512 61dfa3c7ceed310bf4056a5bb1cfe7775efe170f2ff8b171ef58db76040cc4c490e6bf6d36db5cc31f6aa6e82bc703193f2cbf3a9735f912cb1cd4fb8a6739d9 AUX freecell-solver-5.22.1-no-docs.patch 1013 BLAKE2B d766bb4a12e546c7a2e6ccdaf00d234f2d1e9fc874c146e3d8755733915ab2cf58472551f46115347678b92ee6b4d14453f051960f5076932bbb15b8a0337794 SHA512 dbb78cb9f67e2d0d71516d765020c91a074a9984a26b3d5d5baf031a852c4c35efebfd1e331aaa009a2a066bd303c405e60b84be690a1bfe86a94ac832281f2e -DIST freecell-solver-5.14.0.tar.xz 407912 BLAKE2B c9da3557d9d073e017215cb0e0c64bfabeeb001c6e8373cc7e35aac40b2722f18966bb7ebf041e869c9e5c1fdbf0fc24e652fef688707c3ee69b300d8fdc246c SHA512 21c8898673e402514c6d40ae0045d6e9077b1606430465bfb146507fbe098be6ca4f88d976e2dafadbc8e84b5aeb9325b58ce8a384ea4ed6de4f5fec485d51ea DIST freecell-solver-5.22.1.tar.xz 421948 BLAKE2B 173a6bb25110695dfaf590f8339f4728e96ad112788efa73ff05ef311effd48b1e037aaa9ed8446cfe3408012f81bb785e6d7a17d249c95108ca38e2473ee0f7 SHA512 8472ce519168481fcbfa0347d1d86859c7344fe34a58bbef694d22653c02f09e70722bf92e052bda5b3f9bce8cee0f745ac45c9e08712b15c34bb40306f510f6 -EBUILD freecell-solver-5.14.0-r1.ebuild 1233 BLAKE2B 438cef0cda4e7965ca1cc97d8e2f3680aae85d2378d27073a18b329dc773329bd54866d3b3e237d584e030998cc2ec79fe81bffc3ae723e8b46bd423d088f250 SHA512 cdc14824041218a932ad4c8326f171af15aa083694dc102caa01ed417831664e4c761b09cb8efc983af9e6e8842fe72c9a0fe646b9e3e2931dc5c7fb0d145d74 -EBUILD freecell-solver-5.22.1.ebuild 1156 BLAKE2B 5374ac85a07d00d17d18b798498709e473c6c3a22d9d313654f9352de2c3ab07d00f392b817474f3756ce97a7e3d6f47d360e6faf53e149e0a72c2814cd5a7ea SHA512 7348dc14c9ce89cd1e93f82675b34730494068dcc7af9fd46c949e2773f6ff499165eb2f2355a3a4be38dc0e156bd0249485588ac898e3d3805996a845b2423c +DIST freecell-solver-5.24.0.tar.xz 422468 BLAKE2B 3fc98a6ba5116bbbdc79c8c09c820b3992fd666c14736fca98b2191c752b5c5a465dcf4ad3fc79ac944d2189647097aad70f99b140e6feff133bae26d4d52411 SHA512 264a7e016a5dbd093f126aab520b36c98c02111a3834ba09646ba527046973163aeefe41449e05d161d1790d2f599c6a3302402442b96b9bd524e97fc4f54b91 +EBUILD freecell-solver-5.22.1.ebuild 1153 BLAKE2B 9c8c6b348e2cd9f3a2fbc8cc523c3496ce4128c4827022a0dad379cd42c3f9e22475f5f80d75a73a4433187bd4c5bbb0802c31b94aaa7a7c7f6c36ca7a8ddb9f SHA512 2922cacd75685d7b88edf1b2044be70e4d6358a640542942fa1388769b4b0f163a292faf2f8ea6e6200119a246aa5028c61705e1ed11e489eb671795a892a54a +EBUILD freecell-solver-5.24.0.ebuild 1164 BLAKE2B bb7a96c10484bfdd9617441f495ada745aaa80140fdd7cb2f8148263723732913a4b84fb237dd8148d48ed6a9594a7437345049834cbb38d1c55fca47395626c SHA512 391789fa94f90d7521689f32573494b9831c64c49729f6bd3139addc7ee7c68cc4975c6c9486fbd799ab1842e417b9d5c56402e9875f165ee8261980d1ed5af4 MISC metadata.xml 330 BLAKE2B 2d2fad43c972b00253e7740bb472027d4edc54537d6d2564f2804b13c7b02b43a34598bf698255d0f42962b14e207da31cf69f021793d0ae16e198d0a1765e8a SHA512 8e5d4cfa7283a489ea757e3dede6b82334b2ceee2a28a98a8dd3b269a2f8bba02e2f0e6a169712e5ff890dcb7bec2feeedef496143bde90ad587771c87a12726 diff --git a/dev-games/freecell-solver/files/freecell-solver-5.14.0-cmake.patch b/dev-games/freecell-solver/files/freecell-solver-5.14.0-cmake.patch deleted file mode 100644 index 3eef53666837..000000000000 --- a/dev-games/freecell-solver/files/freecell-solver-5.14.0-cmake.patch +++ /dev/null @@ -1,19 +0,0 @@ -Package wants to install all kinds of doc files. It does not help us. - ---- a/CMakeLists.txt 2019-09-12 23:04:19.628187073 +0200 -+++ b/CMakeLists.txt 2019-09-12 23:06:38.928231282 +0200 -@@ -858,14 +858,6 @@ - INSTALL_MAN ("${fc_solve_manpage}" 6) - ENDIF () - --INSTALL( -- FILES -- ${docs_to_install} -- "README.win32.txt" -- DESTINATION -- "share/doc/freecell-solver-5.14.0" --) -- - SET (dest "include/freecell-solver") - INSTALL( - FILES diff --git a/dev-games/freecell-solver/freecell-solver-5.14.0-r1.ebuild b/dev-games/freecell-solver/freecell-solver-5.14.0-r1.ebuild deleted file mode 100644 index 996f3aa184b5..000000000000 --- a/dev-games/freecell-solver/freecell-solver-5.14.0-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit cmake python-single-r1 - -DESCRIPTION="C library for automatically solving Freecell and some other solitaire variants" -HOMEPAGE="https://fc-solve.shlomifish.org/" -SRC_URI="https://fc-solve.shlomifish.org/downloads/fc-solve/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm64 x86" -IUSE="tcmalloc" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pysol_cards[${PYTHON_MULTI_USEDEP}] - dev-python/random2[${PYTHON_MULTI_USEDEP}] - dev-python/six[${PYTHON_MULTI_USEDEP}] - ') - tcmalloc? ( dev-util/google-perftools ) -" -DEPEND="${RDEPEND} - dev-perl/Path-Tiny - dev-perl/Template-Toolkit -" - -DOCS=( README.html ) - -PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) - -src_prepare() { - sed -i -e "s|share/doc/freecell-solver/|share/doc/${P}|" CMakeLists.txt || die - - python_fix_shebang board_gen - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_STATIC_LIBRARY=OFF - -DFCS_BUILD_DOCS=OFF - -DFCS_WITH_TEST_SUITE=OFF #requires unpackaged dependencies - -DFCS_AVOID_TCMALLOC=$(usex !tcmalloc) - ) - - cmake_src_configure -} diff --git a/dev-games/freecell-solver/freecell-solver-5.22.1.ebuild b/dev-games/freecell-solver/freecell-solver-5.22.1.ebuild index 67975b0abe75..c8e88cfcd6eb 100644 --- a/dev-games/freecell-solver/freecell-solver-5.22.1.ebuild +++ b/dev-games/freecell-solver/freecell-solver-5.22.1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://fc-solve.shlomifish.org/downloads/fc-solve/${P}.tar.xz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 arm64 x86" IUSE="tcmalloc" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/dev-games/freecell-solver/freecell-solver-5.24.0.ebuild b/dev-games/freecell-solver/freecell-solver-5.24.0.ebuild new file mode 100644 index 000000000000..0dd634857799 --- /dev/null +++ b/dev-games/freecell-solver/freecell-solver-5.24.0.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) +inherit cmake python-single-r1 + +DESCRIPTION="C library for automatically solving Freecell and some other solitaire variants" +HOMEPAGE="https://fc-solve.shlomifish.org/" +SRC_URI="https://fc-solve.shlomifish.org/downloads/fc-solve/${P}.tar.xz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="tcmalloc" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pysol_cards[${PYTHON_MULTI_USEDEP}] + dev-python/random2[${PYTHON_MULTI_USEDEP}] + dev-python/six[${PYTHON_MULTI_USEDEP}] + ') + tcmalloc? ( dev-util/google-perftools ) +" +DEPEND="${RDEPEND} + dev-perl/Path-Tiny + dev-perl/Template-Toolkit +" + +DOCS=( README.html ) + +PATCHES=( "${FILESDIR}/${PN}-5.22.1-no-docs.patch" ) + +src_prepare() { + python_fix_shebang board_gen + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_STATIC_LIBRARY=OFF + -DFCS_BUILD_DOCS=OFF + -DFCS_WITH_TEST_SUITE=OFF #requires unpackaged dependencies + -DFCS_AVOID_TCMALLOC=$(usex !tcmalloc) + ) + + cmake_src_configure +} diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest index 6f9817a23425..4e33b4f55ec2 100644 --- a/dev-games/openscenegraph/Manifest +++ b/dev-games/openscenegraph/Manifest @@ -5,7 +5,7 @@ AUX openscenegraph-3.6.3-docdir.patch 2991 BLAKE2B 9d2d3bab0d8956f66b4b23a112dbd DIST OpenSceneGraph-3.5.5.tar.gz 5666085 BLAKE2B f474f7e62476c816cc9b036995f2571e65d33ed426a95eb2727994fd2c46e95457bf5392e488556e53c13c30bd46250f0c3d871678a4de234eae8953c03560a6 SHA512 f4a890bfbabab0ed8d50ad50e8f9ae5aa6edd4a73eda30d6c53ad478889608f7c980306a79549ca1e472cdd3df8061af03537c8139fa6446b00aebf47ec26827 DIST OpenSceneGraph-3.6.4.tar.gz 5771539 BLAKE2B 3f608566ed8bd927f30c18ab25147826a40655bfa0eca2b0765f775d1fca53c090b77c9963b392bb73b405150f64f1b3bdc57ac6ef59de7f88bf9fd208b2ff6e SHA512 7cb34fc279ba62a7d7177d3f065f845c28255688bd29026ffb305346e1bb2e515a22144df233e8a7246ed392044ee3e8b74e51bf655282d33ab27dcaf12f4b19 DIST OpenSceneGraph-3.6.5.tar.gz 5780762 BLAKE2B 31ebeeae94eb6aff043788313946d5c08886f97d97cd5796e600918e137ef7f06839206b79b2f5649aac7f34037d4d79e18a5638152e150de931b7f7a7d3c38b SHA512 7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f50953717406864da1952deb09f530bc8c5ddf6e4b90204baec7dbc283f497829846d46d561f66feb4b -EBUILD openscenegraph-3.5.5.ebuild 3688 BLAKE2B e4728143c65859cd17b9dcbcf0223424167155ed8d5f0e0ffd43e18abd1074dda4ac6be12579f4d65d8b41bc58ebb0a2e1a2e35f92827a147e722da4eb883f61 SHA512 ef92dab7d84d89894850506c977bed04f62fca84e7e851af073ca6cd76220a08bcc427a86a816a625db90d7b3c0cab905a730da766d73c0dd8e6b44ff6224e1e -EBUILD openscenegraph-3.6.4.ebuild 4138 BLAKE2B 9d0d7cdd554181af7d27f02a1d27450419538a220993f5863dd62b11ed60153cae55dccab062cfa3a0e1977d1acf5c54be401e15fc179fc212d68ae1490c4d9c SHA512 18f6db8c8b6570151015421967d67a3f61821ac591a399338027cd8b76b357ce3d1e37048d2dec32d0ac095b3089210ead342e9b4d30559e4af8a3987202e39c -EBUILD openscenegraph-3.6.5.ebuild 4138 BLAKE2B e9509c32b5a08150142630926eff27b514ffec6e2a454a2eb56aa6f955e521bc35561cea0b23f407199115efa68ee46b352d397e47390d238e712062063f0a62 SHA512 e4b2542aff10aff59f0287924fdc7734b82ea3fc766cd71833904e68c5138fe7f61c28e753d5bda7b817678d1bddd2a99d1c6141e4b8200551db733c476b1e7d +EBUILD openscenegraph-3.5.5.ebuild 3633 BLAKE2B 47792e7d042d1507bcf8b8ee12cae6528221a32b77c0428e344da2da5d9745daeec210a56d2f6b333e75792818e9960dc138a0835ec751294164a4cb6e1f18a2 SHA512 d410aefb941ee97e2bf35e6c8d91f565bc9fafded5bdc726a50470f242a17ff23afb644ecd52c81e447f4c20054583af19a45b7242e6523634cb7f23fca8d5ec +EBUILD openscenegraph-3.6.4.ebuild 4083 BLAKE2B f8cc4bb27c0c07d2132475966df648c179e804e9ea6ca3da3b56d60c87de875705993f568269e2eceeac2b41ae2011771df5f1041709c84d294562fd078cdc14 SHA512 70c72095cdc67d90e69f07131de08649af6a10a8ff0b932d4c6170f0543713f123ee37986a55b1f1e4d774bad9950b0bf1388b6c17798c0d00062e27ac2026e2 +EBUILD openscenegraph-3.6.5.ebuild 4083 BLAKE2B 0b05e0eccb1577b130cf4d374af784af1de4e759fc89b12a5a694ff040e7be0bb7fd24af50d9853c933a3d6b60d69ecec9b73aa9d4977cb926e18c8933a89c9b SHA512 9cb9ea4e63d39ac39ccfd13d6a751867c31b5d9afca92702b6bd38d8ac51a8cf390960bd06060827e632e6eacac67279e6f74bee436f2a6102eea242f6c8f0ea MISC metadata.xml 1759 BLAKE2B 6cdfd94a0888ac7716c282b7a473fdc23b00542bf55fe0b7b271d81dac36e1dbe6ef6923a3f6a48d6730b27fccbe6a197ebdce0c3611d736cd6674aec9ae35a8 SHA512 48f68b29d2d8ab7aeb31bdd7322ba39f1c5f9c4c14a301c828c084a774e80a818e2366bbaf2728d1a32a9d20b62bda2a45ab49a331c160d4359c1175787a9999 diff --git a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild index 3538002c978d..250b3589885d 100644 --- a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild +++ b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild @@ -17,7 +17,7 @@ LICENSE="wxWinLL-3 LGPL-2.1" SLOT="0/145" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION KEYWORDS="amd64 ~hppa ppc ppc64 x86" IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gstreamer jpeg -las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff +las lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xine xrandr zlib" REQUIRED_USE="sdl2? ( sdl )" @@ -37,10 +37,7 @@ RDEPEND=" sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] ) ) - ffmpeg? ( - libav? ( media-video/libav:0= ) - !libav? ( media-video/ffmpeg:0= ) - ) + ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal ) gif? ( media-libs/giflib:= ) gstreamer? ( diff --git a/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild index 78b6b1ca5a34..c8d6dbf4fbbf 100644 --- a/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild +++ b/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild @@ -16,7 +16,7 @@ LICENSE="wxWinLL-3 LGPL-2.1" SLOT="0/158" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" IUSE="asio curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut -gstreamer jpeg las libav lua openexr openinventor osgapps pdf png sdl sdl2 +gstreamer jpeg las lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xrandr +zlib" REQUIRED_USE="sdl2? ( sdl ) dicom? ( zlib ) openexr? ( zlib )" @@ -42,10 +42,7 @@ RDEPEND=" sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] ) ) - ffmpeg? ( - libav? ( media-video/libav:0= ) - !libav? ( media-video/ffmpeg:0= ) - ) + ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( diff --git a/dev-games/openscenegraph/openscenegraph-3.6.5.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.5.ebuild index ac7435fee720..4614315778aa 100644 --- a/dev-games/openscenegraph/openscenegraph-3.6.5.ebuild +++ b/dev-games/openscenegraph/openscenegraph-3.6.5.ebuild @@ -16,7 +16,7 @@ LICENSE="wxWinLL-3 LGPL-2.1" SLOT="0/160" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" IUSE="asio curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut -gstreamer jpeg las libav lua openexr openinventor osgapps pdf png sdl sdl2 +gstreamer jpeg las lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xrandr +zlib" REQUIRED_USE="sdl2? ( sdl ) dicom? ( zlib ) openexr? ( zlib )" @@ -42,10 +42,7 @@ RDEPEND=" sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] ) ) - ffmpeg? ( - libav? ( media-video/libav:0= ) - !libav? ( media-video/ffmpeg:0= ) - ) + ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( -- cgit v1.2.3