gentoo resync : 22.01.2021

10 files changed, 90 insertions, 6 deletions

diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index f305d9d1e0c2..b65c32b8a2ec 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index 86022c126177..f8aedd84f04b 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -6,12 +6,13 @@ AUX clanlib-0.8.1-libpng15.patch 377 BLAKE2B 50b99f4104ad4a5e71c5356a073f2dd561e
 AUX clanlib-0.8.1-ndebug.patch 866 BLAKE2B db4f813d62220d283f1d4d43eef69ec40697855c387d444759eabb00a0cdd1cf8913662c6df81da6cd83e3de8a1cf8ebebb29ab212c702f7e58e8391b5fdcb51 SHA512 653e70a71961e654bcdd488ccf4583c33dcb601fdef54fe15724e22cc0f0d51f265620137b4a2f194f1a915390c6be06adf66602b93c89d946a0a1650eee6419
 AUX clanlib-2.3.7-autotools.patch 1602 BLAKE2B 054f64c02211799e964ab4b05700375fce18eec039144fc310e111607ee86df1954a815bb96e37eede3fc72ce2bc99961ff2e70c1306406ebf26a3329acd18b6 SHA512 d19fb6435adfe54fe1a6b2bff78dbb87bcf037ded720c4535dbfafef6bdd92c6c002f2ffdd6e563a360531b9a62817baf65ff959e44c0881fb0d95253a92b6fa
 AUX clanlib-2.3.7-doc.patch 506 BLAKE2B 0ea958bd60b2b005919caaaabdf7643c1e3b3cfd62b168dae4370826b328111d6d0bb86a708f19c04fc6778b7db76f86ebb130d48cf96d47e8b5be67040f5f24 SHA512 df75223e466799bde70b07e8ea6f3724792dcd5fe96e417dad47b27d44a3d87b6b7157035f388a48ecce9985473a9e1d84a24de1c8f58247eb952fce457ceccb
+AUX clanlib-2.3.7-freetype_pkgconfig.patch 1087 BLAKE2B 4dd1c76687b18bf2df704b13cc43052fdf84442b2eebde5cb49f46b313c2d9f5fadc1d589f1d4c4ea4d2041592c70fd5d77d33b8169826f05aaea5985b90fff8 SHA512 797fdf7d2d7612b5568583b852ab7d7c808e1cd97a8018ed94df209fccaac1b7cba36aac3ecd8903f863aca3b996dbcd8e3a55177af15931da999998dd7de259
 AUX clanlib-4.0.0-fix-build-system.patch 622 BLAKE2B 4dd50ea87fb7dc2dccf2f5db5b1e00941ead76313b847b6e6e574b85f8a9ac0b884fbd5b5548125e886f1a405efc1087c978317e9a935c0f0e1ac0dae2da1e76 SHA512 bda813264f552eff8cc7cea45ec4ea29517a8590066c4b435942e97ea7d68e8d2f21bebf83141b04f1fcc84e936bb3a7ad354b644184dd56b746ab3bfeff9e19
 AUX clanlib-4.0.0-freetype_pkgconfig.patch 1243 BLAKE2B 1ffe267b206dd5f17a30883e8b7602b37f12da0477f02d767db74fbb755befac07d0fbf697d212d59ac5786bd6955c03a4834f3aad885ccffa3b6830fd1bd1c9 SHA512 b6cc46f4e339d7f415c96baf7c7f9e24968d6e5961d438566e1bb111042f3aad3d434e8e6dd02128444db19259f3d81cb373a21513df0eb2d9d87975c49fc87d
 DIST ClanLib-0.8.1.tgz 7629019 BLAKE2B 7f238111931212e3f9c82ed43842706bf16ee145896735ca35595e29dd357e52364cc592be55d88e231f962adc313bc8f57357bc74c9f1b8b134bc411497f5e9 SHA512 277daaf1055ae0198be7a6bbfd415c79cfae9e2145f62553e83849d670f56e50b8484c83f8b85f23290002e0b0c72c1e01ca597ad608a0954a4add828177293b
 DIST ClanLib-2.3.7.tgz 26132425 BLAKE2B 109ba92baf21174022c8dbc4044e39ec16ec77c730b57590733418e246ab71d18d81bbf281cd469dd9e2aebd4ac4302fbb581f27dc7fc0054a8c7ce69699e19d SHA512 73169afc0f639390f80403150757a8a14f842bc291a9457c9bca1319642b78bc4d03a93327d75254230e39545c5b4b690e56dc0149ed7b60b223e5a5364e882a
 DIST clanlib-4.0.0.tar.gz 7435551 BLAKE2B 243fc2519ee90a12af37e8925c99db77785a9a5da497d870545bb489e76cbfcbb4cac81352731326a0cc59689a361b8ab14db2bb1e255da07696e378a9cfb6e5 SHA512 e727239d782d2d52ce2f927e16a88c469b30f46d5b9eba4573baa520d98f60515df7ff4dd921092ddd5cfe4c6f5c441e0f33469b774287003db439feb8b027fe
 EBUILD clanlib-0.8.1.ebuild 2043 BLAKE2B 216259750a2c4f1f9b55ddbcbe74ab26b59c38ac6fed64db2ade0cdde2efec8778bd3a7348a6528bd2ac84a92dca1856ebbfffefa55ed4a3967f8fb92aa0481b SHA512 b21de7ec8024ebe0c07db99f783abc98dc1b6bfb5a137745d45c10591fa4466a5922571098d453a05c87d3faf8e755613c3815ec4210320290a83f2d7c908e3d
