From 9d6aeaad9b43dd97bc2d839823bf47f9976be450 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Tue, 2 Feb 2021 21:07:05 -0800
Subject: [PATCH 01/13] build/pkgs/scipoptsuite: Update to 7.0.2

---
 build/pkgs/scipoptsuite/checksums.ini       | 6 +++---
 build/pkgs/scipoptsuite/package-version.txt | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/pkgs/scipoptsuite/checksums.ini b/build/pkgs/scipoptsuite/checksums.ini
index 18295f417c1..4761fb416e6 100644
--- a/build/pkgs/scipoptsuite/checksums.ini
+++ b/build/pkgs/scipoptsuite/checksums.ini
@@ -1,4 +1,4 @@
 tarball=scipoptsuite-VERSION-do-not-distribute.tgz
-sha1=6f7f1b6fb09f7fcd289a260bfdc81b2918086514
-md5=56071392f5cc2a85cd995758cd90af25
-cksum=11618526
+sha1=711bb29ee3ca26dd6ae08a26637dac5da2405605
+md5=4d85624679644db1d2a8c2cb843942dc
+cksum=1761242752
diff --git a/build/pkgs/scipoptsuite/package-version.txt b/build/pkgs/scipoptsuite/package-version.txt
index 6b244dcd696..a8907c025d5 100644
--- a/build/pkgs/scipoptsuite/package-version.txt
+++ b/build/pkgs/scipoptsuite/package-version.txt
@@ -1 +1 @@
-5.0.1
+7.0.2

From 0b9cf1c167f3847d48843fb3aa51e0d84ec49fca Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Tue, 2 Feb 2021 21:07:49 -0800
Subject: [PATCH 02/13] build/pkgs/scipoptsuite: Update patches

---
 .../patches/0001-Use-libhistory.patch         | 18 ++---
 .../0001-added-cmake-ipopt-patch.patch        | 77 -------------------
 ...pts-Put-ZIMPL-includes-first-to-avoi.patch | 10 +--
 ...use-INSTALL_NAME_DIR-fix-for-libscip.patch | 24 ------
 4 files changed, 14 insertions(+), 115 deletions(-)
 delete mode 100644 build/pkgs/scipoptsuite/patches/0001-added-cmake-ipopt-patch.patch
 delete mode 100644 build/pkgs/scipoptsuite/patches/0003-use-INSTALL_NAME_DIR-fix-for-libscip.patch

diff --git a/build/pkgs/scipoptsuite/patches/0001-Use-libhistory.patch b/build/pkgs/scipoptsuite/patches/0001-Use-libhistory.patch
index 965f603e5db..5823371caac 100644
--- a/build/pkgs/scipoptsuite/patches/0001-Use-libhistory.patch
+++ b/build/pkgs/scipoptsuite/patches/0001-Use-libhistory.patch
@@ -1,7 +1,7 @@
-From 0b79dea019a9b258014454ac527f04f7d76763fd Mon Sep 17 00:00:00 2001
+From f9ac9ece39f487de3115a653d5d626514385ef8e Mon Sep 17 00:00:00 2001
 From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
 Date: Thu, 5 Apr 2018 12:01:25 -0500
-Subject: [PATCH 1/3] Use libhistory
+Subject: [PATCH 1/2] Use libhistory
 
 ---
  scip/cmake/Modules/FindReadline.cmake | 11 ++++++++---
