wxwidgets, wxgtk-new, audacity: deprecated wxwidgets

This commit combines several spells as some fixes got moved
from the deprecated wxwidgets over to wxgtk-new and also
audacity spell would be broken would it still depend on
wxwidget instead of WXWIDGET.

15 files changed, 47 insertions, 88 deletions

diff --git a/x11-toolkits/wxgtk-new/CONFLICTS b/x11-toolkits/wxgtk-new/CONFLICTS
index cdcc0efd7f..8659c0e8f3 100755
--- a/x11-toolkits/wxgtk-new/CONFLICTS
+++ b/x11-toolkits/wxgtk-new/CONFLICTS
@@ -1,3 +1,2 @@
 conflicts wxgtk-no-unicode &&
-conflicts wxgtk &&
-conflicts wxgtk-new y
+conflicts wxgtk
diff --git a/x11-toolkits/wxgtk-new/DEPENDS b/x11-toolkits/wxgtk-new/DEPENDS
index 58e6afc0d3..f511b452fc 100755
--- a/x11-toolkits/wxgtk-new/DEPENDS
+++ b/x11-toolkits/wxgtk-new/DEPENDS
@@ -1,6 +1,9 @@
 depends -sub CXX gcc  &&
 depends  gtk+${WX_GTK} "--with-gtk=$WX_GTK" &&
 depends  libx11 '--with-x' &&
+depends  libnotify '--with-libnotify' &&
+depends  libsm &&
+depends  libxinerama &&
 
 # all of the "depends" below strictly speaking are not required, e.g. we can
 # use included library by specifying --with-*=builtin, but we want to use the
@@ -9,7 +12,8 @@ depends  zlib    '--with-zlib'     &&
 depends  libpng  '--with-libpng'   &&
 depends  JPEG    '--with-libjpeg'  &&
 depends  tiff    '--with-libtiff'  &&
-depends  pkgconfig &&
+depends  libxpm  '--with-libxpm'  &&
+
 optional_depends  pcre \
                   '--with-regex=sys' \
                   '--with-regex=builtin' \
@@ -30,14 +34,17 @@ optional_depends  OPENGL             \
                   '--with-opengl'    \
                   '--without-opengl' \
                   'for OpenGL support'  &&
+if is_depends_enabled $SPELL OPENGL; then
+  depends glu
+fi &&
 optional_depends  expat              \
                   '--with-expat'     \
                   '--without-expat'  \
                   'for XML parsing using expat library'  &&
 optional_depends  libgnomeprint           \
-                  '--with-gnomeprint'     \
-                  '--without-gnomeprint'  \
-                  'for GNOME print system support'  &&
+                  '--without-gtkprint'     \
+                  '--with-gtkprint'  \
+                  'for GNOME print system support instead of GTK print'  &&
 optional_depends  libiodbc          \
                   '--with-odbc'     \
                   '--without-odbc'  \
@@ -45,7 +52,4 @@ optional_depends  libiodbc          \
 optional_depends  sdl                          \
                   '--with-sdl --enable-sound'  \
                   '--without-sdl'              \
-                  'for sound system support'   &&
-optional_depends  libxpm '--with-libxpm'    \
-                         '--without-libxpm' \
-                         'support XPM file format'
+                  'for sound system support'
diff --git a/x11-toolkits/wxgtk-new/HISTORY b/x11-toolkits/wxgtk-new/HISTORY
index e3709e8566..b3447a6bcc 100644
--- a/x11-toolkits/wxgtk-new/HISTORY
+++ b/x11-toolkits/wxgtk-new/HISTORY
@@ -1,3 +1,11 @@
+2018-01-17 Thomas Orgis <sobukus@sourcemage.org>
+	* UP_TRIGGERS: Fix dependent spells for the downgrade from version
+	  3.1.0 which was in test grimoire for a while.
+	* PRE_BUILD, wxWidgets-3.0.2-gcc6-abs.patch: move patch from
+	  deprecated wxwidgets spell for version 3.0.2 and gcc-6
+	* DEPENDS: some fixup (mostly from wxwidgets spell)
+	* CONFLICTS: The self-conflict is hopefully not necessary anymore.
+
 2015-05-25 Thomas Orgis <sobukus@sourcemage.org>
 	* DETAILS: remove SOURCEFORGE_URL usage (automated)
 
