Version bump. Remove old.

Package-Manager: portage-2.1.9.42/cvs/Linux i686

8 files changed, 63 insertions, 189 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/Manifest b/sci-mathematics/spin/Manifest
index 38bbb8c7181d..49792560a52a 100644
--- a/sci-mathematics/spin/Manifest
+++ b/sci-mathematics/spin/Manifest
@@ -2,21 +2,16 @@
 Hash: SHA1
 
 AUX spin-6.0.1-makefile.patch 799 RMD160 abbaa74f452a7048e3370678182a559b52175b3c SHA1 4b160cb898deedb2ca0bb154d225e83dc2e61235 SHA256 20060fa1644f2633d99fb5a66cffdfc23f8c86f33bd63bf72aa9af3fe8912726
-AUX spin-font-size.patch 1835 RMD160 13697e0a69dbd16d5bdd22d485eea9569e6c6fd5 SHA1 193d5d48525426bb445bd1751cc733b5ab53400f SHA256 18a9646b43c47d44c96676e111874c73685c98a42aebfc8ea3958c8501143aad
-AUX spin-makefile.patch 811 RMD160 1332042461d816b8dd1413c5a1af1b3211dd56ba SHA1 9a0c62d13a086d20583cfe6c6304e75dff6608f0 SHA256 92bfbea9e9ec38ddddebae9d918d1d4e523ab78a8a513eb018d96d54c5337611
-AUX spin-xspin-r1.patch 916 RMD160 8bf4ee6d5243595907c52159b78a2f27d36500f8 SHA1 13c68d388fbf23eb985f021c9ebc2cf5d2dd1039 SHA256 fc9c22128697f93e68b1d0aad586fcdfc13a02fea11801bf826bd7c08899b2c5
-AUX spin-xspin.patch 922 RMD160 f43706719dc0b9028d1cb2b021e2c946af40fc28 SHA1 3a41da3936d394a22a6adca66b02d82497f2f57f SHA256 f2ef6bf2286a8727eae81fc963609e12de2d80be0bbcb0857445db9f8ba0655c
-DIST spin525.tar.gz 413406 RMD160 8d01f8dd0da8c8013fbb8c6d6e9a8c40b8c5f33f SHA1 274649628c0c8ae3414b863c27a1b8d98a8e9921 SHA256 60e6ac1a10e7f543634e99d69d33a8bb03ea85c4251de67824e89826e1955360
 DIST spin601.tar.gz 418700 RMD160 ad47349b38b9a0a0e61a82cf0be4287a83576ef7 SHA1 bf932341d121ebb79b78bb2697e07dba6fa0d16d SHA256 83ca4695f76b66bda9db326fa543bafa1cc1af5f5e2bcbd122e3887605fdf3b9
-DIST xspin525.tcl 194845 RMD160 26d85188070286739019405d49d3a2bd07545f90 SHA1 8166ccc6830f052e31162bec618c17452a988b5d SHA256 e23d8d562e39db6fe73570e52ee895cd806d15c3e52e638299cbc1eb61289eb6
-EBUILD spin-5.2.5-r1.ebuild 1339 RMD160 01af4fe841e0d45c4252d19a541c63d588ad3541 SHA1 3fc6396696d9948b8643201132deac847d52a437 SHA256 8831d251d1f718aea9a2943053f11c4e5de2d6ae3e9e0527711f33eb4e8a6941
+DIST spin610.tar.gz 423663 RMD160 e974118fac314e4ac8025f534d6c4cd2bf40f80e SHA1 a27b04014e149e687a59e0722007baf820101ef2 SHA256 eff1bd93013ab3726a2c2ca684be22b9b90d64db6fa4a9d5d555235ff17ebfa6
 EBUILD spin-6.0.1.ebuild 1045 RMD160 c5ee70510b0f5414f777e97bd19dda70a2755c53 SHA1 596c8aafd40a12a33f87ebf173f24cd3a2d89750 SHA256 2c7d7fb853473d2d794deb9dc2561d72cd561c8cabfaf34cce94649b8d298013
-MISC ChangeLog 1287 RMD160 6de526b37c8a6c7fc540a5104c129a392f14a7c1 SHA1 750bd32c16e70cabb392006a32f634d2833e8ca9 SHA256 3a8de87b6bb5a4e8005eaf40fed7356cef52d4e9835a00b113104cefc57e7418
+EBUILD spin-6.1.0.ebuild 1047 RMD160 7e657700f425d5b2350851dfeb84f4996456970d SHA1 18762db672bd4d37e4326efd3c2a659e42b62c5a SHA256 aa006cb1073f9bf1ed38c76bc80209d3e6647b06f2e82d94491d1b83debd5373
+MISC ChangeLog 1559 RMD160 c4b27b7fdda7e78a40c7bbdb2f40ddc0a183ad8c SHA1 3641930f56a5dbf1f067563ffdf6288ad7923d26 SHA256 9c8ef352dd58f8425618b64c250c468fed6e7d81b791cb0c18059aa08d6951d7
 MISC metadata.xml 260 RMD160 e9437033b7df4bdb32fdef6e886a1ed321a6f462 SHA1 f008d84bacf2428dafd6f33263898961dacf8c5e SHA256 c7f8354174de834aa476ee81d3412d85e1352a6647415dbeee403461b99ea19c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk0jtToACgkQ9/cejkQaxBCv7ACeIxVUT2QraZFMmfoEZfLaz7aZ
-SNMAnAjQqU2bNNR45BPH8iAkyPPqTII9
-=/FiQ
+iEYEARECAAYFAk3ChvgACgkQuUQtlDBCeQJUlACfUrJ+dpcPEFrQtBOG33Nm1M4f
+qa4An1Gi6EZ54+sK/iE2vkKWWxYKehtz
+=VR0Z
 -----END PGP SIGNATURE-----
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
+}