Updating liguros repo

4 files changed, 17 insertions, 14 deletions

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index aac7f6802f21..b42545c0b360 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -9,20 +9,20 @@ DIST Python-3.4.10.tar.xz 14559088 BLAKE2B ea1e333f04c286fe715c1ce97ade37c6a768e
 DIST Python-3.5.9.tar.xz 15388876 BLAKE2B 6086ed2350b6dce3203360f24c2fddf77df65a5815d6da019809796b30c2f43440a9e349c7defd0187cfc3a50a387352dfa63594c2ec513dd6bf585e7c34ec51 SHA512 58127793adef42ed57ae4d56338268866e14c2d084f09f57f26fc6b1c9454e70cc6d3dffc638f8d56f182acc0884021a4dbb578f312dd6fc01995fa85e31377e
 DIST Python-3.6.12.tar.xz 17202980 BLAKE2B c8d22e4d57bcaffe77cd902cda3a473e73adf2b74ab104c23b4d846f19632a24cc0c478af84079b16d784bd1c0956824c06c1f6134fd24f54e58aaab0fe96bb6 SHA512 1462801f3f6626a853097d34ccdca9838c4c5bd81ecc3abc751003f5f2f8d36eecdaa4130ef4218de351c5586093c11669639a34492668fbc5a2a4a241f4a070
 DIST Python-3.7.9.tar.xz 17389636 BLAKE2B 484833aa2aa4e29051a02969294f72099ff6f1a47d944b1a0dd15f8e6c22a0406d551bcbcd1048cf89defedaccf060733211e34b38e31fd8391dd823eaa35bc0 SHA512 e4217b25529b5336e43b63d17f3758a8177a58184564cf02bd92a312f58dba9e096485c9e3cb3544f966e847ea15b3ab30ed065d28a6ca52a6d7e0faddf7d9f9