diff --git a/x11-toolkits/wxgtk-new/PRE_BUILD b/x11-toolkits/wxgtk-new/PRE_BUILD
new file mode 100755
index 0000000000..e676ca1775
--- /dev/null
+++ b/x11-toolkits/wxgtk-new/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -p1 < "$SCRIPT_DIRECTORY/wxWidgets-3.0.2-gcc6-abs.patch"
diff --git a/x11-toolkits/wxgtk-new/UP_TRIGGERS b/x11-toolkits/wxgtk-new/UP_TRIGGERS
new file mode 100755
index 0000000000..0bcea52a83
--- /dev/null
+++ b/x11-toolkits/wxgtk-new/UP_TRIGGERS
@@ -0,0 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+# Take care of the downgrade from 3.1 to 3.0 in test grimoire.
+if spell_ok $SPELL && is_version_less $VERSION 3.1 &&
+  is_version_less $VERSION $(installed_version $SPELL); then
+    cast_dependents $SPELL
+fi
diff --git a/x11-toolkits/wxwidgets/wxWidgets-3.0.2-gcc6-abs.patch b/x11-toolkits/wxgtk-new/wxWidgets-3.0.2-gcc6-abs.patch
index 1f150e4088..1f150e4088 100644
--- a/x11-toolkits/wxwidgets/wxWidgets-3.0.2-gcc6-abs.patch
+++ b/x11-toolkits/wxgtk-new/wxWidgets-3.0.2-gcc6-abs.patch
diff --git a/x11-toolkits/wxwidgets/BUILD b/x11-toolkits/wxwidgets/BUILD
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/x11-toolkits/wxwidgets/BUILD
@@ -0,0 +1 @@
+true
diff --git a/x11-toolkits/wxwidgets/DEPENDS b/x11-toolkits/wxwidgets/DEPENDS
deleted file mode 100755
index 3d03068008..0000000000
--- a/x11-toolkits/wxwidgets/DEPENDS
+++ /dev/null
@@ -1,44 +0,0 @@
-depends -sub CXX gcc &&
-
-depends  gtk+3 '--with-gtk=3' &&
-
-depends  libx11  '--with-x'  &&
-depends  libxpm  '--with-libxpm'  &&
-# all of the "depends" below strictly speaking are not required, e.g. we can
-# use included library by specifying --with-*=builtin, but we want to use the
-# system libraries, so we're saying --with-*[=sys] here.
-depends  zlib    '--with-zlib'     &&
-depends  libpng  '--with-libpng'   &&
-depends  JPEG    '--with-libjpeg'  &&
-depends  tiff    '--with-libtiff'  &&
-depends  libnotify '--with-libnotify' &&
-depends  libsm &&
-depends  libxinerama &&
-
-optional_depends  pcre \
-                  '--with-regex=sys' \
-                  '--with-regex=builtin' \
-                  'use PCRE for RegEx (disable for advanced features)' &&
-
-optional_depends  mesalib            \
-                  '--with-opengl'    \
-                  '--without-opengl' \
-                  'for OpenGL support'  &&
-depends  glu &&
-
-optional_depends  expat              \
-                  '--with-expat'     \
-                  '--without-expat'  \
-                  'for XML parsing using expat library'  &&
-optional_depends  libgnomeprint           \
-                  '--with-gnomeprint --without-gtkprint'     \
-                  '--without-gnomeprint --with-gtkprint'  \
-                  'for GNOME print system support'  &&
-optional_depends  libiodbc          \
-                  '--with-odbc'     \
-                  '--without-odbc'  \
-                  'for ODBC support'  &&
-optional_depends  sdl                          \
-                  '--with-sdl --enable-sound'  \
-                  '--without-sdl'              \
-                  'for sound system support'
diff --git a/x11-toolkits/wxwidgets/DETAILS b/x11-toolkits/wxwidgets/DETAILS
index a102053a2d..61768326aa 100755
--- a/x11-toolkits/wxwidgets/DETAILS
+++ b/x11-toolkits/wxwidgets/DETAILS
@@ -1,20 +1,7 @@
-           SPELL=wxwidgets
-         VERSION=3.0.2
-          SOURCE="wxWidgets-${VERSION}.tar.bz2"
-   SOURCE_URL[0]=http://download.sourceforge.net/sourceforge/wxwindows/$SOURCE
-   SOURCE_HASH=sha512:098f79863103f3be0b7e21e4f0f1b34ab5277ef0033c1ef1387a9c673b0e0b76a2d732b183fa11b22cfcbbfdb7a4884f243d12f65cd49baa1772852307b393c4
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/wxWidgets-${VERSION}"
-        WEB_SITE="https://www.wxwidgets.org/"
-      LICENSE[0]=LGPL
-           TMPFS=off
-         ENTERED=20150823
-           SHORT="a C++ framework for writing advanced GUI applications"
-cat << EOF
-wxWidgets is a free and open source cross-platform C++ framework for writing
-advanced GUI applications using native controls. wxWidgets allows you to write
-native-looking GUI applications for all the major desktop platforms and also
-helps with abstracting the differences in the non-GUI aspects between them. It
-is free for the use in both open source and commercial applications, comes
-with the full, easy to read and modify, source and extensive documentation
-and a collection of more than a hundred examples.
-EOF
+          SPELL=wxwidgets
+        VERSION=0
+     PATCHLEVEL=9999
+          SHORT="deprecated"
+  cat << EOF
+    deprecated spell [replaced by wxgtk-new]
+  EOF
diff --git a/x11-toolkits/wxwidgets/HISTORY b/x11-toolkits/wxwidgets/HISTORY
index f41e9a3bf0..8bf8d27902 100644
--- a/x11-toolkits/wxwidgets/HISTORY
+++ b/x11-toolkits/wxwidgets/HISTORY
@@ -1,3 +1,8 @@
+2018-01-17 Thomas Orgis <sobukus@sourcemage.org>
+	* spell deprecated [duplicate spell]
+	* PATCHLEVEL=9999
+	* DETAILS: version 0
+
 2017-09-27 Thomas Orgis <sobukus@sourcemage.org>
 	* DETAILS: TMPFS=off, needs >2G
 
