[gtk-osx] Remove BerkeleyDB from gtk-osx-python.modules.

[John Ralls <jralls src gnome org>]

commit 1d6fc5dd58cbbeb7f954b2f1a72673ba2e416085
Author: John Ralls <jralls ceridwen us>
Date:   Mon Apr 5 11:49:53 2021 -0700

    Remove BerkeleyDB from gtk-osx-python.modules.
    
    It's not required by any Gnome projects.

 modulesets-stable/gtk-osx-python.modules   | 34 ++----------------------------
 modulesets-unstable/gtk-osx-python.modules | 34 ------------------------------
 modulesets/gtk-osx-python.modules          | 28 ------------------------
 3 files changed, 2 insertions(+), 94 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-python.modules b/modulesets-stable/gtk-osx-python.modules
index 29b33d94..b65b2463 100644
--- a/modulesets-stable/gtk-osx-python.modules
+++ b/modulesets-stable/gtk-osx-python.modules
@@ -49,34 +49,8 @@
     </after>
   </metamodule>
 
-<!--Note the leading ; in autogen-template. It's there on purpose in case the user has set nice_build so 
that the nice prepended to the command doesn't eat the cd. -->
-  <autotools id="berkeleydb" autogen-sh="configure"
-            supports-non-srcdir-builds="no"  makeargs="-C build_unix"
-            autogen-template="cd .;cd build_unix; ../dist/%(autogen-sh)s --prefix %(prefix)s  
%(autogenargs)s"
-            makeinstallargs="-C build_unix install">
-
-    <branch module="berkeley-db/db-4.8.30.NC.tar.gz" version="4.8.30"
-        repo="oracle" >
-      <patch file="https://raw.githubusercontent.com/narkoleptik/os-x-berkeleydb-patch/master/atomic.patch"; 
strip='1'/>
-    </branch>
-  </autotools>
-
-  <!-- For out-of-source-tree builds (i.e., builddir is defined either
-       in .jhbuildrc-custom or passed as an option on the
-       command-line, the normal berkeleydb module will build in its
-       srcdir/build_unix directory. If you want to build it in the
-       build directory with most of the other modules, use this module
-       instead. -->
-  <autotools id="berkeleydb-nonsrctree" autogen-sh="configure"
-         autogen-template="%(srcdir)s/dist/%(autogen-sh)s --prefix %(prefix)s  %(autogenargs)s" >
-
-    <branch module="berkeley-db/db-4.8.30.NC.tar.gz" version="4.8.30"
-        repo="oracle" >
-      <patch file="https://github.com/narkoleptik/os-x-berkeleydb-patch/raw/master/atomic.patch"; strip='1'/>
-    </branch>
-  </autotools>
-
-  <autotools id="python" autogenargs="--enable-shared"
+  <!-- Python 2 end-of-life was 31 December 2020 and 2.7.18 was the last release. -->
+  <autotools id="python2" autogenargs="--enable-shared"
             supports-non-srcdir-builds="no" autogen-sh="autoreconf">
        <branch repo="python"
                module="2.7.17/Python-2.7.17.tgz" version="2.7.17"
@@ -87,10 +61,6 @@
     <dependencies>
       <dep package='readline'/>
     </dependencies>
-    <after>
-      <dep package="berkeleydb"/>
-      <dep package="berkeleydb-nonsrctree"/>
-    </after>
   </autotools>
 
   <autotools id="python3" autogenargs="--enable-shared" autogen-sh="configure">
diff --git a/modulesets-unstable/gtk-osx-python.modules b/modulesets-unstable/gtk-osx-python.modules
index 2c4ecfd4..10694fe1 100644
--- a/modulesets-unstable/gtk-osx-python.modules
+++ b/modulesets-unstable/gtk-osx-python.modules
@@ -9,8 +9,6 @@
               href="git://github.com"/>
   <repository type="tarball" name="python"
               href="https://www.python.org/ftp/python/"/>
-  <repository type="tarball" name="oracle"
-             href="http://download.oracle.com/"/>
   <repository type="tarball" name="pymodules"
              href="http://pypi.python.org/packages/"/>
 
@@ -42,18 +40,6 @@
     </dependencies>
   </metamodule>
 
-  <!--Note the leading ; in autogen-template. It's there on purpose in case the user has set nice_build so 
that the nice prepended to the command doesn't eat the cd. -->
-   <autotools id="berkeleydb" autogen-sh="dist/configure"
-         autogen-template="cd .;cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s  %(autogenargs)s" 
makeargs="-C build_unix"
-         makeinstallargs="-C build_unix install"
-        supports-non-srcdir-builds="no">
-
-    <branch module="berkeley-db/db-4.8.30.NC.tar.gz" version="4.8.30"
-        repo="oracle">
-      <patch file="https://raw.githubusercontent.com/narkoleptik/os-x-berkeleydb-patch/master/atomic.patch"; 
strip='1'/>
-    </branch>
-  </autotools>
-
   <autotools id="python" autogenargs="--enable-shared" supports-non-srcdir-builds="no"
              autogen-sh="autoreconf">
     <branch repo="python"
@@ -66,9 +52,6 @@
       <dep package='readline'/>
       <dep package="openssl" /> <!-- For hashlib -->
     </dependencies>
-    <after>
-      <dep package="berkeleydb"/>
-    </after>
   </autotools>
 
   <autotools id="python3" autogenargs="--enable-shared" autogen-sh="autoreconf">
@@ -79,25 +62,8 @@
       <dep package='readline'/>
       <dep package="openssl" /> <!-- For hashlib -->
     </dependencies>
-    <after>
-      <dep package="berkeleydb"/>
-    </after>
   </autotools>
 
-<!-- Pybsddb replaces Python2's built-in bsd module. Their repo uses
-     hg, so we stick with the tarball. -->
-  <distutils id="pybsddb">
-    <branch module="8d/9b/c3b01ff14e19254b2e031d8ae5ebe472e5523a47acc6f7d49300960d406d/bsddb3-6.2.4.tar.gz"
-           hash="md5:eec77d104c5981366701c6b0de585504" repo="pymodules"
-           version="6.2.4"/>
-    <dependencies>
-      <dep package="python3"/>
-    </dependencies>
-    <after>
-      <dep package="berkeleydb"/>
-    </after>
-  </distutils>
-
  <meson id="pycairo" >
     <branch module="pygobject/pycairo" repo="github" />
     <dependencies>
diff --git a/modulesets/gtk-osx-python.modules b/modulesets/gtk-osx-python.modules
index 64dae40b..ef67e0b2 100644
--- a/modulesets/gtk-osx-python.modules
+++ b/modulesets/gtk-osx-python.modules
@@ -11,8 +11,6 @@
               href="git://anongit.freedesktop.org/git/"/> -->
   <repository type="tarball" name="python"
              href="https://www.python.org/ftp/python/"/>
-  <repository type="tarball" name="oracle"
-             href="http://download.oracle.com/"/>
   <repository type="tarball" name="pymodules"
              href="http://pypi.python.org/packages/"/>
   <repository type="git" name="github" href="git://github.com/"/>
@@ -45,16 +43,6 @@
     </dependencies>
   </metamodule>
 
-<!--Note the leading ; in autogen-template. It's there on purpose in case the user has set nice_build so 
that the nice prepended to the command doesn't eat the cd. -->
-  <autotools id="berkeleydb" autogen-sh="dist/configure"
-         autogen-template="cd .;cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s %(autogenargs)s" 
makeargs="-C build_unix"
-         makeinstallargs="-C build_unix install">
-
-    <branch module="berkeley-db/db-4.8.30.NC.tar.gz" version="4.8.30"
-        repo="oracle">
-      <patch file="https://raw.githubusercontent.com/narkoleptik/os-x-berkeleydb-patch/master/atomic.patch"; 
strip='1'/>
-    </branch>
-  </autotools>
 
   <autotools id="python" autogenargs="--enable-shared"
             supports-non-srcdir-builds="no" autogen-sh="autoreconf">
@@ -68,9 +56,6 @@
       <dep package='readline'/>
       <dep package="openssl"/> <!-- For hashlib -->
     </dependencies>
-    <after>
-      <dep package="berkeleydb"/>
-    </after>
   </autotools>
 
   <autotools id="python3" autogenargs="--enable-shared" autogen-sh="configure">
@@ -83,19 +68,6 @@
     </dependencies>
   </autotools>
 
-  <distutils id="pybsddb">
-    <branch module="8d/9b/c3b01ff14e19254b2e031d8ae5ebe472e5523a47acc6f7d49300960d406d/bsddb3-6.2.4.tar.gz"
-           hash="md5:eec77d104c5981366701c6b0de585504" repo="pymodules"
-           version="6.2.4"/>
-    <dependencies>
-      <dep package="python3"/>
-    </dependencies>
-    <after>
-      <dep package="berkeleydb"/>
-      <dep package="berkeleydb-nonsrctree"/>
-    </after>
-  </distutils>
-
   <distutils id="pylxml">
     <branch module="20/b3/9f245de14b7696e2d2a386c0b09032a2ff6625270761d6543827e667d8de/lxml-3.8.0.tar.gz"
            hash="md5:e54e2fae44d684d6b9c636fe189e93ff" repo="pymodules"