gentoo resync : 14.05.2020

2 files changed, 4 insertions, 32 deletions

diff --git a/dev-lang/lazarus/Manifest b/dev-lang/lazarus/Manifest
index febef33d9fe5..3d4e65df7b70 100644
--- a/dev-lang/lazarus/Manifest
+++ b/dev-lang/lazarus/Manifest
@@ -2,9 +2,8 @@ AUX lazarus-0.9.26-fpcsrc.patch 407 BLAKE2B c3b006fd7bb58fb7037aae3d8d35ac146ab9
 DIST lazarus-1.0.12-0.tar.gz 47687878 BLAKE2B 7a230f8ad433fefd514d8fca128e1ad127ea2a232c2061080d4146b5276ef82bd442be6a522a5eb4a9221338e8d13cf9d3cc954f712dfbc521d8fd74b07389f7 SHA512 2a106c4bff2135ace815f789057f25fea1902edc972503e883547d7cc6d50b585ae54676cba734cce616064864ce535b3a4fcd7892763d15aafdf262dbe24293
 DIST lazarus-1.8.4-python.tar.gz 1060859 BLAKE2B 4d6f7dc275aacd0f70d9f7c85aba99a7722b02165a5bf287bfeed46f28e3b36c5abeac19bd7c6555250102dce169f7c9c213b634ce1b634c24dadc84171aed10 SHA512 f244b4e86410fdb2ffe8ccba7fcb51c270286172b6102f757118827cac3b652210a625d65dd6c017c1992983527792ed64334291ab0e0b824f187316452c56b5
 DIST lazarus-1.8.4.tar.gz 63130653 BLAKE2B f9b2ba9971f1a9a9c3b8d2004bd3516c12db5384bb6243ef275c2fc0d458634fba0c1c23e7ecd5c160c1204d6cc2b4ebc340ce8bb5cfdd9c531f8c36ae59d1e2 SHA512 82cdc3c32dddf8e67c0bed9292a9a924227bab50f22ca479f5e98ecccbf60dd66c7f886ecb8e2979d9d8fccc3d25462ee8c55fcab085aa4194b4704660e0b95d
-DIST lazarus-2.0.2-python.tar.gz 1060859 BLAKE2B 4d6f7dc275aacd0f70d9f7c85aba99a7722b02165a5bf287bfeed46f28e3b36c5abeac19bd7c6555250102dce169f7c9c213b634ce1b634c24dadc84171aed10 SHA512 f244b4e86410fdb2ffe8ccba7fcb51c270286172b6102f757118827cac3b652210a625d65dd6c017c1992983527792ed64334291ab0e0b824f187316452c56b5
-DIST lazarus-2.0.2.tar.gz 67092332 BLAKE2B 12fdca5b0d7c8bcad4f1c6a70c2ebb1d0974b0884cf89135be069744f01527fcd5b2a4b4c898cb500519ec3518025da453087954722cab43a60c1cdb164371d4 SHA512 0d2bf26afa3128104181fbe57b1adeaba3bb589b0a3b72598507825a3f08201d4480c6cff510a6f866dca4d49417fac3a2f68ca7e58fabe4f4e3bad97323c071
+DIST lazarus-2.0.6.tar.gz 65558951 BLAKE2B f5289562adcfeab86af074de9fc44d7faf5939655587ea9951559bbefc15ce1730e7b7dafb6ec1d0a11eb0f8f069309b8fa0a305051c5cc9ea0fcf9665e883bc SHA512 cdb4c5861e130c12bf0a4938a73c439f2766a73008678028d7e9c9bcabe7b277e70025a7c720a5c14c157cf0227e0ff629a44cf983537b3afbf341343e816d07
 EBUILD lazarus-1.0.12.ebuild 2353 BLAKE2B 92b70e8ac8a040c9128547c343fdd0f751b5cb72c6cd59c87724151bec4c8b593ea1a04587784f368d8d16e71f13ea13d7ce2256bbd4a9a6018c6869a04a0524 SHA512 93e90953cd2d4390bb1317c3e15094f8fb11f9e000f37f46a58362a71995c6b37643056c254a05baba3294cd6067b18d2016219ae0dba6bcea4be809dc6090ac
 EBUILD lazarus-1.8.4-r2.ebuild 3530 BLAKE2B 98ad3bf609155c9171b0911812c2cbf9bb7286ab3eee9c1d6c010dec5f0fd694409eb35f0a4d67d5e27f1abe8959129c87ef13f01e9491480d44a339c976db32 SHA512 767e7a9961425daefb834eb4cec25ce9ea537eb1ed50a44fefa11be4fd703fe3747c18158b81799f7cedad25d27e26b2bef3513a9f8f7fa6eba5b21f1bb01dc4
