[Lunar-commits] <moonbase-kde> Merge branch 'master' of github.com:lunar-linux/moonbase-kde

[Florin Braescu]

commit aa404765bcf0297a3b64a677ae58c534a00d4ab6
Author: Florin Braescu <florin at lunar-linux.org>
Date: Fri, 07 Sep 2012 05:00:18 -0700
URL: https://github.com/lunar-linux/moonbase-kde/commit/aa404765bcf0297a3b64a677ae58c534a00d4ab6

Merge branch 'master' of github.com:lunar-linux/moonbase-kde

Conflicts:
	network/libktorrent/DETAILS

aa
---
  network/ktorrent/BUILD      | +0/-2     
  network/ktorrent/DETAILS    | +3/-6     
  network/libktorrent/DETAILS | +2/-2     
  3 files changed

--- a/network/ktorrent/BUILD
+++ b/network/ktorrent/BUILD
@@ -1,7 +1,5 @@
 (
 
-  patch_it $SOURCE_CACHE/$SOURCE2 1  &&
-
   source /etc/profile.d/qt4.rc   &&
   source /etc/profile.d/kde4.rc  &&
 
--- a/network/ktorrent/DETAILS
+++ b/network/ktorrent/DETAILS
@@ -1,16 +1,13 @@
 # Every time you update ktorrent remember to also update libktorrent.
           MODULE=ktorrent
-         VERSION=4.2.1
+         VERSION=4.3.0
           SOURCE=$MODULE-$VERSION.tar.bz2
-         SOURCE1=$MODULE-$VERSION-httpserver.patch.bz2
       SOURCE_URL=http://ktorrent.org/downloads/$VERSION
-     SOURCE2_URL=$PATCH_URL
    MODULE_PREFIX=${KDE4_INSTALL_DIR:-/usr}
-      SOURCE_VFY=sha1:3f52c4a10011a49d304c08a3bb1290a022e0c53f
-     SOURCE2_VFY=sha1:e19963650c24b07419c0621e683ec0c1a1e15cab
+      SOURCE_VFY=sha1:60400c6286f58934dde7ab471f56188b68d69f7b
         WEB_SITE=http://ktorrent.org
          ENTERED=20080111
-         UPDATED=20120716
+         UPDATED=20120906
            SHORT="BitTorrent client for KDE"
 
 cat << EOF
--- a/network/libktorrent/DETAILS
+++ b/network/libktorrent/DETAILS
@@ -1,12 +1,12 @@
           MODULE=libktorrent
          VERSION=1.3.0
           SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_URL=http://ktorrent.org/downloads/4.3.0
+      SOURCE_URL=http://ktorrent.org/downloads/4.3.0/
    MODULE_PREFIX=${KDE4_INSTALL_DIR:-/usr}
       SOURCE_VFY=sha1:e7e813af36f5854237111fd550f4914b83f17102
         WEB_SITE=http://ktorrent.org
          ENTERED=20100526
-         UPDATED=20120901
+         UPDATED=20120906
            SHORT="BitTorrent library"
 
 cat << EOF