audacious-plugins: post-update fixes

4 files changed, 53 insertions, 33 deletions

diff --git a/audio-plugins/audacious-plugins/BUILD b/audio-plugins/audacious-plugins/BUILD
index 84b3ceb240..402b30b547 100755
--- a/audio-plugins/audacious-plugins/BUILD
+++ b/audio-plugins/audacious-plugins/BUILD
@@ -1,4 +1,2 @@
-OPTS="$AUDACIOUS_IPV6 $AUDACIOUS_STATUS $AUDACIOUS_OSD $AUDACIOUS_COSD $OPTS" &&
-OPTS="$AUDACIOUS_SONGCHANGE $AUDACIOUS_HOTKEY $AUDACIOUS_MPRIS $OPTS" &&
-OPTS="$AUDACIOUS_AD $AUDACIOUS_GTKUI $AUDACIOUS_SKINS $AUDACIOUS_LYRIC $OPTS" &&
+OPTS="$AUDACIOUS_OPTS $OPTS" &&
 default_build
diff --git a/audio-plugins/audacious-plugins/CONFIGURE b/audio-plugins/audacious-plugins/CONFIGURE
index 468b97c721..10cbeed6e3 100755
--- a/audio-plugins/audacious-plugins/CONFIGURE
+++ b/audio-plugins/audacious-plugins/CONFIGURE
@@ -1,55 +1,68 @@
-config_query_option AUDACIOUS_IPV6 \
-                    'Enable IPv6 support?' n \
-                    '--enable-ipv6' \
-                    '--disable-ipv6' &&
+# remove deprecated options
+if [[ -n $AUDACIOUS_IPV6 ]]; then
+  persistent_remove AUDACIOUS_IPV6
+fi &&
+if [[ -n $AUDACIOUS_AD ]]; then
+  persistent_remove AUDACIOUS_AD
+fi &&
 
-config_query_option AUDACIOUS_STATUS \
+if [[ ! -v AUDACIOUS_OPTS ]]; then
+  persistent_add AUDACIOUS_OPTS
+fi &&
+
+# backport legacy options
+for o in AUDACIOUS_STATUS AUDACIOUS_OSD AUDACIOUS_COSD AUDACIOUS_SONGCHANGE \
+         AUDACIOUS_HOTKEY AUDACIOUS_MPRIS AUDACIOUS_GTKUI AUDACIOUS_SKINS \
+         AUDACIOUS_LYRIC; do
+  if [[ -n ${!o} ]]; then
+    list_add "AUDACIOUS_OPTS" "${!o}" &&
+    persistent_remove ${o}
+  fi
+done &&
+
+config_query_option AUDACIOUS_OPTS \
                     'Enable X11 Status Icon plugin?' y \
                     '--enable-statusicon' \
                     '--disable-statusicon' &&
 
-config_query_option AUDACIOUS_OSD \
+config_query_option AUDACIOUS_OPTS \
                     'for OSD plugin' y \
                     '--enable-aosd' \
                     '--disable-aosd' &&
-if [[ "$AUDACIOUS_OSD" == '--enable-aosd' ]]; then
-  config_query_option AUDACIOUS_COSD \
+
+if list_find "$AUDACIOUS_OPTS" '--enable-aosd'; then
+  config_query_option AUDACIOUS_OPTS \
                     'for X Composite OSD plugin' y \
                     '--enable-aosd-xcomp' \
                     '--disable-aosd-xcomp'
 fi  &&
 
-config_query_option AUDACIOUS_SONGCHANGE \
+config_query_option AUDACIOUS_OPTS \
                     "Enable Song Change Plugin?" y \
                     "--enable-songchange" \
                     "--disable-songchange" &&
 
-config_query_option AUDACIOUS_HOTKEY \
+config_query_option AUDACIOUS_OPTS \
                     "Enable global hotkey plugin?" y \
                     "--enable-hotkey" \
                     "--disable-hotkey" &&
 