-EBUILD lazarus-2.0.2.ebuild 3526 BLAKE2B 84fd6c78ca6d015b7f324e34d27b18829bc18e75c58f864de7b39609902eaef53a7697e1ad739a8776e67bb8e70f035c9307bbb42483f2b6c686f3a791a61211 SHA512 049a7dea678987f13b43a9e6e1b477ce5224f88f6ad250f089c9673fcdf3109158719afdabfd424a3db6f0a0be82620a9a102abe120c9762620e306e32daedbf
+EBUILD lazarus-2.0.6.ebuild 2471 BLAKE2B e9b45f75b6a7c397d09e123bd3ceb53365656271fe6ffbb150543da83d07f6b216977a1fdb405ff17fc22fd48d2a7162c6ad88ce8cf06aaa64e572e6ff151527 SHA512 ef7ad240944f7380302ef1189669df6d3b3815f428bec0a59758b17d64ae9ed2b29c9e3a8f006138536d8e41203518f7fe715238d4afad671b5ae555a02862fe
 MISC metadata.xml 516 BLAKE2B b4023336c3271703bc3912f9ab02eed6b57178d1f468194bdac5ac9b01027c5f7c847e776e9b1048a9ce29a4939055e3c00e289868a740c76bb2b7c0e6ff9085 SHA512 991dd36587eaa2412af0fccac7664c72a1d9153d12b313ae151943d7c66ac095b3d2cbe61fe4d84c4566e196ff11e1c16c6ffe2ab6e00fa40fc2fdfe23cee524
diff --git a/dev-lang/lazarus/lazarus-2.0.2.ebuild b/dev-lang/lazarus/lazarus-2.0.6.ebuild
index 65a86403c767..8cfaf07f618b 100644
--- a/dev-lang/lazarus/lazarus-2.0.2.ebuild
+++ b/dev-lang/lazarus/lazarus-2.0.6.ebuild
@@ -6,19 +6,15 @@ EAPI=7
 inherit desktop
 
 FPCVER="3.0.4"
-PYTHON_HASH="586eec1a5ea609ef9df2bf586be06825d9fbd50f"
 
 DESCRIPTION="Lazarus IDE is a feature rich visual programming environment emulating Delphi"
 HOMEPAGE="https://www.lazarus-ide.org/"
-SRC_URI="
-	python? ( https://github.com/Alexey-T/Python-for-Lazarus/archive/${PYTHON_HASH}.tar.gz ->\
-		${P}-python.tar.gz )
-	https://sourceforge.net/projects/${PN}/files/Lazarus%20Zip%20_%20GZip/Lazarus%20${PV}/${P}.tar.gz"
+SRC_URI="https://sourceforge.net/projects/${PN}/files/Lazarus%20Zip%20_%20GZip/Lazarus%20${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
 SLOT="0" # Note: Slotting Lazarus needs slotting fpc, see DEPEND.
 KEYWORDS="~amd64 ~x86"
-IUSE="minimal python"
+IUSE="minimal"
 
 DEPEND=">=dev-lang/fpc-${FPCVER}[source]
 	net-misc/rsync
@@ -52,20 +48,6 @@ src_compile() {
 	LCL_PLATFORM=gtk2 emake \
 		$(usex minimal "" "bigide") \
 		-j1
-	if use python; then
-		addpredict ide/exttools.pas
-		./lazbuild -B --lazarusdir="." --pcp="../lazarus-package-config" --build-ide= \
-			--add-package ../Python-for-Lazarus-${PYTHON_HASH}/python4lazarus/python4lazarus_package.lpk \
-			|| die
-		sed -i -e "s:${WORKDIR}/Python-for-Lazarus-${PYTHON_HASH}:/etc/lazarus:g" \
-			../lazarus-package-config/packagefiles.xml \
-			../lazarus-package-config/idemake.cfg \
-			../Python-for-Lazarus-${PYTHON_HASH}/python4lazarus/lib/x86_64-linux/python4lazarus_package.compiled \
-			|| die
-		sed -i -e "s:${WORKDIR}/lazarus-package-config:/etc/lazarus:g" \
-			../lazarus-package-config/idemake.cfg \
-			|| die
-	fi
 }
 
 src_install() {
@@ -93,14 +75,5 @@ src_install() {
 	use minimal || dosym ../share/lazarus/components/chmhelp/lhelp/lhelp /usr/bin/lhelp
 	dosym ../lazarus/images/ide_icon48x48.png /usr/share/pixmaps/lazarus.png
 
-	if use python; then
-		diropts -m0755
-		dodir /etc/lazarus
-		cp -rf ../lazarus-package-config/* \
-			"${ED}"/etc/lazarus || die
-		cp -rf ../Python-for-Lazarus-${PYTHON_HASH}/python4lazarus \
-			"${ED}"/etc/lazarus || die
-	fi
-
 	make_desktop_entry startlazarus "Lazarus IDE" "lazarus"
 }