commit: 7894577df96cff5d7c6ad03905271d4003064d71 Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc> AuthorDate: Thu Oct 22 13:04:08 2020 +0000 Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc> CommitDate: Thu Oct 22 13:04:16 2020 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=7894577d
sci-mathematics/gap: move gap-core to gap make it compatible with ::sage-on-gentoo gap package now it is possible to use their dev-gap packages with ::science gap Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc> profiles/package.mask | 6 -- profiles/updates/4Q-2020 | 1 + sci-mathematics/gap-core/metadata.xml | 30 -------- sci-mathematics/gap/files/64gap-gentoo.el | 10 --- .../files/gap-4.11.0-autoconf.patch} | 50 -------------- .../gap-4.11.0.ebuild} | 10 +-- sci-mathematics/gap/gap-4.4.12.ebuild | 79 ---------------------- sci-mathematics/gap/metadata.xml | 29 ++++---- 8 files changed, 23 insertions(+), 192 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index f495d9865..d39812beb 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -29,9 +29,3 @@ ## app-misc/some-package #--- END OF EXAMPLES --- - -# Aisha Tammy <[email protected]> (2020-10-21) -# This ebuild is unmaintainable and the package -# is going to be split subpackages -# suggested replacement - sci-mathematics/gap-core -sci-mathematics/gap \ No newline at end of file diff --git a/profiles/updates/4Q-2020 b/profiles/updates/4Q-2020 new file mode 100644 index 000000000..fe4449bff --- /dev/null +++ b/profiles/updates/4Q-2020 @@ -0,0 +1 @@ +move sci-libs/amdlibm sci-libs/aocl-libm diff --git a/sci-mathematics/gap-core/metadata.xml b/sci-mathematics/gap-core/metadata.xml deleted file mode 100644 index f1f953b82..000000000 --- a/sci-mathematics/gap-core/metadata.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Aisha Tammy</name> - </maintainer> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Mathematics Project</name> - </maintainer> - <longdescription lang="en"> - Groups, Algorithms, Programming is a system for computational - discrete algebra, with particular emphasis on Computational Group - Theory. GAP provides a programming language, a library of thousands - of functions implementing algebraic algorithms written in the GAP - language as well as large data libraries of algebraic objects. GAP - is used in research and teaching for studying groups and their - representations, rings, vector spaces, algebras, combinatorial - structures, and more. - </longdescription> - <use> - <flag name="boehm">Use <pkg>dev-libs/boehm-gc</pkg> as garbage collector</flag> - <flag name="hpc">Build gap with multithreading and parallel process support</flag> - <flag name="julia">Build julia bindings</flag> - <flag name="julia-gc">Use the julia garbage collector</flag> - <flag name="memcheck">Enable memory checking</flag> - <flag name="valgrind">Build symbols to be used by valgrind</flag> - </use> -</pkgmetadata> diff --git a/sci-mathematics/gap/files/64gap-gentoo.el b/sci-mathematics/gap/files/64gap-gentoo.el deleted file mode 100644 index 24756c0b1..000000000 --- a/sci-mathematics/gap/files/64gap-gentoo.el +++ /dev/null @@ -1,10 +0,0 @@ -;; gap mode -(autoload 'gap-mode "gap-mode" "Gap editing mode" t) -(setq auto-mode-alist (append (list '("\\.g$" . gap-mode) - '("\\.gap$" . gap-mode)) - auto-mode-alist)) -(autoload 'gap "gap-process" "Run GAP in emacs buffer" t) - -(setq gap-executable "/usr/bin/gap") -(setq gap-start-options ()) -;; end gap mode diff --git a/sci-mathematics/gap-core/files/gap-core-4.11.0-autoconf.patch b/sci-mathematics/gap/files/gap-4.11.0-autoconf.patch similarity index 62% rename from sci-mathematics/gap-core/files/gap-core-4.11.0-autoconf.patch rename to sci-mathematics/gap/files/gap-4.11.0-autoconf.patch index ea3ebdfe6..b220f3ada 100644 --- a/sci-mathematics/gap-core/files/gap-core-4.11.0-autoconf.patch +++ b/sci-mathematics/gap/files/gap-4.11.0-autoconf.patch @@ -1,53 +1,3 @@ -diff --git a/Makefile.rules b/Makefile.rules -index c2971b2..3c04e8b 100644 ---- a/Makefile.rules -+++ b/Makefile.rules -@@ -483,20 +483,22 @@ clean: - - LTINSTALL=$(LIBTOOL) --mode=install $(INSTALL) - --install: -- @echo "Error, 'make install' has not yet been implemented" -- exit 1 -+install: install-bin install-libgap install-headers install-gaproot - - install-bin: -- @echo "Warning, 'make install-bin' is incomplete" - $(INSTALL) -d -m 0755 $(DESTDIR)$(bindir) -- $(INSTALL) -m 0755 gap $(DESTDIR)$(bindir)/gap.real -- echo "!/bin/sh\nexec \"$(bindir)/gap.real\" -l \"$(datarootdir)/gap\" \"$@\"" > gap-wrapper.sh -- $(INSTALL) -m 0755 gap-wrapper.sh $(DESTDIR)$(bindir)/gap -- # TODO: make gac installable; this requires adjusting path in it, and -- # installing the libtool script generated by configure somewhere; and then -- # putting that path to it into gac) -- #$(INSTALL) gac $(DESTDIR)$(bindir) -+ $(INSTALL) -m 0755 gap $(DESTDIR)$(datarootdir)/gap -+ echo "!/bin/sh\nexec \"$(datarootdir)/gap\" -l \"$(datarootdir)/gap\" \"$@\"" > gap -+ $(INSTALL) -m 0755 gap $(DESTDIR)$(bindir) -+ sed -e "s:^abs_top_builddir=.*$:abs_top_builddir=\"$(datarootdir)/gap\":" \ -+ -e "s:^abs_top_srcdir=.*$:abs_top_srcdir=\"$(datarootdir)/gap\":" \ -+ -i gac -+ $(INSTALL) -m 0755 gac $(DESTDIR)$(bindir) -+ -+install-libgap: libgap.la -+ @echo "Warning, 'make install-libgap' is incomplete" -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(libdir) -+ $(LTINSTALL) libgap.la $(DESTDIR)$(libdir) - - install-gaproot: - @echo "Warning, 'make install-gaproot' is incomplete" -@@ -538,11 +540,6 @@ install-headers: - $(INSTALL) -m 0644 $(srcdir)/src/hpc/*.h $(DESTDIR)$(includedir)/gap/hpc - # TODO: take care of config.h, this is difficult - --install-libgap: libgap.la -- @echo "Warning, 'make install-libgap' is incomplete" -- $(INSTALL) -d -m 0755 $(DESTDIR)$(libdir) -- $(LTINSTALL) libgap.la $(DESTDIR)$(libdir) -- - - .PHONY: install install-bin install-gaproot install-headers install-libgap - diff --git a/configure.ac b/configure.ac index 938fcd3..b3b2340 100644 --- a/configure.ac diff --git a/sci-mathematics/gap-core/gap-core-4.11.0.ebuild b/sci-mathematics/gap/gap-4.11.0.ebuild similarity index 92% rename from sci-mathematics/gap-core/gap-core-4.11.0.ebuild rename to sci-mathematics/gap/gap-4.11.0.ebuild index 35043f58e..db0da0967 100644 --- a/sci-mathematics/gap-core/gap-core-4.11.0.ebuild +++ b/sci-mathematics/gap/gap-4.11.0.ebuild @@ -6,12 +6,11 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) inherit autotools python-any-r1 -DESCRIPTION="Computational discrete algebra system - Core system of GAP" +DESCRIPTION="Computational discrete algebra system - minimal GAP core system" HOMEPAGE="https://www.gap-system.org/"; -SRC_URI="https://github.com/gap-system/gap/releases/download/v${PV}/gap-${PV}-core.tar.bz2 -> ${P}.tar.bz2 - https://github.com/gap-system/gap/releases/download/v${PV}/packages-required-v${PV}.tar.gz -> ${P}-packages.tar.gz +SRC_URI="https://github.com/gap-system/gap/releases/download/v${PV}/gap-${PV}-core.tar.bz2 + https://github.com/gap-system/gap/releases/download/v${PV}/packages-required-v${PV}.tar.gz -> ${P}-core-packages.tar.gz " -S="${WORKDIR}"/gap-${PV} SLOT="0" LICENSE="GPL-2" @@ -68,6 +67,7 @@ src_prepare() { } src_configure() { + addwrite /proc/self local myconf=( --enable-shared --disable-static @@ -128,7 +128,7 @@ src_install() { cp -a src/hpc/*.h "${ED}"/usr/include/gap/hpc || die fi - cp -a doc grp lib libtool "${ED}"/usr/share/gap || die + cp -a doc grp lib libtool pkg "${ED}"/usr/share/gap || die sed -e "s:${S}:${EPREFIX}/usr/share/gap:g" -i sysinfo.gap insinto /usr/share/gap diff --git a/sci-mathematics/gap/gap-4.4.12.ebuild b/sci-mathematics/gap/gap-4.4.12.ebuild deleted file mode 100644 index a728704c2..000000000 --- a/sci-mathematics/gap/gap-4.4.12.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit elisp-common versionator - -XTOM_VERSION=1r1p4 - -PV1=$(get_version_component_range 1-2 ) -PV2=$(get_version_component_range 3 ) -PV1=$(replace_version_separator 1 'r' ${PV1} ) -PV2=${PV1}p${PV2} - -DESCRIPTION="System for computational discrete algebra" -HOMEPAGE="http://www.gap-system.org/"; -SRC_URI=" - ftp://ftp.gap-system.org/pub/gap/gap44/tar.bz2/${PN}${PV2}.tar.bz2 - xtom? ( ftp://ftp.gap-system.org/pub/gap/gap44/tar.bz2/xtom${XTOM_VERSION}.tar.bz2 )" - -SLOT="0" -IUSE="emacs vim-syntax xtom" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - emacs? ( app-editors/emacs:* ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}"/${PN}${PV1} - -src_compile() { - emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" compile -} - -src_test() { - emake teststandard -} - -src_install() { - dodoc README description* - insinto /usr/share/${PN} - doins -r doc grp lib pkg prim small trans tst sysinfo.gap - source sysinfo.gap - exeinto /usr/libexec/${PN} - doexe bin/${GAParch}/gap - sed -e "s|@gapdir@|/usr/share/${PN}|" \ - -e "s|@target@-@CC@|/usr/libexec/${PN}|" \ - -e "s|@EXEEXT@||" \ - -e 's|$GAP_DIR/bin/||' \ - gap.shi > gap || doe - dobin gap - - if use emacs ; then - elisp-site-file-install etc/emacs/gap-mode.el - elisp-site-file-install etc/emacs/gap-process.el - elisp-site-file-install "${FILESDIR}"/64gap-gentoo.el - dodoc etc/emacs/gap-mode.doc - fi - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax - doins etc/gap.vim - insinto /usr/share/vim/vimfiles/indent - newins etc/gap_indent.vim gap.vim - insinto /usr/share/vim/vimfiles/plugin - newins etc/debug.vim debug_gap.vim - dodoc etc/README.vim-utils etc/debugvim.txt - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sci-mathematics/gap/metadata.xml b/sci-mathematics/gap/metadata.xml index 2d5c1a14d..f1f953b82 100644 --- a/sci-mathematics/gap/metadata.xml +++ b/sci-mathematics/gap/metadata.xml @@ -2,24 +2,29 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <maintainer type="person"> - <email>[email protected]</email> - <name>Andrey Grozin</name> + <email>[email protected]</email> + <name>Aisha Tammy</name> </maintainer> <maintainer type="project"> <email>[email protected]</email> <name>Gentoo Mathematics Project</name> </maintainer> <longdescription lang="en"> -Groups, Algorithms, Programming is a system for computational -discrete algebra, with particular emphasis on Computational Group -Theory. GAP provides a programming language, a library of thousands -of functions implementing algebraic algorithms written in the GAP -language as well as large data libraries of algebraic objects. GAP -is used in research and teaching for studying groups and their -representations, rings, vector spaces, algebras, combinatorial -structures, and more. -</longdescription> + Groups, Algorithms, Programming is a system for computational + discrete algebra, with particular emphasis on Computational Group + Theory. GAP provides a programming language, a library of thousands + of functions implementing algebraic algorithms written in the GAP + language as well as large data libraries of algebraic objects. GAP + is used in research and teaching for studying groups and their + representations, rings, vector spaces, algebras, combinatorial + structures, and more. + </longdescription> <use> - <flag name="xtom">Automatically generated description for xtom</flag> + <flag name="boehm">Use <pkg>dev-libs/boehm-gc</pkg> as garbage collector</flag> + <flag name="hpc">Build gap with multithreading and parallel process support</flag> + <flag name="julia">Build julia bindings</flag> + <flag name="julia-gc">Use the julia garbage collector</flag> + <flag name="memcheck">Enable memory checking</flag> + <flag name="valgrind">Build symbols to be used by valgrind</flag> </use> </pkgmetadata>
