Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire

23 files changed, 148 insertions, 49 deletions

diff --git a/audio-creation/lmms/DEPENDS b/audio-creation/lmms/DEPENDS
index 1c069838d9..40bd3f3048 100755
--- a/audio-creation/lmms/DEPENDS
+++ b/audio-creation/lmms/DEPENDS
@@ -1,21 +1,23 @@
 depends  qt4                                         &&
-depends  g++                                         &&
 depends  cmake                                       &&
 
-# we always want system libs
-depends  libsamplerate "-DWANT_SYSTEM_SR=1"          &&
-depends  libsndfile                                  &&
+#  depends  vst_sdk2_3  ''  ''  z-rejected            &&
 
-if [[ $LMMS_VST == "-DWANT_VST=1" ]]; then
-  depends  vst_sdk2_3  ''  ''  z-rejected            &&
-  depends  wine
-fi                                                   &&
+optional_depends  wine                               \
+                  "-DWANT_VST=1"                     \
+                  "-DWANT_VST=0"                     \
+                  "for VST support"                  &&
 
 optional_depends  alsa-lib                           \
                   "-DWANT_ALSA=1"                    \
                   "-DWANT_ALSA=0"                    \
                   "for ALSA sound output"            &&
 
+optional_depends  pulseaudio                         \
+                  "-DWANT_PULSEAUDIO=1"              \
+                  "-DWANT_PULSEAUDIO=0"              \
+                  "for pulseaudio support"           &&
+
 optional_depends  sdl                                \
                   "-DWANT_SDL=1"                     \
                   "-DWANT_SDL=0"                     \
@@ -26,6 +28,27 @@ optional_depends  JACK-DRIVER                        \
                   "-DWANT_JACK=0"                    \
                   "for JACK transport"               &&
 
+optional_depends  libsndfile                         \
+                  "-DWANT_SYSTEM_SR=1"               \
+                  "-DWANT_SYSTEM_SR=0"               \
+                  "Should be optional..."            &&
+
+optional_depends  libvorbis                          \
+                  "-DWANT_OGGVORBIS=1"               \
+                  "-DWANT_OGGVORBIS=0"               \
+                  "for exporting song to OGG files"  &&
+
+# I have a spell for this locally but need to test it first
+#optional_depends  synthesistoolkit               \
+#                  "-DWANT_STK=1"                   \
+#                  "-DWANT_STK=0"                             \
+#                  "for Stk (Synthesis Toolkit) support"
+
+optional_depends  cmt                                \
+                  "-DWANT_CMT=1"                     \
+                  "-DWANT_CMT=0"                     \
+                  "for LADSPA CMT support"           &&
+
 optional_depends  swh-plugins                        \
                   "-DWANT_SWH=1"                     \
                   "-DWANT_SWH=0"                     \
@@ -41,35 +64,13 @@ optional_depends  caps-plugins                       \
                   "-DWANT_CAPS=0"                    \
                   "for LADSPA CAPS plugins support"  &&
 
-optional_depends  cmt                                \
-                  "-DWANT_CMT=1"                     \
-                  "-DWANT_CMT=0"                     \
-                  "for LADSPA CMT support"           &&
-
-optional_depends  libvorbis                          \
-                  "-DWANT_OGGVORBIS=1"               \
-                  "-DWANT_OGGVORBIS=0"               \
-                  "for exporting song to OGG files"  &&
-
-optional_depends  pulseaudio                         \
-                  "-DWANT_PULSEAUDIO=1"              \
-                  "-DWANT_PULSEAUDIO=0"              \
-                  "for pulseaudio support"           &&
+optional_depends  fluidsynth                         \
+                  "-DWANT_SF2=1"                     \
+                  "-DWANT_SF2=0"                     \
+                  "for SpectrumAnalyzer plugin"      &&
 
 optional_depends  fftw                               \
                   "-DWANT_FFTW3F=1"                  \
                   "-DWANT_FFTW3F=0"                  \
-                  "for SpectrumAnalyzer plugin"      &&
-
-optional_depends  fluidsynth                         \
-                  "-DWANT_SF2=1"                     \
-                  "-DWANT_SF2=0"                     \
                   "for SpectrumAnalyzer plugin"
 
