gentoo resync : 29.06.2020

6 files changed, 9 insertions, 9 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index e546fea44b1c..260707cb30a6 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/lgeneral/Manifest b/games-strategy/lgeneral/Manifest
index 2e34028e4957..2445739b32cf 100644
--- a/games-strategy/lgeneral/Manifest
+++ b/games-strategy/lgeneral/Manifest
@@ -1,5 +1,5 @@
 AUX lgeneral-1.4.3-fix-utf8.patch 466 BLAKE2B ccfdc447ddf0eaf24ac56989007277c4e94f48fe69dfb4dc1030a8c80c5764b8dbc84876f539c4fb99703f578c69ac8ba2b49ecf61e69f31d0621d06379feef0 SHA512 abccea722ea34de06832525b5c936c829119327b44421655884fe7f648bab0b9dcea104543dcf1d2a363ceda55bb74edf360b60a30608e50aca865b1c975a02a
 DIST lgeneral-1.4.3.tar.gz 1924730 BLAKE2B a0f3be4a50e384b7f6baddc705825f12fc4298eb3b73ac7164c0eb6330dd3e204ceb4218e88a322aa438b2fba1b6204dedab21e528713889a67a84f6b0cff768 SHA512 09f8e29b8f6c1af593f56f4d4b7c8437bfa4dfc69bfd0dbe158b7add0bc5ff505fe1ed83bbb8daca17ae43e91ae1a47c5efe2c7700a3ea456505a51d293f1101
 DIST pg-data.tar.gz 410454 BLAKE2B 70b325636c43b69b7cdc2f074a0ac49af46db5c60ebeea5ecefaae18169509b05b4c452c34e8b0cd483d3565c54191623ff3eb900f24683252fd8c775ecdf847 SHA512 b0df30dd9a9d0652acd8702d601c489e5d3a030854ceeb173d2daa656c00633a78a3f45814da9f4157b86544dec34eda02495742242653c7cdebba5ec9951516
-EBUILD lgeneral-1.4.3.ebuild 1582 BLAKE2B 7a9141e5b108777bde58cc6e60c86c6eb01c7fe61aac2d881f312d664c5bbda30e2bfcc08f3b9da3eb7f2b79cd4d88c71096d0ae196fda3091bd381c83ee059e SHA512 0125bbc4dae261daf462d3118778f6ad0c26724ecfb46a3fe255e9dd71b30365e8636dd9093a07e0b1714f972569a5122173b917ddba2e726142c40f0a2775cb
+EBUILD lgeneral-1.4.3.ebuild 1632 BLAKE2B e1448e95d55cdc22bd082b6f3f962c470515965b0c82d55ca62f7ba5743c33c16eec212180055cc2c6336cd149b547739d49c49d00f10de70d355f4c1ada822e SHA512 11c031ac2e0e7245c150744f7a29da982a188a0cca42474f858ec7b11932b95f86e42a64d42324652ed2b8e43412cdb60e5450107f2aac0e59a609e95ae56114
 MISC metadata.xml 331 BLAKE2B ed6b281fa54a304ddd752e6bda476635922a0d9be37524a0e988666502279b85c793d455de63929c93e02f5b105367b78bea2eeb004e1a996d558159fe6443e2 SHA512 eef1e23a9d81b81e39f84ba41d70d39bf11f52acad42dc312548239919b7ce359a671f9b76dcdee92be92bc11c798d9031f3a641c13ab6febfe5bd978a4bbeeb
diff --git a/games-strategy/lgeneral/lgeneral-1.4.3.ebuild b/games-strategy/lgeneral/lgeneral-1.4.3.ebuild
index 3d0b24d9ab9e..def5b5f87a24 100644
--- a/games-strategy/lgeneral/lgeneral-1.4.3.ebuild
+++ b/games-strategy/lgeneral/lgeneral-1.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop xdg
+inherit desktop toolchain-funcs xdg
 
 DESCRIPTION="A Panzer General clone written in SDL"
 HOMEPAGE="http://lgames.sourceforge.net/LGeneral/"
