Revbump - only install oz when USE="emacs"; gcc4 fixes for DSS

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 125 insertions, 2 deletions

diff --git a/dev-lang/mozart/ChangeLog b/dev-lang/mozart/ChangeLog
index d4c042e5c593..3028abcb0722 100644
--- a/dev-lang/mozart/ChangeLog
+++ b/dev-lang/mozart/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/mozart
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.31 2010/11/19 05:06:21 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.32 2010/11/19 23:54:01 keri Exp $
+
+*mozart-1.4.0-r1 (19 Nov 2010)
+
+  19 Nov 2010; <keri@gentoo.org> +mozart-1.4.0-r1.ebuild:
+  Revbump - only install oz when USE="emacs"; gcc4 fixes for DSS
 
   19 Nov 2010; <keri@gentoo.org> mozart-1.4.0.ebuild:
   Enable DP tests to load DSS library. See #298155.
diff --git a/dev-lang/mozart/Manifest b/dev-lang/mozart/Manifest
index 4702a0b45bb7..224b9291322c 100644
--- a/dev-lang/mozart/Manifest
+++ b/dev-lang/mozart/Manifest
@@ -10,10 +10,12 @@ AUX mozart-1.3.2-ri-fpe.patch 1158 RMD160 d8741090acc8fe4bf67c55f873ad141bda0179
 DIST mozart-1.3.2.20060615-doc.tar.gz 3890265 RMD160 450721bb64cbcc5cefddbaf9c3b0cdfe6261ae5f SHA1 28dfd9f92ba6ee698acb7363146b4a1c0ab4199f SHA256 b169418dd02fb6024d897778908928a6aa800e8ea96b6c76515b064bfac3b84e
 DIST mozart-1.3.2.20060615-src.tar.gz 10798680 RMD160 22dd1f639b6ea525744564b37be009bd599d60ad SHA1 aa980f4de7dcb2b4c2db511a464a5b6497b98109 SHA256 a09acd3365911348fd7b351d73ae1b2ad76ae96ffd335ee08746f5dcca3a55bf
 DIST mozart-1.4.0-gentoo-patchset-1.tar.gz 6828 RMD160 fc6fe2a7ac7c9e3cfe8d1312550c14d432fd3b8f SHA1 951ecd3673293428319a0d41b0ec77705ba96d1f SHA256 df75d7c405316d1fd0a2e51b56a86fe54c3d70f440833e873f9f563dc7d1481e
+DIST mozart-1.4.0-gentoo-patchset-2.tar.gz 24707 RMD160 d719da9c7e601a13dc186c3a3ab4b10b5dd8a960 SHA1 de20fdb6030747e6bf66057236718b883575adb7 SHA256 1fce0b0f34935ee34190bf7840cb76c56ef0ac86347fa298db51d1f999934190
 DIST mozart-1.4.0.20080704-doc.tar.gz 4085020 RMD160 1d0c9787ec1bbf28881060a2c360295c7f89d5e7 SHA1 308fdd1d835f5197795f31232ed2374b646bf26a SHA256 68c52cb7379504a5142af37459c89884355fb9cc020f585d7778e7d4b1f0cd9e
 DIST mozart-1.4.0.20080704-src.tar.gz 11848201 RMD160 090c0af3cba9db422c58c37d5fa3e703c8cc82d7 SHA1 5a12a1d66c871f01dc1223aa614d4e0bf7717b3f SHA256 5da73d80b5aa7fa42edca64159a1a076323f090e5c548f3747f94d0afc60b223
 EBUILD mozart-1.3.2-r1.ebuild 3353 RMD160 23eeed57eaa52152a1a80cf9342e2214b179a45d SHA1 a6f67779202464e8b3f424b3c2572fe4bef110d5 SHA256 8a6217db4b59b407e88c4dfcd74bdbc36821881cf8486eb3f83000009d5b227c
 EBUILD mozart-1.3.2.ebuild 2844 RMD160 b82d5f5f606dbb7159a8f9731f5666da49be2ccd SHA1 32c9b7b398be5dfa41765f1c2ed05646e4b7fd15 SHA256 812d800140a4ad6677f35e7be0f433a20c6eb0ace5411a81eb05bdedb9003fc7
