2 files changed, 8 insertions, 44 deletions
diff --git a/databases/py-berkeleydb/files/patch-setup2.py b/databases/py-berkeleydb/files/patch-setup2.py
deleted file mode 100644
index 4ed3fdfd8d8f..000000000000
--- a/databases/py-berkeleydb/files/patch-setup2.py
+++ /dev/null
@@ -1,35 +0,0 @@
---- setup2.py.orig	2016-02-08 21:14:26 UTC
-+++ setup2.py
-@@ -81,11 +81,7 @@ if (sys.version_info[0] < 3) and (sys.ve
-             category=DeprecationWarning)
- 
- 
--try :
--  from setuptools import setup, Extension
--except :
--  from distutils.core import setup, Extension
--
-+from distutils.core import setup, Extension
- from distutils.dep_util import newer
- import distutils.ccompiler
- 
-@@ -288,8 +284,8 @@ if os.name == 'posix':
-         incdir = os.path.join(BERKELEYDB_DIR, 'include')
-     if not libdir:
-         libdir = os.path.join(BERKELEYDB_DIR, 'lib')
--    if not '-ldb' in LIBS:
--        libname = [dblib]
-+    if not '-l%%DBVERSION%%' in LIBS:
-+        libname = ['%%DBVERSION%%']
-     else:
-         if debug: print "LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'"
-         libname = []
-@@ -328,7 +324,7 @@ if os.name == 'posix':
- 
-     # read db.h to figure out what version of Berkeley DB this is
-     ver = None
--    with open(os.path.join(incdir, 'db.h'), 'r') as f :
-+    with open('%%BDB_INCLUDE_DIR%%/db.h', 'r') as f :
-         db_h_lines = f.readlines()
-     db_ver_re = re.compile(
-         r'^#define\s+DB_VERSION_STRING\s.*Berkeley DB (\d+\.\d+).*')
diff --git a/databases/py-berkeleydb/files/patch-setup3.py b/databases/py-berkeleydb/files/patch-setup3.py
index 3ff9359b825d..8991b8079829 100644
--- a/databases/py-berkeleydb/files/patch-setup3.py
+++ b/databases/py-berkeleydb/files/patch-setup3.py
@@ -1,19 +1,18 @@
---- setup3.py.orig	2016-02-08 21:18:47 UTC
+--- setup3.py.orig	2020-12-07 19:17:41 UTC
 +++ setup3.py
-@@ -81,11 +81,7 @@ if (sys.version_info[0] < 3) and (sys.ve
-             category=DeprecationWarning)
+@@ -41,10 +41,7 @@ import sys
+ import glob
  
  
 -try :
 -  from setuptools import setup, Extension
--except :
+-except Exception:
 -  from distutils.core import setup, Extension
--
 +from distutils.core import setup, Extension
+ 
  from distutils.dep_util import newer
  import distutils.ccompiler
- 
-@@ -288,8 +284,8 @@ if os.name == 'posix':
+@@ -258,8 +255,8 @@ if os.name == 'posix':
          incdir = os.path.join(BERKELEYDB_DIR, 'include')
      if not libdir:
          libdir = os.path.join(BERKELEYDB_DIR, 'lib')
@@ -24,9 +23,9 @@
      else:
          if debug: print("LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'")
          libname = []
-@@ -328,7 +324,7 @@ if os.name == 'posix':
+@@ -298,7 +295,7 @@ if os.name == 'posix':
  
-     # read db.h to figure out what version of Berkeley DB this is
+     # read db.h to figure out what version of Oracle Berkeley DB this is
      ver = None
 -    with open(os.path.join(incdir, 'db.h'), 'r') as f :
 +    with open('%%BDB_INCLUDE_DIR%%/db.h', 'r') as f :