@@ -36,10 +36,10 @@ index 051a1e7..9f14b5f 100644
  mark_as_advanced(
      Readline_ROOT_DIR
 diff --git a/scip/src/CMakeLists.txt b/scip/src/CMakeLists.txt
-index bbe9c72..ef55fe7 100644
+index c3bec60..01e2fc8 100644
 --- a/scip/src/CMakeLists.txt
 +++ b/scip/src/CMakeLists.txt
-@@ -803,6 +803,7 @@ setLibProperties(libscip "scip")
+@@ -963,6 +963,7 @@ endif()
  target_link_libraries(libscip PRIVATE
      ${ZLIB_LIBRARIES}
      ${Readline_LIBRARY}
@@ -47,15 +47,15 @@ index bbe9c72..ef55fe7 100644
      ${GMP_LIBRARIES}
      ${THREAD_LIBRARIES}
      ${NLPI_LIBRARIES}
-@@ -824,7 +825,7 @@ endif()
- 
- target_compile_definitions(scip PRIVATE EXTERN=extern)
+@@ -991,7 +992,7 @@ if(CMAKE_BUILD_TYPE EQUAL "Debug")
+     add_sanitizers(scip)
+ endif()
  
 -target_link_libraries(scip ${ZLIB_LIBRARIES} ${Readline_LIBRARY} ${GMP_LIBRARIES}
 +target_link_libraries(scip ${ZLIB_LIBRARIES} ${Readline_LIBRARY} ${History_LIBRARY} ${GMP_LIBRARIES}
-    ${ZIMPL_LIBRARIES} ${LPS_LIBRARIES} ${SYM_LIBRARIES} ${THREAD_LIBRARIES} ${NLPI_LIBRARIES})
+    ${ZIMPL_LIBRARIES} ${LPS_LIBRARIES} ${SYM_LIBRARIES} ${THREAD_LIBRARIES} ${NLPI_LIBRARIES} ${PAPILO_IMPORTED_TARGETS})
  
  add_dependencies(libscip scip_update_githash)
 -- 
-2.11.0
+2.28.0
 
diff --git a/build/pkgs/scipoptsuite/patches/0001-added-cmake-ipopt-patch.patch b/build/pkgs/scipoptsuite/patches/0001-added-cmake-ipopt-patch.patch
deleted file mode 100644
index 96f9091d187..00000000000
--- a/build/pkgs/scipoptsuite/patches/0001-added-cmake-ipopt-patch.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 983b0b8630c41d2ce966877709184564432436cf Mon Sep 17 00:00:00 2001
-From: Moritz Firsching <moritz@math.fu-berlin.de>
-Date: Tue, 17 Apr 2018 11:09:35 +0200
-Subject: [PATCH] added cmake ipopt patch
-
----
- scip/cmake/Modules/FindIPOPT.cmake | 26 ++++++++++++++++----------
- 1 file changed, 16 insertions(+), 10 deletions(-)
-
-diff --git a/scip/cmake/Modules/FindIPOPT.cmake b/scip/cmake/Modules/FindIPOPT.cmake
-index 4d65120..00f4c34 100644
---- a/scip/cmake/Modules/FindIPOPT.cmake
-+++ b/scip/cmake/Modules/FindIPOPT.cmake
-@@ -35,6 +35,7 @@
- # (To distribute this file outside of YCM, substitute the full
- #  License text for the above reference.)
- 
-+SET(IPOPT_FOUND FALSE)
- 
- if(NOT WIN32)
-   # On non Windows systems we use PkgConfig to find IPOPT
-@@ -62,6 +63,7 @@ if(NOT WIN32)
-                      PATHS ${_PC_IPOPT_LIBRARY_DIRS})
-         list(APPEND IPOPT_LIBRARIES ${${_LIBRARY}_PATH})
-       endforeach()
-+      set(IPOPT_FOUND TRUE)
-     else()
-       set(IPOPT_DEFINITIONS "")
-     endif()
-@@ -114,6 +116,7 @@ if(NOT WIN32)
-           endif()
-           mark_as_advanced(IPOPT_SEARCH_FOR_${LIB})
-         endforeach()
-+        set(IPOPT_FOUND TRUE)
-       endif()
-     endif()
- 
-@@ -180,6 +183,7 @@ else()
-         endif()
-         mark_as_advanced(IPOPT_SEARCH_FOR_${LIB})
-       endforeach()
-+      set(IPOPT_FOUND TRUE)
-     endif()
-   endif()
- 
-@@ -188,16 +192,18 @@ else()
- endif()
- 
- # parse the version number
--if(EXISTS ${IPOPT_INCLUDE_DIRS} )
--  file(STRINGS ${IPOPT_INCLUDE_DIRS}/IpoptConfig.h CONFIGFILE)
--
--  foreach(STR ${CONFIGFILE})
--    if("${STR}" MATCHES "^#define IPOPT_VERSION ")
--      string(REGEX REPLACE "#define IPOPT_VERSION " "" IPOPT_VERSION ${STR})
--      string(REGEX REPLACE "\"" "" IPOPT_VERSION ${IPOPT_VERSION})
--    endif()
--  endforeach()
--  # MESSAGE("found Ipopt ${IPOPT_VERSION}")
-+if(IPOPT_FOUND)
-+  if(EXISTS ${IPOPT_INCLUDE_DIRS} )
-+    file(STRINGS ${IPOPT_INCLUDE_DIRS}/IpoptConfig.h CONFIGFILE)
-+
-+    foreach(STR ${CONFIGFILE})
-+      if("${STR}" MATCHES "^#define IPOPT_VERSION ")
-+        string(REGEX REPLACE "#define IPOPT_VERSION " "" IPOPT_VERSION ${STR})
-+        string(REGEX REPLACE "\"" "" IPOPT_VERSION ${IPOPT_VERSION})
-+      endif()
-+    endforeach()
-+    # MESSAGE("found Ipopt ${IPOPT_VERSION}")
-+  endif()
- endif()
- 
- mark_as_advanced(IPOPT_INCLUDE_DIRS
--- 
-2.17.0
-
diff --git a/build/pkgs/scipoptsuite/patches/0002-ZIMPL-cmake-scripts-Put-ZIMPL-includes-first-to-avoi.patch b/build/pkgs/scipoptsuite/patches/0002-ZIMPL-cmake-scripts-Put-ZIMPL-includes-first-to-avoi.patch
index 5e0350f824d..3e4b2977b83 100644
--- a/build/pkgs/scipoptsuite/patches/0002-ZIMPL-cmake-scripts-Put-ZIMPL-includes-first-to-avoi.patch
+++ b/build/pkgs/scipoptsuite/patches/0002-ZIMPL-cmake-scripts-Put-ZIMPL-includes-first-to-avoi.patch
@@ -1,7 +1,7 @@
-From 656f9c88d52639af5109ca18c329bce6e0cea4da Mon Sep 17 00:00:00 2001
+From 78286c79696405cb19b6da5c82fc78837ff41ffc Mon Sep 17 00:00:00 2001
 From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
 Date: Thu, 5 Apr 2018 17:53:39 -0500
-Subject: [PATCH 2/3] ZIMPL cmake scripts: Put ZIMPL includes first to avoid
+Subject: [PATCH 2/2] ZIMPL cmake scripts: Put ZIMPL includes first to avoid
  clash of idxset.h with install soplex idxset.h
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 2/3] ZIMPL cmake scripts: Put ZIMPL includes first to avoid
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/zimpl/src/CMakeLists.txt b/zimpl/src/CMakeLists.txt
-index ee4dbca..a2d0865 100644
+index 5395d60..f378d68 100644
 --- a/zimpl/src/CMakeLists.txt
 +++ b/zimpl/src/CMakeLists.txt
-@@ -5,7 +5,7 @@ flex_target(MMLSCAN zimpl/mmlscan.l ${CMAKE_CURRENT_BINARY_DIR}/mmlscan.c)
+@@ -7,7 +7,7 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zimpl)
  include_directories(${CMAKE_CURRENT_BINARY_DIR})
  
  # for zimpl headers
