gentoo resync : 16.01.2021

5 files changed, 41 insertions, 3 deletions

diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 1b6994ad4bfe..0c5bf6625f85 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/libsmacker/Manifest b/dev-games/libsmacker/Manifest
index f0670343a397..733d456cd38b 100644
--- a/dev-games/libsmacker/Manifest
+++ b/dev-games/libsmacker/Manifest
@@ -1,3 +1,5 @@
 DIST libsmacker-1.1.1_p35.tar.gz 27554 BLAKE2B d8735518d2e6c6dc2b03d5781fb7d58862ff59c7452e91eeea913c619ff4e22b9b01f5cc1512329a1678406f98844c09125caede1a963b0c690bfc8f6a60e367 SHA512 beeece71fe35a9d2554e082245f1f600e211f1431c2162c83d6bd1b378867f211f5687ad359ed5e035c0376cfa28a58651532f1dc58863fae8e0da4540283c33
+DIST libsmacker-1.2.0_p43.tar.gz 27766 BLAKE2B 783b05a66fbf5b0b1344e0b00e06a3edce3eb8c30e189d343869eb8866266ea9204ab1d1821f1f455f63fb365622630cb5da042a1b6650a7d166d5c62d217ac9 SHA512 1785b000884a6f93b621c1503adef100ac9b8c6e7ed5ef4d85b9ea4819715c40f9af3d930490b33ca079f531103acc69de2a800756ed7678c820ff155f86aaeb
 EBUILD libsmacker-1.1.1_p35.ebuild 667 BLAKE2B 28f2d2ecff5856747d3f3667011f58a8caba46f4e552405fa9b7e3bfe7c00e40c1cf177351d0e21d820771c2066e893b8eef8cc5edcd11c57fc01c5c9ba9f154 SHA512 03588b507e65290cb596050f52c0b33222aefd91877c70e727a27d95e94b845774143011ae9771f329c02072ce3e73163baf7d90d4616375ceb191e5df3fba5b
+EBUILD libsmacker-1.2.0_p43.ebuild 708 BLAKE2B 7b946e89cc56be7244839ddebb904d8a324041bc06ead39a7d53434450229b5cd9d8c69347e184f8ac19fcbd22432ac577e8c5b036e0b9c2f7b5573f62d90be6 SHA512 0c9ea667161f592fcfbd887936fe7e4a82810e297653211ffce258640734dc275b29f853c833609a1d6be0bbf94cb6c97855605d24d8bc63ae6a3ca400713d3d
 MISC metadata.xml 413 BLAKE2B cf3df69453155e356f6f30026a06610f4cd5639d8de0ae4842b82442234c235b3c8933bf6943193674b0f7ca894f00b8aebceb2de65f11186ea0c66c42e6bab9 SHA512 e00344899c210aa59b4ac218773745d418730c934784cf4cef0a71511bd7ca4888a9591ef0fcf4603579b189cb78ef2f8b7654c53c8839f75ce6d400bfc3d408
diff --git a/dev-games/libsmacker/libsmacker-1.2.0_p43.ebuild b/dev-games/libsmacker/libsmacker-1.2.0_p43.ebuild
new file mode 100644
index 000000000000..b106ae74e0b3
--- /dev/null
+++ b/dev-games/libsmacker/libsmacker-1.2.0_p43.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ~arm64 ~x86"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	insinto /usr/include
+	doins smacker.h
+
+	# No .la files or static libraries
+	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -name '*.a' -delete || die
+}
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 3e77c80aad5f..7473fd598959 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -21,6 +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-r1.ebuild 5882 BLAKE2B 75d665bedf08195ce640b68db92363724aabc9c4e7bc2864e8adb44a97381342e1413a968dd076533989dc9eef2f2566c68f14ddd7bfb94d57f1fae557c59e17 SHA512 f63f23e66c0e05b6f11f8d4600ba2faeaf297425f32773fc3eb2911337501a6274abc19601fca4d6f5f23fa6575df48afabdfb902adeb0ac376c31a41c07c446
-EBUILD ogre-1.9.0-r3.ebuild 3589 BLAKE2B 9d9ca980e9a0c45864f18dd69a0921ed53453a49d929f6218ccad48ab4d1d3f645f4aa16325026defac3de57c67c870725b1f98abbe4affacf5a3a780b4d3ea6 SHA512 119226ede434ac28f98b5506ea1c12364e79077f2d036455c53cdebab2618914f488fe0de308e71a2eb3b98b97a431bd6fb438c63bd9ca73de573c983717ee65
+EBUILD ogre-1.9.0-r3.ebuild 3676 BLAKE2B 89fb29fe7d180b619f4b77593899ec0af648d94e1e0b36a99d7388ba3f336e6818ba0bf25d4f0891d55cb35bf55e9f36f38a16c529a27ea8e1d4ac4ad071d4f7 SHA512 e1c7d37d97b5621a1360b48cfa5f165710433558c45f69a2acd44e52cca740fcc8de55e63753e3367ef8e02082cdf1ec82a8693429002b25faaa51854b0cb005
 EBUILD ogre-2.1-r1.ebuild 5952 BLAKE2B 5b1b2f0fd60be1ad34dd5879b5960ec5d09a4c0934181e50a1a59622c344f1a21c42387b0338c32466117799c26a6701b2c8725dba4a8d95e0edcbf703bbe33b SHA512 b911bbcc7bdea34b50e29fdf48c760a81f5569a9ea2a8b33a2c32c394036cd5db6ddb8f7d60307c92fdb66444f6c8b22e448668861ba8d6f7e2cf79274c572fc
 MISC metadata.xml 6850 BLAKE2B 09b018c447f618b91d62c1ae8c9ccd04de4dd51af951101d4a7cda7a9b9f43e6bd446a33140956213d088f8f0dbdffddbdcc33c52867780a2a2fd204c36c2d5f SHA512 e8421706eba7db126edf91040062edd5d2cee9c1d19bf1525b50f8d1d33044e8d35191810b8c3426a06b00e088c6ba724110aab10305f7f0dfc347b467b34e05
diff --git a/dev-games/ogre/ogre-1.9.0-r3.ebuild b/dev-games/ogre/ogre-1.9.0-r3.ebuild
index 4adb836a28a4..cb80cd8c754e 100644
--- a/dev-games/ogre/ogre-1.9.0-r3.ebuild
+++ b/dev-games/ogre/ogre-1.9.0-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"
 
-inherit cmake vcs-snapshot
+inherit cmake flag-o-matic vcs-snapshot
 
 DESCRIPTION="Object-oriented Graphics Rendering Engine"
 HOMEPAGE="https://www.ogre3d.org/"
@@ -114,6 +114,11 @@ src_configure() {
 		done
 	fi
 
+	if use examples ; then
+		# bug #829253
+		append-cxxflags -std=c++14
+	fi
+
 	cmake_src_configure
 }