diff options
author | George Shapovalov <george@gentoo.org> | 2006-04-11 13:34:41 +0000 |
---|---|---|
committer | George Shapovalov <george@gentoo.org> | 2006-04-11 13:34:41 +0000 |
commit | 3c8d9bea14b5515c30f8d0321ebc7f5ee20bbb8b (patch) | |
tree | 3f701146aa7a36e38bd6962130c8ca592f39c6be /dev-lang | |
parent | grammar fix (diff) | |
download | gentoo-2-3c8d9bea14b5515c30f8d0321ebc7f5ee20bbb8b.tar.gz gentoo-2-3c8d9bea14b5515c30f8d0321ebc7f5ee20bbb8b.tar.bz2 gentoo-2-3c8d9bea14b5515c30f8d0321ebc7f5ee20bbb8b.zip |
added fixes for the test failures, reenabled experimental features (now fixed). #125258
(Portage version: 2.1_pre7-r5)
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/icon/ChangeLog | 9 | ||||
-rw-r--r-- | dev-lang/icon/Manifest | 9 | ||||
-rw-r--r-- | dev-lang/icon/files/digest-icon-9.4.3-r2 | 3 | ||||
-rw-r--r-- | dev-lang/icon/files/tests-943.patch | 113 | ||||
-rw-r--r-- | dev-lang/icon/icon-9.4.3-r2.ebuild | 103 |
5 files changed, 236 insertions, 1 deletions
diff --git a/dev-lang/icon/ChangeLog b/dev-lang/icon/ChangeLog index 32a1b38e909a..2a70b69f426b 100644 --- a/dev-lang/icon/ChangeLog +++ b/dev-lang/icon/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-lang/icon # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/ChangeLog,v 1.15 2006/04/01 12:25:04 george Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/ChangeLog,v 1.16 2006/04/11 13:34:41 george Exp $ + +*icon-9.4.3-r2 (11 Apr 2006) + + 11 Apr 2006; George Shapovalov <george@gentoo.org> +files/tests-943.patch, + +icon-9.4.3-r2.ebuild: + bug #125258 added fixes for the test failures, reenabled experimental + features (now fixed). Thanks to Cheyenne Wills for supplying patches 01 Apr 2006; George Shapovalov <george@gentoo.org> icon-9.40.ebuild: removed sparc and ~amd64 from 9.40, will mask when 9.4.3 is stabilized on x86 diff --git a/dev-lang/icon/Manifest b/dev-lang/icon/Manifest index 9633168c1a67..c223e11931e8 100644 --- a/dev-lang/icon/Manifest +++ b/dev-lang/icon/Manifest @@ -10,18 +10,27 @@ SHA256 70ceab069bacd89f913d62869149c22b860e484c7847b10d9597d39ea2fca072 files/di MD5 16e13028a4cb899cda6a782e1aeeeccc files/digest-icon-9.4.3-r1 232 RMD160 a63469f5369548d2649151af4a45eaa802d38603 files/digest-icon-9.4.3-r1 232 SHA256 70ceab069bacd89f913d62869149c22b860e484c7847b10d9597d39ea2fca072 files/digest-icon-9.4.3-r1 232 +MD5 16e13028a4cb899cda6a782e1aeeeccc files/digest-icon-9.4.3-r2 232 +RMD160 a63469f5369548d2649151af4a45eaa802d38603 files/digest-icon-9.4.3-r2 232 +SHA256 70ceab069bacd89f913d62869149c22b860e484c7847b10d9597d39ea2fca072 files/digest-icon-9.4.3-r2 232 MD5 abd61a0d7e185c2ac47a4539c79e5d0c files/digest-icon-9.40 62 RMD160 170931a9b20968b692cc5ba73fcc037720a3e4c3 files/digest-icon-9.40 62 SHA256 61bb5137f780d69d53c6a06338e4f3d1bcfb7b78d927c0766bde211987adf012 files/digest-icon-9.40 62 MD5 fadf61644e614aee6ca9af4533791738 files/icon-9.40-gentoo.diff 244 RMD160 05b871d84906131aa6fb11d765271c1a22b66390 files/icon-9.40-gentoo.diff 244 SHA256 08d180626d40a7eddf76b6790164e01fb81762c35a491789e06ee560279c65f1 files/icon-9.40-gentoo.diff 244 +MD5 819f06e1fb8a7efc66644e10cd6b3786 files/tests-943.patch 3643 +RMD160 80bbfd6cb8a15ba6c40997a9db74e67b5245d635 files/tests-943.patch 3643 +SHA256 78222584fab1d1906baceca5cc950deb3458493cdc553f7f00def395af174900 files/tests-943.patch 3643 MD5 a7105bfe916d7df666490650aa3f6772 icon-9.4.2.ebuild 1446 RMD160 df1ba8be8d22343f404abda0dded68119e05ab2d icon-9.4.2.ebuild 1446 SHA256 3e2f0091f720234fd143308d2f1e5e46b78dba7b5e82443df267e351452c55e6 icon-9.4.2.ebuild 1446 MD5 4f54b2a37fe5377df96c30550cdee651 icon-9.4.3-r1.ebuild 2215 RMD160 3e9b53349cef6fe65c53337e3bd15c2d9563d4cf icon-9.4.3-r1.ebuild 2215 SHA256 9dddf2a7514e4f6de856037359a91378ec5084286e0aed11fabe33027251b20d icon-9.4.3-r1.ebuild 2215 +MD5 8270fe832700b657002682aa98adf6e1 icon-9.4.3-r2.ebuild 2422 +RMD160 3c18188cfc195f239a6d8a957223d940eee25720 icon-9.4.3-r2.ebuild 2422 +SHA256 0a2feee455652b3258e2a0b16d0450c6148e7630f0879a98a9f7d8d438eab913 icon-9.4.3-r2.ebuild 2422 MD5 5b28c24fdbd6f0931dad3c51d4415dc3 icon-9.4.3.ebuild 2335 RMD160 5243b748d03f0d92aae49053d775999c16762102 icon-9.4.3.ebuild 2335 SHA256 8c53710d665c3b53b341b4afcec409f661171ecb699f42677c88cafcbea85518 icon-9.4.3.ebuild 2335 diff --git a/dev-lang/icon/files/digest-icon-9.4.3-r2 b/dev-lang/icon/files/digest-icon-9.4.3-r2 new file mode 100644 index 000000000000..6a213e1b39ee --- /dev/null +++ b/dev-lang/icon/files/digest-icon-9.4.3-r2 @@ -0,0 +1,3 @@ +MD5 4740b1fc5caf2fe7409367923dffe607 icon.v943src.tgz 3218627 +RMD160 af75af7f106920cd59a7f8ac85954aa472ae78e7 icon.v943src.tgz 3218627 +SHA256 d6b6dc508922251748c4ceefbc3a96b54a9f488e260f9f517b5e08dc21615bff icon.v943src.tgz 3218627 diff --git a/dev-lang/icon/files/tests-943.patch b/dev-lang/icon/files/tests-943.patch new file mode 100644 index 000000000000..75108cab1936 --- /dev/null +++ b/dev-lang/icon/files/tests-943.patch @@ -0,0 +1,113 @@ +diff -uprN icon.v943src_base/tests/general/io.icn icon.v943src/tests/general/io.icn +--- icon.v943src_base/tests/general/io.icn 2002-03-11 14:21:18.000000000 -0700 ++++ icon.v943src/tests/general/io.icn 2006-04-01 10:35:14.590948251 -0700 +@@ -6,7 +6,7 @@ procedure main() + local L, f, m, n, t1, t2 + + L := [&input, &output, &errout, +- m := open("/etc/motd") | stop("no /etc/motd"), ++ m := open("/etc/gentoo-release") | stop("no /etc/gentoo-release"), + n := open("/dev/null", "w") | stop("no /dev/null")] + L := sort(L) + every f := !L do +@@ -21,10 +21,10 @@ procedure main() + every write(!&input) \ 2 + + write() +- write("flush /etc/motd: ", image(flush(m)) | "FAILED") +- write("close /etc/motd: ", image(close(m)) | "FAILED") +- write("close /etc/motd: ", image(close(m)) | "FAILED") +- write("flush /etc/motd: ", image(flush(m)) | "FAILED") ++ write("flush /etc/gentoo-release: ", image(flush(m)) | "FAILED") ++ write("close /etc/gentoo-release: ", image(close(m)) | "FAILED") ++ write("close /etc/gentoo-release: ", image(close(m)) | "FAILED") ++ write("flush /etc/gentoo-release: ", image(flush(m)) | "FAILED") + + write() + write("flush /dev/null: ", image(flush(n)) | "FAILED") +diff -uprN icon.v943src_base/tests/general/io.std icon.v943src/tests/general/io.std +--- icon.v943src_base/tests/general/io.std 2002-03-11 14:21:18.000000000 -0700 ++++ icon.v943src/tests/general/io.std 2006-04-01 10:35:31.071362086 -0700 +@@ -2,7 +2,7 @@ file: &errout + file: &input + file: &output + file: file(/dev/null) +-file: file(/etc/motd) ++file: file(/etc/gentoo-release) + + aaa + bbbb +@@ -13,10 +13,10 @@ ffffffff + ggggggggg + hhhhhhhhhh + +-flush /etc/motd: file(/etc/motd) +-close /etc/motd: file(/etc/motd) +-close /etc/motd: file(/etc/motd) +-flush /etc/motd: file(/etc/motd) ++flush /etc/gentoo-release: file(/etc/gentoo-release) ++close /etc/gentoo-release: file(/etc/gentoo-release) ++close /etc/gentoo-release: file(/etc/gentoo-release) ++flush /etc/gentoo-release: file(/etc/gentoo-release) + + flush /dev/null: file(/dev/null) + close /dev/null: file(/dev/null) +@@ -109,7 +109,7 @@ file(sed 's/^/=()= /' io.icn) + > =()= local L, f, m, n, t1, t2 + > =()= + > =()= L := [&input, &output, &errout, +-> =()= m := open("/etc/motd") | stop("no /etc/motd"), ++> =()= m := open("/etc/gentoo-release") | stop("no /etc/gentoo-release"), + > =()= n := open("/dev/null", "w") | stop("no /dev/null")] + + file(ls io.i?n io.d?t io.s?d) +diff -uprN icon.v943src_base/tests/general/kwds.std icon.v943src/tests/general/kwds.std +--- icon.v943src_base/tests/general/kwds.std 2002-07-10 18:29:28.000000000 -0600 ++++ icon.v943src/tests/general/kwds.std 2006-04-01 10:35:37.103317654 -0700 +@@ -20,8 +20,10 @@ + &features: ASCII + &features: co-expressions + &features: environment variables ++ &features: event monitoring + &features: keyboard functions + &features: large integers ++ &features: multiple programs + &features: pipes + &features: system function + &input: &input +diff -uprN icon.v943src_base/tests/general/nargs.std icon.v943src/tests/general/nargs.std +--- icon.v943src_base/tests/general/nargs.std 2001-12-06 15:54:01.000000000 -0700 ++++ icon.v943src/tests/general/nargs.std 2006-04-01 10:35:43.282223496 -0700 +@@ -15,7 +15,7 @@ + 1 delay + 2 delete + -2 detab +- 2 display ++ 3 display + 1 dtor + -2 entab + 0 errorclear +@@ -43,12 +43,12 @@ + 4 match + 2 member + 1 move +- 1 name ++ 2 name + 1 numeric + 1 ord + 1 pop + 1 pos +- 2 proc ++ 3 proc + 1 pull + -2 push + -2 put +@@ -79,7 +79,7 @@ + 2 trim + 1 type + 4 upto +- 1 variable ++ 3 variable + 1 where + -1 write + -1 writes diff --git a/dev-lang/icon/icon-9.4.3-r2.ebuild b/dev-lang/icon/icon-9.4.3-r2.ebuild new file mode 100644 index 000000000000..d360969c979e --- /dev/null +++ b/dev-lang/icon/icon-9.4.3-r2.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/icon-9.4.3-r2.ebuild,v 1.1 2006/04/11 13:34:41 george Exp $ + +inherit eutils + +MY_PV=${PV//./} +SRC_URI="http://www.cs.arizona.edu/icon/ftp/packages/unix/icon.v${MY_PV}src.tgz" +HOMEPAGE="http://www.cs.arizona.edu/icon/" +DESCRIPTION="very high level language" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc-macos ~sparc ~x86" +IUSE="X iplsrc" + +S=${WORKDIR}/icon.v${MY_PV}src + +DEPEND="X? ( || ( + ( x11-proto/xextproto + x11-proto/xproto + x11-libs/libX11 + x11-libs/libXpm + x11-libs/libXt ) + virtual/x11 ) + ) + sys-devel/gcc" + +src_unpack() { + unpack ${A} + + # Patch the tests so that they do not fail + # The following files in tests/standard are patched.. + # io.icn - change /etc/motd to /etc/gentoo-release + # io.std - change /etc/motd to /etc/gentoo-release + # kwds.std - add two lines for the two new added keywords + # nargs.std - a couple of functions picked up additional parameters + epatch "${FILESDIR}/tests-${MY_PV}.patch" +} + +src_compile() { + # select the right compile target. Note there are many platforms + # available + local mytarget; + if use ppc-macos; then + mytarget="ppc_macos" + else + mytarget="linux" + fi + + if use X; then + emake X-Configure name=${mytarget} -j1 || die + else + emake Configure name=${mytarget} -j1 || die + fi + + echo "#define MultiThread 1" >> src/h/define.h + echo "#define EventMon 1" >> src/h/define.h + echo "#define Eve 1" >> src/h/define.h + + emake -j1 || die "Make Failed" +} + +src_test() { + make Samples || die "Samples failed" + make Test || die "Test failed" +} + +src_install() { + dodir /usr + dodir /usr/bin + dodir /usr/lib + + make Install dest="${D}/usr/lib/icon" || die "Make install failed" + dosym /usr/lib/icon/bin/icont /usr/bin/icont + dosym /usr/lib/icon/bin/iconx /usr/bin/iconx + dosym /usr/lib/icon/bin/icon /usr/bin/icon + dosym /usr/lib/icon/bin/vib /usr/bin/vib + + cd "${S}/man/man1" + doman icont.1 + doman icon.1 + rm -rf ${D}/usr/lib/icon/man + + cd "${S}/doc" + dodoc *.txt *.sed ../README + # dohtml ignores all anything except .html files, no use here + mkdir -p ${D}/usr/share/doc/${PF}/html + cp -dpR *.htm *.gif *.jpg *.css ${D}/usr/share/doc/${PF}/html + rm -rf ${D}/usr/lib/icon/{doc,README} + + # optional Icon Programming Library + if use iplsrc; then + cd "${S}" + dodir /usr/lib/icon/ipl + rm ipl/BuildBin + rm ipl/BuildExe + rm ipl/CheckAll + rm ipl/Makefile + insinto /usr/lib/icon + doins -r ipl + fi +} |