@@ -22,5 +22,5 @@ index ee4dbca..a2d0865 100644
  set(libsources
      zimpl/blkmem.c
 -- 
-2.11.0
+2.28.0
 
diff --git a/build/pkgs/scipoptsuite/patches/0003-use-INSTALL_NAME_DIR-fix-for-libscip.patch b/build/pkgs/scipoptsuite/patches/0003-use-INSTALL_NAME_DIR-fix-for-libscip.patch
deleted file mode 100644
index a80dd953d4a..00000000000
--- a/build/pkgs/scipoptsuite/patches/0003-use-INSTALL_NAME_DIR-fix-for-libscip.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From a6ff146209ed3dfab985870aa529889625492196 Mon Sep 17 00:00:00 2001
-From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
-Date: Mon, 16 Apr 2018 12:17:08 +0200
-Subject: [PATCH 3/3] use INSTALL_NAME_DIR fix for libscip
-
----
- scip/src/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/scip/src/CMakeLists.txt b/scip/src/CMakeLists.txt
-index ef55fe7..838ef15 100644
---- a/scip/src/CMakeLists.txt
-+++ b/scip/src/CMakeLists.txt
-@@ -834,6 +834,7 @@ add_dependencies(scip scip_update_githash)
- set_target_properties(libscip PROPERTIES
-     VERSION ${SCIP_VERSION_MAJOR}.${SCIP_VERSION_MINOR}.${SCIP_VERSION_PATCH}.${SCIP_VERSION_SUB}
-     SOVERSION ${SCIP_VERSION_MAJOR}.${SCIP_VERSION_MINOR}
-+    INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
-     INSTALL_RPATH_USE_LINK_PATH TRUE)
- 
- # set the install rpath to the installed destination
--- 
-2.11.0
-

From 73aed97df8dbd8ea04d3d74e84efe24a0dc1b5f9 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Tue, 2 Feb 2021 22:32:14 -0800
Subject: [PATCH 03/13] build/pkgs/scipoptsuite/spkg-install.in: Update

---
 build/pkgs/scipoptsuite/spkg-install.in | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/build/pkgs/scipoptsuite/spkg-install.in b/build/pkgs/scipoptsuite/spkg-install.in
index ec4d8daca18..6757f740077 100644
--- a/build/pkgs/scipoptsuite/spkg-install.in
+++ b/build/pkgs/scipoptsuite/spkg-install.in
@@ -1,18 +1,13 @@
-echo "Building scipoptsuite with cmake"
-
 cd src
 mkdir build
 cd build
-cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DGMP_DIR="${SAGE_LOCAL}" -DZLIB_ROOT="${SAGE_LOCAL}" -DReadline_ROOT_DIR="${SAGE_LOCAL}" -DBLISS_DIR="${SAGE_LOCAL}" -DIPOPT=FALSE
-make
-make install
-
-$SAGE_LOCAL/bin/scip -s /dev/null -c quit
-
-if [ $? -ne 0 ]; then
-    echo "SCIP build completed but the scip executable does not work."
-    exit 1
-fi
-
-
-echo "Finished building scipoptsuite"
+cmake .. -DCMAKE_INSTALL_LIBDIR=lib \
+         -DCMAKE_VERBOSE_MAKEFILE=ON \
+         -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE \
+         -DGMP_DIR="${SAGE_GMP_PREFIX}" \
+         -DReadline_ROOT_DIR=$(pkg-config --variable=prefix readline) \
+         -DHistory_ROOT_DIR=$(pkg-config --variable=prefix readline) \
+         -DIPOPT=FALSE \
+    || sdh_die "Error configuring $PKG_NAME with cmake"
+sdh_make
+sdh_make_install

From 3680001cd48940bfdcb404cd4e9a77f987fe6824 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Tue, 2 Feb 2021 21:59:56 -0800
Subject: [PATCH 04/13] build/pkgs/scipoptsuite/SPKG.rst: Update

---
 build/pkgs/scipoptsuite/SPKG.rst     | 25 ++++++++++++-------------
 build/pkgs/scipoptsuite/dependencies |  2 +-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/build/pkgs/scipoptsuite/SPKG.rst b/build/pkgs/scipoptsuite/SPKG.rst
index 37c7e3deb86..1372f850f93 100644
--- a/build/pkgs/scipoptsuite/SPKG.rst
+++ b/build/pkgs/scipoptsuite/SPKG.rst
@@ -20,20 +20,14 @@ this license without charge for research purposes as a member of a
 non-commercial and academic institution, e.g., a university. The
 software is available with its source code.
 
-http://scip.zib.de/academic.txt
-
-
-SPKG Maintainers
-----------------
-
--  Martin Albrecht (original spkg)
--  Matthias Koeppe (updates for new spkg style)
+https://www.scipopt.org/academic.txt
 
 
 Upstream Contact
 ----------------
 
-http://scip.zib.de/doc/html/AUTHORS.shtml
+https://scipopt.org/#scipoptsuite
+
 
 Dependencies
 ------------
@@ -41,10 +35,15 @@ Dependencies
 cmake
 
 
+scipoptsuite brings its own patched version of the bliss library.
+This will conflict with the optional package bliss.
+
+
 Special Update/Build Instructions
 ---------------------------------
 
-We do not have permission to redistribute SCIP or SoPlex. Hence, you
-must download it yourself from http://scip.zib.de and put the tarball
-``scipoptsuite-VERSION.tgz`` in ``$SAGE_ROOT/upstream``, renaming
-it to ``scipoptsuite-VERSION-do-not-distribute.tgz``.
+We do not have permission to redistribute the SCIP Optimization Suite.
+
+Hence, you must download it yourself from http://scip.zib.de and
+put the tarball ``scipoptsuite-VERSION.tgz`` in ``$SAGE_ROOT/upstream``,
+renaming it to ``scipoptsuite-VERSION-do-not-distribute.tgz``.
diff --git a/build/pkgs/scipoptsuite/dependencies b/build/pkgs/scipoptsuite/dependencies
index dfc5ec2e844..13b3d86f23b 100644
--- a/build/pkgs/scipoptsuite/dependencies
+++ b/build/pkgs/scipoptsuite/dependencies
@@ -1,4 +1,4 @@
-$(MP_LIBRARY) bliss readline | cmake
+$(MP_LIBRARY) readline | cmake
 
 ----------
 All lines of this file are ignored except the first.

From dadd03dca118587f22cd71695cbdcc0ff1764eb1 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Fri, 11 Nov 2022 22:03:40 -0800
Subject: [PATCH 05/13] build/pkgs/scipoptsuite: Update to 8.0.2, remove
 patches for now

---
 build/pkgs/scipoptsuite/SPKG.rst              | 24 +-------
 build/pkgs/scipoptsuite/checksums.ini         |  9 +--
 build/pkgs/scipoptsuite/dependencies          |  2 +-
 .../scipoptsuite/has_nonfree_dependencies     |  0
 build/pkgs/scipoptsuite/package-version.txt   |  2 +-
 .../patches/0001-Use-libhistory.patch         | 61 -------------------
 ...pts-Put-ZIMPL-includes-first-to-avoi.patch | 26 --------
 7 files changed, 9 insertions(+), 115 deletions(-)
 delete mode 100644 build/pkgs/scipoptsuite/has_nonfree_dependencies
 delete mode 100644 build/pkgs/scipoptsuite/patches/0001-Use-libhistory.patch
 delete mode 100644 build/pkgs/scipoptsuite/patches/0002-ZIMPL-cmake-scripts-Put-ZIMPL-includes-first-to-avoi.patch

diff --git a/build/pkgs/scipoptsuite/SPKG.rst b/build/pkgs/scipoptsuite/SPKG.rst
index 1372f850f93..553d87c9a5e 100644
--- a/build/pkgs/scipoptsuite/SPKG.rst
+++ b/build/pkgs/scipoptsuite/SPKG.rst
@@ -4,7 +4,7 @@ scipoptsuite: Mixed integer programming solver
 Description
 -----------
 
-SCIP is currently one of the fastest non-commercial mixed integer
+SCIP is currently one of the fastest open source mixed integer
 programming (MIP) solvers. It is also a framework for constraint integer
 programming and branch-cut-and-price. It allows total control of the
 solution process and the access of detailed information down to the guts
@@ -13,14 +13,7 @@ of the solver.
 License
 -------
 
-ZIB Academic License
-
-The ZIB Academic License allows the use of software distributed under
-this license without charge for research purposes as a member of a
-non-commercial and academic institution, e.g., a university. The
-software is available with its source code.
-
-https://www.scipopt.org/academic.txt
+Apache 2.0
 
 
 Upstream Contact
@@ -32,18 +25,5 @@ https://scipopt.org/#scipoptsuite
 Dependencies
 ------------
 
-cmake
-
-
 scipoptsuite brings its own patched version of the bliss library.
 This will conflict with the optional package bliss.
-
-
-Special Update/Build Instructions
----------------------------------
-
-We do not have permission to redistribute the SCIP Optimization Suite.
-
-Hence, you must download it yourself from http://scip.zib.de and
-put the tarball ``scipoptsuite-VERSION.tgz`` in ``$SAGE_ROOT/upstream``,
-renaming it to ``scipoptsuite-VERSION-do-not-distribute.tgz``.
diff --git a/build/pkgs/scipoptsuite/checksums.ini b/build/pkgs/scipoptsuite/checksums.ini
index 4761fb416e6..97b8c8a7084 100644
--- a/build/pkgs/scipoptsuite/checksums.ini
+++ b/build/pkgs/scipoptsuite/checksums.ini
@@ -1,4 +1,5 @@
-tarball=scipoptsuite-VERSION-do-not-distribute.tgz
-sha1=711bb29ee3ca26dd6ae08a26637dac5da2405605
-md5=4d85624679644db1d2a8c2cb843942dc
-cksum=1761242752
+tarball=scip-VERSION.tar.gz
+sha1=2637767428e285b6ddda8c462f1cc31d66833d80
+md5=b657369986ecd9b2944206d11ecce2e4
+cksum=967379932
+upstream_url=https://github.com/scipopt/scip/archive/refs/tags/vVERSION.tar.gz
diff --git a/build/pkgs/scipoptsuite/dependencies b/build/pkgs/scipoptsuite/dependencies
index 13b3d86f23b..577c65e0a0d 100644
--- a/build/pkgs/scipoptsuite/dependencies
+++ b/build/pkgs/scipoptsuite/dependencies
@@ -1,4 +1,4 @@
-$(MP_LIBRARY) readline | cmake
+$(MP_LIBRARY) readline soplex | cmake
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/scipoptsuite/has_nonfree_dependencies b/build/pkgs/scipoptsuite/has_nonfree_dependencies
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/build/pkgs/scipoptsuite/package-version.txt b/build/pkgs/scipoptsuite/package-version.txt
index a8907c025d5..227b54a0631 100644
--- a/build/pkgs/scipoptsuite/package-version.txt
+++ b/build/pkgs/scipoptsuite/package-version.txt
@@ -1 +1 @@
-7.0.2
+802
diff --git a/build/pkgs/scipoptsuite/patches/0001-Use-libhistory.patch b/build/pkgs/scipoptsuite/patches/0001-Use-libhistory.patch
deleted file mode 100644
index 5823371caac..00000000000
--- a/build/pkgs/scipoptsuite/patches/0001-Use-libhistory.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From f9ac9ece39f487de3115a653d5d626514385ef8e Mon Sep 17 00:00:00 2001
-From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
-Date: Thu, 5 Apr 2018 12:01:25 -0500
-Subject: [PATCH 1/2] Use libhistory
-
----
- scip/cmake/Modules/FindReadline.cmake | 11 ++++++++---
- scip/src/CMakeLists.txt               |  3 ++-
- 2 files changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/scip/cmake/Modules/FindReadline.cmake b/scip/cmake/Modules/FindReadline.cmake
-index 051a1e7..9f14b5f 100644
---- a/scip/cmake/Modules/FindReadline.cmake
-+++ b/scip/cmake/Modules/FindReadline.cmake
-@@ -31,14 +31,19 @@ find_library(Readline_LIBRARY
-     HINTS ${Readline_ROOT_DIR}/lib
- )
- 
--if(Readline_INCLUDE_DIR AND Readline_LIBRARY AND Ncurses_LIBRARY)
-+find_library(History_LIBRARY
-+    NAMES history
-+    HINTS ${Readline_ROOT_DIR}/lib
-+)
-+
-+if(Readline_INCLUDE_DIR AND Readline_LIBRARY AND History_LIBRARY AND Ncurses_LIBRARY)
-   set(READLINE_FOUND TRUE)
--else(Readline_INCLUDE_DIR AND Readline_LIBRARY AND Ncurses_LIBRARY)
-+else(Readline_INCLUDE_DIR AND Readline_LIBRARY AND History_LIBRARY AND Ncurses_LIBRARY)
-   FIND_LIBRARY(Readline_LIBRARY NAMES readline)
-   include(FindPackageHandleStandardArgs)
-   FIND_PACKAGE_HANDLE_STANDARD_ARGS(Readline DEFAULT_MSG Readline_INCLUDE_DIR Readline_LIBRARY )
-   MARK_AS_ADVANCED(Readline_INCLUDE_DIR Readline_LIBRARY)
--endif(Readline_INCLUDE_DIR AND Readline_LIBRARY AND Ncurses_LIBRARY)
-+endif(Readline_INCLUDE_DIR AND Readline_LIBRARY AND History_LIBRARY AND Ncurses_LIBRARY)
- 
- mark_as_advanced(
-     Readline_ROOT_DIR
-diff --git a/scip/src/CMakeLists.txt b/scip/src/CMakeLists.txt
-index c3bec60..01e2fc8 100644
---- a/scip/src/CMakeLists.txt
-+++ b/scip/src/CMakeLists.txt
-@@ -963,6 +963,7 @@ endif()
- target_link_libraries(libscip PRIVATE
-     ${ZLIB_LIBRARIES}
-     ${Readline_LIBRARY}
-+    ${History_LIBRARY}
-     ${GMP_LIBRARIES}
-     ${THREAD_LIBRARIES}
-     ${NLPI_LIBRARIES}
-@@ -991,7 +992,7 @@ if(CMAKE_BUILD_TYPE EQUAL "Debug")
-     add_sanitizers(scip)
- endif()
- 
--target_link_libraries(scip ${ZLIB_LIBRARIES} ${Readline_LIBRARY} ${GMP_LIBRARIES}
-+target_link_libraries(scip ${ZLIB_LIBRARIES} ${Readline_LIBRARY} ${History_LIBRARY} ${GMP_LIBRARIES}
-    ${ZIMPL_LIBRARIES} ${LPS_LIBRARIES} ${SYM_LIBRARIES} ${THREAD_LIBRARIES} ${NLPI_LIBRARIES} ${PAPILO_IMPORTED_TARGETS})
- 
- add_dependencies(libscip scip_update_githash)
--- 
-2.28.0
-
diff --git a/build/pkgs/scipoptsuite/patches/0002-ZIMPL-cmake-scripts-Put-ZIMPL-includes-first-to-avoi.patch b/build/pkgs/scipoptsuite/patches/0002-ZIMPL-cmake-scripts-Put-ZIMPL-includes-first-to-avoi.patch
deleted file mode 100644
index 3e4b2977b83..00000000000
--- a/build/pkgs/scipoptsuite/patches/0002-ZIMPL-cmake-scripts-Put-ZIMPL-includes-first-to-avoi.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 78286c79696405cb19b6da5c82fc78837ff41ffc Mon Sep 17 00:00:00 2001
-From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
-Date: Thu, 5 Apr 2018 17:53:39 -0500
-Subject: [PATCH 2/2] ZIMPL cmake scripts: Put ZIMPL includes first to avoid
- clash of idxset.h with install soplex idxset.h
-
----
- zimpl/src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/zimpl/src/CMakeLists.txt b/zimpl/src/CMakeLists.txt
-index 5395d60..f378d68 100644
---- a/zimpl/src/CMakeLists.txt
-+++ b/zimpl/src/CMakeLists.txt
-@@ -7,7 +7,7 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zimpl)
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
- 
- # for zimpl headers
--include_directories(zimpl)
-+include_directories(BEFORE zimpl)
- 
- set(libsources
-     zimpl/blkmem.c
--- 
-2.28.0
-

From ae40ac95b4978441458f60d322ddbd9ba3611694 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Fri, 11 Nov 2022 22:13:05 -0800
Subject: [PATCH 06/13] build/pkgs/scipoptsuite: Change to optional

---
 build/pkgs/scipoptsuite/type | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/pkgs/scipoptsuite/type b/build/pkgs/scipoptsuite/type
index 9839eb20815..134d9bc32d5 100644
--- a/build/pkgs/scipoptsuite/type
+++ b/build/pkgs/scipoptsuite/type
@@ -1 +1 @@
-experimental
+optional

From 338b9fc224f7d805f4d853cc1cff50a872d66710 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Fri, 11 Nov 2022 22:35:59 -0800
Subject: [PATCH 07/13] build/pkgs/scipoptsuite: Update dependencies, cmake
 options

---
 build/pkgs/scipoptsuite/dependencies    | 2 +-
 build/pkgs/scipoptsuite/spkg-install.in | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build/pkgs/scipoptsuite/dependencies b/build/pkgs/scipoptsuite/dependencies
index 577c65e0a0d..76b0b1ecde1 100644
--- a/build/pkgs/scipoptsuite/dependencies
+++ b/build/pkgs/scipoptsuite/dependencies
@@ -1,4 +1,4 @@
-$(MP_LIBRARY) readline soplex | cmake
+$(MP_LIBRARY) readline soplex zlib | cmake
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/scipoptsuite/spkg-install.in b/build/pkgs/scipoptsuite/spkg-install.in
index 6757f740077..3feabed9a99 100644
--- a/build/pkgs/scipoptsuite/spkg-install.in
+++ b/build/pkgs/scipoptsuite/spkg-install.in
@@ -1,13 +1,17 @@
 cd src
 mkdir build
 cd build
-cmake .. -DCMAKE_INSTALL_LIBDIR=lib \
+sdh_cmake -DCMAKE_INSTALL_LIBDIR=lib \
          -DCMAKE_VERBOSE_MAKEFILE=ON \
          -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE \
          -DGMP_DIR="${SAGE_GMP_PREFIX}" \
          -DReadline_ROOT_DIR=$(pkg-config --variable=prefix readline) \
          -DHistory_ROOT_DIR=$(pkg-config --variable=prefix readline) \
-         -DIPOPT=FALSE \
+         -DIPOPT=off \
+         -DPAPILO=off \
+         -DZIMPL=off \
+         -DAMPL=off \
+         .. \
     || sdh_die "Error configuring $PKG_NAME with cmake"
 sdh_make
 sdh_make_install

From 68fb9a7cb229f23bbbd94b3ead9747006ae243ae Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Sun, 13 Nov 2022 16:15:13 -0800
Subject: [PATCH 08/13] build/pkgs/scipoptsuite/dependencies: Add papilo

---
 build/pkgs/scipoptsuite/dependencies    | 2 +-
 build/pkgs/scipoptsuite/spkg-install.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/pkgs/scipoptsuite/dependencies b/build/pkgs/scipoptsuite/dependencies
index 76b0b1ecde1..62836bef5a5 100644
--- a/build/pkgs/scipoptsuite/dependencies
+++ b/build/pkgs/scipoptsuite/dependencies
@@ -1,4 +1,4 @@
-$(MP_LIBRARY) readline soplex zlib | cmake
+$(MP_LIBRARY) readline soplex papilo zlib | cmake
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/scipoptsuite/spkg-install.in b/build/pkgs/scipoptsuite/spkg-install.in
index 3feabed9a99..87de26af415 100644
--- a/build/pkgs/scipoptsuite/spkg-install.in
+++ b/build/pkgs/scipoptsuite/spkg-install.in
@@ -8,7 +8,7 @@ sdh_cmake -DCMAKE_INSTALL_LIBDIR=lib \
          -DReadline_ROOT_DIR=$(pkg-config --variable=prefix readline) \
          -DHistory_ROOT_DIR=$(pkg-config --variable=prefix readline) \
          -DIPOPT=off \
-         -DPAPILO=off \
+         -DPAPILO=on \
          -DZIMPL=off \
          -DAMPL=off \
          .. \

From 2dd029e6607e7ef6966dee83d5db5f92fd3121ed Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Sat, 19 Nov 2022 17:19:16 -0800
Subject: [PATCH 09/13] build/pkgs/{scipoptsuite,soplex}: Use papilo

---
 build/pkgs/scipoptsuite/spkg-install.in | 6 +++---
 build/pkgs/soplex/spkg-install.in       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/pkgs/scipoptsuite/spkg-install.in b/build/pkgs/scipoptsuite/spkg-install.in
index 87de26af415..9aaf53f7f0c 100644
--- a/build/pkgs/scipoptsuite/spkg-install.in
+++ b/build/pkgs/scipoptsuite/spkg-install.in
@@ -8,10 +8,10 @@ sdh_cmake -DCMAKE_INSTALL_LIBDIR=lib \
          -DReadline_ROOT_DIR=$(pkg-config --variable=prefix readline) \
          -DHistory_ROOT_DIR=$(pkg-config --variable=prefix readline) \
          -DIPOPT=off \
-         -DPAPILO=on \
+         -DPAPILO=on -DPAPILO_DIR="${SAGE_LOCAL}" \
          -DZIMPL=off \
          -DAMPL=off \
-         .. \
-    || sdh_die "Error configuring $PKG_NAME with cmake"
+         -DSYM=bliss \
+         ..
 sdh_make
 sdh_make_install
diff --git a/build/pkgs/soplex/spkg-install.in b/build/pkgs/soplex/spkg-install.in
index 0afb67d5026..388285d4f7b 100644
--- a/build/pkgs/soplex/spkg-install.in
+++ b/build/pkgs/soplex/spkg-install.in
@@ -2,7 +2,7 @@ cd src
 mkdir build
 cd build
 sdh_cmake -DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON \
-          -DMPFR=ON \
+          -DPAPILO=on -DPAPILO_DIR="${SAGE_LOCAL}" \
           ..
 sdh_make
 sdh_make_install

From 5efb7ba56ff1050aaa339909473de3ebd978b57b Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Sat, 19 Nov 2022 19:23:10 -0800
Subject: [PATCH 10/13] build/pkgs/soplex/dependencies: Add papilo

---
 build/pkgs/soplex/dependencies | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/pkgs/soplex/dependencies b/build/pkgs/soplex/dependencies
index 0d53ceacb01..32c8bdd67ec 100644
--- a/build/pkgs/soplex/dependencies
+++ b/build/pkgs/soplex/dependencies
@@ -1 +1 @@
-$(MP_LIBRARY) mpfr boost_cropped zlib | cmake
+$(MP_LIBRARY) mpfr boost_cropped zlib papilo | cmake

From 0fc60a0c9a77ce58d1da4d017b5524e8553e65ec Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Sun, 27 Nov 2022 14:18:58 -0800
Subject: [PATCH 11/13] build/pkgs/scipoptsuite: Fix install_name on macOS

---
 .../pkgs/scipoptsuite/patches/no_rpath.patch  | 40 +++++++++++++++++++
 build/pkgs/scipoptsuite/spkg-install.in       |  2 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 build/pkgs/scipoptsuite/patches/no_rpath.patch

diff --git a/build/pkgs/scipoptsuite/patches/no_rpath.patch b/build/pkgs/scipoptsuite/patches/no_rpath.patch
new file mode 100644
index 00000000000..28b4220b6b3
--- /dev/null
+++ b/build/pkgs/scipoptsuite/patches/no_rpath.patch
@@ -0,0 +1,40 @@
+commit eaff18abb55c86e90d44583731550c874dc3c3e0
+Author: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
+Date:   Sun Nov 27 14:12:32 2022 -0800
+
+    CMakeLists.txt: Remove hardcoded RPATH settings
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 8629ace18b..db2505d74b 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -3,8 +3,7 @@
+ #
+ function(setLibProperties targetname outputname)
+     set_target_properties(${targetname} PROPERTIES
+-        OUTPUT_NAME ${outputname}
+-        MACOSX_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
++        OUTPUT_NAME ${outputname})
+ endfunction(setLibProperties)
+ 
+ set(CMAKE_C_STANDARD 99)
+@@ -1092,7 +1091,6 @@ add_dependencies(scip scip_update_githash)
+ set_target_properties(libscip PROPERTIES
+     VERSION ${SCIP_VERSION_MAJOR}.${SCIP_VERSION_MINOR}.${SCIP_VERSION_PATCH}.${SCIP_VERSION_SUB}
+     SOVERSION ${SCIP_VERSION_MAJOR}.${SCIP_VERSION_MINOR}
+-    INSTALL_RPATH_USE_LINK_PATH TRUE
+     CXX_VISIBILITY_PRESET hidden
+     C_VISIBILITY_PRESET hidden
+     VISIBILITY_INLINES_HIDDEN 1)
+@@ -1102,11 +1100,6 @@ target_include_directories(scip PUBLIC
+     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+     $<INSTALL_INTERFACE:include>)
+ 
+-# set the install rpath to the installed destination
+-set_target_properties(scip PROPERTIES
+-    INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
+-    INSTALL_RPATH_USE_LINK_PATH TRUE)
+-
+ # install the header files of scip
+ install(FILES ${lpiheaders} DESTINATION include/lpi)
+ install(FILES ${dijkstraheaders} DESTINATION include/dijkstra)
diff --git a/build/pkgs/scipoptsuite/spkg-install.in b/build/pkgs/scipoptsuite/spkg-install.in
index 9aaf53f7f0c..69bbdfae266 100644
--- a/build/pkgs/scipoptsuite/spkg-install.in
+++ b/build/pkgs/scipoptsuite/spkg-install.in
@@ -3,7 +3,7 @@ mkdir build
 cd build
 sdh_cmake -DCMAKE_INSTALL_LIBDIR=lib \
          -DCMAKE_VERBOSE_MAKEFILE=ON \
-         -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE \
+         -DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON \
          -DGMP_DIR="${SAGE_GMP_PREFIX}" \
          -DReadline_ROOT_DIR=$(pkg-config --variable=prefix readline) \
          -DHistory_ROOT_DIR=$(pkg-config --variable=prefix readline) \

From 392455dc743a3c17a6ba750c4f9354cb15701b7f Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Sun, 27 Nov 2022 14:19:32 -0800
Subject: [PATCH 12/13] build/pkgs/scip: Rename from scipoptsuite

---
 build/pkgs/{scipoptsuite => scip}/SPKG.rst               | 6 +++---
 build/pkgs/{scipoptsuite => scip}/checksums.ini          | 0
 build/pkgs/{scipoptsuite => scip}/dependencies           | 0
 build/pkgs/{scipoptsuite => scip}/distros/repology.txt   | 0
 build/pkgs/{scipoptsuite => scip}/package-version.txt    | 0
 build/pkgs/{scipoptsuite => scip}/patches/no_rpath.patch | 0
 build/pkgs/{scipoptsuite => scip}/spkg-check.in          | 0
 build/pkgs/{scipoptsuite => scip}/spkg-install.in        | 0
 build/pkgs/{scipoptsuite => scip}/type                   | 0
 9 files changed, 3 insertions(+), 3 deletions(-)
 rename build/pkgs/{scipoptsuite => scip}/SPKG.rst (75%)
 rename build/pkgs/{scipoptsuite => scip}/checksums.ini (100%)
 rename build/pkgs/{scipoptsuite => scip}/dependencies (100%)
 rename build/pkgs/{scipoptsuite => scip}/distros/repology.txt (100%)
 rename build/pkgs/{scipoptsuite => scip}/package-version.txt (100%)
 rename build/pkgs/{scipoptsuite => scip}/patches/no_rpath.patch (100%)
 rename build/pkgs/{scipoptsuite => scip}/spkg-check.in (100%)
 rename build/pkgs/{scipoptsuite => scip}/spkg-install.in (100%)
 rename build/pkgs/{scipoptsuite => scip}/type (100%)

diff --git a/build/pkgs/scipoptsuite/SPKG.rst b/build/pkgs/scip/SPKG.rst
similarity index 75%
rename from build/pkgs/scipoptsuite/SPKG.rst
rename to build/pkgs/scip/SPKG.rst
index 553d87c9a5e..5a6d3082d27 100644
--- a/build/pkgs/scipoptsuite/SPKG.rst
+++ b/build/pkgs/scip/SPKG.rst
@@ -1,5 +1,5 @@
-scipoptsuite: Mixed integer programming solver
-==============================================
+scip: Mixed integer programming solver
+======================================
 
 Description
 -----------
@@ -25,5 +25,5 @@ https://scipopt.org/#scipoptsuite
 Dependencies
 ------------
 
-scipoptsuite brings its own patched version of the bliss library.
+scip brings its own patched version of the bliss library.
 This will conflict with the optional package bliss.
diff --git a/build/pkgs/scipoptsuite/checksums.ini b/build/pkgs/scip/checksums.ini
similarity index 100%
rename from build/pkgs/scipoptsuite/checksums.ini
rename to build/pkgs/scip/checksums.ini
diff --git a/build/pkgs/scipoptsuite/dependencies b/build/pkgs/scip/dependencies
similarity index 100%
rename from build/pkgs/scipoptsuite/dependencies
rename to build/pkgs/scip/dependencies
diff --git a/build/pkgs/scipoptsuite/distros/repology.txt b/build/pkgs/scip/distros/repology.txt
similarity index 100%
rename from build/pkgs/scipoptsuite/distros/repology.txt
rename to build/pkgs/scip/distros/repology.txt
diff --git a/build/pkgs/scipoptsuite/package-version.txt b/build/pkgs/scip/package-version.txt
similarity index 100%
rename from build/pkgs/scipoptsuite/package-version.txt
rename to build/pkgs/scip/package-version.txt
diff --git a/build/pkgs/scipoptsuite/patches/no_rpath.patch b/build/pkgs/scip/patches/no_rpath.patch
similarity index 100%
rename from build/pkgs/scipoptsuite/patches/no_rpath.patch
rename to build/pkgs/scip/patches/no_rpath.patch
diff --git a/build/pkgs/scipoptsuite/spkg-check.in b/build/pkgs/scip/spkg-check.in
similarity index 100%
rename from build/pkgs/scipoptsuite/spkg-check.in
rename to build/pkgs/scip/spkg-check.in
diff --git a/build/pkgs/scipoptsuite/spkg-install.in b/build/pkgs/scip/spkg-install.in
similarity index 100%
rename from build/pkgs/scipoptsuite/spkg-install.in
rename to build/pkgs/scip/spkg-install.in
diff --git a/build/pkgs/scipoptsuite/type b/build/pkgs/scip/type
similarity index 100%
rename from build/pkgs/scipoptsuite/type
rename to build/pkgs/scip/type

From 9b402723dff9a32c66ed4d5fbccacd586c6720cf Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Sun, 27 Nov 2022 18:17:33 -0800
Subject: [PATCH 13/13] build/pkgs/scip/distros/conda.txt: New

---
 build/pkgs/scip/distros/conda.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/scip/distros/conda.txt

diff --git a/build/pkgs/scip/distros/conda.txt b/build/pkgs/scip/distros/conda.txt
new file mode 100644
index 00000000000..3065c152171
--- /dev/null
+++ b/build/pkgs/scip/distros/conda.txt
@@ -0,0 +1 @@
+scip