-# I have a spell for this locally but need to test it first
-#optional_depends  synthesistoolkit               \
-#                  "-DWANT_STK=1"                   \
-#                  "-DWANT_STK=0"                             \
-#                  "for Stk (Synthesis Toolkit) support"
-
-
diff --git a/audio-creation/lmms/HISTORY b/audio-creation/lmms/HISTORY
index 4c24c5137c..90c9907624 100644
--- a/audio-creation/lmms/HISTORY
+++ b/audio-creation/lmms/HISTORY
@@ -1,3 +1,7 @@
+2009-08-01 Arjan Bouter <abouter@sourcemage.org>
+	* PRE_BUILD: added, install in lib instead of lib64
+	* DEPENDS: overhauled
+
 2009-01-09 Arjan Bouter <abouter@sourcemage.org>
 	* BUILD: switched to qt4_cmake_build to actually build
 
diff --git a/audio-creation/lmms/PRE_BUILD b/audio-creation/lmms/PRE_BUILD
new file mode 100755
index 0000000000..0d38faa29c
--- /dev/null
+++ b/audio-creation/lmms/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+sedit 's/lib64/lib/' cmake/modules/DetectMachine.cmake
diff --git a/disk/udev/DEPENDS b/disk/udev/DEPENDS
index 3f8a377801..ac9903ed01 100755
--- a/disk/udev/DEPENDS
+++ b/disk/udev/DEPENDS
@@ -7,11 +7,19 @@ if list_find "$UDEV_OPTS" "--enable-extras"; then
   depends pkgconfig &&
   depends glib2     &&
   depends libusb    &&
-  depends usbutils  &&
-  depends hwdata    &&
-  depends libxslt
+  depends USBIDS &&
+  depends PCIIDS
 fi &&
 
+if [[ "$(get_spell_provider ${SPELL} PCIIDS)" = 'pciutils' ]]; then
+  depends -sub NO_ZLIB pciutils
+fi &&
+
+optional_depends gtk-doc \
+                 "--enable-gtk-doc" \
+                 "--disable-gtk-doc" \
+                 "build and install documentation?" &&
+
 optional_depends libselinux \
                  "--with-selinux" \
                  "--without-selinux" \
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index 486670aabb..d94f6cc477 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,6 @@
+2009-08-01 Arjan Bouter <abouter@sourcemage.org>
+	* DEPENDS: depend on providers instead of spells
+
 2009-07-13 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 145
 
diff --git a/utils/hal/DEPENDS b/utils/hal/DEPENDS
index e1df3814c8..1cc0368898 100755
--- a/utils/hal/DEPENDS
+++ b/utils/hal/DEPENDS
@@ -48,9 +48,28 @@ optional_depends  libusb                    \
                   "for libusb support"      &&
 
 optional_depends  hwdata                             \
-                  "--with-hwdata=/usr/share/hwdata"  \
-                  "--without-hwdata"                 \
-                  "for PCI/USB hardware data"       &&
+                  "--enable-pnp-ids" \
+                  "--disable-pnp-ids" \
+                  "for PNP hardware data" &&
+
+optional_depends  PCIIDS              \
+                  "--enable-pci-ids"  \
+                  "--disable-pci-ids" \
+                  "for PCI hardware data"  &&
+
+optional_depends  USBIDS              \
+                  "--enable-usb-ids"  \
+                  "--disable-usb-ids" \
+                  "for USB hardware data" &&
+
+if (is_depends_enabled $SPELL hwdata) || \
+     [[ "$(get_spell_provider ${SPELL} PCIIDS)" = 'hwdata' ]] || \
+     [[ "$(get_spell_provider ${SPELL} USBIDS)" = 'hwdata' ]]; then
+         OPTS="${OPTS} --with-hwdata=/usr/share/hwdata"
+elif [[ "$(get_spell_provider ${SPELL} PCIIDS)" = 'pciutils' ]] || \
+     [[ "$(get_spell_provider ${SPELL} USBIDS)" = 'usbutils' ]]; then
+         OPTS="${OPTS} --with-hwdata=/usr/share"
+fi &&
 
 optional_depends  pciutils                           \
                   "--with-macbookpro"                \
diff --git a/utils/hal/HISTORY b/utils/hal/HISTORY
index 0e1ef0518e..37414a2a15 100644
--- a/utils/hal/HISTORY
+++ b/utils/hal/HISTORY
@@ -1,3 +1,6 @@
+2009-08-01 Arjan Bouter <abouter@sourcemage.org>
+	* DEPENDS: use providers for usb.ids and pci.ids
+
 2009-07-15 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 0.5.13
 	* PRE_BUILD, fstype.patch: removed patch