-EBUILD clanlib-2.3.7.ebuild 2150 BLAKE2B f20d5f06c5ef8adb1f68bde558cc9f114f678f14ebf7397565e37aaf26d9734f822fa874bd877de092aed352ed34fac9865f81db39d56e8427a845770a2db823 SHA512 845fea2f039d35a937f75b88deb866c7db55903254b664ae0fa86520f5d0a7ba111466284f6be99ef6422403b1cdfd45ba6f7ba0ff97d26309ab65ba80eeef57
+EBUILD clanlib-2.3.7.ebuild 2200 BLAKE2B daed6241575bc1b5324a10c980f6035b79e56c620c7affb1c1bc9e47b67e44f699bcfbf64436a231882a74a91734622a13c4143ec6fdb231afab39370a896795 SHA512 8df5c094f60c825f6c22fbb923fb4e88c35a8a5a076c7426e72c9bffdb62da9dc11f3268d450aed727c0c5ef13ecdd35d01c33e4ee2b5e10c0801edc8c436ca1
 EBUILD clanlib-4.0.0.ebuild 1567 BLAKE2B 050e1c8a108dd5ac8ad39caed85e05be9bfea7b21b6e763f9b6e9fdecf940a780de970f94e2c7c480411c5e37d336a0be4f6db8f842f2271d873b281a1c6a11f SHA512 012b62b2ad5ee8a8ff87befccbf33f18186f81bdb0b202606f68a50d22ee978f51cfcdff4ed7119be101de0ae8a7e40202a8e007571616068240fbc502db8d0a
 MISC metadata.xml 3096 BLAKE2B a800d15375b63fd801b1941937815e34197ff8c598f7d6f539a0bb50205e182434506ccf44a9677527a9edd4c9470d3b7d344830d21d7c20386a1998f123fdf8 SHA512 7973a8121a9ae268d6572c9ae980f2b81650e159cfcbee7895097d906637159e4e3470fb7dadb1f58c4928d377860c73978b38c8bb03c44f8dc73d715d9139bd
diff --git a/dev-games/clanlib/clanlib-2.3.7.ebuild b/dev-games/clanlib/clanlib-2.3.7.ebuild
index 994ee11d94ce..08584b0cf5d6 100644
--- a/dev-games/clanlib/clanlib-2.3.7.ebuild
+++ b/dev-games/clanlib/clanlib-2.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -46,6 +46,7 @@ S=${WORKDIR}/${MY_P}
 PATCHES=(
 	"${FILESDIR}"/${P}-autotools.patch
 	"${FILESDIR}"/${P}-doc.patch
+	"${FILESDIR}"/${P}-freetype_pkgconfig.patch #764902
 )
 AUTOTOOLS_AUTORECONF=1
 AUTOTOOLS_IN_SOURCE_BUILD=1
