libraries/openbabel: Updated for version 3.1.1.

If this is too new, then reverting is fine, but since we're
working toward Slackware 15.0, and this 3.1.1 release has
been out for a bit, let's see what happens...

3 files changed, 24 insertions, 25 deletions

diff --git a/libraries/openbabel/gcc-5.patch b/libraries/openbabel/gcc-5.patch
deleted file mode 100644
index bd25e0df0b..0000000000
--- a/libraries/openbabel/gcc-5.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- include/openbabel/shared_ptr.h.gcc5	2015-02-04 20:04:57.000000000 +0100
-+++ include/openbabel/shared_ptr.h	2015-02-07 22:10:37.433163644 +0100
-@@ -21,7 +21,7 @@ GNU General Public License for more deta
-   #define sharedptr boost::shared_ptr
- #else
-   #include <memory>
--  #if __GNUC__ == 4  //&& __GNUC_MINOR__ < 3  removed at the suggestion of Konstantin Tokarev
-+  #if __GNUC__ >= 4  //&& __GNUC_MINOR__ < 3  removed at the suggestion of Konstantin Tokarev
-     #include <tr1/memory>
-   #endif
-   using std::tr1::shared_ptr;
-
diff --git a/libraries/openbabel/openbabel.SlackBuild b/libraries/openbabel/openbabel.SlackBuild
index 426fab52d4..82107fc0f2 100644
--- a/libraries/openbabel/openbabel.SlackBuild
+++ b/libraries/openbabel/openbabel.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for openbabel
 
-# Copyright 2006-2013  Robby Workman, Northport, Alabama, USA
+# Copyright 2006,2013,2021  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,14 +25,13 @@
 # Thanks to Daniil Bratashov (dn2010@gmail.com) for the cmake conversion
 
 PRGNAM=openbabel
-VERSION=${VERSION:-2.4.1}
-SRCVER=$(echo $VERSION | tr . -)
+VERSION=${VERSION:-3.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -43,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -62,9 +61,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$PRGNAM-$SRCVER
-tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
-cd $PRGNAM-$PRGNAM-$SRCVER
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION-source.tar.bz2
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -85,6 +84,18 @@ cd build
   make install DESTDIR=$PKG
 cd ..
 
+# Sigh
+if [ "$LIBDIRSUFFIX" == "64" ]; then
+  sed -i \
+    -e "s,/usr/lib/,/usr/lib64/,g" \
+    -e "s,IMPORT_PREFIX}/lib/,IMPORT_PREFIX}/lib64/,g" \
+    $PKG/usr/lib/cmake/*
+  mv $PKG/usr/lib/cmake/* $PKG/usr/lib64/cmake
+  rmdir $PKG/usr/lib/cmake
+  mv $PKG/usr/lib/* $PKG/usr/lib64/
+  rmdir $PKG/usr/lib
+fi
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
@@ -93,7 +104,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING NEWS.md README.md THANKS authors.txt doc/*.html \
+  AUTHORS COPYING README.md THANKS authors.txt doc/*.html \
     $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/libraries/openbabel/openbabel.info b/libraries/openbabel/openbabel.info
index 112968ba8a..8ef40b4590 100644
--- a/libraries/openbabel/openbabel.info
+++ b/libraries/openbabel/openbabel.info
@@ -1,8 +1,8 @@
 PRGNAM="openbabel"
-VERSION="2.4.1"
+VERSION="3.1.1"
 HOMEPAGE="http://openbabel.sourceforge.net"
-DOWNLOAD="https://github.com/openbabel/openbabel/archive/openbabel-2-4-1/openbabel-2-4-1.tar.gz"
-MD5SUM="c0e0aefeef0f9f2bb2c78109d65c30a5"
+DOWNLOAD="https://github.com/openbabel/openbabel/releases/download/openbabel-3-1-1/openbabel-3.1.1-source.tar.bz2"
+MD5SUM="581c78e6c89368b9f0c17cfb5cec8190"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"