diff --git a/utils/hwdata/HISTORY b/utils/hwdata/HISTORY
index 88340a8124..fda9e985cb 100644
--- a/utils/hwdata/HISTORY
+++ b/utils/hwdata/HISTORY
@@ -1,3 +1,6 @@
+2009-08-01 Arjan Bouter <abouter@sourcemage.org>
+	* PROVIDES: added
+
 2009-04-21 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version git
 	  new website and url
diff --git a/utils/hwdata/PROVIDES b/utils/hwdata/PROVIDES
new file mode 100755
index 0000000000..99160d06db
--- /dev/null
+++ b/utils/hwdata/PROVIDES
@@ -0,0 +1,2 @@
+PCIIDS
+USBIDS
diff --git a/utils/pciutils/BUILD b/utils/pciutils/BUILD
index d558f7152a..4ebf4f7797 100755
--- a/utils/pciutils/BUILD
+++ b/utils/pciutils/BUILD
@@ -1 +1 @@
-make PREFIX="$INSTALL_ROOT/usr" SHARED=yes OPT="$CFLAGS"
+make PREFIX="$INSTALL_ROOT/usr" SHARED=yes ${OPTS} OPT="$CFLAGS"
diff --git a/utils/pciutils/DEPENDS b/utils/pciutils/DEPENDS
index f6febdfa79..d26b1cff4d 100755
--- a/utils/pciutils/DEPENDS
+++ b/utils/pciutils/DEPENDS
@@ -1,4 +1,10 @@
 if [[ $PCIUTILS_UPDATE == y ]]; then
   depends $PCIUTILS_DOWNLOADER &&
   depends which
-fi
+fi &&
+
+optional_depends zlib 'ZLIB=yes' 'ZLIB=no' \
+                 'compress pci.ids?' &&
+
+optional_depends glibc 'DNS=yes' 'DNS=no' \
+                 "Enable querying the central database of PCI ID's using DNS?"
diff --git a/utils/pciutils/HISTORY b/utils/pciutils/HISTORY
index eec5f1a9bd..4df537dcd6 100644
--- a/utils/pciutils/HISTORY
+++ b/utils/pciutils/HISTORY
@@ -1,3 +1,8 @@
+2009-08-01 Arjan Bouter <abouter@sourcemage.org>
+	* DEPENDS: added optional deps on zlib and glibc
+	* (PRE_)SUB_DEPENDS: added to enable use of pci.ids by udev
+	* PROVIDES: added
+
 2009-07-06 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 3.1.3
 
diff --git a/utils/pciutils/PRE_SUB_DEPENDS b/utils/pciutils/PRE_SUB_DEPENDS
new file mode 100755
index 0000000000..6173944851
--- /dev/null
+++ b/utils/pciutils/PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+    ZLIB) is_depends_enabled $SPELL zlib;;
+    NO_ZLIB) is_depends_enabled $SPELL zlib && return 1;;
+    *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+       return 1;;
+esac
diff --git a/utils/pciutils/PROVIDES b/utils/pciutils/PROVIDES
new file mode 100755
index 0000000000..9f4c02db23
--- /dev/null
+++ b/utils/pciutils/PROVIDES
@@ -0,0 +1 @@
+PCIIDS
diff --git a/utils/pciutils/SUB_DEPENDS b/utils/pciutils/SUB_DEPENDS
new file mode 100755
index 0000000000..bb8ce328fc
--- /dev/null
+++ b/utils/pciutils/SUB_DEPENDS
@@ -0,0 +1,8 @@
+case $THIS_SUB_DEPENDS in
+    ZLIB) message "pciutils with zlib requested, forcing enabled zlib dependency" &&
+          depends zlib "ZLIB=yes" ;;
+ NO_ZLIB) message "pciutils without zlib requested, forcing disabled zlib dependency" &&
+          depends zlib "ZLIB=no" ;;
+       *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+          return 1 ;;
+esac
diff --git a/utils/usbutils/HISTORY b/utils/usbutils/HISTORY
index 68644e3801..220c953c91 100644
--- a/utils/usbutils/HISTORY
+++ b/utils/usbutils/HISTORY
@@ -1,3 +1,6 @@
+2009-08-01 Arjan Bouter <abouter@sourcemage.org>
+	* PROVIDES: added
+
 2009-06-25 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 0.84
 
