[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (f72f0be39784e15776a235619f9f75a70201a6cf)

Treeve Jelbert scm at sourcemage.org
Sat Oct 4 07:44:41 EDT 2008


GIT changes to master grimoire by Treeve Jelbert <treeve at sourcemage.org>:

 kde4/kdebindings4/DEPENDS           |    3 ++-
 kde4/kdebindings4/HISTORY           |    5 +++++
 kde4/kdebindings4/PRE_SUB_DEPENDS   |    6 ++++++
 kde4/kdebindings4/SUB_DEPENDS       |    6 ++++++
 kde4/kdeutils4/DEPENDS              |    3 ++-
 kde4/kdeutils4/HISTORY              |    3 +++
 libs/pyqt4/DEPENDS                  |    1 +
 libs/pyqt4/HISTORY                  |    3 +++
 python-pypi/luca/DEPENDS            |    1 +
 python-pypi/luca/HISTORY            |    3 +++
 python-pypi/pastedeploy/DEPENDS     |    1 +
 python-pypi/pastedeploy/DETAILS     |    4 ++--
 python-pypi/pastedeploy/HISTORY     |    4 ++++
 python-pypi/pyprotocols/DEPENDS     |    1 +
 python-pypi/pyprotocols/DETAILS     |    6 +++---
 python-pypi/pyprotocols/HISTORY     |    4 ++++
 python-pypi/ruledispatch/DEPENDS    |    1 +
 python-pypi/ruledispatch/DETAILS    |    6 +++---
 python-pypi/ruledispatch/HISTORY    |    4 ++++
 python-pypi/soappy/DEPENDS          |    1 +
 python-pypi/soappy/HISTORY          |    3 +++
 python-pypi/sqlalchemy/DEPENDS      |    1 +
 python-pypi/sqlalchemy/HISTORY      |    3 +++
 python-pypi/sqlobject/DEPENDS       |    1 +
 python-pypi/sqlobject/HISTORY       |    3 +++
 python-pypi/turbogears/DEPENDS      |    1 +
 python-pypi/turbogears/HISTORY      |    3 +++
 video/freevo/DEPENDS                |    1 +
 video/freevo/HISTORY                |    3 +++
 x11-toolkits/qscintilla/BUILD       |    2 --
 x11-toolkits/qscintilla/DETAILS     |   10 +++++-----
 x11-toolkits/qscintilla/HISTORY     |    6 ++++++
 x11-toolkits/qscintilla/mk.diff.qt3 |   28 ----------------------------
 x11-toolkits/qscintilla/mk.diff.qt4 |   35 -----------------------------------
 34 files changed, 86 insertions(+), 80 deletions(-)

New commits:
commit 133849ec5f8322f1c4919e3eaee18bc9223e80dc
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    "ruledispatch-0.5a0.dev-r2427"

commit 7fedbe296b9e42171e99c18a0be9c443d6bd2109
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    "pyprotocols-1.0a0dev-r2302"

commit e90f81bdc2aee9d8707d32f3b50bfaeddf27f368
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    soappy - add explict depends python

commit 7eaf0eb2b401285f2e73c36de5f838c2c2ec2107
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    "pastedeploy-1.3.2"

commit 5953e3aaa1d11ab2928a0d042cd965613405727c
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    luca - add explict depends python

commit e1aeb32588c9b4bf843d6551543c0b7650bac9ea
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    freevo - add explict depends python

commit a9a8eb76baff28ec8cb9936cba6028ac618f86c1
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    turbogears - add explict depends python

commit 3fffc179e3bb1b082a3b21bfc2e60f06e39a077c
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    sqlobject - add explict depends python

commit 644b15f54642ab30b0627d6c1a4b7b093052b170
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    sqlalchemy - add explict depends python

commit 780c72f3ca7f8baf174be0dfedfb6c09cfc87067
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdeutils4 - adjust depends

commit f9e6f4df1195a0e112b7a65dc4f14f95d48249f1
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdebindings4 - add subdepends

commit 63bce80c1f0a7a2c497aea71136ad8f2c3885d1e
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    pyqt4 - make python an explicit depends

commit facafbf7f1e8b33ff509877cab2ec0dd5759c5db
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    "qscintilla-2.3"

diff --git a/kde4/kdebindings4/DEPENDS b/kde4/kdebindings4/DEPENDS
index 18e1310..e9a25e8 100755
--- a/kde4/kdebindings4/DEPENDS
+++ b/kde4/kdebindings4/DEPENDS
@@ -1,6 +1,6 @@
 source  $SECTION_DIRECTORY/KDE_DEPENDS  &&
 
-optional_depends  falcon     '' ''  'Falcon bindings'  &&
+#optional_depends  falcon     '' ''  'Falcon bindings'  &&
 optional_depends  mono       '' ''  'Mono C#/QT# bindings'    &&
 optional_depends  python     '' ''  'Python bindings'         &&
 optional_depends  qscintilla '' ''  'editing component'       &&
@@ -12,5 +12,6 @@ optional_depends  ruby       '' ''  'Ruby bindings'           &&
 #optional_depends  perl   '' ''  'Perl bindings'      &&
 
 if is_depends_enabled $SPELL python; then
+    depends sip    &&
     depends pyqt4
 fi
diff --git a/kde4/kdebindings4/HISTORY b/kde4/kdebindings4/HISTORY
index 20211d9..9ddfb34 100644
--- a/kde4/kdebindings4/HISTORY
+++ b/kde4/kdebindings4/HISTORY
@@ -1,3 +1,8 @@
+2008-10-04 Treeve Jelbert <treeve at sourcemage.org>
+	* PRE_SUB_DEPENDS, SUB_DEPENDS: added
+	* DEPENDS" add sip
+     disable falcon
+
 2008-10-03 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.1.2
 
diff --git a/kde4/kdebindings4/PRE_SUB_DEPENDS b/kde4/kdebindings4/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..80a9507
--- /dev/null
+++ b/kde4/kdebindings4/PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case "${THIS_SUB_DEPENDS}" in
+  RUBY) is_depends_enabled ${SPELL} ruby && return 0 ;;
+  PYTHON) is_depends_enabled ${SPELL} python && return 0 ;;
+  CSHARP) if is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL} CSHARP); then return 0; fi ;;
+esac &&
+return 1
diff --git a/kde4/kdebindings4/SUB_DEPENDS b/kde4/kdebindings4/SUB_DEPENDS
new file mode 100755
index 0000000..c6dbae3
--- /dev/null
+++ b/kde4/kdebindings4/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case "${THIS_SUB_DEPENDS}" in
+  RUBY) depends ruby" ;;
+  PYTHON) depends python" ;;
+  CSHARP) depends CSHARP ;;
+esac &&
+return 1
diff --git a/kde4/kdeutils4/DEPENDS b/kde4/kdeutils4/DEPENDS
index 555f1b0..c1a16a0 100755
--- a/kde4/kdeutils4/DEPENDS
+++ b/kde4/kdeutils4/DEPENDS
@@ -2,7 +2,8 @@ source  $SECTION_DIRECTORY/KDE_DEPENDS  &&
 depends kdepimlibs4  &&
 optional_depends  gmp    '' '' 'to build kalc'         &&
 if [[ $KDE_CUPS = y ]] ;then