-DIST Python-3.8.5.tar.xz 18019640 BLAKE2B bb3e0566afe28759e4ab129ad0986a0fc5103514f2e2b22ff4aa3973c3173ebdd24d4267fbaf903841814a611fd9ea122673e5a1918934366e5c0efaef9d7517 SHA512 460cee65d7df7150694590575502d7f22e548ebfc99c8f8b363eef8bf30ee72e58d8ffacb1d607824f877f880eb9fd6775a508388029583e1e1df3380f3f9587
-DIST Python-3.9.0rc2.tar.xz 18802576 BLAKE2B fa39f359ca79db83873a9a05c07b3915e759df887c80835f6d0db0e4906f919677c3cac23b83aeb7397800107207f742a876efa8dd74a2bf3b418fd1b05df069 SHA512 77aced89518d86c1fb0e48a96be135c8385f6fb912543f7bb8e792b15ca0d59005269a4c35d4185d31536980572f8fa0adee022a572a268e1f8e9832a052ef5c
+DIST Python-3.8.6.tar.xz 18233864 BLAKE2B c8a8ef6055e344dda30eb808804cfa62016b4f840257cffd5a495e5932f5696e50579d49b8181a487c9cd4a89bdb95656e80981039783a21d20f7980aa2c9883 SHA512 22faec84f6e172e1ac7c6bd6fd37e9b6ae4afc91cf5136aa8cac8ebbed8d18793f9196e8749b8ccc43447cb6c41cb450f65ea72dd363c06dfaeb14e0455f5560
+DIST Python-3.9.0.tar.xz 18866140 BLAKE2B 8e12b64e187a65461473ac3b281dc489f0abac586e0755f6dbeceb236b34bdc008085eeac9ee1a19d76f5ec6a2fbda623985454c9d0164c4888a97b8cd940034 SHA512 b141039c9701a8cb0d15cd11a279153077524af4d0599e7d2c7279d4c18d05fda06b33ef82342d875de996c7117b7dc6eb154dc3669d38a1efa99801aeec6c5e
 DIST python-gentoo-patches-2.7.18-r3.tar.xz 18856 BLAKE2B e35b3d847dad114057b7dab7615941b4879f3531aff1d23bced22da2d445cdec77cdd416566611ca01a3d39f30f16ef224f835f35ca12a301024d7a9fb6a507b SHA512 abb102223555535d5214fa91fd4bb3d1241050c86027af1612a9bd43fea2721e184587e5b784e5af9cbf563b8fec5a25cd07dc5fa72d762228734713176cfcbd
 DIST python-gentoo-patches-3.4.10.tar.xz 21340 BLAKE2B c2ca41fc4bc81ae6be9426d772b1ffc09a4b2e2c021905886a92d85476871e6c3b51ca30c60eeede93ff8cd90628809cd8c6fb00041d16c1595ce1ba8369dac8 SHA512 27ee476c080a0d1c012ef5d3d8325db6e697e1c3d9611f0337668f3660a50e50e6529bd0fd8b3b5b6030c9be8f8a86d95fa59bc27085ce7d18a7e0b50afe9f4b
 DIST python-gentoo-patches-3.5.9.tar.xz 13548 BLAKE2B 9afe277c1c7c42aee21b4279cea5539d31b4a7088fd124bedb9af34299252ef2ab275e602adb5dfbb6944d06b375161924b05fc690f7d0d78860ed3e5f89599c SHA512 def5435a315e58d3794d8bce8fb04105a36ff37bd90a437cf7588a0c0ec8d420af5b68009ab153823286e71e52056e12a0eba4dc4d958eeb8d6b914b24f0de81
 DIST python-gentoo-patches-3.6.12.tar.xz 11448 BLAKE2B a7fb7153ca6fd353649f9dc23f2d777e84ff144d67984d8c3d292619a4f671e3a71d8022bcc334b55f9f1f416ceeca113fb116da805e4bc45d8a67cbc098ead8 SHA512 7efb97abd3e058e4532b89205c99794836ba094079de2a6d7846fd2673ea8cc31e68573b83fd9f82453151653fb0ed9bc40b7961b41efdfe703b64cbed2576bf
 DIST python-gentoo-patches-3.7.9.tar.xz 10588 BLAKE2B f60c8500671e7e3977412474c838905846e0609a7fdac787f2c6a8bfa53c887dcfd3466c5276772ffb8c20205e8b3f207f7d148c04524f19d095964b519da62d SHA512 11f411eb2d59fd45fbd80bdb1d1a83d413770779244045006942c5cb84837cba606673bcde102ae03b1d4579f526b551c93a64d39dba530b4584ba8dd8e9f13e
-DIST python-gentoo-patches-3.8.5.tar.xz 11280 BLAKE2B 163c577da75f4ec0ebe86b5a08bea96d5ae406020bd211439b1405c0f8a5dddc9422a9ea5b16eed195433cbec010d9def3126a578d3f9716325482216b9e4d62 SHA512 6b7f72b8deb87fb7a169e97391185823984b5e9c99ec5232504c670843fbe0ca76afe32fc3fbe1f850ec6c42e9325cf4697022f36f7b00a4028b324069dd4d5b
+DIST python-gentoo-patches-3.8.6.tar.xz 10956 BLAKE2B e3241d97f886d0a37f85735102db8f00902df59ee12e8501b6c7f549dd4b26a6289bf34ff8dba02b369ed7875fad3d18e177afe9e367db4cb06f2ee908482f9e SHA512 7afa8e54f7b7e6ab35edc16d4214384b8ad8a03068d1984656876d6477b278af931e8c797d03d1bed2f10f9d58ac387db1a43921e54fb17cf4b779f33820abc0
 DIST python-gentoo-patches-3.9.0rc1.tar.xz 8856 BLAKE2B 7bd032dfd047640c6a53633b5b9ee7b24199106b985230f772dda978d3b79fe0406eea64c4a842603a20afb71a90469befa7ec59a5ef1f793e4c901aa85952d1 SHA512 85a7d4397abf2a0f3c3d07a94a3e184ba3dcb347f3b70ee2cb77e81aac63846b01323a0228afd0fd1d32b3cafb64b18f82e6f5bfd88e4d564261ddae11e747eb
