gentoo resync : 19.07.2019

4 files changed, 22 insertions, 161 deletions

diff --git a/dev-lang/lazarus/Manifest b/dev-lang/lazarus/Manifest
index 32ea545a2f6d..67d6ff044daa 100644
--- a/dev-lang/lazarus/Manifest
+++ b/dev-lang/lazarus/Manifest
@@ -1,11 +1,10 @@
 AUX lazarus-0.9.26-fpcsrc.patch 407 BLAKE2B c3b006fd7bb58fb7037aae3d8d35ac146ab971fc6063652e3185b320e4cb05ccedb6c26c7d64b2f2998a901608ee251762b723f62bd9c239a51ab6a6d6f2b39d SHA512 823d9ba2041f97c39d8ea5f49cb02f68d8c98da95d0a479cc65a638365e2adafd1c5645fa6846720af18198834958f37b0cc0d92f38023ccdaf40ec8dc848f64
 DIST lazarus-1.0.12-0.tar.gz 47687878 BLAKE2B 7a230f8ad433fefd514d8fca128e1ad127ea2a232c2061080d4146b5276ef82bd442be6a522a5eb4a9221338e8d13cf9d3cc954f712dfbc521d8fd74b07389f7 SHA512 2a106c4bff2135ace815f789057f25fea1902edc972503e883547d7cc6d50b585ae54676cba734cce616064864ce535b3a4fcd7892763d15aafdf262dbe24293
-DIST lazarus-1.6.4-0.tar.gz 57180961 BLAKE2B 930beda6ad04999e749fe4b76a64ab00b0138c18b0f3aea0cbac089ecb3f419aa4165d06757d6ee2d3c6e43401f2be5e154947d07f892a6bc5f4bb8831bad62d SHA512 d7d498483ef9e1eebd0d8ca2325d1984cb1297837ebe2f9547e67f26fc049c2168e2feeac739b8403c08a8251040e9161c962d25951545384ffbdbb076fda2aa
 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
 EBUILD lazarus-1.0.12.ebuild 2353 BLAKE2B 92b70e8ac8a040c9128547c343fdd0f751b5cb72c6cd59c87724151bec4c8b593ea1a04587784f368d8d16e71f13ea13d7ce2256bbd4a9a6018c6869a04a0524 SHA512 93e90953cd2d4390bb1317c3e15094f8fb11f9e000f37f46a58362a71995c6b37643056c254a05baba3294cd6067b18d2016219ae0dba6bcea4be809dc6090ac
-EBUILD lazarus-1.6.4.ebuild 2342 BLAKE2B f02a3c7c3a7e28fa754f560003761fb44257a0f49694c45902f134ce5f5322ece0d94633e495ab2547ee064abd4973f8378e61368c316fb0b451b5737f28dc4f SHA512 348abd222125bf2449cd434312209aaf758ca7f0dbd65a66b985e7afc7851ec71494631c0f2f86e39557a26e949c95afe99327cf0b48a363d6eeee26fbf4a294
-EBUILD lazarus-1.8.4-r1.ebuild 3052 BLAKE2B 9c7a24d205aaa02aacb3e4b1897517be59451a5153fb789a5b1efbb490053944373248a1eba6de49e4601dd3c94a8b49fc51c312f0670d6de6ce8257eee68dda SHA512 92d017993044ade9135e0a9d8fc8cd60415763df404be1dcaa1788d1ebc500a34f3d2dcee604e91aa863c99f3168cf71160c972f7fbcac00b0cb2bf4d24785ad
 EBUILD lazarus-1.8.4-r2.ebuild 3535 BLAKE2B 6c154cbd78bf8167d47e6ed6e43de43b951cf0b388a84b7318268a14a6e99de786a300c51062448184a51ed214da68df620e1d5b41ed5006290d6e75eae1fc6d SHA512 af502f83fc9e3d03bc5888913923208a4b9f35ae52a9270f9b627044620a337f4fc0ba7c6c9ea3e5b93234d2bc8a5856ac3447b5c109052eb3eeba0c40372930