-  depends kdebindings4  &&
+  depends python  &&
+  depends -sub PYTHON kdebindings4  &&
   depends pycups
 else
   optional_depends  python '' '' 'to build SuperKaramba'
diff --git a/kde4/kdeutils4/HISTORY b/kde4/kdeutils4/HISTORY
index d921d0a..28f1854 100644
--- a/kde4/kdeutils4/HISTORY
+++ b/kde4/kdeutils4/HISTORY
@@ -1,3 +1,6 @@
+2008-10-04 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: add 'kdebindings4 -sub PYTHON'
+
 2008-10-03 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.1.2
 
diff --git a/libs/pyqt4/DEPENDS b/libs/pyqt4/DEPENDS
index a8f66da..a4a2bc2 100755
--- a/libs/pyqt4/DEPENDS
+++ b/libs/pyqt4/DEPENDS
@@ -1,4 +1,5 @@
 depends  qt4      &&
+depends  python   &&
 depends  sip      &&
 optional_depends qscintilla '' '' "editting component"
 if is_depends_enabled pyqt qscintilla; then
diff --git a/libs/pyqt4/HISTORY b/libs/pyqt4/HISTORY
index 4777f4d..c06e6b2 100644
--- a/libs/pyqt4/HISTORY
+++ b/libs/pyqt4/HISTORY
@@ -1,3 +1,6 @@
+2008-10-04 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: add ppython explicitly
+
 2008-08-09 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.4.3
 
