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

17 files changed, 84 insertions, 25 deletions

diff --git a/audio-soft/qjackctl/DEPENDS b/audio-soft/qjackctl/DEPENDS
index 83d9aff5fa..0a0feebab9 100755
--- a/audio-soft/qjackctl/DEPENDS
+++ b/audio-soft/qjackctl/DEPENDS
@@ -1,5 +1,5 @@
 #
-# only needed for qt4_bin_path_fix.diff
+# only needed for qt4_bin_path_fix.diff and cvs version
 #
 depends  autoconf  &&
 
@@ -14,6 +14,11 @@ then
   depends  libxext
 fi  &&
 
+if [[ $QJCTL_VCS == y ]]
+then
+  depends  CVS
+fi  &&
+
 depends  JACK-DRIVER  &&
 
 optional_depends  alsa-lib              \
diff --git a/audio-soft/qjackctl/DETAILS b/audio-soft/qjackctl/DETAILS
index d04fc2069e..c5b76aaf59 100755
--- a/audio-soft/qjackctl/DETAILS
+++ b/audio-soft/qjackctl/DETAILS
@@ -1,9 +1,24 @@
            SPELL=qjackctl
+if [[ $QJCTL_VCS == y ]]
+then
+  if [[ $QJCTL_VCS_AUTOUPDATE == y ]]
+  then
+         VERSION=$(date +%Y%m%d)
+  else
+         VERSION=cvs
+  fi
+          SOURCE=$SPELL-cvs.tar.bz2
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-cvs"
+   SOURCE_URL[0]=cvs://:pserver:anonymous@qjackctl.cvs.sourceforge.net:/cvsroot/qjackctl:qjackctl
+   SOURCE_IGNORE=volatile
+  FORCE_DOWNLOAD=on
+else
          VERSION=0.3.1a
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
      SOURCE_HASH=sha512:0b6863b30e600d689e43832416083a6d020963c174adb02f2585e295420259c1d5bcf10bc0c3d787d889658780ff541d1d1736375149733a5cce1d108fc4bd7e
+fi
         WEB_SITE=http://qjackctl.sf.net
          ENTERED=20031215
       LICENSE[0]=GPL
@@ -19,4 +34,3 @@ which are properly saved between sessions, and a way control of the status
 of the audio server daemon. With time, this primordial interface has become
 richer by including a enhanced patchbay and connection control features.
 EOF
-
diff --git a/audio-soft/qjackctl/HISTORY b/audio-soft/qjackctl/HISTORY
index f91ce366b9..8d6d2102f8 100644
--- a/audio-soft/qjackctl/HISTORY
+++ b/audio-soft/qjackctl/HISTORY
@@ -1,3 +1,7 @@
+2007-10-20 Juuso Alasuutari <iuso@sourcemage.org>
+	* DETAILS, DEPENDS, PRE_BUILD: Added cvs version.
+	* PREPARE: Added, for cvs version query.
+
 2007-09-21 Juuso Alasuutari <iuso@sourcemage.org>
 	* PRE_BUILD: Replaced sed hack with patch from upstream.
 	* qt4_bin_path_fix.diff: Added.
diff --git a/audio-soft/qjackctl/PREPARE b/audio-soft/qjackctl/PREPARE
new file mode 100755
index 0000000000..d0089455a0
--- /dev/null
+++ b/audio-soft/qjackctl/PREPARE
@@ -0,0 +1,7 @@
+config_query  QJCTL_VCS  "Build latest version from development tree?"  n  &&
+
+if  [[ $QJCTL_VCS == y ]]
+then
+  config_query  QJCTL_VCS_AUTOUPDATE  \
+                "Update automatically on every system update?"  n
+fi
diff --git a/audio-soft/qjackctl/PRE_BUILD b/audio-soft/qjackctl/PRE_BUILD
index 38c9fcb58d..b4033a332e 100755
--- a/audio-soft/qjackctl/PRE_BUILD
+++ b/audio-soft/qjackctl/PRE_BUILD
@@ -1,8 +1,16 @@
 default_pre_build        &&
 cd  "$SOURCE_DIRECTORY"  &&
 
-#
-# fix ./configure not finding Qt4 build utils
-#
-patch -p0 < "$SCRIPT_DIRECTORY/qt4_bin_path_fix.diff"  &&
-autoconf
+if [[ $QJCTL_VCS != y ]]
+then
+  #
+  # fix ./configure not finding Qt4 build utils
+  #
+  patch -p0 < "$SCRIPT_DIRECTORY/qt4_bin_path_fix.diff"  &&
+  autoconf
+else
+  #
+  # prepare cvs version build
+  #
+  make -f Makefile.cvs
+fi
diff --git a/gnu/gcc/DETAILS b/gnu/gcc/DETAILS
index 07933d6f45..fc9c322fd9 100755
--- a/gnu/gcc/DETAILS
+++ b/gnu/gcc/DETAILS
@@ -12,6 +12,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
         WEB_SITE=http://gcc.gnu.org/
          ENTERED=20040420
             DOCS="$DOCS INSTALL"