diff --git a/dev-games/clanlib/files/clanlib-2.3.7-freetype_pkgconfig.patch b/dev-games/clanlib/files/clanlib-2.3.7-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..47a1c89b2405
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-2.3.7-freetype_pkgconfig.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/764902
+
+--- ClanLib-2.3.7/configure.ac
++++ ClanLib-2.3.7/configure.ac
+@@ -342,7 +342,7 @@
+ 	echo "=============================="
+ 	CLANLIB_CHECK_LIB(png,  [`cat $srcdir/Setup/Tests/png.cpp`],  clanDisplay, [ *** Cannot find png (See http://www.libpng.org ) (Try libpng12-dev or better) ], [-lz -lpng])
+ 	CLANLIB_CHECK_LIB(jpeg, [`cat $srcdir/Setup/Tests/jpeg.cpp`], clanDisplay, [ *** Cannot find jpeg (See http://www.ijg.org ) (Try libjpeg62-dev or better) ], [ -ljpeg])
+-	CLANLIB_CHECK_LIB(ttf, [`cat $srcdir/Setup/Tests/ttf.cpp`], clanDisplay, [ *** Cannot find ttf (freetype) (See http://freetype.sourceforge.net )  (Try libfreetype6-dev or better) ], [`freetype-config --libs` ], [ `freetype-config --cflags`])
++	CLANLIB_CHECK_LIB(ttf, [`cat $srcdir/Setup/Tests/ttf.cpp`], clanDisplay, [ *** Cannot find ttf (freetype) (See http://freetype.sourceforge.net )  (Try libfreetype6-dev or better) ], [`pkg-config --libs freetype2` ], [ `pkg-config --cflags freetype2`])
+ 
+ 	dnl  Optional linux/joystick.h
+ 	AC_CHECK_HEADERS(linux/joystick.h, linux_joystick=yes)
diff --git a/dev-games/freecell-solver/Manifest b/dev-games/freecell-solver/Manifest
index 8a724e8c37ea..6e63e65b1f19 100644
--- a/dev-games/freecell-solver/Manifest
+++ b/dev-games/freecell-solver/Manifest
@@ -1,4 +1,5 @@
 AUX freecell-solver-5.22.1-no-docs.patch 1013 BLAKE2B d766bb4a12e546c7a2e6ccdaf00d234f2d1e9fc874c146e3d8755733915ab2cf58472551f46115347678b92ee6b4d14453f051960f5076932bbb15b8a0337794 SHA512 dbb78cb9f67e2d0d71516d765020c91a074a9984a26b3d5d5baf031a852c4c35efebfd1e331aaa009a2a066bd303c405e60b84be690a1bfe86a94ac832281f2e
+AUX freecell-solver-6.2.0-no-git-clone-kthxbye.patch 752 BLAKE2B 651fa79006d38c2d93404221547bfbeac2d500a4c8fca6a5607ea288177639f91be9fc2a71670a4c97c690b054c9aca73e0c745ceec44630a29f5b1bafc833ee SHA512 1c41cf9b09ab1569f714c1f73372532bf533c0ccf25c37f8ee593415a459e6ff06791f5cd6a086037361293e4c556ca8bf427dcf4906f6998a13c8d35c4ccdb4
 DIST freecell-solver-6.2.0.tar.xz 426616 BLAKE2B f48d1b67c56a42f42e00e765a911944ae7d2eb97db81a8ebb58baa1603bd274c9ceb460bdf5c232c4f2b3f54d33acc0057e25c8c0bce897bb862eedc16613f05 SHA512 090f6b93c3f354b5c6bcb1ea67d9313639d23e81998cdc15316246a1cdac26450cf8fd04172bfd5539d875edf407dcdf7ce2c872221b7261f89dbbe309c27560
-EBUILD freecell-solver-6.2.0.ebuild 1178 BLAKE2B 98f7182ea1599d72b261795b10e5b0f136972db3d87210997b7675b26553ddcf6f52df16c988f0595b927fe33473ebcd252b18b75cb1b53ae01a07433fe3985a SHA512 4cadff9b87541cb2092c6c129887be8cd60803caec92901173c196bbf349db624d2ab5b932b257f3f089ad2b0f1216f94c846bbb25651e4f01d154eb4d93e344
+EBUILD freecell-solver-6.2.0-r1.ebuild 1268 BLAKE2B 6630b5c09c9ea76da8d2c83a17362791999afa536542479ede098c4fcd4aafc8c761fe320643d4c5a6a4279df596f12604caf595c318c2e912b82047dbb98d08 SHA512 d073b1b00447fe590e159ca8efa39b18676fa01f5759ea4e315105c1f9bb6eb6dc8efee28a69ee0d51f946c2837ddb609637d94e41cdbffb1e73bbf709c128c0
 MISC metadata.xml 330 BLAKE2B 2d2fad43c972b00253e7740bb472027d4edc54537d6d2564f2804b13c7b02b43a34598bf698255d0f42962b14e207da31cf69f021793d0ae16e198d0a1765e8a SHA512 8e5d4cfa7283a489ea757e3dede6b82334b2ceee2a28a98a8dd3b269a2f8bba02e2f0e6a169712e5ff890dcb7bec2feeedef496143bde90ad587771c87a12726
diff --git a/dev-games/freecell-solver/files/freecell-solver-6.2.0-no-git-clone-kthxbye.patch b/dev-games/freecell-solver/files/freecell-solver-6.2.0-no-git-clone-kthxbye.patch
new file mode 100644
index 000000000000..17675d22ab0a
--- /dev/null
+++ b/dev-games/freecell-solver/files/freecell-solver-6.2.0-no-git-clone-kthxbye.patch
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -210,7 +210,7 @@
+ # Clone the patsolve repository with the appropriate branch.
+ SET (pats_dir "patsolve")
+ 
+-IF (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${pats_dir}")
++IF (0)
+     EXECUTE_PROCESS(
+         COMMAND "git" "clone" "https://github.com/shlomif/patsolve.git" "${pats_dir}"
+         WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+@@ -219,7 +219,7 @@
+ 
+ # Clone the rinutils repository with the appropriate tag.
+ SET (rinutils_dir "rinutils")
+-IF (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${rinutils_dir}")
++IF (0)
+     EXECUTE_PROCESS(
+         COMMAND "git" "clone" "-b" "0.6.0" "https://github.com/shlomif/rinutils.git" "${rinutils_dir}"
+         WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
diff --git a/dev-games/freecell-solver/freecell-solver-6.2.0.ebuild b/dev-games/freecell-solver/freecell-solver-6.2.0-r1.ebuild
index 5fb0e0560f86..c74ccd6cfb05 100644
--- a/dev-games/freecell-solver/freecell-solver-6.2.0.ebuild
+++ b/dev-games/freecell-solver/freecell-solver-6.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,6 +18,7 @@ IUSE="tcmalloc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
+	dev-libs/rinutils
 	$(python_gen_cond_dep '
 		dev-python/pysol_cards[${PYTHON_MULTI_USEDEP}]
 		dev-python/random2[${PYTHON_MULTI_USEDEP}]
@@ -33,11 +34,15 @@ DEPEND="${RDEPEND}
 
 DOCS=( README.html )
 
-PATCHES=( "${FILESDIR}/${PN}-5.22.1-no-docs.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-5.22.1-no-docs.patch"
+	"${FILESDIR}/${P}-no-git-clone-kthxbye.patch"
+)
 
 src_prepare() {
-	python_fix_shebang board_gen
 	cmake_src_prepare
+	python_fix_shebang board_gen
+	rm -r rinutils || die
 }
 
 src_configure() {
diff --git a/dev-games/libsmacker/Manifest b/dev-games/libsmacker/Manifest
new file mode 100644
index 000000000000..bea85cb5d173
--- /dev/null
+++ b/dev-games/libsmacker/Manifest
@@ -0,0 +1,3 @@
+DIST libsmacker-1.1.1_p35.tar.gz 27554 BLAKE2B d8735518d2e6c6dc2b03d5781fb7d58862ff59c7452e91eeea913c619ff4e22b9b01f5cc1512329a1678406f98844c09125caede1a963b0c690bfc8f6a60e367 SHA512 beeece71fe35a9d2554e082245f1f600e211f1431c2162c83d6bd1b378867f211f5687ad359ed5e035c0376cfa28a58651532f1dc58863fae8e0da4540283c33
+EBUILD libsmacker-1.1.1_p35.ebuild 656 BLAKE2B a73c12350f9baf109e5657c8c09dbf744027e975d2d7360d3e02789f4ed8ff81d5770248d7a1f3c26618444a5da77dd3b70d08fb458bc355be90e187d7b2fa4b SHA512 e9e90d8060cbd0c93c83549876ac5352958be45d783240cb74ee181f20dd3a585e2008711591debfd64cdac459270bdb082ad05ce0edc8865750854fdc214b85
+MISC metadata.xml 382 BLAKE2B 2a58c709cead6b58075460431af75fd8fa8f0e8f965efc62d13878b0ffe70ef9461adb3f980463241dda25c01adf0ec934087e6da16d05822597ddcf92f10b1a SHA512 c7a4a726b4d7ec5462bfd941673327380efb5fe0d32913f125e0df1820d9605facef16a2f766fbb4baa1fdf5000b1a31beea3a454e4dc7918ea387459d28c6c9
diff --git a/dev-games/libsmacker/libsmacker-1.1.1_p35.ebuild b/dev-games/libsmacker/libsmacker-1.1.1_p35.ebuild
new file mode 100644
index 000000000000..2e8ee41e9c85
--- /dev/null
+++ b/dev-games/libsmacker/libsmacker-1.1.1_p35.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A cross-platform C library for decoding .smk Smacker Video files."
+HOMEPAGE="http://libsmacker.sourceforge.net"
+SRC_URI="https://sourceforge.net/projects/libsmacker/files/libsmacker-$(ver_cut 1-2)/${P/_p/r}.tar.gz/download -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	# No .la files or static libraries
+	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -name '*.a' -delete || die
+}
diff --git a/dev-games/libsmacker/metadata.xml b/dev-games/libsmacker/metadata.xml
new file mode 100644
index 000000000000..2a6c92d969d5
--- /dev/null
+++ b/dev-games/libsmacker/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>misanthropos@gmx.net</email>
+    <name>Richard Fröhning</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+</pkgmetadata>