diff --git a/python-pypi/luca/DEPENDS b/python-pypi/luca/DEPENDS
index 3a698a7..13b652d 100755
--- a/python-pypi/luca/DEPENDS
+++ b/python-pypi/luca/DEPENDS
@@ -1,3 +1,4 @@
+depends python     &&
 depends setuptools &&
 depends turbogears &&
 depends soappy     &&
diff --git a/python-pypi/luca/HISTORY b/python-pypi/luca/HISTORY
index 1632fc3..51ba6e9 100644
--- a/python-pypi/luca/HISTORY
+++ b/python-pypi/luca/HISTORY
@@ -1,3 +1,6 @@
+2008-10-04 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: add explicit python
+
 2008-03-09 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.1
 	* DEPENDS: + soappy
diff --git a/python-pypi/pastedeploy/DEPENDS b/python-pypi/pastedeploy/DEPENDS
index c72e1a1..87ff2ba 100755
--- a/python-pypi/pastedeploy/DEPENDS
+++ b/python-pypi/pastedeploy/DEPENDS
@@ -1 +1,2 @@
+depends python   &&
 depends initools
diff --git a/python-pypi/pastedeploy/DETAILS b/python-pypi/pastedeploy/DETAILS
index bb4bb4c..0b8df4b 100755
--- a/python-pypi/pastedeploy/DETAILS
+++ b/python-pypi/pastedeploy/DETAILS
@@ -1,6 +1,6 @@
            SPELL=pastedeploy
-         VERSION=1.3.1
-     SOURCE_HASH=sha512:47d30764f91215adda9a4e9a9dcf2226613caed3e573bd579a62dc6879f0bbe28451acb9d30141b4d986487d334b533adc085d96de6020e36923b382443e3877
+         VERSION=1.3.2
+     SOURCE_HASH=sha512:6bfbf350e3d4fa571fa034ed8520e92775e00e6c7895f69a17ce103b7dec1cf4f9210ac5a2d38edce8bdab00e1013c027d99e5500b65affbc762e7f623abed7c
           SOURCE=PasteDeploy-$VERSION.tar.gz
    SOURCE_URL[0]=http://pypi.python.org/packages/source/P/PasteDeploy/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/PasteDeploy-$VERSION
diff --git a/python-pypi/pastedeploy/HISTORY b/python-pypi/pastedeploy/HISTORY
index 8352051..c603a51 100644
--- a/python-pypi/pastedeploy/HISTORY
+++ b/python-pypi/pastedeploy/HISTORY
@@ -1,3 +1,7 @@
+2008-10-04 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.3.2
+	* DEPENDS: add explicit python
+
 2008-01-13 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: cleaned up
 
diff --git a/python-pypi/pyprotocols/DEPENDS b/python-pypi/pyprotocols/DEPENDS
index 54f5789..8309a10 100755
--- a/python-pypi/pyprotocols/DEPENDS
+++ b/python-pypi/pyprotocols/DEPENDS
@@ -1 +1,2 @@
+depends python    &&
 depends setuptools
diff --git a/python-pypi/pyprotocols/DETAILS b/python-pypi/pyprotocols/DETAILS
index 9f8eb0b..9a21366 100755
--- a/python-pypi/pyprotocols/DETAILS
+++ b/python-pypi/pyprotocols/DETAILS
@@ -1,7 +1,7 @@
            SPELL=pyprotocols
-         VERSION=1.0a0dev_r2082
-     SOURCE_HASH='sha512:654df3fa2093ef69a8b51cd9460113e1910ef64a03b3d1d95831578310d5f74cc16e1ef49f9151e087571a36011c4b52281490570d4bbb17f740dce859b1370b'
-          SOURCE="PyProtocols-$VERSION.zip"
+         VERSION=1.0a0dev-r2302
+     SOURCE_HASH=sha512:71d4558fb0a5ad76e3b6312829e12740058368a638f7988b04be1567fa5af315cd96568f779f3f350b541d1c478fb75a2a927d638d318ea3f118e58fc95506d9
+          SOURCE="PyProtocols-$VERSION.tar.gz"
    SOURCE_URL[0]="http://peak.telecommunity.com/snapshots/$SOURCE"
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/PyProtocols-$VERSION"
         WEB_SITE="http://peak.telecommunity.com/PyProtocols.html"
