Revert 18dea74a4fc97 - go back to openbabel-2.4.1

Nothing I've tried so far can build with 3.1.1.

3 files changed, 25 insertions, 24 deletions

diff --git a/libraries/openbabel/gcc-5.patch b/libraries/openbabel/gcc-5.patch
new file mode 100644
index 0000000000..bd25e0df0b
--- /dev/null
+++ b/libraries/openbabel/gcc-5.patch
@@ -0,0 +1,12 @@
+--- 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 82107fc0f2..426fab52d4 100644
--- a/libraries/openbabel/openbabel.SlackBuild
+++ b/libraries/openbabel/openbabel.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for openbabel
 
-# Copyright 2006,2013,2021  Robby Workman, Tuscaloosa, Alabama, USA
+# Copyright 2006-2013  Robby Workman, Northport, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,13 +25,14 @@
 # Thanks to Daniil Bratashov (dn2010@gmail.com) for the cmake conversion
 
 PRGNAM=openbabel
-VERSION=${VERSION:-3.1.1}
+VERSION=${VERSION:-2.4.1}
+SRCVER=$(echo $VERSION | tr . -)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
+    i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -42,8 +43,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -61,9 +62,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-source.tar.bz2
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$PRGNAM-$SRCVER
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -84,18 +85,6 @@ 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
 
@@ -104,7 +93,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING README.md THANKS authors.txt doc/*.html \
+  AUTHORS COPYING NEWS.md 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 8ef40b4590..112968ba8a 100644
--- a/libraries/openbabel/openbabel.info
+++ b/libraries/openbabel/openbabel.info
@@ -1,8 +1,8 @@
 PRGNAM="openbabel"
-VERSION="3.1.1"
+VERSION="2.4.1"
 HOMEPAGE="http://openbabel.sourceforge.net"
-DOWNLOAD="https://github.com/openbabel/openbabel/releases/download/openbabel-3-1-1/openbabel-3.1.1-source.tar.bz2"
-MD5SUM="581c78e6c89368b9f0c17cfb5cec8190"
+DOWNLOAD="https://github.com/openbabel/openbabel/archive/openbabel-2-4-1/openbabel-2-4-1.tar.gz"
+MD5SUM="c0e0aefeef0f9f2bb2c78109d65c30a5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"