Fix tcl/tk slotting; bump to EAPI=5

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 167 insertions, 18 deletions

diff --git a/dev-lang/mozart/ChangeLog b/dev-lang/mozart/ChangeLog
index 32f78104bce4..ae85df8f7faf 100644
--- a/dev-lang/mozart/ChangeLog
+++ b/dev-lang/mozart/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/mozart
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.40 2012/08/27 08:05:52 keri Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.41 2015/03/25 12:27:23 jlec Exp $
+
+*mozart-1.4.0-r3 (25 Mar 2015)
+
+  25 Mar 2015; Justin Lecher <jlec@gentoo.org> +mozart-1.4.0-r3.ebuild,
+  mozart-1.4.0-r2.ebuild:
+  Fix tcl/tk slotting; bump to EAPI=5
 
   27 Aug 2012; <keri@gentoo.org> -files/mozart-1.3.2-const-cast.patch,
   -files/mozart-1.3.2-contrib.patch, -files/mozart-1.3.2-emubin.patch,
diff --git a/dev-lang/mozart/Manifest b/dev-lang/mozart/Manifest
index 057a2fac6f63..60210718ec08 100644
--- a/dev-lang/mozart/Manifest
+++ b/dev-lang/mozart/Manifest
@@ -1,17 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 50mozart-gentoo.el 482 SHA256 0e008cf41eb34bf0d679215c08aeb6b8beb5c1466f62a1af490525e07bad8731 SHA512 d9319273051e3d485e35af29710a3df1b7bd66f47ec7ee60cf37af364ec2dbe42d6507ed573d39577479a6c58ba2f15c52052b32d37371ea0b5aebf39bd46bbf WHIRLPOOL 6272f02f761bac06079d1fedb80d48c72466d85cbe38238e78b6c199bd3915d63e6cee30e66c45611e9d19f15e5617a8be259539041052bcae8eb551b664986a
 DIST mozart-1.4.0-gentoo-patchset-5.tar.gz 24700 SHA256 7ab555ea5345d6a2d5b89b4112fde11ef5be9e9bc9c05b1d84bb54d1f115993b SHA512 99db9bf62682fd306c4b665d99ab3b48a787c26230d5e8db2e3564684eff2e41ac0c6bb6a612afa0446555dcb1e419ae7ef1dbfec4c918d769d51dafeeee8462 WHIRLPOOL ef7c2974bc8ec03823c1432f56be6349991774a221bd1f278adf733e08b6d5cfe763d23d984f502070ab2afce7d7c805a15d073c0c1e302647d9d63cde126b43
 DIST mozart-1.4.0.20080704-doc.tar.gz 4085020 SHA256 68c52cb7379504a5142af37459c89884355fb9cc020f585d7778e7d4b1f0cd9e SHA512 25f8f4b603ae7f4ef054a79a2baa4e10074f8a95f762b75fd88480526fb073b5b4874c269d116a960017a9e7ef989dd9f41853b0ff76e08b2cad2de2090c2eb4 WHIRLPOOL 1f05b48d9ad41006576a66fa5062116bb60bc02438a119ddfe334ff0da02fe8505dee8254db20ca2d02e713e02f8327188ded4b957ee7fec5b965375fe39d5c0
 DIST mozart-1.4.0.20080704-src.tar.gz 11848201 SHA256 5da73d80b5aa7fa42edca64159a1a076323f090e5c548f3747f94d0afc60b223 SHA512 f1114662c8c603cc2ac530d4ea1d22a0581f6e1b4d5cb57ccf899b8051ea48dbcf2fa2b62173359a754367a5456a7cb121a208d6a246248207599b0470525229 WHIRLPOOL e96ff3688025cffb0c78f050f02421872f2119498943b5ebf5786e0886a13f264e0f637c6a41869b6e79ee10c6ed03c8dc55fe1775c5cf66d60fc9f5d09db742
