commit: 9a15f9addce43008c376f1f68d5bbef481667f6d Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc> AuthorDate: Thu Feb 25 02:08:58 2021 +0000 Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc> CommitDate: Thu Feb 25 02:09:50 2021 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=9a15f9ad
sci-mathematics/lie: fixup to EAPI 7 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc> ...lie-2.2.2-make.patch => lie-2.2.2-debian.patch} | 165 +++++++++++++-------- .../lie/files/parrallelmake-lie-2.2.2.patch | 52 ------- sci-mathematics/lie/lie-2.2.2.ebuild | 35 ++--- sci-mathematics/lie/metadata.xml | 9 +- 4 files changed, 122 insertions(+), 139 deletions(-) diff --git a/sci-mathematics/lie/files/lie-2.2.2-make.patch b/sci-mathematics/lie/files/lie-2.2.2-debian.patch similarity index 63% rename from sci-mathematics/lie/files/lie-2.2.2-make.patch rename to sci-mathematics/lie/files/lie-2.2.2-debian.patch index cf6bd4537..4710cf60b 100644 --- a/sci-mathematics/lie/files/lie-2.2.2-make.patch +++ b/sci-mathematics/lie/files/lie-2.2.2-debian.patch @@ -1,55 +1,22 @@ -diff -u -r -P --new-file --exclude=CVS lie-2.2.2/debian/lie.1 lie-2.2.2-1/debian/lie.1 ---- lie-2.2.2/debian/lie.1 1970-01-01 01:00:00.000000000 +0100 -+++ lie-2.2.2-1/debian/lie.1 2007-02-13 14:32:47.000000000 +0000 -@@ -0,0 +1,27 @@ -+.TH LIE 1 "December 12, 2006" "" "" -+ -+.SH NAME -+LiE - A computer algebra package for Lie group computations -+.SH SYNOPSIS -+.BR "lie" -+.SH DESCRIPTION -+.B LiE -+LiE is a computer algebra system that is specialised in computations -+involving (reductive) Lie groups and their representations. -+ -+Full documentation about the program and the underlying mathematics -+can be found in /usr/share/doc/lie/manual.dvi. -+ -+Run-time help can be obtained by typing '?' for a list of help entries -+or '?help' for help information. -+ -+See the web page at -+.BR "http://young.sp2mi.univ-poitiers.fr/~marc/LiE/"; -+for the CWEBx source code. -+.SH AUTHORS -+LiE was written by Arjeh M. Cohen <[email protected]>, Marc van Leeuwen -+<[email protected]> and Bert Lisser. -+.PP -+This manual page was written by Kasper Peeters -+<[email protected]>, for the Debian project (but may be used -+by others). -diff -u -r -P --new-file --exclude=CVS lie-2.2.2/lie lie-2.2.2-1/lie ---- lie-2.2.2/lie 1970-01-01 01:00:00.000000000 +0100 -+++ lie-2.2.2-1/lie 2007-02-20 21:47:37.000000000 +0000 -@@ -0,0 +1,4 @@ -+#!/bin/sh -+PTH=`which ${0} | sed -e 's/bin\/lie//'` -+ -+exec ${PTH}/bin/Lie.exe initfile ${PTH}/share/lie -diff -u -r -P --new-file --exclude=CVS lie-2.2.2/lie_script lie-2.2.2-1/lie_script ---- lie-2.2.2/lie_script 1996-09-16 16:14:38.000000000 +0100 -+++ lie-2.2.2-1/lie_script 2006-12-17 13:42:23.000000000 +0000 -@@ -1,2 +1,3 @@ --LD=actual directory gets substituted here --exec $LD/Lie.exe initfile $LD -+#!/bin/sh -+#LD=actual directory gets substituted here -+exec /usr/bin/Lie.exe initfile /usr/share/lie -diff -u -r -P --new-file --exclude=CVS lie-2.2.2/Makefile lie-2.2.2-1/Makefile ---- lie-2.2.2/Makefile 2000-04-07 08:46:28.000000000 +0100 -+++ lie-2.2.2-1/Makefile 2007-02-20 20:41:22.000000000 +0000 -@@ -24,20 +24,36 @@ +diff --git a/Makefile b/Makefile +index c049e89..48b5c87 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,11 +1,11 @@ + srcdir :=$(shell pwd) + +-CFLAGS= -O ++CFLAGS?= -O + fixed-flags = -I$(srcdir) -I$(srcdir)/box + all-C-flags:= -ansi $(fixed-flags) $(CFLAGS) + non-ansi-flags := $(fixed-flags) $(CFLAGS) + +-CC = gcc # some compiler for ANSI/ISO C ++CC ?= gcc # some compiler for ANSI/ISO C + + # These settings should also be used in subdirectories: + export CC all-C-flags fixed-flags CFLAGS +@@ -24,20 +24,34 @@ GAP_objects=$(common_objects) gapprint.o gapgetl.o # Global organisation (phony targets) @@ -73,33 +40,42 @@ diff -u -r -P --new-file --exclude=CVS lie-2.2.2/Makefile lie-2.2.2-1/Makefile +# install manual/manual.dvi $(DESTDIR)/usr/share/doc/lie + install -d $(DESTDIR)/usr/share/man/man1 + install debian/lie.1 $(DESTDIR)/usr/share/man/man1 -+ gzip -f9 $(DESTDIR)/usr/share/man/man1/lie.1 ++# gzip -f9 $(DESTDIR)/usr/share/man/man1/lie.1 +# install debian/lie.1 $(DESTDIR)/usr/share/man/man1/Lie.exe.1 +# gzip -f9 $(DESTDIR)/usr/share/man/man1/Lie.exe.1 # To 'make all', we first descend into the subdirectories, and afterwards # return to finish here. - all: +-all: - $(MAKE) math_functions binding_functions -+ $(MAKE) math_functions binding_functions - $(MAKE) finish +- $(MAKE) finish ++all: math_functions binding_functions finish -finish: Lie.exe LEARN.ind INFO.ind # do not call 'make finish' directly +finish: lie Lie.exe LEARN.ind INFO.ind # do not call 'make finish' directly math_functions: $(MAKE) -C box all -@@ -88,7 +104,7 @@ +@@ -82,13 +96,13 @@ gapgetl.o: getl.c + # been set to the most recent one of object files in the respective + # subdirectories, whence taking that dummy file as dependency suffices. + +-date.o: date.c $(objects) box/.last_compiled static/.last_compiled ++date.o: date.c $(objects) math_functions binding_functions + $(CC) -ansi -c date.c +-gapdate.o: date.c $(GAP_objects) box/.last_compiled static/.last_compiled ++gapdate.o: date.c $(GAP_objects) math_functions binding_functions $(CC) -ansi -c -o gapdate.o date.c - Lie.exe: date.o +-Lie.exe: date.o - $(CC) -o Lie.exe $(objects) date.o static/*.o box/*.o -lreadline ++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 $(CC) -o Liegap.exe $(GAP_objects) gapdate.o static/*.o box/*.o -@@ -101,8 +117,8 @@ +@@ -101,8 +115,8 @@ noreadline: math_functions binding_functions $(common_objects) print.o chmod g+w Lie.exe $(MAKE) LEARN.ind INFO.ind script INFO.a @@ -110,7 +86,16 @@ diff -u -r -P --new-file --exclude=CVS lie-2.2.2/Makefile lie-2.2.2-1/Makefile INFO.ind: INFO.0 INFO.1 INFO.2 INFO.3 INFO.4 infoind ./infoind -@@ -123,5 +139,8 @@ +@@ -115,7 +129,7 @@ infoind: util/infoind.c + learnind: util/learnind.c + $(MAKE) -C util ../learnind + +-INFO.a: progs/maxsub progs/maxsub0 progs/eqrank ++INFO.a: Lie.exe progs/maxsub progs/maxsub0 progs/eqrank + rm -f INFO.a + ./Lie.exe < progs/maxsub + +@@ -123,5 +137,8 @@ INFO.a: progs/maxsub progs/maxsub0 progs/eqrank clean: $(MAKE) -C box clean $(MAKE) -C static clean @@ -121,9 +106,63 @@ diff -u -r -P --new-file --exclude=CVS lie-2.2.2/Makefile lie-2.2.2-1/Makefile + rm -f debian/lie/usr/bin/Lie.exe + rm -f debian/lie/usr/bin/lie + rm -f debian/lie/usr/share/lie/* -diff -u -r -P --new-file --exclude=CVS lie-2.2.2/make_lie lie-2.2.2-1/make_lie ---- lie-2.2.2/make_lie 1996-09-16 16:19:07.000000000 +0100 -+++ lie-2.2.2-1/make_lie 2006-12-17 13:42:23.000000000 +0000 +diff --git a/debian/lie.1 b/debian/lie.1 +new file mode 100644 +index 0000000..10bf50d +--- /dev/null ++++ b/debian/lie.1 +@@ -0,0 +1,27 @@ ++.TH LIE 1 "December 12, 2006" "" "" ++ ++.SH NAME ++LiE - A computer algebra package for Lie group computations ++.SH SYNOPSIS ++.BR "lie" ++.SH DESCRIPTION ++.B LiE ++LiE is a computer algebra system that is specialised in computations ++involving (reductive) Lie groups and their representations. ++ ++Full documentation about the program and the underlying mathematics ++can be found in /usr/share/doc/lie/manual.dvi. ++ ++Run-time help can be obtained by typing '?' for a list of help entries ++or '?help' for help information. ++ ++See the web page at ++.BR "http://young.sp2mi.univ-poitiers.fr/~marc/LiE/"; ++for the CWEBx source code. ++.SH AUTHORS ++LiE was written by Arjeh M. Cohen <[email protected]>, Marc van Leeuwen ++<[email protected]> and Bert Lisser. ++.PP ++This manual page was written by Kasper Peeters ++<[email protected]>, for the Debian project (but may be used ++by others). +diff --git a/lie b/lie +new file mode 100644 +index 0000000..5a7a906 +--- /dev/null ++++ b/lie +@@ -0,0 +1,4 @@ ++#!/bin/sh ++PTH=`which ${0} | sed -e 's/bin\/lie//'` ++ ++exec ${PTH}/bin/Lie.exe initfile ${PTH}/share/lie +diff --git a/lie_script b/lie_script +index 76f3701..62972c0 100644 +--- a/lie_script ++++ b/lie_script +@@ -1,2 +1,3 @@ +-LD=actual directory gets substituted here +-exec $LD/Lie.exe initfile $LD ++#!/bin/sh ++#LD=actual directory gets substituted here ++exec /usr/bin/Lie.exe initfile /usr/share/lie +diff --git a/make_lie b/make_lie +index 5f059d7..1b5320b 100755 +--- a/make_lie ++++ b/make_lie @@ -1,3 +1,3 @@ #!/bin/sh -sed -e "s!LD=.*!LD=`/bin/pwd`!" <lie_script >lie diff --git a/sci-mathematics/lie/files/parrallelmake-lie-2.2.2.patch b/sci-mathematics/lie/files/parrallelmake-lie-2.2.2.patch deleted file mode 100644 index 5bd54b403..000000000 --- a/sci-mathematics/lie/files/parrallelmake-lie-2.2.2.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- 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) - --CFLAGS= -O -+CFLAGS?= -O - fixed-flags = -I$(srcdir) -I$(srcdir)/box - all-C-flags:= -ansi $(fixed-flags) $(CFLAGS) - non-ansi-flags := $(fixed-flags) $(CFLAGS) - --CC = gcc # some compiler for ANSI/ISO C -+CC ?= gcc # some compiler for ANSI/ISO C - - # These settings should also be used in subdirectories: - export CC all-C-flags fixed-flags CFLAGS -@@ -49,9 +49,7 @@ - # To 'make all', we first descend into the subdirectories, and afterwards - # return to finish here. - --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,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. - --date.o: date.c $(objects) box/.last_compiled static/.last_compiled -+date.o: date.c $(objects) math_functions binding_functions - $(CC) -ansi -c date.c --gapdate.o: date.c $(GAP_objects) box/.last_compiled static/.last_compiled -+gapdate.o: date.c $(GAP_objects) math_functions binding_functions - $(CC) -ansi -c -o gapdate.o date.c - --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 - --INFO.a: progs/maxsub progs/maxsub0 progs/eqrank -+INFO.a: Lie.exe progs/maxsub progs/maxsub0 progs/eqrank - rm -f INFO.a - ./Lie.exe < progs/maxsub - diff --git a/sci-mathematics/lie/lie-2.2.2.ebuild b/sci-mathematics/lie/lie-2.2.2.ebuild index b41f5cea9..9577bf240 100644 --- a/sci-mathematics/lie/lie-2.2.2.ebuild +++ b/sci-mathematics/lie/lie-2.2.2.ebuild @@ -1,15 +1,14 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="A Computer algebra package for Lie group computations" HOMEPAGE="http://www-math.univ-poitiers.fr/~maavl/LiE/"; # no https, invalid certificate SRC_URI="http://wwwmathlabo.univ-poitiers.fr/~maavl/LiE/conLiE.tar.gz -> ${P}.tar.gz" -#### Remove the following line when moving this ebuild to the main tree! -RESTRICT="mirror" +S="${WORKDIR}/LiE" LICENSE="LGPL-2.1" ##### See http://packages.debian.org/changelogs/pool/main/l/lie/lie_2.2.2+dfsg-1/lie.copyright @@ -17,20 +16,16 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc" -DEPEND=" +RDEPEND=" + sys-libs/readline:= + sys-libs/ncurses:= +" +DEPEND="${RDEPEND}" +BDEPEND="${RDEPEND} sys-devel/bison - sys-libs/readline:0= - sys-libs/ncurses:0=" -RDEPEND="sys-libs/readline:= - sys-libs/ncurses" - -S="${WORKDIR}/LiE" +" -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-make.patch \ - "${FILESDIR}"/parrallelmake-${P}.patch -} +PATCHES=( "${FILESDIR}"/${P}-debian.patch ) src_compile() { emake CC=$(tc-getCC) @@ -38,11 +33,5 @@ src_compile() { src_install() { default - use doc && dodoc "${S}"/manual/* -} - -pkg_postinst() { - elog "This version of the LiE ebuild is still under development." - elog "Help us improve the ebuild in:" - elog "https://bugs.gentoo.org/show_bug.cgi?id=194393"; + use doc && dodoc "${S}"/manual/ } diff --git a/sci-mathematics/lie/metadata.xml b/sci-mathematics/lie/metadata.xml index 5041a04a0..f3e755ec1 100644 --- a/sci-mathematics/lie/metadata.xml +++ b/sci-mathematics/lie/metadata.xml @@ -5,5 +5,12 @@ <email>[email protected]</email> <name>Gentoo Mathematics Project</name> </maintainer> - <longdescription>LiE is the name of a software package that enables mathematicians and physicists to perform computations of a Lie group theoretic nature. It focuses on the representation theory of complex semisimple (reductive) Lie groups and algebras, and on the structure of their Weyl groups and root systems.</longdescription> + <longdescription> + LiE is the name of a software package that enables + mathematicians and physicists to perform computations + of a Lie group theoretic nature. It focuses on the + representation theory of complex semisimple (reductive) + Lie groups and algebras, and on the structure of their + Weyl groups and root systems. + </longdescription> </pkgmetadata>