+      PATCHLEVEL=1
         KEYWORDS="compiler"
            SHORT="the GNU C compiler"
 cat << EOF
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 4959b5171f..42d227d9b3 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,8 @@
+2007-10-20 David Brown <dmlb2000@gmail.com>
+	* INSTALL: make sure if they are using lib64 to compile in the linker
+	  as if it was in /lib64
+	* DETAILS: patchlevel++
+
 2007-10-09 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
 	* DETAILS: updated spell to 4.2.2
 	  fixed WEB_SITE
diff --git a/gnu/gcc/INSTALL b/gnu/gcc/INSTALL
index db5e393d44..7ed5d01e45 100755
--- a/gnu/gcc/INSTALL
+++ b/gnu/gcc/INSTALL
@@ -22,6 +22,11 @@ ln -sf ${TRACK_ROOT}/usr/bin/cpp ${INSTALL_ROOT}/lib            &&
 local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION         &&
 mkdir -p $SPECSDIR/specs-local                                    &&
 cp  gcc/specs  $SPECSDIR/specs-local/specs-gcc                    &&
+if [[ $HOST == x86_64-* && $GCC_NOLIB64 == n ]]
+then
+  # make sure the linker gets compiled in as a /lib64 one
+  sed -i 's#/lib/ld-linux-x86-64.so.2#/lib64/ld-linux-x86-64.so.2#' $SPECSDIR/specs-local/specs-gcc
+fi &&
 # make sure installwatch tracks it, the cat alone doesn't do that
 touch  $SPECSDIR/specs                                            &&
 cat  $SPECSDIR/specs-local/* > $SPECSDIR/specs
diff --git a/kde-core/kdebase/FINAL b/kde-core/kdebase/FINAL
index 94cabe4266..b37e679ab4 100755
--- a/kde-core/kdebase/FINAL
+++ b/kde-core/kdebase/FINAL
@@ -1,12 +1,3 @@
-if check_if_xorg_modular_libs qt-x11; then
-  message "$PROBLEM_COLOR"
-  message "kdm does not work out-of-the-box with xorg-modular since the "
-  message "paths changed. Edit /usr/share/config/kdm/kdmrc and modify "
-  message "ServerCmd to point to /usr/bin/X . If needed, set Xrdb, "
-  message "FailsafeClient and Session to point to correct paths (no X11R6/)."
-  message "$DEFAULT_COLOR"
-fi &&
-
 message '
 To get pmount working with hal on kde >= 3.5.4 a policy for the plugdev group
 has to be created in /etc/dbus-1/system.d/hal.conf:
diff --git a/kde-core/kdebase/HISTORY b/kde-core/kdebase/HISTORY
index eba2e3478c..ba7ae79cfe 100644
--- a/kde-core/kdebase/HISTORY
+++ b/kde-core/kdebase/HISTORY
@@ -1,3 +1,7 @@
+2007-10-20 Juuso Alasuutari <iuso@sourcemage.org>
+	* FINAL: Removed warning about paths in kdmrc, they have been made
+	  xorg-modular-compliant.
+
 2007-10-16  Treeve Jelbert <treeve@sourcemage.org>
 	* INSTALL: /usr/share/xsessions is a directory, 
 	  create it before copying
diff --git a/kde4/kdebase4/DEPENDS b/kde4/kdebase4/DEPENDS
index 506a9138c7..3ddaef27dd 100755
--- a/kde4/kdebase4/DEPENDS
+++ b/kde4/kdebase4/DEPENDS
@@ -15,7 +15,11 @@ if  check_if_xorg_modular_libs  qt4  ;  then
   depends  libxxf86misc   &&
   depends  xsetroot       &&
   depends  xset           &&
-  optional_depends  libxcb      '' '' 'VideoWidget'              &&
+  optional_depends  xine-lib   '' ''   'video player'            &&
+  if is_depends_enabled $SPELL xine-lib;then
+#    sub_depends xine-lib libxcb
+    depends libxcb
+  fi                      &&
   optional_depends  libxdamage  '' '' 'Compositing support'
 fi                        &&
 
@@ -31,5 +35,4 @@ optional_depends  libxklavier '' ''  'keyboard configuration'     &&
 optional_depends  libusb     '' ''   'usb support'                &&
 optional_depends  bluez-libs '' ''   'Bluetooth support '         &&
 optional_depends  openldap   '' ''   'LDAP authentication'        &&
-optional_depends  cyrus-sasl '' ''   'Cyrus SASL authentication'  &&
-optional_depends  xine-lib   '' ''   'video player'
+optional_depends  cyrus-sasl '' ''   'Cyrus SASL authentication'
diff --git a/kde4/kdebase4/DETAILS b/kde4/kdebase4/DETAILS
index a734fa7242..65b39bbb1f 100755
--- a/kde4/kdebase4/DETAILS
+++ b/kde4/kdebase4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=kdebase4
         SPELLX=${SPELL//4}
-         VERSION=3.93.0
-     SOURCE_HASH=sha512:8643a6ec5c9d6f2e109924bf265ce088db8ad2ce4d04ff9c33b08e65812e628100a5014d6b20eb021902727cddc22ee443308e99b8b46b608c779bab2b8b014c
+         VERSION=3.94.0
+     SOURCE_HASH=sha512:ba5f80b39b9e30ddd600111db59b8b12991b742a0b558b3941cd5632e74bb3fe0e6fd2052ad052dbbb36859f44b1f1ae74f9008fd0d90dcd3c802c9d5d45a7cf
           SOURCE=$SPELLX-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
    SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdebase4/HISTORY b/kde4/kdebase4/HISTORY
index 623a74ff1d..855949ba12 100644
--- a/kde4/kdebase4/HISTORY
+++ b/kde4/kdebase4/HISTORY
@@ -1,3 +1,9 @@
+2007-10-19  Treeve Jelbert <treeve@sourcemage.org>
+	* DEPENDS: adjust xine-lib, libxcb dependency
+
+2007-10-18  Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 3.94.0
+
 2007-09-07 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: update description
 	* DEPENDS: add qimageblitz, kdepimlibs
diff --git a/kde4/kdebindings4/DETAILS b/kde4/kdebindings4/DETAILS
index 03973c08bf..d10dd72033 100755
--- a/kde4/kdebindings4/DETAILS
+++ b/kde4/kdebindings4/DETAILS
@@ -1,6 +1,6 @@
            SPELL=kdebindings4
-         VERSION=3.93.0
-     SOURCE_HASH=sha512:075a51e2625d80c907c67b6709881fbc4e8d1e2c69d95c08f90105bcd4addcb741e8ed124c78bc9802efde18eab4b637671cd1e0eb41c4143c4e2ebd41fc80fb
+         VERSION=3.94.0
+     SOURCE_HASH=sha512:1a2964d323701a83509a320e2f278ec992c382947a4def2e20bdb50652253e6aaf14f29ede820a1eb3340d38566296166a8610146d4ffeb7df94609b3f22ebd1
           SOURCE=${SPELL//4}-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//4}-$VERSION
    SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdebindings4/HISTORY b/kde4/kdebindings4/HISTORY
index a0519a57ef..4ef86f50e4 100644
--- a/kde4/kdebindings4/HISTORY
+++ b/kde4/kdebindings4/HISTORY
@@ -1,2 +1,5 @@
+2007-10-18  Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 3.94.0
+
 2007-09-09 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 3.93.0
diff --git a/kde4/kdepim4/DETAILS b/kde4/kdepim4/DETAILS
index 2f09074c81..27130aad82 100755
--- a/kde4/kdepim4/DETAILS
+++ b/kde4/kdepim4/DETAILS
@@ -1,7 +1,7 @@
           SPELL=kdepim4
         SPELLX=${SPELL//4}
-         VERSION=3.93.0
-     SOURCE_HASH=sha512:02bbb5f4460d896f7889b824a967435689e40636b9417f612afdaa0c42908ee40badce838a1804df4f7988d1be2da4e49adca1bf5d56265f855974f66efa404b
+         VERSION=3.94.0
+     SOURCE_HASH=sha512:0eb42a428ca73df62fc887793245d0e3ac0d1010d4909fb14ca7e8e4d950e1e257b11e2dd034106b7d07950483c79d87f1835f379228d00328cca88a1b0a7468
           SOURCE=$SPELLX-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
    SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdepim4/HISTORY b/kde4/kdepim4/HISTORY
index bd9dbb41e1..2abefe0646 100644
--- a/kde4/kdepim4/HISTORY
+++ b/kde4/kdepim4/HISTORY
@@ -1,3 +1,6 @@
+2007-10-18  Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 3.94.0
+
 2007-09-07 Treeve Jelbert <treeve@sourcemage.org>
 	* DEPENDS: add kdepimlibs4
 	  tidy up