diff --git a/python-pypi/pyprotocols/HISTORY b/python-pypi/pyprotocols/HISTORY
index f39b281..4a64246 100644
--- a/python-pypi/pyprotocols/HISTORY
+++ b/python-pypi/pyprotocols/HISTORY
@@ -1,3 +1,7 @@
+2008-10-04 Treeve Jelbert <treeve at soucemage.org>
+	* DETAILS: version 1.0a0dev-r2302
+	* DEPENDS: add explicit python
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/python-pypi/ruledispatch/DEPENDS b/python-pypi/ruledispatch/DEPENDS
index d799ce0..1f178ea 100755
--- a/python-pypi/ruledispatch/DEPENDS
+++ b/python-pypi/ruledispatch/DEPENDS
@@ -1 +1,2 @@
+depends python &&
 depends pyprotocols
diff --git a/python-pypi/ruledispatch/DETAILS b/python-pypi/ruledispatch/DETAILS
index c3f7878..fb36e10 100755
--- a/python-pypi/ruledispatch/DETAILS
+++ b/python-pypi/ruledispatch/DETAILS
@@ -1,8 +1,8 @@
            SPELL=ruledispatch
-         VERSION=0.5a0.dev-r2306
-     SOURCE_HASH=sha512:de51350e2a6676d08393ece2f2836795c95b530c5036ed4c2cba518252d0c7b56eba3016d7c54b1ef43a7c48975a5a5f5e74c9e49125d2bc15ddd52e53402894
+         VERSION=0.5a0.dev-r2427
+     SOURCE_HASH=sha512:2c0c8b45533c7c17d6d1631ff77f44b375be2795972102719c53bfc13efaab257db3a68d4cbfc1caeb5dc36a19c4d0013b5a4ab16e44060b2ac4bbd0b632e376
           SOURCE=RuleDispatch-$VERSION.tar.gz
-   SOURCE_URL[0]=http://files.turbogears.org/eggs/$SOURCE
+   SOURCE_URL[0]=http://peak.telecommunity.com/snapshots/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/RuleDispatch-$VERSION"
         WEB_SITE="http://peak.telecommunity.com/"
       LICENSE[0]='PSF'
diff --git a/python-pypi/ruledispatch/HISTORY b/python-pypi/ruledispatch/HISTORY
index 33673c8..57b40e1 100644
--- a/python-pypi/ruledispatch/HISTORY
+++ b/python-pypi/ruledispatch/HISTORY
@@ -1,3 +1,7 @@
+2008-10-04 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.5a0.dev-r2427
+	* DEPENDS: add explicit python
+
 2007-06-14 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.5a0.dev-r2306
 	  new url
diff --git a/python-pypi/soappy/DEPENDS b/python-pypi/soappy/DEPENDS
index 468bdb9..b43c37a 100755
--- a/python-pypi/soappy/DEPENDS
+++ b/python-pypi/soappy/DEPENDS
@@ -1,2 +1,3 @@
+depends python &&
 depends pyxml &&
 depends fpconst
diff --git a/python-pypi/soappy/HISTORY b/python-pypi/soappy/HISTORY
index 06348cf..5abb694 100644
--- a/python-pypi/soappy/HISTORY
+++ b/python-pypi/soappy/HISTORY
@@ -1,3 +1,6 @@
+2008-10-04 TreeveJelbert <treeve at sourcemage.org>
+	* DEPENDS: add explicit python
+
 2007-09-10 Pol Vinogradov <vin.public at gmail.com>
 	* PRE_BUILD, import-error.patch: added to fix building errors
 
diff --git a/python-pypi/sqlalchemy/DEPENDS b/python-pypi/sqlalchemy/DEPENDS
index 06e0bc3..bad51c7 100755
--- a/python-pypi/sqlalchemy/DEPENDS
+++ b/python-pypi/sqlalchemy/DEPENDS
@@ -1,3 +1,4 @@
+depends python  &&
 #depends formencode  &&
 suggest_depends kinterbasdb  "firebird support"   &&
 suggest_depends mysql-python "MySQL support"      &&
diff --git a/python-pypi/sqlalchemy/HISTORY b/python-pypi/sqlalchemy/HISTORY
index a4e36c4..57ab015 100644
--- a/python-pypi/sqlalchemy/HISTORY
+++ b/python-pypi/sqlalchemy/HISTORY
@@ -1,3 +1,6 @@
+2008-10-04 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: add explicit python
+
 2008-07-31 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.4.7p1
 
