aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrançois Bissey <francois.bissey@canterbury.ac.nz>2013-09-19 13:53:47 +1200
committerFrançois Bissey <francois.bissey@canterbury.ac.nz>2013-09-19 13:54:45 +1200
commit03c08154f2a7cda9acd7fa8dc4422f32e4428e64 (patch)
tree7c558840561152d73ae85bfecdb0c5dcc7d027e3
parentbump modglue to 1.19 (diff)
downloadsci-03c08154f2a7cda9acd7fa8dc4422f32e4428e64.tar.gz
sci-03c08154f2a7cda9acd7fa8dc4422f32e4428e64.tar.bz2
sci-03c08154f2a7cda9acd7fa8dc4422f32e4428e64.zip
Bump to 1.33 and solve issue #113
Package-Manager: portage-2.2.6
-rw-r--r--sci-mathematics/cadabra/ChangeLog8
-rw-r--r--sci-mathematics/cadabra/Manifest2
-rw-r--r--sci-mathematics/cadabra/cadabra-1.33.ebuild (renamed from sci-mathematics/cadabra/cadabra-1.31.ebuild)18
-rw-r--r--sci-mathematics/cadabra/files/cadabra-1.21-no-stripping.patch30
-rw-r--r--sci-mathematics/cadabra/files/cadabra-1.25-xcadabra-flags.patch11
-rw-r--r--sci-mathematics/cadabra/files/cadabra-1.33-FLAGS.patch171
6 files changed, 191 insertions, 49 deletions
diff --git a/sci-mathematics/cadabra/ChangeLog b/sci-mathematics/cadabra/ChangeLog
index fc95a0fae..e630f20a8 100644
--- a/sci-mathematics/cadabra/ChangeLog
+++ b/sci-mathematics/cadabra/ChangeLog
@@ -2,6 +2,14 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*cadabra-1.33 (19 Sep 2013)
+
+ 19 Sep 2013; François Bissey <francois.bissey@canterbury.ac.nz>
+ +cadabra-1.33.ebuild, +files/cadabra-1.33-FLAGS.patch, -cadabra-1.31.ebuild,
+ -files/cadabra-1.21-no-stripping.patch,
+ -files/cadabra-1.25-xcadabra-flags.patch:
+ Bump to 1.33 and solve issue #113
+
13 Jun 2013; Justin Lecher <jlec@gentoo.org> -cadabra-1.25.ebuild,
-cadabra-1.28.ebuild, -cadabra-1.29.ebuild, cadabra-1.31.ebuild,
metadata.xml:
diff --git a/sci-mathematics/cadabra/Manifest b/sci-mathematics/cadabra/Manifest
index 96690ef40..2c7e3d931 100644
--- a/sci-mathematics/cadabra/Manifest
+++ b/sci-mathematics/cadabra/Manifest
@@ -1 +1 @@
-DIST cadabra-1.31.tar.gz 853016 SHA256 97be19dfce98a91d133dd60cebe58029ffbba3108dd1ae6b8e201f1d1791aad2 SHA512 a1e77b5e5c099b3eecd27ec06721acd1054815d987b405265a9e31348ca0b12ab5c6be437417e8783a34a6bf3ee55cebfaf92a12621bc72d8ede559af4e2ef40 WHIRLPOOL 22a99e61afc8b40b9bc314ad9481199dcf09cf5c6ec8dd43dfbc82177f4b3d1d9756c602713f0e5e099f026f3ef8dfbe0fecc4a94da57562f325ed064fc200d1
+DIST cadabra-1.33.tar.gz 855777 SHA256 075dad3a1a9fd8774473f6d28f036f65629a286304c02f0ac1e10be3cb2ebd12 SHA512 3add8e2dd94c51ac68ed6a7243769b256c873a8f86eb58a7a7c24680b5333eb6849103c0bfd4cd0cc55290fb78fdcd4686065693e815eb4c2f62099bedbcdb6c WHIRLPOOL cd922d21e752acda08e23678b970162b561830d4d8def717dfb4d4bf2625090b8c3b02be4ff25fac731942b28d6f0d07c77066bb75c7a2e11901adce9a300380
diff --git a/sci-mathematics/cadabra/cadabra-1.31.ebuild b/sci-mathematics/cadabra/cadabra-1.33.ebuild
index f56d98121..ca222daad 100644
--- a/sci-mathematics/cadabra/cadabra-1.31.ebuild
+++ b/sci-mathematics/cadabra/cadabra-1.33.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://cadabra.phi-sci.com/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="doc examples X"
+IUSE="doc examples X test"
CDEPEND="
sci-libs/modglue
@@ -28,18 +28,20 @@ CDEPEND="
DEPEND="${CDEPEND}
doc? (
app-doc/doxygen
- || ( app-text/texlive-core dev-tex/pdftex ) )"
+ || ( app-text/texlive-core dev-tex/pdftex ) )
+ test? ( sys-process/time )"
RDEPEND="${CDEPEND}
virtual/latex-base
- dev-tex/mh"
+ dev-texlive/texlive-latexrecommended"
src_prepare(){
- # xcadabra doesn't respect LDFLAGS (cadabra does!)
- epatch "${FILESDIR}/${PN}-1.25-xcadabra-flags.patch"
+ # fixing the flag mess
+ epatch "${FILESDIR}/${PN}-1.33-FLAGS.patch"
}
src_configure(){
- econf $(use_enable X gui)
+ econf $(use_enable X gui) \
+ --disable-runtime-dependency-check
}
src_compile() {
@@ -54,7 +56,9 @@ src_compile() {
}
src_install() {
- emake DESTDIR="${D}" DEVDESTDIR="${D}" install
+ # cadabra strip binaries unless you are on OS X.
+ # So faking it to avoid outright stripping.
+ emake DESTDIR="${D}" DEVDESTDIR="${D}" MACTEST=1 install
dodoc AUTHORS ChangeLog INSTALL
diff --git a/sci-mathematics/cadabra/files/cadabra-1.21-no-stripping.patch b/sci-mathematics/cadabra/files/cadabra-1.21-no-stripping.patch
deleted file mode 100644
index d21047f72..000000000
--- a/sci-mathematics/cadabra/files/cadabra-1.21-no-stripping.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/Makefile.in.orig 2010-03-28 23:01:45.367865648 +1300
-+++ src/Makefile.in 2010-03-28 23:02:11.518865659 +1300
-@@ -146,9 +146,9 @@
- # Installation and cleanup.
-
- install:
--ifeq ($(strip $(MACTEST)),)
-- strip cadabra
--endif
-+#ifeq ($(strip $(MACTEST)),)
-+# strip cadabra
-+#endif
- # strip -S cadabra
- #endif
- @INSTALL@ -m 0755 -d ${DESTDIR}@prefix@/bin
---- gui/Makefile.in.orig 2010-03-28 23:01:34.485865848 +1300
-+++ gui/Makefile.in 2010-03-28 23:02:30.490865700 +1300
-@@ -30,9 +30,9 @@
- @CXX@ -o test_texit `pkg-config modglue --libs` `pkg-config --libs gtkmm-2.4` $+
-
- install:
--ifeq ($(strip $(MACTEST)),)
-- strip xcadabra
--endif
-+#ifeq ($(strip $(MACTEST)),)
-+# strip xcadabra
-+#endif
- install -d ${DESTDIR}@prefix@/bin
- install -m 0755 xcadabra ${DESTDIR}@prefix@/bin
- install -d ${DESTDIR}@prefix@/share/texmf/tex/latex/cadabra
diff --git a/sci-mathematics/cadabra/files/cadabra-1.25-xcadabra-flags.patch b/sci-mathematics/cadabra/files/cadabra-1.25-xcadabra-flags.patch
deleted file mode 100644
index 0d1beaa2d..000000000
--- a/sci-mathematics/cadabra/files/cadabra-1.25-xcadabra-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gui/Makefile.in.orig 2010-08-20 22:59:47.208483158 +1200
-+++ gui/Makefile.in 2010-08-20 23:00:51.888482426 +1200
-@@ -19,7 +19,7 @@
- main.o: $(OBJS) Makefile
-
- xcadabra: $(OBJS)
-- @CXX@ -o xcadabra $+ `pkg-config modglue --libs` `pkg-config --libs gtkmm-2.4` -lpcrecpp
-+ @CXX@ @CFLAGS@ @LDFLAGS@ -o xcadabra $+ `pkg-config modglue --libs` `pkg-config --libs gtkmm-2.4` -lpcrecpp
-
- xcadabra_static: $(OBJS)
- @CXX@ -o xcadabra -static $+ -L@prefix@/lib `pkg-config modglue --libs` \
diff --git a/sci-mathematics/cadabra/files/cadabra-1.33-FLAGS.patch b/sci-mathematics/cadabra/files/cadabra-1.33-FLAGS.patch
new file mode 100644
index 000000000..2d78e9327
--- /dev/null
+++ b/sci-mathematics/cadabra/files/cadabra-1.33-FLAGS.patch
@@ -0,0 +1,171 @@
+--- Makefile.in.orig 2013-09-05 21:45:20.026339263 +1200
++++ Makefile.in 2013-09-05 21:48:20.859739672 +1200
+@@ -24,7 +24,7 @@
+ ( cd src && $(MAKE) static );
+
+ profile:
+- ( export CFLAGS=-pg && export LDFLAGS=-pg && cd src && $(MAKE) );
++ ( export CFLAGS="$(CFLAGS) -pg" && CXXFLAGS="$(CXXFLAGS) -pg" && cd src && $(MAKE) );
+
+ doc:
+ ( cd doc && $(MAKE) );
+--- src/Makefile.in.orig 2013-09-05 21:45:35.546373837 +1200
++++ src/Makefile.in 2013-09-05 21:53:51.146459582 +1200
+@@ -22,12 +22,13 @@
+
+ SRCS = `find . -name "*.cc"`
+ MCFLAGS = @CFLAGS@ -I. -I@top_srcdir@/src `pkg-config modglue --cflags`
++MCXXFLAGS = @CXXFLAGS@ -I. -I@top_srcdir@/src `pkg-config modglue --cflags`
+ TIMESTAMP = -D"RELEASE=\"${RELEASE}\"" -D"DATETIME=\"`date | sed -e 's/ / /'`\"" -DHOSTNAME=\"`hostname`\"
+
+
+
+ %.o: %.cc
+- @CXX@ ${MCFLAGS} ${TIMESTAMP} -c -o $@ $<
++ @CXX@ ${MCXXFLAGS} ${TIMESTAMP} -c -o $@ $<
+
+ modules/xperm.o: modules/xperm.c
+ @CC@ @NESTED@ ${MCFLAGS} ${TIMESTAMP} -c -o $@ $<
+@@ -42,10 +43,10 @@
+
+ ifeq ($(strip $(MACTEST)),)
+ cadabra: $(OBJS) $(MOBJS)
+- @CXX@ -o cadabra ${LDFLAGS} -Wl,--as-needed $+ `pkg-config modglue --libs` -lgmpxx -lpcrecpp -lgmp
++ @CXX@ -o cadabra ${MCXXFLAGS} ${LDFLAGS} -Wl,--as-needed $+ `pkg-config modglue --libs` -lgmpxx -lpcrecpp -lgmp
+ else
+ cadabra: $(OBJS) $(MOBJS)
+- @CXX@ -o cadabra ${LDFLAGS} -Wl,-dead_strip_dylibs $+ `pkg-config modglue --libs` -lgmpxx -lpcrecpp -lgmp
++ @CXX@ -o cadabra ${MCXXFLAGS} ${LDFLAGS} -Wl,-dead_strip_dylibs $+ `pkg-config modglue --libs` -lgmpxx -lpcrecpp -lgmp
+ endif
+
+ #`pkg-config glib-2.0 --libs`
+@@ -53,15 +54,15 @@
+
+ cadabra_static: $(OBJS) $(MOBJS)
+ rm -f main.o
+- @CXX@ -Wall -g ${MCFLAGS} ${TIMESTAMP} -DSTATICBUILD -c -o main.o main.cc
++ @CXX@ -Wall -g ${MCXXFLAGS} ${TIMESTAMP} -DSTATICBUILD -c -o main.o main.cc
+ ifeq ($(strip $(MACTEST)),)
+- @CXX@ -o cadabra -static $+ ${LDFLAGS} `pkg-config modglue --libs` -lmodglue \
++ @CXX@ -o cadabra -static ${MCXXFLAGS} $+ ${LDFLAGS} `pkg-config modglue --libs` -lmodglue \
+ -lgmpxx -lgmp -lpcrecpp -lpcre \
+ `pkg-config sigc++-2.0 --libs` -lsigc-2.0 -lutil
+
+ else
+ export MACOSX_DEPLOYMENT_TARGET=10.3
+- @CXX@ -o cadabra $+ ${LDFLAGS} `pkg-config modglue --libs` \
++ @CXX@ -o cadabra ${MCXXFLAGS} $+ ${LDFLAGS} `pkg-config modglue --libs` \
+ -lgmp -lgmpxx -lpcre++ -lpcre -lexpect
+ endif
+
+@@ -77,32 +78,32 @@
+ # @CXX@ -c -o defaults.o defaults.cc
+
+ test_tree: test_tree.o
+- @CXX@ -o test_tree test_tree.o
++ @CXX@ ${MCXXFLAGS} -o test_tree test_tree.o
+
+ test_lie: test_lie.o modules/lie.o
+ ifeq ($(strip $(MACTEST)),)
+- @CXX@ -o test_lie test_lie.o modules/lie.o `pkg-config --libs modglue`
++ @CXX@ ${MCXXFLAGS} -o test_lie test_lie.o modules/lie.o `pkg-config --libs modglue`
+ else
+- @CXX@ -o test_lie test_lie.o modules/lie.o `pkg-config --libs modglue`
++ @CXX@ ${MCXXFLAGS} -o test_lie test_lie.o modules/lie.o `pkg-config --libs modglue`
+ endif
+
+ tree_regression_tests: tree_regression_tests.o
+- @CXX@ -o tree_regression_tests tree_regression_tests.o
++ @CXX@ ${MCXXFLAGS} -o tree_regression_tests tree_regression_tests.o
+
+ test_xperm: test_xperm.o modules/xperm.o
+- @CXX@ -o test_xperm test_xperm.o modules/xperm.o
++ @CXX@ ${MCXXFLAGS} -o test_xperm test_xperm.o modules/xperm.o
+
+ tree_example: tree_example.o tree.hh
+- @CXX@ -o tree_example tree_example.o
++ @CXX@ ${MCXXFLAGS} -o tree_example tree_example.o
+
+ test_combinatorics: test_combinatorics.o combinatorics.o
+- @CXX@ -o test_combinatorics test_combinatorics.o combinatorics.o
++ @CXX@ ${MCXXFLAGS} -o test_combinatorics test_combinatorics.o combinatorics.o
+
+ test_young: test_young.o youngtab.o combinatorics.o
+- @CXX@ -o test_young test_young.o youngtab.o combinatorics.o ${LDFLAGS} -lgmpxx -lgmp
++ @CXX@ ${MCXXFLAGS} -o test_young test_young.o youngtab.o combinatorics.o ${LDFLAGS} -lgmpxx -lgmp
+
+ test_preprocessor: test_preprocessor.o preprocessor.o
+- @CXX@ -o test_preprocessor test_preprocessor.o preprocessor.o ${LDFLAGS} -lgmpxx -lgmp
++ @CXX@ ${MCXXFLAGS} -o test_preprocessor test_preprocessor.o preprocessor.o ${LDFLAGS} -lgmpxx -lgmp
+
+ mpi_pass_tree: mpi_pass_tree.o
+ @CXX@ -o mpi_pass_tree mpi_pass_tree.o -L/usr/lib/mpich/lib -lmpich++ -lpmpich -lmpich
+@@ -133,13 +134,13 @@
+ # Then the actual compilation.
+
+ lex.yy.o: lex.yy.c parser2.tab.h
+- @CXX@ -c -o lex.yy.o lex.yy.c
++ @CXX@ ${MCXXFLAGS} -c -o lex.yy.o lex.yy.c
+
+ parser2.tab.o: parser2.tab.c
+- @CXX@ -c -o parser2.tab.o parser2.tab.c
++ @CXX@ ${MCXXFLAGS} -c -o parser2.tab.o parser2.tab.c
+
+ parser2: parser2.tab.o lex.yy.o storage.o props.o
+- @CXX@ -o parser2 $+ -ll -ly -lgmpxx -lgmp -lpcrecpp
++ @CXX@ ${MCXXFLAGS} -o parser2 $+ -ll -ly -lgmpxx -lgmp -lpcrecpp
+
+
+
+@@ -170,7 +171,7 @@
+ .depend:
+ rm -f .depend
+ for i in ${SRCS}; \
+- do @CXX@ ${MCFLAGS} -E -MM -MT `echo $$i | sed -e 's/\.\///' -e 's/\.cc/\.o/'` ${CFLAGS} $$i >> .depend; \
++ do @CXX@ ${MCXXFLAGS} -E -MM -MT `echo $$i | sed -e 's/\.\///' -e 's/\.cc/\.o/'` ${CXXFLAGS} $$i >> .depend; \
+ done
+
+ include .depend
+--- gui/Makefile.in.orig 2013-09-05 21:45:50.989408184 +1200
++++ gui/Makefile.in 2013-09-05 21:57:17.495902104 +1200
+@@ -8,26 +8,26 @@
+ static: xcadabra_static
+
+ OBJS = help.o widgets.o window.o main.o ../src/stopwatch.o
+-CFLAGS = -O2 -I. -I@top_srcdir@/include `pkg-config modglue --cflags` `pkg-config --cflags gtkmm-2.4` \
++MCXXFLAGS = -O2 $(CXXFLAGS) -I. -I@top_srcdir@/include `pkg-config modglue --cflags` `pkg-config --cflags gtkmm-2.4` \
+ `pkg-config --cflags pango`
+ SRCS = `find . -name "*.cc"`
+ TIMESTAMP = -D"RELEASE=\"${RELEASE}\"" -D"DATETIME=\"`date | sed -e 's/ / /'`\"" -DHOSTNAME=\"`hostname`\"
+
+ %.o: %.cc
+- @CXX@ -Wall @CFLAGS@ -D"DESTDIR=\"@prefix@\"" ${TIMESTAMP} ${CFLAGS} -c -o $@ $<
++ @CXX@ -Wall $(MCXXFLAGS) -D"DESTDIR=\"@prefix@\"" ${TIMESTAMP} -c -o $@ $<
+
+ main.o: $(OBJS) Makefile
+
+ xcadabra: $(OBJS)
+- @CXX@ -o xcadabra $+ `pkg-config modglue --libs` `pkg-config --libs gtkmm-2.4` -lpcrecpp
++ @CXX@ $(MCXXFLAGS) -o xcadabra $+ $(LDFLAGS) `pkg-config modglue --libs` `pkg-config --libs gtkmm-2.4` -lpcrecpp
+
+ xcadabra_static: $(OBJS)
+- @CXX@ -o xcadabra -static $+ -L@prefix@/lib `pkg-config modglue --libs` \
++ @CXX@ $(MCXXFLAGS) -o xcadabra -static $+ $(LDFLAGS) -L@prefix@/lib `pkg-config modglue --libs` \
+ `pkg-config --libs gtkmm-2.4` `pkg-config libxml++-2.6` \
+ -lpthread -lexpat
+
+ test_texit: texit.o test_texit.o
+- @CXX@ -o test_texit `pkg-config modglue --libs` `pkg-config --libs gtkmm-2.4` $+
++ @CXX@ $(MCXXFLAGS) -o test_texit `pkg-config modglue --libs` `pkg-config --libs gtkmm-2.4` $+
+
+ install:
+ ifeq ($(strip $(MACTEST)),)
+@@ -50,7 +50,7 @@
+ .depend:
+ rm -f .depend
+ for i in ${SRCS}; \
+- do g++ -E -MM -MT `echo $$i | sed -e 's/\.\///' -e 's/\.cc/\.o/'` ${CFLAGS} $$i >> .depend; \
++ do g++ -E -MM -MT `echo $$i | sed -e 's/\.\///' -e 's/\.cc/\.o/'` ${MCXXFLAGS} $$i >> .depend; \
+ done
+
+ include .depend