From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2E3B8138351 for ; Mon, 3 Feb 2020 04:02:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5B44EE0848; Mon, 3 Feb 2020 04:02:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DB5A6E0826 for ; Mon, 3 Feb 2020 04:02:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7334D34E4C0 for ; Mon, 3 Feb 2020 04:02:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1D77D134 for ; Mon, 3 Feb 2020 04:02:50 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1580702556.a1e9a011645237b0401e65acdeb2a2f039bbdbaf.heroxbd@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/cadabra/files/, sci-mathematics/cadabra/ X-VCS-Repository: proj/sci X-VCS-Files: sci-mathematics/cadabra/cadabra-1.39.ebuild sci-mathematics/cadabra/files/cadabra-1.33-FLAGS.patch sci-mathematics/cadabra/files/cadabra-1.39-FLAGS.patch sci-mathematics/cadabra/metadata.xml X-VCS-Directories: sci-mathematics/cadabra/files/ sci-mathematics/cadabra/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: a1e9a011645237b0401e65acdeb2a2f039bbdbaf X-VCS-Branch: master Date: Mon, 3 Feb 2020 04:02:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 846b2829-d8e6-4aad-b7f0-1814557235eb X-Archives-Hash: 24f01f811d62d2e9c97f63f0a66dd2ea commit: a1e9a011645237b0401e65acdeb2a2f039bbdbaf Author: Benda Xu gentoo org> AuthorDate: Mon Feb 3 03:56:58 2020 +0000 Commit: Benda XU gentoo org> CommitDate: Mon Feb 3 04:02:36 2020 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=a1e9a011 sci-mathematics/cadabra: remove from tree. SRC_URI is dead, simple version bump did not work. Bug: https://bugs.gentoo.org/707558 Signed-off-by: Benda Xu gentoo.org> sci-mathematics/cadabra/cadabra-1.39.ebuild | 88 ----------- .../cadabra/files/cadabra-1.33-FLAGS.patch | 171 --------------------- .../cadabra/files/cadabra-1.39-FLAGS.patch | 171 --------------------- sci-mathematics/cadabra/metadata.xml | 9 -- 4 files changed, 439 deletions(-) diff --git a/sci-mathematics/cadabra/cadabra-1.39.ebuild b/sci-mathematics/cadabra/cadabra-1.39.ebuild deleted file mode 100644 index 095ab87dd..000000000 --- a/sci-mathematics/cadabra/cadabra-1.39.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils texlive-common - -DESCRIPTION="Field-theory motivated computer algebra system" -HOMEPAGE="http://cadabra.phi-sci.com" -SRC_URI="http://cadabra.phi-sci.com/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples X test" - -CDEPEND=" - sci-libs/modglue - sci-mathematics/lie - dev-libs/gmp[cxx] - dev-libs/libpcre - X? ( - x11-libs/gtk+:2 - dev-cpp/gtkmm:2.4 - dev-cpp/pangomm:1.4 - app-text/dvipng )" -DEPEND="${CDEPEND} - doc? ( - app-doc/doxygen - dev-texlive/texlive-latexextra - app-text/texlive-core - ) - test? ( sys-process/time )" -RDEPEND="${CDEPEND} - virtual/latex-base - dev-texlive/texlive-latexrecommended" - -src_prepare(){ - # fixing the flag mess - epatch "${FILESDIR}/${P}-FLAGS.patch" -} - -src_configure(){ - econf $(use_enable X gui) \ - --disable-runtime-dependency-check -} - -src_compile() { - default - - if use doc; then - cd "${S}/doc" || die - default - cd doxygen/latex || die - emake pdf - fi -} - -src_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 - - if use doc; then - cd "${S}/doc/doxygen" || die - dohtml html/* - dodoc latex/*.pdf - fi - - if use examples; then - dodoc -r "${S}/examples/" - fi - - rm -rf "${D}/usr/share/TeXmacs" || die -} - -pkg_postinst() { - etexmf-update - elog "This version of the cadabra ebuild is still under development." - elog "Help us improve the ebuild in:" - elog "http://bugs.gentoo.org/show_bug.cgi?id= 194393" -} - -pkg_postrm() { - etexmf-update -} diff --git a/sci-mathematics/cadabra/files/cadabra-1.33-FLAGS.patch b/sci-mathematics/cadabra/files/cadabra-1.33-FLAGS.patch deleted file mode 100644 index 2d78e9327..000000000 --- a/sci-mathematics/cadabra/files/cadabra-1.33-FLAGS.patch +++ /dev/null @@ -1,171 +0,0 @@ ---- 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 diff --git a/sci-mathematics/cadabra/files/cadabra-1.39-FLAGS.patch b/sci-mathematics/cadabra/files/cadabra-1.39-FLAGS.patch deleted file mode 100644 index 2f18edb2a..000000000 --- a/sci-mathematics/cadabra/files/cadabra-1.39-FLAGS.patch +++ /dev/null @@ -1,171 +0,0 @@ ---- Makefile.in -+++ Makefile.in -@@ -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) ); ---- gui/Makefile.in -+++ gui/Makefile.in -@@ -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 -diff -u -r cadabra-1.39.orig/src/Makefile.in cadabra-1.39/src/Makefile.in ---- src/Makefile.in -+++ src/Makefile.in -@@ -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_new.o - # @CXX@ -o test_xperm test_xperm.o modules/xperm_new.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 diff --git a/sci-mathematics/cadabra/metadata.xml b/sci-mathematics/cadabra/metadata.xml deleted file mode 100644 index 0cc2fca48..000000000 --- a/sci-mathematics/cadabra/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - sci-mathematics@gentoo.org - Gentoo Mathematics Project - - Cadabra is a computer algebra system (CAS) designed specifically for the solution of problems encountered in field theory. It has extensive functionality for tensor computer algebra, tensor polynomial simplification including multi-term symmetries, fermions and anti-commuting variables, Clifford algebras and Fierz transformations, implicit coordinate dependence, multiple index types and many more. -