7 files changed, 148 insertions, 36 deletions

diff --git a/net-p2p/eiskaltdcpp-qt/Makefile b/net-p2p/eiskaltdcpp-qt/Makefile
index 1c17f54519af..994873afea57 100644
--- a/net-p2p/eiskaltdcpp-qt/Makefile
+++ b/net-p2p/eiskaltdcpp-qt/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	eiskaltdcpp-qt
-PORTVERSION=	2.1.1
+PORTVERSION=	2.2.1
 CATEGORIES=	net-p2p
 MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	eiskaltdcpp-${DISTVERSION}
@@ -14,14 +14,17 @@ DISTNAME=	eiskaltdcpp-${DISTVERSION}
 MAINTAINER=	gelraen.ua@gmail.com
 COMMENT=	EiskaltDC++ Direct Connect client Qt GUI
 
+LICENSE=	GPLv3
+
 RUN_DEPENDS=	${LOCALBASE}/share/eiskaltdcpp/keep_me:${PORTSDIR}/net-p2p/eiskaltdcpp-data
 
-LIB_DEPENDS+=	eiskaltdcpp:${PORTSDIR}/net-p2p/eiskaltdcpp-lib
+LIB_DEPENDS+=	eiskaltdcpp:${PORTSDIR}/net-p2p/eiskaltdcpp-lib \
+		execinfo:${PORTSDIR}/devel/libexecinfo
 CMAKE_ARGS+=	-DBUILD_LIB:BOOL=OFF
 
 PROJECTHOST=	eiskaltdc
 
-USE_BZIP2=	yes
+USE_XZ=		yes
 USE_GCC=	4.2+
 USE_GETTEXT=	yes
 USE_CMAKE=	yes
@@ -35,6 +38,8 @@ OPTIONS=	ASPELL		"Build with aspell support" off \
 		FREE_SPACE	"Free space bar in status panel"	on \
 		DBUS_NOTIFY	"DBus notification support"	on \
 		QTSCRIPT	"QtScript support"	off \
+		QML	"Qt Declarative ui support" off \
+		SQLITE	"SQLite support (experimental)" off \
 		MINIUPNP	"UPnP support"	on
 
 USE_QT_VER=	4
@@ -74,12 +79,27 @@ CMAKE_ARGS+=	-DDBUS_NOTIFY:BOOL=OFF
 .if defined(WITH_QTSCRIPT)
 CMAKE_ARGS+=	-DUSE_JS:BOOL=ON
 QT_COMPONENTS+=	script