-EBUILD python-2.7.18-r3.ebuild 11424 BLAKE2B 3e1ff05bf6d9f9e0bd5b964fe1024801fd861ba4bb94dcb96201e054ea99d5365557e12a6d12131d2a9da45a3a74b2f0c928a0ce33c97db2a3b639802940edbc SHA512 e5b97d25bca9d273018a8331e9edd99dc3e45706663f4313aee7e8709067918f1ab82be3a65ab507630e64f4006a7a1ab9cfe23744f1b7885b2665473a6eb632
+EBUILD python-2.7.18-r4.ebuild 11466 BLAKE2B 6e4f63af91b2c3515af3fd7314813f53973527e456f1989e46e614c01396e0b0d50c5bff7f6018f565f5b3ba98869790dca635523af096098c3e2bf42c782686 SHA512 c7971c6d4cc0f1d345b1a3141ef2fc0dcbccc6fe7833b551e317cf5e185f6cbaaad0d6a6ec25bd7f8bac4fd12a3f375fd9603fda67b952924afb1d55108d060c
 EBUILD python-3.4.10-r1.ebuild 11680 BLAKE2B 6b64a015cbc21de1f42667987b85e2befd0d4a12ad10b172da2fc58a18a77796f3624d7fe8a9c392ed721cbd9d2494ad4c4ae4ddb9141fea5824e861bf2c338d SHA512 a4d5afc3f49eb78d9132e0c4d48618f1e88bb402ef2cd688c4fa718ec14b7ff5a8299f82140463559fe9c8c9cc8cc76882c6ae62b4a721c9aaed597a18afe6a1
 EBUILD python-3.5.9-r1.ebuild 12232 BLAKE2B 90f97470859131ca50bf92420fc46fcef49541537a6d5e42aaa9cb15518bc6a6151531fa4dd7b00e49361a5f9e4f63b352813aba2b2f3358180d5252c1662f4a SHA512 c6afb2e4f9dac20240d41651c2359b5d01f125f7ef10d99f74f9c3166be56cdccdd11416e760202f0026eeab053cd1ec81b5603cc4d48b82dfe48be0fcd6a67e
 EBUILD python-3.6.12.ebuild 11856 BLAKE2B 04fdc9a1993284cd915344d85d59073b3879a80770a472190df72a5c7cb3671f87dfd9548f0b61ffa82eeac8ca7862e7e5941e628c3f338afc9ce55e29af2ccc SHA512 0192daf323d9a5e085e4f522e6c87ca2f0738911b013dda2c08793f230d9419a05b16e70d67a1760539c36a2bbfb9c72395cfb7f175f73c3db52548d5379cbf2
 EBUILD python-3.7.9.ebuild 11697 BLAKE2B bad11f88d9ca95591bfe2725153b941f5f1ddc262a6126f4c36414f895f299682d52250d1f45de50fc006ec466e0e9314072b877d9e75091571b0103d26901ae SHA512 467f016b452c78e759f30e1fe384f43c28330bf2348b8af8a87197d86a76353afdc407a58dc5c8fe535548e195199a36a97d4cef72273797e83283a2293dbf47
