diff options
author | Paweł Hajdan <phajdan.jr@gentoo.org> | 2011-05-05 11:16:03 +0000 |
---|---|---|
committer | Paweł Hajdan <phajdan.jr@gentoo.org> | 2011-05-05 11:16:03 +0000 |
commit | 4a433adde535fe8fde96b07cac631e26265c0ca1 (patch) | |
tree | 73c597da25ec6b221300bddfe970368bb1cbe806 /sci-mathematics | |
parent | x86 stable wrt bug #365885 (diff) | |
download | gentoo-2-4a433adde535fe8fde96b07cac631e26265c0ca1.tar.gz gentoo-2-4a433adde535fe8fde96b07cac631e26265c0ca1.tar.bz2 gentoo-2-4a433adde535fe8fde96b07cac631e26265c0ca1.zip |
Version bump. Remove old.
(Portage version: 2.1.9.42/cvs/Linux i686)
Diffstat (limited to 'sci-mathematics')
-rw-r--r-- | sci-mathematics/spin/ChangeLog | 10 | ||||
-rw-r--r-- | sci-mathematics/spin/files/spin-font-size.patch | 47 | ||||
-rw-r--r-- | sci-mathematics/spin/files/spin-makefile.patch | 22 | ||||
-rw-r--r-- | sci-mathematics/spin/files/spin-xspin-r1.patch | 26 | ||||
-rw-r--r-- | sci-mathematics/spin/files/spin-xspin.patch | 26 | ||||
-rw-r--r-- | sci-mathematics/spin/spin-5.2.5-r1.ebuild | 55 | ||||
-rw-r--r-- | sci-mathematics/spin/spin-6.1.0.ebuild | 47 |
7 files changed, 56 insertions, 177 deletions
diff --git a/sci-mathematics/spin/ChangeLog b/sci-mathematics/spin/ChangeLog index a5c62b276575..83024ea6dbee 100644 --- a/sci-mathematics/spin/ChangeLog +++ b/sci-mathematics/spin/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sci-mathematics/spin # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/spin/ChangeLog,v 1.6 2011/01/05 00:04:13 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/spin/ChangeLog,v 1.7 2011/05/05 11:16:02 phajdan.jr Exp $ + +*spin-6.1.0 (05 May 2011) + + 05 May 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> + -spin-5.2.5-r1.ebuild, +spin-6.1.0.ebuild, -files/spin-font-size.patch, + -files/spin-makefile.patch, -files/spin-xspin.patch, + -files/spin-xspin-r1.patch: + Version bump. Remove old. 05 Jan 2011; Markos Chandras <hwoarang@gentoo.org> spin-5.2.5-r1.ebuild, spin-6.0.1.ebuild: diff --git a/sci-mathematics/spin/files/spin-font-size.patch b/sci-mathematics/spin/files/spin-font-size.patch deleted file mode 100644 index 25ba5f08bd25..000000000000 --- a/sci-mathematics/spin/files/spin-font-size.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- xspin.tcl.orig 2010-06-11 16:29:55.000000000 +0200 -+++ xspin.tcl 2010-06-22 19:43:37.000000000 +0200 -@@ -82,7 +82,7 @@ - - #-- GUI configuration options - by Leszek Holenderski <lhol@win.tue.nl> - #-- basic text size: -- set HelvBig -Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-* -+ set HelvBig -Adobe-Helvetica-Medium-R-Normal--*-80-*-*-*-*-*-* - # mscs: - if {$NT} { ;# on a windows nt machine - set SmallFont "-*-Courier-Bold-R-Normal--*-110-*" -@@ -157,7 +157,7 @@ - #--- fonts - # fonts for the input/log area (default is system dependent, - # usually -*-Courier-Medium-R-Normal--*-120-*) --option add *Input*Text.font -*-Helvetica-Medium-R-Normal--*-120-* startupFile -+option add *Input*Text.font -*-Helvetica-Medium-R-Normal--*-80-* startupFile - #option add *Input*Text.font -schumacher-clean-medium-r-normal--*-120-*-60-* startupFile - #option add *Log*Text.font -schumacher-clean-medium-r-normal--*-120-*-60-* startupFile - -@@ -168,7 +168,7 @@ - option add *SimpleText.Text.background white - - # sections (decorated frames for grouping related buttons) -- option add *Section*Title.font -*-Helvetica-Bold-R-Normal--*-100-* startupFile -+ option add *Section*Title.font -*-Helvetica-Bold-R-Normal--*-60-* startupFile - - #option add *Section*Checkbutton.font -*-Helvetica-Medium-R-Normal--*-100-* startupFile - #option add *Section*Radiobutton.font -*-Helvetica-Medium-R-Normal--*-100-* startupFile -@@ -480,7 +480,7 @@ - .menu.edit.m add command -label "Paste" \ - -command {tk_textPaste .inp.t} - --set FSz 110 -+set FSz 80 - - menu .menu.view.m - .menu.view.m add command -label "Larger" \ -@@ -491,7 +491,7 @@ - } - .menu.view.m add command -label "Default text size" \ - -command { -- set FSz 110 -+ set FSz 80 - set HelvBig "-Adobe-Helvetica-Medium-R-Normal--*-$FSz-*-*-*-*-*-*" - .inp.t configure -font $HelvBig - } diff --git a/sci-mathematics/spin/files/spin-makefile.patch b/sci-mathematics/spin/files/spin-makefile.patch deleted file mode 100644 index 4f4c6dd12fc5..000000000000 --- a/sci-mathematics/spin/files/spin-makefile.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- makefile.orig 2010-10-12 13:13:59.000000000 +0200 -+++ makefile 2010-10-12 13:15:19.000000000 +0200 -@@ -10,10 +10,6 @@ - # Documentation: http://spinroot.com/ - # Bug-reports: bugs@spinroot.com - --CC=gcc -DNXT # -DNXT enables the X operator in LTL --# CC=cc -m32 -DNXT # for 32bit compilation on a 64bit system --CFLAGS=-ansi -D_POSIX_SOURCE -Wno-format-security # on some systems add: -I/usr/include -- - # for a more picky compilation: - # CFLAGS=-std=c99 -Wstrict-prototypes -pedantic -fno-strength-reduce -fno-builtin -W -Wshadow -Wpointer-arith -Wcast-qual -Winline -Wall -g - -@@ -37,7 +33,7 @@ - tl_mem.o tl_rewrt.o tl_cache.o - - spin: $(SPIN_OS) $(TL_OS) -- $(CC) $(CFLAGS) -o spin $(SPIN_OS) $(TL_OS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o spin $(SPIN_OS) $(TL_OS) - - spin.o: spin.y - $(YACC) $(YFLAGS) spin.y diff --git a/sci-mathematics/spin/files/spin-xspin-r1.patch b/sci-mathematics/spin/files/spin-xspin-r1.patch deleted file mode 100644 index 7606fa55a787..000000000000 --- a/sci-mathematics/spin/files/spin-xspin-r1.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- xspin.tcl.orig 2010-04-03 12:26:48.000000000 +0200 -+++ xspin.tcl 2010-04-03 12:27:26.000000000 +0200 -@@ -1,22 +1,4 @@ --#!/bin/sh --# the next line restarts using wish \ --exec wish c:/cygwin/bin/xspin -- $* -- --# cd ;# enable to cd to home directory by default -- --# on PCs: --# adjust the first argument to wish above with the name and --# location of this tcl/tk file on your system, if different. --# --# Cygwin: --# if you use cygwin, do not refer to the file as /usr/bin/xspin --# /usr/bin is a symbolic link to /bin, which really --# lives in c:/cygwin, hence the contortions above --# --# on Unix/Linux/Solaris systems --# replace the first line with something like --# #!/usr/bin/wish -f --# using the pathname for the wish executable on your system -+#!/usr/bin/wish -f - - #======================================================================# - # Tcl/Tk Spin Controller, written by Gerard J. Holzmann, 1995-2009. # diff --git a/sci-mathematics/spin/files/spin-xspin.patch b/sci-mathematics/spin/files/spin-xspin.patch deleted file mode 100644 index 72b6f36acd3b..000000000000 --- a/sci-mathematics/spin/files/spin-xspin.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- xspin523.tcl.orig 2010-04-03 12:26:48.000000000 +0200 -+++ xspin523.tcl 2010-04-03 12:27:26.000000000 +0200 -@@ -1,22 +1,4 @@ --#!/bin/sh --# the next line restarts using wish \ --exec wish c:/cygwin/bin/xspin -- $* -- --# cd ;# enable to cd to home directory by default -- --# on PCs: --# adjust the first argument to wish above with the name and --# location of this tcl/tk file on your system, if different. --# --# Cygwin: --# if you use cygwin, do not refer to the file as /usr/bin/xspin --# /usr/bin is a symbolic link to /bin, which really --# lives in c:/cygwin, hence the contortions above --# --# on Unix/Linux/Solaris systems --# replace the first line with something like --# #!/usr/bin/wish -f --# using the pathname for the wish executable on your system -+#!/usr/bin/wish -f - - #======================================================================# - # Tcl/Tk Spin Controller, written by Gerard J. Holzmann, 1995-2009. # diff --git a/sci-mathematics/spin/spin-5.2.5-r1.ebuild b/sci-mathematics/spin/spin-5.2.5-r1.ebuild deleted file mode 100644 index 7a98ed08e9f4..000000000000 --- a/sci-mathematics/spin/spin-5.2.5-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/spin/spin-5.2.5-r1.ebuild,v 1.2 2011/01/05 00:04:13 hwoarang Exp $ - -EAPI="2" - -inherit eutils versionator - -MY_PV=$(replace_all_version_separators '') -MY_P="${PN}${MY_PV}" - -DESCRIPTION="Tool for formal verification of distributed software systems." -HOMEPAGE="http://spinroot.com/" -SRC_URI="http://spinroot.com/spin/Src/${MY_P}.tar.gz - http://spinroot.com/spin/Src/xspin525.tcl" - -LICENSE="|| ( spin-commercial spin-educational )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="graphviz tk" - -DEPEND="sys-devel/bison" -RDEPEND="sys-devel/gcc - sys-process/time - tk? ( - dev-lang/tk - graphviz? ( media-gfx/graphviz ) - )" - -S="${WORKDIR}/Spin/Src${PV}" - -src_unpack() { - unpack "${MY_P}.tar.gz" - cp "${DISTDIR}/xspin525.tcl" "${S}/xspin.tcl" || die "cp failed" -} - -src_prepare() { - epatch "${FILESDIR}/${PN}-makefile.patch" - epatch "${FILESDIR}/${PN}-xspin-r1.patch" - epatch "${FILESDIR}/${PN}-font-size.patch" -} - -src_compile() { - emake -j1 || die "emake failed" -} - -src_install() { - dobin spin || die "dobin failed" - doman ../Man/spin.1 || die "doman failed" - dodoc ../Doc/* || die "dodoc failed" - if use tk; then - newbin xspin.tcl xspin || die "newbin failed" - make_desktop_entry xspin XSpin - fi -} diff --git a/sci-mathematics/spin/spin-6.1.0.ebuild b/sci-mathematics/spin/spin-6.1.0.ebuild new file mode 100644 index 000000000000..1fbd1fe8a6a1 --- /dev/null +++ b/sci-mathematics/spin/spin-6.1.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/spin/spin-6.1.0.ebuild,v 1.1 2011/05/05 11:16:02 phajdan.jr Exp $ + +EAPI="2" + +inherit eutils versionator + +MY_PV=$(replace_all_version_separators '') +MY_P="${PN}${MY_PV}" + +DESCRIPTION="Tool for formal verification of distributed software systems." +HOMEPAGE="http://spinroot.com/" +SRC_URI="http://spinroot.com/spin/Src/${MY_P}.tar.gz" + +LICENSE="|| ( spin-commercial spin-educational )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="graphviz tk" + +DEPEND="sys-devel/bison" +RDEPEND="sys-devel/gcc + sys-process/time + tk? ( + dev-lang/tk + graphviz? ( media-gfx/graphviz ) + )" + +S="${WORKDIR}/Spin/Src${PV}" + +src_prepare() { + epatch "${FILESDIR}/${PN}-6.0.1-makefile.patch" +} + +src_compile() { + emake -j1 || die +} + +src_install() { + dobin spin || die + doman ../Man/spin.1 || die + dodoc ../Doc/* || die + if use tk; then + newbin "${WORKDIR}/Spin/iSpin/ispin.tcl" ispin || die + make_desktop_entry ispin + fi +} |