[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart-stdlib/, net-misc/pedro/, dev-lang/mercury-extras/, ...

2024-01-17 Thread Michał Górny 
commit: a05b3f3669a9cd2286d1d79fc13a1e7d5b2239db
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jan 17 19:41:25 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jan 17 19:41:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a05b3f36

Reassign keri's packages

Signed-off-by: Michał Górny  gentoo.org>

 dev-lang/mercury-extras/metadata.xml | 5 +
 dev-lang/mercury/metadata.xml| 5 +
 dev-lang/mozart-stdlib/metadata.xml  | 5 +
 dev-lang/mozart/metadata.xml | 5 +
 net-misc/pedro/metadata.xml  | 5 +
 5 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/dev-lang/mercury-extras/metadata.xml 
b/dev-lang/mercury-extras/metadata.xml
index ea24723e851e..d6a4b0b729f8 100644
--- a/dev-lang/mercury-extras/metadata.xml
+++ b/dev-lang/mercury-extras/metadata.xml
@@ -1,10 +1,7 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-
-  k...@gentoo.org
-  Keri Harris
-
+
 
   Enable support for tommath library
 

diff --git a/dev-lang/mercury/metadata.xml b/dev-lang/mercury/metadata.xml
index 2b1197df03e1..99628dd871a5 100644
--- a/dev-lang/mercury/metadata.xml
+++ b/dev-lang/mercury/metadata.xml
@@ -1,10 +1,7 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-k...@gentoo.org
-Keri Harris
-  
+  
   
 Support Mercury Erlang grade
 Support Mercury trail grades

diff --git a/dev-lang/mozart-stdlib/metadata.xml 
b/dev-lang/mozart-stdlib/metadata.xml
index 79e2ba1aced7..85e4ed814fa2 100644
--- a/dev-lang/mozart-stdlib/metadata.xml
+++ b/dev-lang/mozart-stdlib/metadata.xml
@@ -1,8 +1,5 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-
-  k...@gentoo.org
-  Keri Harris
-
+
 

diff --git a/dev-lang/mozart/metadata.xml b/dev-lang/mozart/metadata.xml
index 5bbf98d6810e..16ef0f221f64 100644
--- a/dev-lang/mozart/metadata.xml
+++ b/dev-lang/mozart/metadata.xml
@@ -1,10 +1,7 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   k...@gentoo.org
-   Keri Harris
-   
+   

mozart/mozart2


diff --git a/net-misc/pedro/metadata.xml b/net-misc/pedro/metadata.xml
index 776ccf273d9d..85e4ed814fa2 100644
--- a/net-misc/pedro/metadata.xml
+++ b/net-misc/pedro/metadata.xml
@@ -1,8 +1,5 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-
-   k...@gentoo.org
-   Keri Harris
-
+

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart-stdlib/

2022-10-15 Thread Sam James 
commit: 44564cbfb09d2d3c5905f4b192c716654b021a3b
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 16 00:23:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 16 00:23:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44564cbf

dev-lang/mozart-stdlib: drop to ~x86

Slacking stabilisation for sbt.

Signed-off-by: Sam James  gentoo.org>

 dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild 
b/dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild
index c9826227a597..933aec7b6d3d 100644
--- a/dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild
+++ b/dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ 
SRC_URI="https://dev.gentoo.org/~keri/distfiles/mozart-stdlib/${MY_PN}-${PV}.tar
 
 LICENSE="Mozart"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/mozart-2.0.1"

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart/

2022-10-15 Thread Sam James 
commit: 470b50c945df70410386305892cc985b41e65791
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 16 00:00:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 16 00:00:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=470b50c9

dev-lang/mozart: drop to ~x86

Slacking stabilisation for sbt.

Signed-off-by: Sam James  gentoo.org>

 dev-lang/mozart/mozart-2.0.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/mozart/mozart-2.0.1.ebuild 
b/dev-lang/mozart/mozart-2.0.1.ebuild
index d30212468b3b..a3b0cc28394c 100644
--- a/dev-lang/mozart/mozart-2.0.1.ebuild
+++ b/dev-lang/mozart/mozart-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/mozart/mozart2/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart/

2021-08-03 Thread Keri Harris 
commit: 9ecf58b1a6ade07c9585ac61a0fcbb70f33f4608
Author: Keri Harris  gentoo  org>
AuthorDate: Tue Aug  3 15:10:50 2021 +
Commit: Keri Harris  gentoo  org>
CommitDate: Tue Aug  3 15:12:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ecf58b1

dev-lang/mozart: patch VM to compile with GCC 11

Closes: https://bugs.gentoo.org/789819
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Keri Harris  gentoo.org>

 dev-lang/mozart/Manifest| 2 +-
 dev-lang/mozart/mozart-2.0.1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/mozart/Manifest b/dev-lang/mozart/Manifest
index 777da6f5120..15998cc0917 100644
--- a/dev-lang/mozart/Manifest
+++ b/dev-lang/mozart/Manifest
@@ -1,2 +1,2 @@
-DIST mozart-2.0.1-gentoo-patchset-1.tar.gz 39069 BLAKE2B 
7490d13665314b3a998fb21bd8a342f262d92a395c3b0bbfa9a7813c044220c82ac02eb0103409127862c9bb4e4c44765b1228a7bdea2cb247492c94264f4fe0
 SHA512 
ce3cdb8ffebd95d6065439432905ad68b9cd8b86f58478092ab55df7ae7c72498a3e29bda462f3305aff6c99d010c45d786f905e2e906550ee61656ba122bbc6
+DIST mozart-2.0.1-gentoo-patchset-2.tar.gz 39435 BLAKE2B 
18fe6f6e0d81d3b7901c73df567d79b6d8d8564bc49eb10dace2669de1448672a48dc0c509afbb5c506e8af65902ce36cb30f48c7fa26b6aa49cc09988218d42
 SHA512 
407da6fae39734097ab22fec5bc97ad1beb9103b13484ee0429a40a8f5803f6ed2abd2a64cfb56ccdddf9f82a2d9cd0883fe0a8f8a94bee963590606e1667127
 DIST mozart-2.0.1.tar.gz 2281261 BLAKE2B 
7f071e9ec130a0b482b299f4dac15d64f632702d6ecf55b7af0993087064e533b4de80f77520a725f69f68648a9ce763c8c8826bb24e52af49eda8c3ccfba0b5
 SHA512 
a72a6fa68296d06af72327fd11310b3be152e5ad9a56f1fc4200ac7b89cd177e9a23a38c6721e1885d4f2ed0870065e919fb9fe3c9a2833fcd8e4ac0fd43aeb4

diff --git a/dev-lang/mozart/mozart-2.0.1.ebuild 
b/dev-lang/mozart/mozart-2.0.1.ebuild
index 510d6729b40..d30212468b3 100644
--- a/dev-lang/mozart/mozart-2.0.1.ebuild
+++ b/dev-lang/mozart/mozart-2.0.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit cmake elisp-common java-pkg-2 java-ant-2
 
-PATCHSET_VER="1"
+PATCHSET_VER="2"
 
 DESCRIPTION="Advanced development platform for intelligent, distributed 
applications"
 HOMEPAGE="http://mozart2.org/;

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart/

2021-07-25 Thread Sam James 
commit: 0aaec09918e4353af56be3c4ab40ad937281db3a
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 25 22:49:04 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 25 23:23:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aaec099

dev-lang/mozart: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 dev-lang/mozart/metadata.xml | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/dev-lang/mozart/metadata.xml b/dev-lang/mozart/metadata.xml
index 61b1b5e42a2..8491185c414 100644
--- a/dev-lang/mozart/metadata.xml
+++ b/dev-lang/mozart/metadata.xml
@@ -1,8 +1,11 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-k...@gentoo.org
-Keri Harris
-  
+   
+   k...@gentoo.org
+   Keri Harris
+   
+   
+   mozart/mozart2
+

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart/, dev-lang/mozart/files/

2021-06-27 Thread Keri Harris 
commit: d48eb5d10b1d301240521d5369b9ddcf8c93cb52
Author: Keri Harris  gentoo  org>
AuthorDate: Sun Jun 27 14:50:06 2021 +
Commit: Keri Harris  gentoo  org>
CommitDate: Sun Jun 27 14:50:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d48eb5d1

dev-lang/mozart: include site-lisp file to get Oz major modes.

Closes: https://bugs.gentoo.org/194604
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Keri Harris  gentoo.org>

 dev-lang/mozart/files/50mozart-gentoo.el | 13 +
 dev-lang/mozart/mozart-2.0.1.ebuild  | 12 +++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/dev-lang/mozart/files/50mozart-gentoo.el 
b/dev-lang/mozart/files/50mozart-gentoo.el
new file mode 100644
index 000..3533d49d693
--- /dev/null
+++ b/dev-lang/mozart/files/50mozart-gentoo.el
@@ -0,0 +1,13 @@
+;;; mozart site-lisp configuration
+
+(or (getenv "OZHOME")
+(setenv "OZHOME" "/usr"))
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'run-oz' "oz" "Start Mozart as a sub-process" t)
+(autoload 'oz-mode "oz" "Major mode for editing Oz code." t)
+(autoload 'oz-gump-mode "oz"
+  "Major mode for editing Oz code with embedded Gump specifications." t)
+(autoload 'ozm-mode "mozart" "Major mode for displaying Oz machine code." t)
+(add-to-list 'auto-mode-alist '("\\.oz$" . oz-mode))
+(add-to-list 'auto-mode-alist '("\\.ozg$" . oz-gump-mode))
+(add-to-list 'auto-mode-alist '("\\.ozm$" . ozm-mode))

diff --git a/dev-lang/mozart/mozart-2.0.1.ebuild 
b/dev-lang/mozart/mozart-2.0.1.ebuild
index d469901f25b..510d6729b40 100644
--- a/dev-lang/mozart/mozart-2.0.1.ebuild
+++ b/dev-lang/mozart/mozart-2.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake java-pkg-2 java-ant-2
+inherit cmake elisp-common java-pkg-2 java-ant-2
 
 PATCHSET_VER="1"
 
@@ -30,6 +30,8 @@ DEPEND="${RDEPEND}
dev-lang/scala:2.12
test? ( dev-cpp/gtest:= )"
 
+SITEFILE="50${PN}-gentoo.el"
+
 S="${WORKDIR}/${PN}2-${PV}"
 
 src_prepare() {
@@ -71,12 +73,19 @@ src_install() {
 
dolib.so "${BUILD_DIR}"/vm/vm/main/libmozartvm.so
dolib.so "${BUILD_DIR}"/vm/boostenv/main/libmozartvmboost.so
+
+   if use emacs; then
+   elisp-install ${PN} "${S}"/opi/emacs/*.el
+   elisp-site-file-install "${FILESDIR}"/"${SITEFILE}" \
+   || die "elsip-site-file-install failed"
+   fi
 }
 
 pkg_postinst() {
if use emacs; then
xdg_icon_cache_update
xdg_desktop_database_update
+   elisp-site-regen
fi
 }
 
@@ -84,5 +93,6 @@ pkg_postrm() {
if use emacs; then
xdg_icon_cache_update
xdg_desktop_database_update
+   elisp-site-regen
fi
 }

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart/

2021-05-09 Thread Andreas Sturmlechner 
commit: 71a7e85770ecab393a9cc4190816e2bc7e28e033
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Apr  5 12:13:13 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May  9 20:51:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71a7e857

dev-lang/mozart: Tidyup, use cmake.eclass

- local mycmakeargs
- Drop superfluous and post-inherit BUILD_DIR, CMAKE_USE_DIR
- Drop superfluous eapply_user, done by cmake_src_prepare

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-lang/mozart/mozart-2.0.1.ebuild | 38 +
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/dev-lang/mozart/mozart-2.0.1.ebuild 
b/dev-lang/mozart/mozart-2.0.1.ebuild
index 09d87b13382..d469901f25b 100644
--- a/dev-lang/mozart/mozart-2.0.1.ebuild
+++ b/dev-lang/mozart/mozart-2.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils java-pkg-2 java-ant-2
+inherit cmake java-pkg-2 java-ant-2
 
 PATCHSET_VER="1"
 
@@ -31,50 +31,46 @@ DEPEND="${RDEPEND}
test? ( dev-cpp/gtest:= )"
 
 S="${WORKDIR}/${PN}2-${PV}"
-BUILD_DIR="${S}/build"
-CMAKE_USE_DIR="${S}"
 
 src_prepare() {
if [[ -d "${WORKDIR}"/${PV} ]] ; then
eapply "${WORKDIR}"/${PV}
fi
-   eapply_user
 
-   touch "${S}"/stdlib/CMakeLists.txt
-   touch "${S}"/vm/vm/test/gtest/CMakeLists.txt
+   touch stdlib/CMakeLists.txt || die
+   touch vm/vm/test/gtest/CMakeLists.txt || die
 
-   cmake-utils_src_prepare
+   cmake_src_prepare
 }
 
 src_configure() {
-   mycmakeargs=(
+   local mycmakeargs=(
-DMOZART_BOOST_USE_STATIC_LIBS=OFF
-   -DEMACS=$(if use emacs; then echo /usr/bin/emacs; fi)
-   )
+   -DEMACS=$(usex emacs "/usr/bin/emacs" "")
+   )
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }
 
 src_compile() {
EANT_GENTOO_CLASSPATH="scala:2.12"
-   cd "${S}"/bootcompiler
+   pushd bootcompiler > /dev/null || die
ANT_OPTS="-Xss2M" eant jar
+   popd > /dev/null || die
 
-   cd "${S}"
-   cmake-utils_src_compile
+   cmake_src_compile
 }
 
 src_test() {
-   cmake-utils_src_compile vmtest platform-test
-   cmake-utils_src_test -V
+   cmake_build vmtest platform-test
+   cmake_src_test -V
 }
 
 src_install() {
-   cmake-utils_src_install
+   cmake_src_install
 
-   cd "${BUILD_DIR}"
-   dolib.so vm/vm/main/libmozartvm.so
-   dolib.so vm/boostenv/main/libmozartvmboost.so
+   dolib.so "${BUILD_DIR}"/vm/vm/main/libmozartvm.so
+   dolib.so "${BUILD_DIR}"/vm/boostenv/main/libmozartvmboost.so
 }
 
 pkg_postinst() {

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart-stdlib/

2021-05-09 Thread Andreas Sturmlechner 
commit: 5991ddf5a021e8d8b07190d0f824c6046a14d059
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Apr  5 12:18:09 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May  9 20:51:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5991ddf5

dev-lang/mozart-stdlib: Tidyup, use cmake.eclass

Drop superfluous and post-inherit BUILD_DIR, CMAKE_USE_DIR

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild | 11 +++
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild 
b/dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild
index 024329f0def..c9826227a59 100644
--- a/dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild
+++ b/dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils
-
 MY_PN=mozart2-stdlib
+inherit cmake
 
 PATCHSET_VER="0"
 
@@ -23,14 +22,10 @@ RDEPEND=">=dev-lang/mozart-2.0.1"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_PN}"
-BUILD_DIR="${S}/build"
-CMAKE_USE_DIR="${S}"
 
 src_prepare() {
if [[ -d "${WORKDIR}"/${PV} ]] ; then
eapply "${WORKDIR}"/${PV}
fi
-   eapply_user
-
-   cmake-utils_src_prepare
+   cmake_src_prepare
 }

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart/files/

2020-09-21 Thread Conrad Kostecki 
commit: e420584490f83413b7de14f8f9547cce9357d0bd
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Tue Sep 15 18:07:25 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Mon Sep 21 21:48:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4205844

dev-lang/mozart: remove unused file

Closes: https://github.com/gentoo/gentoo/pull/17552
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-lang/mozart/files/50mozart-gentoo.el | 11 ---
 1 file changed, 11 deletions(-)

diff --git a/dev-lang/mozart/files/50mozart-gentoo.el 
b/dev-lang/mozart/files/50mozart-gentoo.el
deleted file mode 100644
index 64f65c54a68..000
--- a/dev-lang/mozart/files/50mozart-gentoo.el
+++ /dev/null
@@ -1,11 +0,0 @@
-
-;;; mozart site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'oz-mode "oz" "Major mode for editing Oz code." t)
-(autoload 'oz-gump-mode "oz"
-  "Major mode for editing Oz code with embedded Gump specifications." t)
-(autoload 'ozm-mode "mozart" "Major mode for displaying Oz machine code." t)
-(add-to-list 'auto-mode-alist '("\\.oz$" . oz-mode))
-(add-to-list 'auto-mode-alist '("\\.ozg$" . oz-gump-mode))
-(add-to-list 'auto-mode-alist '("\\.ozm$" . ozm-mode))

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart/

2020-09-11 Thread Keri Harris 
commit: 780e4198a30dc52b3c95461e42d015cb60833a14
Author: Keri Harris  gentoo  org>
AuthorDate: Fri Sep 11 14:39:32 2020 +
Commit: Keri Harris  gentoo  org>
CommitDate: Fri Sep 11 14:39:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=780e4198

dev-lang/mozart: remove old (broken) version

Package-Manager: Portage-2.3.103, Repoman-2.3.22
Signed-off-by: Keri Harris  gentoo.org>

 dev-lang/mozart/Manifest   |   4 -
 dev-lang/mozart/mozart-1.4.0-r3.ebuild | 124 --
 dev-lang/mozart/mozart-1.4.0-r4.ebuild | 135 -
 3 files changed, 263 deletions(-)

diff --git a/dev-lang/mozart/Manifest b/dev-lang/mozart/Manifest
index 4175014dce1..777da6f5120 100644
--- a/dev-lang/mozart/Manifest
+++ b/dev-lang/mozart/Manifest
@@ -1,6 +1,2 @@
-DIST mozart-1.4.0-gentoo-patchset-5.tar.gz 24700 BLAKE2B 
c3b14bd7d8a762b84a098a9e42dfe09b5b902fdfe6c8e8dcebe7198eaaf0e89cbb101ec3765713db0fbddb6f3b9741ed927af98df48aed496d7864f6bc5f6999
 SHA512 
99db9bf62682fd306c4b665d99ab3b48a787c26230d5e8db2e3564684eff2e41ac0c6bb6a612afa0446555dcb1e419ae7ef1dbfec4c918d769d51daf8462
-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
 DIST mozart-2.0.1-gentoo-patchset-1.tar.gz 39069 BLAKE2B 
7490d13665314b3a998fb21bd8a342f262d92a395c3b0bbfa9a7813c044220c82ac02eb0103409127862c9bb4e4c44765b1228a7bdea2cb247492c94264f4fe0
 SHA512 
ce3cdb8ffebd95d6065439432905ad68b9cd8b86f58478092ab55df7ae7c72498a3e29bda462f3305aff6c99d010c45d786f905e2e906550ee61656ba122bbc6
 DIST mozart-2.0.1.tar.gz 2281261 BLAKE2B 
7f071e9ec130a0b482b299f4dac15d64f632702d6ecf55b7af0993087064e533b4de80f77520a725f69f68648a9ce763c8c8826bb24e52af49eda8c3ccfba0b5
 SHA512 
a72a6fa68296d06af72327fd11310b3be152e5ad9a56f1fc4200ac7b89cd177e9a23a38c6721e1885d4f2ed0870065e919fb9fe3c9a2833fcd8e4ac0fd43aeb4

diff --git a/dev-lang/mozart/mozart-1.4.0-r3.ebuild 
b/dev-lang/mozart/mozart-1.4.0-r3.ebuild
deleted file mode 100644
index 44dbcac3190..000
--- a/dev-lang/mozart/mozart-1.4.0-r3.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp-common eutils
-
-PATCHSET_VER="5"
-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
-   doc? ( 
mirror://sourceforge/project/mozart-oz/v1/1.4.0-2008-07-02-tar/${MY_P}-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:0=
-   sys-libs/zlib
-   emacs? ( >=app-editors/emacs-23.1:* )
-   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) \
-

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart-stdlib/files/, dev-lang/mozart-stdlib/

2020-09-11 Thread Keri Harris 
commit: 42fbf51fccf61197a377967b84de3ac48fa99307
Author: Keri Harris  gentoo  org>
AuthorDate: Fri Sep 11 14:38:37 2020 +
Commit: Keri Harris  gentoo  org>
CommitDate: Fri Sep 11 14:38:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42fbf51f

dev-lang/mozart-stdlib: remove old (broken) version

Package-Manager: Portage-2.3.103, Repoman-2.3.22
Signed-off-by: Keri Harris  gentoo.org>

 dev-lang/mozart-stdlib/Manifest|  1 -
 .../files/mozart-stdlib-1.4.0-docroot.patch| 13 
 .../files/mozart-stdlib-1.4.0-ozload.patch | 13 
 .../mozart-stdlib/mozart-stdlib-1.4.0-r2.ebuild| 35 --
 4 files changed, 62 deletions(-)

diff --git a/dev-lang/mozart-stdlib/Manifest b/dev-lang/mozart-stdlib/Manifest
index 35d4e0af1e8..740685a3e6a 100644
--- a/dev-lang/mozart-stdlib/Manifest
+++ b/dev-lang/mozart-stdlib/Manifest
@@ -1,3 +1,2 @@
-DIST mozart-1.4.0.20080704-std.tar.gz 1305359 BLAKE2B 
1dc665a801f2ab1a87b6256279cf097053865b6d78c8131f15188b5b5e25d4b70c34c8dc590b9c4c708ece9821ba1d46fc62ddec698471ff5c629dfcee171a71
 SHA512 
5b9d9811d739c3533b7f1fa98757d842b506d58a3fd5d89ee2c1d9c036b3130f152da05b19036c8c1609057e361d71b106a728afea47140ebab3b4fc82441aed
 DIST mozart-stdlib-2.0.1-gentoo-patchset-0.tar.gz 1237 BLAKE2B 
c18fbaba2860faed1ab1b53cc9ead90af338da8fc673c08e167463c784e1b31ec9b6edadb1a55cf70d25f545e88fa226ccec313df09f1ecaa16eb619f9242b8d
 SHA512 
84f2c44124901f63ee11706cdd573b2f6a4eb8427d12560be8f0772bb872ca9f5a14ad3f047ce64da8060188f21ccf774b1866ecc439381294822c6d9a41f2eb
 DIST mozart2-stdlib-2.0.1.tar.gz 1315353 BLAKE2B 
b2bd25634dc9194af6dc5e23da369515b3a55e0b23bf6d1bf312d0b8eb9f92eee732ea9cf14ebd659e0e296f77c1b1cffa13a74885279bfc5fc0be5d583fd8c3
 SHA512 
8bb481b00cd9b62aef348dba9e905b3210d1a2fd219cf561d7d243dc0ead135d3ca53378a5945deedfc67ae076ca72008dd098f4a326f00992764123b682f79c

diff --git a/dev-lang/mozart-stdlib/files/mozart-stdlib-1.4.0-docroot.patch 
b/dev-lang/mozart-stdlib/files/mozart-stdlib-1.4.0-docroot.patch
deleted file mode 100644
index f4102a47b27..000
--- a/dev-lang/mozart-stdlib/files/mozart-stdlib-1.4.0-docroot.patch
+++ /dev/null
@@ -1,13 +0,0 @@
 mozart-1.4.0.20080704-std.orig/Makefile.in 2004-05-19 02:22:05.0 
+1200
-+++ mozart-1.4.0.20080704-std/Makefile.in  2010-11-20 13:33:30.0 
+1300
-@@ -25,8 +25,8 @@
-   cd ozmake && $(MAKE) ozmake.ozf
- 
- install: all
--  $(OZENGINE) ozmake/ozmake.ozf --prefix=$(CYG_PREFIX) 
--srcdir=$(CYG_SRCDIR) --install --nosavedb
--  $(OZENGINE) ozmake/ozmake.ozf --prefix=$(CYG_PREFIX) 
--srcdir=$(CYG_SRCDIR)/ozmake --builddir=$(CYG_BUILDDIR_OZMAKE) --install 
--nosavedb
-+  $(OZENGINE) ozmake/ozmake.ozf --prefix=$(CYG_PREFIX) 
--srcdir=$(CYG_SRCDIR) --docroot=$(DOCROOT) --install --nosavedb
-+  $(OZENGINE) ozmake/ozmake.ozf --prefix=$(CYG_PREFIX) 
--srcdir=$(CYG_SRCDIR)/ozmake --builddir=$(CYG_BUILDDIR_OZMAKE) 
--docroot=$(DOCROOT) --install --nosavedb
- 
- export CLEANDIR
- 

diff --git a/dev-lang/mozart-stdlib/files/mozart-stdlib-1.4.0-ozload.patch 
b/dev-lang/mozart-stdlib/files/mozart-stdlib-1.4.0-ozload.patch
deleted file mode 100644
index 6cdc6153f6e..000
--- a/dev-lang/mozart-stdlib/files/mozart-stdlib-1.4.0-ozload.patch
+++ /dev/null
@@ -1,13 +0,0 @@
 mozart-1.4.0.20080704-std.orig/ozmake/Makefile.in  2004-04-01 
00:52:55.0 +1200
-+++ mozart-1.4.0.20080704-std/ozmake/Makefile.in   2008-07-06 
19:56:25.0 +1200
-@@ -37,8 +37,8 @@
- 
- # these additional 2 lines makes it possible to build in a directory
- # different from the source directory
--OZLOAD = 
prefix=$(CYGSRCDIR)=$(CYGBUILDDIR)$(OZLOADSEP)root=$(CYGBUILDDIR)$(OZLOADSEP)root=$(CYGSRCDIR)$(OZLOADSEP)cache=~/.oz/cache$(OZLOADSEP)cache=$(OZHOME)/cache
--export OZLOAD
-+#OZLOAD = 
prefix=$(CYGSRCDIR)=$(CYGBUILDDIR)$(OZLOADSEP)root=$(CYGBUILDDIR)$(OZLOADSEP)root=$(CYGSRCDIR)$(OZLOADSEP)cache=~/.oz/cache$(OZLOADSEP)cache=$(OZHOME)/cache
-+#export OZLOAD
- 
- XSLTPROC  = @VAR_XSLTPROC@
- LYNX  = @VAR_LYNX@

diff --git a/dev-lang/mozart-stdlib/mozart-stdlib-1.4.0-r2.ebuild 
b/dev-lang/mozart-stdlib/mozart-stdlib-1.4.0-r2.ebuild
deleted file mode 100644
index 16efae7b182..000
--- a/dev-lang/mozart-stdlib/mozart-stdlib-1.4.0-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="mozart-${PV}.20080704-std"
-
-DESCRIPTION="The Mozart Standard Library"
-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}.tar.gz"
-LICENSE="Mozart"
-
-SLOT="0"
-KEYWORDS="-amd64 ppc -ppc64 x86"
-
-DEPEND="dev-lang/mozart"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${P}-ozload.patch
-   "${FILESDIR}"/${P}-docroot.patch )
-
-src_install() {
-   emake \
-

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart-stdlib/

2020-07-28 Thread Keri Harris 
commit: 66127460dc2fab74534928c3d3f5e09dc2dc1004
Author: Keri Harris  gentoo  org>
AuthorDate: Tue Jul 28 19:34:26 2020 +
Commit: Keri Harris  gentoo  org>
CommitDate: Tue Jul 28 19:34:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66127460

dev-lang/mozart-stdlib: stable on amd64 + x86. Bug 734090

Package-Manager: Portage-2.3.103, Repoman-2.3.22
Signed-off-by: Keri Harris  gentoo.org>

 dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild 
b/dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild
index c599cda1e3a..024329f0def 100644
--- a/dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild
+++ b/dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://dev.gentoo.org/~keri/distfiles/mozart-stdlib/${MY_PN}-${PV}.tar
 
 LICENSE="Mozart"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/mozart-2.0.1"

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart/

2020-07-28 Thread Keri Harris 
commit: f395d604dc096789410291f91d1d35d98d78b3fe
Author: Keri Harris  gentoo  org>
AuthorDate: Tue Jul 28 19:31:55 2020 +
Commit: Keri Harris  gentoo  org>
CommitDate: Tue Jul 28 19:31:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f395d604

dev-lang/mozart: stable on amd64 + x86. Bug 734090

Package-Manager: Portage-2.3.103, Repoman-2.3.22
Signed-off-by: Keri Harris  gentoo.org>

 dev-lang/mozart/mozart-2.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/mozart/mozart-2.0.1.ebuild 
b/dev-lang/mozart/mozart-2.0.1.ebuild
index b44def58b10..09d87b13382 100644
--- a/dev-lang/mozart/mozart-2.0.1.ebuild
+++ b/dev-lang/mozart/mozart-2.0.1.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/mozart/mozart2/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart/

2020-06-24 Thread Keri Harris 
commit: 08278e6cd0b4d9cbb023696822f5fe76c75623d2
Author: Keri Harris  gentoo  org>
AuthorDate: Wed Jun 24 14:09:46 2020 +
Commit: Keri Harris  gentoo  org>
CommitDate: Wed Jun 24 14:09:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08278e6c

dev-lang/mozart: pin bootcompiler to scala-2.12

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Keri Harris  gentoo.org>

 dev-lang/mozart/mozart-2.0.1.ebuild | 11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/dev-lang/mozart/mozart-2.0.1.ebuild 
b/dev-lang/mozart/mozart-2.0.1.ebuild
index ebd5d3b0473..b44def58b10 100644
--- a/dev-lang/mozart/mozart-2.0.1.ebuild
+++ b/dev-lang/mozart/mozart-2.0.1.ebuild
@@ -27,10 +27,7 @@ RDEPEND="dev-libs/boost:=
 DEPEND="${RDEPEND}
dev-java/ant-core
>=virtual/jdk-1.8:=
-   || (
-   dev-lang/scala:2.12
-   dev-lang/scala-bin:0
-   )
+   dev-lang/scala:2.12
test? ( dev-cpp/gtest:= )"
 
 S="${WORKDIR}/${PN}2-${PV}"
@@ -59,11 +56,7 @@ src_configure() {
 }
 
 src_compile() {
-   if has_version "dev-lang/scala"; then
-   EANT_GENTOO_CLASSPATH="scala:2.12"
-   else
-   EANT_GENTOO_CLASSPATH="scala-bin"
-   fi
+   EANT_GENTOO_CLASSPATH="scala:2.12"
cd "${S}"/bootcompiler
ANT_OPTS="-Xss2M" eant jar

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart/

2020-06-23 Thread Keri Harris 
commit: 155f0f8869defe6c80b2e60ec5ada30334d57189
Author: Keri Harris  gentoo  org>
AuthorDate: Tue Jun 23 16:13:08 2020 +
Commit: Keri Harris  gentoo  org>
CommitDate: Tue Jun 23 16:13:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=155f0f88

dev-lang/mozart: patch bootcompiler to work with Scala 2.12

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Keri Harris  gentoo.org>

 dev-lang/mozart/Manifest| 2 +-
 dev-lang/mozart/mozart-2.0.1.ebuild | 8 
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-lang/mozart/Manifest b/dev-lang/mozart/Manifest
index f18a5f097ff..4175014dce1 100644
--- a/dev-lang/mozart/Manifest
+++ b/dev-lang/mozart/Manifest
@@ -2,5 +2,5 @@ DIST mozart-1.4.0-gentoo-patchset-5.tar.gz 24700 BLAKE2B 
c3b14bd7d8a762b84a098a9
 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
-DIST mozart-2.0.1-gentoo-patchset-0.tar.gz 10888 BLAKE2B 
2b41560021bec70bb60cfb4439b5db13a6e7ac7d7b1b7e1be6fd584f5e7de566db40f67fccec66f53a39150b1985a4e41a45cbd41aa8b77ff740fd60ce708f05
 SHA512 
082187494ef4c7a5655bde22d9b6df9c37fada5512cae2f15440dd298229e48777d1de4a2461f127279fa8f36da9900c78c6927fbde03bfa4d2006200923e33e
+DIST mozart-2.0.1-gentoo-patchset-1.tar.gz 39069 BLAKE2B 
7490d13665314b3a998fb21bd8a342f262d92a395c3b0bbfa9a7813c044220c82ac02eb0103409127862c9bb4e4c44765b1228a7bdea2cb247492c94264f4fe0
 SHA512 
ce3cdb8ffebd95d6065439432905ad68b9cd8b86f58478092ab55df7ae7c72498a3e29bda462f3305aff6c99d010c45d786f905e2e906550ee61656ba122bbc6
 DIST mozart-2.0.1.tar.gz 2281261 BLAKE2B 
7f071e9ec130a0b482b299f4dac15d64f632702d6ecf55b7af0993087064e533b4de80f77520a725f69f68648a9ce763c8c8826bb24e52af49eda8c3ccfba0b5
 SHA512 
a72a6fa68296d06af72327fd11310b3be152e5ad9a56f1fc4200ac7b89cd177e9a23a38c6721e1885d4f2ed0870065e919fb9fe3c9a2833fcd8e4ac0fd43aeb4

diff --git a/dev-lang/mozart/mozart-2.0.1.ebuild 
b/dev-lang/mozart/mozart-2.0.1.ebuild
index e6b2dc3f442..ebd5d3b0473 100644
--- a/dev-lang/mozart/mozart-2.0.1.ebuild
+++ b/dev-lang/mozart/mozart-2.0.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit cmake-utils java-pkg-2 java-ant-2
 
-PATCHSET_VER="0"
+PATCHSET_VER="1"
 
 DESCRIPTION="Advanced development platform for intelligent, distributed 
applications"
 HOMEPAGE="http://mozart2.org/;
@@ -28,8 +28,8 @@ DEPEND="${RDEPEND}
dev-java/ant-core
>=virtual/jdk-1.8:=
|| (
-   dev-lang/scala
-   dev-lang/scala-bin
+   dev-lang/scala:2.12
+   dev-lang/scala-bin:0
)
test? ( dev-cpp/gtest:= )"
 
@@ -60,7 +60,7 @@ src_configure() {
 
 src_compile() {
if has_version "dev-lang/scala"; then
-   EANT_GENTOO_CLASSPATH="scala"
+   EANT_GENTOO_CLASSPATH="scala:2.12"
else
EANT_GENTOO_CLASSPATH="scala-bin"
fi

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart/

2020-06-22 Thread Keri Harris 
commit: c3e49e0607ada6c61ae091472d9a662c81cbd9b8
Author: Keri Harris  gentoo  org>
AuthorDate: Mon Jun 22 15:47:56 2020 +
Commit: Keri Harris  gentoo  org>
CommitDate: Mon Jun 22 15:48:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3e49e06

dev-lang/mozart: remove = slot operator from inside || block

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Keri Harris  gentoo.org>

 dev-lang/mozart/mozart-2.0.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/mozart/mozart-2.0.1.ebuild 
b/dev-lang/mozart/mozart-2.0.1.ebuild
index f5be42ff391..e6b2dc3f442 100644
--- a/dev-lang/mozart/mozart-2.0.1.ebuild
+++ b/dev-lang/mozart/mozart-2.0.1.ebuild
@@ -28,8 +28,8 @@ DEPEND="${RDEPEND}
dev-java/ant-core
>=virtual/jdk-1.8:=
|| (
-   dev-lang/scala:=
-   dev-lang/scala-bin:=
+   dev-lang/scala
+   dev-lang/scala-bin
)
test? ( dev-cpp/gtest:= )"

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart-stdlib/

2020-06-22 Thread Keri Harris 
commit: 0f2fc8edd4d9288bbd970ccaa7cb09e93ba2fc72
Author: Keri Harris  gentoo  org>
AuthorDate: Mon Jun 22 13:33:55 2020 +
Commit: Keri Harris  gentoo  org>
CommitDate: Mon Jun 22 13:34:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f2fc8ed

dev-lang/mozart-stdlib: version bump

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Keri Harris  gentoo.org>

 dev-lang/mozart-stdlib/Manifest   |  2 ++
 dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild | 36 +++
 2 files changed, 38 insertions(+)

diff --git a/dev-lang/mozart-stdlib/Manifest b/dev-lang/mozart-stdlib/Manifest
index 54decb0a0aa..35d4e0af1e8 100644
--- a/dev-lang/mozart-stdlib/Manifest
+++ b/dev-lang/mozart-stdlib/Manifest
@@ -1 +1,3 @@
 DIST mozart-1.4.0.20080704-std.tar.gz 1305359 BLAKE2B 
1dc665a801f2ab1a87b6256279cf097053865b6d78c8131f15188b5b5e25d4b70c34c8dc590b9c4c708ece9821ba1d46fc62ddec698471ff5c629dfcee171a71
 SHA512 
5b9d9811d739c3533b7f1fa98757d842b506d58a3fd5d89ee2c1d9c036b3130f152da05b19036c8c1609057e361d71b106a728afea47140ebab3b4fc82441aed
+DIST mozart-stdlib-2.0.1-gentoo-patchset-0.tar.gz 1237 BLAKE2B 
c18fbaba2860faed1ab1b53cc9ead90af338da8fc673c08e167463c784e1b31ec9b6edadb1a55cf70d25f545e88fa226ccec313df09f1ecaa16eb619f9242b8d
 SHA512 
84f2c44124901f63ee11706cdd573b2f6a4eb8427d12560be8f0772bb872ca9f5a14ad3f047ce64da8060188f21ccf774b1866ecc439381294822c6d9a41f2eb
+DIST mozart2-stdlib-2.0.1.tar.gz 1315353 BLAKE2B 
b2bd25634dc9194af6dc5e23da369515b3a55e0b23bf6d1bf312d0b8eb9f92eee732ea9cf14ebd659e0e296f77c1b1cffa13a74885279bfc5fc0be5d583fd8c3
 SHA512 
8bb481b00cd9b62aef348dba9e905b3210d1a2fd219cf561d7d243dc0ead135d3ca53378a5945deedfc67ae076ca72008dd098f4a326f00992764123b682f79c

diff --git a/dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild 
b/dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild
new file mode 100644
index 000..c599cda1e3a
--- /dev/null
+++ b/dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+MY_PN=mozart2-stdlib
+
+PATCHSET_VER="0"
+
+DESCRIPTION="The Mozart Standard Library"
+HOMEPAGE="http://mozart2.org/;
+SRC_URI="https://dev.gentoo.org/~keri/distfiles/mozart-stdlib/${MY_PN}-${PV}.tar.gz
+   
https://dev.gentoo.org/~keri/distfiles/mozart-stdlib/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz;
+
+LICENSE="Mozart"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/mozart-2.0.1"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}"
+BUILD_DIR="${S}/build"
+CMAKE_USE_DIR="${S}"
+
+src_prepare() {
+   if [[ -d "${WORKDIR}"/${PV} ]] ; then
+   eapply "${WORKDIR}"/${PV}
+   fi
+   eapply_user
+
+   cmake-utils_src_prepare
+}

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart/

2020-06-22 Thread Keri Harris 
commit: ff73aea77c11d8091a215062def7a2a4d7265646
Author: Keri Harris  gentoo  org>
AuthorDate: Mon Jun 22 13:31:11 2020 +
Commit: Keri Harris  gentoo  org>
CommitDate: Mon Jun 22 13:32:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff73aea7

dev-lang/mozart: version bump

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Keri Harris  gentoo.org>

 dev-lang/mozart/Manifest|  2 +
 dev-lang/mozart/mozart-2.0.1.ebuild | 99 +
 2 files changed, 101 insertions(+)

diff --git a/dev-lang/mozart/Manifest b/dev-lang/mozart/Manifest
index fd420dc7f17..f18a5f097ff 100644
--- a/dev-lang/mozart/Manifest
+++ b/dev-lang/mozart/Manifest
@@ -2,3 +2,5 @@ DIST mozart-1.4.0-gentoo-patchset-5.tar.gz 24700 BLAKE2B 
c3b14bd7d8a762b84a098a9
 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
+DIST mozart-2.0.1-gentoo-patchset-0.tar.gz 10888 BLAKE2B 
2b41560021bec70bb60cfb4439b5db13a6e7ac7d7b1b7e1be6fd584f5e7de566db40f67fccec66f53a39150b1985a4e41a45cbd41aa8b77ff740fd60ce708f05
 SHA512 
082187494ef4c7a5655bde22d9b6df9c37fada5512cae2f15440dd298229e48777d1de4a2461f127279fa8f36da9900c78c6927fbde03bfa4d2006200923e33e
+DIST mozart-2.0.1.tar.gz 2281261 BLAKE2B 
7f071e9ec130a0b482b299f4dac15d64f632702d6ecf55b7af0993087064e533b4de80f77520a725f69f68648a9ce763c8c8826bb24e52af49eda8c3ccfba0b5
 SHA512 
a72a6fa68296d06af72327fd11310b3be152e5ad9a56f1fc4200ac7b89cd177e9a23a38c6721e1885d4f2ed0870065e919fb9fe3c9a2833fcd8e4ac0fd43aeb4

diff --git a/dev-lang/mozart/mozart-2.0.1.ebuild 
b/dev-lang/mozart/mozart-2.0.1.ebuild
new file mode 100644
index 000..f5be42ff391
--- /dev/null
+++ b/dev-lang/mozart/mozart-2.0.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils java-pkg-2 java-ant-2
+
+PATCHSET_VER="0"
+
+DESCRIPTION="Advanced development platform for intelligent, distributed 
applications"
+HOMEPAGE="http://mozart2.org/;
+SRC_URI="https://github.com/mozart/mozart2/archive/v${PV}.tar.gz -> ${P}.tar.gz
+   
https://dev.gentoo.org/~keri/distfiles/mozart/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz;
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/boost:=
+   dev-libs/gmp:0
+   dev-lang/tcl:0
+   dev-lang/tk:0
+   emacs? ( >=app-editors/emacs-23.1:* )"
+
+DEPEND="${RDEPEND}
+   dev-java/ant-core
+   >=virtual/jdk-1.8:=
+   || (
+   dev-lang/scala:=
+   dev-lang/scala-bin:=
+   )
+   test? ( dev-cpp/gtest:= )"
+
+S="${WORKDIR}/${PN}2-${PV}"
+BUILD_DIR="${S}/build"
+CMAKE_USE_DIR="${S}"
+
+src_prepare() {
+   if [[ -d "${WORKDIR}"/${PV} ]] ; then
+   eapply "${WORKDIR}"/${PV}
+   fi
+   eapply_user
+
+   touch "${S}"/stdlib/CMakeLists.txt
+   touch "${S}"/vm/vm/test/gtest/CMakeLists.txt
+
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   mycmakeargs=(
+   -DMOZART_BOOST_USE_STATIC_LIBS=OFF
+   -DEMACS=$(if use emacs; then echo /usr/bin/emacs; fi)
+   )
+
+   cmake-utils_src_configure
+}
+
+src_compile() {
+   if has_version "dev-lang/scala"; then
+   EANT_GENTOO_CLASSPATH="scala"
+   else
+   EANT_GENTOO_CLASSPATH="scala-bin"
+   fi
+   cd "${S}"/bootcompiler
+   ANT_OPTS="-Xss2M" eant jar
+
+   cd "${S}"
+   cmake-utils_src_compile
+}
+
+src_test() {
+   cmake-utils_src_compile vmtest platform-test
+   cmake-utils_src_test -V
+}
+
+src_install() {
+   cmake-utils_src_install
+
+   cd "${BUILD_DIR}"
+   dolib.so vm/vm/main/libmozartvm.so
+   dolib.so vm/boostenv/main/libmozartvmboost.so
+}
+
+pkg_postinst() {
+   if use emacs; then
+   xdg_icon_cache_update
+   xdg_desktop_database_update
+   fi
+}
+
+pkg_postrm() {
+   if use emacs; then
+   xdg_icon_cache_update
+

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart/

2020-05-27 Thread Keri Harris 
commit: 00e0c10e0a7a7cd3b14e17bd63180f6bcc26ef29
Author: Keri Harris  gentoo  org>
AuthorDate: Wed May 27 14:31:13 2020 +
Commit: Keri Harris  gentoo  org>
CommitDate: Wed May 27 14:35:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00e0c10e

dev-lang/mozart: fix compile failures with GCC 9. Closes #722954

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Keri Harris  gentoo.org>

 dev-lang/mozart/Manifest   |  1 +
 dev-lang/mozart/mozart-1.4.0-r4.ebuild | 39 +-
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/dev-lang/mozart/Manifest b/dev-lang/mozart/Manifest
index c3fd4a8a9f3..fd420dc7f17 100644
--- a/dev-lang/mozart/Manifest
+++ b/dev-lang/mozart/Manifest
@@ -1,3 +1,4 @@
 DIST mozart-1.4.0-gentoo-patchset-5.tar.gz 24700 BLAKE2B 
c3b14bd7d8a762b84a098a9e42dfe09b5b902fdfe6c8e8dcebe7198eaaf0e89cbb101ec3765713db0fbddb6f3b9741ed927af98df48aed496d7864f6bc5f6999
 SHA512 
99db9bf62682fd306c4b665d99ab3b48a787c26230d5e8db2e3564684eff2e41ac0c6bb6a612afa0446555dcb1e419ae7ef1dbfec4c918d769d51daf8462
+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

diff --git a/dev-lang/mozart/mozart-1.4.0-r4.ebuild 
b/dev-lang/mozart/mozart-1.4.0-r4.ebuild
index ab9ddf42868..25aff0bfbc8 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

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart-stdlib/

2019-05-11 Thread Mikle Kolyada 
commit: 3a16691021032350757d9585c586b6f87b77ac1e
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat May 11 16:45:04 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat May 11 16:45:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a166910

dev-lang/mozart-stdlib: Drop old

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 .../mozart-stdlib/mozart-stdlib-1.4.0-r1.ebuild| 40 --
 1 file changed, 40 deletions(-)

diff --git a/dev-lang/mozart-stdlib/mozart-stdlib-1.4.0-r1.ebuild 
b/dev-lang/mozart-stdlib/mozart-stdlib-1.4.0-r1.ebuild
deleted file mode 100644
index 898c3bfdbed..000
--- a/dev-lang/mozart-stdlib/mozart-stdlib-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils
-
-MY_P="mozart-${PV}.20080704-std"
-
-DESCRIPTION="The Mozart Standard Library"
-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}.tar.gz"
-LICENSE="Mozart"
-
-SLOT="0"
-KEYWORDS="-amd64 ppc -ppc64 x86"
-IUSE=""
-
-DEPEND="dev-lang/mozart"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-   epatch "${FILESDIR}"/${P}-ozload.patch
-   epatch "${FILESDIR}"/${P}-docroot.patch
-}
-
-src_install() {
-   emake \
-   PREFIX="${D}"/usr/lib/mozart \
-   DOCROOT="${D}"/usr/share/doc/${PF} \
-   install || die "emake install failed"
-
-   dosym /usr/lib/mozart/bin/ozmake /usr/bin/ozmake || die
-
-   doman ozmake/ozmake.1 || die
-   docinto mozart-ozmake
-   dodoc ozmake/{DESIGN,NOTES,README} || die
-}

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart-stdlib/

2019-05-11 Thread Mikle Kolyada 
commit: eae089dfd0c83c6d54c5d01efe05761d66b43991
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat May 11 16:44:22 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat May 11 16:44:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eae089df

dev-lang/mozart-stdlib: mark stable

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 dev-lang/mozart-stdlib/mozart-stdlib-1.4.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/mozart-stdlib/mozart-stdlib-1.4.0-r2.ebuild 
b/dev-lang/mozart-stdlib/mozart-stdlib-1.4.0-r2.ebuild
index 5ea3d580e6a..16efae7b182 100644
--- a/dev-lang/mozart-stdlib/mozart-stdlib-1.4.0-r2.ebuild
+++ b/dev-lang/mozart-stdlib/mozart-stdlib-1.4.0-r2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="mirror://sourceforge/project/mozart-oz/v1/1.4.0-2008-07-02-tar/${MY_P}.
 LICENSE="Mozart"
 
 SLOT="0"
-KEYWORDS="-amd64 ~ppc -ppc64 ~x86"
+KEYWORDS="-amd64 ppc -ppc64 x86"
 
 DEPEND="dev-lang/mozart"
 RDEPEND="${DEPEND}"

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart/

2019-04-09 Thread Patrice Clement 
commit: 9ac35ce64910753c8f89a3e1471dc85be2b0d6be
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Mar  6 18:53:27 2019 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Apr  9 22:21:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ac35ce6

dev-lang/mozart: EAPI7, improve ebuild.

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Patrice Clement  gentoo.org>

 dev-lang/mozart/mozart-1.4.0-r4.ebuild | 126 +
 1 file changed, 126 insertions(+)

diff --git a/dev-lang/mozart/mozart-1.4.0-r4.ebuild 
b/dev-lang/mozart/mozart-1.4.0-r4.ebuild
new file mode 100644
index 000..f94dc9760e3
--- /dev/null
+++ b/dev-lang/mozart/mozart-1.4.0-r4.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp-common
+
+PATCHSET_VER="5"
+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
+   doc? ( 
mirror://sourceforge/project/mozart-oz/v1/1.4.0-2008-07-02-tar/${MY_P}-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:0=
+   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() {
+   default
+   eapply "${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
+   if use doc ; then
+   docinto html
+   dodoc -r "${WORKDIR}"/mozart/doc/*
+   fi
+
+   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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart-stdlib/

2019-04-09 Thread Patrice Clement 
commit: f5db7a4c5b43317683079cbcd54339b4c7c6443b
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Mar  6 18:54:53 2019 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Apr  9 22:21:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5db7a4c

dev-lang/mozart-stdlib: fix HOMEPAGE and SRC_URI.

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Patrice Clement  gentoo.org>

 dev-lang/mozart-stdlib/mozart-stdlib-1.4.0-r1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-lang/mozart-stdlib/mozart-stdlib-1.4.0-r1.ebuild 
b/dev-lang/mozart-stdlib/mozart-stdlib-1.4.0-r1.ebuild
index 53c6e040555..898c3bfdbed 100644
--- a/dev-lang/mozart-stdlib/mozart-stdlib-1.4.0-r1.ebuild
+++ b/dev-lang/mozart-stdlib/mozart-stdlib-1.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -8,8 +8,8 @@ inherit eutils
 MY_P="mozart-${PV}.20080704-std"
 
 DESCRIPTION="The Mozart Standard Library"
-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-std.tar.gz;
+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}.tar.gz"
 LICENSE="Mozart"
 
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart-stdlib/

2019-04-09 Thread Patrice Clement 
commit: 1607416ed0580c71878c25e28ad2c3814b1ac4bb
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Mar  6 18:57:28 2019 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Apr  9 22:21:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1607416e

dev-lang/mozart-stdlib: EAPI7, improve ebuild.

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Patrice Clement  gentoo.org>

 .../mozart-stdlib/mozart-stdlib-1.4.0-r2.ebuild| 35 ++
 1 file changed, 35 insertions(+)

diff --git a/dev-lang/mozart-stdlib/mozart-stdlib-1.4.0-r2.ebuild 
b/dev-lang/mozart-stdlib/mozart-stdlib-1.4.0-r2.ebuild
new file mode 100644
index 000..5ea3d580e6a
--- /dev/null
+++ b/dev-lang/mozart-stdlib/mozart-stdlib-1.4.0-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="mozart-${PV}.20080704-std"
+
+DESCRIPTION="The Mozart Standard Library"
+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}.tar.gz"
+LICENSE="Mozart"
+
+SLOT="0"
+KEYWORDS="-amd64 ~ppc -ppc64 ~x86"
+
+DEPEND="dev-lang/mozart"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${P}-ozload.patch
+   "${FILESDIR}"/${P}-docroot.patch )
+
+src_install() {
+   emake \
+   PREFIX="${D}"/usr/lib/mozart \
+   DOCROOT="${D}"/usr/share/doc/${PF} \
+   install
+
+   dosym /usr/lib/mozart/bin/ozmake /usr/bin/ozmake
+
+   doman ozmake/ozmake.1
+   docinto mozart-ozmake
+   dodoc ozmake/{DESIGN,NOTES,README}
+}

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart/

2019-04-09 Thread Patrice Clement 
commit: 4dbddacdd6c10c5369b02a4abd4a98c3a496d98e
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Mar  6 18:47:22 2019 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Apr  9 22:21:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dbddacd

dev-lang/mozart: fix HOMEPAGE and SRC_URI.

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11286
Signed-off-by: Patrice Clement  gentoo.org>

 dev-lang/mozart/mozart-1.4.0-r3.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-lang/mozart/mozart-1.4.0-r3.ebuild 
b/dev-lang/mozart/mozart-1.4.0-r3.ebuild
index 5c828c75cab..8f96e42f884 100644
--- a/dev-lang/mozart/mozart-1.4.0-r3.ebuild
+++ b/dev-lang/mozart/mozart-1.4.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,11 +9,11 @@ PATCHSET_VER="5"
 MY_P="mozart-${PV}.20080704"
 
 DESCRIPTION="Advanced development platform for intelligent, distributed 
applications"
-HOMEPAGE="http://www.mozart-oz.org/;
+HOMEPAGE="https://mozart.github.io/ https://github.com/mozart/mozart;
 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://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
-   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
 )"
+   doc? ( 
mirror://sourceforge/project/mozart-oz/v1/1.4.0-2008-07-02-tar/${MY_P}-doc.tar.gz
 )"
 
 SLOT="0"
 LICENSE="Mozart"

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart-stdlib/files/

2016-11-06 Thread David Seifert 
commit: 79d0d005fcef8fc765dc2615663502fa1e7b67c6
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Sat Aug  6 15:01:29 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Nov  6 19:31:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79d0d005

dev-lang/mozart-stdlib: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/2167

Signed-off-by: David Seifert  gentoo.org>

 .../files/mozart-stdlib-1.3.2-doc.patch| 179 -
 .../files/mozart-stdlib-1.3.2-ozmake.patch |  78 -
 .../files/mozart-stdlib-1.3.2-r1-ozmake.patch  |  78 -
 3 files changed, 335 deletions(-)

diff --git a/dev-lang/mozart-stdlib/files/mozart-stdlib-1.3.2-doc.patch 
b/dev-lang/mozart-stdlib/files/mozart-stdlib-1.3.2-doc.patch
deleted file mode 100644
index 1752bb9..
--- a/dev-lang/mozart-stdlib/files/mozart-stdlib-1.3.2-doc.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-diff -ur mozart-1.3.2.20060615-std.orig/adt/makefile.oz 
mozart-1.3.2.20060615-std/adt/makefile.oz
 mozart-1.3.2.20060615-std.orig/adt/makefile.oz 2004-05-19 
11:40:35.0 +1200
-+++ mozart-1.3.2.20060615-std/adt/makefile.oz  2007-02-17 12:29:43.0 
+1300
-@@ -4,14 +4,5 @@
- 'Dictionary.ozf' 'Cell.ozf'
- %%'Generator.ozf'
-]
--   doc : [
--'index.html'
--'cell.html'
--'counter.html'
--'dictionary.html'
--%%'generator.html'
--'queue.html'
--'stack.html'
--]
- 
-)
-diff -ur mozart-1.3.2.20060615-std.orig/makefile.oz 
mozart-1.3.2.20060615-std/makefile.oz
 mozart-1.3.2.20060615-std.orig/makefile.oz 2004-05-19 20:05:19.0 
+1200
-+++ mozart-1.3.2.20060615-std/makefile.oz  2007-02-17 12:29:25.0 
+1300
-@@ -10,12 +10,4 @@
-'os'
-'net'
-   ]
--   doc: [
--   'index.html'
--   'ozdoc.css'
--   'page.gif'
-- 'string.html'
-- 'mapping.html'
-- 'generator.html'
--  ]
-)
-diff -ur mozart-1.3.2.20060615-std.orig/net/makefile.oz 
mozart-1.3.2.20060615-std/net/makefile.oz
 mozart-1.3.2.20060615-std.orig/net/makefile.oz 2004-05-18 
11:33:41.0 +1200
-+++ mozart-1.3.2.20060615-std/net/makefile.oz  2007-02-17 12:29:54.0 
+1300
-@@ -1,4 +1,3 @@
- makefile(
-lib : ['URL.ozf']
--   doc : ['index.html' 'url.html']
-)
-\ No newline at end of file
-diff -ur mozart-1.3.2.20060615-std.orig/os/makefile.oz 
mozart-1.3.2.20060615-std/os/makefile.oz
 mozart-1.3.2.20060615-std.orig/os/makefile.oz  2004-05-18 
11:33:41.0 +1200
-+++ mozart-1.3.2.20060615-std/os/makefile.oz   2007-02-17 12:30:07.0 
+1300
-@@ -1,4 +1,3 @@
- makefile(
-lib : ['Path.ozf' 'Shell.ozf']
--   doc : ['index.html' 'path.html' 'shell.html']
-)
-diff -ur mozart-1.3.2.20060615-std.orig/wp/makefile.oz 
mozart-1.3.2.20060615-std/wp/makefile.oz
 mozart-1.3.2.20060615-std.orig/wp/makefile.oz  2004-05-18 
11:33:41.0 +1200
-+++ mozart-1.3.2.20060615-std/wp/makefile.oz   2007-02-17 12:30:24.0 
+1300
-@@ -2,5 +2,4 @@
-subdirs : ['qtk'
- %'qhtml'
-]
--   doc : ['index.html']
-)
-diff -ur mozart-1.3.2.20060615-std.orig/wp/qtk/makefile.oz 
mozart-1.3.2.20060615-std/wp/qtk/makefile.oz
 mozart-1.3.2.20060615-std.orig/wp/qtk/makefile.oz  2004-02-28 
03:05:22.0 +1300
-+++ mozart-1.3.2.20060615-std/wp/qtk/makefile.oz   2007-02-17 
12:31:29.0 +1300
-@@ -117,96 +117,4 @@
-%%src : ['QTk.ozf' 'QTkDevel.ozf' 'QTkBare.ozf']
-rules   : o(
-   'QTk.ozf' : ozl('QTkBare.ozf'))
--   doc : ['html/button.gif'
--'html/bwoz1.gif'
--'html/canvas.gif'
--'html/checkbutton.gif'
--'html/color.gif'
--'html/dropdownlistbox.gif'
--'html/entry.gif'
--'html/grid.gif'
--'html/index.html'
--'html/label.gif'
--'html/line.gif'
--'html/listbox.gif'
--'html/listcont.oz'
--'html/load.gif'
--'html/menubutton.gif'
--'html/message.gif'
--'html/node1.html'
--'html/node10.html'
--'html/node11.html'
--'html/node12.html'
--'html/node13.html'
--'html/node14.html'
--'html/node15.html'
--'html/node16.html'
--'html/node17.html'
--'html/node18.html'
--'html/node19.html'
--'html/node2.html'
--'html/node20.html'
--'html/node21.html'
--'html/node22.html'
--'html/node23.html'
--'html/node24.html'
--'html/node25.html'
--'html/node26.html'
--'html/node27.html'
--'html/node28.html'
--'html/node29.html'
--

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart/

2015-11-11 Thread Justin Lecher 
commit: 67c9d7700ff53e418a14ecc8683590c3f28d1567
Author: Justin Lecher  gentoo  org>
AuthorDate: Wed Nov 11 10:49:00 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Wed Nov 11 11:35:20 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67c9d770

dev-lang/mozart: Drop old

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 dev-lang/mozart/metadata.xml   |   8 +-
 dev-lang/mozart/mozart-1.4.0-r2.ebuild | 131 -
 2 files changed, 4 insertions(+), 135 deletions(-)

diff --git a/dev-lang/mozart/metadata.xml b/dev-lang/mozart/metadata.xml
index b60aa8b..f3395b7 100644
--- a/dev-lang/mozart/metadata.xml
+++ b/dev-lang/mozart/metadata.xml
@@ -1,8 +1,8 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
-  k...@gentoo.org
-  Keri Harris
-
+  
+k...@gentoo.org
+Keri Harris
+  
 

diff --git a/dev-lang/mozart/mozart-1.4.0-r2.ebuild 
b/dev-lang/mozart/mozart-1.4.0-r2.ebuild
deleted file mode 100644
index c6c8428..000
--- a/dev-lang/mozart/mozart-1.4.0-r2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-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 || 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
-
-   if use examples; then
-   cd "${S}"/share
-   insinto /usr/share/doc/${PF}/examples
-   doins -r examples/* || die
-   doins -r demo/* || die
-   rm -rf $(find "${D}"/usr/share/doc/${PF}/examples \
-   -name Makefile -o -name

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart/

2015-11-11 Thread Justin Lecher 
commit: 572a3bc152e387a815f4b0c939b1fe304c200d28
Author: Justin Lecher  gentoo  org>
AuthorDate: Wed Nov 11 10:52:15 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Wed Nov 11 11:35:20 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=572a3bc1

dev-lang/mozart: Set slot operators

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 dev-lang/mozart/mozart-1.4.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/mozart/mozart-1.4.0-r3.ebuild 
b/dev-lang/mozart/mozart-1.4.0-r3.ebuild
index 27cdfcc..de7783d 100644
--- a/dev-lang/mozart/mozart-1.4.0-r3.ebuild
+++ b/dev-lang/mozart/mozart-1.4.0-r3.ebuild
@@ -23,7 +23,7 @@ IUSE="doc emacs examples gdbm static tcl threads tk"
 
 RDEPEND="
dev-lang/perl
-   dev-libs/gmp
+   dev-libs/gmp:0=
sys-libs/zlib
emacs? ( virtual/emacs )
gdbm? ( sys-libs/gdbm  )

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart/

2015-11-11 Thread Agostino Sarubbo 
commit: 4f1770c47f320563633e89f18195129348f71346
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Nov 11 10:38:57 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Nov 11 10:38:57 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f1770c4

dev-lang/mozart: x86 stable wrt bug #548688

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"

 dev-lang/mozart/mozart-1.4.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/mozart/mozart-1.4.0-r3.ebuild 
b/dev-lang/mozart/mozart-1.4.0-r3.ebuild
index 00a81c5..27cdfcc 100644
--- a/dev-lang/mozart/mozart-1.4.0-r3.ebuild
+++ b/dev-lang/mozart/mozart-1.4.0-r3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="Mozart"
-KEYWORDS="-amd64 ppc -ppc64 ~x86"
+KEYWORDS="-amd64 ppc -ppc64 x86"
 IUSE="doc emacs examples gdbm static tcl threads tk"
 
 RDEPEND="