-config_query_option AUDACIOUS_MPRIS \
+config_query_option AUDACIOUS_OPTS \
                     "Enable mpris2 plugin?" y \
                     "--enable-mpris2" \
                     "--disable-mpris2" &&
 
-config_query_option AUDACIOUS_AD \
-                    "Enable AdPlug plugin?" y \
-                    "--enable-adplug" \
-                    "--disable-adplug" &&
-
-config_query_option AUDACIOUS_GTKUI \
+config_query_option AUDACIOUS_OPTS \
                     "Enable GTK Interface?" y \
                     "--enable-gtkui" \
                     "--disable-gtkui" &&
 
-config_query_option AUDACIOUS_SKINS \
+config_query_option AUDACIOUS_OPTS \
                     "Enable Winamp Classic interface?" y \
                     "--enable-skins" \
                     "--disable-skins" &&
 
-config_query_option AUDACIOUS_LYRIC \
+config_query_option AUDACIOUS_OPTS \
                     "Enable LyricWiki plugin?" y \
                     "--enable-lyricwiki" \
                     "--disable-lyricwiki" 
diff --git a/audio-plugins/audacious-plugins/DEPENDS b/audio-plugins/audacious-plugins/DEPENDS
index a5813e9fcf..0c9e69938e 100755
--- a/audio-plugins/audacious-plugins/DEPENDS
+++ b/audio-plugins/audacious-plugins/DEPENDS
@@ -57,6 +57,11 @@ optional_depends lame \
                  "--disable-filewriter_mp3" \
                  "for MP3 filewriter" &&
 
+optional_depends libbinio \
+                 "" \
+                 "--disable-adplug" \
+                 "for AdPlug plugin" &&
+
 optional_depends wavpack \
                  "" \
                  "--disable-wavpack" \
@@ -89,9 +94,9 @@ optional_depends neon \
                  "Enable Neon HTTP support?" &&
 
 optional_depends curl \
-                 "--enable-scrobbler" \
-                 "--disable-scrobbler" \
-                 "Enable Scrobbler plugin?"  &&
+                 "--enable-scrobbler2" \
+                 "--disable-scrobbler2" \
+                 "Enable Scrobbler 2 plugin?"  &&
 
 optional_depends libnotify \
                  "--enable-notify" \
@@ -108,13 +113,10 @@ optional_depends libcdio \
                  "--disable-cdaudio" \
                  "Enable CD Audio Plugin?" &&
 
-optional_depends libcdio-paranoia \
-                 "" "" \
-                 "Needed for CD Audio plugin" &&
-
-optional_depends libcddb \
-                 "" "" \
-                 "Needed for CD Audio plugin" &&
+if is_depends_enabled $SPELL libcdio; then
+  depends libcdio-paranoia &&
+  depends libcddb
+fi &&
 
 optional_depends libmms \
                  "--enable-mms" \
@@ -130,4 +132,3 @@ optional_depends libsamplerate \
                  "--enable-resample --enable-speedpitch" \
                  "--disable-resample --disable-speedpitch" \
                  "Enable Resample Effect and Speed and Pitch plugins?" 
-
diff --git a/audio-plugins/audacious-plugins/HISTORY b/audio-plugins/audacious-plugins/HISTORY
index 29632d269f..f706b45522 100644
--- a/audio-plugins/audacious-plugins/HISTORY
+++ b/audio-plugins/audacious-plugins/HISTORY
@@ -1,3 +1,11 @@
+2015-04-24 Vlad Glagolev <stealth@sourcemage.org>
+	* BUILD: dropped AUDACIOUS_* spaghetti
+	* DEPENDS: libcdio-paranoia and libcddb are _required_ for cdaudio-ng
+	  plugin; scrobbler has been renamed to scrobbler2; added libbinio for
+	  AdPlug plugin
+	* CONFIGURE: removed deprecated IPv6 setting; migrate options to
+	  AUDACIOUS_OPTS; moved adplug setting to DEPENDS
+
 2013-07-01 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 3.4