-EBUILD python-3.8.5.ebuild 11659 BLAKE2B d2ebd5bab4a09e3b355ccc800af8b446992068e5ee0e35411a07ecd6444c8ff7c74b9574721e34f68c8f0e2ff24e1f0c95259a7f467c9be87e87173a3f7cb1d4 SHA512 1bf40394d0195de3290fe151f7d7760e853ef2df38481554e8ca4ef5ff619ed459932ac2705f79590bd073f066bee92e2a27a89ca8df4f9717ea1db45e03088c
-EBUILD python-3.9.0_rc2.ebuild 10806 BLAKE2B b9c29802773427faf0bfb8ded2a1e82912e84cea1ab4e83d83ac28001c38a9e99af009d4ab754f303e62f41f88fea706dfb7235e7e1831f1422b9fb4b5db8d74 SHA512 2d8a15ffd8dcb2add12b01b915cd4752d5b314114b8ed7e7dc687fe9397031f19957c37f0e3fc6d7bcd4f51f5e99561aeb1d10c4e4427a6733b9aa783191a10d
+EBUILD python-3.8.6.ebuild 11659 BLAKE2B d2ebd5bab4a09e3b355ccc800af8b446992068e5ee0e35411a07ecd6444c8ff7c74b9574721e34f68c8f0e2ff24e1f0c95259a7f467c9be87e87173a3f7cb1d4 SHA512 1bf40394d0195de3290fe151f7d7760e853ef2df38481554e8ca4ef5ff619ed459932ac2705f79590bd073f066bee92e2a27a89ca8df4f9717ea1db45e03088c
+EBUILD python-3.9.0.ebuild 10806 BLAKE2B b9c29802773427faf0bfb8ded2a1e82912e84cea1ab4e83d83ac28001c38a9e99af009d4ab754f303e62f41f88fea706dfb7235e7e1831f1422b9fb4b5db8d74 SHA512 2d8a15ffd8dcb2add12b01b915cd4752d5b314114b8ed7e7dc687fe9397031f19957c37f0e3fc6d7bcd4f51f5e99561aeb1d10c4e4427a6733b9aa783191a10d
 MISC metadata.xml 819 BLAKE2B 120c7c65d77488e726c5a0f4aa19469867ea6900e747169fae2f9cf8f14ec2936089d5edfe1935ce610bec26387273e261b1cc4b023680c8c4b229f2141a7223 SHA512 08f45707e5490067a21951b9d37c8ae67064ab67cccc5b8d8c204eab8d4a004fb910627b62989c67b849b89d301618f8f8f7996e99e1ef5bab38a239c49c124d
diff --git a/dev-lang/python/python-2.7.18-r3.ebuild b/dev-lang/python/python-2.7.18-r4.ebuild
index cd33da021b36..edad3f86e611 100644
--- a/dev-lang/python/python-2.7.18-r3.ebuild
+++ b/dev-lang/python/python-2.7.18-r4.ebuild
@@ -62,7 +62,9 @@ DEPEND="${RDEPEND}
 	bluetooth? ( net-wireless/bluez )
 	virtual/pkgconfig
 	!sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
+RDEPEND+="
+        !build? ( app-misc/mime-types )
+        !<=dev-lang/python-exec-2.4.6-r1"
 PDEPEND=">=app-eselect/eselect-python-20140125-r1"
 
 pkg_setup() {
@@ -349,17 +351,13 @@ src_install() {
 	python_domodule epython.py
 
 	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
 	local scriptdir=${D}$(python_get_scriptdir)
 	mkdir -p "${scriptdir}" || die
-	# python and pythonX
+	# python
 	ln -s "../../../bin/python${PYVER}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
+		"${scriptdir}/python" || die
+	# python-config
 	ln -s "../../../bin/python${PYVER}-config" \
-		"${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
 		"${scriptdir}/python-config" || die
 	# 2to3, pydoc, pyvenv
 	ln -s "../../../bin/2to3-${PYVER}" \
@@ -371,6 +369,11 @@ src_install() {
 		ln -s "../../../bin/idle${PYVER}" \
 			"${scriptdir}/idle" || die
 	fi
+
+	# python2* is no longer wrapped, so just symlink it
+	local pymajor=${PYVER%.*}
+	dosym "python${PYVER}" "/usr/bin/python${pymajor}"
+	dosym "python${PYVER}-config" "/usr/bin/python${pymajor}-config"
 }
 
 eselect_python_update() {
diff --git a/dev-lang/python/python-3.8.5.ebuild b/dev-lang/python/python-3.8.6.ebuild
index 69a192f6c1a0..69a192f6c1a0 100644
--- a/dev-lang/python/python-3.8.5.ebuild
+++ b/dev-lang/python/python-3.8.6.ebuild
diff --git a/dev-lang/python/python-3.9.0_rc2.ebuild b/dev-lang/python/python-3.9.0.ebuild
index 5ee8493c3162..5ee8493c3162 100644
--- a/dev-lang/python/python-3.9.0_rc2.ebuild
+++ b/dev-lang/python/python-3.9.0.ebuild