diff --git a/x11-toolkits/wxwidgets/INSTALL b/x11-toolkits/wxwidgets/INSTALL
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/x11-toolkits/wxwidgets/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/x11-toolkits/wxwidgets/PRE_BUILD b/x11-toolkits/wxwidgets/PRE_BUILD
index e676ca1775..27ba77ddaf 100755
--- a/x11-toolkits/wxwidgets/PRE_BUILD
+++ b/x11-toolkits/wxwidgets/PRE_BUILD
@@ -1,3 +1 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-patch -p1 < "$SCRIPT_DIRECTORY/wxWidgets-3.0.2-gcc6-abs.patch"
+true
diff --git a/x11-toolkits/wxwidgets/PRE_SUB_DEPENDS b/x11-toolkits/wxwidgets/PRE_SUB_DEPENDS
deleted file mode 100755
index b98818557f..0000000000
--- a/x11-toolkits/wxwidgets/PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,5 +0,0 @@
-case $THIS_SUB_DEPENDS in
-  BUILTIN_REGEXP) is_depends_enabled $SPELL pcre && return 1 ;;
-  *) echo "Unknown sub-dependency $THIS_SUB_DEPENDS" ;;
-esac
-return 1
diff --git a/x11-toolkits/wxwidgets/SUB_DEPENDS b/x11-toolkits/wxwidgets/SUB_DEPENDS
deleted file mode 100755
index 431a5219d0..0000000000
--- a/x11-toolkits/wxwidgets/SUB_DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-case $THIS_SUB_DEPENDS in
-  BUILTIN_REGEXP) echo "builtin regexp requested, not depending on pcre."  &&
-        OPTS="$OPTS --with-regexp=builtin"
-        ;;
-  *) echo "Unknown sub-dependency $THIS_SUB_DEPENDS" ; return 1 ;;
-esac
diff --git a/x11-toolkits/wxwidgets/UP_TRIGGERS b/x11-toolkits/wxwidgets/UP_TRIGGERS
new file mode 100755
index 0000000000..50dea96708
--- /dev/null
+++ b/x11-toolkits/wxwidgets/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger $SPELL dispel_self
+up_trigger wxgtk-new cast_self