gentoo resync : 30.05.2020

2 files changed, 26 insertions, 16 deletions

diff --git a/dev-lang/mozart/Manifest b/dev-lang/mozart/Manifest
index ccfd5a3e02fc..d7730eefebb6 100644
--- a/dev-lang/mozart/Manifest
+++ b/dev-lang/mozart/Manifest
@@ -1,7 +1,8 @@
 AUX 50mozart-gentoo.el 482 BLAKE2B f98c3c44f0e9ddfad7ee957e4c0dd3b24a01905ce09289322b6a3e391b515cb82e3334ac30c5b18c84aa86e57c22c1bd1622687d66858ca42a25556d1a26c4c8 SHA512 d9319273051e3d485e35af29710a3df1b7bd66f47ec7ee60cf37af364ec2dbe42d6507ed573d39577479a6c58ba2f15c52052b32d37371ea0b5aebf39bd46bbf
 DIST mozart-1.4.0-gentoo-patchset-5.tar.gz 24700 BLAKE2B c3b14bd7d8a762b84a098a9e42dfe09b5b902fdfe6c8e8dcebe7198eaaf0e89cbb101ec3765713db0fbddb6f3b9741ed927af98df48aed496d7864f6bc5f6999 SHA512 99db9bf62682fd306c4b665d99ab3b48a787c26230d5e8db2e3564684eff2e41ac0c6bb6a612afa0446555dcb1e419ae7ef1dbfec4c918d769d51dafeeee8462
+DIST mozart-1.4.0-gentoo-patchset-6.tar.gz 25878 BLAKE2B 831fa3accc587c769ab40ae4289e45ca28171af572095b7c3b93b69e82ff4bcaeb425d68c7a76aa9b2724b610ba21020647b6d1e3aa525ce58edbc9446d88791 SHA512 5a292bcc81c8062ebd5a948b224e8131302fc61b60303b8e3257ed20e751d0a874303611aeba6d1aacddbf92ec611428e49c2c17bc1dff5e182d0198afe655bf
 DIST mozart-1.4.0.20080704-doc.tar.gz 4085020 BLAKE2B 33eaf57c91dd62d9aa79651095aa5d095086d76dfa16bd5f520962229338c00556fcf3ac01eca1769c687f990110e95fa887d56391346af780d55166708338a1 SHA512 25f8f4b603ae7f4ef054a79a2baa4e10074f8a95f762b75fd88480526fb073b5b4874c269d116a960017a9e7ef989dd9f41853b0ff76e08b2cad2de2090c2eb4
 DIST mozart-1.4.0.20080704-src.tar.gz 11848201 BLAKE2B 0ceeb7dbd3f6858d1a4fee76f2a99eeb3127a07fd31b6760748ac8b8b638c36caaa873154be6481c3dc4b5196ef04cb0c10be421bd87dc3bc4e6b29357622d8d SHA512 f1114662c8c603cc2ac530d4ea1d22a0581f6e1b4d5cb57ccf899b8051ea48dbcf2fa2b62173359a754367a5456a7cb121a208d6a246248207599b0470525229
 EBUILD mozart-1.4.0-r3.ebuild 2907 BLAKE2B 51d3f72aa2e7fa96029a9ff8abb21f52153dbaf044a6a9c84ea6c9ab6431447e5b2c469166bede84c5f6fb9e2a3b62a059424d569f455eb9723db7cff1783a7f SHA512 f860e6013bb7e8efeecb8ec020f7884718e082ea7917b70e9c9343961ae0f72d188b256ce647897d7e2f284dc6ac3cb349ace59eaf00fd69d775f43fae11b11f
-EBUILD mozart-1.4.0-r4.ebuild 2899 BLAKE2B 39c2530e3a87f38a29291ff44e861b287d1413463c1c7fcd80ccf611cbd9d8ea3f6c976f92fe3136ecce7453f9194dd99999e1600cf8ca81e8226e130ea51ef4 SHA512 c1324e8ae65b5f23d0727bc6a5c87238d5413df4ac31c45e9e8259531bf2cacf7764e9646a9ace1427fe197995c4a79d972131e39c0204ec6bc04c927930acf3
+EBUILD mozart-1.4.0-r4.ebuild 3080 BLAKE2B 1363240805a389a5e111d30a5e38287dff565d1716b39b10f7a80ac73aa5f0c6f3e4c8fb2ab8ed93dc7512c8e18ed045421db1a750105d4098761425606769ea SHA512 e4347d58bf3233a4db2aebb7c94d71ff3a1e5408179e72975a84e8f31a0a53b59b75ebffa0a3c510a6fb80d6b3995095abdd07b955cc259047bdb71b1a76b029
 MISC metadata.xml 248 BLAKE2B 15dcca8e423036aaf3d73f9557507d39f7a22a6fa36d83405d8180df441adc50b9d61f8dd720a9d0045f5b3e6ebc9785fcf8f1340c253b2d277404672d395c1b SHA512 b296da55efb17a1040203bc1f5f3bfa8160711fdb72f0543739e6efe48b75427c082eb6c405d99b3256e8d536d3d29f71fdd0fd8d281cb9a9967060ea467a034