+EBUILD mozart-1.4.0-r1.ebuild 3072 RMD160 00c6d938ef508520521f528afe1d18f04741b3cb SHA1 f2682d3d45c0529d51767c18dd340d218af16e9b SHA256 943505c078c245501123b4343dd546ac6bfd02a656eb217917d13095e5bf675d
 EBUILD mozart-1.4.0.ebuild 3052 RMD160 0c8a9b508e9828da78b935993e9021085990e0a1 SHA1 f3fee6b1180f517a45744f3c4c1f639661668321 SHA256 a147cf2a9fb4e69d42ee43ee8dbf4ebddb359fb1667384d2268dff68563dd911
-MISC ChangeLog 5333 RMD160 1f78cc8b36d9aa02b0720ae1a6292619a1da1e9b SHA1 8a7f73c667e50620e58f7790870c44517d6ccde4 SHA256 42ca6111caf841cbf4a6a947fc6ae370affa090e4f67c6adc4a87b2737e8babf
+MISC ChangeLog 5489 RMD160 d5f1f58cc50456e9f3b4cd7faae3fc520f873325 SHA1 dcbdca7a35a3c98557ceec88c2e4f0e6ec0cef49 SHA256 a35f375bae0217d7d465bf6d2359a3247687506ad8261336d7885243b8bc13cf
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
diff --git a/dev-lang/mozart/mozart-1.4.0-r1.ebuild b/dev-lang/mozart/mozart-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..a7f5b6610ce0
--- /dev/null
+++ b/dev-lang/mozart/mozart-1.4.0-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2010 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-r1.ebuild,v 1.1 2010/11/19 23:54:01 keri Exp $
+
+EAPI="2"
+
+inherit elisp-common eutils
+
+PATCHSET_VER="2"
+MY_P="mozart-${PV}.20080704"
+
+DESCRIPTION="Mozart is an 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 )"
+LICENSE="Mozart"
+
+SLOT="0"
+KEYWORDS="-amd64 ~ppc -ppc64 ~sparc ~x86"
+IUSE="doc emacs 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
+			dev-lang/tcl ) )"
+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 || die "emake bootstrap failed"
+}
+
+src_test() {
+	# Mozart tests must be run single-threaded
+	cd "${S}"/share/test
+	emake -j1 boot-oztest || die "emake boot-oztest failed"
+	emake -j1 boot-check || die "emake boot-check failed"
+}
+
+src_install() {
+	emake \
+		PREFIX="${D}"/usr/lib/mozart \
+		ELISPDIR="${D}${SITELISP}/${PN}" \
+		install || die "emake install failed"
+
+	dosym /usr/lib/mozart/bin/convertTextPickle /usr/bin/convertTextPickle || die
+	dosym /usr/lib/mozart/bin/oldpickle2text /usr/bin/oldpickle2text || die
+	dosym /usr/lib/mozart/bin/ozc /usr/bin/ozc || die
+	dosym /usr/lib/mozart/bin/ozd /usr/bin/ozd || die
+	dosym /usr/lib/mozart/bin/ozengine /usr/bin/ozengine || die
+	dosym /usr/lib/mozart/bin/ozl /usr/bin/ozl || die
+	dosym /usr/lib/mozart/bin/ozplatform /usr/bin/ozplatform || die
+	dosym /usr/lib/mozart/bin/oztool /usr/bin/oztool || die
+	dosym /usr/lib/mozart/bin/pickle2text /usr/bin/pickle2text || die
+	dosym /usr/lib/mozart/bin/text2pickle /usr/bin/text2pickle || die
+
+	if use emacs; then
+		dosym /usr/lib/mozart/bin/oz /usr/bin/oz || die
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+			|| die "elisp-site-file-install failed"
+	fi
+
+	if use doc ; then
+		dohtml -r "${WORKDIR}"/mozart/doc/* || die
+	fi
+
+	dodoc README || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}