-EBUILD mozart-1.4.0-r2.ebuild 3316 SHA256 b05692eaf6ee3126a158479d2f415cc2254ca1f1d45384e868cd8c1b2e49fa2c SHA512 368cf7d5fd2c430095e7f85cb0831e6243ee9e979ad21c4d2bfd8ab64d1edca9d49d96d2e87263ef8592aeee3c919485d536414e973f293c2940acad80d3e5e5 WHIRLPOOL 23a829ae8f3faa7301cd0b476831a380cfcb869ccf532faae04b034fa0ab29df2430a785c405b50b5eac50ab27d392e4b1f3b84d3a7be21dbc09236e9990b853
-MISC ChangeLog 6834 SHA256 3a68b25e47c6b86b090bee9d8ef08eb61be18b8de788c62250af270f8f5002cc SHA512 27c98427eb4a1078e316edf15b1456b46560b55b4fd041df9703b5b5a0c19f89966ea40ec3007dba109d00a88d1d8907d1c36ae08a70ffd7db5af546691ae20b WHIRLPOOL 708676ae18133fc712d49aac887e101ae9b51b614c9495fc43419de9acf20b471313b3da27d4974b3040d24e30cf821401c9289317aecf1b55adb244332c0e44
+EBUILD mozart-1.4.0-r2.ebuild 3317 SHA256 1ba4bc76a8154dc00df72a34304376a055b1135cdeb777b1b5a28071bdb84767 SHA512 40d3d3a593b851cc47fb2bce5f96ee7375ee702eeade1417d69a424476779a9d04807ffdd96c61dd1f133f5aa49a0cd9f967d439ad16d2f84fd29a3904d5dbb9 WHIRLPOOL 46fb7e8ee6e04a359d5513ad86aea840c6b323e21a68ee1253d5e9a1214e0dbb650250285ad9512e368a94204ec33b1613246e06956dd9e4b64fea7524b786e2
+EBUILD mozart-1.4.0-r3.ebuild 3020 SHA256 a4a60c62f98047496ffd9ca15164ef0b8ef20833efdd98a28264871af6a5687b SHA512 0fc44fb1b3741f08e860826cd421d2075c2ab7f1729c0c1891c733f256a2618b55e026dbdda010837c434baddbce7b520ade020d09313bb8f775015cf9be9148 WHIRLPOOL 285f247bf2500fa8b9ee40763e9d9bf1da15ced6e392ad29305a53be4bbd604d8a0f5a175be2c7e82fd720ad38b56d681be76930cbc49c7d0fed35c8da3fe8dc
+MISC ChangeLog 7003 SHA256 4691ea151e9b44b0b05f15e4a61d2affa031bea4bb5da0851471307c6b47413d SHA512 d46d5d30ae143c9a46d36108369399795c872bcec4c2c9be70553a3377eff41138dcefeca8d58586efa6361bb8f78a6a81cc861eb6f541866edec5f2543f2989 WHIRLPOOL e76e4777905463df9458b9a486a607217a90a5dd6adaef84c76914a2e62e6f9bda702dd9a124662bbb4ee6cad754219249d518e99ceb1ad15cad077ee628f595
 MISC metadata.xml 226 SHA256 0d359bc56d5b0e47547d7033243f050a6d77a558ad92f2386ea9e847daf964f1 SHA512 8b376d61a45854d0a2e5642d1dd7dc572a7b25d31dd918574ba674ccf3c58e13982a674277b5ea84c42131bcddb30d5189fd46472fb79246d698ffad13cae134 WHIRLPOOL b34f0dc45ade06d3683142ae218be827894805c82548773061d82e2d2d98527db436d6f3efeeacea9257266f0c55dbc9a70719ea8d47b2f6f6705e1bac2cd949
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlA7Kl8ACgkQrwS/tqE49e31wwCfezuccsiHmgw+lh4rI2MpoDaq
-g6YAmwevQ2PJfU/57bdp2NA7qe85rZE+
-=sTx/
+iQJ8BAEBCgBmBQJVEqmsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir1iwP/2M1gDpBw54QJo+p4pYSyjon
+r1y/Gf+B+/7iB2cA9OpTDI2dCSooJTaDp05IfAEXVG74JZ1Se06lXiIWYfO4qy/W
+MDA+lgJifCFt3663lEgdKObv2flfNokxzLwjD9qT9eO0xtOLSaaIa5gYmcEkvt/u
+Q96XsKYgxRWaMze5jS0uwe1HCWlWwu3H3SC8h6mbef5JblNGnc9kZyUP+XqpgXFn
+pRpQOx03qUid9snKiJFJdtyRlIPfY+dzPH1NrQnHcn0vFcOgpAn24Z1VJZlRfSoE
++rpZkMwUlb+EqgyDo98DgPdvxh51FGbx0HQv3vEWY0O8/ApV8QZgGR0fOtBKgueQ
+mSv3vJSm/actNsDdfSonQRsEZN9DPYMrMsd0cZIuLqPp9r74173p5hTTVVkbWjeb
+sBa/jEYJV+NwLHs+VFnsOWSxcw9J2qvlpJoD00AvPUaFYExx/VMtbEISt0ZklcAu
+XOv/ERblY9SC9cI/mEImyBExeD3Z04pw1Ye2A2pXgHCG2/8CYur+ZHNnjjx57WeB
+0v2ayONj9SQOTlFU18/KDSwP75F2Du3zcaaFw9HuhpCua5mNdLqZ94kTVI/G+Zqi
+bIUqIs/Im+xKjkJRmz2DNbDKKzDZS5x96SrWWzdwG+bKuAbmhg8jDV8jbol/1a40
+2tXKTyd/7R0ttvnA7FRg
+=CIIq
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/mozart/mozart-1.4.0-r2.ebuild b/dev-lang/mozart/mozart-1.4.0-r2.ebuild
index c6c2fb4cbf06..94e81478368d 100644
--- a/dev-lang/mozart/mozart-1.4.0-r2.ebuild
+++ b/dev-lang/mozart/mozart-1.4.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.4.0-r2.ebuild,v 1.6 2012/08/22 10:42:47 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.4.0-r2.ebuild,v 1.7 2015/03/25 12:27:23 jlec Exp $
 
 EAPI="2"
 
@@ -9,25 +9,30 @@ inherit elisp-common eutils
 PATCHSET_VER="5"
 MY_P="mozart-${PV}.20080704"
 
-DESCRIPTION="Mozart is an advanced development platform for intelligent, distributed applications"
+DESCRIPTION="Advanced development platform for intelligent, distributed applications"
 HOMEPAGE="http://www.mozart-oz.org/"
-SRC_URI="http://www.mozart-oz.org/download/mozart-ftp/store/1.4.0-2008-07-02-tar/mozart-1.4.0.20080704-src.tar.gz
+SRC_URI="
+	http://www.mozart-oz.org/download/mozart-ftp/store/1.4.0-2008-07-02-tar/mozart-1.4.0.20080704-src.tar.gz
 	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
 	doc? ( http://www.mozart-oz.org/download/mozart-ftp/store/1.4.0-2008-07-02-tar/mozart-1.4.0.20080704-doc.tar.gz )"
-LICENSE="Mozart"
 
 SLOT="0"
+LICENSE="Mozart"
 KEYWORDS="-amd64 ppc -ppc64 x86"
 IUSE="doc emacs examples gdbm static tcl threads tk"
 
-RDEPEND="dev-lang/perl
+RDEPEND="
+	dev-lang/perl
 	dev-libs/gmp
 	sys-libs/zlib
 	emacs? ( virtual/emacs )
 	gdbm? ( sys-libs/gdbm  )
-	tcl? ( tk? (
-			dev-lang/tk
-			dev-lang/tcl ) )"
+	tcl? (
+		tk? (
+			dev-lang/tk:0
+			dev-lang/tcl:0
+		)
+	)"
 DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex"
diff --git a/dev-lang/mozart/mozart-1.4.0-r3.ebuild b/dev-lang/mozart/mozart-1.4.0-r3.ebuild
new file mode 100644
index 000000000000..07f36d136316
--- /dev/null
+++ b/dev-lang/mozart/mozart-1.4.0-r3.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.4.0-r3.ebuild,v 1.1 2015/03/25 12:27:23 jlec Exp $
+
+EAPI=5
+
+inherit elisp-common eutils
+
+PATCHSET_VER="5"
+MY_P="mozart-${PV}.20080704"
+
+DESCRIPTION="Advanced development platform for intelligent, distributed applications"
+HOMEPAGE="http://www.mozart-oz.org/"
+SRC_URI="
+	http://www.mozart-oz.org/download/mozart-ftp/store/1.4.0-2008-07-02-tar/mozart-1.4.0.20080704-src.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
+	doc? ( http://www.mozart-oz.org/download/mozart-ftp/store/1.4.0-2008-07-02-tar/mozart-1.4.0.20080704-doc.tar.gz )"
+
+SLOT="0"
+LICENSE="Mozart"
+KEYWORDS="-amd64 ~ppc -ppc64 ~x86"
+IUSE="doc emacs examples gdbm static tcl threads tk"
+
+RDEPEND="
+	dev-lang/perl
+	dev-libs/gmp
+	sys-libs/zlib
+	emacs? ( virtual/emacs )
+	gdbm? ( sys-libs/gdbm  )
+	tcl? (
+		tk? (
+			dev-lang/tk:0=
+			dev-lang/tcl:0=
+		)
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+SITEFILE=50${PN}-gentoo.el
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
+}
+
+src_configure() {
+	local myconf="\
+			--without-global-oz \
+			--enable-opt=none"
+
+	if use tcl && use tk ; then
+		myconf="${myconf} --enable-wish"
+	else
+		myconf="${myconf} --disable-wish"
+	fi
+
+	econf \
+		${myconf} \
+		--disable-doc \
+		--enable-contrib \
+		--disable-contrib-micq \
+		$(use_enable doc contrib-doc) \
+		$(use_enable gdbm contrib-gdbm) \
+		$(use_enable tk contrib-tk) \
+		$(use_enable emacs compile-elisp) \
+		$(use_enable static link-static) \
+		$(use_enable threads threaded)
+}
+
+src_compile() {
+	emake bootstrap
+}
+
+src_test() {
+	# Mozart tests must be run single-threaded
+	cd "${S}"/share/test || die
+	emake -j1 boot-oztest
+	emake -j1 boot-check
+}
+
+src_install() {
+	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
+
+	if use emacs; then
+		dosym /usr/lib/mozart/bin/oz /usr/bin/oz
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	dodoc "${S}"/README
+	use doc && dohtml -r "${WORKDIR}"/mozart/doc/*
+
+	if use examples; then
+		cd "${S}"/share || die
+		insinto /usr/share/doc/${PF}
+		doins -r examples demo
+		rm -rf $(find "${ED}"/usr/share/doc/${PF}/examples \
+			-name Makefile -o -name Makefile.in) || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}