@@ -53,10 +53,10 @@ src_configure() {
 }
 
 src_compile() {
-	emake
+	emake AR="$(tc-getAR)"
 
 	# Build the temporary lgc-pg:
-	emake -C "${WORKDIR}"/tmp-build
+	emake -C "${WORKDIR}"/tmp-build AR="$(tc-getAR)"
 }
 
 src_install() {
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index 13f8ed2d6500..475209ea1bd6 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -2,6 +2,6 @@ DIST warzone2100-3.2.3-qt_compile_fix.patch 680 BLAKE2B 1073ea1619640455326c63dc
 DIST warzone2100-3.2.3.tar.xz 81314060 BLAKE2B 231be8c24d1c0967adb0a76ac9e441c2ea9f835720df9951f74227988473d100b24bccbfe4b5882a36c63a798368ed1a1f871751b6b363d90a82fea48c44ba65 SHA512 4b1bc0a0bb50a8b4726a2762a922ee233b92f9835e38bbab80c159a9cb301df7434a73ba5acfb17404031467c02a9b3480d6a0d44906d70896311b3468141746
 DIST warzone2100-3.3.0_src.tar.xz 86605304 BLAKE2B 70bad66966e31009de7f16a039525b2bc3e84a9991e7d95227f8789ceca7313a219044f41c0ceec0ce357e8368a30833d7dc1cc35e9575d9b56efa20b9e35c03 SHA512 876e36578472d9de4c00651af9b26a79bbbc85161d03c58e381aac90be710999b9091524425332e950ed42b79d872ace6848798829e7d3d7bb6ae7dae0003559
 DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6
-EBUILD warzone2100-3.2.3.ebuild 2574 BLAKE2B 025a756979b5c40a2c486ed84a08013ddd3a3b7f397ba83e5d420b16410ddfe58d6bae20bdf75922a4289f5bee84d16179529c79cbe03d45ee581bcd1b1989d7 SHA512 448c367a65c0dd1f1ce5fd83c6e6ffa5e023767acd1e32f5cef15546911eb67c1ff315baa9afa0f4cc2f370bcde7ead305f8cb0aa7e7cf2a00976b84a7a09340
-EBUILD warzone2100-3.3.0.ebuild 2346 BLAKE2B a45c71a3e0f6b6592513e37d66658db108420f69a6ebc0a47213d151d3713c85d377ecb21bd07461b8affaee604f11410db0fe09d6a36d3400d8ce6dae9a9538 SHA512 0ae2aed3202e84c34f35fe77b16cfc903ce9aad6333c7a2974fd5cd3df98606c465bf27091de177ea38bf3d27aba648019be954df681aa352869e870135292dc
+EBUILD warzone2100-3.2.3.ebuild 2575 BLAKE2B 2712f209478693da3b3e106ac00149ab01fe49a798f29c1ec3397d6d39bc552fbf63a6e915f59ec9569276dfd235e9c44392fa09d40fe181516a8814b3cbbcbf SHA512 f19f25b22e9664053c07741990976fc297ed8d6389a4449d30f14ee4616261c63d72943ed5a50f4c223fd14695de8bbdd7a19b2bb983480cac64f898be48e70a
+EBUILD warzone2100-3.3.0.ebuild 2347 BLAKE2B d0e8bb5e2c3927e309e732db9be52ae8198d6b05c8bd37f5a391bdb5d78c83c9b1299cf100dca97ebc418431bb79cba3539c32dff69fef3c7c55e6c3bb67ad36 SHA512 49ed12f8483c013d28281069c38e49c6b7699295fc2bec91b2eebf71f68d5b9b24307812818a49c013062bf84e9ef7c1638a1c5adc8111f163468426bf9941aa
 MISC metadata.xml 674 BLAKE2B b0c40e88934cfbdbcbb7ffdbc277abcc3da3400de71f7508af51301f7ec5b6e00083ff2b59f59f7435a8e3f588291d7e5dbde19fa193b6fc78677b842cfb44ee SHA512 00aa4a109f41a0469e2b0e5daadcd33f9f3b255fdd2a724b7d116912ecb0b5fa4eb5e0dd7e4ae3e45f00c062c1034aa7d40143e48da0e66bab48da3d4e047dcc
diff --git a/games-strategy/warzone2100/warzone2100-3.2.3.ebuild b/games-strategy/warzone2100/warzone2100-3.2.3.ebuild
index 56daf63618e0..74fa50ea82f2 100644
--- a/games-strategy/warzone2100/warzone2100-3.2.3.ebuild
+++ b/games-strategy/warzone2100/warzone2100-3.2.3.ebuild
@@ -8,7 +8,7 @@ MY_PV=$(get_version_component_range -2)
 VIDEOS_PV=2.2
 VIDEOS_P=${PN}-videos-${VIDEOS_PV}.wz
 DESCRIPTION="3D real-time strategy game"
-HOMEPAGE="http://wz2100.net/"
+HOMEPAGE="https://wz2100.net/"
 SRC_URI="mirror://sourceforge/warzone2100/${P}.tar.xz
 	videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
 
diff --git a/games-strategy/warzone2100/warzone2100-3.3.0.ebuild b/games-strategy/warzone2100/warzone2100-3.3.0.ebuild
index fe91974e0f39..8f0f5308698f 100644
--- a/games-strategy/warzone2100/warzone2100-3.3.0.ebuild
+++ b/games-strategy/warzone2100/warzone2100-3.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ MY_PV="$(ver_cut 1-2)"
 VIDEOS_PV=2.2
 VIDEOS_P="${PN}-videos-${VIDEOS_PV}.wz"
 DESCRIPTION="3D real-time strategy game"
-HOMEPAGE="http://wz2100.net/"
+HOMEPAGE="https://wz2100.net/"
 SRC_URI="mirror://sourceforge/warzone2100/${P}_src.tar.xz
 	videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"