diff --git a/dev-lang/mozart/mozart-1.4.0-r4.ebuild b/dev-lang/mozart/mozart-1.4.0-r4.ebuild
index ab9ddf42868e..25aff0bfbc8f 100644
--- a/dev-lang/mozart/mozart-1.4.0-r4.ebuild
+++ b/dev-lang/mozart/mozart-1.4.0-r4.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit elisp-common
+inherit elisp-common flag-o-matic
 
-PATCHSET_VER="5"
+PATCHSET_VER="6"
 MY_P="mozart-${PV}.20080704"
 
 DESCRIPTION="Advanced development platform for intelligent, distributed applications"
 HOMEPAGE="https://mozart.github.io/ https://github.com/mozart/mozart"
 SRC_URI="
 	mirror://sourceforge/project/mozart-oz/v1/1.4.0-2008-07-02-tar/${MY_P}-src.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
+	https://dev.gentoo.org/~keri/distfiles/mozart/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
 	doc? ( mirror://sourceforge/project/mozart-oz/v1/1.4.0-2008-07-02-tar/${MY_P}-doc.tar.gz )"
 
 SLOT="0"
@@ -43,9 +43,15 @@ S="${WORKDIR}"/${MY_P}
 src_prepare() {
 	default
 	eapply "${WORKDIR}"/${PV}
+
+	mkdir -p "${S}"/build/contrib
+	ln -s "${S}"/configure "${S}"/build/configure
 }
 
 src_configure() {
+	cd "${S}"/build
+
+	append-flags -fno-tree-vrp
 	local myconf="\
 			--without-global-oz \
 			--enable-opt=none"
@@ -70,6 +76,7 @@ src_configure() {
 }
 
 src_compile() {
+	cd "${S}"/build
 	emake bootstrap
 }
 
@@ -81,24 +88,26 @@ src_test() {
 }
 
 src_install() {
+	cd "${S}"/build
+
 	emake \
 		PREFIX="${D}"/usr/lib/mozart \
 		ELISPDIR="${D}${SITELISP}/${PN}" \
 		install
 
-	dosym /usr/lib/mozart/bin/convertTextPickle /usr/bin/convertTextPickle
-	dosym /usr/lib/mozart/bin/oldpickle2text /usr/bin/oldpickle2text
-	dosym /usr/lib/mozart/bin/ozc /usr/bin/ozc
-	dosym /usr/lib/mozart/bin/ozd /usr/bin/ozd
-	dosym /usr/lib/mozart/bin/ozengine /usr/bin/ozengine
-	dosym /usr/lib/mozart/bin/ozl /usr/bin/ozl
-	dosym /usr/lib/mozart/bin/ozplatform /usr/bin/ozplatform
-	dosym /usr/lib/mozart/bin/oztool /usr/bin/oztool
-	dosym /usr/lib/mozart/bin/pickle2text /usr/bin/pickle2text
-	dosym /usr/lib/mozart/bin/text2pickle /usr/bin/text2pickle
+	dosym ../lib/mozart/bin/convertTextPickle /usr/bin/convertTextPickle
+	dosym ../lib/mozart/bin/oldpickle2text /usr/bin/oldpickle2text
+	dosym ../lib/mozart/bin/ozc /usr/bin/ozc
+	dosym ../lib/mozart/bin/ozd /usr/bin/ozd
+	dosym ../lib/mozart/bin/ozengine /usr/bin/ozengine
+	dosym ../lib/mozart/bin/ozl /usr/bin/ozl
+	dosym ../lib/mozart/bin/ozplatform /usr/bin/ozplatform
+	dosym ../lib/mozart/bin/oztool /usr/bin/oztool
+	dosym ../lib/mozart/bin/pickle2text /usr/bin/pickle2text
+	dosym ../lib/mozart/bin/text2pickle /usr/bin/text2pickle
 
 	if use emacs; then
-		dosym /usr/lib/mozart/bin/oz /usr/bin/oz
+		dosym ../lib/mozart/bin/oz /usr/bin/oz
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi