Skip to content

Commit

Permalink
Merge branch 'vbraun' for sage 10.2
Browse files Browse the repository at this point in the history
  • Loading branch information
kiwifb committed Dec 3, 2023
2 parents b9a5ede + a9c918e commit 6a748af
Show file tree
Hide file tree
Showing 23 changed files with 890 additions and 60 deletions.
1 change: 1 addition & 0 deletions dev-gap/guava/Manifest
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
DIST guava-3.17.tar.gz 2624632 BLAKE2B bab8e5719fb0513aadd09ebc4e9a3c83d9ddfaf4a9f124c036053d452fee6455fff2696b868667f4c0abb9962e749919491c892b907afbc542e1593a11bfb0f5 SHA512 785bd0fd65b6717aefb22caca35ee77e21ee48a7fcf3f401cc0a3839ebe187fd700a9053d3f581c6865f4cd0cfc4b83792530e7be18fe40a1d694f571990b457
DIST guava-3.18.tar.gz 2635260 BLAKE2B f2b81d6418204564afeede7901f9d9a54e93a165913ffd6152a641590452455d07607e511ecde220a0d9f44182d793ce25bde51c5103324033f9b0470b2bb234 SHA512 350240ffff584877fa3981e4acdda94419bdeb982de26a308af056dd3130b38eeccaf6157afef7ffbdab359b0fddf5a213ccb6d27d2f4e8955ae45e0607d6b97
2 changes: 1 addition & 1 deletion dev-gap/guava/guava-3.17.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ IUSE=""
DEPEND=">=sci-mathematics/gap-4.12.2"
RDEPEND="${DEPEND}"

DOCS=( README.md {CHANGES,HISTORY,README}.${PN} )
DOCS=( README.md CHANGES HISTORY )