diff --git a/utils/usbutils/PROVIDES b/utils/usbutils/PROVIDES
new file mode 100755
index 0000000000..65f0ea5cc2
--- /dev/null
+++ b/utils/usbutils/PROVIDES
@@ -0,0 +1 @@
+USBIDS
diff --git a/utils/xen-tools/HISTORY b/utils/xen-tools/HISTORY
index 2ed5776df1..958c1814bc 100644
--- a/utils/xen-tools/HISTORY
+++ b/utils/xen-tools/HISTORY
@@ -1,3 +1,6 @@
+2009-07-31 Arjan Bouter <abouter@sourcemage.org>
+	* PRE_BUILD: added, install into lib instead of lib64
+
 2009-07-30 Arjan Bouter <abouter@sourcemage.org>
 	* DETAILS: version 3.4.0
 
diff --git a/utils/xen-tools/PRE_BUILD b/utils/xen-tools/PRE_BUILD
new file mode 100755
index 0000000000..ec51a92c09
--- /dev/null
+++ b/utils/xen-tools/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+sedit 's/lib64/lib/' config/StdGNU.mk
diff --git a/x11-libs/wine/BUILD b/x11-libs/wine/BUILD
index 8124c389f6..747ce63735 100755
--- a/x11-libs/wine/BUILD
+++ b/x11-libs/wine/BUILD
@@ -9,6 +9,8 @@ if grep -q "\-O3" <<< $CFLAGS; then
   CXXFLAGS="-fno-guess-branch-probability $CXXFLAGS"
 fi  &&
 
+OPTS="${OPTS} ${WINE64}" &&
+
 default_build                     &&
 
 if is_depends_enabled $SPELL docbook-utils; then
diff --git a/x11-libs/wine/CONFIGURE b/x11-libs/wine/CONFIGURE
new file mode 100755
index 0000000000..a881b15924
--- /dev/null
+++ b/x11-libs/wine/CONFIGURE
@@ -0,0 +1,8 @@
+ARCH="$(uname -m)" &&
+if [[ "${ARCH}" = 'x86_64' ]]; then
+  message "Wine64 does NOT run 32bit apps. You can, however, build a 64bit Wine." &&
+  message "Probably this is not what you want. If you say 'n' to the next question" &&
+  message "an attempt will be made to build a 32bit Wine, which will fail if you" &&
+  message "do not have a multilib system." &&
+  config_query_option WINE64 'Build a 64bit Wine?' n '--enable-win64 --enable-maintainer-mode' ''
+fi
diff --git a/x11-libs/wine/DEPENDS b/x11-libs/wine/DEPENDS
index c90a0af381..f5809bc8a0 100755
--- a/x11-libs/wine/DEPENDS
+++ b/x11-libs/wine/DEPENDS
@@ -71,9 +71,9 @@ optional_depends  libpng                                 \
                   '--without-png'                        \
                   'for PNG image support'                &&
 
-optional_depends  libxslt                   \
-                  '--with-xslt'             \
-                  '--without-xslt'          \
+optional_depends  libxslt                                \
+                  '--with-xslt --with-xml'               \
+                  '--without-xslt --without-xml'         \
                   'for a functional Microsoft XML (MSXML) implementation'  &&
 
 optional_depends  MSTTF                                  \
@@ -88,10 +88,11 @@ optional_depends  nas                                    \
                   'for NAS audio support'                &&
 
 # the --with-curses option fails
-optional_depends  ncurses               \
-                  ""                    \
-                  "--without-curses"    \
-                  "curses gui?"         &&
+# because it can't find libncurses
+#optional_depends  ncurses               \
+#                  ""                    \
+#                  "--without-curses"    \
+#                  "curses gui?"         &&
 
 optional_depends  OPENGL                \
                   '--with-opengl'       \
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index d01d62efd8..727727c210 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,9 @@
+2009-08-01 Arjan Bouter <abouter@sourcemage.org>
+	* BUILD,CONFIGURE: added wine64 (fixes bug #11336)
+	* DEPENDS: completed optional dep on libxslt and commented out the
+	  optional dep on ncurses as that fails to find libncurses and would
+	  break the spell.
+
 2009-07-17 Eric Sandall <sandalle@sourcemage.org>
 	* DETAILS: Updated to 1.1.26