+RUN_DEPENDS+=	${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so:${PORTSDIR}/devel/qtscriptgenerator
 PLIST_SUB+=	QTSCRIPT=""
 .else
 CMAKE_ARGS+=	-DUSE_JS:BOOL=OFF
 PLIST_SUB+=	QTSCRIPT="@comment "
 .endif
 
+.if defined(WITH_QML)
+CMAKE_ARGS+=	-DUSE_QT_QML:BOOL=ON
+QT_COMPONENTS+=	declarative
+.else
+CMAKE_ARGS+=	-DUSE_QT_QML:BOOL=OFF
+.endif
+
+.if defined(WITH_SQLITE) && !defined(WITHOUT_SQLITE)
+CMAKE_ARGS+=	-DUSE_QT_SQLITE:BOOL=ON
+QT_COMPONENTS+=	sql-sqlite3
+.else
+CMAKE_ARGS+=	-DUSE_QT_SQLITE:BOOL=OFF
+.endif
+
 .if defined(WITH_MINIUPNP)
 LIB_DEPENDS+=	miniupnpc:${PORTSDIR}/net/miniupnpc
 CMAKE_ARGS+=	-DUSE_MINIUPNP:BOOL=ON -DLOCAL_MINIUPNP:BOOL=OFF
diff --git a/net-p2p/eiskaltdcpp-qt/distinfo b/net-p2p/eiskaltdcpp-qt/distinfo
index 44a689707872..b90927dbed33 100644
--- a/net-p2p/eiskaltdcpp-qt/distinfo
+++ b/net-p2p/eiskaltdcpp-qt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (eiskaltdcpp-2.1.1.tar.bz2) = 7c9d2288c2f39e95d02baff20df94f00c8343dbec182206758c3751fc880d944
-SIZE (eiskaltdcpp-2.1.1.tar.bz2) = 2079712
+SHA256 (eiskaltdcpp-2.2.1.tar.xz) = 2b2bd627a1325c595f604766404ca4f4787db1b49b4b0c5c5d8e88ddfc2a2c40
+SIZE (eiskaltdcpp-2.2.1.tar.xz) = 1916680
diff --git a/net-p2p/eiskaltdcpp-qt/files/patch-CMakeLists.txt b/net-p2p/eiskaltdcpp-qt/files/patch-CMakeLists.txt
index 1036ced86a9d..3c65dc23ad44 100644
--- a/net-p2p/eiskaltdcpp-qt/files/patch-CMakeLists.txt
+++ b/net-p2p/eiskaltdcpp-qt/files/patch-CMakeLists.txt
@@ -1,31 +1,26 @@
---- CMakeLists.txt.orig	2010-11-21 23:38:14.000000000 +0100
-+++ CMakeLists.txt	2010-11-26 15:00:17.000000000 +0100
-@@ -301,19 +301,17 @@
-     if (CMAKE_CROSSCOMPILING)
-         set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -enable-auto-import")
-     endif (CMAKE_CROSSCOMPILING)
+--- ./CMakeLists.txt.orig	2011-03-08 19:47:12.000000000 +0200
++++ ./CMakeLists.txt	2011-03-09 15:49:15.000000000 +0200
+@@ -316,16 +316,14 @@
+     if (MINGW)
+         set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--enable-auto-import")
+     endif (MINGW)
 -    if (NOT APPLE)
--    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,--as-needed")
--    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--as-needed")
+-        set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,--as-needed")
+-        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--as-needed")
 -    endif (NOT APPLE)
      set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -pipe -DNDEBUG")
      set (CMAKE_CXX_FLAGS_RELEASE     "${CMAKE_CXX_FLAGS_RELEASE} -DQT_NO_DEBUG -pipe")
      set (CMAKE_CXX_FLAGS_DEBUG       "${CMAKE_CXX_FLAGS_DEBUG} -UNDEBUG -g3 -pipe")
- #endif (CMAKE_COMPILER_IS_GNUСXX AND CMAKE_COMPILER_IS_GNUC)
- endif (NOT MSVC)
+ endif ()
  
 -include_directories(${eiskaltdcpp_BINARY_DIR}
--   ${eiskaltdcpp_SOURCE_DIR}
--   ${GMP_INCLUDE_DIR}
 +include_directories(
-+	${EISKALTDCPP_INCLUDE_DIR}
-+	${eiskaltdcpp_BINARY_DIR}
-+	${eiskaltdcpp_SOURCE_DIR}
-+	${GMP_INCLUDE_DIR}
++   ${EISKALTDCPP_INCLUDE_DIR}
++   ${eiskaltdcpp_BINARY_DIR}
+    ${eiskaltdcpp_SOURCE_DIR}
+    ${GMP_INCLUDE_DIR}
     )
- 
- message(STATUS "CMAKE will use this libs (and headers) during build:
-@@ -375,7 +373,9 @@
+@@ -395,7 +393,9 @@
  add_subdirectory (dht)
  endif (DHT)
  
@@ -36,7 +31,7 @@
  
  if (USE_QT)
    add_subdirectory (eiskaltdcpp-qt)
-@@ -420,11 +420,11 @@
+@@ -443,11 +443,11 @@
        LOCALE_LIST "${LANGUAGES}"
        COPYRIGHT_HOLDER "EiskaltDC++ team"
        SOURCES "${DCPP_SRCS};${DCPP_HDRS}"
diff --git a/net-p2p/eiskaltdcpp-qt/files/patch-eiskaltdcpp-qt__CMakeLists.txt b/net-p2p/eiskaltdcpp-qt/files/patch-eiskaltdcpp-qt__CMakeLists.txt
index 23f2f15e77f3..9f78c795996d 100644
--- a/net-p2p/eiskaltdcpp-qt/files/patch-eiskaltdcpp-qt__CMakeLists.txt
+++ b/net-p2p/eiskaltdcpp-qt/files/patch-eiskaltdcpp-qt__CMakeLists.txt
@@ -1,8 +1,8 @@
---- ./eiskaltdcpp-qt/CMakeLists.txt.orig	2010-11-22 00:38:14.000000000 +0200
-+++ ./eiskaltdcpp-qt/CMakeLists.txt	2010-11-22 02:10:28.000000000 +0200
-@@ -321,6 +321,10 @@
-   list (APPEND LIBS ${LUA_LIBRARIES})
- endif (LUA_SCRIPT)
+--- ./eiskaltdcpp-qt/CMakeLists.txt.orig	2011-03-08 19:47:12.000000000 +0200
++++ ./eiskaltdcpp-qt/CMakeLists.txt	2011-03-09 15:49:15.000000000 +0200
+@@ -356,6 +356,10 @@
+    set_property(SOURCE ${PROJECT_SOURCE_DIR}/src/main.cpp PROPERTY COMPILE_DEFINITIONS FORCE_XDG )
+ endif (FORCE_XDG)
  
 +if (USE_MINIUPNP OR FREE_SPACE_BAR_C)
 +	list(APPEND LIBS extra)
@@ -11,7 +11,7 @@
  if (APPLE)
    set (MACOSICON "${PROJECT_SOURCE_DIR}/../icons/icon_128x128.icns")
    set (MACOSICONINBUNDLE "icon_128x128.icns")
-@@ -358,10 +362,19 @@
+@@ -393,10 +397,19 @@
    add_definitions(-DCLIENT_RES_DIR="${CLIENT_DATA_DIR}/qt/resources")
  endif (APPLE)
  
@@ -25,15 +25,15 @@
 +endif (BUILD_LIB)
 +
  if (APPLE)
--  target_link_libraries (eiskaltdcpp-qt ${LIBS} dcpp iconv ixml)
-+	target_link_libraries (eiskaltdcpp-qt ${LIBS} ${DCPP_LIB} iconv ixml)
+-  target_link_libraries (eiskaltdcpp-qt ${LIBS} dcpp iconv)
++	target_link_libraries (eiskaltdcpp-qt ${LIBS} ${DCPP_LIB} iconv)
  else (APPLE)
 -  target_link_libraries (eiskaltdcpp-qt ${LIBS} dcpp)
 +	target_link_libraries (eiskaltdcpp-qt ${LIBS} ${DCPP_LIB})
  endif (APPLE)
  
- if (UNIX AND NOT APPLE)
-@@ -431,7 +444,7 @@
+ if (APPLE)
+@@ -464,7 +477,7 @@
  else (APPLE)
    install (FILES ${PROJECT_BINARY_DIR}/default.rcc DESTINATION ${CLIENT_DATA_DIR}/qt/resources)
    if (UNIX)
diff --git a/net-p2p/eiskaltdcpp-qt/files/patch-eiskaltdcpp-qt__src__main.cpp b/net-p2p/eiskaltdcpp-qt/files/patch-eiskaltdcpp-qt__src__main.cpp
new file mode 100644
index 000000000000..f9ac3f6e4995
--- /dev/null
+++ b/net-p2p/eiskaltdcpp-qt/files/patch-eiskaltdcpp-qt__src__main.cpp
@@ -0,0 +1,20 @@
+--- ./eiskaltdcpp-qt/src/main.cpp.orig	2011-03-09 15:49:53.000000000 +0200
++++ ./eiskaltdcpp-qt/src/main.cpp	2011-03-09 15:50:14.000000000 +0200
+@@ -58,8 +58,6 @@
+ #include <signal.h>
+ #include <execinfo.h>
+ 
+-#include "extra/stacktrace.h"
+-
+ void installHandlers();
+ 
+ #ifdef FORCE_XDG
+@@ -214,8 +212,6 @@
+         std::cout << QObject::tr("Cannot handle SIGPIPE").toStdString() << std::endl;
+     }
+ 
+-    signal(SIGSEGV, printBacktrace);
+-
+     std::cout << QObject::tr("Signal handlers installed.").toStdString() << std::endl;
+ }
+ 
diff --git a/net-p2p/eiskaltdcpp-qt/pkg-descr b/net-p2p/eiskaltdcpp-qt/pkg-descr
index 4c04e74a399c..228e3214d356 100644
--- a/net-p2p/eiskaltdcpp-qt/pkg-descr
+++ b/net-p2p/eiskaltdcpp-qt/pkg-descr
@@ -1,4 +1,4 @@
-EiskaltDC++ is a program for UNIX-like systems that uses the Direct Connect
+EiskaltDC++ is a cross-platform program that uses the Direct Connect
 and ADC protocol. It is compatible with other DC clients, such as the
 original DC from Neomodus, DC++ and derivatives. EiskaltDC++ also
 interoperates with all common DC hub software.
diff --git a/net-p2p/eiskaltdcpp-qt/pkg-plist b/net-p2p/eiskaltdcpp-qt/pkg-plist
index fce158b3d9ee..a3789cb5ba14 100644
--- a/net-p2p/eiskaltdcpp-qt/pkg-plist
+++ b/net-p2p/eiskaltdcpp-qt/pkg-plist
@@ -55,6 +55,8 @@ share/eiskaltdcpp/qt/icons/appl/default/reconnect.png
 share/eiskaltdcpp/qt/icons/appl/default/refrlist.png
 share/eiskaltdcpp/qt/icons/appl/default/reload.png
 share/eiskaltdcpp/qt/icons/appl/default/server.png
+share/eiskaltdcpp/qt/icons/appl/default/slow.png
+share/eiskaltdcpp/qt/icons/appl/default/slow_off.png
 share/eiskaltdcpp/qt/icons/appl/default/spam.png
 share/eiskaltdcpp/qt/icons/appl/default/spy.png
 share/eiskaltdcpp/qt/icons/appl/default/status.png
@@ -68,11 +70,83 @@ share/eiskaltdcpp/qt/icons/appl/default/view-filter.png
 share/eiskaltdcpp/qt/icons/appl/default/zoom-in.png
 share/eiskaltdcpp/qt/icons/appl/default/zoom-out.png
 share/eiskaltdcpp/qt/icons/user/default/usericons.png
+share/eiskaltdcpp/qt/icons/appl/faenza/adls.png
+share/eiskaltdcpp/qt/icons/appl/faenza/application-exit.png
+share/eiskaltdcpp/qt/icons/appl/faenza/application-x-archive.png
+share/eiskaltdcpp/qt/icons/appl/faenza/application-x-executable.png
+share/eiskaltdcpp/qt/icons/appl/faenza/audio-x-generic.png
+share/eiskaltdcpp/qt/icons/appl/faenza/ball_green.png
+share/eiskaltdcpp/qt/icons/appl/faenza/bookmark-new.png
+share/eiskaltdcpp/qt/icons/appl/faenza/chat.png
+share/eiskaltdcpp/qt/icons/appl/faenza/configure.png
+share/eiskaltdcpp/qt/icons/appl/faenza/console.png
+share/eiskaltdcpp/qt/icons/appl/faenza/dialog-close.png
+share/eiskaltdcpp/qt/icons/appl/faenza/document-edit.png
+share/eiskaltdcpp/qt/icons/appl/faenza/download.png
+share/eiskaltdcpp/qt/icons/appl/faenza/edit-clear-locationbar-rtl.png
+share/eiskaltdcpp/qt/icons/appl/faenza/edit-clear.png
+share/eiskaltdcpp/qt/icons/appl/faenza/edit-copy.png
+share/eiskaltdcpp/qt/icons/appl/faenza/edit-delete.png
+share/eiskaltdcpp/qt/icons/appl/faenza/edit-find.png
+share/eiskaltdcpp/qt/icons/appl/faenza/eraser.png
+share/eiskaltdcpp/qt/icons/appl/faenza/face-smile.png
+share/eiskaltdcpp/qt/icons/appl/faenza/fav.png
+share/eiskaltdcpp/qt/icons/appl/faenza/favadd.png
+share/eiskaltdcpp/qt/icons/appl/faenza/favrem.png
+share/eiskaltdcpp/qt/icons/appl/faenza/favserver.png
+share/eiskaltdcpp/qt/icons/appl/faenza/favusers.png
+share/eiskaltdcpp/qt/icons/appl/faenza/find.png
+share/eiskaltdcpp/qt/icons/appl/faenza/folder-blue.png
+share/eiskaltdcpp/qt/icons/appl/faenza/freespace.png
+share/eiskaltdcpp/qt/icons/appl/faenza/go-down-search.png
+share/eiskaltdcpp/qt/icons/appl/faenza/go-down.png
+share/eiskaltdcpp/qt/icons/appl/faenza/go-up-search.png
+share/eiskaltdcpp/qt/icons/appl/faenza/go-up.png
+share/eiskaltdcpp/qt/icons/appl/faenza/gui.png
+share/eiskaltdcpp/qt/icons/appl/faenza/hashing.png
+share/eiskaltdcpp/qt/icons/appl/faenza/hubmsg.png
+share/eiskaltdcpp/qt/icons/appl/faenza/icon_appl.png
+share/eiskaltdcpp/qt/icons/appl/faenza/icon_appl_big.png
+share/eiskaltdcpp/qt/icons/appl/faenza/icon_msg.png
+share/eiskaltdcpp/qt/icons/appl/faenza/im-user-away.png
+share/eiskaltdcpp/qt/icons/appl/faenza/image-x-generic.png
+share/eiskaltdcpp/qt/icons/appl/faenza/list-add.png
+share/eiskaltdcpp/qt/icons/appl/faenza/log_file.png
+share/eiskaltdcpp/qt/icons/appl/faenza/message.png
+share/eiskaltdcpp/qt/icons/appl/faenza/network-connect.png
+share/eiskaltdcpp/qt/icons/appl/faenza/network-disconnect.png
+share/eiskaltdcpp/qt/icons/appl/faenza/openlist.png
+share/eiskaltdcpp/qt/icons/appl/faenza/own_filelist.png
+share/eiskaltdcpp/qt/icons/appl/faenza/plugin.png
+share/eiskaltdcpp/qt/icons/appl/faenza/pmmsg.png
+share/eiskaltdcpp/qt/icons/appl/faenza/qt-logo.png
+share/eiskaltdcpp/qt/icons/appl/faenza/reconnect.png
+share/eiskaltdcpp/qt/icons/appl/faenza/refrlist.png
+share/eiskaltdcpp/qt/icons/appl/faenza/reload.png
+share/eiskaltdcpp/qt/icons/appl/faenza/server.png
+share/eiskaltdcpp/qt/icons/appl/faenza/slow.png
+share/eiskaltdcpp/qt/icons/appl/faenza/slow_off.png
+share/eiskaltdcpp/qt/icons/appl/faenza/spam.png
+share/eiskaltdcpp/qt/icons/appl/faenza/spy.png
+share/eiskaltdcpp/qt/icons/appl/faenza/status.png
+share/eiskaltdcpp/qt/icons/appl/faenza/text-x-generic.png
+share/eiskaltdcpp/qt/icons/appl/faenza/transfer.png
+share/eiskaltdcpp/qt/icons/appl/faenza/unknown.png
+share/eiskaltdcpp/qt/icons/appl/faenza/users.png
+share/eiskaltdcpp/qt/icons/appl/faenza/video-x-generic.png
+share/eiskaltdcpp/qt/icons/appl/faenza/view-close.png
+share/eiskaltdcpp/qt/icons/appl/faenza/view-filter.png
+share/eiskaltdcpp/qt/icons/appl/faenza/zoom-in.png
+share/eiskaltdcpp/qt/icons/appl/faenza/zoom-out.png
 share/eiskaltdcpp/qt/icons/user/valknut/usericons.png
 %%QTSCRIPT%%share/eiskaltdcpp/qt/qtscripts/amarok_nowplay/amarok.png
 %%QTSCRIPT%%share/eiskaltdcpp/qt/qtscripts/amarok_nowplay/amarok.sh
 %%QTSCRIPT%%share/eiskaltdcpp/qt/qtscripts/amarok_nowplay/main.js
 %%QTSCRIPT%%share/eiskaltdcpp/qt/qtscripts/amarok_nowplay/script.desc
+%%QTSCRIPT%%share/eiskaltdcpp/qt/qtscripts/clementine_nowplay/clementine.png
+%%QTSCRIPT%%share/eiskaltdcpp/qt/qtscripts/clementine_nowplay/clementine.sh
+%%QTSCRIPT%%share/eiskaltdcpp/qt/qtscripts/clementine_nowplay/main.js
+%%QTSCRIPT%%share/eiskaltdcpp/qt/qtscripts/clementine_nowplay/script.desc
 %%QTSCRIPT%%share/eiskaltdcpp/qt/qtscripts/gnome/commands.ru_RU.UTF-8.php
 %%QTSCRIPT%%share/eiskaltdcpp/qt/qtscripts/gnome/gnome.png
 %%QTSCRIPT%%share/eiskaltdcpp/qt/qtscripts/gnome/main.js
@@ -96,6 +170,7 @@ share/eiskaltdcpp/qt/icons/user/valknut/usericons.png
 share/eiskaltdcpp/qt/resources/default.rcc
 share/eiskaltdcpp/qt/ts/be.qm
 share/eiskaltdcpp/qt/ts/bg.qm
+share/eiskaltdcpp/qt/ts/cs.qm
 share/eiskaltdcpp/qt/ts/en.qm
 share/eiskaltdcpp/qt/ts/es.qm
 share/eiskaltdcpp/qt/ts/fr.qm
@@ -106,6 +181,7 @@ share/eiskaltdcpp/qt/ts/sr.qm
 share/eiskaltdcpp/qt/ts/sk.qm
 share/eiskaltdcpp/qt/ts/uk.qm
 %%QTSCRIPT%%@dirrm share/eiskaltdcpp/qt/qtscripts/amarok_nowplay
+%%QTSCRIPT%%@dirrm share/eiskaltdcpp/qt/qtscripts/clementine_nowplay
 %%QTSCRIPT%%@dirrm share/eiskaltdcpp/qt/qtscripts/gnome
 %%QTSCRIPT%%@dirrm share/eiskaltdcpp/qt/qtscripts/logmanager
 %%QTSCRIPT%%@dirrm share/eiskaltdcpp/qt/qtscripts/tic-tac-toe/content/pics
@@ -114,6 +190,7 @@ share/eiskaltdcpp/qt/ts/uk.qm
 %%QTSCRIPT%%@dirrm share/eiskaltdcpp/qt/qtscripts/konsole
 %%QTSCRIPT%%@dirrm share/eiskaltdcpp/qt/qtscripts
 @dirrm share/eiskaltdcpp/qt/icons/appl/default
+@dirrm share/eiskaltdcpp/qt/icons/appl/faenza
 @dirrm share/eiskaltdcpp/qt/icons/appl
 @dirrm share/eiskaltdcpp/qt/icons/user/default
 @dirrm share/eiskaltdcpp/qt/icons/user/valknut