PATCHES=(
"${FILESDIR}"/${PN}-3.15-makefile.patch
Expand Down
49 changes: 49 additions & 0 deletions dev-gap/guava/guava-3.18.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

inherit gap-pkg toolchain-funcs

DESCRIPTION="GAP package for computing with error-correcting codes"
HOMEPAGE="https://www.gap-system.org/Packages/guava.html"
SLOT="0"
SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"

LICENSE="|| ( GPL-2 GPL-3 )"
KEYWORDS="~amd64 ~x86"
IUSE=""

DEPEND=">=sci-mathematics/gap-4.12.2"
RDEPEND="${DEPEND}"

DOCS=( README.md CHANGES HISTORY )

PATCHES=(
"${FILESDIR}"/${PN}-3.15-makefile.patch
)

GAP_PKG_OBJS="doc lib tbl"

src_prepare() {
default
# Remove temporary files in src/leon/.
rm src/leon/src/stamp-h1 || die
}

src_configure() {
# Not a real autoconf configure script
# The argument is the folder containing sysinfo.gap
./configure $(gap_sysinfo_loc)

cd src/leon/ || die
# real autoconf configure script
econf
}

src_compile() {
# COMPILE, COMPOPT, LINKOPT are needed to compile the code in src/leon/.
emake \
CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
COMPILE="$(tc-getCC)" COMPOPT="${CFLAGS} -c" LINKOPT="${LDFLAGS}"
}
2 changes: 1 addition & 1 deletion package.keywords/sage
48 changes: 14 additions & 34 deletions package.keywords/sage-10.1 → package.keywords/sage-10.2
Original file line number Diff line number Diff line change
@@ -1,41 +1,30 @@
dev-python/cvxopt
~dev-python/cysignals-1.11.2
dev-python/memory-allocator
~dev-python/pplpy-0.8.7
dev-python/pyopengl
~dev-python/cypari2-2.1.3
>=dev-python/cysignals-1.11.4
=dev-python/pplpy-0.8*
=dev-python/cypari2-2.1*
>dev-python/furo-2023.8.19
~dev-python/jupyter-jsmol-2022.1.0
~dev-python/jupyter-sphinx-0.3.2
dev-python/lrcalc
dev-python/primecountpy
dev-python/jupyter-sphinx
>=dev-python/rpy-3.5.7
dev-python/sphinx-copybutton
~dev-python/sympy-1.11.1
=dev-tex/sagetex-3*
media-gfx/tachyon
~media-gfx/threejs-sage-extension-122
sci-libs/dsdp
~sci-libs/fplll-5.4.4
~dev-python/fpylll-0.5.9
=sci-mathematics/arb-2.22*
>=sci-libs/fplll-5.4.5
>=dev-python/fpylll-0.6.0
sci-mathematics/cu2
sci-mathematics/cubex
sci-mathematics/dikcube
>sci-mathematics/giac-1.9.0.0
~sci-mathematics/gmp-ecm-7.0.5
~sci-mathematics/lcalc-1.23
~sci-mathematics/lrcalc-2.1
~sci-mathematics/maxima-5.46.0::sage-on-gentoo
sci-mathematics/mcube
sci-mathematics/optimal
sci-mathematics/palp
=sci-mathematics/pari-2.15*
~sci-mathematics/sage-10.1
~sci-mathematics/sage-conf-10.1
~sci-mathematics/sage_setup-10.1
~sci-mathematics/sage_docbuild-10.1
~sci-mathematics/sage-doc-10.1
~sci-mathematics/sage-10.2
~sci-mathematics/sage-conf-10.2
~sci-mathematics/sage_setup-10.2
~sci-mathematics/sage_docbuild-10.2
~sci-mathematics/sage-doc-10.2
~sci-mathematics/sage-data-conway_polynomials-0.5
~sci-mathematics/sage-data-combinatorial_designs-20140630
~sci-mathematics/sage-data-elliptic_curves-0.8
Expand All @@ -50,13 +39,12 @@ sci-mathematics/ExportSageNB
# sage optional binding
#########################
sci-libs/modular_decomposition
sci-libs/bliss
~sci-mathematics/sagemath-bliss-10.1
~sci-mathematics/sagemath-bliss-10.2
dev-libs/igraph
sci-mathematics/shared_meataxe
~sci-mathematics/sagemath-meataxe-10.1
~sci-mathematics/sagemath-meataxe-10.2
sci-libs/libsirocco
~sci-mathematics/sagemath-sirocco-10.1
~sci-mathematics/sagemath-sirocco-10.2
# optional packages
~sci-mathematics/database_knotinfo-2023.6.1
sci-mathematics/surface-dynamics
Expand All @@ -68,14 +56,6 @@ sci-mathematics/spherogram
sci-mathematics/plink
sci-mathematics/snappy
sci-mathematics/FXrays
# coinor-cbc
sci-libs/coinor-cbc
sci-libs/coinor-clp
sci-libs/coinor-cgl
sci-libs/coinor-dylp
sci-libs/coinor-osi
sci-libs/coinor-utils
sci-libs/coinor-vol
##################################
# GAP 4.12.2
##################################
Expand Down
27 changes: 3 additions & 24 deletions package.keywords/sage-9999
Original file line number Diff line number Diff line change
@@ -1,36 +1,25 @@
dev-python/cvxopt
=dev-python/cysignals-1.11*
dev-python/memory-allocator
>=dev-python/cysignals-1.11.4
=dev-python/pplpy-0.8*
dev-python/pyopengl
=dev-python/cypari2-2.1*
>dev-python/furo-2023.8.19
~dev-python/jupyter-jsmol-2022.1.0
dev-python/jupyter-sphinx
dev-python/lrcalc
dev-python/primecountpy
>=dev-python/rpy-3.5.7
dev-python/sphinx-copybutton
~dev-python/sympy-1.11.1
=dev-tex/sagetex-3*
media-gfx/tachyon
~media-gfx/threejs-sage-extension-122
sci-libs/dsdp
~sci-libs/fplll-5.4.4
>=dev-python/fpylll-0.5.9
=sci-mathematics/arb-2.22*
>=sci-libs/fplll-5.4.5
>=dev-python/fpylll-0.6.0
sci-mathematics/cu2
sci-mathematics/cubex
sci-mathematics/dikcube
>sci-mathematics/giac-1.9.0.0
~sci-mathematics/gmp-ecm-7.0.5
~sci-mathematics/lcalc-1.23
~sci-mathematics/lrcalc-2.1
~sci-mathematics/maxima-5.46.0::sage-on-gentoo
sci-mathematics/mcube
sci-mathematics/optimal
sci-mathematics/palp
=sci-mathematics/pari-2.15*
~sci-mathematics/sage-9999 **
~sci-mathematics/sage-conf-9999 **
~sci-mathematics/sage_setup-9999 **
Expand All @@ -50,7 +39,6 @@ sci-mathematics/ExportSageNB
# sage optional binding
#########################
sci-libs/modular_decomposition
sci-libs/bliss
~sci-mathematics/sagemath-bliss-9999 **
dev-libs/igraph
sci-mathematics/shared_meataxe
Expand All @@ -68,15 +56,6 @@ sci-mathematics/spherogram
sci-mathematics/plink
sci-mathematics/snappy
sci-mathematics/FXrays
# coinor-cbc
sci-libs/coinor-cbc
sci-libs/coinor-clp
sci-libs/coinor-cgl
sci-libs/coinor-dylp
sci-libs/coinor-osi
sci-libs/coinor-utils
sci-libs/coinor-vol
sci-mathematics/sage_numerical_backends_coin
##################################
# GAP 4.12.2
##################################
Expand Down
1 change: 1 addition & 0 deletions sci-mathematics/sage-conf/Manifest
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
DIST sage-conf-10.1.tar.gz 2913104 BLAKE2B 919c66239fe967807940ed9602e76d9ec9789f77e9e821ff84b1897c163b18fd283814d9394110448eb6520b1f129503f8c08df41f6a8fbea21e331a068cc6a1 SHA512 cd703f0e616f055c1202c024d9fa06735933ddc8ee3ec7df65f2cd6846ee4a8b53ceb5908c6c427afd9c3ae410654498f8954c2615e60b4b920bd377ddfd47f3
DIST sage-conf-10.2.tar.gz 2998959 BLAKE2B ca16168f905c9b42f4f5de3b13e102166db9d4969e67da3dbe26bcfdf100afb8a3e01414947e0eb1e47a2a3ec03b9579e398f2f6d8aa934648adc901e19ba9b4 SHA512 c73c01b24e9a1ed31dd72e0fbb35887d4aa63a86ee9279350762062d353e5e721857daa862ae4a8d67d2efd5af1ed0f2fbe17c83ce3800d20596016aa45308e4
39 changes: 39 additions & 0 deletions sci-mathematics/sage-conf/files/sage-conf-9999.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
diff --git a/pyproject.toml b/pyproject.toml
index d882f39..4d038c7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,13 +11,9 @@ authors = [{name = "The Sage Developers", email = "[email protected]
urls = {Homepage = "https://www.sagemath.org"}
dynamic = ["version"]

-[project.scripts]
-sage-config = "sage_conf:_main"
-
[tool.setuptools]
packages = ["_sage_conf"]
py-modules = ["sage_conf"]
-script-files = ["bin/sage-env-config"]
include-package-data = false

[tool.setuptools.dynamic]
diff --git a/setup.py b/setup.py
index 16686a8..bfb1cbd 100644
--- a/setup.py
+++ b/setup.py
@@ -108,7 +108,6 @@ class build_py(setuptools_build_py):
class build_scripts(distutils_build_scripts):

def run(self):
- self.distribution.scripts.append(os.path.join('bin', 'sage-env-config'))
if not self.distribution.entry_points:
self.entry_points = self.distribution.entry_points = dict()
distutils_build_scripts.run(self)
@@ -123,7 +122,6 @@ class editable_wheel(setuptools_editable_wheel):


setup(
- cmdclass=dict(build_py=build_py,
- build_scripts=build_scripts,
+ cmdclass=dict(build_scripts=build_scripts,
editable_wheel=editable_wheel)
)
60 changes: 60 additions & 0 deletions sci-mathematics/sage-conf/sage-conf-10.2.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="readline,sqlite"
DISTUTILS_USE_PEP517=setuptools

inherit distutils-r1 prefix

if [[ ${PV} == 9999 ]]; then
inherit git-r3 sage-git
EGIT_REPO_URI="https://github.com/sagemath/sage.git"
else
PYPI_NO_NORMALIZE=1
inherit pypi
KEYWORDS="~amd64 ~amd64-linux ~ppc-macos ~x64-macos"
fi

DESCRIPTION="Math software for abstract and numerical computations"
HOMEPAGE="https://www.sagemath.org"

LICENSE="GPL-2"
SLOT="0"

# No real tests here in spite of QA warnings.
RESTRICT="test mirror"

# pplpy needs to be installed to get documentation folder right :(
DEPEND=""
RDEPEND=""
BDEPEND="dev-python/pplpy[doc,${PYTHON_USEDEP}]"

PATCHES=(
"${FILESDIR}/${PN}-10.2.patch"
)

python_prepare_all() {
if [[ ${PV} == 9999 ]]; then
sage-git_src_prepare "${PN}_pypi"
fi

distutils-r1_python_prepare_all

# sage on gentoo environment variables
cp -f "${FILESDIR}"/${PN}.py-10.2 _sage_conf/_conf.py
eprefixify _sage_conf/_conf.py
# set the documentation location to the externally provided sage-doc package
sed -i "s:@GENTOO_PORTAGE_PF@:sage-doc-${PV}:" _sage_conf/_conf.py
# set lib/lib64 - only useful for GAP_LIB_DIR for now
sed -i "s:@libdir@:$(get_libdir):g" _sage_conf/_conf.py
# Fix finding pplpy documentation with intersphinx
local pplpyver=$(best_version dev-python/pplpy)
# using pplpyver from character 11 to remove "dev-python/"
sed -i "s:@PPLY_DOC_VERS@:${pplpyver:11}:" _sage_conf/_conf.py
# Set sage version as stated in VERSION.txt
local sage_version=$(cat VERSION.txt)
sed -i "s:@SAGE_VERSION@:${sage_version}:" _sage_conf/_conf.py
}
1 change: 1 addition & 0 deletions sci-mathematics/sage-doc/Manifest
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
DIST sage-doc-10.1.tar.gz 29253433 BLAKE2B 9dd0e9d41dc03e1344d1edb41bbb8f4845fa5166e784e1606b30da3085f146766eb10433afc4305d17f86713127cdcb00c04ee0903d1c898a0377e9d7fb9577e SHA512 f62633cd3fc4441191abfaf01c7966d789cd995a2b9002abf5063bfc9a307cd267af6c4d048426b190020dee355e4e5d0a26d9b3b0ddcb067c26abf8e73d7995
DIST sage-doc-10.2.tar.gz 29368872 BLAKE2B 2e8dbde8438b6e801c3b78bc680e95bfdef9cdf63a4468117fe6b71e05e33e1044c60daf11d66559ad7d77f02a7589a66c5513b7bd5d268399b5060ae33a9ff9 SHA512 b9eec42aaab22dc28585472ecec16306d10219654930867baf1a15ca490037f9bc87c640bdfbb7a269c48d361e57f80d25d3ed132588612ade02786f527ca06d
Loading

0 comments on commit 6a748af

Please sign in to comment.