diff --git a/python-pypi/sqlobject/DEPENDS b/python-pypi/sqlobject/DEPENDS
index c30d7af..6120900 100755
--- a/python-pypi/sqlobject/DEPENDS
+++ b/python-pypi/sqlobject/DEPENDS
@@ -1,3 +1,4 @@
+depends python &&
 depends formencode  &&
 suggest_depends kinterbasdb  "firebird support"   &&
 suggest_depends mysql-python "MySQL support"      &&
diff --git a/python-pypi/sqlobject/HISTORY b/python-pypi/sqlobject/HISTORY
index 8b346f2..5a0666f 100644
--- a/python-pypi/sqlobject/HISTORY
+++ b/python-pypi/sqlobject/HISTORY
@@ -1,3 +1,6 @@
+2008-10-04 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: add explicit depends python
+
 2008-05-30 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.10.2
 
diff --git a/python-pypi/turbogears/DEPENDS b/python-pypi/turbogears/DEPENDS
index e1ce598..cc199ef 100755
--- a/python-pypi/turbogears/DEPENDS
+++ b/python-pypi/turbogears/DEPENDS
@@ -1,3 +1,4 @@
+depends python       &&
 depends setuptools   &&
 depends cherrypy &&
 depends mochikit &&
diff --git a/python-pypi/turbogears/HISTORY b/python-pypi/turbogears/HISTORY
index 58dc40d..1f4f3e2 100644
--- a/python-pypi/turbogears/HISTORY
+++ b/python-pypi/turbogears/HISTORY
@@ -1,3 +1,6 @@
+2008-10-04 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: add explicit depends python
+
 2008-09-18 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.0.7
 
diff --git a/video/freevo/DEPENDS b/video/freevo/DEPENDS
index 4c04f94..d6e124f 100755
--- a/video/freevo/DEPENDS
+++ b/video/freevo/DEPENDS
@@ -1,3 +1,4 @@
+depends python         &&
 depends kaa-base       &&
 depends kaa-metadata   &&
 depends kaa-imlib2     &&
diff --git a/video/freevo/HISTORY b/video/freevo/HISTORY
index 55f22b4..90f0fb5 100644
--- a/video/freevo/HISTORY
+++ b/video/freevo/HISTORY
@@ -1,3 +1,6 @@
+2008-10-04 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: add explicit depends python 
+
 2008-10-02 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.8.2
 
diff --git a/x11-toolkits/qscintilla/BUILD b/x11-toolkits/qscintilla/BUILD
index 6a8af43..0303d96 100755
--- a/x11-toolkits/qscintilla/BUILD
+++ b/x11-toolkits/qscintilla/BUILD
@@ -8,7 +8,5 @@ else
 fi &&
  cd $SOURCE_DIRECTORY/$QTSCINT          &&
  qmake qscintilla.pro                   &&
-# fix the generated Makefile, so that libqscintilla gets installed at the correct time
- patch -p0 < $SPELL_DIRECTORY/mk.diff.${QTSCINT/Q/q}   &&
  make
 
diff --git a/x11-toolkits/qscintilla/DETAILS b/x11-toolkits/qscintilla/DETAILS
index 6a4969c..3a7b954 100755
--- a/x11-toolkits/qscintilla/DETAILS
+++ b/x11-toolkits/qscintilla/DETAILS
@@ -1,10 +1,10 @@
            SPELL=qscintilla
-         VERSION=1.73-gpl-2.1
-     SOURCE_HASH=sha512:db0f0def2660539e76f0016e57daefb7ffc9abe279a0c8468d98cf2b8f1a18643648b31e136c92e18f39116bc3688268923bf9f7ed71f6c4d1cdd52224f1bdf2
-          SOURCE=QScintilla-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/QScintilla-$VERSION
+         VERSION=2.3
+     SOURCE_HASH=sha512:806b7aeb290d079347ca8db0f76ecfd6a7d6538a10749bc512df1902d0d4e6a41d312c9a2f370f49a6680483dbbad2394b9e5c1603358e8a6e665869d7e39686
+          SOURCE=QScintilla-gpl-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/QScintilla-gpl-$VERSION
         WEB_SITE=http://www.riverbankcomputing.co.uk/qscintilla/
