5 files changed, 67 insertions, 25 deletions
diff --git a/multimedia/ripit/README b/multimedia/ripit/README
index 903706601e0ba..3a86bf699e2ee 100644
--- a/multimedia/ripit/README
+++ b/multimedia/ripit/README
@@ -1,22 +1,16 @@
-RipIT is used to create MPEG-1 Layer 3 (mp3) using Lame, or uses Flac (flac),
-Ogg Vorbis (ogg), Faac (m4a), Musepack (mpc), mp4als (als), Wavpack (wv) or
-ffmpeg to convert audio files (wav) extracted from an audio CD.
-It is a console based front-end (no GUI here), written in Perl, for these
-programs (which must be installed -- at least one out of each category):
+ripit (command line audio CD ripper)
 
-* dagrab, cdparanoia or cdda2wav (tosha and cdd are also supported)
-for ripping the audio CD tracks
-* Lame, OggVorbis, Flac or Faac, Musepack, mp4als, Wavpack or ffmpeg for
-encoding the wav files to a compressed format
+RipIT is used to create MPEG-1 Layer 3 (mp3) using Lame, or uses Flac
+(flac), Ogg Vorbis (ogg), Faac (m4a), Musepack (mpc), mp4als (als),
+Wavpack (wv) or ffmpeg to convert audio files (wav) extracted from an
+audio CD. It is a console based front-end (no GUI here), written in Perl,
+for various programs which must be installed.
 
-Optionally, ripit can use:
+RipIT has *many* optional dependencies; see README_SBo.txt for details.
 
-* CDDB_get 2.27 or higher, a Perl module for CDDB retrieval
-* LWP::simple, a Perl module to access web pages and eventually Digest::MD5
-and Unicode::UCD depending your choice of options
-
-When using Musicbrainz DB one needs additionally: WebService::MusicBrainz
-and the discid-tool or MusicBrainz::DiscID.
+RipIT has a vast (some would say bewildering) array of command-line
+and config file options. See its man page and the comments in
+/etc/ripit/config for details.
 
 The program will do the following without user intervention:
 
diff --git a/multimedia/ripit/README_SBo.txt b/multimedia/ripit/README_SBo.txt
new file mode 100644
index 0000000000000..64d316166c138
--- /dev/null
+++ b/multimedia/ripit/README_SBo.txt
@@ -0,0 +1,43 @@
+
+The TL;DR version: install lame if you want to rip to mp3.
+
+If you're still reading: ripit's optional dependencies are runtime deps,
+so you can install them after installing ripit and they will be detected.
+
+If you don't install anything extra, you'll be able to rip with cdparanoia
+or cdda2wav, and encode to flac, ogg, or wavpack. You'll also be unable
+to submit updated CDDB entries (most people don't need to do this anyway).
+
+Here's the list of optional deps available from SBo:
+
+lame - Normally required for encoding to mp3 (-c 0 option, which is the
+       default), though ffmpeg can be used instead.
+
+faac - Required for encoding to mp4/aac (-c 3 option).
+
+ffmpeg - Can encode to any format supported by ffmpeg (-c 7 option, plus
+        --ffmpegopt and --ffmpegsuffix options).
+
+musepack-tools or mppenc -
+  Required for encoding to MusePack (mpc) format (-c 5 option).
+
+libwwwperl - Required for submitting updated CDDB entries to freedb.org.
+             If this package is missing, ripit will warn that LWP::Simple
+             is not installed. You can ignore the warning, if you never
+             intend to submit any CDDB entries.
+
+perl-MusicBrainz-DiscID and perl-WebService-MusicBrainz -
+  These can be used for identifying the disc. However, the SlackBuild author
+  has NOT tested this script with MusicBrainz, and does not guarantee that
+  it'll work. If you manage to get this working, please contact the maintainer
+  (email address in the .info file) and let me know how you managed it, so I
+  can update this documentation.
+
+There are other optional deps not available on SBo. These include:
+
+dagrab, tosha, cdd -
+  CD rippers, which could be used instead of cdparanoia or cdda2wav.
+
+MP3::Tag - Required for including cover art within mp3 files.
+
+Unicode::UCD - Required for non-UTF-8 id3 tags.
diff --git a/multimedia/ripit/doinst.sh b/multimedia/ripit/doinst.sh
index 63523ebd11b9e..dbad5c294e526 100644
--- a/multimedia/ripit/doinst.sh
+++ b/multimedia/ripit/doinst.sh
@@ -1,15 +1,11 @@
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
   if [ ! -r $OLD ]; then
     mv $NEW $OLD
   elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
     rm $NEW
   fi
-  # Otherwise, we leave the .new copy for the admin to consider...
 }
 
 config etc/ripit/config.new
-
diff --git a/multimedia/ripit/ripit.SlackBuild b/multimedia/ripit/ripit.SlackBuild
index 3dcafa9c9793a..6f9f74e466eef 100644
--- a/multimedia/ripit/ripit.SlackBuild
+++ b/multimedia/ripit/ripit.SlackBuild
@@ -1,7 +1,8 @@
 #!/bin/sh
 # Slackware build script for ripit
 
-# Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
+# Formerly maintained by Ryan P.C. McQuen <email removed>
+# Now maintained by B. Watson <yalhcru@gmail.com>
 
 # Copyright 2011 Grigorios Bouzakis <grbzks@xsmail.com>
 # All rights reserved.
@@ -21,10 +22,18 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20170326 bkw:
+# - take over maintenance.
+# - fix the REQUIRES. faac and ffmpeg are optional, perl-CDDB-get is
+#   mandatory, id3 and mpc were spurious.
+# - document the optional deps in README_SBo.txt.
+# - update README.
+# - BUILD=2.
+
 PRGNAM=ripit
 VERSION=${VERSION:-3.9.0}
 ARCH=noarch
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 TAG=${TAG:-_SBo}
 CWD=$(pwd)
diff --git a/multimedia/ripit/ripit.info b/multimedia/ripit/ripit.info
index bbc5bb8ef29bf..9c68b08f4159e 100644
--- a/multimedia/ripit/ripit.info
+++ b/multimedia/ripit/ripit.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://slackware.uk/sbosrcarch/by-name/multimedia/ripit/ripit-3.9.0.ta
 MD5SUM="34210d4ee72c288be31f75340c5351d0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="faac ffmpeg id3 mpc"
-MAINTAINER="Ryan P.C. McQuen"
-EMAIL="ryanpcmcquen@member.fsf.org"
+REQUIRES="perl-CDDB-get"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"