-EBUILD lazarus-1.8.4.ebuild 2285 BLAKE2B a04e012ce18d7c8d793043b82bff199c3c558d44e52a64d81037658eb9f19c26d8a15c50f5f0aad54e7285d11b8e5700403b1ab88687ad2c5e85177c1437778d SHA512 642ef819cdc11082b2530b7c06d60be77abdb22008e16b0a45313e4981d3a6b22bd3d7065c951826bd98ce285726ab52178e625d9392e7b273433dfa55499983
+EBUILD lazarus-2.0.2.ebuild 3532 BLAKE2B 58c6638d6b56ae1cbe073ca05d39e480da7526818a1d1623abbc560a41e793d4d348a1009852ee87889be11d098359c31464310d5a6ab5ae039b33c31fd0bc8a SHA512 6ef47f780e9fe5aa4b49c02c9a1e3048ee5488c14ddb4bcbdc9873d1be1bd53258d414402d9ba0466a0c975f3013ff70e166e05e857f1f1ec46eb35e9a945009
 MISC metadata.xml 516 BLAKE2B b4023336c3271703bc3912f9ab02eed6b57178d1f468194bdac5ac9b01027c5f7c847e776e9b1048a9ce29a4939055e3c00e289868a740c76bb2b7c0e6ff9085 SHA512 991dd36587eaa2412af0fccac7664c72a1d9153d12b313ae151943d7c66ac095b3d2cbe61fe4d84c4566e196ff11e1c16c6ffe2ab6e00fa40fc2fdfe23cee524
