diff --git a/dev-lang/lazarus/ChangeLog b/dev-lang/lazarus/ChangeLog index f9dc236..b733de2 100644 --- a/dev-lang/lazarus/ChangeLog +++ b/dev-lang/lazarus/ChangeLog @@ -1,5 +1,6 @@ -*lazarus-2.0.2-r1 (23 Nov 2019) +*lazarus-2.0.6 (31 Mar 2020) - 23 Nov 2019; +files/lazarus-0.9.26-fpcsrc.patch, - +lazarus-2.0.2-r1.ebuild, +metadata.xml: - dev-lang/lazarus: fixed Python USE flag ahead of Gentoo Main + 31 Mar 2020; +lazarus-2.0.6.ebuild, -ChangeLog, + -lazarus-2.0.2-r1.ebuild: + dev-lang/lazarus: version bump 2.0.6 ahead of Gentoo Main + https://github.com/gentoo/gentoo/pull/15183 diff --git a/dev-lang/lazarus/Manifest b/dev-lang/lazarus/Manifest index e9fac8d..3c81e6e 100644 --- a/dev-lang/lazarus/Manifest +++ b/dev-lang/lazarus/Manifest @@ -1,2 +1 @@ -DIST lazarus-2.0.2.tar.gz 67092332 SHA256 e9d07f176e63c6ff7cf693a135ee66135c147ba398f67b8c6fe892c726f6a476 SHA512 0d2bf26afa3128104181fbe57b1adeaba3bb589b0a3b72598507825a3f08201d4480c6cff510a6f866dca4d49417fac3a2f68ca7e58fabe4f4e3bad97323c071 WHIRLPOOL 81bbaf476e121d335a493ed5021fc7b8aadd53dcc22f42e426d3278fa7675ea798c8d9fc30140808bb382c44b824442c6f7863ac83862604cf38a0a4deb11d84 -DIST lazarus-python-f362a0ea44a1981558539833a0354c1cf4b10eca.tar.gz 1254207 SHA256 3483e38fd84488e2321575e8549cc20041a7c3f89bb10319dfe6a135b967388c SHA512 3b93ac44838e09bdd61bde50f93d116d113779679f6dff1288a0b16003bbfcea0fca2edcc77cfc013ef605e3e7fca5dc71322f4cf9b5b6f78d25c18e7a74ce8f WHIRLPOOL e863641020ddf80365065f2e27145095fe5e5fc303d15ac867f371a4129a3a39f85960c63a19902386d3dfc8ab652496a8e12b7bd41ce66f081e6e5f5e6620e6 +DIST lazarus-2.0.6.tar.gz 65558951 SHA256 82cdafb0f0c05cf1ebb8e52b58bf980a08a866b6df1003f55ca2da3480e92a6c SHA512 cdb4c5861e130c12bf0a4938a73c439f2766a73008678028d7e9c9bcabe7b277e70025a7c720a5c14c157cf0227e0ff629a44cf983537b3afbf341343e816d07 WHIRLPOOL 89e7bb64151e6b644a06b9059cd30b995dfd25f81fa1131e0abad0d77e63aaa2bf9cd95bf8cb401ef54fd0bf283cc0d782a91ce9a9d4aa0ee665561c83066fc2 diff --git a/dev-lang/lazarus/lazarus-2.0.2-r1.ebuild b/dev-lang/lazarus/lazarus-2.0.6.ebuild similarity index 66% rename from dev-lang/lazarus/lazarus-2.0.2-r1.ebuild rename to dev-lang/lazarus/lazarus-2.0.6.ebuild index 14dcb03..dad2f5b 100644 --- a/dev-lang/lazarus/lazarus-2.0.2-r1.ebuild +++ b/dev-lang/lazarus/lazarus-2.0.6.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 @@ -10,15 +10,12 @@ PYTHON_HASH="f362a0ea44a1981558539833a0354c1cf4b10eca" 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 ->\ - ${PN}-python-${PYTHON_HASH}.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 +49,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 +76,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" }