Respect LDFLAGS, bug #337093 by flameeyes. Remove old.

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

5 files changed, 18 insertions, 117 deletions

diff --git a/sci-mathematics/spin/ChangeLog b/sci-mathematics/spin/ChangeLog
index a7792b253a24..f925b7dc7509 100644
--- a/sci-mathematics/spin/ChangeLog
+++ b/sci-mathematics/spin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/spin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/spin/ChangeLog,v 1.3 2010/06/22 17:49:59 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/spin/ChangeLog,v 1.4 2010/10/12 11:16:28 phajdan.jr Exp $
+
+  12 Oct 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> -spin-5.2.4.ebuild,
+  -spin-5.2.5.ebuild, files/spin-makefile.patch:
+  Respect LDFLAGS, bug #337093 by flameeyes. Remove old.
 
 *spin-5.2.5-r1 (22 Jun 2010)
 
diff --git a/sci-mathematics/spin/Manifest b/sci-mathematics/spin/Manifest
index 93714b537435..5093825db03c 100644
--- a/sci-mathematics/spin/Manifest
+++ b/sci-mathematics/spin/Manifest
@@ -1,13 +1,9 @@
 AUX spin-font-size.patch 1835 RMD160 13697e0a69dbd16d5bdd22d485eea9569e6c6fd5 SHA1 193d5d48525426bb445bd1751cc733b5ab53400f SHA256 18a9646b43c47d44c96676e111874c73685c98a42aebfc8ea3958c8501143aad
-AUX spin-makefile.patch 583 RMD160 88941c0223492fa393b31f59be9e926fb36f4475 SHA1 2323ca5916fcbbe77c4f56eaeeff7173cbbd35f7 SHA256 ad06809f3538bbff5fc0245fc420dc74cdf06b1b5e81db9040af5765c717fd83
+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 spin524.tar.gz 362299 RMD160 bf07242f4f47e41365410604c43466cee05a9afc SHA1 91d2cf9c12a28947ce1934b0c007d7fb8f613575 SHA256 512249c5f8b0ba4eeac997f3a4e59767fc0ead782741e8414f3c0f9b9ad53865
 DIST spin525.tar.gz 413406 RMD160 8d01f8dd0da8c8013fbb8c6d6e9a8c40b8c5f33f SHA1 274649628c0c8ae3414b863c27a1b8d98a8e9921 SHA256 60e6ac1a10e7f543634e99d69d33a8bb03ea85c4251de67824e89826e1955360
-DIST xspin523.tcl 194848 RMD160 108b3121bd8a6baa96bbe0634f7063bb6572052f SHA1 74914147f73892479cd2b17cc06cd24e9a01be04 SHA256 9ba55a92aa301043089460b1683551796b7ac6b2a2ff9b5e2dc308974d1d6e22
 DIST xspin525.tcl 194845 RMD160 26d85188070286739019405d49d3a2bd07545f90 SHA1 8166ccc6830f052e31162bec618c17452a988b5d SHA256 e23d8d562e39db6fe73570e52ee895cd806d15c3e52e638299cbc1eb61289eb6
-EBUILD spin-5.2.4.ebuild 1277 RMD160 d040afe9876327375ca64fdbb1c97f9fe9c0aefe SHA1 03518ef6ab461c83c5689616a69bd419fb94b40a SHA256 fe8dd1b9ee70ab60b612fedbec4538d236a5011e95cd7e330d964a8370f76d78
 EBUILD spin-5.2.5-r1.ebuild 1334 RMD160 20db1390c3f2354cf137b4cb818aa578d6582007 SHA1 f617a02a7f1aa84fd485178d11e8ed5d6015e407 SHA256 b4e8829511d048f5a8077fe48ece30bbd7b54145fcd71dd09e54c9a55cb9459d
-EBUILD spin-5.2.5.ebuild 1287 RMD160 923cfdc21cf3b247fc1c2ac1ddfa75dd53280f4f SHA1 320c8eb0473566ae2e007a645915eca4ab8ee96e SHA256 ddd954a228205b235a6e74976172febf3e8c5ded30aec790b20d32033cd8e41e
-MISC ChangeLog 820 RMD160 67605d8402fb276c926848dcd2e6e6db217e017b SHA1 6f3106d553b03f7025f807fc54b2895d516d9170 SHA256 242314d8fe2f88adc9be15931f3ac1760c1522a6e73ae25cc014eb0a620af0f1
+MISC ChangeLog 1002 RMD160 cdb195b8a5e23f592e614e7882cbaef2294958d7 SHA1 ca728ff32adc22f45b9be902a7dcd2ba83610246 SHA256 846f81308f2212faf6602be257dff8926bd62b09adc23018458b8f2de3671456
 MISC metadata.xml 260 RMD160 e9437033b7df4bdb32fdef6e886a1ed321a6f462 SHA1 f008d84bacf2428dafd6f33263898961dacf8c5e SHA256 c7f8354174de834aa476ee81d3412d85e1352a6647415dbeee403461b99ea19c
diff --git a/sci-mathematics/spin/files/spin-makefile.patch b/sci-mathematics/spin/files/spin-makefile.patch
index 83fa9e95e12f..4f4c6dd12fc5 100644
--- a/sci-mathematics/spin/files/spin-makefile.patch
+++ b/sci-mathematics/spin/files/spin-makefile.patch
@@ -1,5 +1,5 @@
---- makefile.orig	2010-04-03 12:13:41.000000000 +0200
-+++ makefile	2010-04-03 12:14:21.000000000 +0200
+--- 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
@@ -11,3 +11,12 @@
  # 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/spin-5.2.4.ebuild b/sci-mathematics/spin/spin-5.2.4.ebuild
deleted file mode 100644
index 6835d92186f0..000000000000
--- a/sci-mathematics/spin/spin-5.2.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/spin/spin-5.2.4.ebuild,v 1.1 2010/04/11 12:50:07 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
-	http://spinroot.com/spin/Src/xspin523.tcl"
-
-LICENSE="|| ( spin-commercial spin-educational )"
-SLOT="0"
-KEYWORDS="~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}/xspin523.tcl" "${S}" || die "cp failed"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-makefile.patch"
-	epatch "${FILESDIR}/${PN}-xspin.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 xspin523.tcl xspin || die "newbin failed"
-		make_desktop_entry xspin XSpin
-	fi
-}
diff --git a/sci-mathematics/spin/spin-5.2.5.ebuild b/sci-mathematics/spin/spin-5.2.5.ebuild
deleted file mode 100644
index 7977a990ee44..000000000000
--- a/sci-mathematics/spin/spin-5.2.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 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.ebuild,v 1.1 2010/06/11 14:31:38 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
-	http://spinroot.com/spin/Src/xspin525.tcl"
-
-LICENSE="|| ( spin-commercial spin-educational )"
-SLOT="0"
-KEYWORDS="~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"
-}
-
-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
-}