[SM-Commit] GIT changes to stable-rc-0.7 grimoire by Jaka Kranjc (d2648621d8ba43bf774ab2c84b0caf07de013fa6)

Jaka Kranjc scm at mail.sourcemage.org
Mon Feb 12 15:27:24 EST 2007


GIT changes to stable-rc-0.7 grimoire by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:

 audio-soft/cd-discid/BUILD       |   11 ++---------
 audio-soft/cd-discid/DETAILS     |    5 ++---
 audio-soft/cd-discid/HISTORY     |    3 +++
 audio-soft/cd-discid/INSTALL     |    2 ++
 kde-core/kdebase/HISTORY         |    4 ++++
 kde-core/kdebase/PRE_SUB_DEPENDS |    7 +++++++
 kde-core/kdebase/SUB_DEPENDS     |    8 ++++++++
 kde-core/kdepim/DEPENDS          |    7 +++++++
 kde-core/kdepim/HISTORY          |    4 ++++
 9 files changed, 39 insertions(+), 12 deletions(-)

New commits:
commit d2648621d8ba43bf774ab2c84b0caf07de013fa6
Author: Juuso Alasuutari <iuso at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    kdepim: sub_depends kdebase SASL when cyrus-sasl enabled (bug #13483)
    (cherry picked from commit 5cbd156e711bea52258ae69b429905ceb56a8d8f)

commit 92f2c29b9fdba46fd96746366dedd2724682f5b2
Author: Juuso Alasuutari <iuso at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    kdebase: add SASL sub-dependency (bug #13483)
    (cherry picked from commit efd7dea90bcc4510cede78ddbaa8e825c5bafdf7)

commit e720c17d48ecea9421f76bbe1b22077f014c368c
Author: Thomas Orgis <sobukus at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    bumping cd-discid to 0.9 and changing build api to 2
    (cherry picked from commit f96222dba81f1a55ae299cc8232e9dee9f37b45c)

diff --git a/audio-soft/cd-discid/BUILD b/audio-soft/cd-discid/BUILD
index 63d1e26..4276e43 100755
--- a/audio-soft/cd-discid/BUILD
+++ b/audio-soft/cd-discid/BUILD
@@ -1,9 +1,2 @@
-cp $SCRIPT_DIRECTORY/Makefile .
-(
-
-  make                               &&
-  prepare_install                    &&
-  make    install
-
-) > $C_FIFO 2>&1
-
+cp "$SCRIPT_DIRECTORY"/Makefile . &&
+make
diff --git a/audio-soft/cd-discid/DETAILS b/audio-soft/cd-discid/DETAILS
index 525af16..ba4a646 100755
--- a/audio-soft/cd-discid/DETAILS
+++ b/audio-soft/cd-discid/DETAILS
@@ -1,14 +1,13 @@
            SPELL=cd-discid
-         VERSION=0.8
+         VERSION=0.9
           SOURCE=${SPELL}_${VERSION}.orig.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://lly.org/~rcw/cd-discid/$SOURCE
         WEB_SITE=http://lly.org/~rcw/abcde/page/
          LICENSE[0]=GPL
-        SOURCE_HASH=sha512:48ebbb7d75e1fe70e41c2ec68b254563e769a72952a30b0365ff73ac89b51e6df60f9f405e1d19695152fc8c58de4b2ef5bf450693a57176f3ab4907b743b7cf
+        SOURCE_HASH=sha512:d2fa71fee2ee600f256311ee3fbf03a72790443c10545d18f1572274d60a87759d2cca396f5b42077e6615345e81cdff5f105702ccfdeba06a924d899076f78f
          ENTERED=20020911
         KEYWORDS="tools audio"
-       BUILD_API=1
            SHORT="A backend utility for cddb"
 cat << EOF
 cd-discid is a backend utility to get CDDB discid information from a
diff --git a/audio-soft/cd-discid/HISTORY b/audio-soft/cd-discid/HISTORY
index eca1b90..4f38e1c 100644
--- a/audio-soft/cd-discid/HISTORY
+++ b/audio-soft/cd-discid/HISTORY
@@ -1,3 +1,6 @@
+2007-02-03 Thomas Orgis <sobukus at sourcemage.org>
+	* DETAILS, BUILD, INSTALL: bump to 0.9, switch to build api 2
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/audio-soft/cd-discid/INSTALL b/audio-soft/cd-discid/INSTALL
new file mode 100755
index 0000000..cbe8406
--- /dev/null
+++ b/audio-soft/cd-discid/INSTALL
@@ -0,0 +1,2 @@
+make DESTDIR="$INSTALL_ROOT" install
+
diff --git a/kde-core/kdebase/HISTORY b/kde-core/kdebase/HISTORY
index 7f918f8..aceab6b 100644
--- a/kde-core/kdebase/HISTORY
+++ b/kde-core/kdebase/HISTORY
@@ -1,3 +1,7 @@
+2007-02-02 Juuso Alasuutari <iuso at sourcemage.org>
+	* PRE_SUB_DEPENDS, SUB_DEPENDS: Added, sub-dependency for
+	  cyrus-sasl (bug #13483).
+
 2007-01-26 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* DETAILS: updated spell to 3.5.6
 
diff --git a/kde-core/kdebase/PRE_SUB_DEPENDS b/kde-core/kdebase/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..562ffa2
--- /dev/null
+++ b/kde-core/kdebase/PRE_SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+SASL) is_depends_enabled  $SPELL  cyrus-sasl  &&
+      return 0
+      ;;
+esac
+
+return 1
diff --git a/kde-core/kdebase/SUB_DEPENDS b/kde-core/kdebase/SUB_DEPENDS
new file mode 100755
index 0000000..94a2f54
--- /dev/null
+++ b/kde-core/kdebase/SUB_DEPENDS
@@ -0,0 +1,8 @@
+case $THIS_SUB_DEPENDS in
+SASL) echo "SASL support requested, forcing cyrus-sasl dependency."
+      depends  cyrus-sasl
+      ;;
+   *) echo "Unknown sub-dependency $THIS_SUB_DEPENDS!"
+      return 1
+      ;;
+esac
diff --git a/kde-core/kdepim/DEPENDS b/kde-core/kdepim/DEPENDS
index 7ff14d1..5ca8d95 100755
--- a/kde-core/kdepim/DEPENDS
+++ b/kde-core/kdepim/DEPENDS
@@ -15,6 +15,13 @@ optional_depends  cyrus-sasl
                   '--without-sasl'                                                                                                                 \
                   'for SASL authentication support (which may be needed for working with e-mail with SMTP and IMAP -- RECOMMENDED)'  &&
 
+# bug #13483
+.  "$GRIMOIRE/is_depends_enabled.function"  &&
+if is_depends_enabled  $SPELL  cyrus-sasl
+then
+  sub_depends  kdebase  SASL
+fi  &&
+
 config_query ENCRYPTION  \
              'Would you like to enable encryption support in KMail?' y
 if  [  "$ENCRYPTION"  ==  "y"  ];  then
diff --git a/kde-core/kdepim/HISTORY b/kde-core/kdepim/HISTORY
index 29447bf..b312eb2 100644
--- a/kde-core/kdepim/HISTORY
+++ b/kde-core/kdepim/HISTORY
@@ -1,3 +1,7 @@
+2007-02-02 Juuso Alasuutari <iuso at sourcemage.org>
+	* DEPENDS: 'sub_depends kdebase SASL' if cyrus-sasl enabled
+	  (bug #13483).
+
 2007-01-26 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* DETAILS: updated spell to 3.5.6
 



More information about the SM-Commit mailing list