4 files changed, 16 insertions, 55 deletions
diff --git a/audio/ecasound/ecasound.SlackBuild b/audio/ecasound/ecasound.SlackBuild
index ff7f4870f8..ffac39fb72 100644
--- a/audio/ecasound/ecasound.SlackBuild
+++ b/audio/ecasound/ecasound.SlackBuild
@@ -6,8 +6,14 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20191202 bkw:
+# - Updated for v2.9.2.
+# - removed python_module_dir.diff and ruby2.patch from 2.9.1,
+#   they're no longer needed. This means you can no longer build
+#   2.9.1 with this script.
+
 PRGNAM=ecasound
-VERSION=${VERSION:-2.9.1}
+VERSION=${VERSION:-2.9.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -47,25 +53,12 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # Figure out the version number part of the python lib dir:
 PYVER=$( python -c 'import sys; print "%d.%d" % sys.version_info[0:2]' )
 
-# Hack configure script to work around a patch that was meant to work around
-# broken debian systems (but what it really does is make configure ignore
-# the --with-python-modules option; they get installed *outside the DESTDIR*
-# too). Sigh.
-patch -p1 < $CWD/python_module_dir.diff
-
-# Don't drop ruby module into the package root (patch from Arch)
-# https://git.archlinux.org/svntogit/packages.git/plain/trunk/ruby2.patch?h=packages/ecasound
-patch -p1 < $CWD/ruby2.patch
-
 # --disable-static and --enable-shared are accepted, but ignored.
 # This is deliberate: upstream doesn't want shared libs. See:
 # http://www.eca.cx/ecasound-list/2002/10/0031.html
@@ -73,6 +66,7 @@ patch -p1 < $CWD/ruby2.patch
 CFLAGS="-g $SLKCFLAGS" \
 CXXFLAGS="-g $SLKCFLAGS" \
 ./configure \
+  --enable-python-force-site-packages \
   --disable-arts \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -88,6 +82,9 @@ CXXFLAGS="-g $SLKCFLAGS" \
 make
 make install-strip DESTDIR=$PKG
 
+# Per -current guidelines (and does no harm on 14.2):
+rm -f $PKG/usr/lib$LIBDIRSUFFIX/*.la
+
 # Kind of a twist for a SlackBuild: bunch of identical man pages are getting
 # installed, and we want them to be symlinks instead of copies.
 cd $PKG/usr/man/man1
diff --git a/audio/ecasound/ecasound.info b/audio/ecasound/ecasound.info
index 91845801f5..dd24157a12 100644
--- a/audio/ecasound/ecasound.info
+++ b/audio/ecasound/ecasound.info
@@ -1,8 +1,8 @@
 PRGNAM="ecasound"
-VERSION="2.9.1"
+VERSION="2.9.2"
 HOMEPAGE="http://eca.cx/ecasound/"
-DOWNLOAD="http://ecasound.seul.org/download/ecasound-2.9.1.tar.gz"
-MD5SUM="13c7be1e4eddc0bbf3792dc17777e465"
+DOWNLOAD="http://ecasound.seul.org/download/ecasound-2.9.2.tar.gz"
+MD5SUM="29e82be3cd8d951be4353fba80e4931d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack-audio-connection-kit liblo"
diff --git a/audio/ecasound/python_module_dir.diff b/audio/ecasound/python_module_dir.diff
deleted file mode 100644
index 338cfcfddb..0000000000
--- a/audio/ecasound/python_module_dir.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur ecasound-2.8.1/configure ecasound-2.8.1.patched//configure
---- ecasound-2.8.1/configure	2011-05-22 07:25:44.000000000 -0400
-+++ ecasound-2.8.1.patched//configure	2011-06-22 02:22:38.000000000 -0400
-@@ -6691,19 +6691,7 @@
- fi
- 
- 
--
--ECA_S_PYTHON_MODULES=NO
--for i in $pymoddirs;
--do
--  for j in lib-dynload;
--  do
--    if test -r "$i/$j"; then
--      ECA_S_PYTHON_MODULES=$i
--      break 2
--    fi
--  done
--done
--
-+ECA_S_PYTHON_MODULES="$pymoddirs"
- if test -d $ECA_S_PYTHON_MODULES/site-packages -o "X$python_force_site_packages" = "Xyes"
- then
-     ECA_S_PYTHON_MODULES=$ECA_S_PYTHON_MODULES/site-packages
diff --git a/audio/ecasound/ruby2.patch b/audio/ecasound/ruby2.patch
deleted file mode 100644
index d55f121403..0000000000
--- a/audio/ecasound/ruby2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur ecasound-2.9.0.orig/configure ecasound-2.9.0/configure
---- ecasound-2.9.0.orig/configure	2013-03-26 17:14:51.759045636 +0800
-+++ ecasound-2.9.0/configure	2013-03-26 17:15:50.502060731 +0800
-@@ -6535,7 +6535,7 @@
-   rubyecasound_support=no
-   ECA_S_RUBY_SITEDIR=""
- else
--  ECA_S_RUBY_SITEDIR="`ruby -e 'require "rbconfig"; include Config; print CONFIG["sitedir"] + "/" + CONFIG["MAJOR"] + "." + CONFIG["MINOR"]'`"
-+  ECA_S_RUBY_SITEDIR="`ruby -e 'include RbConfig; print CONFIG["vendordir"] + "/" + CONFIG["MAJOR"] + "." + CONFIG["MINOR"]'`"
- fi
- 
-