Rebase patches, add pyprimecount dependency

1 files changed, 6 insertions, 6 deletions

diff --git a/sagemath-optional-packages.patch b/sagemath-optional-packages.patch
index 4130e8850da6..fa5dd945dccc 100644
--- a/sagemath-optional-packages.patch
+++ b/sagemath-optional-packages.patch
@@ -1,11 +1,11 @@
 diff --git a/pkgs/sagemath-standard/setup.py b/pkgs/sagemath-standard/setup.py
-index 0d7c29d746..fb34cbfd5e 100755
+index 6744236593..a038006449 100755
 --- a/pkgs/sagemath-standard/setup.py
 +++ b/pkgs/sagemath-standard/setup.py
-@@ -75,10 +75,9 @@ if sdist:
- else:
+@@ -81,10 +81,9 @@ else:
+     from sage_setup.optional_extension import is_package_installed_and_updated
      distributions = ['']
-     optional_packages_with_extensions = ['mcqd', 'bliss', 'tdlib', 'primecount',
+     optional_packages_with_extensions = ['mcqd', 'bliss', 'tdlib',
 -                                         'coxeter3', 'fes', 'sirocco', 'meataxe']
 +                                         'coxeter3', 'sirocco', 'meataxe']
      distributions += ['sagemath-{}'.format(pkg)
@@ -13,5 +13,5 @@ index 0d7c29d746..fb34cbfd5e 100755
 -                      if is_package_installed_and_updated(pkg)]
 +                      for pkg in optional_packages_with_extensions]
      log.warn('distributions = {0}'.format(distributions))
- 
- from sage_setup.find import find_python_sources
+     from sage_setup.find import find_python_sources
+     python_packages, python_modules, cython_modules = find_python_sources(