aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrançois Bissey <f.r.bissey@massey.ac.nz>2010-08-17 00:07:18 +1200
committerFrançois Bissey <f.r.bissey@massey.ac.nz>2010-08-17 00:07:18 +1200
commit403c9c7f55f8088848721eb2cbf55a4d011740e9 (patch)
tree4f6b7eb846500d09eb77ba3a6b8fe64834199ba8 /sci-mathematics
parentsci-geosciences/pydap_handlers_csv: Version bump. (diff)
downloadsci-403c9c7f55f8088848721eb2cbf55a4d011740e9.tar.gz
sci-403c9c7f55f8088848721eb2cbf55a4d011740e9.tar.bz2
sci-403c9c7f55f8088848721eb2cbf55a4d011740e9.zip
Fix last QA issues - hopefully that solved parallel make for good.
(Portage version: 2.2_rc67/git/Linux i686) (Unsigned Manifest commit)
Diffstat (limited to 'sci-mathematics')
-rw-r--r--sci-mathematics/lie/ChangeLog4
-rw-r--r--sci-mathematics/lie/Manifest6
-rw-r--r--sci-mathematics/lie/files/parrallelmake-lie-2.2.2.patch28
-rw-r--r--sci-mathematics/lie/lie-2.2.2.ebuild6
4 files changed, 28 insertions, 16 deletions
diff --git a/sci-mathematics/lie/ChangeLog b/sci-mathematics/lie/ChangeLog
index 1379d1860..b756d529e 100644
--- a/sci-mathematics/lie/ChangeLog
+++ b/sci-mathematics/lie/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 16 Aug 2010; François Bissey <f.r.bissey@massey.ac.nz> lie-2.2.2.ebuild,
+ files/parrallelmake-lie-2.2.2.patch:
+ Fix double compilation issues.
+
15 Aug 2010; François Bissey <f.r.bissey@massey.ac.nz> lie-2.2.2.ebuild,
files/lie-2.2.2-make.patch, files/parrallelmake-lie-2.2.2.patch:
Migrated to EAPI=3 and fixed QA: parallel make (again) & FLAGS
diff --git a/sci-mathematics/lie/Manifest b/sci-mathematics/lie/Manifest
index 0d5859719..7edab1737 100644
--- a/sci-mathematics/lie/Manifest
+++ b/sci-mathematics/lie/Manifest
@@ -1,6 +1,6 @@
AUX lie-2.2.2-make.patch 4675 RMD160 eb95a5dbc39742cb9a1e75ded97174175db8e359 SHA1 34628122e9f9c33bb27539699aff0104dc267b62 SHA256 1303d861a180e9af51842d2e332a5b10ed204576e636e01acaf0d4725ae9dc21
-AUX parrallelmake-lie-2.2.2.patch 1373 RMD160 0e0b9bb14425a299887af60096ac666bb0c3a55e SHA1 65e9199ab23d2f846eccb2e93f5e4caabd2768fd SHA256 9273d945428c191b473d35b092c645c31b69a23be77dae900dd51aea84525004
+AUX parrallelmake-lie-2.2.2.patch 1734 RMD160 790e3d85bade83504cce93a7a47dd6d9ac3a3a94 SHA1 02b001285b3f0bcd399c3ff50f4fe566c280191a SHA256 6e57a21fa70ceaa21f625a7632b05ee83d511fa7ada846aa4b399df04824cb42
DIST conLiE.tar.gz 361170 RMD160 3a0ff7e62db3de194222d0d5bd5fab8390ef8537 SHA1 92eb9283868cc46ae0b87c4dfd6f13631e046bee SHA256 6eac244471abb730811a05c8cb0b36eb7f8285cd18a03b956dadcf80ef1f0961
-EBUILD lie-2.2.2.ebuild 1150 RMD160 edba9f8f32ca2d192446919d8d48aca4d2970df1 SHA1 ba24460e737f5a13bf4358e3c4b2237a09baa328 SHA256 3e9eb34c1e61649d70b049620a762c451bc26b1137e2c2af5b68a597ab6a4fac
-MISC ChangeLog 714 RMD160 9d698f5fdf847960a46aeae37ad7e776fc388191 SHA1 ae96b6bc165faf5e5d317bda404034929feb4951 SHA256 668225e0ab4e7347b733efcbb2007baabc781d2f82367cfdecd0ebae6c7be73b
+EBUILD lie-2.2.2.ebuild 1186 RMD160 b514a2b16a1028c66e98ec56616dc1efef480b49 SHA1 8c0999afae09cd7e8a7a243d6299f086204020a4 SHA256 cadd208561e99bf8516ba7053e3e44cc0f11aedf051eb539c837e072eea91c67
+MISC ChangeLog 863 RMD160 d784721faebf2787bcfe0011712170242a31531b SHA1 eebbe47f3488c60f6f9ed4ff4c33c06783958e30 SHA256 8f9e75960cfa5145329cac262ee1b31b0c3845a12d4f0e61b36543e9fea5a0a1
MISC metadata.xml 490 RMD160 86d74e0315fd46dcb1ef92be92e9c399c6ad596c SHA1 30ddf33d8bc318eb3eba19600719de1126da5ee1 SHA256 2c4512011eb778ff4063be3a181a00266912cf9ec962d142dc5c36b5008316ff
diff --git a/sci-mathematics/lie/files/parrallelmake-lie-2.2.2.patch b/sci-mathematics/lie/files/parrallelmake-lie-2.2.2.patch
index 601bf0708..5bd54b403 100644
--- a/sci-mathematics/lie/files/parrallelmake-lie-2.2.2.patch
+++ b/sci-mathematics/lie/files/parrallelmake-lie-2.2.2.patch
@@ -1,5 +1,5 @@
---- Makefile.orig 2010-08-15 23:55:28.989825847 +1200
-+++ Makefile 2010-08-15 23:57:15.251826046 +1200
+--- Makefile.orig 2010-08-16 23:59:45.463692224 +1200
++++ Makefile 2010-08-17 00:00:45.069692939 +1200
@@ -1,11 +1,11 @@
srcdir :=$(shell pwd)
@@ -14,16 +14,18 @@
# These settings should also be used in subdirectories:
export CC all-C-flags fixed-flags CFLAGS
-@@ -58,7 +58,7 @@
- math_functions:
- $(MAKE) -C box all
+@@ -49,9 +49,7 @@
+ # To 'make all', we first descend into the subdirectories, and afterwards
+ # return to finish here.
--binding_functions:
-+binding_functions: math_functions
- $(MAKE) -C static
+-all:
+- $(MAKE) math_functions binding_functions
+- $(MAKE) finish
++all: math_functions binding_functions finish
+ finish: lie Lie.exe LEARN.ind INFO.ind # do not call 'make finish' directly
-@@ -98,9 +98,9 @@
+@@ -98,12 +96,12 @@
# been set to the most recent one of object files in the respective
# subdirectories, whence taking that dummy file as dependency suffices.
@@ -34,8 +36,12 @@
+gapdate.o: date.c $(GAP_objects) math_functions binding_functions
$(CC) -ansi -c -o gapdate.o date.c
- Lie.exe: date.o
-@@ -131,7 +131,7 @@
+-Lie.exe: date.o
++Lie.exe: math_functions binding_functions date.o
+ $(CC) -o Lie.exe $(LDFLAGS) $(objects) date.o static/*.o box/*.o -lreadline -lncurses
+ chmod g+w Lie.exe
+ Liegap.exe: gapdate.o
+@@ -131,7 +129,7 @@
learnind: util/learnind.c
$(MAKE) -C util ../learnind
diff --git a/sci-mathematics/lie/lie-2.2.2.ebuild b/sci-mathematics/lie/lie-2.2.2.ebuild
index 14465dae0..a009d897f 100644
--- a/sci-mathematics/lie/lie-2.2.2.ebuild
+++ b/sci-mathematics/lie/lie-2.2.2.ebuild
@@ -19,8 +19,10 @@ SLOT="0"
KEYWORDS="~x86"
IUSE="doc"
DEPEND="sys-devel/bison
- sys-libs/readline"
-RDEPEND="sys-libs/readline"
+ sys-libs/readline
+ sys-libs/ncurses"
+RDEPEND="sys-libs/readline
+ sys-libs/ncurses"
S="${WORKDIR}/LiE"