diff --git a/dev-lang/lazarus/lazarus-1.6.4.ebuild b/dev-lang/lazarus/lazarus-1.6.4.ebuild
deleted file mode 100644
index efe6c7dbbbf6..000000000000
--- a/dev-lang/lazarus/lazarus-1.6.4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-FPCVER="3.0.0"
-
-DESCRIPTION="Lazarus IDE is a feature rich visual programming environment emulating Delphi"
-HOMEPAGE="https://www.lazarus-ide.org/"
-SRC_URI="https://sourceforge.net/projects/${PN}/files/Lazarus%20Zip%20_%20GZip/Lazarus%20${PV}/${P}-0.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"
-
-DEPEND=">=dev-lang/fpc-${FPCVER}[source]
-	net-misc/rsync
-	x11-libs/gtk+:2
-	>=sys-devel/binutils-2.19.1-r1:="
-RDEPEND="${DEPEND}
-	!=gnome-base/librsvg-2.16.1"
-
-RESTRICT="strip" #269221
-
-S=${WORKDIR}/${PN}
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.26-fpcsrc.patch )
-
-src_prepare() {
-	default
-	# Use default configuration (minus stripping) unless specifically requested otherwise
-	if ! test ${PPC_CONFIG_PATH+set} ; then
-		local FPCVER=$(fpc -iV)
-		export PPC_CONFIG_PATH="${WORKDIR}"
-		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
-			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
-		#sed -i -e '/^-Xs/d' "${PPC_CONFIG_PATH}"/fpc.cfg || die
-	fi
-}
-
-src_compile() {
-	LCL_PLATFORM=gtk2 emake \
-		$(usex minimal "" "bigide") \
-		-j1
-}
-
-src_install() {
-	diropts -m0755
-	dodir /usr/share
-	# Using rsync to avoid unnecessary copies and cleaning...
-	# Note: *.o and *.ppu are needed
-	rsync -a \
-		--exclude="CVS"     --exclude=".cvsignore" \
-		--exclude="*.ppw"   --exclude="*.ppl" \
-		--exclude="*.ow"    --exclude="*.a"\
-		--exclude="*.rst"   --exclude=".#*" \
-		--exclude="*.~*"    --exclude="*.bak" \
-		--exclude="*.orig"  --exclude="*.rej" \
-		--exclude=".xvpics" --exclude="*.compiled" \
-		--exclude="killme*" --exclude=".gdb_hist*" \
-		--exclude="debian"  --exclude="COPYING*" \
-		--exclude="*.app" \
-		"${S}" "${ED%/}"/usr/share \
-		|| die "Unable to copy files!"
-
-	dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
-	dosym ../share/lazarus/startlazarus /usr/bin/lazarus
-	dosym ../share/lazarus/lazbuild /usr/bin/lazbuild
-	use minimal || dosym ../share/lazarus/components/chmhelp/lhelp/lhelp /usr/bin/lhelp
-	dosym ../lazarus/images/ide_icon48x48.png /usr/share/pixmaps/lazarus.png
-
-	make_desktop_entry startlazarus "Lazarus IDE" "lazarus" || die "Failed making desktop entry!"
-}
diff --git a/dev-lang/lazarus/lazarus-1.8.4.ebuild b/dev-lang/lazarus/lazarus-1.8.4.ebuild
deleted file mode 100644
index 5a5cd58c19aa..000000000000
--- a/dev-lang/lazarus/lazarus-1.8.4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop
-
-FPCVER="3.0.4"
-
-DESCRIPTION="Lazarus IDE is a feature rich visual programming environment emulating Delphi"
-HOMEPAGE="https://www.lazarus-ide.org/"
-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"
-
-DEPEND=">=dev-lang/fpc-${FPCVER}[source]
-	net-misc/rsync
-	x11-libs/gtk+:2
-	>=sys-devel/binutils-2.19.1-r1:="
-RDEPEND="${DEPEND}
-	!=gnome-base/librsvg-2.16.1"
-
-RESTRICT="strip" #269221
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.26-fpcsrc.patch )
-
-src_prepare() {
-	default
-	# Use default configuration (minus stripping) unless specifically requested otherwise
-	if ! test ${PPC_CONFIG_PATH+set} ; then
-		local FPCVER=$(fpc -iV)
-		export PPC_CONFIG_PATH="${WORKDIR}"
-		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
-			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
-	fi
-}
-
-src_compile() {
-	LCL_PLATFORM=gtk2 emake \
-		$(usex minimal "" "bigide") \
-		-j1
-}
-
-src_install() {
-	diropts -m0755
-	dodir /usr/share
-	# Using rsync to avoid unnecessary copies and cleaning...
-	# Note: *.o and *.ppu are needed
-	rsync -a \
-		--exclude="CVS"     --exclude=".cvsignore" \
-		--exclude="*.ppw"   --exclude="*.ppl" \
-		--exclude="*.ow"    --exclude="*.a"\
-		--exclude="*.rst"   --exclude=".#*" \
-		--exclude="*.~*"    --exclude="*.bak" \
-		--exclude="*.orig"  --exclude="*.rej" \
-		--exclude=".xvpics" --exclude="*.compiled" \
-		--exclude="killme*" --exclude=".gdb_hist*" \
-		--exclude="debian"  --exclude="COPYING*" \
-		--exclude="*.app" \
-		"${S}" "${ED%/}"/usr/share \
-		|| die "Unable to copy files!"
-
-	dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
-	dosym ../share/lazarus/startlazarus /usr/bin/lazarus
-	dosym ../share/lazarus/lazbuild /usr/bin/lazbuild
-	use minimal || dosym ../share/lazarus/components/chmhelp/lhelp/lhelp /usr/bin/lhelp
-	dosym ../lazarus/images/ide_icon48x48.png /usr/share/pixmaps/lazarus.png
-
-	make_desktop_entry startlazarus "Lazarus IDE" "lazarus" || die "Failed making desktop entry!"
-}
diff --git a/dev-lang/lazarus/lazarus-1.8.4-r1.ebuild b/dev-lang/lazarus/lazarus-2.0.2.ebuild
index 4564a9467aa6..8724ffdb8bac 100644
--- a/dev-lang/lazarus/lazarus-1.8.4-r1.ebuild
+++ b/dev-lang/lazarus/lazarus-2.0.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit desktop
 
@@ -41,6 +41,11 @@ src_prepare() {
 		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
 			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
 	fi
+	sed -i \
+		-e "s;SecondaryConfigPath:='/etc/lazarus';SecondaryConfigPath:=ExpandFileNameUTF8('~/.lazarus');g" \
+		-e "s;PrimaryConfigPath:=ExpandFileNameUTF8('~/.lazarus');PrimaryConfigPath:='/etc/lazarus';g" \
+		ide/include/unix/lazbaseconf.inc \
+		|| die
 }
 
 src_compile() {
@@ -49,14 +54,17 @@ src_compile() {
 		-j1
 	if use python; then
 		addpredict ide/exttools.pas
-		./lazbuild -B --lazarusdir="." --pcp="with-packages" --build-ide= \
+		./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}:/usr/share/lazarus/with-packages:g" \
-			with-packages/packagefiles.xml \
-			with-packages/idemake.cfg \
+		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
 }
 
@@ -86,8 +94,12 @@ src_install() {
 	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%/}"/usr/share/lazarus/with-packages || die
+			"${ED%/}"/etc/lazarus || die
 	fi
 
 	make_desktop_entry startlazarus "Lazarus IDE" "lazarus"