-   SOURCE_URL[0]=http://www.riverbankcomputing.com/Downloads/QScintilla2/$SOURCE
+   SOURCE_URL[0]=http://www.riverbankcomputing.com/static/Downloads/QScintilla2/$SOURCE
       LICENSE[0]=GPL
          ENTERED=20060206
         KEYWORDS="qt editors x11 libs"
diff --git a/x11-toolkits/qscintilla/HISTORY b/x11-toolkits/qscintilla/HISTORY
index dd95b28..a8d04d9 100644
--- a/x11-toolkits/qscintilla/HISTORY
+++ b/x11-toolkits/qscintilla/HISTORY
@@ -1,3 +1,9 @@
+2008-10-04 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 2.3
+	  new SOURCE_URL
+	* BUILD: remove patching of makefile
+	* mk.diff.qt?: deleted
+
 2007-06-12 Treeve Jelbert <treeve at sourcemage.org>
 	* SUB_DEPENDS: fix typo
 
diff --git a/x11-toolkits/qscintilla/mk.diff.qt3 b/x11-toolkits/qscintilla/mk.diff.qt3
deleted file mode 100644
index 07c4f2e..0000000
--- a/x11-toolkits/qscintilla/mk.diff.qt3
+++ /dev/null
@@ -1,28 +0,0 @@
---- Makefile.orig	2007-06-10 18:22:43.000000000 +0200
-+++ Makefile	2007-06-10 18:34:59.000000000 +0200
-@@ -435,12 +435,12 @@
- 
- ####### Build rules
- 
--all: Makefile  $(QTDIR)/lib/$(TARGET)
-+all: Makefile  $(TARGET)
- 
--$(QTDIR)/lib/$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)  
--	test -d $(QTDIR)/lib/ || mkdir -p $(QTDIR)/lib/
--	-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-+$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)  
- 	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
-+
-+install-scint: $(TARGET)
- 	-ln -s $(TARGET) $(TARGET0)
- 	-ln -s $(TARGET) $(TARGET1)
- 	-ln -s $(TARGET) $(TARGET2)
-@@ -1264,7 +1264,7 @@
- 	-$(DEL_DIR) "$(INSTALL_ROOT)../../../share/qt/"
- 
- 
--install: install_header install_trans install_qsci  
-+install: install-scint install_header install_trans install_qsci  
- 
- uninstall: uninstall_header uninstall_trans uninstall_qsci  
- 
diff --git a/x11-toolkits/qscintilla/mk.diff.qt4 b/x11-toolkits/qscintilla/mk.diff.qt4
deleted file mode 100644
index 9a826cd..0000000
--- a/x11-toolkits/qscintilla/mk.diff.qt4
+++ /dev/null
@@ -1,35 +0,0 @@
---- Makefile	2007-06-10 17:46:56.000000000 +0200
-+++ Makefile.cp	2007-06-10 17:58:10.000000000 +0200
-@@ -383,19 +383,15 @@
- 
- ####### Build rules
- 
--all: Makefile  ../../../lib/$(TARGET)
-+all: Makefile  $(TARGET)
- 
--../../../lib/$(TARGET):  $(OBJECTS) $(SUBLIBS) $(OBJCOMP)  
--	@$(CHK_DIR_EXISTS) ../../../lib/ || $(MKDIR) ../../../lib/ 
--	-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-+$(TARGET):  $(OBJECTS) $(SUBLIBS) $(OBJCOMP)  
- 	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS) $(OBJCOMP)
- 	-ln -s $(TARGET) $(TARGET0)
- 	-ln -s $(TARGET) $(TARGET1)
- 	-ln -s $(TARGET) $(TARGET2)
--	-$(DEL_FILE) ../../../lib/$(TARGET)
--	-$(DEL_FILE) ../../../lib/$(TARGET0)
--	-$(DEL_FILE) ../../../lib/$(TARGET1)
--	-$(DEL_FILE) ../../../lib/$(TARGET2)
-+
-+install-scint: $(TARGET)
- 	-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) ../../../lib/
- 
- 
-@@ -1267,7 +1263,7 @@
- 	-$(DEL_DIR) $(INSTALL_ROOT)/usr/share/qt4/ 
- 
- 
--install:  install_header install_trans install_qsci  FORCE
-+install:  install-scint install_header install_trans install_qsci  FORCE
- 
- uninstall: uninstall_header uninstall_trans uninstall_qsci   FORCE
- 



More information about the SM-Commit mailing list