Version bump. Remove old.

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

4 files changed, 46 insertions, 24 deletions

diff --git a/sci-mathematics/spin/ChangeLog b/sci-mathematics/spin/ChangeLog
index 83024ea6dbee..524d5080ecbd 100644
--- a/sci-mathematics/spin/ChangeLog
+++ b/sci-mathematics/spin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.7 2011/05/05 11:16:02 phajdan.jr Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/spin/ChangeLog,v 1.8 2012/05/21 13:05:22 phajdan.jr Exp $
+
+*spin-6.2.1 (21 May 2012)
+
+  21 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> -spin-6.0.1.ebuild,
+  +spin-6.2.1.ebuild, +files/spin-6.2.1-makefile.patch:
+  Version bump. Remove old.
 
 *spin-6.1.0 (05 May 2011)
 
diff --git a/sci-mathematics/spin/Manifest b/sci-mathematics/spin/Manifest
index af0df404ebb8..c458698e80ec 100644
--- a/sci-mathematics/spin/Manifest
+++ b/sci-mathematics/spin/Manifest
@@ -1,19 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX spin-6.0.1-makefile.patch 799 RMD160 abbaa74f452a7048e3370678182a559b52175b3c SHA1 4b160cb898deedb2ca0bb154d225e83dc2e61235 SHA256 20060fa1644f2633d99fb5a66cffdfc23f8c86f33bd63bf72aa9af3fe8912726
-DIST spin601.tar.gz 418700 RMD160 ad47349b38b9a0a0e61a82cf0be4287a83576ef7 SHA1 bf932341d121ebb79b78bb2697e07dba6fa0d16d SHA256 83ca4695f76b66bda9db326fa543bafa1cc1af5f5e2bcbd122e3887605fdf3b9
+AUX spin-6.2.1-makefile.patch 756 RMD160 94b79e1e43a064b67632a33296a60010fab2fd0c SHA1 b4af19df46edddec09304438da45cb10510fcf60 SHA256 befb05f5c54b6099399a0e125f79caa95be38f985deaaddb0e4012d4e47d5db5
 DIST spin610.tar.gz 423663 RMD160 e974118fac314e4ac8025f534d6c4cd2bf40f80e SHA1 a27b04014e149e687a59e0722007baf820101ef2 SHA256 eff1bd93013ab3726a2c2ca684be22b9b90d64db6fa4a9d5d555235ff17ebfa6
-EBUILD spin-6.0.1.ebuild 1045 RMD160 c5ee70510b0f5414f777e97bd19dda70a2755c53 SHA1 596c8aafd40a12a33f87ebf173f24cd3a2d89750 SHA256 2c7d7fb853473d2d794deb9dc2561d72cd561c8cabfaf34cce94649b8d298013
+DIST spin621.tar.gz 463101 RMD160 4ad183224d6a02504263208e285d9dc5a402f208 SHA1 b2a5f10ec931ef21b002ac51c44ae88eda390288 SHA256 2b3a9163e1bce4cb6402550819f6e190449e0e5aeb7b81630a017e130f7921cb
 EBUILD spin-6.1.0.ebuild 1047 RMD160 7e657700f425d5b2350851dfeb84f4996456970d SHA1 18762db672bd4d37e4326efd3c2a659e42b62c5a SHA256 aa006cb1073f9bf1ed38c76bc80209d3e6647b06f2e82d94491d1b83debd5373
-MISC ChangeLog 1559 RMD160 c4b27b7fdda7e78a40c7bbdb2f40ddc0a183ad8c SHA1 3641930f56a5dbf1f067563ffdf6288ad7923d26 SHA256 9c8ef352dd58f8425618b64c250c468fed6e7d81b791cb0c18059aa08d6951d7
+EBUILD spin-6.2.1.ebuild 982 RMD160 82f2ffa235bcd6b52d9f1eec1ed88fe43ec835f5 SHA1 18d77ba11ada4e9eaea4b9958fd44ad49a94dfd3 SHA256 86499d9eedf3422d12fdd350ea0ba90ecf479cfe7d60569a0e281f5c8ddcdfa4
+MISC ChangeLog 1746 RMD160 4d96a7ed8428b114ecb4bd8bb3d4181e7ee5513f SHA1 017d5db212ad83ef70efdebd4547d6f03683ee36 SHA256 eea7ebf102173ee54217f3e674bbb114dc1f5dd14c094eb23c425c9434aff6aa
 MISC metadata.xml 238 RMD160 7b2f4e44501d009fd9989fce9d632a7ebb1086e2 SHA1 1a0fbc7c1fa7486ec4660714cb96e9c86a22013a SHA256 f5bfe7b3171e6a50ad6d8fb7da8ae5c20f228d93ecaaef9beea6a72d34be799a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59sYcACgkQfXuS5UK5QB3FowP5AXGmbPeSsW0Uw1MNGwiEmciY
-meyj7w5IHjMirxB7xEaqL6+Xj0cM1sBZiug/3BXQRoLgzITG/Q95/1AuDrGUH5Ko
-Cp3/R95TM5sO84SA1tgml8P+4KWWcbC1H2QBMAJmn6K94DOtSnsK5PgDAaMTJLhP
-/Yb25y7PcCvHJF3N++k=
-=8M4N
+iEYEAREKAAYFAk+6PZoACgkQuUQtlDBCeQLdIQCfXVLaBo2Ds6BcRpkJzgYJtdCD
+lxkAnReXgWclGFXuGpErz+0IicqU6rl5
+=J644
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/spin/files/spin-6.2.1-makefile.patch b/sci-mathematics/spin/files/spin-6.2.1-makefile.patch
new file mode 100644
index 000000000000..9133f54f9fac
--- /dev/null
+++ b/sci-mathematics/spin/files/spin-6.2.1-makefile.patch
@@ -0,0 +1,21 @@
+--- makefile.orig	2012-05-21 14:59:56.000000000 +0200
++++ makefile	2012-05-21 15:00:47.000000000 +0200
+@@ -13,9 +13,6 @@
+ 
+ # see also ./make_pc for a simpler script, not requiring make
+ 
+-CC=gcc
+-CFLAGS=-O2 -DNXT	# on some systems add: -I/usr/include
+-
+ # CC=gcc -m32 	# 32bit compilation on a 64bit system
+ # for a more picky compilation use gcc-4 and:
+ # CFLAGS=-std=c99 -Wstrict-prototypes -pedantic -fno-strength-reduce -fno-builtin -W -Wshadow -Wpointer-arith -Wcast-qual -Winline -Wall -g -DNXT -DPC
+@@ -43,7 +40,7 @@
+ 	tl_mem.o tl_rewrt.o tl_cache.o
+ 
+ spin:	$(SPIN_OS) $(TL_OS) spin.o
+-	$(CC) $(CFLAGS) -o spin spin.o $(SPIN_OS) $(TL_OS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o spin spin.o $(SPIN_OS) $(TL_OS)
+ 
+ spin.o:	spin.y
+ 	$(YACC) $(YFLAGS) spin.y
diff --git a/sci-mathematics/spin/spin-6.0.1.ebuild b/sci-mathematics/spin/spin-6.2.1.ebuild
index cbf3c23ca55a..9015abebca72 100644
--- a/sci-mathematics/spin/spin-6.0.1.ebuild
+++ b/sci-mathematics/spin/spin-6.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/spin/spin-6.0.1.ebuild,v 1.2 2011/01/05 00:04:13 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/spin/spin-6.2.1.ebuild,v 1.1 2012/05/21 13:05:22 phajdan.jr Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit eutils versionator
 
@@ -29,19 +29,15 @@ RDEPEND="sys-devel/gcc
 S="${WORKDIR}/Spin/Src${PV}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-6.0.1-makefile.patch"
-}
-
-src_compile() {
-	emake -j1 || die
+	epatch "${FILESDIR}/${PN}-6.2.1-makefile.patch"
 }
 
 src_install() {
-	dobin spin || die
-	doman ../Man/spin.1 || die
-	dodoc ../Doc/* || die
+	dobin spin
+	doman ../Man/spin.1
+	dodoc ../Doc/*
 	if use tk; then
-		newbin "${WORKDIR}/Spin/iSpin/ispin.tcl" ispin || die
+		newbin "${WORKDIR}/Spin/iSpin/ispin.tcl" ispin
 		make_desktop_entry ispin
 	fi
 }